This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new c8728b18e [spark] Add paimon prefix to objects under spark sql package
(#3170)
c8728b18e is described below
commit c8728b18e2a932edffdaf307e7bac8b79e1f263d
Author: Zouxxyy <[email protected]>
AuthorDate: Tue Apr 9 10:23:48 2024 +0800
[spark] Add paimon prefix to objects under spark sql package (#3170)
---
.../spark/sql/{StatsUtils.scala => PaimonStatsUtils.scala} | 2 +-
.../spark/sql/{StatsUtils.scala => PaimonStatsUtils.scala} | 2 +-
.../java/org/apache/paimon/spark/SparkGenericCatalog.java | 4 ++--
.../org/apache/paimon/spark/procedure/CompactProcedure.java | 4 ++--
.../main/scala/org/apache/paimon/spark/PaimonMetrics.scala | 6 +++---
.../org/apache/paimon/spark/PaimonRecordReaderIterator.scala | 6 +++---
.../src/main/scala/org/apache/paimon/spark/PaimonScan.scala | 2 +-
.../scala/org/apache/paimon/spark/PaimonStatistics.scala | 4 ++--
.../catalyst/analysis/expressions/ExpressionHelper.scala | 2 +-
.../paimon/spark/commands/DeleteFromPaimonTableCommand.scala | 2 +-
.../apache/paimon/spark/commands/MergeIntoPaimonTable.scala | 2 +-
.../spark/commands/PaimonAnalyzeTableColumnCommand.scala | 12 ++++++------
.../org/apache/paimon/spark/commands/PaimonCommand.scala | 2 +-
.../commands/PaimonDynamicPartitionOverwriteCommand.scala | 2 +-
.../paimon/spark/commands/UpdatePaimonTableCommand.scala | 2 +-
.../scala/org/apache/paimon/spark/sources/PaimonSink.scala | 4 ++--
.../paimon/spark/statistics/StatisticsHelperBase.scala | 4 ++--
.../spark/sql/{StatsUtils.scala => PaimonStatsUtils.scala} | 2 +-
.../org/apache/spark/sql/{Utils.scala => PaimonUtils.scala} | 2 +-
.../catalog/{CatalogUtils.scala => PaimonCatalogUtils.scala} | 2 +-
20 files changed, 34 insertions(+), 34 deletions(-)
diff --git
a/paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/spark/sql/StatsUtils.scala
b/paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
similarity index 99%
rename from
paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/spark/sql/StatsUtils.scala
rename to
paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
index 802d1fe19..bcefa32e3 100644
---
a/paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/spark/sql/StatsUtils.scala
+++
b/paimon-spark/paimon-spark-3.1/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
@@ -27,7 +27,7 @@ import org.apache.spark.sql.types.{BinaryType, BooleanType,
DataType, DateType,
import java.net.URI
-object StatsUtils {
+object PaimonStatsUtils {
def calculateTotalSize(
sessionState: SessionState,
diff --git
a/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/spark/sql/StatsUtils.scala
b/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
similarity index 99%
rename from
paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/spark/sql/StatsUtils.scala
rename to
paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
index 10dc54ff4..f3a2ad3aa 100644
---
a/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/spark/sql/StatsUtils.scala
+++
b/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
@@ -27,7 +27,7 @@ import org.apache.spark.sql.types.{BinaryType, BooleanType,
DataType, DateType,
import java.net.URI
-object StatsUtils {
+object PaimonStatsUtils {
def calculateTotalSize(
sessionState: SessionState,
tableName: String,
diff --git
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java
b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java
index 3bdff7376..62674bf54 100644
---
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java
+++
b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java
@@ -38,10 +38,10 @@ import
org.apache.spark.sql.catalyst.catalog.InMemoryCatalog;
import org.apache.spark.sql.catalyst.catalog.SessionCatalog;
import org.apache.spark.sql.connector.catalog.CatalogExtension;
import org.apache.spark.sql.connector.catalog.CatalogPlugin;
-import org.apache.spark.sql.connector.catalog.CatalogUtils;
import org.apache.spark.sql.connector.catalog.FunctionCatalog;
import org.apache.spark.sql.connector.catalog.Identifier;
import org.apache.spark.sql.connector.catalog.NamespaceChange;
+import org.apache.spark.sql.connector.catalog.PaimonCatalogUtils;
import org.apache.spark.sql.connector.catalog.SupportsNamespaces;
import org.apache.spark.sql.connector.catalog.Table;
import org.apache.spark.sql.connector.catalog.TableCatalog;
@@ -260,7 +260,7 @@ public class SparkGenericCatalog extends SparkBaseCatalog
implements CatalogExte
hadoopConf.set(entry.getKey(), entry.getValue());
}
ExternalCatalog externalCatalog =
- CatalogUtils.buildExternalCatalog(sparkConf, hadoopConf);
+ PaimonCatalogUtils.buildExternalCatalog(sparkConf,
hadoopConf);
this.sessionCatalog = new V2SessionCatalog(new
SessionCatalog(externalCatalog));
}
}
diff --git
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CompactProcedure.java
b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CompactProcedure.java
index 1c5662025..51fa6bd6e 100644
---
a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CompactProcedure.java
+++
b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CompactProcedure.java
@@ -51,8 +51,8 @@ import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.api.java.function.FlatMapFunction;
import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.PaimonUtils;
import org.apache.spark.sql.Row;
-import org.apache.spark.sql.Utils;
import org.apache.spark.sql.catalyst.InternalRow;
import org.apache.spark.sql.catalyst.expressions.Expression;
import org.apache.spark.sql.catalyst.plans.logical.Filter;
@@ -363,7 +363,7 @@ public class CompactProcedure extends BaseProcedure {
LogicalPlan relation,
@Nullable Expression condition) {
Dataset<Row> row =
- Utils.createDataset(
+ PaimonUtils.createDataset(
spark(), condition == null ? relation : new
Filter(condition, relation));
new WriteIntoPaimonTable(
table,
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonMetrics.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonMetrics.scala
index 0acdffb39..da7ea7be8 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonMetrics.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonMetrics.scala
@@ -18,7 +18,7 @@
package org.apache.paimon.spark
-import org.apache.spark.sql.Utils
+import org.apache.spark.sql.PaimonUtils
import org.apache.spark.sql.connector.metric.{CustomAvgMetric,
CustomSumMetric, CustomTaskMetric}
import java.text.DecimalFormat
@@ -85,7 +85,7 @@ case class PaimonSplitSizeMetric() extends PaimonSumMetric {
override def description(): String = "size of splits read"
override def aggregateTaskMetrics(taskMetrics: Array[Long]): String = {
- Utils.bytesToString(aggregateTaskMetrics0(taskMetrics))
+ PaimonUtils.bytesToString(aggregateTaskMetrics0(taskMetrics))
}
}
@@ -119,7 +119,7 @@ case class PaimonAvgSplitSizeMetric() extends
PaimonAvgMetric {
override def aggregateTaskMetrics(taskMetrics: Array[Long]): String = {
val average = aggregateTaskMetrics0(taskMetrics).round
- Utils.bytesToString(average)
+ PaimonUtils.bytesToString(average)
}
}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonRecordReaderIterator.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonRecordReaderIterator.scala
index 3debb5e18..36fb03fd6 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonRecordReaderIterator.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonRecordReaderIterator.scala
@@ -23,7 +23,7 @@ import org.apache.paimon.fs.Path
import org.apache.paimon.reader.{FileRecordIterator, RecordReader}
import org.apache.paimon.utils.CloseableIterator
-import org.apache.spark.sql.Utils
+import org.apache.spark.sql.PaimonUtils
import java.io.IOException
@@ -61,7 +61,7 @@ case class PaimonRecordReaderIterator(reader:
RecordReader[PaimonInternalRow])
}
} finally {
reader.close()
- Utils.unsetInputFileName()
+ PaimonUtils.unsetInputFileName()
}
}
@@ -70,7 +70,7 @@ case class PaimonRecordReaderIterator(reader:
RecordReader[PaimonInternalRow])
iter match {
case fileRecordIterator: FileRecordIterator[_] =>
if (lastFilePath != fileRecordIterator.filePath()) {
- Utils.setInputFileName(fileRecordIterator.filePath().toUri.toString)
+
PaimonUtils.setInputFileName(fileRecordIterator.filePath().toUri.toString)
lastFilePath = fileRecordIterator.filePath()
}
case _ =>
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonScan.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonScan.scala
index 6cd5ef0ed..7f1900e2d 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonScan.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonScan.scala
@@ -21,7 +21,7 @@ package org.apache.paimon.spark
import org.apache.paimon.predicate.Predicate
import org.apache.paimon.table.Table
-import org.apache.spark.sql.Utils.fieldReference
+import org.apache.spark.sql.PaimonUtils.fieldReference
import org.apache.spark.sql.connector.expressions.NamedReference
import org.apache.spark.sql.connector.read.SupportsRuntimeFiltering
import org.apache.spark.sql.sources.{Filter, In}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonStatistics.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonStatistics.scala
index 865af3957..d31820cb3 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonStatistics.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/PaimonStatistics.scala
@@ -22,7 +22,7 @@ import org.apache.paimon.stats
import org.apache.paimon.stats.ColStats
import org.apache.paimon.types.DataType
-import org.apache.spark.sql.Utils
+import org.apache.spark.sql.PaimonUtils
import org.apache.spark.sql.catalyst.plans.logical.ColumnStat
import org.apache.spark.sql.connector.expressions.NamedReference
import org.apache.spark.sql.connector.read.Statistics
@@ -59,7 +59,7 @@ case class PaimonStatistics[T <: PaimonBaseScan](scan: T)
extends Statistics {
.forEach(
f =>
resultMap.put(
- Utils.fieldReference(f.name()),
+ PaimonUtils.fieldReference(f.name()),
PaimonColumnStats(f.`type`(), paimonColStats.get(f.name()))))
}
resultMap
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/expressions/ExpressionHelper.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/expressions/ExpressionHelper.scala
index 4e7a8109b..e80186767 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/expressions/ExpressionHelper.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/expressions/ExpressionHelper.scala
@@ -22,8 +22,8 @@ import org.apache.paimon.predicate.{Predicate,
PredicateBuilder}
import org.apache.paimon.spark.SparkFilterConverter
import org.apache.paimon.types.RowType
+import org.apache.spark.sql.PaimonUtils.{normalizeExprs, translateFilter}
import org.apache.spark.sql.SparkSession
-import org.apache.spark.sql.Utils.{normalizeExprs, translateFilter}
import org.apache.spark.sql.catalyst.analysis.Resolver
import org.apache.spark.sql.catalyst.expressions.{Alias, And, Attribute, Cast,
Expression, GetStructField, Literal, PredicateHelper, SubqueryExpression}
import org.apache.spark.sql.catalyst.plans.logical.{Filter, LogicalPlan}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/DeleteFromPaimonTableCommand.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/DeleteFromPaimonTableCommand.scala
index 457467da1..95efb7a23 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/DeleteFromPaimonTableCommand.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/DeleteFromPaimonTableCommand.scala
@@ -29,7 +29,7 @@ import org.apache.paimon.table.sink.{BatchWriteBuilder,
CommitMessage}
import org.apache.paimon.types.RowKind
import org.apache.spark.sql.{Row, SparkSession}
-import org.apache.spark.sql.Utils.createDataset
+import org.apache.spark.sql.PaimonUtils.createDataset
import org.apache.spark.sql.catalyst.expressions.{And, Expression, Not}
import org.apache.spark.sql.catalyst.expressions.Literal.TrueLiteral
import org.apache.spark.sql.catalyst.plans.logical.{Filter, SupportsSubquery}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/MergeIntoPaimonTable.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/MergeIntoPaimonTable.scala
index ffd09dcdb..ae95b7548 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/MergeIntoPaimonTable.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/MergeIntoPaimonTable.scala
@@ -27,7 +27,7 @@ import org.apache.paimon.table.FileStoreTable
import org.apache.paimon.types.RowKind
import org.apache.spark.sql.{Column, Dataset, Row, SparkSession}
-import org.apache.spark.sql.Utils._
+import org.apache.spark.sql.PaimonUtils._
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
import org.apache.spark.sql.catalyst.expressions.{Alias, Attribute,
BasePredicate, Expression, Literal, UnsafeProjection}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonAnalyzeTableColumnCommand.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonAnalyzeTableColumnCommand.scala
index 19026ef05..5f9957dbe 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonAnalyzeTableColumnCommand.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonAnalyzeTableColumnCommand.scala
@@ -26,7 +26,7 @@ import org.apache.paimon.table.FileStoreTable
import org.apache.paimon.table.sink.BatchWriteBuilder
import org.apache.parquet.Preconditions
-import org.apache.spark.sql.{Row, SparkSession, StatsUtils}
+import org.apache.spark.sql.{PaimonStatsUtils, Row, SparkSession}
import org.apache.spark.sql.catalyst.expressions.Attribute
import org.apache.spark.sql.catalyst.plans.logical.ColumnStat
import org.apache.spark.sql.catalyst.util.DateTimeUtils
@@ -57,12 +57,12 @@ case class PaimonAnalyzeTableColumnCommand(
// compute stats
val attributes = getColumnsToAnalyze(relation, columnNames, allColumns)
- val totalSize = StatsUtils.calculateTotalSize(
+ val totalSize = PaimonStatsUtils.calculateTotalSize(
sparkSession.sessionState,
table.name(),
Some(table.location().toUri))
val (mergedRecordCount, colStats) =
- StatsUtils.computeColumnStats(sparkSession, relation, attributes)
+ PaimonStatsUtils.computeColumnStats(sparkSession, relation, attributes)
val totalRecordCount = currentSnapshot.totalRecordCount()
Preconditions.checkState(
@@ -113,7 +113,7 @@ case class PaimonAnalyzeTableColumnCommand(
}
columnsToAnalyze.foreach {
attr =>
- if (!StatsUtils.analyzeSupportsType(attr.dataType)) {
+ if (!PaimonStatsUtils.analyzeSupportsType(attr.dataType)) {
throw new UnsupportedOperationException(
s"Analyzing on col: ${attr.name}, data type: ${attr.dataType} is
not supported.")
}
@@ -148,12 +148,12 @@ case class PaimonAnalyzeTableColumnCommand(
}
/**
- * Convert data from spark type to paimon, only cover datatype meet
[[StatsUtils.hasMinMax]]
+ * Convert data from spark type to paimon, only cover datatype meet
[[PaimonStatsUtils.hasMinMax]]
* currently.
*/
private def toPaimonData(o: Any, dataType: DataType): Any = {
dataType match {
- case d if !StatsUtils.hasMinMax(d) =>
+ case d if !PaimonStatsUtils.hasMinMax(d) =>
// should not reach here
throw new UnsupportedOperationException(s"Unsupported data type $d,
value is $o.")
case _: DecimalType =>
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonCommand.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonCommand.scala
index 6a9afa9c2..da91ab1fb 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonCommand.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonCommand.scala
@@ -28,8 +28,8 @@ import org.apache.paimon.table.sink.{CommitMessage,
CommitMessageImpl}
import org.apache.paimon.table.source.DataSplit
import org.apache.paimon.types.RowType
+import org.apache.spark.sql.PaimonUtils.createDataset
import org.apache.spark.sql.SparkSession
-import org.apache.spark.sql.Utils.createDataset
import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression}
import org.apache.spark.sql.catalyst.expressions.Literal.TrueLiteral
import org.apache.spark.sql.catalyst.plans.logical.{Filter =>
FilterLogicalNode}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonDynamicPartitionOverwriteCommand.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonDynamicPartitionOverwriteCommand.scala
index 24056142f..1edcc99b8 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonDynamicPartitionOverwriteCommand.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonDynamicPartitionOverwriteCommand.scala
@@ -23,7 +23,7 @@ import org.apache.paimon.spark.DynamicOverWrite
import org.apache.paimon.table.FileStoreTable
import org.apache.spark.sql.{Row, SparkSession}
-import org.apache.spark.sql.Utils.createDataset
+import org.apache.spark.sql.PaimonUtils.createDataset
import org.apache.spark.sql.catalyst.analysis.NamedRelation
import org.apache.spark.sql.catalyst.plans.logical.{Command, LogicalPlan,
V2WriteCommand}
import org.apache.spark.sql.execution.command.RunnableCommand
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/UpdatePaimonTableCommand.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/UpdatePaimonTableCommand.scala
index fbfe01a3f..6c16ce5e8 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/UpdatePaimonTableCommand.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/commands/UpdatePaimonTableCommand.scala
@@ -27,7 +27,7 @@ import org.apache.paimon.table.sink.CommitMessage
import org.apache.paimon.types.RowKind
import org.apache.spark.sql.{Column, Row, SparkSession}
-import org.apache.spark.sql.Utils.createDataset
+import org.apache.spark.sql.PaimonUtils.createDataset
import org.apache.spark.sql.catalyst.expressions.{Alias, Expression, If}
import org.apache.spark.sql.catalyst.expressions.Literal.TrueLiteral
import org.apache.spark.sql.catalyst.plans.logical.{Assignment, Filter,
Project, SupportsSubquery}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/sources/PaimonSink.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/sources/PaimonSink.scala
index 59651cf1e..54a7a1114 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/sources/PaimonSink.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/sources/PaimonSink.scala
@@ -23,7 +23,7 @@ import org.apache.paimon.spark.{InsertInto, Overwrite}
import org.apache.paimon.spark.commands.{PaimonCommand, SchemaHelper,
WriteIntoPaimonTable}
import org.apache.paimon.table.FileStoreTable
-import org.apache.spark.sql.{DataFrame, SQLContext, Utils}
+import org.apache.spark.sql.{DataFrame, PaimonUtils, SQLContext}
import org.apache.spark.sql.execution.streaming.Sink
import org.apache.spark.sql.sources.AlwaysTrue
import org.apache.spark.sql.streaming.OutputMode
@@ -44,7 +44,7 @@ class PaimonSink(
InsertInto
}
partitionColumns.foreach(println)
- val newData = Utils.createNewDataFrame(data)
+ val newData = PaimonUtils.createNewDataFrame(data)
WriteIntoPaimonTable(originTable, saveMode, newData,
options).run(sqlContext.sparkSession)
}
}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/statistics/StatisticsHelperBase.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/statistics/StatisticsHelperBase.scala
index 85f40fdf3..275f17fe8 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/statistics/StatisticsHelperBase.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/statistics/StatisticsHelperBase.scala
@@ -20,7 +20,7 @@ package org.apache.paimon.spark.statistics
import org.apache.paimon.spark.PaimonColumnStats
-import org.apache.spark.sql.Utils
+import org.apache.spark.sql.PaimonUtils
import org.apache.spark.sql.catalyst.{SQLConfHelper, StructFilters}
import org.apache.spark.sql.catalyst.expressions.{Attribute,
AttributeReference, BoundReference, Expression}
import org.apache.spark.sql.catalyst.plans.logical
@@ -86,7 +86,7 @@ trait StatisticsHelperBase extends SQLConfHelper {
v1Stats.attributeStats.foreach {
case (attr, v1ColStats) =>
columnStatsMap.put(
- Utils.fieldReference(attr.name),
+ PaimonUtils.fieldReference(attr.name),
PaimonColumnStats(v1ColStats)
)
}
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/StatsUtils.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
similarity index 99%
rename from
paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/StatsUtils.scala
rename to
paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
index 57b4fbd29..3e3a8c9d3 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/StatsUtils.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/PaimonStatsUtils.scala
@@ -32,7 +32,7 @@ import java.net.URI
* [[org.apache.spark.sql]] package, Hence, use this class to adapt then so
that we can use them
* indirectly.
*/
-object StatsUtils {
+object PaimonStatsUtils {
def calculateTotalSize(
sessionState: SessionState,
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/Utils.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/PaimonUtils.scala
similarity index 99%
rename from
paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/Utils.scala
rename to
paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/PaimonUtils.scala
index 4767dab39..06a255ebb 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/Utils.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/PaimonUtils.scala
@@ -31,7 +31,7 @@ import org.apache.spark.util.{Utils => SparkUtils}
* [[org.apache.spark.sql]] package, Hence, use this class to adapt then so
that we can use them
* indirectly.
*/
-object Utils {
+object PaimonUtils {
/**
* In the streaming write case, An "Queries with streaming sources must be
executed with
diff --git
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/connector/catalog/CatalogUtils.scala
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/connector/catalog/PaimonCatalogUtils.scala
similarity index 98%
rename from
paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/connector/catalog/CatalogUtils.scala
rename to
paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/connector/catalog/PaimonCatalogUtils.scala
index 283fbf254..265c82866 100644
---
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/connector/catalog/CatalogUtils.scala
+++
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/spark/sql/connector/catalog/PaimonCatalogUtils.scala
@@ -28,7 +28,7 @@ import org.apache.spark.util.Utils
import scala.reflect.ClassTag
import scala.util.control.NonFatal
-object CatalogUtils {
+object PaimonCatalogUtils {
def buildExternalCatalog(conf: SparkConf, hadoopConf: Configuration):
ExternalCatalog = {
val externalCatalogClassName =
