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 20484aa742 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250121)
(#8577)
20484aa742 is described below
commit 20484aa742b313d250b6fbbd4e12e9873c57f841
Author: Kyligence Git <[email protected]>
AuthorDate: Tue Jan 21 05:49:03 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250121) (#8577)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250121)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/74085
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/74727
* Fix gtest build due to https://github.com/ClickHouse/ClickHouse/pull/74085
* Fix Gtest failed due to
https://github.com/apache/incubator-gluten/pull/8321
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp | 6 +++---
cpp-ch/local-engine/Parser/ExpressionParser.cpp | 2 +-
cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp | 2 +-
cpp-ch/local-engine/tests/gtest_ch_functions.cpp | 6 +++---
cpp-ch/local-engine/tests/gtest_local_engine.cpp | 4 ----
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index dfeb3287e3..1e3aebc271 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250116
-CH_COMMIT=a260339b40c
+CH_BRANCH=rebase_ch/20250121
+CH_COMMIT=e5ecd10bf24
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp
b/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp
index fbbd944c0e..ec247dd12d 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp
+++ b/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp
@@ -14,6 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <bitset>
+#include <memory>
+#include <string>
#include <Columns/ColumnString.h>
#include <DataTypes/DataTypeString.h>
#include <Functions/FunctionFactory.h>
@@ -21,9 +24,6 @@
#include <Functions/IFunction.h>
#include <IO/WriteHelpers.h>
-#include <memory>
-#include <string>
-
using namespace DB;
namespace DB
diff --git a/cpp-ch/local-engine/Parser/ExpressionParser.cpp
b/cpp-ch/local-engine/Parser/ExpressionParser.cpp
index a50590aaf7..238e36e288 100644
--- a/cpp-ch/local-engine/Parser/ExpressionParser.cpp
+++ b/cpp-ch/local-engine/Parser/ExpressionParser.cpp
@@ -479,7 +479,7 @@ ExpressionParser::NodeRawConstPtr
ExpressionParser::parseExpression(ActionsDAG &
PreparedSets prepared_sets;
FutureSet::Hash emptyKey;
- auto future_set = prepared_sets.addFromTuple(emptyKey,
{elem_block}, context->queryContext()->getSettingsRef());
+ auto future_set = prepared_sets.addFromTuple(emptyKey, nullptr,
{elem_block}, context->queryContext()->getSettingsRef());
auto arg = DB::ColumnSet::create(1, std::move(future_set));
args.emplace_back(&actions_dag.addColumn(DB::ColumnWithTypeAndName(std::move(arg),
std::make_shared<DB::DataTypeSet>(), name)));
diff --git a/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp
index 1c7a043449..c355c5d813 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp
@@ -154,7 +154,7 @@ DB::QueryPlanPtr MergeTreeRelParser::parseReadRel(
context->getSettingsRef()[Setting::max_block_size],
1);
- auto * source_step_with_filter = static_cast<SourceStepWithFilter
*>(read_step.get());
+ auto * source_step_with_filter = static_cast<SourceStepWithFilterBase
*>(read_step.get());
if (const auto & storage_prewhere_info = query_info->prewhere_info)
{
source_step_with_filter->addFilter(storage_prewhere_info->prewhere_actions.clone(),
storage_prewhere_info->prewhere_column_name);
diff --git a/cpp-ch/local-engine/tests/gtest_ch_functions.cpp
b/cpp-ch/local-engine/tests/gtest_ch_functions.cpp
index fc094515a6..a442c4039f 100644
--- a/cpp-ch/local-engine/tests/gtest_ch_functions.cpp
+++ b/cpp-ch/local-engine/tests/gtest_ch_functions.cpp
@@ -80,7 +80,7 @@ TEST(TestFunction, In)
set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName());
set->finishInsert();
PreparedSets::Hash empty;
- auto future_set = std::make_shared<FutureSetFromStorage>(empty,
std::move(set), std::nullopt);
+ auto future_set = std::make_shared<FutureSetFromStorage>(empty, nullptr,
std::move(set), std::nullopt);
//TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we
need pass 4 instead of 1
auto arg = ColumnSet::create(4, future_set);
@@ -124,7 +124,7 @@ TEST(TestFunction, NotIn1)
set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName());
set->finishInsert();
PreparedSets::Hash empty;
- auto future_set = std::make_shared<FutureSetFromStorage>(empty,
std::move(set), std::nullopt);
+ auto future_set = std::make_shared<FutureSetFromStorage>(empty, nullptr,
std::move(set), std::nullopt);
//TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we
need pass 4 instead of 1
auto arg = ColumnSet::create(4, future_set);
@@ -168,7 +168,7 @@ TEST(TestFunction, NotIn2)
set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName());
set->finishInsert();
PreparedSets::Hash empty;
- auto future_set = std::make_shared<FutureSetFromStorage>(empty,
std::move(set), std::nullopt);
+ auto future_set = std::make_shared<FutureSetFromStorage>(empty, nullptr,
std::move(set), std::nullopt);
//TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we
need pass 4 instead of 1
auto arg = ColumnSet::create(4, future_set);
diff --git a/cpp-ch/local-engine/tests/gtest_local_engine.cpp
b/cpp-ch/local-engine/tests/gtest_local_engine.cpp
index 97d8094208..585713788d 100644
--- a/cpp-ch/local-engine/tests/gtest_local_engine.cpp
+++ b/cpp-ch/local-engine/tests/gtest_local_engine.cpp
@@ -18,7 +18,6 @@
#include <iostream>
#include <gluten_test_util.h>
#include <incbin.h>
-#include <Builder/SerializedPlanBuilder.h>
#include <Disks/DiskLocal.h>
#include <Formats/FormatFactory.h>
#include <Interpreters/Context.h>
@@ -100,9 +99,6 @@ int main(int argc, char ** argv)
[&](const SparkConfigs::ConfigMap & spark_conf_map) {
BackendInitializerUtil::initBackend(spark_conf_map); },
true);
- auto & factory = FormatFactory::instance();
- DB::registerOutputFormatParquet(factory);
-
SCOPE_EXIT({ BackendFinalizerUtil::finalizeGlobally(); });
::testing::InitGoogleTest(&argc, argv);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
