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 cf4275fd9 [VL] Minor class name / package name clean-ups (#6720)
cf4275fd9 is described below
commit cf4275fd97a07f90df399e9092e5f451e20242dd
Author: Hongze Zhang <[email protected]>
AuthorDate: Fri Aug 9 08:34:01 2024 +0800
[VL] Minor class name / package name clean-ups (#6720)
---
.../main/java/org/apache/gluten/utils/VeloxBatchResizer.java | 4 ++--
.../org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java | 4 ++--
.../main/java/org/apache/gluten/utils/VeloxBloomFilter.java | 2 +-
.../org/apache/gluten/utils/VeloxBloomFilterJniWrapper.java | 4 ++--
.../apache/gluten/backendsapi/velox/VeloxTransformerApi.scala | 2 +-
.../org/apache/gluten/execution/RowToVeloxColumnarExec.scala | 2 +-
.../org/apache/gluten/execution/VeloxColumnarToRowExec.scala | 2 +-
.../main/scala/org/apache/gluten/utils/DatasourceUtil.scala | 2 +-
.../scala/org/apache/spark/sql/execution/BroadcastUtils.scala | 2 +-
.../spark/sql/execution/ColumnarCachedBatchSerializer.scala | 2 +-
.../execution/datasources/velox/VeloxFormatWriterInjects.scala | 2 +-
...OffHeapSizingTest.scala => DynamicOffHeapSizingSuite.scala} | 2 +-
...unctionsValidateTest.scala => FunctionsValidateSuite.scala} | 2 +-
.../apache/gluten/execution/ScalarFunctionsValidateSuite.scala | 2 +-
.../apache/gluten/execution/WindowFunctionsValidateSuite.scala | 2 +-
.../gluten/fuzzer/{FuzzerTestBase.scala => FuzzerBase.scala} | 4 ++--
.../fuzzer/{FuzzerTestResult.scala => FuzzerResult.scala} | 2 +-
...RowToColumnarFuzzerTest.scala => RowToColumnarFuzzer.scala} | 4 ++--
...ShuffleWriterFuzzerTest.scala => ShuffleWriterFuzzer.scala} | 4 ++--
cpp/core/jni/JniCommon.cc | 2 +-
cpp/core/jni/JniWrapper.cc | 10 +++++-----
dev/build_arrow.sh | 2 ++
.../spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala | 2 +-
.../spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala | 2 +-
.../apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java | 4 ++--
.../java/org/apache/gluten/columnarbatch/ColumnarBatches.java | 4 ++--
.../org/apache/gluten/columnarbatch/IndicatorVectorBase.java | 2 +-
.../org/apache/gluten/datasource/DatasourceJniWrapper.java | 4 ++--
.../java/org/apache/gluten/{exec => runtime}/RuntimeAware.java | 2 +-
.../org/apache/gluten/{exec => runtime}/RuntimeJniWrapper.java | 2 +-
.../org/apache/gluten/vectorized/ColumnarBatchInIterator.java | 2 +-
.../org/apache/gluten/vectorized/ColumnarBatchOutIterator.java | 4 ++--
.../gluten/vectorized/ColumnarBatchSerializerJniWrapper.java | 4 ++--
.../gluten/vectorized/NativeColumnarToRowJniWrapper.java | 4 ++--
.../java/org/apache/gluten/vectorized/NativePlanEvaluator.java | 4 ++--
.../gluten/vectorized/NativeRowToColumnarJniWrapper.java | 4 ++--
.../org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java | 4 ++--
.../org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java | 4 ++--
.../org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java | 4 ++--
.../scala/org/apache/gluten/{exec => runtime}/Runtime.scala | 4 ++--
.../scala/org/apache/gluten/{exec => runtime}/Runtimes.scala | 2 +-
.../org/apache/gluten/vectorized/ColumnarBatchSerializer.scala | 2 +-
.../scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala | 2 +-
.../apache/spark/sql/execution/ColumnarBuildSideRelation.scala | 2 +-
.../scala/org/apache/spark/sql/execution/utils/ExecUtil.scala | 2 +-
.../shuffle/writer/VeloxUniffleColumnarShuffleWriter.java | 4 ++--
46 files changed, 70 insertions(+), 68 deletions(-)
diff --git
a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java
b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java
index e2f11cd35..2a6dcb43a 100644
---
a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java
+++
b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.utils;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.Runtimes;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.Runtimes;
import org.apache.gluten.vectorized.ColumnarBatchInIterator;
import org.apache.gluten.vectorized.ColumnarBatchOutIterator;
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 3011ced2a..8855dd2ac 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
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.utils;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
import org.apache.gluten.vectorized.ColumnarBatchInIterator;
public class VeloxBatchResizerJniWrapper implements RuntimeAware {
diff --git
a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilter.java
b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilter.java
index f23426d7d..10179d63e 100644
--- a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilter.java
+++ b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilter.java
@@ -16,7 +16,7 @@
*/
package org.apache.gluten.utils;
-import org.apache.gluten.exec.Runtimes;
+import org.apache.gluten.runtime.Runtimes;
import org.apache.commons.io.IOUtils;
import org.apache.spark.util.sketch.BloomFilter;
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 3ddfd2c02..d5ee78415 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
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.utils;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
public class VeloxBloomFilterJniWrapper implements RuntimeAware {
private final Runtime runtime;
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxTransformerApi.scala
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxTransformerApi.scala
index 4cbde635e..37d8acc7f 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxTransformerApi.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxTransformerApi.scala
@@ -17,8 +17,8 @@
package org.apache.gluten.backendsapi.velox
import org.apache.gluten.backendsapi.TransformerApi
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.expression.ConverterUtils
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.substrait.expression.{ExpressionBuilder,
ExpressionNode}
import org.apache.gluten.utils.InputPartitionsUtil
import org.apache.gluten.vectorized.PlanEvaluatorJniWrapper
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/execution/RowToVeloxColumnarExec.scala
b/backends-velox/src/main/scala/org/apache/gluten/execution/RowToVeloxColumnarExec.scala
index 2f3e88f9a..9ceb6b5b6 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/execution/RowToVeloxColumnarExec.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/execution/RowToVeloxColumnarExec.scala
@@ -18,8 +18,8 @@ package org.apache.gluten.execution
import org.apache.gluten.GlutenConfig
import org.apache.gluten.columnarbatch.ColumnarBatches
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.utils.ArrowAbiUtil
import org.apache.gluten.utils.iterator.Iterators
import org.apache.gluten.vectorized._
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala
b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala
index 993a888b9..d3fb9c3ff 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala
@@ -18,8 +18,8 @@ package org.apache.gluten.execution
import org.apache.gluten.columnarbatch.ColumnarBatches
import org.apache.gluten.exception.GlutenNotSupportException
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.extension.ValidationResult
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.utils.iterator.Iterators
import org.apache.gluten.vectorized.NativeColumnarToRowJniWrapper
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/utils/DatasourceUtil.scala
b/backends-velox/src/main/scala/org/apache/gluten/utils/DatasourceUtil.scala
index 3d7725655..8963ce93c 100644
--- a/backends-velox/src/main/scala/org/apache/gluten/utils/DatasourceUtil.scala
+++ b/backends-velox/src/main/scala/org/apache/gluten/utils/DatasourceUtil.scala
@@ -17,8 +17,8 @@
package org.apache.gluten.utils
import org.apache.gluten.datasource.DatasourceJniWrapper
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators
+import org.apache.gluten.runtime.Runtimes
import org.apache.spark.sql.types.StructType
import org.apache.spark.sql.utils.SparkSchemaUtil
diff --git
a/backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala
b/backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala
index 3d532133a..29a12f532 100644
---
a/backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala
+++
b/backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala
@@ -17,7 +17,7 @@
package org.apache.spark.sql.execution
import org.apache.gluten.columnarbatch.ColumnarBatches
-import org.apache.gluten.exec.Runtimes
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.sql.shims.SparkShimLoader
import org.apache.gluten.vectorized.{ColumnarBatchSerializeResult,
ColumnarBatchSerializerJniWrapper}
diff --git
a/backends-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala
b/backends-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala
index 15fd51abe..db9e75a05 100644
---
a/backends-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala
+++
b/backends-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala
@@ -19,9 +19,9 @@ package org.apache.spark.sql.execution
import org.apache.gluten.GlutenConfig
import org.apache.gluten.backendsapi.BackendsApiManager
import org.apache.gluten.columnarbatch.ColumnarBatches
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.execution.{RowToVeloxColumnarExec,
VeloxColumnarToRowExec}
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.utils.ArrowAbiUtil
import org.apache.gluten.utils.iterator.Iterators
import org.apache.gluten.vectorized.ColumnarBatchSerializerJniWrapper
diff --git
a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala
b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala
index 7da4da5f0..e25d3c663 100644
---
a/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala
+++
b/backends-velox/src/main/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala
@@ -19,9 +19,9 @@ package org.apache.spark.sql.execution.datasources.velox
import org.apache.gluten.columnarbatch.{ColumnarBatches,
ColumnarBatchJniWrapper}
import org.apache.gluten.datasource.DatasourceJniWrapper
import org.apache.gluten.exception.GlutenException
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.execution.datasource.GlutenRowSplitter
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.utils.{ArrowAbiUtil, DatasourceUtil}
import org.apache.spark.sql.SparkSession
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingTest.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingSuite.scala
similarity index 96%
rename from
backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingTest.scala
rename to
backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingSuite.scala
index 56fc6eac3..51d06110e 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingTest.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingSuite.scala
@@ -22,7 +22,7 @@ import org.apache.gluten.tags.SkipTestTags
import org.apache.spark.SparkConf
@SkipTestTags
-class DynamicOffHeapSizingTest extends VeloxWholeStageTransformerSuite {
+class DynamicOffHeapSizingSuite extends VeloxWholeStageTransformerSuite {
override protected val resourcePath: String = "/tpch-data-parquet-velox"
override protected val fileFormat: String = "parquet"
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateTest.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateSuite.scala
similarity index 97%
rename from
backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateTest.scala
rename to
backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateSuite.scala
index 12f66278f..a9c5cf70d 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateTest.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateSuite.scala
@@ -25,7 +25,7 @@ import java.nio.file.Files
import scala.collection.JavaConverters._
-class FunctionsValidateTest extends WholeStageTransformerSuite {
+class FunctionsValidateSuite extends WholeStageTransformerSuite {
override protected val resourcePath: String = "/tpch-data-parquet-velox"
override protected val fileFormat: String = "parquet"
private var parquetPath: String = _
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala
index a0f7d22e4..b8de30b1b 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala
@@ -67,7 +67,7 @@ class ScalarFunctionsValidateSuiteRasOn extends
ScalarFunctionsValidateSuite {
}
}
-abstract class ScalarFunctionsValidateSuite extends FunctionsValidateTest {
+abstract class ScalarFunctionsValidateSuite extends FunctionsValidateSuite {
disableFallbackCheck
import testImplicits._
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/WindowFunctionsValidateSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/WindowFunctionsValidateSuite.scala
index ef9c028be..04d0d2c56 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/WindowFunctionsValidateSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/WindowFunctionsValidateSuite.scala
@@ -16,7 +16,7 @@
*/
package org.apache.gluten.execution
-class WindowFunctionsValidateSuite extends FunctionsValidateTest {
+class WindowFunctionsValidateSuite extends FunctionsValidateSuite {
test("lag/lead window function with negative input offset") {
runQueryAndCompare(
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerTestBase.scala
b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerBase.scala
similarity index 96%
rename from
backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerTestBase.scala
rename to
backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerBase.scala
index 1ee79a2ad..07996bc4b 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerTestBase.scala
+++ b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerBase.scala
@@ -18,12 +18,12 @@ package org.apache.gluten.fuzzer
import org.apache.gluten.benchmarks.RandomParquetDataGenerator
import org.apache.gluten.execution.VeloxWholeStageTransformerSuite
-import org.apache.gluten.fuzzer.FuzzerTestResult.{Failed, OOM, Successful,
TestResult}
+import org.apache.gluten.fuzzer.FuzzerResult.{Failed, OOM, Successful,
TestResult}
import org.apache.gluten.memory.memtarget.ThrowOnOomMemoryTarget
import org.apache.spark.SparkConf
-abstract class FuzzerTestBase extends VeloxWholeStageTransformerSuite {
+abstract class FuzzerBase extends VeloxWholeStageTransformerSuite {
override protected val resourcePath: String = "/tpch-data-parquet-velox"
override protected val fileFormat: String = "parquet"
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerTestResult.scala
b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerResult.scala
similarity index 97%
rename from
backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerTestResult.scala
rename to
backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerResult.scala
index 42f901b06..cff9ffec8 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerTestResult.scala
+++ b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerResult.scala
@@ -16,7 +16,7 @@
*/
package org.apache.gluten.fuzzer
-object FuzzerTestResult {
+object FuzzerResult {
trait TestResult {
val seed: Long
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/RowToColumnarFuzzerTest.scala
b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/RowToColumnarFuzzer.scala
similarity index 95%
rename from
backends-velox/src/test/scala/org/apache/gluten/fuzzer/RowToColumnarFuzzerTest.scala
rename to
backends-velox/src/test/scala/org/apache/gluten/fuzzer/RowToColumnarFuzzer.scala
index b6d986047..d60e577ac 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/RowToColumnarFuzzerTest.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/RowToColumnarFuzzer.scala
@@ -17,7 +17,7 @@
package org.apache.gluten.fuzzer
import org.apache.gluten.execution.RowToVeloxColumnarExec
-import org.apache.gluten.fuzzer.FuzzerTestResult.Successful
+import org.apache.gluten.fuzzer.FuzzerResult.Successful
import org.apache.gluten.tags.{FuzzerTest, SkipTestTags}
import org.apache.spark.SparkConf
@@ -25,7 +25,7 @@ import org.apache.spark.sql.DataFrame
@FuzzerTest
@SkipTestTags
-class RowToColumnarFuzzerTest extends FuzzerTestBase {
+class RowToColumnarFuzzer extends FuzzerBase {
override protected def sparkConf: SparkConf = {
super.sparkConf
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/ShuffleWriterFuzzerTest.scala
b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/ShuffleWriterFuzzer.scala
similarity index 96%
rename from
backends-velox/src/test/scala/org/apache/gluten/fuzzer/ShuffleWriterFuzzerTest.scala
rename to
backends-velox/src/test/scala/org/apache/gluten/fuzzer/ShuffleWriterFuzzer.scala
index 7d8fc56d9..44f25b517 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/ShuffleWriterFuzzerTest.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/ShuffleWriterFuzzer.scala
@@ -16,7 +16,7 @@
*/
package org.apache.gluten.fuzzer
-import org.apache.gluten.fuzzer.FuzzerTestResult.Successful
+import org.apache.gluten.fuzzer.FuzzerResult.Successful
import org.apache.gluten.tags.{FuzzerTest, SkipTestTags}
import org.apache.spark.sql.DataFrame
@@ -24,7 +24,7 @@ import
org.apache.spark.sql.execution.ColumnarShuffleExchangeExec
@FuzzerTest
@SkipTestTags
-class ShuffleWriterFuzzerTest extends FuzzerTestBase {
+class ShuffleWriterFuzzer extends FuzzerBase {
private val REPARTITION_SQL = (numPartitions: Int) =>
s"select /*+ REPARTITION($numPartitions) */ * from tbl"
private val AGG_REPARTITION_SQL =
diff --git a/cpp/core/jni/JniCommon.cc b/cpp/core/jni/JniCommon.cc
index 759a9d121..0d2b5d874 100644
--- a/cpp/core/jni/JniCommon.cc
+++ b/cpp/core/jni/JniCommon.cc
@@ -38,7 +38,7 @@ jmethodID gluten::JniCommonState::runtimeAwareCtxHandle() {
}
void gluten::JniCommonState::initialize(JNIEnv* env) {
- runtimeAwareClass_ = createGlobalClassReference(env,
"Lorg/apache/gluten/exec/RuntimeAware;");
+ runtimeAwareClass_ = createGlobalClassReference(env,
"Lorg/apache/gluten/runtime/RuntimeAware;");
runtimeAwareCtxHandle_ = getMethodIdOrError(env, runtimeAwareClass_,
"handle", "()J");
JavaVM* vm;
if (env->GetJavaVM(&vm) != JNI_OK) {
diff --git a/cpp/core/jni/JniWrapper.cc b/cpp/core/jni/JniWrapper.cc
index 60f367fd7..3e583f20b 100644
--- a/cpp/core/jni/JniWrapper.cc
+++ b/cpp/core/jni/JniWrapper.cc
@@ -222,7 +222,7 @@ namespace {
const std::string kBacktraceAllocation =
"spark.gluten.memory.backtrace.allocation";
}
-JNIEXPORT jlong JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_createRuntime( // NOLINT
+JNIEXPORT jlong JNICALL
Java_org_apache_gluten_runtime_RuntimeJniWrapper_createRuntime( // NOLINT
JNIEnv* env,
jclass,
jstring jbackendType,
@@ -249,7 +249,7 @@ JNIEXPORT jlong JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_createRunt
JNI_METHOD_END(kInvalidObjectHandle)
}
-JNIEXPORT jbyteArray JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_collectMemoryUsage( // NOLINT
+JNIEXPORT jbyteArray JNICALL
Java_org_apache_gluten_runtime_RuntimeJniWrapper_collectMemoryUsage( // NOLINT
JNIEnv* env,
jclass,
jlong ctxHandle) {
@@ -268,7 +268,7 @@ JNIEXPORT jbyteArray JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_colle
JNI_METHOD_END(nullptr)
}
-JNIEXPORT jlong JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_shrinkMemory( // NOLINT
+JNIEXPORT jlong JNICALL
Java_org_apache_gluten_runtime_RuntimeJniWrapper_shrinkMemory( // NOLINT
JNIEnv* env,
jclass,
jlong ctxHandle,
@@ -279,7 +279,7 @@ JNIEXPORT jlong JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_shrinkMemo
JNI_METHOD_END(kInvalidObjectHandle)
}
-JNIEXPORT void JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_holdMemory( // NOLINT
+JNIEXPORT void JNICALL
Java_org_apache_gluten_runtime_RuntimeJniWrapper_holdMemory( // NOLINT
JNIEnv* env,
jclass,
jlong ctxHandle) {
@@ -289,7 +289,7 @@ JNIEXPORT void JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_holdMemory(
JNI_METHOD_END()
}
-JNIEXPORT void JNICALL
Java_org_apache_gluten_exec_RuntimeJniWrapper_releaseRuntime( // NOLINT
+JNIEXPORT void JNICALL
Java_org_apache_gluten_runtime_RuntimeJniWrapper_releaseRuntime( // NOLINT
JNIEnv* env,
jclass,
jlong ctxHandle) {
diff --git a/dev/build_arrow.sh b/dev/build_arrow.sh
index 8e1eefc21..e7496350f 100755
--- a/dev/build_arrow.sh
+++ b/dev/build_arrow.sh
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+set -exu
+
CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
export SUDO=sudo
source ${CURRENT_DIR}/build_helper_functions.sh
diff --git
a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala
b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala
index 6f21b528f..696a3c343 100644
---
a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala
+++
b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala
@@ -18,8 +18,8 @@ package org.apache.spark.shuffle
import org.apache.gluten.GlutenConfig
import org.apache.gluten.GlutenConfig.{GLUTEN_RSS_SORT_SHUFFLE_WRITER,
GLUTEN_SORT_SHUFFLE_WRITER}
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.utils.ArrowAbiUtil
import org.apache.gluten.vectorized._
diff --git
a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala
b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala
index c14d46a52..b7a0beae7 100644
---
a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala
+++
b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala
@@ -18,8 +18,8 @@ package org.apache.spark.shuffle
import org.apache.gluten.GlutenConfig
import org.apache.gluten.columnarbatch.ColumnarBatches
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.memory.memtarget.{MemoryTarget, Spiller, Spillers}
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.vectorized._
import org.apache.spark._
diff --git
a/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
index e71e9d7be..37376951c 100644
---
a/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
+++
b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.columnarbatch;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
public class ColumnarBatchJniWrapper implements RuntimeAware {
private final Runtime runtime;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatches.java
b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatches.java
index a72eaafae..543e6d4cf 100644
---
a/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatches.java
+++
b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatches.java
@@ -17,8 +17,8 @@
package org.apache.gluten.columnarbatch;
import org.apache.gluten.exception.GlutenException;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.Runtimes;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.Runtimes;
import org.apache.gluten.utils.ArrowAbiUtil;
import org.apache.gluten.utils.ArrowUtil;
import org.apache.gluten.utils.ImplicitClass;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/columnarbatch/IndicatorVectorBase.java
b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/IndicatorVectorBase.java
index 1bc685bd5..700eb3cad 100644
---
a/gluten-data/src/main/java/org/apache/gluten/columnarbatch/IndicatorVectorBase.java
+++
b/gluten-data/src/main/java/org/apache/gluten/columnarbatch/IndicatorVectorBase.java
@@ -16,7 +16,7 @@
*/
package org.apache.gluten.columnarbatch;
-import org.apache.gluten.exec.Runtimes;
+import org.apache.gluten.runtime.Runtimes;
import org.apache.spark.sql.types.DataTypes;
import org.apache.spark.sql.types.Decimal;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
index 11ed3fb7d..4550dbd9a 100644
---
a/gluten-data/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
+++
b/gluten-data/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
@@ -16,9 +16,9 @@
*/
package org.apache.gluten.datasource;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
import org.apache.gluten.init.JniUtils;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
import org.apache.spark.sql.execution.datasources.BlockStripes;
diff --git a/gluten-data/src/main/java/org/apache/gluten/exec/RuntimeAware.java
b/gluten-data/src/main/java/org/apache/gluten/runtime/RuntimeAware.java
similarity index 96%
rename from gluten-data/src/main/java/org/apache/gluten/exec/RuntimeAware.java
rename to gluten-data/src/main/java/org/apache/gluten/runtime/RuntimeAware.java
index ca96ace64..5caef9a69 100644
--- a/gluten-data/src/main/java/org/apache/gluten/exec/RuntimeAware.java
+++ b/gluten-data/src/main/java/org/apache/gluten/runtime/RuntimeAware.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.exec;
+package org.apache.gluten.runtime;
/**
* This defines the base abstraction for the contextual objects that can be
transmitted to C++ side
diff --git
a/gluten-data/src/main/java/org/apache/gluten/exec/RuntimeJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/runtime/RuntimeJniWrapper.java
similarity index 97%
rename from
gluten-data/src/main/java/org/apache/gluten/exec/RuntimeJniWrapper.java
rename to
gluten-data/src/main/java/org/apache/gluten/runtime/RuntimeJniWrapper.java
index d2a18e9b4..80f9509d9 100644
--- a/gluten-data/src/main/java/org/apache/gluten/exec/RuntimeJniWrapper.java
+++ b/gluten-data/src/main/java/org/apache/gluten/runtime/RuntimeJniWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.exec;
+package org.apache.gluten.runtime;
import org.apache.gluten.memory.listener.ReservationListener;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchInIterator.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchInIterator.java
index c147862d0..ef7d7167c 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchInIterator.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchInIterator.java
@@ -18,8 +18,8 @@ package org.apache.gluten.vectorized;
import org.apache.gluten.columnarbatch.ColumnarBatchJniWrapper;
import org.apache.gluten.columnarbatch.ColumnarBatches;
-import org.apache.gluten.exec.Runtimes;
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators;
+import org.apache.gluten.runtime.Runtimes;
import org.apache.spark.sql.vectorized.ColumnarBatch;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
index 9dd040438..4f436e58d 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
@@ -17,9 +17,9 @@
package org.apache.gluten.vectorized;
import org.apache.gluten.columnarbatch.ColumnarBatches;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
import org.apache.gluten.metrics.IMetrics;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
import org.apache.spark.sql.vectorized.ColumnarBatch;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
index bfe0d7561..d78cbdab2 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.vectorized;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
public class ColumnarBatchSerializerJniWrapper implements RuntimeAware {
private final Runtime runtime;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
index ffcb77ad3..947f4c816 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.vectorized;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
public class NativeColumnarToRowJniWrapper implements RuntimeAware {
private final Runtime runtime;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/NativePlanEvaluator.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativePlanEvaluator.java
index e5eea029b..8fb18e439 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/NativePlanEvaluator.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativePlanEvaluator.java
@@ -17,11 +17,11 @@
package org.apache.gluten.vectorized;
import org.apache.gluten.backendsapi.BackendsApiManager;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.Runtimes;
import org.apache.gluten.memory.memtarget.MemoryTarget;
import org.apache.gluten.memory.memtarget.Spiller;
import org.apache.gluten.memory.memtarget.Spillers;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.Runtimes;
import org.apache.gluten.utils.DebugUtil;
import org.apache.gluten.validate.NativePlanValidationInfo;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java
index 1185d52fe..c561174b2 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/NativeRowToColumnarJniWrapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.vectorized;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
public class NativeRowToColumnarJniWrapper implements RuntimeAware {
private final Runtime runtime;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java
index eecd7c9e2..ee6a26a41 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/PlanEvaluatorJniWrapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.vectorized;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
import org.apache.gluten.validate.NativePlanValidationInfo;
/**
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java
index 515486e45..3d2f9e119 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleReaderJniWrapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.vectorized;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
public class ShuffleReaderJniWrapper implements RuntimeAware {
private final Runtime runtime;
diff --git
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java
index 1d622d491..23c7118af 100644
---
a/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java
+++
b/gluten-data/src/main/java/org/apache/gluten/vectorized/ShuffleWriterJniWrapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.gluten.vectorized;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.RuntimeAware;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.RuntimeAware;
import java.io.IOException;
diff --git a/gluten-data/src/main/scala/org/apache/gluten/exec/Runtime.scala
b/gluten-data/src/main/scala/org/apache/gluten/runtime/Runtime.scala
similarity index 97%
rename from gluten-data/src/main/scala/org/apache/gluten/exec/Runtime.scala
rename to gluten-data/src/main/scala/org/apache/gluten/runtime/Runtime.scala
index 1f632659e..8edceea44 100644
--- a/gluten-data/src/main/scala/org/apache/gluten/exec/Runtime.scala
+++ b/gluten-data/src/main/scala/org/apache/gluten/runtime/Runtime.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.exec
+package org.apache.gluten.runtime
import org.apache.gluten.GlutenConfig
import org.apache.gluten.backendsapi.BackendsApiManager
@@ -44,7 +44,7 @@ trait Runtime {
}
object Runtime {
- private[exec] def apply(name: String): Runtime with TaskResource = {
+ private[runtime] def apply(name: String): Runtime with TaskResource = {
new RuntimeImpl(name)
}
diff --git a/gluten-data/src/main/scala/org/apache/gluten/exec/Runtimes.scala
b/gluten-data/src/main/scala/org/apache/gluten/runtime/Runtimes.scala
similarity index 97%
rename from gluten-data/src/main/scala/org/apache/gluten/exec/Runtimes.scala
rename to gluten-data/src/main/scala/org/apache/gluten/runtime/Runtimes.scala
index 3614fe05f..6d5e11afe 100644
--- a/gluten-data/src/main/scala/org/apache/gluten/exec/Runtimes.scala
+++ b/gluten-data/src/main/scala/org/apache/gluten/runtime/Runtimes.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gluten.exec
+package org.apache.gluten.runtime
import org.apache.spark.util.{TaskResource, TaskResources}
diff --git
a/gluten-data/src/main/scala/org/apache/gluten/vectorized/ColumnarBatchSerializer.scala
b/gluten-data/src/main/scala/org/apache/gluten/vectorized/ColumnarBatchSerializer.scala
index 379fb4885..0bd78cb92 100644
---
a/gluten-data/src/main/scala/org/apache/gluten/vectorized/ColumnarBatchSerializer.scala
+++
b/gluten-data/src/main/scala/org/apache/gluten/vectorized/ColumnarBatchSerializer.scala
@@ -17,8 +17,8 @@
package org.apache.gluten.vectorized
import org.apache.gluten.GlutenConfig
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.utils.ArrowAbiUtil
import org.apache.spark.SparkEnv
diff --git
a/gluten-data/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala
b/gluten-data/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala
index d62ff1d68..08535a393 100644
---
a/gluten-data/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala
+++
b/gluten-data/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala
@@ -18,8 +18,8 @@ package org.apache.spark.shuffle
import org.apache.gluten.GlutenConfig
import org.apache.gluten.columnarbatch.ColumnarBatches
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.memory.memtarget.{MemoryTarget, Spiller, Spillers}
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.vectorized._
import org.apache.spark._
diff --git
a/gluten-data/src/main/scala/org/apache/spark/sql/execution/ColumnarBuildSideRelation.scala
b/gluten-data/src/main/scala/org/apache/spark/sql/execution/ColumnarBuildSideRelation.scala
index 9f13ea967..cb65dbca4 100644
---
a/gluten-data/src/main/scala/org/apache/spark/sql/execution/ColumnarBuildSideRelation.scala
+++
b/gluten-data/src/main/scala/org/apache/spark/sql/execution/ColumnarBuildSideRelation.scala
@@ -17,8 +17,8 @@
package org.apache.spark.sql.execution
import org.apache.gluten.columnarbatch.ColumnarBatches
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.sql.shims.SparkShimLoader
import org.apache.gluten.utils.ArrowAbiUtil
import org.apache.gluten.utils.iterator.Iterators
diff --git
a/gluten-data/src/main/scala/org/apache/spark/sql/execution/utils/ExecUtil.scala
b/gluten-data/src/main/scala/org/apache/spark/sql/execution/utils/ExecUtil.scala
index 94bdc73a5..65b06214e 100644
---
a/gluten-data/src/main/scala/org/apache/spark/sql/execution/utils/ExecUtil.scala
+++
b/gluten-data/src/main/scala/org/apache/spark/sql/execution/utils/ExecUtil.scala
@@ -17,8 +17,8 @@
package org.apache.spark.sql.execution.utils
import org.apache.gluten.columnarbatch.ColumnarBatches
-import org.apache.gluten.exec.Runtimes
import org.apache.gluten.memory.arrow.alloc.ArrowBufferAllocators
+import org.apache.gluten.runtime.Runtimes
import org.apache.gluten.utils.iterator.Iterators
import org.apache.gluten.vectorized.{ArrowWritableColumnVector,
NativeColumnarToRowInfo, NativeColumnarToRowJniWrapper, NativePartitioning}
diff --git
a/gluten-uniffle/velox/src/main/java/org/apache/spark/shuffle/writer/VeloxUniffleColumnarShuffleWriter.java
b/gluten-uniffle/velox/src/main/java/org/apache/spark/shuffle/writer/VeloxUniffleColumnarShuffleWriter.java
index d2032fa48..d505260b8 100644
---
a/gluten-uniffle/velox/src/main/java/org/apache/spark/shuffle/writer/VeloxUniffleColumnarShuffleWriter.java
+++
b/gluten-uniffle/velox/src/main/java/org/apache/spark/shuffle/writer/VeloxUniffleColumnarShuffleWriter.java
@@ -18,11 +18,11 @@ package org.apache.spark.shuffle.writer;
import org.apache.gluten.GlutenConfig;
import org.apache.gluten.columnarbatch.ColumnarBatches;
-import org.apache.gluten.exec.Runtime;
-import org.apache.gluten.exec.Runtimes;
import org.apache.gluten.memory.memtarget.MemoryTarget;
import org.apache.gluten.memory.memtarget.Spiller;
import org.apache.gluten.memory.memtarget.Spillers;
+import org.apache.gluten.runtime.Runtime;
+import org.apache.gluten.runtime.Runtimes;
import org.apache.gluten.vectorized.ShuffleWriterJniWrapper;
import org.apache.gluten.vectorized.SplitResult;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
