From 5b632f64e0f4126f0b507e8288399c80f25472e6 Mon Sep 17 00:00:00 2001 From: Wenzheng Liu Date: Sun, 12 Nov 2023 18:27:36 +0800 Subject: [PATCH] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231112) (#3683) * [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231112) * fix build due to https://github.com/ClickHouse/ClickHouse/pull/56556 * fix build due to https://github.com/ClickHouse/ClickHouse/pull/56556 * remove unneeded hedaders --------- Co-authored-by: kyligence-git Co-authored-by: Chang Chen --- cpp-ch/clickhouse.version | 4 ++-- cpp-ch/local-engine/Common/CHUtil.cpp | 4 ++-- cpp-ch/local-engine/Functions/SparkParseURL.cpp | 9 +-------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index d372f761f328..9385abe8af22 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,3 +1,3 @@ CH_ORG=Kyligence -CH_BRANCH=rebase_ch/20231108 -CH_COMMIT=4aefea4773e +CH_BRANCH=rebase_ch/20231112 +CH_COMMIT=04fb51332e1 diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp b/cpp-ch/local-engine/Common/CHUtil.cpp index 7bae4eb065df..662a992cb273 100644 --- a/cpp-ch/local-engine/Common/CHUtil.cpp +++ b/cpp-ch/local-engine/Common/CHUtil.cpp @@ -398,9 +398,9 @@ const DB::ActionsDAG::Node * ActionsDAGUtil::convertNodeType( type_name_col.type = std::make_shared(); const auto * right_arg = &actions_dag->addColumn(std::move(type_name_col)); const auto * left_arg = node; - DB::FunctionCastBase::Diagnostic diagnostic = {node->result_name, node->result_name}; + DB::CastDiagnostic diagnostic = {node->result_name, node->result_name}; DB::FunctionOverloadResolverPtr func_builder_cast - = DB::CastInternalOverloadResolver::createImpl(std::move(diagnostic)); + = DB::createInternalCastOverloadResolver(DB::CastType::nonAccurate, std::move(diagnostic)); DB::ActionsDAG::NodeRawConstPtrs children = {left_arg, right_arg}; return &actions_dag->addFunction(func_builder_cast, std::move(children), result_name); diff --git a/cpp-ch/local-engine/Functions/SparkParseURL.cpp b/cpp-ch/local-engine/Functions/SparkParseURL.cpp index 5023e7c37d66..c39c8eaa90f8 100644 --- a/cpp-ch/local-engine/Functions/SparkParseURL.cpp +++ b/cpp-ch/local-engine/Functions/SparkParseURL.cpp @@ -14,23 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include #include +#include #include -#include #include #include #include -#include #include #include -// #include #include -#include -#include #include -#include #include namespace DB