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 bc08fdf37 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240319)
(#5008)
bc08fdf37 is described below
commit bc08fdf3712567ed55f225649b2d4bd174d87c1e
Author: Wenzheng Liu <[email protected]>
AuthorDate: Tue Mar 19 13:54:42 2024 +0800
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240319) (#5008)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240319)
1 fix build due to https://github.com/ClickHouse/ClickHouse/pull/61502
2 fix build due to https://github.com/ClickHouse/ClickHouse/pull/61114
3 fix build due to https://github.com/ClickHouse/ClickHouse/pull/61267
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 +--
cpp-ch/local-engine/Common/CHUtil.cpp | 1 -
.../Functions/SparkFunctionGetJsonObject.h | 3 +-
.../local-engine/Parser/SerializedPlanParser.cpp | 1 -
.../Storages/Mergetree/SparkMergeTreeWriter.cpp | 32 +++++++++-------------
.../tests/benchmark_cast_float_function.cpp | 1 -
6 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 9a3f82356..8ff055d4b 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240315
-CH_COMMIT=1240fda3f62
\ No newline at end of file
+CH_BRANCH=rebase_ch/20240319
+CH_COMMIT=06814835aa8
\ No newline at end of file
diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp
b/cpp-ch/local-engine/Common/CHUtil.cpp
index 96b65c724..1d69f76a6 100644
--- a/cpp-ch/local-engine/Common/CHUtil.cpp
+++ b/cpp-ch/local-engine/Common/CHUtil.cpp
@@ -38,7 +38,6 @@
#include <DataTypes/NestedUtils.h>
#include <Disks/registerDisks.h>
#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionsConversion.h>
#include <Functions/registerFunctions.h>
#include <IO/ReadBufferFromFile.h>
#include <IO/SharedThreadPools.h>
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionGetJsonObject.h
b/cpp-ch/local-engine/Functions/SparkFunctionGetJsonObject.h
index d2d551a62..d9411813b 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionGetJsonObject.h
+++ b/cpp-ch/local-engine/Functions/SparkFunctionGetJsonObject.h
@@ -267,7 +267,8 @@ private:
const char * query_end = required_fields.back().c_str() +
required_fields.back().size();
DB::Tokens tokens(query_begin, query_end);
UInt32 max_parser_depth =
static_cast<UInt32>(context->getSettingsRef().max_parser_depth);
- DB::IParser::Pos token_iterator(tokens, max_parser_depth);
+ UInt32 max_parser_backtracks =
static_cast<UInt32>(context->getSettingsRef().max_parser_backtracks);
+ DB::IParser::Pos token_iterator(tokens, max_parser_depth,
max_parser_backtracks);
DB::ASTPtr json_path_ast;
DB::ParserJSONPath path_parser;
DB::Expected expected;
diff --git a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
index 405f9d6cb..9f6ea0b01 100644
--- a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
+++ b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
@@ -44,7 +44,6 @@
#include <DataTypes/Serializations/ISerialization.h>
#include <DataTypes/getLeastSupertype.h>
#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionsConversion.h>
#include <Interpreters/ActionsDAG.h>
#include <Interpreters/ActionsVisitor.h>
#include <Interpreters/CollectJoinOnKeysVisitor.h>
diff --git a/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
b/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
index 3184dd19e..f5c9a1338 100644
--- a/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
+++ b/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
@@ -47,32 +47,26 @@ void SparkMergeTreeWriter::write(DB::Block & block)
ExpressionActions do_convert = ExpressionActions(converter);
do_convert.execute(new_block);
}
- auto res = squashing_transform->add(new_block);
- if (res)
+
+ auto blocks_with_partition =
MergeTreeDataWriter::splitBlockIntoParts(squashing_transform->add(new_block),
10, metadata_snapshot, context);
+ for (auto & item : blocks_with_partition)
{
- auto blocks_with_partition =
MergeTreeDataWriter::splitBlockIntoParts(res, 10, metadata_snapshot, context);
- for (auto & item : blocks_with_partition)
- {
- auto temp_part = writeTempPart(item, metadata_snapshot, context);
- temp_part.finalize();
- new_parts.emplace_back(temp_part.part);
- part_num++;
- }
+ auto temp_part = writeTempPart(item, metadata_snapshot, context);
+ temp_part.finalize();
+ new_parts.emplace_back(temp_part.part);
+ part_num++;
}
}
void SparkMergeTreeWriter::finalize()
{
- auto block = squashing_transform->add({});
- if (block.rows())
+
+ auto blocks_with_partition =
MergeTreeDataWriter::splitBlockIntoParts(squashing_transform->add({}), 10,
metadata_snapshot, context);
+ for (auto & item : blocks_with_partition)
{
- auto blocks_with_partition =
MergeTreeDataWriter::splitBlockIntoParts(block, 10, metadata_snapshot, context);
- for (auto & item : blocks_with_partition)
- {
- auto temp_part = writeTempPart(item, metadata_snapshot, context);
- temp_part.finalize();
- new_parts.emplace_back(temp_part.part);
- }
+ auto temp_part = writeTempPart(item, metadata_snapshot, context);
+ temp_part.finalize();
+ new_parts.emplace_back(temp_part.part);
}
}
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 cb8d9ead6..a1ca08e13 100644
--- a/cpp-ch/local-engine/tests/benchmark_cast_float_function.cpp
+++ b/cpp-ch/local-engine/tests/benchmark_cast_float_function.cpp
@@ -20,7 +20,6 @@
#include <DataTypes/IDataType.h>
#include <DataTypes/DataTypeFactory.h>
#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionsConversion.h>
#include <Functions/SparkFunctionCastFloatToInt.h>
#include <Parser/SerializedPlanParser.h>
#include <benchmark/benchmark.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
