Merge pull request #2 from apache/master

Week Ending 12/15

.gitignore

@@ -17,6 +17,7 @@
 
 apache-rat-*.jar
 arrow-src.tar
+arrow-src.tar.gz
 
 # Compiled source
 *.a
@@ -36,10 +37,18 @@ MANIFEST
 *.sln
 *.iml
 
+# Linux perf sample data
+perf.data
+perf.data.old
+
 cpp/.idea/
 cpp/apidoc/xml/
+docs/example.gz
+docs/example1.dat
+docs/example3.dat
 python/.eggs/
 python/doc/
+
 .vscode
 .idea/
 .pytest_cache/

.travis.yml

@@ -50,8 +50,8 @@ matrix:
   - jdk: oraclejdk9
   - language: r
   include:
-  # Lint C++, Python, R
-  - os: linux
+  - name: "Lint C++, Python, R"
+    os: linux
     language: python
     python: "3.6"
     env:
@@ -62,8 +62,8 @@ matrix:
     - $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_lint.sh
-  # C++ & Python w/ gcc 4.9
-  - compiler: gcc
+  - name: "C++ & Python w/ gcc 4.9"
+    compiler: gcc
     language: cpp
     os: linux
     jdk: openjdk8
@@ -102,15 +102,22 @@ matrix:
     - export PLASMA_VALGRIND=1
     - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 3.6
     - $TRAVIS_BUILD_DIR/ci/travis_upload_cpp_coverage.sh
-  # Gandiva C++ w/ gcc 4.9 and Java
-  - compiler: gcc
+  - name: "Gandiva C++ w/ gcc 4.9 and Java"
+    compiler: gcc
     language: cpp
     os: linux
     jdk: openjdk8
     env:
     - ARROW_TRAVIS_GANDIVA=1
+    - ARROW_TRAVIS_GANDIVA_JAVA=1
+    - ARROW_TRAVIS_GANDIVA_TESTS=1
+    - ARROW_TRAVIS_OPTIONAL_INSTALL=1
+    - ARROW_CPP_BUILD_TARGETS="gandiva"
+    # TODO(wesm): Remove this after ARROW-4026
+    - ARROW_TRAVIS_CPP_TEST_INCLUDE_LABELS="gandiva"
     - ARROW_TRAVIS_USE_TOOLCHAIN=1
-    - ARROW_TRAVIS_VALGRIND=1
+    # ARROW-3979 temporarily disabled.
+    - ARROW_TRAVIS_VALGRIND=0
     - ARROW_BUILD_WARNING_LEVEL=CHECKIN
     - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
     before_script:
@@ -122,8 +129,8 @@ matrix:
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_cpp.sh
     - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh
-  # [OS X] C++ & Python w/ XCode 6.4
-  - compiler: clang
+  - name: "[OS X] C++ & Python w/ XCode 6.4"
+    compiler: clang
     language: cpp
     osx_image: xcode6.4
     os: osx
@@ -144,8 +151,8 @@ matrix:
     - if [ $ARROW_CI_CPP_AFFECTED == "1" ]; then $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh; fi
     - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 2.7
     - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 3.6
-  # [OS X] Gandiva C++ w/ XCode 8.3 & Java
-  - compiler: clang
+  - name: "[OS X] Gandiva C++ w/ XCode 8.3 & Java"
+    compiler: clang
     language: cpp
     # xcode 7.3 has a bug in strptime.
     osx_image: xcode8.3
@@ -154,6 +161,12 @@ matrix:
     addons:
     env:
     - ARROW_TRAVIS_GANDIVA=1
+    - ARROW_TRAVIS_GANDIVA_JAVA=1
+    - ARROW_TRAVIS_GANDIVA_TESTS=1
+    - ARROW_TRAVIS_OPTIONAL_INSTALL=1
+    - ARROW_CPP_BUILD_TARGETS="gandiva"
+    # TODO(wesm): Remove this after ARROW-4026
+    - ARROW_TRAVIS_CPP_TEST_INCLUDE_LABELS="gandiva"
     - ARROW_TRAVIS_USE_TOOLCHAIN=1
     - ARROW_BUILD_WARNING_LEVEL=CHECKIN
     before_script:
@@ -163,14 +176,14 @@ matrix:
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_cpp.sh
     - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh
