Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240806) #6718

Merged
merged 4 commits into from
Aug 6, 2024
Merged

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240806) #6718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
378ca29
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240806)
Aug 5, 2024
f37bb63
Fix build due to https://github.com/apache/incubator-gluten/pull/6621
baibaichen Aug 4, 2024
b417151
Fix debug build due to https://github.com/apache/incubator-gluten/pul…
baibaichen Aug 5, 2024
50745fa
Fix build due to https://github.com/ClickHouse/ClickHouse/pull/67405
baibaichen Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpp-ch/clickhouse.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CH_ORG=Kyligence
CH_BRANCH=rebase_ch/20240803
CH_COMMIT=b3cfc38f967
CH_BRANCH=rebase_ch/20240806
CH_COMMIT=c8a7d6e496d

16 changes: 8 additions & 8 deletions cpp-ch/local-engine/Functions/SparkFunctionPositionUTF8.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ struct PositionSparkImpl
const std::string & needle,
const ColumnPtr & start_pos,
PaddedPODArray<UInt64> & res,
[[maybe_unused]] ColumnUInt8 * res_null)
[[maybe_unused]] ColumnUInt8 * res_null,
[[maybe_unused]] size_t input_rows_count)
{
/// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
assert(!res_null);
Expand Down Expand Up @@ -163,17 +164,17 @@ struct PositionSparkImpl
const ColumnString::Offsets & needle_offsets,
const ColumnPtr & start_pos,
PaddedPODArray<UInt64> & res,
[[maybe_unused]] ColumnUInt8 * res_null)
[[maybe_unused]] ColumnUInt8 * res_null,
size_t input_rows_count)
{
/// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
assert(!res_null);

ColumnString::Offset prev_haystack_offset = 0;
ColumnString::Offset prev_needle_offset = 0;

size_t size = haystack_offsets.size();

for (size_t i = 0; i < size; ++i)
for (size_t i = 0; i < input_rows_count; ++i)
{
size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1;
Expand Down Expand Up @@ -227,17 +228,16 @@ struct PositionSparkImpl
const ColumnString::Offsets & needle_offsets,
const ColumnPtr & start_pos,
PaddedPODArray<UInt64> & res,
[[maybe_unused]] ColumnUInt8 * res_null)
[[maybe_unused]] ColumnUInt8 * res_null,
size_t input_rows_count)
{
/// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
assert(!res_null);

/// NOTE You could use haystack indexing. But this is a rare case.
ColumnString::Offset prev_needle_offset = 0;

size_t size = needle_offsets.size();

for (size_t i = 0; i < size; ++i)
for (size_t i = 0; i < input_rows_count; ++i)
{
size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;

Expand Down
2 changes: 1 addition & 1 deletion cpp-ch/local-engine/Storages/Output/OutputFormatFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Block OutputFormatFile::createHeaderWithPreferredSchema(const Block & header)
ColumnWithTypeAndName column(preferred_column.type->createColumn(), preferred_column.type, preferred_column.name);
columns.emplace_back(std::move(column));
}
assert(prefered_schema.columns() == index);
assert(preferred_schema.columns() == index);
return {std::move(columns)};
}

Expand Down
2 changes: 0 additions & 2 deletions cpp-ch/local-engine/tests/benchmark_local_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
#include <Shuffle/ShuffleReader.h>

#include <Storages/CustomMergeTreeSink.h>
#include <Storages/CustomStorageMergeTree.h>
#include <Storages/MergeTree/MergeTreeData.h>
#include <Storages/SelectQueryInfo.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp-ch/local-engine/tests/gtest_ch_join.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <Processors/QueryPlan/ReadFromPreparedSource.h>
#include <Processors/Sources/SourceFromSingleChunk.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
#include <Storages/CustomMergeTreeSink.h>

#include <Storages/SubstraitSource/SubstraitFileSource.h>
#include <gtest/gtest.h>
#include <Common/DebugUtils.h>
Expand Down
1 change: 0 additions & 1 deletion cpp-ch/local-engine/tests/gtest_ch_storages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <Parsers/ASTFunction.h>
#include <Processors/Executors/PipelineExecutor.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
#include <Storages/CustomMergeTreeSink.h>
#include <Storages/SubstraitSource/SubstraitFileSource.h>
#include <google/protobuf/util/json_util.h>
#include <google/protobuf/wrappers.pb.h>
Expand Down
1 change: 0 additions & 1 deletion cpp-ch/local-engine/tests/gtest_local_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <Parser/SubstraitParserUtils.h>
#include <Processors/Executors/PipelineExecutor.h>
#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
#include <Storages/CustomMergeTreeSink.h>
#include <Storages/CustomStorageMergeTree.h>
#include <Storages/MergeTree/MergeTreeData.h>
#include <gtest/gtest.h>
Expand Down
Loading