Change from com.clickhouse to com.clickhouse.spark

ClickHouse · Jul 21, 2024 · 4a148ff · 4a148ff
1 parent d97ec99
commit 4a148ff
Show file tree

Hide file tree

Showing 158 changed files with 416 additions and 413 deletions.
diff --git a/build.gradle b/build.gradle
@@ -164,7 +164,7 @@ project(':clickhouse-core') {
 
     generateGrammarSource {
         maxHeapSize = "64m"
-        arguments += ["-visitor", "-package", "com.clickhouse"]
+        arguments += ["-visitor", "-package", "com.clickhouse.spark"]
     }
 
     test {

diff --git a/clickhouse-core-it/src/test/resources/log4j.properties b/clickhouse-core-it/src/test/resources/log4j.properties
@@ -27,4 +27,4 @@ log4j.appender.file.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %t %p %c{
 
 log4j.logger.org.apache.hadoop.util.Shell=ERROR
 log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
-log4j.logger.com.clickhouse=DEBUG
+log4j.logger.com.clickhouse.spark=DEBUG
diff --git a/...test/scala/com/clickhouse/HashSuite.scala → ...cala/com/clickhouse/spark/HashSuite.scala b/...test/scala/com/clickhouse/HashSuite.scala → ...cala/com/clickhouse/spark/HashSuite.scala
@@ -12,12 +12,12 @@
  * limitations under the License.
  */
 
-package com.clickhouse
+package com.clickhouse.spark
 
-import com.clickhouse.base.ClickHouseSingleMixIn
-import com.clickhouse.client.NodeClient
-import com.clickhouse.hash.{CityHash64, HashUtils, Murmurhash2_32, Murmurhash2_64, Murmurhash3_32, Murmurhash3_64}
-import com.clickhouse.hash._
+import com.clickhouse.spark.base.ClickHouseSingleMixIn
+import com.clickhouse.spark.client.NodeClient
+import com.clickhouse.spark.hash.{CityHash64, HashUtils, Murmurhash2_32, Murmurhash2_64, Murmurhash3_32, Murmurhash3_64}
+import com.clickhouse.spark.hash._
 
 class HashSuite extends ClickHouseSingleMixIn with Logging {
 

diff --git a/...com/clickhouse/UtilsClickHouseSuite.scala → ...ickhouse/spark/UtilsClickHouseSuite.scala b/...com/clickhouse/UtilsClickHouseSuite.scala → ...ickhouse/spark/UtilsClickHouseSuite.scala
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.clickhouse
+package com.clickhouse.spark
 
-import com.clickhouse.base.ClickHouseSingleMixIn
+import com.clickhouse.spark.base.ClickHouseSingleMixIn
 import java.time.{LocalDateTime, ZoneId}
 
 class UtilsClickHouseSuite extends ClickHouseSingleMixIn with Logging {

diff --git a/...ickhouse/exception/ClickHouseErrCode.java → ...se/spark/exception/ClickHouseErrCode.java b/...ickhouse/exception/ClickHouseErrCode.java → ...se/spark/exception/ClickHouseErrCode.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.exception;
+package com.clickhouse.spark.exception;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...khouse/hash/cityhash/CityHash_v1_0_2.java → .../spark/hash/cityhash/CityHash_v1_0_2.java b/...khouse/hash/cityhash/CityHash_v1_0_2.java → .../spark/hash/cityhash/CityHash_v1_0_2.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash.cityhash;
+package com.clickhouse.spark.hash.cityhash;
 
 
 // modified from https://github.com/dpoluyanov/achord/blob/master/src/main/java/com/github/mangelion/achord/CityHash_v1_0_2.java

diff --git a/...com/clickhouse/hash/cityhash/UInt128.java → ...ickhouse/spark/hash/cityhash/UInt128.java b/...com/clickhouse/hash/cityhash/UInt128.java → ...ickhouse/spark/hash/cityhash/UInt128.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash.cityhash;
+package com.clickhouse.spark.hash.cityhash;
 
 /**
  * copied from https://github.com/dpoluyanov/achord/blob/master/src/main/java/com/github/mangelion/achord/UInt128.java

diff --git a/...n/scala/com/clickhouse/JsonProtocol.scala → ...a/com/clickhouse/spark/JsonProtocol.scala b/...n/scala/com/clickhouse/JsonProtocol.scala → ...a/com/clickhouse/spark/JsonProtocol.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse
+package com.clickhouse.spark
 
 import com.fasterxml.jackson.databind.{DeserializationFeature, ObjectMapper, SerializationFeature}
 import com.fasterxml.jackson.module.scala.ClassTagExtensions

diff --git a/...c/main/scala/com/clickhouse/Logging.scala → .../scala/com/clickhouse/spark/Logging.scala b/...c/main/scala/com/clickhouse/Logging.scala → .../scala/com/clickhouse/spark/Logging.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse
+package com.clickhouse.spark
 
 import org.slf4j.{Logger, LoggerFactory}
 

diff --git a/...src/main/scala/com/clickhouse/Utils.scala → ...in/scala/com/clickhouse/spark/Utils.scala b/...src/main/scala/com/clickhouse/Utils.scala → ...in/scala/com/clickhouse/spark/Utils.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse
+package com.clickhouse.spark
 
 import org.apache.commons.lang3.time.FastDateFormat
 

diff --git a/...com/clickhouse/client/ClusterClient.scala → ...ickhouse/spark/client/ClusterClient.scala b/...com/clickhouse/client/ClusterClient.scala → ...ickhouse/spark/client/ClusterClient.scala
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-package com.clickhouse.client
+package com.clickhouse.spark.client
 
-import com.clickhouse.Logging
-import com.clickhouse.exception.CHClientException
-import com.clickhouse.spec.ClusterSpec
+import com.clickhouse.spark.Logging
+import com.clickhouse.spark.exception.CHClientException
+import com.clickhouse.spark.spec.ClusterSpec
 
 import java.util.concurrent.ConcurrentHashMap
 import scala.collection.JavaConverters._

diff --git a/...la/com/clickhouse/client/NodeClient.scala → .../clickhouse/spark/client/NodeClient.scala b/...la/com/clickhouse/client/NodeClient.scala → .../clickhouse/spark/client/NodeClient.scala
@@ -12,23 +12,23 @@
  * limitations under the License.
  */
 
-package com.clickhouse.client
+package com.clickhouse.spark.client
 
-import com.clickhouse.Logging
+import com.clickhouse.spark.Logging
 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.{
+import com.clickhouse.spark.exception.{CHClientException, CHException, CHServerException}
+import com.clickhouse.spark.format.{
   JSONCompactEachRowWithNamesAndTypesSimpleOutput,
   JSONEachRowSimpleOutput,
   NamesAndTypes,
   SimpleOutput
 }
-import com.clickhouse.spec.NodeSpec
+import com.clickhouse.spark.spec.NodeSpec
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
-import com.clickhouse.format._
+import com.clickhouse.spark.format._
 
 import java.io.InputStream
 import java.util.UUID

diff --git a/...a/com/clickhouse/client/NodesClient.scala → ...clickhouse/spark/client/NodesClient.scala b/...a/com/clickhouse/client/NodesClient.scala → ...clickhouse/spark/client/NodesClient.scala
@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.clickhouse.client
+package com.clickhouse.spark.client
 
-import com.clickhouse.Logging
-import com.clickhouse.spec.{NodeSpec, Nodes}
+import com.clickhouse.spark.Logging
+import com.clickhouse.spark.spec.{NodeSpec, Nodes}
 
 import java.util.concurrent.ConcurrentHashMap
 import scala.collection.JavaConverters._

diff --git a/...om/clickhouse/exception/CHException.scala → ...ckhouse/spark/exception/CHException.scala b/...om/clickhouse/exception/CHException.scala → ...ckhouse/spark/exception/CHException.scala
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.clickhouse.exception
+package com.clickhouse.spark.exception
 
-import com.clickhouse.spec.NodeSpec
+import com.clickhouse.spark.spec.NodeSpec
 
 abstract class CHException(
   val code: Int,

diff --git a/...ala/com/clickhouse/expr/Expressions.scala → ...m/clickhouse/spark/expr/Expressions.scala b/...ala/com/clickhouse/expr/Expressions.scala → ...m/clickhouse/spark/expr/Expressions.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.expr
+package com.clickhouse.spark.expr
 
 trait Expr extends Serializable {
   def sql: String // ClickHouse dialect

diff --git a/...a/com/clickhouse/format/InputFormat.scala → ...clickhouse/spark/format/InputFormat.scala b/...a/com/clickhouse/format/InputFormat.scala → ...clickhouse/spark/format/InputFormat.scala
@@ -12,6 +12,6 @@
  * limitations under the License.
  */
 
-package com.clickhouse.format
+package com.clickhouse.spark.format
 
 trait InputFormat
diff --git a/.../clickhouse/format/JSONOutputFormat.scala → ...house/spark/format/JSONOutputFormat.scala b/.../clickhouse/format/JSONOutputFormat.scala → ...house/spark/format/JSONOutputFormat.scala
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package com.clickhouse.format
+package com.clickhouse.spark.format
 
-import com.clickhouse.exception.CHClientException
+import com.clickhouse.spark.exception.CHClientException
 import java.io.InputStream
 
 import scala.collection.immutable.ListMap
 import scala.collection.JavaConverters._
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
-import com.clickhouse.JsonProtocol.om
+import com.clickhouse.spark.JsonProtocol.om
 
 ///////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////// Simple ////////////////////////////////////

diff --git a/.../com/clickhouse/format/OutputFormat.scala → ...lickhouse/spark/format/OutputFormat.scala b/.../com/clickhouse/format/OutputFormat.scala → ...lickhouse/spark/format/OutputFormat.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.format
+package com.clickhouse.spark.format
 
 import scala.collection.immutable.ListMap
 

diff --git a/...cala/com/clickhouse/hash/CityHash64.scala → ...om/clickhouse/spark/hash/CityHash64.scala b/...cala/com/clickhouse/hash/CityHash64.scala → ...om/clickhouse/spark/hash/CityHash64.scala
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash
+package com.clickhouse.spark.hash
 
-import com.clickhouse.hash.cityhash.{CityHash_v1_0_2, UInt128}
+import com.clickhouse.spark.hash.cityhash.{CityHash_v1_0_2, UInt128}
 
 // https://github.com/ClickHouse/ClickHouse/blob/v23.5.3.24-stable/src/Functions/FunctionsHashing.h#L694
 object CityHash64 extends HashFunc[Long] {

diff --git a/.../scala/com/clickhouse/hash/HashFunc.scala → .../com/clickhouse/spark/hash/HashFunc.scala b/.../scala/com/clickhouse/hash/HashFunc.scala → .../com/clickhouse/spark/hash/HashFunc.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash
+package com.clickhouse.spark.hash
 
 import java.nio.charset.StandardCharsets
 import scala.reflect.ClassTag

diff --git a/...scala/com/clickhouse/hash/HashUtils.scala → ...com/clickhouse/spark/hash/HashUtils.scala b/...scala/com/clickhouse/hash/HashUtils.scala → ...com/clickhouse/spark/hash/HashUtils.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash
+package com.clickhouse.spark.hash
 
 object HashUtils {
   def intHash64Impl(x: Long): Long =

diff --git a/.../com/clickhouse/hash/Murmurhash2_32.scala → ...lickhouse/spark/hash/Murmurhash2_32.scala b/.../com/clickhouse/hash/Murmurhash2_32.scala → ...lickhouse/spark/hash/Murmurhash2_32.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash
+package com.clickhouse.spark.hash
 
 import org.apache.commons.codec.digest.MurmurHash2
 

diff --git a/.../com/clickhouse/hash/Murmurhash2_64.scala → ...lickhouse/spark/hash/Murmurhash2_64.scala b/.../com/clickhouse/hash/Murmurhash2_64.scala → ...lickhouse/spark/hash/Murmurhash2_64.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash
+package com.clickhouse.spark.hash
 
 import org.apache.commons.codec.digest.MurmurHash2
 

diff --git a/.../com/clickhouse/hash/Murmurhash3_32.scala → ...lickhouse/spark/hash/Murmurhash3_32.scala b/.../com/clickhouse/hash/Murmurhash3_32.scala → ...lickhouse/spark/hash/Murmurhash3_32.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash
+package com.clickhouse.spark.hash
 
 import org.apache.commons.codec.digest.MurmurHash3
 

diff --git a/.../com/clickhouse/hash/Murmurhash3_64.scala → ...lickhouse/spark/hash/Murmurhash3_64.scala b/.../com/clickhouse/hash/Murmurhash3_64.scala → ...lickhouse/spark/hash/Murmurhash3_64.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.hash
+package com.clickhouse.spark.hash
 
 import org.apache.commons.codec.digest.MurmurHash3
 

diff --git a/...lickhouse/io/ForwardingOutputStream.scala → ...use/spark/io/ForwardingOutputStream.scala b/...lickhouse/io/ForwardingOutputStream.scala → ...use/spark/io/ForwardingOutputStream.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.io
+package com.clickhouse.spark.io
 
 import java.io.OutputStream
 

diff --git a/.../com/clickhouse/io/ForwardingWriter.scala → ...lickhouse/spark/io/ForwardingWriter.scala b/.../com/clickhouse/io/ForwardingWriter.scala → ...lickhouse/spark/io/ForwardingWriter.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.io
+package com.clickhouse.spark.io
 
 import java.io.Writer
 

diff --git a/...lickhouse/io/ObservableOutputStream.scala → ...use/spark/io/ObservableOutputStream.scala b/...lickhouse/io/ObservableOutputStream.scala → ...use/spark/io/ObservableOutputStream.scala
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.clickhouse.io
+package com.clickhouse.spark.io
 
-import com.clickhouse.Utils
+import com.clickhouse.spark.Utils
 import java.io.OutputStream
 import java.util.concurrent.atomic.LongAdder
 

diff --git a/...ala/com/clickhouse/parse/AstVisitor.scala → ...m/clickhouse/spark/parse/AstVisitor.scala b/...ala/com/clickhouse/parse/AstVisitor.scala → ...m/clickhouse/spark/parse/AstVisitor.scala
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.clickhouse.parse
+package com.clickhouse.spark.parse
 
-import com.clickhouse.ClickHouseSQLParser.{
+import com.clickhouse.spark.ClickHouseSQLParser.{
   ColumnExprContext,
   ColumnExprFunctionContext,
   ColumnExprIdentifierContext,
@@ -31,8 +31,8 @@ import com.clickhouse.ClickHouseSQLParser.{
   OrderExprContext,
   SettingsClauseContext
 }
-import com.clickhouse.expr.{Expr, FieldRef, FuncExpr, OrderExpr, StringLiteral, TupleExpr}
-import com.clickhouse.spec.{
+import com.clickhouse.spark.expr.{Expr, FieldRef, FuncExpr, OrderExpr, StringLiteral, TupleExpr}
+import com.clickhouse.spark.spec.{
   DistributedEngineSpec,
   MergeTreeEngineSpec,
   ReplacingMergeTreeEngineSpec,
@@ -41,13 +41,13 @@ import com.clickhouse.spec.{
   TableEngineSpec,
   UnknownTableEngineSpec
 }
-import com.clickhouse.{ClickHouseSQLBaseVisitor, Logging, Utils}
+import com.clickhouse.spark.{ClickHouseSQLBaseVisitor, Logging, Utils}
 
 import scala.collection.JavaConverters._
 import org.antlr.v4.runtime.tree.ParseTree
-import com.clickhouse.expr._
-import com.clickhouse.spec._
-import com.clickhouse.ClickHouseSQLParser._
+import com.clickhouse.spark.expr._
+import com.clickhouse.spark.spec._
+import com.clickhouse.spark.ClickHouseSQLParser._
 
 class AstVisitor extends ClickHouseSQLBaseVisitor[AnyRef] with Logging {
   import ParseUtils._

diff --git a/...ala/com/clickhouse/parse/ParseUtils.scala → ...m/clickhouse/spark/parse/ParseUtils.scala b/...ala/com/clickhouse/parse/ParseUtils.scala → ...m/clickhouse/spark/parse/ParseUtils.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.clickhouse.parse
+package com.clickhouse.spark.parse
 
 import java.util
 import org.antlr.v4.runtime.{ParserRuleContext, Token}

diff --git a/...cala/com/clickhouse/parse/SQLParser.scala → ...om/clickhouse/spark/parse/SQLParser.scala b/...cala/com/clickhouse/parse/SQLParser.scala → ...om/clickhouse/spark/parse/SQLParser.scala
@@ -12,15 +12,15 @@
  * limitations under the License.
  */
 
-package com.clickhouse.parse
+package com.clickhouse.spark.parse
 
-import com.clickhouse.{ClickHouseSQLLexer, ClickHouseSQLParser, Logging}
-import com.clickhouse.expr.Expr
-import com.clickhouse.spec.TableEngineSpec
+import com.clickhouse.spark.{ClickHouseSQLLexer, ClickHouseSQLParser, Logging}
+import com.clickhouse.spark.expr.Expr
+import com.clickhouse.spark.spec.TableEngineSpec
 import org.antlr.v4.runtime._
 import org.antlr.v4.runtime.atn.PredictionMode
 import org.antlr.v4.runtime.misc.ParseCancellationException
-import com.clickhouse._
+import com.clickhouse.spark._
 
 class SQLParser(astVisitor: AstVisitor) extends Logging {
 

diff --git a/...la/com/clickhouse/spec/DatabaseSpec.scala → .../clickhouse/spark/spec/DatabaseSpec.scala b/...la/com/clickhouse/spec/DatabaseSpec.scala → .../clickhouse/spark/spec/DatabaseSpec.scala
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.clickhouse.spec
+package com.clickhouse.spark.spec
 
-import com.clickhouse.ToJson
+import com.clickhouse.spark.ToJson
 
 import java.util
 import scala.collection.JavaConverters._