This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 3ffb12d6d1 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250221)
(#8801)
3ffb12d6d1 is described below
commit 3ffb12d6d1c572344e7e70e3ac1e69e49e6bbe70
Author: Kyligence Git <[email protected]>
AuthorDate: Thu Feb 20 23:54:15 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250221) (#8801)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250221)
* Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/76299
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Common/QueryContext.cpp | 1 +
cpp-ch/local-engine/Functions/SparkFunctionMapToString.h | 2 +-
cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp | 1 +
cpp-ch/local-engine/tests/benchmark_cast_float_function.cpp | 1 +
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 0940123e63..89031ace1b 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250220
-CH_COMMIT=c4a8e4a6d2f
+CH_BRANCH=rebase_ch/20250221
+CH_COMMIT=dfb7f9649ee
diff --git a/cpp-ch/local-engine/Common/QueryContext.cpp
b/cpp-ch/local-engine/Common/QueryContext.cpp
index 32d84b0e2c..109ac53a0b 100644
--- a/cpp-ch/local-engine/Common/QueryContext.cpp
+++ b/cpp-ch/local-engine/Common/QueryContext.cpp
@@ -18,6 +18,7 @@
#include <iomanip>
#include <sstream>
+#include <Core/Field.h>
#include <Interpreters/Context.h>
#include <base/unit.h>
#include <Common/ConcurrentMap.h>
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionMapToString.h
b/cpp-ch/local-engine/Functions/SparkFunctionMapToString.h
index 6c49d3c18d..34fb4a7de6 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionMapToString.h
+++ b/cpp-ch/local-engine/Functions/SparkFunctionMapToString.h
@@ -23,7 +23,6 @@
#include <Columns/ColumnsNumber.h>
#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
#include <Formats/FormatFactory.h>
#include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h>
@@ -34,6 +33,7 @@ namespace DB
namespace ErrorCodes
{
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+ extern const int ILLEGAL_TYPE_OF_ARGUMENT;
}
}
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp
b/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp
index ec247dd12d..3f05a76d90 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp
+++ b/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp
@@ -32,6 +32,7 @@ namespace ErrorCodes
{
extern const int ILLEGAL_COLUMN;
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+ extern const int ILLEGAL_TYPE_OF_ARGUMENT;
}
}
diff --git a/cpp-ch/local-engine/tests/benchmark_cast_float_function.cpp
b/cpp-ch/local-engine/tests/benchmark_cast_float_function.cpp
index a50bcf170e..269638308c 100644
--- a/cpp-ch/local-engine/tests/benchmark_cast_float_function.cpp
+++ b/cpp-ch/local-engine/tests/benchmark_cast_float_function.cpp
@@ -17,6 +17,7 @@
#include <Columns/IColumn.h>
#include <Core/Block.h>
+#include <Core/Field.h>
#include <DataTypes/DataTypeFactory.h>
#include <DataTypes/DataTypeString.h>
#include <DataTypes/IDataType.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
