[arrow] branch master updated: ARROW-17086: [C++] Install java/dataset include file and fix debug build failed by compiler flag (#13614)

[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 08a20b79b4 ARROW-17086: [C++] Install java/dataset include file and 
fix debug build failed by compiler flag (#13614)
08a20b79b4 is described below

commit 08a20b79b427edc2aa125f408a9a118c1d0580fe
Author: Jin Chengcheng <79615558+jinchengchen...@users.noreply.github.com>
AuthorDate: Wed Jul 20 21:19:50 2022 +0800

    ARROW-17086: [C++] Install java/dataset include file and fix debug build 
failed by compiler flag (#13614)
    
    Arrow8 will install jni_util.h, but Arrow9 not, cause our project fail when 
upgraded to Arrow 9
    
    And if use cmake --preset ninja-debug \
            -DARROW_BUILD_SHARED=ON \
            -DARROW_GANDIVA_JAVA=ON \
            -DARROW_GANDIVA=ON
    it will failed with this error, fix it
    arrow/cpp/src/gandiva/jni/expression_registry_helper.cc:157:78: error: 
implicit conversion loses integer precision: 'unsigned long' to 'int' 
[-Werror,-Wshorten-64-to-32]
      
gandiva_data_types.SerializeToArray(reinterpret_cast<void*>(buffer.get()), 
size);
    
    Lead-authored-by: Chengcheng Jin <chengcheng....@intel.com>
    Co-authored-by: David Li <li.david...@gmail.com>
    Signed-off-by: David Li <li.david...@gmail.com>
---
 cpp/src/gandiva/jni/expression_registry_helper.cc | 4 ++--
 java/dataset/src/main/cpp/CMakeLists.txt          | 2 ++
 java/dataset/src/main/cpp/jni_util.cc             | 4 ++--
 java/dataset/src/main/cpp/jni_wrapper.cc          | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cpp/src/gandiva/jni/expression_registry_helper.cc 
b/cpp/src/gandiva/jni/expression_registry_helper.cc
index 0d1f74ba6f..338290618d 100644
--- a/cpp/src/gandiva/jni/expression_registry_helper.cc
+++ b/cpp/src/gandiva/jni/expression_registry_helper.cc
@@ -152,7 +152,7 @@ 
Java_org_apache_arrow_gandiva_evaluator_ExpressionRegistryJniHelper_getGandivaSu
     types::ExtGandivaType* gandiva_data_type = 
gandiva_data_types.add_datatype();
     ArrowToProtobuf(type, gandiva_data_type);
   }
-  auto size = gandiva_data_types.ByteSizeLong();
+  auto size = static_cast<int>(gandiva_data_types.ByteSizeLong());
   std::unique_ptr<jbyte[]> buffer{new jbyte[size]};
   gandiva_data_types.SerializeToArray(reinterpret_cast<void*>(buffer.get()), 
size);
   jbyteArray ret = env->NewByteArray(size);
@@ -181,7 +181,7 @@ 
Java_org_apache_arrow_gandiva_evaluator_ExpressionRegistryJniHelper_getGandivaSu
       ArrowToProtobuf(param_type, proto_param_type);
     }
   }
-  auto size = gandiva_functions.ByteSizeLong();
+  auto size = static_cast<int>(gandiva_functions.ByteSizeLong());
   std::unique_ptr<jbyte[]> buffer{new jbyte[size]};
   gandiva_functions.SerializeToArray(reinterpret_cast<void*>(buffer.get()), 
size);
   jbyteArray ret = env->NewByteArray(size);
diff --git a/java/dataset/src/main/cpp/CMakeLists.txt 
b/java/dataset/src/main/cpp/CMakeLists.txt
index 6a0be9b7f5..8a6f7c5a1b 100644
--- a/java/dataset/src/main/cpp/CMakeLists.txt
+++ b/java/dataset/src/main/cpp/CMakeLists.txt
@@ -63,3 +63,5 @@ add_arrow_test(dataset_jni_test
                jni_util.cc
                EXTRA_INCLUDES
                ${JNI_INCLUDE_DIRS})
+
+install(FILES jni_util.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/jni/dataset")
diff --git a/java/dataset/src/main/cpp/jni_util.cc 
b/java/dataset/src/main/cpp/jni_util.cc
index dec77e63a9..a48224db80 100644
--- a/java/dataset/src/main/cpp/jni_util.cc
+++ b/java/dataset/src/main/cpp/jni_util.cc
@@ -321,9 +321,9 @@ arrow::Result<jbyteArray> ToSchemaByteArray(JNIEnv* env,
       std::shared_ptr<arrow::Buffer> buffer,
       arrow::ipc::SerializeSchema(*schema, arrow::default_memory_pool()))
 
-  jbyteArray out = env->NewByteArray(buffer->size());
+  jbyteArray out = env->NewByteArray(static_cast<int>(buffer->size()));
   auto src = reinterpret_cast<const jbyte*>(buffer->data());
-  env->SetByteArrayRegion(out, 0, buffer->size(), src);
+  env->SetByteArrayRegion(out, 0, static_cast<int>(buffer->size()), src);
   return out;
 }
 
diff --git a/java/dataset/src/main/cpp/jni_wrapper.cc 
b/java/dataset/src/main/cpp/jni_wrapper.cc
index a4f453fbf9..e96dfb8aed 100644
--- a/java/dataset/src/main/cpp/jni_wrapper.cc
+++ b/java/dataset/src/main/cpp/jni_wrapper.cc
@@ -49,8 +49,8 @@ class JniPendingException : public std::runtime_error {
   explicit JniPendingException(const std::string& arg, jthrowable cause)
       : runtime_error(arg), cause_(cause) {}
 
-  const jthrowable GetCause() const { return cause_; }
-  const bool HasCause() const { return cause_ != nullptr; }
+  jthrowable GetCause() const { return cause_; }
+  bool HasCause() const { return cause_ != nullptr; }
 
  private:
   jthrowable cause_;