-  # [manylinux1] Python
-  - language: cpp
+  - name: "[manylinux1] Python"
+    language: cpp
     before_script:
     - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then docker pull quay.io/xhochy/arrow_manylinux1_x86_64_base:latest; fi
     script:
     - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then $TRAVIS_BUILD_DIR/ci/travis_script_manylinux.sh; fi
-  # Java w/ OpenJDK 8
-  - language: java
+  - name: "Java w/ OpenJDK 8"
+    language: java
     os: linux
     jdk: openjdk8
     before_script:
@@ -179,8 +192,8 @@ matrix:
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
     - $TRAVIS_BUILD_DIR/ci/travis_script_javadoc.sh
-  # Java w/ Oracle JDK 9
-  - language: java
+  - name: "Java w/ Oracle JDK 9"
+    language: java
     os: linux
     jdk: oraclejdk9
     before_script:
@@ -191,8 +204,8 @@ matrix:
       apt:
         packages:
           - oracle-java9-installer
-  # Integration w/ OpenJDK 8
-  - language: java
+  - name: "Integration w/ OpenJDK 8"
+    language: java
     os: linux
     env: ARROW_TEST_GROUP=integration
     jdk: openjdk8
@@ -211,8 +224,8 @@ matrix:
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_integration.sh
     - $TRAVIS_BUILD_DIR/ci/travis_script_plasma_java_client.sh
-  # NodeJS
-  - language: node_js
+  - name: "NodeJS"
+    language: node_js
     os: linux
     node_js:
     - '10.1'
@@ -222,8 +235,8 @@ matrix:
     - $TRAVIS_BUILD_DIR/ci/travis_before_script_js.sh
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_js.sh
-  # C++ & GLib & Ruby w/ gcc 4.9
-  - compiler: gcc
+  - name: "C++ & GLib & Ruby w/ gcc 4.9"
+    compiler: gcc
     language: cpp
     os: linux
     env:
@@ -244,8 +257,8 @@ matrix:
     script:
     - if [ $ARROW_CI_C_GLIB_AFFECTED = "1" ]; then $TRAVIS_BUILD_DIR/ci/travis_script_c_glib.sh; fi
     - $TRAVIS_BUILD_DIR/ci/travis_script_ruby.sh
-  # [OS X] C++ & GLib & Ruby w/ XCode 8.3 & homebrew
-  - compiler: clang
+  - name: "[OS X] C++ & GLib & Ruby w/ XCode 8.3 & homebrew"
+    compiler: clang
     osx_image: xcode8.3
     os: osx
     env:
@@ -255,7 +268,6 @@ matrix:
     - ARROW_TRAVIS_PLASMA=1
     cache:
     addons:
-    rvm: 2.2
     before_script:
     - if [ $ARROW_CI_RUBY_AFFECTED != "1" ]; then exit; fi
     - $TRAVIS_BUILD_DIR/ci/travis_install_osx.sh
@@ -265,8 +277,8 @@ matrix:
     script:
     - if [ $ARROW_CI_C_GLIB_AFFECTED = "1" ]; then $TRAVIS_BUILD_DIR/ci/travis_script_c_glib.sh; fi
     - $TRAVIS_BUILD_DIR/ci/travis_script_ruby.sh
-  # Rust
-  - language: rust
+  - name: Rust
+    language: rust
     cache: cargo
     addons:
       apt:
@@ -288,8 +300,8 @@ matrix:
     - mkdir -p target/kcov
     - RUST_BACKTRACE=1 RUSTUP_TOOLCHAIN=stable cargo coverage --verbose
     - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
-  # Go
-  - language: go
+  - name: Go
+    language: go
     go_import_path: github.com/apache/arrow
     os: linux
     go:
@@ -301,8 +313,8 @@ matrix:
     after_success:
     - pushd ${TRAVIS_BUILD_DIR}/go/arrow
     - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
-  # R
-  - language: r
+  - name: R
+    language: r
     cache: packages
     latex: false
     before_install:

CODE_OF_CONDUCT.md

@@ -0,0 +1,24 @@
+<!---
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+# Code of Conduct
+
+* [Code of Conduct for The Apache Software Foundation][1]
+
+[1]: https://www.apache.org/foundation/policies/conduct.html