Skip to content

MINOR: Fix JNI code after upstream DCHECK change #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidavidm merged 3 commits into from
Apr 8, 2025
Merged

MINOR: Fix JNI code after upstream DCHECK change #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f500cd
MINOR: Fix JNI code after upstream DCHECK change
lidavidm Apr 7, 2025
7fe6afd
fix flatbuf
lidavidm Apr 8, 2025
78f23ba
fix flatbuf (again)
lidavidm Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions dataset/src/main/cpp/jni_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion gandiva/src/main/cpp/expression_registry_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion gandiva/src/main/cpp/jni_common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Loading