Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/src/arrow/array-union-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down
3 changes: 0 additions & 3 deletions dev/tasks/gandiva-jars/build-cpp-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions dev/tasks/gandiva-jars/build-java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion dev/tasks/gandiva-jars/travis.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/gandiva-jars/travis.osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down