Skip to content

Commit bc64afb

Browse files
committed
nit
1 parent 5d45838 commit bc64afb

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

spark-3.4/clickhouse-spark/src/main/scala/xenon/clickhouse/func/Days.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ import java.time.format.DateTimeFormatter
2222

2323
object Days extends UnboundFunction with ScalarFunction[Int] with ClickhouseEquivFunction {
2424

25-
override def name: String = "clickhouse_days"
25+
override def name: String = "clickhouse_toYYYYMMDD"
2626

2727
override def canonicalName: String = s"clickhouse.$name"
2828

2929
override def toString: String = name
3030

3131
override val ckFuncNames: Array[String] = Array("toYYYYMMDD")
3232

33-
override def description: String = s"$name: (date: Date) => shard_num: int"
33+
override def description: String = s"$name: (date: DATE) => YYYYMMDD: STRING"
3434

3535
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
3636
case Array(StructField(_, DateType, _, _)) => this

spark-3.4/clickhouse-spark/src/main/scala/xenon/clickhouse/func/FunctionRegistry.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ object StaticFunctionRegistry extends FunctionRegistry {
4848

4949
private val functions = Map[String, UnboundFunction](
5050
"ck_xx_hash64" -> ClickHouseXxHash64, // for compatible
51-
"clickhouse_xxHash64" -> ClickHouseXxHash64,
52-
"clickhouse_murmurHash2_32" -> MurmurHash2_32,
53-
"clickhouse_murmurHash2_64" -> MurmurHash2_64,
54-
"clickhouse_murmurHash3_32" -> MurmurHash3_32,
55-
"clickhouse_murmurHash3_64" -> MurmurHash3_64,
56-
"clickhouse_cityHash64" -> CityHash64,
57-
"clickhouse_years" -> Years,
58-
"clickhouse_months" -> Months,
59-
"clickhouse_days" -> Days,
60-
"clickhouse_hours" -> Hours,
61-
"sharding_mod" -> Mod
51+
ClickHouseXxHash64.name -> ClickHouseXxHash64,
52+
MurmurHash2_32.name -> MurmurHash2_32,
53+
MurmurHash2_64.name -> MurmurHash2_64,
54+
MurmurHash3_32.name -> MurmurHash3_32,
55+
MurmurHash3_64.name -> MurmurHash3_64,
56+
CityHash64.name -> CityHash64,
57+
Years.name -> Years,
58+
Months.name -> Months,
59+
Days.name -> Days,
60+
Hours.name -> Hours,
61+
Mod.name -> Mod
6262
)
6363

6464
override def list: Array[String] = functions.keys.toArray

spark-3.4/clickhouse-spark/src/main/scala/xenon/clickhouse/func/Hours.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ import java.text.SimpleDateFormat
2222

2323
object Hours extends UnboundFunction with ScalarFunction[Int] with ClickhouseEquivFunction {
2424

25-
override def name: String = "clickhouse_hours"
25+
override def name: String = "clickhouse_toHour"
2626

2727
override def canonicalName: String = s"clickhouse.$name"
2828

2929
override def toString: String = name
3030

3131
override val ckFuncNames: Array[String] = Array("toHour", "HOUR")
3232

33-
override def description: String = s"$name: (time: timestamp) => shard_num: int"
33+
override def description: String = s"$name: (time: TIMESTAMP) => HH: INT"
3434

3535
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
3636
case Array(StructField(_, TimestampType, _, _)) | Array(StructField(_, TimestampNTZType, _, _)) => this

spark-3.4/clickhouse-spark/src/main/scala/xenon/clickhouse/func/Mod.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import org.apache.spark.sql.types._
1919

2020
object Mod extends UnboundFunction with ScalarFunction[Long] with ClickhouseEquivFunction {
2121

22-
override def name: String = "sharding_mod"
22+
override def name: String = "clickhouse_modulo"
2323

2424
override def canonicalName: String = s"clickhouse.$name"
2525

@@ -29,7 +29,7 @@ object Mod extends UnboundFunction with ScalarFunction[Long] with ClickhouseEqui
2929
// Added remainder as a synonym.
3030
override val ckFuncNames: Array[String] = Array("modulo", "remainder")
3131

32-
override def description: String = s"$name: (a: long, b: long) => mod: long"
32+
override def description: String = s"$name: (a: LONG, b: LONG) => a % b: LONG"
3333

3434
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
3535
case Array(a, b) if

spark-3.4/clickhouse-spark/src/main/scala/xenon/clickhouse/func/Months.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ import java.time.format.DateTimeFormatter
2222

2323
object Months extends UnboundFunction with ScalarFunction[Int] with ClickhouseEquivFunction {
2424

25-
override def name: String = "clickhouse_months"
25+
override def name: String = "clickhouse_toYYYYMM"
2626

2727
override def canonicalName: String = s"clickhouse.$name"
2828

2929
override def toString: String = name
3030

3131
override val ckFuncNames: Array[String] = Array("toYYYYMM")
3232

33-
override def description: String = s"$name: (date: Date) => shard_num: int"
33+
override def description: String = s"$name: (date: DATE) => YYYYMM: INT"
3434

3535
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
3636
case Array(StructField(_, DateType, _, _)) => this

spark-3.4/clickhouse-spark/src/main/scala/xenon/clickhouse/func/MultiStringArgsHash.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ abstract class MultiStringArgsHash extends UnboundFunction with ClickhouseEquivF
2727

2828
override val ckFuncNames: Array[String]
2929

30-
override def description: String = s"$name: (value: string, ...) => hash_value: long"
30+
override def description: String = s"$name: (value: STRING, ...) => hash_value: LONG"
3131

3232
private def isExceptedType(dt: DataType): Boolean =
3333
dt.isInstanceOf[StringType]

spark-3.4/clickhouse-spark/src/main/scala/xenon/clickhouse/func/XxHash64.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object ClickHouseXxHash64 extends UnboundFunction with ScalarFunction[Long] with
3636

3737
override val ckFuncNames: Array[String] = Array("xxHash64")
3838

39-
override def description: String = s"$name: (value: string) => hash_value: long"
39+
override def description: String = s"$name: (value: STRING) => hash_value: LONG"
4040

4141
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
4242
case Array(StructField(_, StringType, _, _)) => this
@@ -75,7 +75,7 @@ class ClickHouseXxHash64Shard(clusters: Seq[ClusterSpec]) extends UnboundFunctio
7575

7676
override def canonicalName: String = s"clickhouse.$name"
7777

78-
override def description: String = s"$name: (cluster_name: string, value: string) => shard_num: int"
78+
override def description: String = s"$name: (cluster_name: STRING, value: STRING) => shard_num: INT"
7979

8080
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
8181
case Array(StructField(_, StringType, _, _), StructField(_, StringType, _, _)) => this

spark-3.4/clickhouse-spark/src/main/scala/xenon/clickhouse/func/Years.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ import java.time.format.DateTimeFormatter
2222

2323
object Years extends UnboundFunction with ScalarFunction[Int] with ClickhouseEquivFunction {
2424

25-
override def name: String = "clickhouse_years"
25+
override def name: String = "clickhouse_toYear"
2626

2727
override def canonicalName: String = s"clickhouse.$name"
2828

2929
override def toString: String = name
3030

3131
override val ckFuncNames: Array[String] = Array("toYear", "YEAR")
3232

33-
override def description: String = s"$name: (date: Date) => shard_num: int"
33+
override def description: String = s"$name: (date: DATE) => YYYY: INT"
3434

3535
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
3636
case Array(StructField(_, DateType, _, _)) => this

0 commit comments

Comments
 (0)