Skip to content
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

[VL] Minor class name / package name clean-ups #6720

Merged
merged 6 commits into from
Aug 9, 2024
Merged

[VL] Minor class name / package name clean-ups #6720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3be4e24
Rename tests
zhztheplayer Aug 6, 2024
30ef67d
rename package
zhztheplayer Aug 6, 2024
9fe5bb7
fixup
zhztheplayer Aug 8, 2024
b2635f9
fixup
zhztheplayer Aug 8, 2024
bf8159b
fixup
zhztheplayer Aug 8, 2024
da0c9ee
fixup
zhztheplayer Aug 8, 2024
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 backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions backends-velox/src/main/java/org/apache/gluten/utils/VeloxBloomFilterJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxTransformerApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/main/scala/org/apache/gluten/execution/RowToVeloxColumnarExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/main/scala/org/apache/gluten/utils/DatasourceUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/main/scala/org/apache/spark/sql/execution/BroadcastUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion ...s-velox/src/main/scala/org/apache/spark/sql/execution/ColumnarCachedBatchSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ain/scala/org/apache/spark/sql/execution/datasources/velox/VeloxFormatWriterInjects.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../execution/DynamicOffHeapSizingTest.scala → ...execution/DynamicOffHeapSizingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ...ten/execution/FunctionsValidateTest.scala → ...en/execution/FunctionsValidateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = _
Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class ScalarFunctionsValidateSuiteRasOn extends ScalarFunctionsValidateSuite {
}
}

abstract class ScalarFunctionsValidateSuite extends FunctionsValidateTest {
abstract class ScalarFunctionsValidateSuite extends FunctionsValidateSuite {
disableFallbackCheck
import testImplicits._

Expand Down
2 changes: 1 addition & 1 deletion backends-velox/src/test/scala/org/apache/gluten/execution/WindowFunctionsValidateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions ...apache/gluten/fuzzer/FuzzerTestBase.scala → ...org/apache/gluten/fuzzer/FuzzerBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...ache/gluten/fuzzer/FuzzerTestResult.scala → ...g/apache/gluten/fuzzer/FuzzerResult.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.gluten.fuzzer

object FuzzerTestResult {
object FuzzerResult {
trait TestResult {
val seed: Long

Expand Down
4 changes: 2 additions & 2 deletions ...uten/fuzzer/RowToColumnarFuzzerTest.scala → ...e/gluten/fuzzer/RowToColumnarFuzzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
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
import org.apache.spark.sql.DataFrame

@FuzzerTest
@SkipTestTags
class RowToColumnarFuzzerTest extends FuzzerTestBase {
class RowToColumnarFuzzer extends FuzzerBase {

override protected def sparkConf: SparkConf = {
super.sparkConf
Expand Down
4 changes: 2 additions & 2 deletions ...uten/fuzzer/ShuffleWriterFuzzerTest.scala → ...e/gluten/fuzzer/ShuffleWriterFuzzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
*/
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
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 =
Expand Down
2 changes: 1 addition & 1 deletion cpp/core/jni/JniCommon.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions cpp/core/jni/JniWrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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) {
Expand All @@ -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,
Expand All @@ -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) {
Expand All @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions dev/build_arrow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down
2 changes: 1 addition & 1 deletion ...rn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
4 changes: 2 additions & 2 deletions gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatchJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions gluten-data/src/main/java/org/apache/gluten/columnarbatch/ColumnarBatches.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion gluten-data/src/main/java/org/apache/gluten/columnarbatch/IndicatorVectorBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions gluten-data/src/main/java/org/apache/gluten/datasource/DatasourceJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion .../org/apache/gluten/exec/RuntimeAware.java → ...g/apache/gluten/runtime/RuntimeAware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...apache/gluten/exec/RuntimeJniWrapper.java → ...che/gluten/runtime/RuntimeJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchInIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

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;

Expand Down
4 changes: 2 additions & 2 deletions gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...en-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchSerializerJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions gluten-data/src/main/java/org/apache/gluten/vectorized/NativeColumnarToRowJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading