[arrow] branch master updated: ARROW-5776: [Gandiva][Crossbow] Use commit id instead of fetch head.

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ravindra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 9df3342  ARROW-5776: [Gandiva][Crossbow] Use commit id instead of fetch head.
9df3342 is described below

commit 9df33423f36fd8c111d465a4e3cb9c921ad0f2a0
Author: Praveen <pr...@dremio.com>
AuthorDate: Fri Aug 2 20:42:35 2019 +0530

    ARROW-5776: [Gandiva][Crossbow] Use commit id instead of fetch head.
    
    - It is important to use the same commit to build the various gandiva artifacts
      on OsX/Linux etc, so that they are consistent.
    - We use the commit id to pin all of the builds to the same commit on the tree.
    
    Closes #4738 from praveenbingo/ARROW-5776 and squashes the following commits:
    
    05c3888b4 <Pindikura Ravindra> Update array-union-test.cc
    94c86fa23 <Praveen> Fix condition.
    dc77cdbd8 <Praveen> Suppress mvn output.
    6d5238344 <Praveen> Fixed test to compile in manylinux.
    bccf49022 <Praveen> Fix java build script.
    9d8de1468 <Praveen> Supress all maven output.
    3a82c079e <Praveen> Reduce logging, since travis seems to terminate for excessive logging.
    12f6c2f14 <Praveen> ARROW-5776:  Add back commit ids instead of fetch head
    
    Lead-authored-by: Praveen <pr...@dremio.com>
    Co-authored-by: Pindikura Ravindra <ra...@dremio.com>
    Signed-off-by: Pindikura Ravindra <ra...@dremio.com>
---
 cpp/src/arrow/array-union-test.cc         | 2 +-
 dev/tasks/gandiva-jars/build-cpp-linux.sh | 3 ---
 dev/tasks/gandiva-jars/build-java.sh      | 5 +++--
 dev/tasks/gandiva-jars/travis.linux.yml   | 2 +-
 dev/tasks/gandiva-jars/travis.osx.yml     | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/cpp/src/arrow/array-union-test.cc b/cpp/src/arrow/array-union-test.cc
index 62a4e15..1aefa5c 100644
--- a/cpp/src/arrow/array-union-test.cc
+++ b/cpp/src/arrow/array-union-test.cc
@@ -283,7 +283,7 @@ class UnionBuilderTest : public ::testing::Test {
   std::shared_ptr<Int8Builder> i8_builder = std::make_shared<Int8Builder>();
   std::shared_ptr<StringBuilder> str_builder = std::make_shared<StringBuilder>();
   std::shared_ptr<DoubleBuilder> dbl_builder = std::make_shared<DoubleBuilder>();
-  std::shared_ptr<B> union_builder{new B(default_memory_pool())};
+  std::shared_ptr<B> union_builder = std::make_shared<B>(default_memory_pool());
   std::shared_ptr<UnionArray> actual;
 };
 
diff --git a/dev/tasks/gandiva-jars/build-cpp-linux.sh b/dev/tasks/gandiva-jars/build-cpp-linux.sh
index ba359b3..354127c 100755
--- a/dev/tasks/gandiva-jars/build-cpp-linux.sh
+++ b/dev/tasks/gandiva-jars/build-cpp-linux.sh
@@ -22,9 +22,6 @@ source /multibuild/manylinux_utils.sh
 # Quit on failure
 set -e
 
-# Print commands for debugging
-set -x
-
 PYTHON_VERSION=2.7
 CPYTHON_PATH="$(cpython_path ${PYTHON_VERSION} 16)"
 PYTHON_INTERPRETER="${CPYTHON_PATH}/bin/python"
diff --git a/dev/tasks/gandiva-jars/build-java.sh b/dev/tasks/gandiva-jars/build-java.sh
index 50122e4..c21f759 100755
--- a/dev/tasks/gandiva-jars/build-java.sh
+++ b/dev/tasks/gandiva-jars/build-java.sh
@@ -27,9 +27,10 @@ pushd java
   fi
 
   # build the entire project
-  mvn clean install -DskipTests -P arrow-jni -Darrow.cpp.build.dir=$CPP_BUILD_DIR
+  mvn clean install -q -DskipTests -P arrow-jni -Darrow.cpp.build.dir=$CPP_BUILD_DIR
   # test only gandiva
-  mvn test -P arrow-jni -pl gandiva -Darrow.cpp.build.dir=$CPP_BUILD_DIR
+  mvn test -q -P arrow-jni -pl gandiva -Dgandiva.cpp.build.dir=$CPP_BUILD_DIR
+
   # copy the jars to distribution folder
   find gandiva/target/ -name "*.jar" -not -name "*tests*" -exec cp  {} $CPP_BUILD_DIR \;
 popd
diff --git a/dev/tasks/gandiva-jars/travis.linux.yml b/dev/tasks/gandiva-jars/travis.linux.yml
index 8b3bc21..2955aa6 100644
--- a/dev/tasks/gandiva-jars/travis.linux.yml
+++ b/dev/tasks/gandiva-jars/travis.linux.yml
@@ -43,7 +43,7 @@ before_install:
 before_script:
   - git clone --no-checkout {{ arrow.remote }} arrow
   - git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
-  - git -C arrow checkout FETCH_HEAD
+  - if [ $CROSSBOW_USE_COMMIT_ID == true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi
 
   - export TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR/arrow
 
diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml
index ac25b04..3d5ea0b 100644
--- a/dev/tasks/gandiva-jars/travis.osx.yml
+++ b/dev/tasks/gandiva-jars/travis.osx.yml
@@ -35,7 +35,7 @@ env:
 before_script:
   - git clone --no-checkout {{ arrow.remote }} arrow
   - git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
-  - git -C arrow checkout FETCH_HEAD
+  - if [ $CROSSBOW_USE_COMMIT_ID == true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi
 
   - export TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR/arrow
   - brew update