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 36c60044a [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240515)
(#5747)
36c60044a is described below
commit 36c60044a52fbc36519cca317c362462dbb37173
Author: Kyligence Git <[email protected]>
AuthorDate: Wed May 15 00:32:41 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240515) (#5747)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240515)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/63432
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Parser/JoinRelParser.cpp | 3 ++-
cpp-ch/local-engine/tests/benchmark_local_engine.cpp | 6 +++---
cpp-ch/local-engine/tests/gtest_ch_join.cpp | 3 ++-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 7e5d2a5b9..6a58dce0f 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240514
-CH_COMMIT=c0d37f6fa5b
\ No newline at end of file
+CH_BRANCH=rebase_ch/20240515
+CH_COMMIT=00867009134
\ No newline at end of file
diff --git a/cpp-ch/local-engine/Parser/JoinRelParser.cpp
b/cpp-ch/local-engine/Parser/JoinRelParser.cpp
index 023a51552..8f7f35d5e 100644
--- a/cpp-ch/local-engine/Parser/JoinRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/JoinRelParser.cpp
@@ -135,7 +135,8 @@ std::pair<DB::JoinKind, DB::JoinStrictness>
getJoinKindAndStrictness(substrait::
std::shared_ptr<DB::TableJoin>
createDefaultTableJoin(substrait::JoinRel_JoinType join_type)
{
auto & global_context = SerializedPlanParser::global_context;
- auto table_join =
std::make_shared<TableJoin>(global_context->getSettings(),
global_context->getGlobalTemporaryVolume());
+ auto table_join = std::make_shared<TableJoin>(
+ global_context->getSettings(),
global_context->getGlobalTemporaryVolume(),
global_context->getTempDataOnDisk());
std::pair<DB::JoinKind, DB::JoinStrictness> kind_and_strictness =
getJoinKindAndStrictness(join_type);
table_join->setKind(kind_and_strictness.first);
diff --git a/cpp-ch/local-engine/tests/benchmark_local_engine.cpp
b/cpp-ch/local-engine/tests/benchmark_local_engine.cpp
index 51ee7ad12..89fa4fa96 100644
--- a/cpp-ch/local-engine/tests/benchmark_local_engine.cpp
+++ b/cpp-ch/local-engine/tests/benchmark_local_engine.cpp
@@ -51,11 +51,10 @@
#include <Common/PODArray_fwd.h>
#include <Common/Stopwatch.h>
#include <Common/logger_useful.h>
-#include <Compression/CompressedReadBuffer.h>
#include "testConfig.h"
#if defined(__SSE2__)
-# include <emmintrin.h>
+#include <emmintrin.h>
#endif
@@ -836,7 +835,8 @@ QueryPlanPtr readFromMergeTree(MergeTreeWithSnapshot
storage)
QueryPlanPtr joinPlan(QueryPlanPtr left, QueryPlanPtr right, String left_key,
String right_key, size_t block_size = 8192)
{
- auto join = std::make_shared<TableJoin>(global_context->getSettings(),
global_context->getGlobalTemporaryVolume());
+ auto join = std::make_shared<TableJoin>(
+ global_context->getSettings(),
global_context->getGlobalTemporaryVolume(),
global_context->getTempDataOnDisk());
auto left_columns =
left->getCurrentDataStream().header.getColumnsWithTypeAndName();
auto right_columns =
right->getCurrentDataStream().header.getColumnsWithTypeAndName();
join->setKind(JoinKind::Left);
diff --git a/cpp-ch/local-engine/tests/gtest_ch_join.cpp
b/cpp-ch/local-engine/tests/gtest_ch_join.cpp
index 1621a9e88..739390302 100644
--- a/cpp-ch/local-engine/tests/gtest_ch_join.cpp
+++ b/cpp-ch/local-engine/tests/gtest_ch_join.cpp
@@ -85,7 +85,8 @@ TEST(TestJoin, simple)
QueryPlan right_plan;
right_plan.addStep(std::make_unique<ReadFromPreparedSource>(Pipe(right_table)));
- auto join = std::make_shared<TableJoin>(global_context->getSettings(),
global_context->getGlobalTemporaryVolume());
+ auto join = std::make_shared<TableJoin>(
+ global_context->getSettings(),
global_context->getGlobalTemporaryVolume(),
global_context->getTempDataOnDisk());
join->setKind(JoinKind::Left);
join->setStrictness(JoinStrictness::All);
join->setColumnsFromJoinedTable(right.getNamesAndTypesList());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
