ClickHouse · mzitnik · Jul 21, 2024 · Jul 17, 2024 · Jul 17, 2024 · Jul 21, 2024
diff --git a/build.gradle b/build.gradle
@@ -164,7 +164,7 @@ project(':clickhouse-core') {
 
     generateGrammarSource {
         maxHeapSize = "64m"
-        arguments += ["-visitor", "-package", "xenon.clickhouse"]
+        arguments += ["-visitor", "-package", "com.clickhouse"]
     }
 
     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.xenon.clickhouse=DEBUG
+log4j.logger.com.clickhouse=DEBUG
diff --git a/...st/scala/xenon/clickhouse/HashSuite.scala → ...test/scala/com/clickhouse/HashSuite.scala b/...st/scala/xenon/clickhouse/HashSuite.scala → ...test/scala/com/clickhouse/HashSuite.scala
@@ -12,11 +12,12 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse
+package com.clickhouse
 
-import xenon.clickhouse.base.ClickHouseSingleMixIn
-import xenon.clickhouse.client.NodeClient
-import xenon.clickhouse.hash._
+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._
 
 class HashSuite extends ClickHouseSingleMixIn with Logging {
 

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

diff --git a/...n/antlr/xenon.clickhouse/ClickHouseSQL.g4 → ...ain/antlr/com.clickhouse/ClickHouseSQL.g4 b/...n/antlr/xenon.clickhouse/ClickHouseSQL.g4 → ...ain/antlr/com.clickhouse/ClickHouseSQL.g4
diff --git a/...ickhouse/exception/ClickHouseErrCode.java → ...ickhouse/exception/ClickHouseErrCode.java b/...ickhouse/exception/ClickHouseErrCode.java → ...ickhouse/exception/ClickHouseErrCode.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.exception;
+package com.clickhouse.exception;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...khouse/hash/cityhash/CityHash_v1_0_2.java → ...khouse/hash/cityhash/CityHash_v1_0_2.java b/...khouse/hash/cityhash/CityHash_v1_0_2.java → ...khouse/hash/cityhash/CityHash_v1_0_2.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.hash.cityhash;
+package com.clickhouse.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/...non/clickhouse/hash/cityhash/UInt128.java → ...com/clickhouse/hash/cityhash/UInt128.java b/...non/clickhouse/hash/cityhash/UInt128.java → ...com/clickhouse/hash/cityhash/UInt128.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.hash.cityhash;
+package com.clickhouse.hash.cityhash;
 
 /**
  * copied from https://github.com/dpoluyanov/achord/blob/master/src/main/java/com/github/mangelion/achord/UInt128.java

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

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

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

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

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

diff --git a/...xenon/clickhouse/client/NodesClient.scala → ...a/com/clickhouse/client/NodesClient.scala b/...xenon/clickhouse/client/NodesClient.scala → ...a/com/clickhouse/client/NodesClient.scala
@@ -12,16 +12,15 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.client
+package com.clickhouse.client
 
-import java.util.concurrent.ConcurrentHashMap
+import com.clickhouse.Logging
+import com.clickhouse.spec.{NodeSpec, Nodes}
 
+import java.util.concurrent.ConcurrentHashMap
 import scala.collection.JavaConverters._
 import scala.util.Random.shuffle
 
-import xenon.clickhouse.spec.{NodeSpec, Nodes}
-import xenon.clickhouse.Logging
-
 object NodesClient {
   def apply(nodes: Nodes) = new NodesClient(nodes)
 }

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

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

diff --git a/...xenon/clickhouse/format/InputFormat.scala → ...a/com/clickhouse/format/InputFormat.scala b/...xenon/clickhouse/format/InputFormat.scala → ...a/com/clickhouse/format/InputFormat.scala
@@ -12,6 +12,6 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.format
+package com.clickhouse.format
 
 trait InputFormat
diff --git a/.../clickhouse/format/JSONOutputFormat.scala → .../clickhouse/format/JSONOutputFormat.scala b/.../clickhouse/format/JSONOutputFormat.scala → .../clickhouse/format/JSONOutputFormat.scala
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.format
+package com.clickhouse.format
 
+import com.clickhouse.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 xenon.clickhouse.JsonProtocol.om
-import xenon.clickhouse.exception.CHClientException
+import com.clickhouse.JsonProtocol.om
 
 ///////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////// Simple ////////////////////////////////////

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

diff --git a/...la/xenon/clickhouse/hash/CityHash64.scala → ...cala/com/clickhouse/hash/CityHash64.scala b/...la/xenon/clickhouse/hash/CityHash64.scala → ...cala/com/clickhouse/hash/CityHash64.scala
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.hash
+package com.clickhouse.hash
 
-import xenon.clickhouse.hash.cityhash.{CityHash_v1_0_2, UInt128}
+import com.clickhouse.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/...cala/xenon/clickhouse/hash/HashFunc.scala → .../scala/com/clickhouse/hash/HashFunc.scala b/...cala/xenon/clickhouse/hash/HashFunc.scala → .../scala/com/clickhouse/hash/HashFunc.scala
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.hash
+package com.clickhouse.hash
 
 import java.nio.charset.StandardCharsets
 import scala.reflect.ClassTag

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

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

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

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

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

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

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

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

diff --git a/...a/xenon/clickhouse/parse/AstVisitor.scala → ...ala/com/clickhouse/parse/AstVisitor.scala b/...a/xenon/clickhouse/parse/AstVisitor.scala → ...ala/com/clickhouse/parse/AstVisitor.scala
@@ -12,15 +12,42 @@
  * limitations under the License.
  */
 
-package xenon.clickhouse.parse
+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.expr.{Expr, FieldRef, FuncExpr, OrderExpr, StringLiteral, TupleExpr}
+import com.clickhouse.spec.{
+  DistributedEngineSpec,
+  MergeTreeEngineSpec,
+  ReplacingMergeTreeEngineSpec,
+  ReplicatedMergeTreeEngineSpec,
+  ReplicatedReplacingMergeTreeEngineSpec,
+  TableEngineSpec,
+  UnknownTableEngineSpec
+}
+import com.clickhouse.{ClickHouseSQLBaseVisitor, Logging, Utils}
 
 import scala.collection.JavaConverters._
-
 import org.antlr.v4.runtime.tree.ParseTree
-import xenon.clickhouse.{ClickHouseSQLBaseVisitor, Logging, Utils}
-import xenon.clickhouse.expr._
-import xenon.clickhouse.spec._
-import xenon.clickhouse.ClickHouseSQLParser._
+import com.clickhouse.expr._
+import com.clickhouse.spec._
+import com.clickhouse.ClickHouseSQLParser._
 
 class AstVisitor extends ClickHouseSQLBaseVisitor[AnyRef] with Logging {
   import ParseUtils._

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

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