Skip to content

Commit 8aacd7b

Browse files
committed
Move GlutenConfig.scala to package dir
1 parent 4867d60 commit 8aacd7b

File tree

220 files changed

+228
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+228
-222
lines changed

backends-clickhouse/src-celeborn/main/scala/org/apache/spark/shuffle/CHCelebornColumnarBatchSerializer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.spark.shuffle
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings
2120
import org.apache.gluten.vectorized.BlockOutputStream
2221
import org.apache.gluten.vectorized.CHStreamReader
@@ -28,6 +27,7 @@ import org.apache.spark.sql.execution.metric.SQLMetric
2827
import org.apache.spark.sql.vectorized.ColumnarBatch
2928

3029
import org.apache.celeborn.client.read.CelebornInputStream
30+
import org.apache.gluten.config.GlutenConfig
3131

3232
import java.io._
3333
import java.nio.ByteBuffer

backends-clickhouse/src-celeborn/main/scala/org/apache/spark/shuffle/CHCelebornColumnarShuffleWriter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.spark.shuffle
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings
2120
import org.apache.gluten.execution.ColumnarNativeIterator
2221
import org.apache.gluten.memory.CHThreadGroup
@@ -30,6 +29,7 @@ import org.apache.spark.sql.vectorized.ColumnarBatch
3029
import org.apache.celeborn.client.ShuffleClient
3130
import org.apache.celeborn.common.CelebornConf
3231
import org.apache.celeborn.common.protocol.ShuffleMode
32+
import org.apache.gluten.config.GlutenConfig
3333

3434
import java.io.IOException
3535
import java.util.Locale

backends-clickhouse/src-delta-32/main/scala/org/apache/spark/sql/delta/ClickhouseOptimisticTransaction.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.spark.sql.delta
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHConf
2120

2221
import org.apache.spark.SparkException
@@ -38,6 +37,7 @@ import org.apache.spark.sql.internal.SQLConf
3837
import org.apache.spark.util.SerializableConfiguration
3938

4039
import org.apache.commons.lang3.exception.ExceptionUtils
40+
import org.apache.gluten.config.GlutenConfig
4141
import org.apache.hadoop.fs.Path
4242
import org.apache.spark.sql.delta.perf.DeltaOptimizedWriterExec
4343

backends-clickhouse/src-delta-32/test/scala/org/apache/spark/sql/execution/datasources/DeltaV1WritesSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.spark.sql.execution.datasources
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020
import org.apache.gluten.execution.{GlutenClickHouseWholeStageTransformerSuite, GlutenPlan, SortExecTransformer}
2121
import org.apache.spark.SparkConf
2222
import org.apache.spark.sql.execution.datasources.parquet.ParquetFileFormat

backends-clickhouse/src-iceberg/test/scala/org/apache/gluten/execution/iceberg/ClickHouseIcebergSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.execution.iceberg
1818

19+
import org.apache.gluten.config.GlutenConfig
1920
import org.apache.gluten.execution.{GlutenClickHouseWholeStageTransformerSuite, IcebergScanTransformer}
20-
import org.apache.gluten.GlutenConfig
2121
import org.apache.spark.SparkConf
2222
import org.apache.spark.sql.Row
2323

backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHNativeExpressionEvaluator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.vectorized;
1818

19-
import org.apache.gluten.GlutenConfig;
2019
import org.apache.gluten.backendsapi.BackendsApiManager;
20+
import org.apache.gluten.config.GlutenConfig;
2121
import org.apache.gluten.execution.ColumnarNativeIterator;
2222
import org.apache.gluten.memory.CHThreadGroup;
2323
import org.apache.gluten.utils.ConfigUtil;

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBackend.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package org.apache.gluten.backendsapi.clickhouse
1818

1919
import org.apache.gluten.GlutenBuildInfo._
20-
import org.apache.gluten.GlutenConfig
2120
import org.apache.gluten.backendsapi._
2221
import org.apache.gluten.columnarbatch.CHBatch
2322
import org.apache.gluten.component.Component.BuildInfo
23+
import org.apache.gluten.config.GlutenConfig
2424
import org.apache.gluten.execution.WriteFilesExecTransformer
2525
import org.apache.gluten.expression.WindowFunctionsBuilder
2626
import org.apache.gluten.extension.ValidationResult

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHConf.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.backendsapi.clickhouse
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.SparkConf
2222
import org.apache.spark.sql.internal.SQLConf

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHIteratorApi.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.backendsapi.clickhouse
1818

