[arrow] branch master updated: ARROW-16930: [Java] Move CPP ORC JNI code to Java ORC project (#13458)

[lidavidm]

This is an automated email from the ASF dual-hosted git repository.

lidavidm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 3d6240c1ee ARROW-16930: [Java] Move CPP ORC JNI code to Java ORC 
project (#13458)
3d6240c1ee is described below

commit 3d6240c1ee7802829d2ed209f4135906e9413915
Author: david dali susanibar arce <davi.sar...@gmail.com>
AuthorDate: Tue Jul 5 08:29:59 2022 -0500

    ARROW-16930: [Java] Move CPP ORC JNI code to Java ORC project (#13458)
    
    Authored-by: david dali susanibar arce <davi.sar...@gmail.com>
    Signed-off-by: David Li <li.david...@gmail.com>
---
 cpp/CMakeLists.txt                                 |  6 ++++--
 cpp/src/jni/CMakeLists.txt                         | 23 ----------------------
 .../adapter/orc/src/main/cpp}/CMakeLists.txt       |  2 +-
 .../adapter/orc/src/main/cpp}/concurrent_map.h     |  0
 .../adapter/orc/src/main/cpp}/jni_wrapper.cpp      |  0
 5 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 08f6fe35bc..479c48bbb0 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -987,9 +987,11 @@ if(ARROW_PARQUET)
 endif()
 
 if(ARROW_JNI)
-  add_subdirectory(src/jni)
+  if(ARROW_ORC)
+    add_subdirectory(../java/adapter/orc/src/main/cpp ./java/orc/jni)
+  endif()
   if(ARROW_DATASET)
-    add_subdirectory(../java/dataset/src/main/cpp ./java/jni)
+    add_subdirectory(../java/dataset/src/main/cpp ./java/dataset/jni)
   endif()
 endif()
 
diff --git a/cpp/src/jni/CMakeLists.txt b/cpp/src/jni/CMakeLists.txt
deleted file mode 100644
index 835f58cd8f..0000000000
--- a/cpp/src/jni/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# arrow_jni
-#
-if(ARROW_ORC)
-  add_subdirectory(orc)
-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 eceda52949..96d5748729 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