Apply spotless

ClickHouse · Jul 17, 2024 · d97ec99 · d97ec99
1 parent 2809f79
commit d97ec99
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 10 deletions.
diff --git a/clickhouse-core/src/main/scala/com/clickhouse/client/NodeClient.scala b/clickhouse-core/src/main/scala/com/clickhouse/client/NodeClient.scala
@@ -19,7 +19,12 @@ import com.clickhouse.client._
 import com.clickhouse.client.config.ClickHouseClientOption
 import com.clickhouse.data.{ClickHouseCompression, ClickHouseFormat}
 import com.clickhouse.exception.{CHClientException, CHException, CHServerException}
-import com.clickhouse.format.{JSONCompactEachRowWithNamesAndTypesSimpleOutput, JSONEachRowSimpleOutput, NamesAndTypes, SimpleOutput}
+import com.clickhouse.format.{
+  JSONCompactEachRowWithNamesAndTypesSimpleOutput,
+  JSONEachRowSimpleOutput,
+  NamesAndTypes,
+  SimpleOutput
+}
 import com.clickhouse.spec.NodeSpec
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode

diff --git a/clickhouse-core/src/main/scala/com/clickhouse/parse/AstVisitor.scala b/clickhouse-core/src/main/scala/com/clickhouse/parse/AstVisitor.scala
@@ -14,9 +14,33 @@
 
 package com.clickhouse.parse
 
-import com.clickhouse.ClickHouseSQLParser.{ColumnExprContext, ColumnExprFunctionContext, ColumnExprIdentifierContext, ColumnExprListContext, ColumnExprLiteralContext, ColumnExprParensContext, ColumnExprPrecedence1Context, ColumnExprPrecedence2Context, ColumnExprTupleContext, ColumnsExprColumnContext, ColumnsExprContext, EngineClauseContext, OrderByClauseContext, OrderExprContext, SettingsClauseContext}
+import com.clickhouse.ClickHouseSQLParser.{
+  ColumnExprContext,
+  ColumnExprFunctionContext,
+  ColumnExprIdentifierContext,
+  ColumnExprListContext,
+  ColumnExprLiteralContext,
+  ColumnExprParensContext,
+  ColumnExprPrecedence1Context,
+  ColumnExprPrecedence2Context,
+  ColumnExprTupleContext,
+  ColumnsExprColumnContext,
+  ColumnsExprContext,
+  EngineClauseContext,
+  OrderByClauseContext,
+  OrderExprContext,
+  SettingsClauseContext
+}
 import com.clickhouse.expr.{Expr, FieldRef, FuncExpr, OrderExpr, StringLiteral, TupleExpr}
-import com.clickhouse.spec.{DistributedEngineSpec, MergeTreeEngineSpec, ReplacingMergeTreeEngineSpec, ReplicatedMergeTreeEngineSpec, ReplicatedReplacingMergeTreeEngineSpec, TableEngineSpec, UnknownTableEngineSpec}
+import com.clickhouse.spec.{
+  DistributedEngineSpec,
+  MergeTreeEngineSpec,
+  ReplacingMergeTreeEngineSpec,
+  ReplicatedMergeTreeEngineSpec,
+  ReplicatedReplacingMergeTreeEngineSpec,
+  TableEngineSpec,
+  UnknownTableEngineSpec
+}
 import com.clickhouse.{ClickHouseSQLBaseVisitor, Logging, Utils}
 
 import scala.collection.JavaConverters._

diff --git a/clickhouse-core/src/test/scala/com/clickhouse/parse/SQLParserSuite.scala b/clickhouse-core/src/test/scala/com/clickhouse/parse/SQLParserSuite.scala
@@ -15,7 +15,13 @@
 package com.clickhouse.parse
 
 import com.clickhouse.expr.{FieldRef, FuncExpr, StringLiteral, TupleExpr}
-import com.clickhouse.spec.{DistributedEngineSpec, MergeTreeEngineSpec, ReplacingMergeTreeEngineSpec, ReplicatedMergeTreeEngineSpec, ReplicatedReplacingMergeTreeEngineSpec}
+import com.clickhouse.spec.{
+  DistributedEngineSpec,
+  MergeTreeEngineSpec,
+  ReplacingMergeTreeEngineSpec,
+  ReplicatedMergeTreeEngineSpec,
+  ReplicatedReplacingMergeTreeEngineSpec
+}
 import org.scalatest.funsuite.AnyFunSuite
 import com.clickhouse.expr._
 import com.clickhouse.spec._

diff --git a/spark-3.5/clickhouse-spark/src/main/scala/com/clickhouse/ClickHouseCatalog.scala b/spark-3.5/clickhouse-spark/src/main/scala/com/clickhouse/ClickHouseCatalog.scala
@@ -26,7 +26,13 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
 import Constants._
 import com.clickhouse
 import com.clickhouse.exception.ClickHouseErrCode._
-import com.clickhouse.func.{ClickHouseXxHash64Shard, CompositeFunctionRegistry, DynamicFunctionRegistry, FunctionRegistry, StaticFunctionRegistry}
+import com.clickhouse.func.{
+  ClickHouseXxHash64Shard,
+  CompositeFunctionRegistry,
+  DynamicFunctionRegistry,
+  FunctionRegistry,
+  StaticFunctionRegistry
+}
 import com.clickhouse.spec.{ClusterSpec, DistributedEngineSpec, NodeSpec, TableEngineUtils}
 import com.clickhouse.func._
 import com.clickhouse.spec._

