From 558ed6052b478a37590eac6c13501d3710bc1fe0 Mon Sep 17 00:00:00 2001 From: Larry White Date: Wed, 29 Jun 2022 14:10:33 -0400 Subject: [PATCH 1/7] moved files (initial) --- cpp/src/jni/CMakeLists.txt | 4 ---- java/dataset/CMakeLists.txt | 4 ++++ .../jni/dataset => java/dataset/src/main/cpp}/CMakeLists.txt | 2 +- .../src/jni/dataset => java/dataset/src/main/cpp}/jni_util.cc | 0 {cpp/src/jni/dataset => java/dataset/src/main/cpp}/jni_util.h | 0 .../dataset => java/dataset/src/main/cpp}/jni_util_test.cc | 0 .../jni/dataset => java/dataset/src/main/cpp}/jni_wrapper.cc | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename {cpp/src/jni/dataset => java/dataset/src/main/cpp}/CMakeLists.txt (97%) rename {cpp/src/jni/dataset => java/dataset/src/main/cpp}/jni_util.cc (100%) rename {cpp/src/jni/dataset => java/dataset/src/main/cpp}/jni_util.h (100%) rename {cpp/src/jni/dataset => java/dataset/src/main/cpp}/jni_util_test.cc (100%) rename {cpp/src/jni/dataset => java/dataset/src/main/cpp}/jni_wrapper.cc (100%) diff --git a/cpp/src/jni/CMakeLists.txt b/cpp/src/jni/CMakeLists.txt index 3a5cc7fca80..835f58cd8f0 100644 --- 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/java/dataset/CMakeLists.txt b/java/dataset/CMakeLists.txt index 5b6e4a9ce24..17ac5e6c31a 100644 --- a/java/dataset/CMakeLists.txt +++ b/java/dataset/CMakeLists.txt @@ -19,6 +19,10 @@ # arrow_dataset_java # +if(ARROW_DATASET) + add_subdirectory(src/main/cpp) +endif() + # Headers: top level project(arrow_dataset_java) diff --git a/cpp/src/jni/dataset/CMakeLists.txt b/java/dataset/src/main/cpp/CMakeLists.txt similarity index 97% rename from cpp/src/jni/dataset/CMakeLists.txt rename to java/dataset/src/main/cpp/CMakeLists.txt index f3e309b614a..ae7c1222853 100644 --- a/cpp/src/jni/dataset/CMakeLists.txt +++ b/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(../../../../../java/dataset ./java) set(ARROW_BUILD_STATIC OFF) diff --git a/cpp/src/jni/dataset/jni_util.cc b/java/dataset/src/main/cpp/jni_util.cc similarity index 100% rename from cpp/src/jni/dataset/jni_util.cc rename to java/dataset/src/main/cpp/jni_util.cc diff --git a/cpp/src/jni/dataset/jni_util.h b/java/dataset/src/main/cpp/jni_util.h similarity index 100% rename from cpp/src/jni/dataset/jni_util.h rename to java/dataset/src/main/cpp/jni_util.h diff --git a/cpp/src/jni/dataset/jni_util_test.cc b/java/dataset/src/main/cpp/jni_util_test.cc similarity index 100% rename from cpp/src/jni/dataset/jni_util_test.cc rename to java/dataset/src/main/cpp/jni_util_test.cc diff --git a/cpp/src/jni/dataset/jni_wrapper.cc b/java/dataset/src/main/cpp/jni_wrapper.cc similarity index 100% rename from cpp/src/jni/dataset/jni_wrapper.cc rename to java/dataset/src/main/cpp/jni_wrapper.cc From 7fbacd8f0bee066d0f7ed6d320efb4a4d47b26f4 Mon Sep 17 00:00:00 2001 From: Larry White Date: Thu, 30 Jun 2022 16:23:21 -0400 Subject: [PATCH 2/7] fixed issue in CMakeLists and modified obsolete header references in .cc files --- cpp/CMakeLists.txt | 1 + java/dataset/CMakeLists.txt | 4 ---- java/dataset/src/main/cpp/CMakeLists.txt | 2 +- java/dataset/src/main/cpp/jni_util.cc | 2 +- java/dataset/src/main/cpp/jni_wrapper.cc | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index f1b41cfacfb..7261c1bfda3 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -980,6 +980,7 @@ endif() if(ARROW_JNI) add_subdirectory(src/jni) + add_subdirectory(../java/dataset/src/main/cpp ./java/jni) endif() if(ARROW_GANDIVA) diff --git a/java/dataset/CMakeLists.txt b/java/dataset/CMakeLists.txt index 17ac5e6c31a..5b6e4a9ce24 100644 --- a/java/dataset/CMakeLists.txt +++ b/java/dataset/CMakeLists.txt @@ -19,10 +19,6 @@ # arrow_dataset_java # -if(ARROW_DATASET) - add_subdirectory(src/main/cpp) -endif() - # Headers: top level project(arrow_dataset_java) diff --git a/java/dataset/src/main/cpp/CMakeLists.txt b/java/dataset/src/main/cpp/CMakeLists.txt index ae7c1222853..6a0be9b7f58 100644 --- a/java/dataset/src/main/cpp/CMakeLists.txt +++ b/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/java/dataset/src/main/cpp/jni_util.cc b/java/dataset/src/main/cpp/jni_util.cc index 8979c327109..e54dcba32bd 100644 --- a/java/dataset/src/main/cpp/jni_util.cc +++ b/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 #include diff --git a/java/dataset/src/main/cpp/jni_wrapper.cc b/java/dataset/src/main/cpp/jni_wrapper.cc index 1e5c7a8aa72..9312825e28d 100644 --- a/java/dataset/src/main/cpp/jni_wrapper.cc +++ b/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" From bc39a0bc18d148850745c977ffd5e4ed44f12674 Mon Sep 17 00:00:00 2001 From: Larry White Date: Fri, 1 Jul 2022 09:57:30 -0400 Subject: [PATCH 3/7] Add if(ARROW_DATASET) condition to CMakeLists --- cpp/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 7261c1bfda3..d79c2a8cf71 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -980,9 +980,13 @@ endif() if(ARROW_JNI) add_subdirectory(src/jni) +endif() + +if(ARROW_DATASET) add_subdirectory(../java/dataset/src/main/cpp ./java/jni) endif() + if(ARROW_GANDIVA) add_subdirectory(src/gandiva) endif() From 48728539b2f16fba40116a38c7a354f3ee7cb9f6 Mon Sep 17 00:00:00 2001 From: Larry White Date: Fri, 1 Jul 2022 10:06:17 -0400 Subject: [PATCH 4/7] fixing nesting on if --- cpp/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index d79c2a8cf71..2f6e8d88e1a 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -980,10 +980,9 @@ endif() if(ARROW_JNI) add_subdirectory(src/jni) -endif() - -if(ARROW_DATASET) - add_subdirectory(../java/dataset/src/main/cpp ./java/jni) + if(ARROW_DATASET) + add_subdirectory(../java/dataset/src/main/cpp ./java/jni) + endif() endif() From e034ee0f12be06b88d9eb2423a2306ba377f913d Mon Sep 17 00:00:00 2001 From: Larry White Date: Fri, 1 Jul 2022 10:47:18 -0400 Subject: [PATCH 5/7] remove extra blank line --- cpp/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 2f6e8d88e1a..af790829eec 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -985,7 +985,6 @@ if(ARROW_JNI) endif() endif() - if(ARROW_GANDIVA) add_subdirectory(src/gandiva) endif() From 9c62fe9eb6254a9d1b06f9b36008aef1c6bd8c56 Mon Sep 17 00:00:00 2001 From: Larry White Date: Fri, 1 Jul 2022 11:04:01 -0400 Subject: [PATCH 6/7] fix whitespace --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index af790829eec..0af0de2a4ff 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -982,7 +982,7 @@ if(ARROW_JNI) add_subdirectory(src/jni) if(ARROW_DATASET) add_subdirectory(../java/dataset/src/main/cpp ./java/jni) - endif() + endif() endif() if(ARROW_GANDIVA) From f5226ecd97c77418463e900d22f76fe6c61e8722 Mon Sep 17 00:00:00 2001 From: Larry White Date: Fri, 1 Jul 2022 12:34:47 -0400 Subject: [PATCH 7/7] remove tab and replace with spaces --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 0af0de2a4ff..fc8f74db536 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -981,7 +981,7 @@ endif() if(ARROW_JNI) add_subdirectory(src/jni) if(ARROW_DATASET) - add_subdirectory(../java/dataset/src/main/cpp ./java/jni) + add_subdirectory(../java/dataset/src/main/cpp ./java/jni) endif() endif()