Fix conflicts.

.gitignore

@@ -27,4 +27,5 @@ MANIFEST
 
 cpp/.idea/
 python/.eggs/
-.vscode
+.vscode
+.idea/

.travis.yml

@@ -120,6 +120,27 @@ matrix:
  - $TRAVIS_BUILD_DIR/ci/travis_before_script_c_glib.sh
  script:
  - $TRAVIS_BUILD_DIR/ci/travis_script_c_glib.sh
+ - compiler: gcc
+ language: cpp
+ os: linux
+ group: deprecated
+ before_script:
+ - export CC="gcc-4.9"
+ - export CXX="g++-4.9"
+ - $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
+ script:
+ - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
+ - $TRAVIS_BUILD_DIR/ci/travis_script_plasma.sh
+ - compiler: clang
+ osx_image: xcode6.4
+ os: osx
+ cache:
+ addons:
+ before_script:
+ - $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
+ script:
+ - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
+ - $TRAVIS_BUILD_DIR/ci/travis_script_plasma.sh
 
 before_install:
 - ulimit -c unlimited -S

appveyor.yml

@@ -45,6 +45,13 @@ environment:
  PYTHON: "3.5"
  ARCH: "64"
  CONFIGURATION: "Release"
+ - JOB: "Build"
+ GENERATOR: Visual Studio 15 2017 Win64
+ PYTHON: "3.5"
+ ARCH: "64"
+ CONFIGURATION: "Release"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+ BOOST_ROOT: C:\Libraries\boost_1_64_0
 
  MSVC_DEFAULT_OPTIONS: ON
  BOOST_ROOT: C:\Libraries\boost_1_63_0

ci/travis_script_manylinux.sh

@@ -18,4 +18,4 @@ set -ex
 pushd python/manylinux1
 git clone ../../ arrow
 docker build -t arrow-base-x86_64 -f Dockerfile-x86_64 .
-docker run --rm -e PYARROW_PARALLEL=3 -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh
+docker run --shm-size=2g --rm -e PYARROW_PARALLEL=3 -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh

ci/travis_script_plasma.sh

@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+
+# Licensed 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. See accompanying LICENSE file.
+
+set -e
+
+source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
+
+export ARROW_HOME=$ARROW_CPP_INSTALL
+export PYARROW_WITH_PLASMA=1
+
+pushd $ARROW_PYTHON_DIR
+
+function build_arrow_libraries() {
+ CPP_BUILD_DIR=$1
+ CPP_DIR=$TRAVIS_BUILD_DIR/cpp
+
+ mkdir $CPP_BUILD_DIR
+ pushd $CPP_BUILD_DIR
+
+ cmake -DARROW_BUILD_TESTS=off \
+ -DARROW_PYTHON=on \
+ -DARROW_PLASMA=on \
+ -DCMAKE_INSTALL_PREFIX=$2 \
+ $CPP_DIR
+
+ make -j4
+ make install
+
+ popd
+}
+
+python_version_tests() {
+ PYTHON_VERSION=$1
+ CONDA_ENV_DIR=$TRAVIS_BUILD_DIR/pyarrow-test-$PYTHON_VERSION
+
+ export ARROW_HOME=$TRAVIS_BUILD_DIR/arrow-install-$PYTHON_VERSION
+ export LD_LIBRARY_PATH=$ARROW_HOME/lib:$PARQUET_HOME/lib
+
+ conda create -y -q -p $CONDA_ENV_DIR python=$PYTHON_VERSION cmake curl
+ source activate $CONDA_ENV_DIR
+
+ python --version
+ which python
+
+ # faster builds, please
+ conda install -y -q nomkl
+
+ # Expensive dependencies install from Continuum package repo
+ conda install -y -q pip numpy pandas cython
+
+ # Build C++ libraries
+ build_arrow_libraries arrow-build-$PYTHON_VERSION $ARROW_HOME
+
+ # Other stuff pip install
+ pip install -r requirements.txt
+
+ python setup.py build_ext --inplace
+
+ python -m pytest -vv -r sxX pyarrow
+
+ # Build documentation once
+ if [[ "$PYTHON_VERSION" == "3.6" ]]
+ then
+ conda install -y -q --file=doc/requirements.txt
+ python setup.py build_sphinx -s doc/source
+ fi
+
+ # Build and install pyarrow
+ pushd $TRAVIS_BUILD_DIR/python
+ python setup.py install
+ popd
+
+ # Run Plasma tests
+ pushd $TRAVIS_BUILD_DIR/python
+ python -m pytest pyarrow/tests/test_plasma.py
+ if [ $TRAVIS_OS_NAME == "linux" ]; then
+ PLASMA_VALGRIND=1 python -m pytest pyarrow/tests/test_plasma.py
+ fi
+ popd
+}
+
+# run tests for python 2.7 and 3.6
+python_version_tests 2.7
+python_version_tests 3.6
+
+popd

ci/travis_script_python.sh

@@ -17,6 +17,7 @@ set -e
 source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
 
 export ARROW_HOME=$ARROW_CPP_INSTALL
+export PYARROW_WITH_PLASMA=1
 
 pushd $ARROW_PYTHON_DIR
 export PARQUET_HOME=$TRAVIS_BUILD_DIR/parquet-env
@@ -71,9 +72,8 @@ function build_arrow_libraries() {
  pushd $CPP_BUILD_DIR
 
  cmake -DARROW_BUILD_TESTS=off \
- -DARROW_PYTHON=on \
- -DPLASMA_PYTHON=on \
  -DARROW_PLASMA=on \
+ -DARROW_PYTHON=on \
  -DCMAKE_INSTALL_PREFIX=$2 \
  $CPP_DIR
 

cpp/.clang-format

@@ -15,67 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 ---
-Language: Cpp
-# BasedOnStyle: Google
-AccessModifierOffset: -1
-AlignAfterOpenBracket: false
-AlignConsecutiveAssignments: false
-AlignEscapedNewlinesLeft: true
-AlignOperands: true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
-BinPackParameters: true
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-ColumnLimit: 90
-CommentPragmas: '^ IWYU pragma:'
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
+BasedOnStyle: Google
 DerivePointerAlignment: false
-DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
-ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IndentCaseLabels: true
-IndentWidth: 2
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd: ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: false
-PenaltyBreakBeforeFirstCallParameter: 1000
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 200
-PointerAlignment: Left
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 2
-SpacesInAngles: false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp11
-TabWidth: 8
-UseTab: Never
+ColumnLimit: 90

cpp/cmake_modules/SnappyConfig.h

@@ -29,7 +29,7 @@
 #ifndef SNAPPY_CONFIG_H
 #define SNAPPY_CONFIG_H 1
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1900)
+#if defined(_MSC_VER) && (_MSC_VER <= 1910)
 typedef __int64 ssize_t;
 #endif
 

cpp/src/arrow/allocator-test.cc

@@ -48,7 +48,7 @@ TEST(stl_allocator, FreeLargeMemory) {
 
 #ifndef NDEBUG
  EXPECT_EXIT(alloc.deallocate(data, 120), ::testing::ExitedWithCode(1),
- ".*Check failed: \\(bytes_allocated_\\) >= \\(size\\)");
+  ".*Check failed: \\(bytes_allocated_\\) >= \\(size\\)");
 #endif
 
  alloc.deallocate(data, 100);