[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240808) (#6755)

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240808) * Fix build due to ClickHouse/ClickHouse#66279 * Revert "[GLUTEN-6262][CH]Json input format ignore key case #6263" due to ClickHouse/ClickHouse#67484 revert ClickHouse/ClickHouse#61750 This reverts commit 2be6c86. * fix gtest due to #6722 --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang Chen <[email protected]>
apache · Aug 8, 2024 · 5410c83 · 5410c83
1 parent 1f982d3
commit 5410c83
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/backends-clickhouse/src/test/resources/text-data/json-settings/data.txt b/backends-clickhouse/src/test/resources/text-data/json-settings/data.txt
@@ -1,5 +1,4 @@
 {"a":1,"b":2,"c":3}
-{"a":"a5", "B":"b6", "c":7}
 {"a":"4"}
 {"t":{"ta":"cc","tb":100,"tc":1.234}}
 {"t":{"ta":"cc","tb":100,"td":"ignore"}}
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,4 +1,4 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240806
-CH_COMMIT=c8a7d6e496d
+CH_BRANCH=rebase_ch/20240808
+CH_COMMIT=641bd1900cd
 
diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp b/cpp-ch/local-engine/Common/CHUtil.cpp
@@ -781,7 +781,6 @@ void BackendInitializerUtil::initSettings(std::map<std::string, std::string> & b
     settings.set("input_format_parquet_import_nested", true);
     settings.set("input_format_json_read_numbers_as_strings", true);
     settings.set("input_format_json_read_bools_as_numbers", false);
-    settings.set("input_format_json_case_insensitive_column_matching", true);
     settings.set("input_format_csv_trim_whitespaces", false);
     settings.set("input_format_csv_allow_cr_end_of_line", true);
     settings.set("output_format_orc_string_as_string", true);

diff --git a/cpp-ch/local-engine/Storages/Parquet/VectorizedParquetRecordReader.h b/cpp-ch/local-engine/Storages/Parquet/VectorizedParquetRecordReader.h
@@ -235,7 +235,7 @@ class VectorizedParquetBlockInputFormat final : public DB::IInputFormat
     ColumnIndexFilterPtr column_index_filter_;
 
 protected:
-    void onCancel() override { is_stopped = 1; }
+    void onCancel() noexcept override { is_stopped = 1; }
 
 public:
     VectorizedParquetBlockInputFormat(DB::ReadBuffer & in_, const DB::Block & header_, const DB::FormatSettings & format_settings);

diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/SubstraitFileSource.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/SubstraitFileSource.cpp
@@ -144,7 +144,7 @@ bool SubstraitFileSource::tryPrepareReader()
 }
 
 
-void SubstraitFileSource::onCancel()
+void SubstraitFileSource::onCancel() noexcept
 {
     if (file_reader)
         file_reader->cancel();

diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/SubstraitFileSource.h b/cpp-ch/local-engine/Storages/SubstraitSource/SubstraitFileSource.h
@@ -131,7 +131,7 @@ class SubstraitFileSource : public DB::SourceWithKeyCondition
 
 private:
     bool tryPrepareReader();
-    void onCancel() override;
+    void onCancel() noexcept override;
 
     DB::ContextPtr context;
     DB::Block output_header; /// Sample header may contains partitions keys

diff --git a/cpp-ch/local-engine/tests/gtest_spark_row.cpp b/cpp-ch/local-engine/tests/gtest_spark_row.cpp
@@ -136,7 +136,7 @@ TEST(SparkRow, GetArrayElementSize)
         {std::make_shared<DataTypeUInt32>(), 4},
         {std::make_shared<DataTypeFloat32>(), 4},
         {std::make_shared<DataTypeDate32>(), 4},
-        {std::make_shared<DataTypeDecimal32>(9, 4), 4},
+        {std::make_shared<DataTypeDecimal32>(9, 4), 8},
         {std::make_shared<DataTypeInt64>(), 8},
         {std::make_shared<DataTypeUInt64>(), 8},
         {std::make_shared<DataTypeFloat64>(), 8},
@@ -152,11 +152,11 @@ TEST(SparkRow, GetArrayElementSize)
 
     for (const auto & [type, size] : type_to_size)
     {
-        EXPECT_TRUE(BackingDataLengthCalculator::getArrayElementSize(type) == size);
+        EXPECT_EQ(size, BackingDataLengthCalculator::getArrayElementSize(type));
         if (type->canBeInsideNullable())
         {
             const auto type_with_nullable = std::make_shared<DataTypeNullable>(type);
-            EXPECT_TRUE(BackingDataLengthCalculator::getArrayElementSize(type_with_nullable) == size);
+            EXPECT_EQ(size, BackingDataLengthCalculator::getArrayElementSize(type_with_nullable));
         }
     }
 }