19-
import org.apache.gluten.GlutenNumaBindingInfo
2019
import org.apache.gluten.backendsapi.IteratorApi
20+
import org.apache.gluten.config.GlutenNumaBindingInfo
2121
import org.apache.gluten.execution._
2222
import org.apache.gluten.expression.ConverterUtils
2323
import org.apache.gluten.logging.LogLevelUtil

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHListenerApi.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
*/
1717
package org.apache.gluten.backendsapi.clickhouse
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.ListenerApi
2120
import org.apache.gluten.columnarbatch.CHBatch
21+
import org.apache.gluten.config.GlutenConfig
2222
import org.apache.gluten.execution.CHBroadcastBuildSideCache
2323
import org.apache.gluten.execution.datasource.GlutenFormatFactory
2424
import org.apache.gluten.expression.UDFMappings

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
*/
1717
package org.apache.gluten.backendsapi.clickhouse
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.RuleApi
2120
import org.apache.gluten.columnarbatch.CHBatch
21+
import org.apache.gluten.config.GlutenConfig
2222
import org.apache.gluten.extension._
2323
import org.apache.gluten.extension.columnar._
2424
import org.apache.gluten.extension.columnar.MiscColumnarRules.{RemoveGlutenTableCacheColumnarToRow, RemoveTopmostColumnarToRow, RewriteSubqueryBroadcast}

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.backendsapi.clickhouse
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.{BackendsApiManager, SparkPlanExecApi}
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.exception.{GlutenException, GlutenNotSupportException}
2222
import org.apache.gluten.execution._
2323
import org.apache.gluten.expression._

backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHValidatorApi.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.backendsapi.clickhouse
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.ValidatorApi
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.expression.ExpressionConverter
2222
import org.apache.gluten.extension.ValidationResult
2323
import org.apache.gluten.substrait.SubstraitContext

backends-clickhouse/src/main/scala/org/apache/gluten/extension/CommonSubexpressionEliminateRule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.extension
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.internal.Logging
2222
import org.apache.spark.sql.SparkSession

backends-clickhouse/src/main/scala/org/apache/gluten/extension/CountDistinctWithoutExpand.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.extension
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, Count, CountDistinct}
2222
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan

backends-clickhouse/src/main/scala/org/apache/gluten/extension/ExtendedColumnPruning.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.extension
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.internal.Logging
2222
import org.apache.spark.sql.SparkSession

backends-clickhouse/src/main/scala/org/apache/gluten/extension/FallbackBroadcastHashJoinRules.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.extension
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.BackendsApiManager
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.extension.columnar.FallbackTags
2222

2323
import org.apache.spark.sql.SparkSession

backends-clickhouse/src/main/scala/org/apache/gluten/extension/RewriteDateTimestampComparisonRule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.extension
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.internal.Logging
2222
import org.apache.spark.sql.SparkSession

backends-clickhouse/src/main/scala/org/apache/gluten/extension/RewriteToDateExpresstionRule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.extension
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.internal.Logging
2222
import org.apache.spark.sql.SparkSession

backends-clickhouse/src/main/scala/org/apache/gluten/extension/WriteFilesWithBucketValue.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.extension
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.sql.catalyst.expressions.{Alias, BitwiseAnd, Expression, HiveHash, Literal, Pmod}
2222
import org.apache.spark.sql.catalyst.plans.physical.HashPartitioning

backends-clickhouse/src/main/scala/org/apache/gluten/vectorized/CHColumnarBatchSerializer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.vectorized
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings
20+
import org.apache.gluten.config.GlutenConfig
2121

2222
import org.apache.spark.SparkEnv
2323
import org.apache.spark.internal.Logging

backends-clickhouse/src/main/scala/org/apache/spark/rpc/GlutenDriverEndpoint.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.spark.rpc
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.SparkEnv
2222
import org.apache.spark.internal.Logging