diff --git a/spark-3.5/clickhouse-spark/src/main/scala/com/clickhouse/ClickHouseHelper.scala b/spark-3.5/clickhouse-spark/src/main/scala/com/clickhouse/ClickHouseHelper.scala
@@ -25,7 +25,16 @@ import org.apache.spark.sql.types.StructType
 import org.apache.spark.sql.util.CaseInsensitiveStringMap
 import Constants._
 import Utils.dateTimeFmt
-import com.clickhouse.spec.{ClusterSpec, DatabaseSpec, NoPartitionSpec, NodeSpec, PartitionSpec, ReplicaSpec, ShardSpec, TableSpec}
+import com.clickhouse.spec.{
+  ClusterSpec,
+  DatabaseSpec,
+  NoPartitionSpec,
+  NodeSpec,
+  PartitionSpec,
+  ReplicaSpec,
+  ShardSpec,
+  TableSpec
+}
 import com.clickhouse.spec._
 
 import java.time.{LocalDateTime, ZoneId}

diff --git a/spark-3.5/clickhouse-spark/src/main/scala/com/clickhouse/ClickHouseTable.scala b/spark-3.5/clickhouse-spark/src/main/scala/com/clickhouse/ClickHouseTable.scala
@@ -32,7 +32,16 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
 import org.apache.spark.unsafe.types.UTF8String
 import Utils._
 import com.clickhouse.read.{ClickHouseMetadataColumn, ClickHouseScanBuilder, ScanJobDescription}
-import com.clickhouse.spec.{ClusterSpec, DistributedEngineSpec, MergeTreeFamilyEngineSpec, NodeSpec, PartitionSpec, TableEngineSpec, TableEngineUtils, TableSpec}
+import com.clickhouse.spec.{
+  ClusterSpec,
+  DistributedEngineSpec,
+  MergeTreeFamilyEngineSpec,
+  NodeSpec,
+  PartitionSpec,
+  TableEngineSpec,
+  TableEngineUtils,
+  TableSpec
+}
 import com.clickhouse.write.{ClickHouseWriteBuilder, WriteJobDescription}
 import com.clickhouse.spec._
 

diff --git a/spark-3.5/clickhouse-spark/src/main/scala/com/clickhouse/write/ClickHouseWriter.scala b/spark-3.5/clickhouse-spark/src/main/scala/com/clickhouse/write/ClickHouseWriter.scala
@@ -22,7 +22,7 @@ import com.clickhouse.spec.{DistributedEngineSpec, ShardUtils}
 import org.apache.commons.io.IOUtils
 import org.apache.spark.sql.catalyst.expressions.{BoundReference, Expression, TransformExpression}
 import org.apache.spark.sql.catalyst.expressions.{Projection, SafeProjection}
-import org.apache.spark.sql.catalyst.{InternalRow, expressions}
+import org.apache.spark.sql.catalyst.{expressions, InternalRow}
 import org.apache.spark.sql.clickhouse.ExprUtils
 import org.apache.spark.sql.connector.metric.CustomTaskMetric
 import org.apache.spark.sql.connector.write.{DataWriter, WriterCommitMessage}

diff --git a/spark-3.5/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/ExprUtils.scala b/spark-3.5/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/ExprUtils.scala
@@ -25,7 +25,7 @@ import org.apache.spark.sql.catalyst.expressions.{TimeZoneAwareExpression, Trans
 import org.apache.spark.sql.catalyst.plans.logical.{LeafNode, LogicalPlan}
 import org.apache.spark.sql.catalyst.rules.{Rule, RuleExecutor}
 import org.apache.spark.sql.catalyst.trees.TreePattern.{LIST_SUBQUERY, TIME_ZONE_AWARE_EXPRESSION}
-import org.apache.spark.sql.catalyst.{SQLConfHelper, expressions}
+import org.apache.spark.sql.catalyst.{expressions, SQLConfHelper}
 import org.apache.spark.sql.clickhouse.ClickHouseSQLConf.IGNORE_UNSUPPORTED_TRANSFORM
 import org.apache.spark.sql.connector.catalog.Identifier
 import org.apache.spark.sql.connector.catalog.functions.{BoundFunction, ScalarFunction, UnboundFunction}

diff --git a/...ickhouse-spark/src/test/scala/org/apache/spark/sql/clickhouse/FunctionRegistrySuite.scala b/...ickhouse-spark/src/test/scala/org/apache/spark/sql/clickhouse/FunctionRegistrySuite.scala
@@ -14,7 +14,13 @@
 
 package org.apache.spark.sql.clickhouse
 
-import com.clickhouse.func.{ClickHouseXxHash64, ClickhouseEquivFunction, CompositeFunctionRegistry, DynamicFunctionRegistry, StaticFunctionRegistry}
+import com.clickhouse.func.{
+  ClickHouseXxHash64,
+  ClickhouseEquivFunction,
+  CompositeFunctionRegistry,
+  DynamicFunctionRegistry,
+  StaticFunctionRegistry
+}
 import org.scalatest.funsuite.AnyFunSuite
 import com.clickhouse.func._