From 983b17f371893b39717482fcf053cfa2c89644ff Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Tue, 12 Nov 2024 15:33:27 +0800 Subject: [PATCH] Revert "read data from orc file format - ignore reading except date32" by cherry pick https://github.com/ClickHouse/ClickHouse/pull/71500 This reverts commit f498fe74850348e4ac3120da41138fe4dda122b1. --- .../gluten/execution/GlutenClickHouseExcelFormatSuite.scala | 5 ++--- cpp-ch/clickhouse.version | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala index a5b866cb448d..0fd868a8a878 100644 --- a/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala +++ b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala @@ -1038,13 +1038,12 @@ class GlutenClickHouseExcelFormatSuite ) } - test("read data from orc file format - except date32") { + test("read data from orc file format") { val filePath = s"$orcDataPath/all_data_types_with_non_primitive_type.snappy.orc" val orcFileFormat = "orc" val sql = s""" - | select string_field, int_field, long_field, float_field, double_field, short_field, - | byte_field, boolean_field, decimal_field + | select * | from $orcFileFormat.`$filePath` | where long_field > 30 |""".stripMargin diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index b5e11ca13f06..e51caf2aa788 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,3 +1,3 @@ CH_ORG=Kyligence CH_BRANCH=rebase_ch/20241111 -CH_COMMIT=c988219798d \ No newline at end of file +CH_COMMIT=06ffc32a255