ARROW-16941: [Java] Consolidate Dataset JNI compilation (#13481)

Moves the Dataset JNI C++ code from the arrow/cpp project to the arrow/java project, updating the CMakeLists.txt files as needed. Authored-by: Larry White <lwhite1@users.noreply.github.com> Signed-off-by: David Li <li.davidm96@gmail.com>
apache · Jul 1, 2022 · 9dac8ab · 9dac8ab
1 parent 38918ef
commit 9dac8ab
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -980,6 +980,9 @@ endif()
 
 if(ARROW_JNI)
   add_subdirectory(src/jni)
+  if(ARROW_DATASET)
+    add_subdirectory(../java/dataset/src/main/cpp ./java/jni)
+  endif()
 endif()
 
 if(ARROW_GANDIVA)

diff --git a/cpp/src/jni/CMakeLists.txt b/cpp/src/jni/CMakeLists.txt
@@ -21,7 +21,3 @@
 if(ARROW_ORC)
   add_subdirectory(orc)
 endif()
-
-if(ARROW_DATASET)
-  add_subdirectory(dataset)
-endif()
diff --git a/cpp/src/jni/dataset/CMakeLists.txt → java/dataset/src/main/cpp/CMakeLists.txt b/cpp/src/jni/dataset/CMakeLists.txt → java/dataset/src/main/cpp/CMakeLists.txt
@@ -29,7 +29,7 @@ add_custom_target(arrow_dataset_jni)
 
 set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
 
-add_subdirectory(../../../../java/dataset ./java)
+add_subdirectory(../../../../dataset ./java)
 
 set(ARROW_BUILD_STATIC OFF)
 

diff --git a/cpp/src/jni/dataset/jni_util.cc → java/dataset/src/main/cpp/jni_util.cc b/cpp/src/jni/dataset/jni_util.cc → java/dataset/src/main/cpp/jni_util.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "jni/dataset/jni_util.h"
+#include "./jni_util.h"
 
 #include <memory>
 #include <mutex>

diff --git a/cpp/src/jni/dataset/jni_util.h → java/dataset/src/main/cpp/jni_util.h b/cpp/src/jni/dataset/jni_util.h → java/dataset/src/main/cpp/jni_util.h
diff --git a/cpp/src/jni/dataset/jni_util_test.cc → java/dataset/src/main/cpp/jni_util_test.cc b/cpp/src/jni/dataset/jni_util_test.cc → java/dataset/src/main/cpp/jni_util_test.cc
diff --git a/cpp/src/jni/dataset/jni_wrapper.cc → java/dataset/src/main/cpp/jni_wrapper.cc b/cpp/src/jni/dataset/jni_wrapper.cc → java/dataset/src/main/cpp/jni_wrapper.cc
@@ -24,7 +24,7 @@
 #include "arrow/filesystem/localfs.h"
 #include "arrow/ipc/api.h"
 #include "arrow/util/iterator.h"
-#include "jni/dataset/jni_util.h"
+#include "./jni_util.h"
 #include "org_apache_arrow_dataset_file_JniWrapper.h"
 #include "org_apache_arrow_dataset_jni_JniWrapper.h"
 #include "org_apache_arrow_dataset_jni_NativeMemoryPool.h"