Skip to content

Commit 789c8c8

Browse files
authored
Merge pull request #4 from apache/master
Arrow Master 1/29/2019
2 parents e5b19ee + 072200f commit 789c8c8

File tree

1,008 files changed

+50387
-22980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,008 files changed

+50387
-22980
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ arrow-src.tar.gz
3030
.build_cache_dir
3131
dependency-reduced-pom.xml
3232
MANIFEST
33+
compile_commands.json
34+
build.ninja
3335

3436
# Generated Visual Studio files
3537
*.vcxproj

.travis.yml

+86-26
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717

1818
sudo: required
19-
dist: trusty
19+
dist: xenial
2020

2121
services:
2222
- docker
@@ -38,16 +38,13 @@ before_install:
3838
- |
3939
if [ $TRAVIS_OS_NAME == "linux" ]; then
4040
sudo bash -c "echo -e 'Acquire::Retries 10; Acquire::http::Timeout \"20\";' > /etc/apt/apt.conf.d/99-travis-retry"
41-
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
4241
sudo apt-get update -qq
4342
fi
4443
- eval `python $TRAVIS_BUILD_DIR/ci/detect-changes.py`
4544

4645

4746
matrix:
4847
fast_finish: true
49-
allow_failures:
50-
- jdk: oraclejdk9
5148
include:
5249
- name: "Lint C++, Python, R"
5350
os: linux
@@ -61,20 +58,44 @@ matrix:
6158
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
6259
script:
6360
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
64-
- name: "C++ unit tests, code coverage with gcc 4.8"
61+
- name: "C++ unit tests w/ Valgrind, clang 6.0"
62+
language: cpp
63+
os: linux
64+
env:
65+
- ARROW_TRAVIS_VALGRIND=1
66+
- ARROW_TRAVIS_USE_TOOLCHAIN=1
67+
- ARROW_TRAVIS_PLASMA=1
68+
- ARROW_TRAVIS_ORC=1
69+
- ARROW_TRAVIS_PARQUET=1
70+
- ARROW_TRAVIS_GANDIVA=1
71+
- ARROW_TRAVIS_USE_SYSTEM_JAVA=1
72+
- ARROW_BUILD_WARNING_LEVEL=CHECKIN
73+
before_script:
74+
- if [ $ARROW_CI_CPP_AFFECTED != "1" ]; then exit; fi
75+
- export CC="clang-6.0"
76+
- export CXX="clang++-6.0"
77+
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
78+
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
79+
# If either C++ or Python changed, we must install the C++ libraries
80+
- git submodule update --init
81+
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
82+
script:
83+
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh || travis_terminate 1
84+
# Separating Valgrind and C++ coverage makes individual jobs shorter
85+
- name: "C++ unit tests w/ gcc 5.4, coverage"
6586
compiler: gcc
6687
language: cpp
6788
os: linux
6889
jdk: openjdk8
6990
env:
70-
- ARROW_TRAVIS_VALGRIND=1
7191
- ARROW_TRAVIS_USE_TOOLCHAIN=1
7292
- ARROW_TRAVIS_PLASMA=1
7393
- ARROW_TRAVIS_ORC=1
7494
- ARROW_TRAVIS_COVERAGE=1
7595
- ARROW_TRAVIS_PARQUET=1
7696
- ARROW_TRAVIS_GANDIVA=1
7797
- ARROW_TRAVIS_GANDIVA_JAVA=1
98+
- ARROW_TRAVIS_USE_SYSTEM_JAVA=1
7899
- ARROW_BUILD_WARNING_LEVEL=CHECKIN
79100
before_script:
80101
- if [ $ARROW_CI_CPP_AFFECTED != "1" ] && [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
@@ -87,7 +108,40 @@ matrix:
87108
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh || travis_terminate 1
88109
- $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1
89110
- $TRAVIS_BUILD_DIR/ci/travis_upload_cpp_coverage.sh || travis_terminate 1
90-
- name: "Python 2.7 and 3.6 unit tests, coverage with gcc 4.8"
111+
- name: "C++ unit tests w/ gcc 4.8, trusty"
112+
dist: trusty
113+
compiler: gcc
114+
language: cpp
115+
os: linux
116+
jdk: openjdk8
117+
env:
118+
- ARROW_TRAVIS_USE_TOOLCHAIN=1
119+
- ARROW_TRAVIS_PLASMA=1
120+
- ARROW_TRAVIS_ORC=1
121+
- ARROW_TRAVIS_PARQUET=1
122+
- ARROW_TRAVIS_GANDIVA=1
123+
- ARROW_TRAVIS_GANDIVA_JAVA=1
124+
- ARROW_BUILD_WARNING_LEVEL=CHECKIN
125+
before_install:
126+
- ulimit -c unlimited -S
127+
- |
128+
if [ $TRAVIS_OS_NAME == "linux" ]; then
129+
sudo bash -c "echo -e 'Acquire::Retries 10; Acquire::http::Timeout \"20\";' > /etc/apt/apt.conf.d/99-travis-retry"
130+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
131+
sudo apt-get update -qq
132+
fi
133+
- eval `python $TRAVIS_BUILD_DIR/ci/detect-changes.py`
134+
before_script:
135+
- if [ $ARROW_CI_CPP_AFFECTED != "1" ] && [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
136+
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
137+
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
138+
# If either C++ or Python changed, we must install the C++ libraries
139+
- git submodule update --init
140+
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
141+
script:
142+
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh || travis_terminate 1
143+
- $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1
144+
- name: "Python 2.7 and 3.6 unit tests w/ Valgrind, gcc 5.4, coverage"
91145
compiler: gcc
92146
language: cpp
93147
os: linux
@@ -98,10 +152,10 @@ matrix:
98152
- ARROW_TRAVIS_USE_TOOLCHAIN=1
99153
- ARROW_TRAVIS_COVERAGE=1
100154
- ARROW_TRAVIS_PYTHON_DOCS=1
101-
- ARROW_BUILD_WARNING_LEVEL=CHECKIN
102155
- ARROW_TRAVIS_PYTHON_JVM=1
103-
- ARROW_TRAVIS_PYTHON_GANDIVA=1
104156
- ARROW_TRAVIS_OPTIONAL_INSTALL=1
157+
- ARROW_BUILD_WARNING_LEVEL=CHECKIN
158+
- ARROW_TRAVIS_USE_SYSTEM_JAVA=1
105159
# TODO(wesm): Run the benchmarks outside of Travis
106160
# - ARROW_TRAVIS_PYTHON_BENCHMARKS=1
107161
before_script:
@@ -111,6 +165,7 @@ matrix:
111165
- $TRAVIS_BUILD_DIR/ci/travis_install_toolchain.sh
112166
script:
113167
- $TRAVIS_BUILD_DIR/ci/travis_script_java.sh || travis_terminate 1
168+
- ARROW_TRAVIS_PYTHON_GANDIVA=1
114169
# Only run Plasma tests with valgrind in one of the Python builds because
115170
# they are slow
116171
- export PLASMA_VALGRIND=0
@@ -148,17 +203,18 @@ matrix:
148203
script:
149204
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh || travis_terminate 1
150205
- $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh
151-
- name: "[OS X] Python w/ XCode 6.4"
206+
- name: "[OS X] Python w/ XCode 7.3"
152207
compiler: clang
153208
language: cpp
154-
osx_image: xcode6.4
209+
osx_image: xcode7.3
155210
os: osx
156211
cache:
157212
addons:
158213
env:
159214
- ARROW_TRAVIS_USE_TOOLCHAIN=1
160215
- ARROW_BUILD_WARNING_LEVEL=CHECKIN
161216
- ARROW_TRAVIS_OPTIONAL_INSTALL=1
217+
- MACOSX_DEPLOYMENT_TARGET="10.9"
162218
before_script:
163219
script:
164220
- if [ $ARROW_CI_PYTHON_AFFECTED != "1" ]; then exit; fi
@@ -181,18 +237,22 @@ matrix:
181237
script:
182238
- $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
183239
- $TRAVIS_BUILD_DIR/ci/travis_script_javadoc.sh
184-
- name: "Java w/ Oracle JDK 9"
240+
- name: "Java w/ OpenJDK 9"
185241
language: java
186242
os: linux
187-
jdk: oraclejdk9
243+
jdk: openjdk9
244+
before_script:
245+
- if [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
246+
script:
247+
- $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
248+
- name: "Java w/ OpenJDK 11"
249+
language: java
250+
os: linux
251+
jdk: openjdk11
188252
before_script:
189253
- if [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
190254
script:
191255
- $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
192-
addons:
193-
apt:
194-
packages:
195-
- oracle-java9-installer
196256
- name: "Integration w/ OpenJDK 8"
197257
language: java
198258
os: linux
@@ -201,13 +261,13 @@ matrix:
201261
env:
202262
- ARROW_TRAVIS_PLASMA=1
203263
- ARROW_TRAVIS_PLASMA_JAVA_CLIENT=1
204-
- CC="clang-6.0"
205-
- CXX="clang++-6.0"
206264
before_script:
207265
- if [ $ARROW_CI_INTEGRATION_AFFECTED != "1" ]; then exit; fi
266+
- export CC="clang-6.0"
267+
- export CXX="clang++-6.0"
208268
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
209269
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
210-
- nvm install 10.1
270+
- nvm install 11.6
211271
- $TRAVIS_BUILD_DIR/ci/travis_before_script_js.sh
212272
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
213273
script:
@@ -217,14 +277,14 @@ matrix:
217277
language: node_js
218278
os: linux
219279
node_js:
220-
- '10.1'
280+
- '11.6'
221281
before_script:
222282
- if [ $ARROW_CI_JS_AFFECTED != "1" ]; then exit; fi
223283
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
224284
- $TRAVIS_BUILD_DIR/ci/travis_before_script_js.sh
225285
script:
226286
- $TRAVIS_BUILD_DIR/ci/travis_script_js.sh
227-
- name: "C++ & GLib & Ruby w/ gcc 4.9"
287+
- name: "C++ & GLib & Ruby w/ gcc 5.4"
228288
compiler: gcc
229289
language: cpp
230290
os: linux
@@ -234,8 +294,6 @@ matrix:
234294
- ARROW_TRAVIS_USE_VENDORED_BOOST=1
235295
- ARROW_TRAVIS_PARQUET=1
236296
- ARROW_TRAVIS_PLASMA=1
237-
- BUILD_TORCH_EXAMPLE=no
238-
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
239297
before_script:
240298
- if [ $ARROW_CI_RUBY_AFFECTED != "1" ]; then exit; fi
241299
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
@@ -286,7 +344,7 @@ matrix:
286344
- pushd ${TRAVIS_BUILD_DIR}/rust
287345
# Run coverage for codecov.io
288346
- mkdir -p target/kcov
289-
- RUST_BACKTRACE=1 RUSTUP_TOOLCHAIN=stable cargo coverage --verbose
347+
- RUST_BACKTRACE=1 RUSTUP_TOOLCHAIN=nightly cargo coverage --verbose
290348
- bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
291349
- name: Go
292350
language: go
@@ -305,6 +363,9 @@ matrix:
305363
language: r
306364
cache: packages
307365
latex: false
366+
dist: trusty
367+
env:
368+
- ARROW_TRAVIS_PARQUET=1
308369
before_install:
309370
# Have to copy-paste this here because of how R's build steps work
310371
- eval `python $TRAVIS_BUILD_DIR/ci/detect-changes.py`
@@ -317,7 +378,6 @@ matrix:
317378
fi
318379
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
319380
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh --only-library
320-
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
321381
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TRAVIS_BUILD_DIR/cpp-install/lib
322382
- export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TRAVIS_BUILD_DIR/cpp-install/lib/pkgconfig
323383
- pushd ${TRAVIS_BUILD_DIR}/r

0 commit comments

Comments
 (0)