From ef8c26c09af1b2e0d46d71ca6316ff3b87499e1b Mon Sep 17 00:00:00 2001 From: kyligence-git Date: Fri, 26 Jul 2024 23:03:10 +0000 Subject: [PATCH 1/3] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240727) --- cpp-ch/clickhouse.version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index 082ea747bc62..d1347f95f5c9 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,4 +1,4 @@ CH_ORG=Kyligence -CH_BRANCH=rebase_ch/20240719 -CH_COMMIT=3a2e993b1d4 +CH_BRANCH=rebase_ch/20240727 +CH_COMMIT=62105f9031b From 3279f7be7df97b00473b1706596681862f79cfe9 Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Sat, 27 Jul 2024 11:55:51 +0800 Subject: [PATCH 2/3] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240727) --- cpp-ch/clickhouse.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index d1347f95f5c9..a67f0227c0eb 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,4 +1,4 @@ CH_ORG=Kyligence CH_BRANCH=rebase_ch/20240727 -CH_COMMIT=62105f9031b +CH_COMMIT=7d0829e25b9 From 245d92d0a5353a69ad2efc10682e19a1521945e3 Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Sat, 27 Jul 2024 11:56:29 +0800 Subject: [PATCH 3/3] fix ut due to https://github.com/ClickHouse/ClickHouse/pull/67149 --- cpp-ch/local-engine/Common/CHUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp b/cpp-ch/local-engine/Common/CHUtil.cpp index 1be9c09a8c26..787277dbefb1 100644 --- a/cpp-ch/local-engine/Common/CHUtil.cpp +++ b/cpp-ch/local-engine/Common/CHUtil.cpp @@ -766,7 +766,7 @@ void BackendInitializerUtil::initSettings(std::map & 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_ignore_key_case", true); + 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);