This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 93b6cbc234 [CORE][VL] Minor code cleanups (#7280)
93b6cbc234 is described below
commit 93b6cbc2349b2c07b210739aa2dfa640334b1b21
Author: Hongze Zhang <[email protected]>
AuthorDate: Fri Sep 20 08:04:58 2024 +0800
[CORE][VL] Minor code cleanups (#7280)
---
.../src/main/java/org/apache/gluten/vectorized/BatchIterator.java | 6 ------
.../java/org/apache/gluten/metrics/IteratorMetricsJniWrapper.java | 2 +-
.../java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java | 2 +-
.../java/org/apache/gluten/utils/VeloxBloomFilterJniWrapper.java | 2 +-
cpp/core/jni/JniCommon.cc | 2 +-
.../org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java | 2 +-
.../java/org/apache/gluten/datasource/DatasourceJniWrapper.java | 2 +-
.../src/main/java/org/apache/gluten/runtime/RuntimeAware.java | 4 ++--
.../org/apache/gluten/vectorized/ColumnarBatchOutIterator.java | 8 +-------
.../gluten/vectorized/ColumnarBatchSerializerJniWrapper.java | 2 +-
.../apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java | 2 +-
.../apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java | 2 +-
.../org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java | 2 +-
.../org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java | 2 +-
.../org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java | 2 +-
.../main/java/org/apache/gluten/iterator/ClosableIterator.java | 2 --
16 files changed, 15 insertions(+), 29 deletions(-)
diff --git
a/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BatchIterator.java
b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BatchIterator.java
index f6e651b7bf..2f7471d837 100644
---
a/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BatchIterator.java
+++
b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/BatchIterator.java
@@ -32,12 +32,6 @@ public class BatchIterator extends ClosableIterator {
this.handle = handle;
}
- @Override
- public String id() {
- // Using native handle as identifier
- return String.valueOf(handle);
- }
-
private native boolean nativeHasNext(long nativeHandle);
private native long nativeCHNext(long nativeHandle);
diff --git
a/backends-velox/src/main/java/org/apache/gluten/metrics/IteratorMetricsJniWrapper.java
b/backends-velox/src/main/java/org/apache/gluten/metrics/IteratorMetricsJniWrapper.java
index 3731408279..7250fde0fe 100644
---
a/backends-velox/src/main/java/org/apache/gluten/metrics/IteratorMetricsJniWrapper.java
+++
b/backends-velox/src/main/java/org/apache/gluten/metrics/IteratorMetricsJniWrapper.java
@@ -40,7 +40,7 @@ public class IteratorMetricsJniWrapper implements
RuntimeAware {
private native Metrics nativeFetchMetrics(long itrHandle);
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
}
diff --git
a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java
b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java
index 8855dd2acb..a1985057ef 100644
---
a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java
+++
b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java
@@ -32,7 +32,7 @@ public class VeloxBatchResizerJniWrapper implements
RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git
a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilterJniWrapper.java
b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilterJniWrapper.java
index d5ee784150..024c4ad045 100644
---
a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilterJniWrapper.java
+++
b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilterJniWrapper.java
@@ -31,7 +31,7 @@ public class VeloxBloomFilterJniWrapper implements
RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git a/cpp/core/jni/JniCommon.cc b/cpp/core/jni/JniCommon.cc
index 0d2b5d874d..686f2a5fbf 100644
--- a/cpp/core/jni/JniCommon.cc
+++ b/cpp/core/jni/JniCommon.cc
@@ -39,7 +39,7 @@ jmethodID gluten::JniCommonState::runtimeAwareCtxHandle() {
void gluten::JniCommonState::initialize(JNIEnv* env) {
runtimeAwareClass_ = createGlobalClassReference(env,
"Lorg/apache/gluten/runtime/RuntimeAware;");
- runtimeAwareCtxHandle_ = getMethodIdOrError(env, runtimeAwareClass_,
"handle", "()J");
+ runtimeAwareCtxHandle_ = getMethodIdOrError(env, runtimeAwareClass_,
"rtHandle", "()J");
JavaVM* vm;
if (env->GetJavaVM(&vm) != JNI_OK) {
throw gluten::GlutenException("Unable to get JavaVM instance");
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
b/gluten-arrow/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
index 37376951c5..464ac1aecb 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
@@ -51,7 +51,7 @@ public class ColumnarBatchJniWrapper implements RuntimeAware {
public native void close(long batch);
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
b/gluten-arrow/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
index 4550dbd9a4..2173f6375f 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
@@ -38,7 +38,7 @@ public class DatasourceJniWrapper implements RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/runtime/RuntimeAware.java
b/gluten-arrow/src/main/java/org/apache/gluten/runtime/RuntimeAware.java
index 5caef9a691..4ef44cd2a8 100644
--- a/gluten-arrow/src/main/java/org/apache/gluten/runtime/RuntimeAware.java
+++ b/gluten-arrow/src/main/java/org/apache/gluten/runtime/RuntimeAware.java
@@ -22,8 +22,8 @@ package org.apache.gluten.runtime;
*/
public interface RuntimeAware {
default boolean isCompatibleWith(RuntimeAware other) {
- return handle() == other.handle();
+ return rtHandle() == other.rtHandle();
}
- long handle();
+ long rtHandle();
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
index d46dbb0bfe..b253485c90 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
@@ -36,16 +36,10 @@ public class ColumnarBatchOutIterator extends
ClosableIterator implements Runtim
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
- @Override
- public String id() {
- // Using native iterHandle as identifier
- return String.valueOf(iterHandle);
- }
-
public long itrHandle() {
return iterHandle;
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
index d78cbdab24..000e233d5a 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
@@ -31,7 +31,7 @@ public class ColumnarBatchSerializerJniWrapper implements
RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
index 947f4c8166..564293438a 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
@@ -31,7 +31,7 @@ public class NativeColumnarToRowJniWrapper implements
RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java
index c561174b2b..93aa48608e 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java
@@ -31,7 +31,7 @@ public class NativeRowToColumnarJniWrapper implements
RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java
index 9336457e96..915091a7db 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java
@@ -37,7 +37,7 @@ public class PlanEvaluatorJniWrapper implements RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java
index 3d2f9e1197..09f97cbd06 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java
@@ -31,7 +31,7 @@ public class ShuffleReaderJniWrapper implements RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java
index 4fc9ede39d..575e383afc 100644
---
a/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java
+++
b/gluten-arrow/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java
@@ -33,7 +33,7 @@ public class ShuffleWriterJniWrapper implements RuntimeAware {
}
@Override
- public long handle() {
+ public long rtHandle() {
return runtime.getHandle();
}
diff --git
a/gluten-core/src/main/java/org/apache/gluten/iterator/ClosableIterator.java
b/gluten-core/src/main/java/org/apache/gluten/iterator/ClosableIterator.java
index 555368b272..6123a4a527 100644
--- a/gluten-core/src/main/java/org/apache/gluten/iterator/ClosableIterator.java
+++ b/gluten-core/src/main/java/org/apache/gluten/iterator/ClosableIterator.java
@@ -55,8 +55,6 @@ public abstract class ClosableIterator
}
}
- public abstract String id();
-
protected abstract void close0();
protected abstract boolean hasNext0() throws Exception;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
