(arrow-java) branch main updated: MINOR: Fix JNI code after upstream DCHECK change (#706)

[lidavidm]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 8ffc1d3e MINOR: Fix JNI code after upstream DCHECK change (#706)
8ffc1d3e is described below

commit 8ffc1d3eb58bbe4fc023d2222cc4439dace7e8ea
Author: David Li <li.david...@gmail.com>
AuthorDate: Tue Apr 8 12:17:11 2025 +0900

    MINOR: Fix JNI code after upstream DCHECK change (#706)
    
    ## What's Changed
    
    Upstream renamed the public DCHECK macros to ARROW_DCHECK
    (https://github.com/apache/arrow/pull/46015)
---
 .github/workflows/rc.yml                           | 5 +++++
 dataset/src/main/cpp/jni_util.cc                   | 4 ++--
 gandiva/src/main/cpp/expression_registry_helper.cc | 2 +-
 gandiva/src/main/cpp/jni_common.cc                 | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
index 5b78cc93..e039306e 100644
--- a/.github/workflows/rc.yml
+++ b/.github/workflows/rc.yml
@@ -261,6 +261,11 @@ jobs:
           # bundled Protobuf.
           brew uninstall protobuf
 
+          # We need Flatbuffers 24, not the latest version
+          # Homebrew does not offer older versions, so remove the Homebrew
+          # package and rely on Arrow using a bundled version instead
+          brew uninstall flatbuffers
+
           brew bundle --file=Brewfile
       - name: Prepare ccache
         run: |
diff --git a/dataset/src/main/cpp/jni_util.cc b/dataset/src/main/cpp/jni_util.cc
index 1fd15696..35bfb328 100644
--- a/dataset/src/main/cpp/jni_util.cc
+++ b/dataset/src/main/cpp/jni_util.cc
@@ -187,7 +187,7 @@ 
ReservationListenableMemoryPool::~ReservationListenableMemoryPool() {}
 std::string Describe(JNIEnv* env, jthrowable t) {
   jclass describer_class =
       env->FindClass("org/apache/arrow/dataset/jni/JniExceptionDescriber");
-  DCHECK_NE(describer_class, nullptr);
+  ARROW_DCHECK_NE(describer_class, nullptr);
   jmethodID describe_method = env->GetStaticMethodID(
       describer_class, "describe", 
"(Ljava/lang/Throwable;)Ljava/lang/String;");
   std::string description = JStringToCString(
@@ -197,7 +197,7 @@ std::string Describe(JNIEnv* env, jthrowable t) {
 
 bool IsErrorInstanceOf(JNIEnv* env, jthrowable t, std::string class_name) {
   jclass java_class = env->FindClass(class_name.c_str());
-  DCHECK_NE(java_class, nullptr) << "Could not find Java class " << class_name;
+  ARROW_DCHECK_NE(java_class, nullptr) << "Could not find Java class " << 
class_name;
   return env->IsInstanceOf(t, java_class);
 }
 
diff --git a/gandiva/src/main/cpp/expression_registry_helper.cc 
b/gandiva/src/main/cpp/expression_registry_helper.cc
index 66b97c8b..21077ff1 100644
--- a/gandiva/src/main/cpp/expression_registry_helper.cc
+++ b/gandiva/src/main/cpp/expression_registry_helper.cc
@@ -138,7 +138,7 @@ void ArrowToProtobuf(DataTypePtr type, 
gandiva::types::ExtGandivaType* gandiva_d
     default:
       // un-supported types. test ensures that
       // when one of these are added build breaks.
-      DCHECK(false);
+      ARROW_DCHECK(false);
   }
 }
 
diff --git a/gandiva/src/main/cpp/jni_common.cc 
b/gandiva/src/main/cpp/jni_common.cc
index ec1bb762..28512500 100644
--- a/gandiva/src/main/cpp/jni_common.cc
+++ b/gandiva/src/main/cpp/jni_common.cc
@@ -751,7 +751,7 @@ Status JavaResizableBuffer::Resize(const int64_t new_size, 
bool shrink_to_fit) {
   }
 
   RETURN_NOT_OK(Reserve(new_size));
-  DCHECK_GE(capacity_, new_size);
+  ARROW_DCHECK_GE(capacity_, new_size);
   size_ = new_size;
   return Status::OK();
 }