mirror of
https://github.com/wassname/ray.git
synced 2026-07-21 12:50:45 +08:00
Update arrow and parquet-cpp. (#1875)
* Update arrow. * Fix bug. * Cherry-pick commit for fixing parquet segfault. * Update arrow and revert auto-releasing buffer commit. * Remove parquet cherry-pick.
This commit is contained in:
committed by
Philipp Moritz
parent
39cf6ff6e1
commit
d0fffec2d0
Vendored
+6
-2
@@ -44,10 +44,14 @@ if [[ ! -d $TP_DIR/../python/ray/pyarrow_files/pyarrow ]]; then
|
||||
|
||||
pushd $TP_DIR/build/arrow
|
||||
git fetch origin master
|
||||
# The PR for this commit is https://github.com/apache/arrow/pull/1581. We
|
||||
# The PR for this commit is https://github.com/apache/arrow/pull/1880. We
|
||||
# include the link here to make it easier to find the right commit because
|
||||
# Arrow often rewrites git history and invalidates certain commits.
|
||||
git checkout 46aa99e9843ac0148357bb36a9235cfd48903e73
|
||||
git checkout 4009b62086dfa43a4fd8bfa714772716e6531c6f
|
||||
|
||||
# Revert https://github.com/apache/arrow/pull/1807, which unfortunately
|
||||
# introduces the issue in https://issues.apache.org/jira/browse/ARROW-2448.
|
||||
git revert --no-commit cf396867df6f1f93948c69ce10ceb0f95e399242
|
||||
|
||||
cd cpp
|
||||
if [ ! -d "build" ]; then
|
||||
|
||||
Vendored
+1
-1
@@ -15,7 +15,7 @@ if [ ! -d $TP_DIR/build/parquet-cpp ]; then
|
||||
git clone https://github.com/apache/parquet-cpp.git "$TP_DIR/build/parquet-cpp"
|
||||
pushd $TP_DIR/build/parquet-cpp
|
||||
git fetch origin master
|
||||
git checkout 76388ea4eb8b23656283116bc656b0c8f5db093b
|
||||
git checkout 0875e43010af485e1c0b506d77d7e0edc80c66cc
|
||||
|
||||
if [ "$unamestr" == "Darwin" ]; then
|
||||
OPENSSL_ROOT_DIR=$OPENSSL_DIR \
|
||||
|
||||
Reference in New Issue
Block a user