Skip to content

[GLUTEN-11308][CORE] Avoid copy string while calling jStringToCString #11309

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

Closed
beliefer wants to merge 1 commit into from
Closed

[GLUTEN-11308][CORE] Avoid copy string while calling jStringToCString #11309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cpp/core/jni/JniCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

static jint jniVersion = JNI_VERSION_1_8;

static inline std::string jStringToCString(JNIEnv* env, jstring string) {
static inline std::string jStringToCString(JNIEnv* env, const jstring& string) {
if (!string) {
return {};
}
Expand Down Expand Up @@ -354,7 +354,7 @@ static inline arrow::Compression::type getCompressionType(JNIEnv* env, jstring c
return compressionType;
}

static inline gluten::CodecBackend getCodecBackend(JNIEnv* env, jstring codecBackendJstr) {
static inline gluten::CodecBackend getCodecBackend(JNIEnv* env, const jstring& codecBackendJstr) {
if (codecBackendJstr == nullptr) {
return gluten::CodecBackend::NONE;
}
Expand Down
20 changes: 10 additions & 10 deletions cpp/core/jni/JniWrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
JNIEXPORT jlong JNICALL Java_org_apache_gluten_runtime_RuntimeJniWrapper_createRuntime( // NOLINT
JNIEnv* env,
jclass,
jstring jBackendType,
const jstring& jBackendType,
jlong nmmHandle,
jbyteArray sessionConf) {
JNI_METHOD_START
Expand Down Expand Up @@ -341,7 +341,7 @@ const std::string kBacktraceAllocation = "spark.gluten.memory.backtrace.allocati
JNIEXPORT jlong JNICALL Java_org_apache_gluten_memory_NativeMemoryManagerJniWrapper_create( // NOLINT
JNIEnv* env,
jclass,
jstring jBackendType,
const jstring& jBackendType,
jobject jListener,
jbyteArray sessionConf) {
JNI_METHOD_START
Expand Down Expand Up @@ -460,7 +460,7 @@ Java_org_apache_gluten_vectorized_PlanEvaluatorJniWrapper_nativeCreateKernelWith
jint partitionId,
jlong taskId,
jboolean enableDumping,
jstring spillDir) {
const jstring& spillDir) {
JNI_METHOD_START

auto ctx = getRuntime(env, wrapper);
Expand Down Expand Up @@ -857,8 +857,8 @@ Java_org_apache_gluten_vectorized_LocalPartitionWriterJniWrapper_createPartition
jdouble mergeThreshold,
jint numSubDirs,
jint shuffleFileBufferSize,
jstring dataFileJstr,
jstring localDirsJstr,
const jstring& dataFileJstr,
const jstring& localDirsJstr,
jboolean enableDictionary) {
JNI_METHOD_START

Expand Down Expand Up @@ -893,7 +893,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrappe
JNIEnv* env,
jobject wrapper,
jint numPartitions,
jstring partitioningNameJstr,
const jstring& partitioningNameJstr,
jint startPartitionId,
jint splitBufferSize,
jdouble splitBufferReallocThreshold,
Expand Down Expand Up @@ -921,7 +921,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrappe
JNIEnv* env,
jobject wrapper,
jint numPartitions,
jstring partitioningNameJstr,
const jstring& partitioningNameJstr,
jint startPartitionId,
jint splitBufferSize,
jdouble splitBufferReallocThreshold,
Expand Down Expand Up @@ -949,7 +949,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrappe
JNIEnv* env,
jobject wrapper,
jint numPartitions,
jstring partitioningNameJstr,
const jstring& partitioningNameJstr,
jint startPartitionId,
jint diskWriteBufferSize,
jint initialSortBufferSize,
Expand Down Expand Up @@ -979,7 +979,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleWriterJniWrappe
JNIEnv* env,
jobject wrapper,
jint numPartitions,
jstring partitioningNameJstr,
const jstring& partitioningNameJstr,
jint startPartitionId,
jint splitBufferSize,
jlong sortBufferMaxSize,
Expand Down Expand Up @@ -1118,7 +1118,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ShuffleReaderJniWrappe
jint batchSize,
jlong readerBufferSize,
jlong deserializerBufferSize,
jstring shuffleWriterType) {
const jstring& shuffleWriterType) {
JNI_METHOD_START
auto ctx = getRuntime(env, wrapper);

Expand Down
6 changes: 3 additions & 3 deletions cpp/velox/jni/VeloxJniWrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ Java_org_apache_gluten_utils_VeloxFileSystemValidationJniWrapper_allSupportedByR
JNIEXPORT jlong JNICALL Java_org_apache_gluten_datasource_VeloxDataSourceJniWrapper_init( // NOLINT
JNIEnv* env,
jobject wrapper,
jstring filePath,
const jstring& filePath,
jlong cSchema,
jbyteArray options) {
JNI_METHOD_START
Expand Down Expand Up @@ -839,8 +839,8 @@ JNIEXPORT jlong JNICALL Java_org_apache_gluten_execution_IcebergWriteJniWrapper_
jobject wrapper,
jlong cSchema,
jint format,
jstring directory,
jstring codecJstr,
const jstring& directory,
const jstring& codecJstr,
jbyteArray partition,
jbyteArray fieldBytes) {
JNI_METHOD_START
Expand Down
Loading