parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-967: Combine libparquet, libparquet_arrow libraries
Date Wed, 31 May 2017 17:43:01 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master fc5228af3 -> 48ded9c02


PARQUET-967: Combine libparquet, libparquet_arrow libraries

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #344 from wesm/PARQUET-967 and squashes the following commits:

e059c6e [Wes McKinney] Remove PARQUET_ARROW CMake flag
eb24ce7 [Wes McKinney] Combine libparquet, libparquet_arrow


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/48ded9c0
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/48ded9c0
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/48ded9c0

Branch: refs/heads/master
Commit: 48ded9c02e58916f650132aa7abf882c882a098a
Parents: fc5228a
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Wed May 31 13:42:54 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Wed May 31 13:42:54 2017 -0400

----------------------------------------------------------------------
 CMakeLists.txt                        | 13 ++++----
 ci/before_script_travis.sh            |  2 --
 ci/travis_script_toolchain.sh         |  1 -
 dev/release/verify-release-candidate  |  2 +-
 src/parquet/arrow/CMakeLists.txt      | 48 ------------------------------
 src/parquet/arrow/parquet-arrow.pc.in | 30 -------------------
 6 files changed, 6 insertions(+), 90 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/48ded9c0/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c0156c..b329ace 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,9 +110,6 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
   option(PARQUET_BUILD_EXECUTABLES
     "Build the libparquet executable CLI tools"
     ON)
-  option(PARQUET_ARROW
-    "Build the Arrow support"
-    ON)
   option(PARQUET_ZLIB_VENDORED
     "Build our own zlib (some libz.a aren't configured for static linking)"
     ON)
