Merge pull request #6 from apache/master

Arrow Master Through 2/5

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "cpp/submodules/parquet-testing"]
 	path = cpp/submodules/parquet-testing
 	url = https://github.com/apache/parquet-testing.git
+[submodule "testing"]
+	path = testing
+	url = https://github.com/apache/arrow-testing

ci/cpp-msvc-build-main.bat

@@ -57,6 +57,7 @@ cmake -G "%GENERATOR%" %CMAKE_ARGS% ^
       -DCMAKE_CXX_FLAGS_RELEASE="/MD %CMAKE_CXX_FLAGS_RELEASE%" ^
       -DARROW_GANDIVA=%ARROW_BUILD_GANDIVA% ^
       -DARROW_PARQUET=ON ^
+      -DPARQUET_BUILD_EXECUTABLES=ON ^
       -DARROW_PYTHON=ON ^
       ..  || exit /B
 cmake --build . --target install --config %CONFIGURATION%  || exit /B

ci/travis_env_common.sh

@@ -21,6 +21,7 @@
 export NODE_NO_WARNINGS=1
 export MINICONDA=$HOME/miniconda
 export CONDA_PKGS_DIRS=$HOME/.conda_packages
+export CONDA_BINUTILS_VERSION=2.31
 
 export ARROW_CPP_DIR=$TRAVIS_BUILD_DIR/cpp
 export ARROW_PYTHON_DIR=$TRAVIS_BUILD_DIR/python

ci/travis_install_toolchain.sh

@@ -34,7 +34,7 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
             CONDA_LABEL=" -c conda-forge/label/cf201901"
         else
             # Use newer binutils when linking against conda-provided libraries
-            CONDA_PACKAGES="$CONDA_PACKAGES binutils"
+            CONDA_PACKAGES="$CONDA_PACKAGES binutils=$CONDA_BINUTILS_VERSION"
         fi
     fi
 

cpp/CMakeLists.txt

@@ -58,6 +58,8 @@ include(FindPkgConfig)
 
 include(GNUInstallDirs)
 
+cmake_policy(SET CMP0025 NEW)
+
 # Compatibility with CMake 3.1
 if(POLICY CMP0054)
   # http://www.cmake.org/cmake/help/v3.1/policy/CMP0054.html

cpp/cmake_modules/Findc-ares.cmake

@@ -0,0 +1,108 @@
+#
+# 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.
+#
+# Tries to find c-ares headers and libraries.
+#
+# Usage of this module as follows:
+#
+#  find_package(c-ares)
+#
+# Variables used by this module, they can change the default behaviour and need
+# to be set before calling find_package:
+#
+#  CARES_HOME - When set, this path is inspected instead of standard library
+#               locations as the root of the c-ares installation.
+#               The environment variable CARES_HOME overrides this variable.
+#
+# - Find CARES
+# This module defines
+#  CARES_INCLUDE_DIR, directory containing headers
+#  CARES_SHARED_LIB, path to c-ares's shared library
+#  CARES_FOUND, whether c-ares has been found
+
+if( NOT "${CARES_HOME}" STREQUAL "")
+    file( TO_CMAKE_PATH "${CARES_HOME}" _native_path )
+    list( APPEND _cares_roots ${_native_path} )
+elseif ( CARES_HOME )
+    list( APPEND _cares_roots ${CARES_HOME} )
+endif()
+
+if (MSVC)
+  set(CARES_LIB_NAME cares.lib)
+else ()
+  set(CARES_LIB_NAME
+    ${CMAKE_SHARED_LIBRARY_PREFIX}cares${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(CARES_STATIC_LIB_NAME
+    ${CMAKE_STATIC_LIBRARY_PREFIX}cares${CMAKE_STATIC_LIBRARY_SUFFIX})
+endif ()
+
+# Try the parameterized roots, if they exist
+if (_cares_roots)
+  find_path(CARES_INCLUDE_DIR NAMES ares.h
+    PATHS ${_cares_roots} NO_DEFAULT_PATH
+    PATH_SUFFIXES "include")
+  find_library(CARES_SHARED_LIB
+    NAMES ${CARES_LIB_NAME}
+    PATHS ${_cares_roots} NO_DEFAULT_PATH
+    PATH_SUFFIXES "lib")
+  find_library(CARES_STATIC_LIB
+    NAMES ${CARES_STATIC_LIB_NAME}
+    PATHS ${_cares_roots} NO_DEFAULT_PATH
+    PATH_SUFFIXES "lib")
+else ()
+  pkg_check_modules(PKG_CARES cares)
+  if (PKG_CARES_FOUND)
+    set(CARES_INCLUDE_DIR ${PKG_CARES_INCLUDEDIR})
+    find_library(CARES_SHARED_LIB
+      NAMES ${CARES_LIB_NAME}
+      PATHS ${PKG_CARES_LIBDIR} NO_DEFAULT_PATH)
+  else ()
+    find_path(CARES_INCLUDE_DIR NAMES cares.h)
+    find_library(CARES_SHARED_LIB NAMES ${CARES_LIB_NAME})
+  endif ()
+endif ()
+
+if (CARES_INCLUDE_DIR AND CARES_SHARED_LIB)
+  set(CARES_FOUND TRUE)
+else ()
+  set(CARES_FOUND FALSE)
+endif ()
+
+if (CARES_FOUND)
+  if (NOT CARES_FIND_QUIETLY)
+    if (CARES_SHARED_LIB)
+      message(STATUS "Found the c-ares shared library: ${CARES_SHARED_LIB}")
+    endif ()
+  endif ()
+else ()
+  if (NOT CARES_FIND_QUIETLY)
+    set(CARES_ERR_MSG "Could not find the c-ares library. Looked in ")
+    if ( _cares_roots )
+      set(CARES_ERR_MSG "${CARES_ERR_MSG} ${_cares_roots}.")
+    else ()
+      set(CARES_ERR_MSG "${CARES_ERR_MSG} system search paths.")
+    endif ()
+    if (CARES_FIND_REQUIRED)
+      message(FATAL_ERROR "${CARES_ERR_MSG}")
+    else (CARES_FIND_REQUIRED)
+      message(STATUS "${CARES_ERR_MSG}")
+    endif (CARES_FIND_REQUIRED)
+  endif ()
+endif ()
+
+mark_as_advanced(
+  CARES_INCLUDE_DIR
+  CARES_LIBRARIES
+  CARES_SHARED_LIB
+  CARES_STATIC_LIB
+)

cpp/cmake_modules/SetupCxxFlags.cmake

@@ -111,6 +111,8 @@ if (NOT BUILD_WARNING_LEVEL)
 endif(NOT BUILD_WARNING_LEVEL)
 string(TOUPPER ${BUILD_WARNING_LEVEL} BUILD_WARNING_LEVEL)
 
+message(STATUS "Arrow build warning level: ${BUILD_WARNING_LEVEL}")
+
 if ("${BUILD_WARNING_LEVEL}" STREQUAL "CHECKIN")
   # Pre-checkin builds
   if ("${COMPILER_FAMILY}" STREQUAL "msvc")