Skip to content

ARROW-4263: [Rust] Donate DataFusion#3399

Closed
andygrove wants to merge 12 commits intoapache:masterfrom
andygrove:ARROW-4263
Closed

ARROW-4263: [Rust] Donate DataFusion#3399
andygrove wants to merge 12 commits intoapache:masterfrom
andygrove:ARROW-4263

Conversation

@andygrove
Copy link
Copy Markdown
Member

@andygrove andygrove commented Jan 15, 2019

This PR is to donate the DataFusion source code (assuming that the vote passes!)

This was referenced Jan 29, 2019
Closed
Closed
Closed
@andygrove andygrove changed the title ARROW-4263: [Rust] Donate DataFusion [WIP] ARROW-4263: [Rust] Donate DataFusion Jan 30, 2019
@kou
Copy link
Copy Markdown
Member

kou commented Jan 30, 2019

Could you update https://github.com/apache/arrow/blob/master/dev/release/00-prepare.sh#L101-L105 ?
And please use git rebase instead of git merge.

@andygrove
Copy link
Copy Markdown
Member Author

andygrove commented Jan 30, 2019

Thanks @kou .. I've actually been trying to figure out git rebase tonight and just asked a question about this on the mailing list.

Is it too late now to rebase this PR?

@wesm
Copy link
Copy Markdown
Member

wesm commented Jan 30, 2019 •
edited
Loading

You can squash the branch this way

git checkout -b ARROW-4263-squash
git fetch apache
git reset --hard apache/master
git merge --squash ARROW-4263
git commit -m "commit message here"
git checkout ARROW-4263
git reset --hard ARROW-4263-squash
git push -f

If you make a mistake you can recover using the reflog. see also https://ohshitgit.com/

@wesm
Copy link
Copy Markdown
Member

wesm commented Jan 30, 2019 •
edited
Loading

(Generally once you have merge commits in a branch, normal rebasing is off the table)

@wesm
Copy link
Copy Markdown
Member

wesm commented Jan 31, 2019

Can you move the test data files to arrow-testing?

3.35s$ $TRAVIS_BUILD_DIR/ci/travis_release_audit.sh
NOT APPROVED: rust/datafusion/test/data/aggregate_test_1.csv (apache-arrow/rust/datafusion/test/data/aggregate_test_1.csv): false
NOT APPROVED: rust/datafusion/test/data/aggregate_test_2.csv (apache-arrow/rust/datafusion/test/data/aggregate_test_2.csv): false
NOT APPROVED: rust/datafusion/test/data/all_types.csv (apache-arrow/rust/datafusion/test/data/all_types.csv): false
NOT APPROVED: rust/datafusion/test/data/all_types_flat.csv (apache-arrow/rust/datafusion/test/data/all_types_flat.csv): false
NOT APPROVED: rust/datafusion/test/data/null_test.csv (apache-arrow/rust/datafusion/test/data/null_test.csv): false
NOT APPROVED: rust/datafusion/test/data/numerics.csv (apache-arrow/rust/datafusion/test/data/numerics.csv): false
NOT APPROVED: rust/datafusion/test/data/people.csv (apache-arrow/rust/datafusion/test/data/people.csv): false
NOT APPROVED: rust/datafusion/test/data/uk_cities.csv (apache-arrow/rust/datafusion/test/data/uk_cities.csv): false
8 unapproved licences. Check rat report: rat.txt

@andygrove
Copy link
Copy Markdown
Member Author

andygrove commented Feb 1, 2019

@wesm I have created a PR against arrow-testing:

apache/arrow-testing#1

@kou
Copy link
Copy Markdown
Member

kou commented Feb 1, 2019

Could you re-add a change for https://github.com/apache/arrow/blob/master/dev/release/00-prepare.sh#L101-L105 ?

@andygrove
Copy link
Copy Markdown
Member Author

andygrove commented Feb 2, 2019

Once #3547 and apache/arrow-testing#1 are merged, I can delete the test data file from this PR and update the tests to use the version from arrow-testing

@wesm
Copy link
Copy Markdown
Member

wesm commented Feb 4, 2019

The IP clearance vote is passed

@wesm
Copy link
Copy Markdown
Member

wesm commented Feb 4, 2019

I just merged apache/arrow-testing#1. Let me know when this is ready to merge =)

@andygrove
Copy link
Copy Markdown
Member Author

andygrove commented Feb 4, 2019

@wesm Tests pass for me locally so hopefully we're good to go once Travis has run ...

@andygrove
Copy link
Copy Markdown
Member Author

andygrove commented Feb 4, 2019

Travis is happy

@andygrove
Copy link
Copy Markdown
Member Author

andygrove commented Feb 4, 2019

Appveyor is happy too. Let's do this!

@wesm wesm closed this in 29f14ca Feb 4, 2019
@wesm
Copy link
Copy Markdown
Member

wesm commented Feb 4, 2019

👍

@paddyhoran
Copy link
Copy Markdown
Contributor

paddyhoran commented Feb 4, 2019

Excited to see this merged, thanks @andygrove

xhochy pushed a commit that referenced this pull request Feb 8, 2019
@andygrove @xhochy
ARROW-4263: [Rust] Donate DataFusion
125d1f1 
This PR is to donate the DataFusion source code (assuming that the vote passes!)

Author: Andy Grove <andygrove73@gmail.com>

Closes #3399 from andygrove/ARROW-4263 and squashes the following commits:

990d06f <Andy Grove> formatting
6603091 <Andy Grove> update path again, update testing submodule
38fa63b <Andy Grove> remove test csv file, update tests to use test data from new testing submodule
16e4cff <Andy Grove> remove test csv file, update tests to use test data from new testing submodule
91f6e90 <Andy Grove> update example to use new data file
4ebeee5 <Andy Grove> formatting
ae88a90 <Andy Grove> convert tests to use new test data file that was randomly generated
d7bea8e <Andy Grove> update test to use uk_cities.csv and remove people.csv
061d788 <Andy Grove> remove unused test data files
f60e50d <Andy Grove> remove unused test data files, manually recreate uk_cities.csv because I can't trace where the original data came from
28d914a <Andy Grove> Update 00-prepare.sh to handle datafusion versioning
c4e1a26 <Andy Grove> DataFusion Donation
@asfimport asfimport mentioned this pull request Feb 4, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@andygrove @kou @wesm @paddyhoran