@@ -609,6 +606,10 @@ set(LIBPARQUET_SRCS
   src/parquet/exception.cc
   src/parquet/types.cc
 
+  src/parquet/arrow/reader.cc
+  src/parquet/arrow/schema.cc
+  src/parquet/arrow/writer.cc
+
   src/parquet/column/levels.cc
   src/parquet/column/reader.cc
   src/parquet/column/writer.cc
@@ -686,6 +687,7 @@ ADD_LIB(parquet
 
 add_subdirectory(src/parquet)
 add_subdirectory(src/parquet/api)
+add_subdirectory(src/parquet/arrow)
 add_subdirectory(src/parquet/column)
 add_subdirectory(src/parquet/file)
 add_subdirectory(src/parquet/util)
@@ -696,11 +698,6 @@ endif()
 add_subdirectory(examples)
 add_subdirectory(tools)
 
-# Arrow adapter
-if (PARQUET_ARROW)
-  add_subdirectory(src/parquet/arrow)
-endif()
-
 add_custom_target(clean-all
    COMMAND ${CMAKE_BUILD_TOOL} clean
    COMMAND ${CMAKE_COMMAND} -P cmake_modules/clean-all.cmake

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/48ded9c0/ci/before_script_travis.sh
----------------------------------------------------------------------
diff --git a/ci/before_script_travis.sh b/ci/before_script_travis.sh
index 6742144..2ddf2ec 100755
--- a/ci/before_script_travis.sh
+++ b/ci/before_script_travis.sh
@@ -30,13 +30,11 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
     cmake -DPARQUET_CXXFLAGS=-Werror \
           -DPARQUET_TEST_MEMCHECK=ON \
           -DPARQUET_BUILD_BENCHMARKS=ON \
-          -DPARQUET_ARROW=ON \
           -DPARQUET_ARROW_LINKAGE=static \
           -DPARQUET_GENERATE_COVERAGE=1 \
           $TRAVIS_BUILD_DIR
 else
     cmake -DPARQUET_CXXFLAGS=-Werror \
-          -DPARQUET_ARROW=ON \
           -DPARQUET_ARROW_LINKAGE=static \
           $TRAVIS_BUILD_DIR
 fi

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/48ded9c0/ci/travis_script_toolchain.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_toolchain.sh b/ci/travis_script_toolchain.sh
index db1b92b..d8b5890 100755
--- a/ci/travis_script_toolchain.sh
+++ b/ci/travis_script_toolchain.sh
@@ -54,7 +54,6 @@ export BOOST_ROOT=$CPP_TOOLCHAIN
 cmake -DPARQUET_CXXFLAGS=-Werror \
       -DPARQUET_TEST_MEMCHECK=ON \
       -DPARQUET_ZLIB_VENDORED=off \
-      -DPARQUET_ARROW=ON \
       -DPARQUET_GENERATE_COVERAGE=1 \
       $TRAVIS_BUILD_DIR
 

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/48ded9c0/dev/release/verify-release-candidate
----------------------------------------------------------------------
diff --git a/dev/release/verify-release-candidate b/dev/release/verify-release-candidate
index 94b1daa..278c1f2 100755
--- a/dev/release/verify-release-candidate
+++ b/dev/release/verify-release-candidate
@@ -50,7 +50,7 @@ run_tests() {
   # Build
   mkdir -p build
   cd build
-  cmake -DPARQUET_ARROW=ON -DPARQUET_ARROW_LINKAGE=static ..
+  cmake -DPARQUET_ARROW_LINKAGE=static ..
   make -j5
 
   # Test

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/48ded9c0/src/parquet/arrow/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/CMakeLists.txt b/src/parquet/arrow/CMakeLists.txt
index 8f2a698..616555f 100644
--- a/src/parquet/arrow/CMakeLists.txt
+++ b/src/parquet/arrow/CMakeLists.txt
@@ -15,51 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# ----------------------------------------------------------------------
-# parquet_arrow : Arrow <-> Parquet adapter
-
-set(PARQUET_ARROW_SRCS
-  reader.cc
-  schema.cc
-  writer.cc
-)
-
-# Set dependencies so ExternalProjects are built beforehand
-set(PARQUET_ARROW_DEPENDENCIES ${ARROW_LINK_LIBS} parquet_static)
-SET(PARQUET_ARROW_SHARED_LINK_LIBS ${ARROW_LINK_LIBS} parquet_shared)
-SET(PARQUET_ARROW_STATIC_LINK_LIBS ${ARROW_LINK_LIBS} parquet_static)
-
-ADD_LIB(parquet_arrow
-        SOURCES ${PARQUET_ARROW_SRCS}
-        LIB_BUILD_SHARED ${PARQUET_BUILD_SHARED}
-        LIB_BUILD_STATIC ${PARQUET_BUILD_STATIC}
-        DEPENDENCIES ${PARQUET_ARROW_DEPENDENCIES}
-        SHARED_LINK_FLAGS ${SHARED_LINK_FLAGS}
-        SHARED_LINK_LIBS ${PARQUET_ARROW_SHARED_LINK_LIBS}
-        STATIC_LINK_LIBS ${PARQUET_ARROW_STATIC_LINK_LIBS}
-        ABI_VERSION ${PARQUET_ABI_VERSION}
-        SO_VERSION ${PARQUET_SO_VERSION}
-        LIB_RPATH_ORIGIN ${PARQUET_RPATH_ORIGIN}
-)
-
 ADD_PARQUET_TEST(arrow-schema-test)
 ADD_PARQUET_TEST(arrow-reader-writer-test)
 
-if (PARQUET_BUILD_STATIC)
-  ADD_PARQUET_LINK_LIBRARIES(arrow-schema-test parquet_arrow_static)
-  ADD_PARQUET_LINK_LIBRARIES(arrow-reader-writer-test parquet_arrow_static)
-else()
-  ADD_PARQUET_LINK_LIBRARIES(arrow-schema-test parquet_arrow_shared)
-  ADD_PARQUET_LINK_LIBRARIES(arrow-reader-writer-test parquet_arrow_shared)
-endif()
-
 if(PARQUET_BUILD_BENCHMARKS)
   ADD_PARQUET_BENCHMARK(arrow-reader-writer-benchmark)
-  if (PARQUET_BUILD_STATIC)
-    ADD_PARQUET_LINK_LIBRARIES(arrow-reader-writer-benchmark parquet_arrow_static)
-  else()
-    ADD_PARQUET_LINK_LIBRARIES(arrow-reader-writer-benchmark parquet_arrow_shared)
-  endif()
 endif()
 
 # Headers: top level
@@ -68,11 +28,3 @@ install(FILES
   schema.h
   writer.h
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/parquet/arrow")
-
-# pkg-config support
-configure_file(parquet-arrow.pc.in
-  "${CMAKE_CURRENT_BINARY_DIR}/parquet-arrow.pc"
-  @ONLY)
-install(
-  FILES "${CMAKE_CURRENT_BINARY_DIR}/parquet-arrow.pc"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/48ded9c0/src/parquet/arrow/parquet-arrow.pc.in
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/parquet-arrow.pc.in b/src/parquet/arrow/parquet-arrow.pc.in
deleted file mode 100644
index 2cfdddb..0000000
--- a/src/parquet/arrow/parquet-arrow.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.
-
-prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-
-so_version=@PARQUET_SO_VERSION@
-abi_version=@PARQUET_ABI_VERSION@
-
-Name: Apache Parquet Apache Arrow adapter
-Description: Apache Parquet Apache arrow adapter provides Arrow IPC modules for reading and
writing Parquet format.
-Version: @PARQUET_VERSION@
-Libs: -L${libdir} -lparquet_arrow
-Cflags: -I${includedir}
-Requires: parquet arrow


Mime
View raw message