Skip to content

Commit 3d6240c

Browse files
davisusanibardavisusanibar
authored
ARROW-16930: [Java] Move CPP ORC JNI code to Java ORC project (apache#13458)
Authored-by: david dali susanibar arce <davi.sarces@gmail.com> Signed-off-by: David Li <li.davidm96@gmail.com>
1 parent cd3c6ea commit 3d6240c

5 files changed

Lines changed: 5 additions & 26 deletions

File tree

‎cpp/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -987,9 +987,11 @@ if(ARROW_PARQUET)
987987
endif()
988988
989989
if(ARROW_JNI)
990-
add_subdirectory(src/jni)
990+
if(ARROW_ORC)
991+
add_subdirectory(../java/adapter/orc/src/main/cpp ./java/orc/jni)
992+
endif()
991993
if(ARROW_DATASET)
992-
add_subdirectory(../java/dataset/src/main/cpp ./java/jni)
994+
add_subdirectory(../java/dataset/src/main/cpp ./java/dataset/jni)
993995
endif()
994996
endif()
995997

‎cpp/src/jni/CMakeLists.txt‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

cpp/src/jni/orc/CMakeLists.txt renamed to java/adapter/orc/src/main/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ add_custom_target(arrow_orc_jni)
2929

3030
set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
3131

32-
add_subdirectory(../../../../java/adapter/orc ./java)
32+
add_subdirectory(../../../../orc ./java)
3333

3434
add_arrow_lib(arrow_orc_jni
3535
BUILD_SHARED

cpp/src/jni/orc/concurrent_map.h renamed to java/adapter/orc/src/main/cpp/concurrent_map.h

File renamed without changes.

cpp/src/jni/orc/jni_wrapper.cpp renamed to java/adapter/orc/src/main/cpp/jni_wrapper.cpp

File renamed without changes.

0 commit comments

Comments
 (0)