[GLUTEN-1632][CH]Daily Update Clickhouse Version (20231112) (#3683)

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231112) * fix build due to ClickHouse/ClickHouse#56556 * fix build due to ClickHouse/ClickHouse#56556 * remove unneeded hedaders --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang Chen <[email protected]>
apache · Nov 12, 2023 · 5b632f6 · 5b632f6
1 parent 3a64f2e
commit 5b632f6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git 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
@@ -398,9 +398,9 @@ const DB::ActionsDAG::Node * ActionsDAGUtil::convertNodeType(
     type_name_col.type = std::make_shared<DB::DataTypeString>();
     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<DB::CastType::nonAccurate>::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
@@ -14,23 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-#include <string.h>
 #include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnNullable.h>
 #include <Columns/IColumn.h>
-#include <Core/ColumnsWithTypeAndName.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/FunctionsStringArray.h>
 #include <Functions/FunctionsStringSearchToString.h>
 #include <Functions/IFunction.h>
-// #include <Functions/URL/FunctionsURL.h>
 #include <Functions/URL/domain.h>
-#include <base/find_symbols.h>
-#include <sys/types.h>
 #include <Poco/Logger.h>
-#include <Common/logger_useful.h>
 #include <memory>
 
 namespace DB