revert hard code

Author: luoyuxia

adapter/orc/CMakeLists.txt

@@ -16,7 +16,6 @@
 # under the License.
 
 find_package(Arrow REQUIRED)
-find_package(Protobuf REQUIRED)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
                     ${JNI_INCLUDE_DIRS} ${JNI_HEADERS_DIR})
@@ -36,8 +35,7 @@ add_jar(arrow_java_jni_orc_jar
 add_library(arrow_java_jni_orc SHARED src/main/cpp/jni_wrapper.cpp)
 set_property(TARGET arrow_java_jni_orc PROPERTY OUTPUT_NAME "arrow_orc_jni")
 target_link_libraries(arrow_java_jni_orc arrow_java_jni_orc_headers jni
-                      Arrow::arrow_static
-                      ${Protobuf_LIBRARIES})
+                      Arrow::arrow_static)
 
 set(ARROW_JAVA_JNI_ORC_LIBDIR
     "${CMAKE_INSTALL_PREFIX}/lib/arrow_orc_jni/${ARROW_JAVA_JNI_ARCH_DIR}")

dataset/CMakeLists.txt

@@ -17,7 +17,6 @@
 
 find_package(ArrowDataset REQUIRED)
 find_package(ArrowSubstrait REQUIRED)
-find_package(Protobuf REQUIRED)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
                     ${JNI_INCLUDE_DIRS} ${JNI_HEADERS_DIR})
@@ -40,8 +39,7 @@ target_link_libraries(arrow_java_jni_dataset
                       arrow_java_jni_dataset_headers
                       jni
                       ArrowDataset::arrow_dataset_static
-                      ArrowSubstrait::arrow_substrait_static
-                      ${Protobuf_LIBRARIES})
+                      ArrowSubstrait::arrow_substrait_static)
 
 if(BUILD_TESTING)
   add_executable(arrow-java-jni-dataset-test src/main/cpp/jni_util_test.cc

dataset/src/main/cpp/jni_wrapper.cc

@@ -30,12 +30,6 @@
 #ifdef ARROW_CSV
 #include "arrow/dataset/file_csv.h"
 #endif
-#ifdef ARROW_ORC
-#include "arrow/dataset/file_orc.h"
-#endif
-#ifdef ARROW_JSON
-#include "arrow/dataset/file_json.h"
-#endif
 #include "arrow/filesystem/api.h"
 #include "arrow/filesystem/path_util.h"
 #include "arrow/engine/substrait/util.h"
@@ -147,25 +141,20 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
     jint file_format_id) {
   switch (file_format_id) {
     case 0:
-      return std::static_pointer_cast<arrow::dataset::FileFormat>(
-          std::make_shared<arrow::dataset::ParquetFileFormat>());
+      return std::make_shared<arrow::dataset::ParquetFileFormat>();
     case 1:
-      return std::static_pointer_cast<arrow::dataset::FileFormat>(
-          std::make_shared<arrow::dataset::IpcFileFormat>());
+      return std::make_shared<arrow::dataset::IpcFileFormat>();
 #ifdef ARROW_ORC
     case 2:
-      return std::static_pointer_cast<arrow::dataset::FileFormat>(
-          std::make_shared<arrow::dataset::OrcFileFormat>());
+      return std::make_shared<arrow::dataset::OrcFileFormat>();
 #endif
 #ifdef ARROW_CSV
     case 3:
-      return std::static_pointer_cast<arrow::dataset::FileFormat>(
-          std::make_shared<arrow::dataset::CsvFileFormat>());
+      return std::make_shared<arrow::dataset::CsvFileFormat>();
 #endif
 #ifdef ARROW_JSON
     case 4:
-      return std::static_pointer_cast<arrow::dataset::FileFormat>(
-          std::make_shared<arrow::dataset::JsonFileFormat>());
+      return std::make_shared<arrow::dataset::JsonFileFormat>();
 #endif
     default:
       std::string error_message =

dataset/src/main/java/org/apache/arrow/dataset/jni/JniLoader.java

@@ -77,13 +77,18 @@ private synchronized void loadRemaining() {
   }
 
   private void load(String name) {
-    final String libraryToLoad = "/Users/yuxia/Projects/cpp-projects/arrow/java-dist/lib/" +
-        name + "/" + getNormalizedArch() + "/" + System.mapLibraryName(name);
+    final String libraryToLoad =
+            name
+            + "/"
+            + getNormalizedArch()
+            + "/"
+            + System.mapLibraryName(name);
     try {
       File temp =
           File.createTempFile("jnilib-", ".tmp", new File(System.getProperty("java.io.tmpdir")));
       temp.deleteOnExit();
-      try (final InputStream is = Files.newInputStream(Path.of(libraryToLoad))) {
+      try (final InputStream is =
+                   JniWrapper.class.getClassLoader().getResourceAsStream(libraryToLoad)) {
         if (is == null) {
           throw new FileNotFoundException(libraryToLoad);
         }

pom.xml

@@ -76,8 +76,6 @@ under the License.
     <module>algorithm</module>
     <module>adapter/avro</module>
     <module>compression</module>
-    <module>adapter/orc</module>
-    <module>dataset</module>
   </modules>
 
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">