Skip to content

Commit 5a53a7c

Browse files
committed
nit
1 parent 21a8363 commit 5a53a7c

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

spark-3.4/clickhouse-spark-it/src/test/scala/org/apache/spark/sql/clickhouse/cluster/ClusterShardByTransformSuite.scala

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ import org.apache.spark.SparkConf
1818
import org.apache.spark.sql.Row
1919

2020
class ClusterShardByTransformSuite extends SparkClickHouseClusterTest {
21-
override protected def sparkConf: SparkConf = {
22-
val _conf = super.sparkConf
23-
.set("spark.clickhouse.write.distributed.convertLocal", "true")
24-
_conf
25-
}
21+
override protected def sparkConf: SparkConf = super.sparkConf
22+
.set("spark.clickhouse.write.distributed.convertLocal", "true")
2623

2724
def runTest(func_name: String, func_args: Array[String]): Unit = {
2825
val func_expr = s"$func_name(${func_args.mkString(",")})"
@@ -94,13 +91,13 @@ class ClusterShardByTransformSuite extends SparkClickHouseClusterTest {
9491
}
9592

9693
Seq(
97-
// wait for SPARK-44180 to be fixed, then add implicit cast test cases
94+
// TODO timezone aware implicit cast requires SPARK-44180
9895
("toYear", Array("create_date")),
99-
// ("toYear", Array("create_time")),
96+
// ("toYear", Array("create_time")),
10097
("toYYYYMM", Array("create_date")),
101-
// ("toYYYYMM", Array("create_time")),
98+
// ("toYYYYMM", Array("create_time")),
10299
("toYYYYMMDD", Array("create_date")),
103-
// ("toYYYYMMDD", Array("create_time")),
100+
// ("toYYYYMMDD", Array("create_time")),
104101
("toHour", Array("create_time")),
105102
("xxHash64", Array("value")),
106103
("murmurHash2_64", Array("value")),

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ object Days extends UnboundFunction with ScalarFunction[Int] with ClickhouseEqui
3434

3535
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
3636
case Array(StructField(_, DateType, _, _)) => this
37-
// case Array(StructField(_, TimestampType, _, _)) | Array(StructField(_, TimestampNTZType, _, _)) => this
37+
// TODO timezone aware implicit cast requires SPARK-44180
38+
// case Array(StructField(_, TimestampType, _, _)) | Array(StructField(_, TimestampNTZType, _, _)) => this
3839
case _ => throw new UnsupportedOperationException(s"Expect 1 DATE argument. $description")
3940
}
4041

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ object Months extends UnboundFunction with ScalarFunction[Int] with ClickhouseEq
3434

3535
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
3636
case Array(StructField(_, DateType, _, _)) => this
37-
// case Array(StructField(_, TimestampType, _, _)) | Array(StructField(_, TimestampNTZType, _, _)) => this
37+
// TODO timezone aware implicit cast requires SPARK-44180
38+
// case Array(StructField(_, TimestampType, _, _)) | Array(StructField(_, TimestampNTZType, _, _)) => this
3839
case _ => throw new UnsupportedOperationException(s"Expect 1 DATE argument. $description")
3940
}
4041

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ object Years extends UnboundFunction with ScalarFunction[Int] with ClickhouseEqu
3434

3535
override def bind(inputType: StructType): BoundFunction = inputType.fields match {
3636
case Array(StructField(_, DateType, _, _)) => this
37-
// case Array(StructField(_, TimestampType, _, _)) | Array(StructField(_, TimestampNTZType, _, _)) => this
37+
// TODO timezone aware implicit cast requires SPARK-44180
38+
// case Array(StructField(_, TimestampType, _, _)) | Array(StructField(_, TimestampNTZType, _, _)) => this
3839
case _ => throw new UnsupportedOperationException(s"Expect 1 DATE argument. $description")
3940
}
4041

0 commit comments

Comments
 (0)