Add ARROW_S3=ON, Add symlink copy in CMakeList.

oap-project · Apr 19, 2021 · 6fe3437 · 6fe3437
1 parent 47c7551
commit 6fe3437
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -54,7 +54,7 @@ jobs:
           cd native-sql-engine/cpp/
           mkdir -p build
           cd build
-          cmake .. -DTESTS=1
+          cmake .. -DBUILD_ARROW=0 -DTESTS=1
           make
           cd src
           ctest -R

diff --git a/arrow-data-source/script/build_arrow.sh b/arrow-data-source/script/build_arrow.sh
@@ -67,6 +67,7 @@ pushd $ARROW_SOURCE_DIR
 
 cmake ./cpp \
 	-DARROW_BUILD_STATIC=OFF -DARROW_BUILD_SHARED=ON -DARROW_COMPUTE=ON \
+        -DARROW_S3=ON \
         -DARROW_GANDIVA_JAVA=ON \
         -DARROW_GANDIVA=ON \
         -DARROW_PARQUET=ON \

diff --git a/native-sql-engine/cpp/src/CMakeLists.txt b/native-sql-engine/cpp/src/CMakeLists.txt
@@ -137,6 +137,7 @@ macro(build_arrow STATIC_ARROW)
                       -DARROW_BUILD_STATIC=OFF
                       -DARROW_BUILD_SHARED=ON
                       -DARROW_COMPUTE=ON
+                      -DARROW_S3=ON
                       -DARROW_GANDIVA_JAVA=ON
                       -DARROW_GANDIVA=ON
                       -DARROW_PARQUET=ON
@@ -208,21 +209,49 @@ macro(build_arrow STATIC_ARROW)
 
     # Copy Arrow Shared Library to releases directory for package jar
     ExternalProject_Add_Step(arrow_ep copy_arrow_binary
-                      COMMAND cp ${ARROW_PREFIX}/lib/libarrow.so.300 ${root_directory}/releases/
+                      COMMAND cp -a ${ARROW_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${ARROW_LIB_NAME}${ARROW_SHARED_LIBRARY_SUFFIX} ${root_directory}/releases/
+                      COMMENT "Copy libarrow.so to releases/"
+                      DEPENDEES mkdir download update patch configure build install java_install
+                      WORKING_DIRECTORY "${ARROW_PREFIX}/"
+    )
+
+    ExternalProject_Add_Step(arrow_ep copy_arrow_binary_300
+                      COMMAND cp -a ${ARROW_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${ARROW_LIB_NAME}${ARROW_SHARED_LIBRARY_SUFFIX}.300 ${root_directory}/releases/
                       COMMENT "Copy libarrow.so.300 to releases/"
                       DEPENDEES mkdir download update patch configure build install java_install
                       WORKING_DIRECTORY "${ARROW_PREFIX}/"
     )
 
+    ExternalProject_Add_Step(arrow_ep copy_arrow_binary_300_0_0
+                      COMMAND cp -a ${ARROW_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${ARROW_LIB_NAME}${ARROW_SHARED_LIBRARY_SUFFIX}.300.0.0 ${root_directory}/releases/
+                      COMMENT "Copy libarrow.so.300.0.0 to releases/"
+                      DEPENDEES mkdir download update patch configure build install java_install
+                      WORKING_DIRECTORY "${ARROW_PREFIX}/"
+    )
+
 
     # Copy Gandiva Shared Library to releases directory for package jar
     ExternalProject_Add_Step(arrow_ep copy_gandiva_binary
-                      COMMAND cp ${ARROW_PREFIX}/lib/libgandiva.so.300 ${root_directory}/releases/
+                      COMMAND cp -a ${ARROW_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${GANDIVA_LIB_NAME}${ARROW_SHARED_LIBRARY_SUFFIX} ${root_directory}/releases/
+                      COMMENT "Copy libgandiva.so to releases/"
+                      DEPENDEES mkdir download update patch configure build install java_install
+                      WORKING_DIRECTORY "${ARROW_PREFIX}/"
+    )
+
+    ExternalProject_Add_Step(arrow_ep copy_gandiva_binary_300
+                      COMMAND cp -a ${ARROW_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${GANDIVA_LIB_NAME}${ARROW_SHARED_LIBRARY_SUFFIX}.300 ${root_directory}/releases/
                       COMMENT "Copy libgandiva.so.300 to releases/"
                       DEPENDEES mkdir download update patch configure build install java_install
                       WORKING_DIRECTORY "${ARROW_PREFIX}/"
     )
 
+    ExternalProject_Add_Step(arrow_ep copy_gandiva_binary_300_0_0
+                      COMMAND cp -a ${ARROW_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${GANDIVA_LIB_NAME}${ARROW_SHARED_LIBRARY_SUFFIX}.300.0.0 ${root_directory}/releases/
+                      COMMENT "Copy libgandiva.so.300.0.0 to releases/"
+                      DEPENDEES mkdir download update patch configure build install java_install
+                      WORKING_DIRECTORY "${ARROW_PREFIX}/"
+    )
+
 
     # Copy Arrow Headers to releases/include
     ExternalProject_Add_Step(arrow_ep copy_arrow_header