From f30d865dc07b7e0e047e438d3d3bc120d1326724 Mon Sep 17 00:00:00 2001 From: david dali susanibar arce Date: Tue, 28 Jun 2022 19:41:31 -0500 Subject: [PATCH 1/5] Move CPP ORC JNI code to Java ORC project --- cpp/CMakeLists.txt | 2 +- cpp/src/jni/CMakeLists.txt | 4 ---- .../jni/orc => java/adapter/orc/src/main/cpp}/CMakeLists.txt | 2 +- .../orc => java/adapter/orc/src/main/cpp}/concurrent_map.h | 0 .../jni/orc => java/adapter/orc/src/main/cpp}/jni_wrapper.cpp | 0 5 files changed, 2 insertions(+), 6 deletions(-) rename {cpp/src/jni/orc => java/adapter/orc/src/main/cpp}/CMakeLists.txt (96%) rename {cpp/src/jni/orc => java/adapter/orc/src/main/cpp}/concurrent_map.h (100%) rename {cpp/src/jni/orc => java/adapter/orc/src/main/cpp}/jni_wrapper.cpp (100%) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index f1b41cfacfb..de1691630ce 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -979,7 +979,7 @@ if(ARROW_PARQUET) endif() if(ARROW_JNI) - add_subdirectory(src/jni) + add_subdirectory(../java/adapter/orc/src/main/cpp ./java/jni) endif() if(ARROW_GANDIVA) diff --git a/cpp/src/jni/CMakeLists.txt b/cpp/src/jni/CMakeLists.txt index 3a5cc7fca80..92db76c4e2c 100644 --- a/cpp/src/jni/CMakeLists.txt +++ b/cpp/src/jni/CMakeLists.txt @@ -18,10 +18,6 @@ # # arrow_jni # -if(ARROW_ORC) - add_subdirectory(orc) -endif() - if(ARROW_DATASET) add_subdirectory(dataset) endif() diff --git a/cpp/src/jni/orc/CMakeLists.txt b/java/adapter/orc/src/main/cpp/CMakeLists.txt similarity index 96% rename from cpp/src/jni/orc/CMakeLists.txt rename to java/adapter/orc/src/main/cpp/CMakeLists.txt index eceda529494..96d5748729e 100644 --- a/cpp/src/jni/orc/CMakeLists.txt +++ b/java/adapter/orc/src/main/cpp/CMakeLists.txt @@ -29,7 +29,7 @@ add_custom_target(arrow_orc_jni) set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -add_subdirectory(../../../../java/adapter/orc ./java) +add_subdirectory(../../../../orc ./java) add_arrow_lib(arrow_orc_jni BUILD_SHARED diff --git a/cpp/src/jni/orc/concurrent_map.h b/java/adapter/orc/src/main/cpp/concurrent_map.h similarity index 100% rename from cpp/src/jni/orc/concurrent_map.h rename to java/adapter/orc/src/main/cpp/concurrent_map.h diff --git a/cpp/src/jni/orc/jni_wrapper.cpp b/java/adapter/orc/src/main/cpp/jni_wrapper.cpp similarity index 100% rename from cpp/src/jni/orc/jni_wrapper.cpp rename to java/adapter/orc/src/main/cpp/jni_wrapper.cpp From fe9215dd340344ab1703c51cff9c5643198e77af Mon Sep 17 00:00:00 2001 From: david dali susanibar arce Date: Tue, 28 Jun 2022 20:28:12 -0500 Subject: [PATCH 2/5] Adding JNI Dataset subdirectory to solve errors on Java JNI Dataset --- cpp/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index de1691630ce..75007fba54b 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -979,6 +979,7 @@ if(ARROW_PARQUET) endif() if(ARROW_JNI) + add_subdirectory(src/jni) add_subdirectory(../java/adapter/orc/src/main/cpp ./java/jni) endif() From c6ac7ad3f3fbc12011e004e34ceb82be7670fae0 Mon Sep 17 00:00:00 2001 From: david dali susanibar arce Date: Thu, 30 Jun 2022 11:46:32 -0500 Subject: [PATCH 3/5] Adding JNI ORC configurable parameter at build --- java/adapter/orc/src/main/cpp/CMakeLists.txt | 68 +++++++++++--------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/java/adapter/orc/src/main/cpp/CMakeLists.txt b/java/adapter/orc/src/main/cpp/CMakeLists.txt index 96d5748729e..db9279bbef8 100644 --- a/java/adapter/orc/src/main/cpp/CMakeLists.txt +++ b/java/adapter/orc/src/main/cpp/CMakeLists.txt @@ -19,35 +19,39 @@ # arrow_orc_jni # -project(arrow_orc_jni) - -cmake_minimum_required(VERSION 3.11) - -find_package(JNI REQUIRED) - -add_custom_target(arrow_orc_jni) - -set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") - -add_subdirectory(../../../../orc ./java) - -add_arrow_lib(arrow_orc_jni - BUILD_SHARED - ON - BUILD_STATIC - OFF - SOURCES - jni_wrapper.cpp - OUTPUTS - ARROW_ORC_JNI_LIBRARIES - SHARED_PRIVATE_LINK_LIBS - arrow_static - EXTRA_INCLUDES - ${JNI_HEADERS_DIR} - PRIVATE_INCLUDES - ${JNI_INCLUDE_DIRS} - DEPENDENCIES - arrow_static - arrow_orc_java) - -add_dependencies(arrow_orc_jni ${ARROW_ORC_JNI_LIBRARIES}) +if(ARROW_ORC) + project(arrow_orc_jni) + + cmake_minimum_required(VERSION 3.11) + + find_package(JNI REQUIRED) + + add_custom_target(arrow_orc_jni) + + set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") + + add_subdirectory(../../../../orc ./java) + + add_arrow_lib(arrow_orc_jni + BUILD_SHARED + ON + BUILD_STATIC + OFF + SOURCES + jni_wrapper.cpp + OUTPUTS + ARROW_ORC_JNI_LIBRARIES + SHARED_PRIVATE_LINK_LIBS + arrow_static + EXTRA_INCLUDES + ${JNI_HEADERS_DIR} + PRIVATE_INCLUDES + ${JNI_INCLUDE_DIRS} + DEPENDENCIES + arrow_static + arrow_orc_java) + + add_dependencies(arrow_orc_jni ${ARROW_ORC_JNI_LIBRARIES}) +endif() + + From 5378076c6d0fd3ebb500c82112a1fb1b63342fa2 Mon Sep 17 00:00:00 2001 From: david dali susanibar arce Date: Thu, 30 Jun 2022 12:09:04 -0500 Subject: [PATCH 4/5] Soving linter problems with archery lint --cmake-format --fix --- java/adapter/orc/src/main/cpp/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/adapter/orc/src/main/cpp/CMakeLists.txt b/java/adapter/orc/src/main/cpp/CMakeLists.txt index db9279bbef8..431674f4c31 100644 --- a/java/adapter/orc/src/main/cpp/CMakeLists.txt +++ b/java/adapter/orc/src/main/cpp/CMakeLists.txt @@ -53,5 +53,3 @@ if(ARROW_ORC) add_dependencies(arrow_orc_jni ${ARROW_ORC_JNI_LIBRARIES}) endif() - - From 499f0bbdabaff9f44d3ad44a1a66b26c61e1e179 Mon Sep 17 00:00:00 2001 From: david dali susanibar arce Date: Thu, 30 Jun 2022 14:53:40 -0500 Subject: [PATCH 5/5] Move ARROW_ORC parameter to main cpp/CMakeLists.txt logic --- cpp/CMakeLists.txt | 4 +- java/adapter/orc/src/main/cpp/CMakeLists.txt | 66 ++++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 75007fba54b..16bc05c3a46 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -980,7 +980,9 @@ endif() if(ARROW_JNI) add_subdirectory(src/jni) - add_subdirectory(../java/adapter/orc/src/main/cpp ./java/jni) + if(ARROW_ORC) + add_subdirectory(../java/adapter/orc/src/main/cpp ./java/jni) + endif() endif() if(ARROW_GANDIVA) diff --git a/java/adapter/orc/src/main/cpp/CMakeLists.txt b/java/adapter/orc/src/main/cpp/CMakeLists.txt index 431674f4c31..96d5748729e 100644 --- a/java/adapter/orc/src/main/cpp/CMakeLists.txt +++ b/java/adapter/orc/src/main/cpp/CMakeLists.txt @@ -19,37 +19,35 @@ # arrow_orc_jni # -if(ARROW_ORC) - project(arrow_orc_jni) - - cmake_minimum_required(VERSION 3.11) - - find_package(JNI REQUIRED) - - add_custom_target(arrow_orc_jni) - - set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") - - add_subdirectory(../../../../orc ./java) - - add_arrow_lib(arrow_orc_jni - BUILD_SHARED - ON - BUILD_STATIC - OFF - SOURCES - jni_wrapper.cpp - OUTPUTS - ARROW_ORC_JNI_LIBRARIES - SHARED_PRIVATE_LINK_LIBS - arrow_static - EXTRA_INCLUDES - ${JNI_HEADERS_DIR} - PRIVATE_INCLUDES - ${JNI_INCLUDE_DIRS} - DEPENDENCIES - arrow_static - arrow_orc_java) - - add_dependencies(arrow_orc_jni ${ARROW_ORC_JNI_LIBRARIES}) -endif() +project(arrow_orc_jni) + +cmake_minimum_required(VERSION 3.11) + +find_package(JNI REQUIRED) + +add_custom_target(arrow_orc_jni) + +set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") + +add_subdirectory(../../../../orc ./java) + +add_arrow_lib(arrow_orc_jni + BUILD_SHARED + ON + BUILD_STATIC + OFF + SOURCES + jni_wrapper.cpp + OUTPUTS + ARROW_ORC_JNI_LIBRARIES + SHARED_PRIVATE_LINK_LIBS + arrow_static + EXTRA_INCLUDES + ${JNI_HEADERS_DIR} + PRIVATE_INCLUDES + ${JNI_INCLUDE_DIRS} + DEPENDENCIES + arrow_static + arrow_orc_java) + +add_dependencies(arrow_orc_jni ${ARROW_ORC_JNI_LIBRARIES})