backends-clickhouse/src/main/scala/org/apache/spark/shuffle/CHColumnarShuffleWriter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.spark.shuffle
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.execution.ColumnarNativeIterator
2222
import org.apache.gluten.memory.CHThreadGroup
2323
import org.apache.gluten.vectorized._

backends-clickhouse/src/main/scala/org/apache/spark/sql/catalyst/CHAggregateFunctionRewriteRule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.spark.sql.catalyst
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.sql.SparkSession
2222
import org.apache.spark.sql.catalyst.expressions.Cast

backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHParquetWriterInjects.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.spark.sql.execution.datasources.v1
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.sql.internal.SQLConf
2222

backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/utils/CHExecUtil.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.spark.sql.execution.utils
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.expression.ConverterUtils
2222
import org.apache.gluten.row.SparkRowInfo
2323
import org.apache.gluten.vectorized._
@@ -32,7 +32,7 @@ import org.apache.spark.shuffle.utils.RangePartitionerBoundsGenerator
3232
import org.apache.spark.sql.catalyst.InternalRow
3333
import org.apache.spark.sql.catalyst.expressions.{Attribute, BindReferences, BoundReference, UnsafeProjection, UnsafeRow}
3434
import org.apache.spark.sql.catalyst.expressions.codegen.LazilyGeneratedOrdering
35-
import org.apache.spark.sql.catalyst.plans.physical.{SinglePartition, _}
35+
import org.apache.spark.sql.catalyst.plans.physical._
3636
import org.apache.spark.sql.execution.SparkPlan
3737
import org.apache.spark.sql.execution.exchange.ShuffleExchangeExec
3838
import org.apache.spark.sql.execution.metric.{SQLMetric, SQLShuffleWriteMetricsReporter}

backends-clickhouse/src/test/scala/org/apache/gluten/RunTPCHTest.scala

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package org.apache.gluten
1818

1919
import org.apache.gluten.backendsapi.clickhouse.RuntimeConfig
2020
import org.apache.gluten.benchmarks.GenTPCHTableScripts
21+
import org.apache.gluten.config.GlutenConfig
2122

2223
import org.apache.spark.sql.SparkSession
2324
import org.apache.spark.sql.execution.datasources.v2.clickhouse.ClickHouseConfig

backends-clickhouse/src/test/scala/org/apache/gluten/affinity/CHUTAffinity.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.affinity
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHBackendSettings
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.softaffinity.AffinityManager
2222

2323
import org.apache.spark.affinity.MixedAffinity

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseDeltaParquetWriteSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.SparkConf
2222
import org.apache.spark.gluten.delta.DeltaStatsUtils

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHConf
20+
import org.apache.gluten.config.GlutenConfig
2121

2222
import org.apache.spark.SparkConf
2323
import org.apache.spark.sql.{functions, DataFrame, Row}

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseJoinSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.CHConf
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.utils.UTSystemParameters
2222

2323
import org.apache.spark.SparkConf

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseNativeExceptionSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020
import org.apache.gluten.utils.{TestExceptionUtils, UTSystemParameters}
2121

2222
import org.apache.spark.SparkConf

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseNativeLibSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020
import org.apache.gluten.exception.GlutenException
2121
import org.apache.gluten.utils.UTSystemParameters
2222

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseSyntheticDataSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020
import org.apache.gluten.utils.UTSystemParameters
2121

2222
import org.apache.spark.SparkConf

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSAbstractSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.benchmarks.GenTPCDSTableScripts
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.utils.{Arm, UTSystemParameters}
2222

2323
import org.apache.spark.SparkConf

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHAbstractSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020
import org.apache.gluten.utils.UTSystemParameters
2121

2222
import org.apache.spark.SparkConf

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHNullableSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
19+
import org.apache.gluten.config.GlutenConfig
2020

2121
import org.apache.spark.SparkConf
2222
import org.apache.spark.sql.catalyst.expressions.Alias

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.gluten.execution
1818

19-
import org.apache.gluten.GlutenConfig
2019
import org.apache.gluten.backendsapi.clickhouse.RuntimeConfig
20+
import org.apache.gluten.config.GlutenConfig
2121
import org.apache.gluten.utils.UTSystemParameters
2222

2323
import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf}

0 commit comments

Comments
 (0)