thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 19:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build after conflict resolution

Browse Source
This commit is contained in:
avogar 2024-05-10 12:20:27 +00:00
parent 6207f6f4a5
commit 60c721c21b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Functions/FunctionsConversion.cpp
View File

@ -44,6 +44,7 @@
#include <DataTypes/ObjectUtils.h> #include <DataTypes/ObjectUtils.h>
#include <DataTypes/Serializations/SerializationDecimal.h> #include <DataTypes/Serializations/SerializationDecimal.h>
#include <Formats/FormatSettings.h> #include <Formats/FormatSettings.h>
#include <Formats/FormatFactory.h>
#include <Functions/CastOverloadResolver.h> #include <Functions/CastOverloadResolver.h>
#include <Functions/DateTimeTransforms.h> #include <Functions/DateTimeTransforms.h>
#include <Functions/FunctionFactory.h> #include <Functions/FunctionFactory.h>
@ -5057,7 +5058,7 @@ private:
} }
else if (from_type->getCustomSerialization()) else if (from_type->getCustomSerialization())
{ {
ret = [](ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr ret = [this](ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
{ {
return ConvertImplGenericToString<typename ToDataType::ColumnType>::execute(arguments, result_type, input_rows_count, context ? getFormatSettings(context) : FormatSettings()); return ConvertImplGenericToString<typename ToDataType::ColumnType>::execute(arguments, result_type, input_rows_count, context ? getFormatSettings(context) : FormatSettings());
}; };

11
src/Storages/MergeTree/MergeTreeReaderWide.cpp
View File

@ -249,7 +249,7 @@ MergeTreeReaderWide::FileStreams::iterator MergeTreeReaderWide::addStream(const
auto marks_loader = std::make_shared<MergeTreeMarksLoader>( auto marks_loader = std::make_shared<MergeTreeMarksLoader>(
data_part_info_for_read, data_part_info_for_read,
mark_cache, mark_cache,
data_part_info_for_read->getIndexGranularityInfo().getMarksFilePath(*stream_name), data_part_info_for_read->getIndexGranularityInfo().getMarksFilePath(stream_name),
num_marks_in_part, num_marks_in_part,
data_part_info_for_read->getIndexGranularityInfo(), data_part_info_for_read->getIndexGranularityInfo(),
settings.save_marks_in_cache, settings.save_marks_in_cache,
@ -257,24 +257,23 @@ MergeTreeReaderWide::FileStreams::iterator MergeTreeReaderWide::addStream(const
load_marks_threadpool, load_marks_threadpool,
/*num_columns_in_mark=*/ 1); /*num_columns_in_mark=*/ 1);
has_any_stream = true;
auto stream_settings = settings; auto stream_settings = settings;
stream_settings.is_low_cardinality_dictionary = substream_path.size() > 1 && substream_path[substream_path.size() - 2].type == ISerialization::Substream::Type::DictionaryKeys; stream_settings.is_low_cardinality_dictionary = substream_path.size() > 1 && substream_path[substream_path.size() - 2].type == ISerialization::Substream::Type::DictionaryKeys;
auto create_stream = [&]<typename Stream>() auto create_stream = [&]<typename Stream>()
{ {
return std::make_unique<Stream>( return std::make_unique<Stream>(
data_part_info_for_read->getDataPartStorage(), *stream_name, DATA_FILE_EXTENSION, data_part_info_for_read->getDataPartStorage(), stream_name, DATA_FILE_EXTENSION,
num_marks_in_part, all_mark_ranges, stream_settings, num_marks_in_part, all_mark_ranges, stream_settings,
uncompressed_cache, data_part_info_for_read->getFileSizeOrZero(*stream_name + DATA_FILE_EXTENSION), uncompressed_cache, data_part_info_for_read->getFileSizeOrZero(stream_name + DATA_FILE_EXTENSION),
std::move(marks_loader), profile_callback, clock_type); std::move(marks_loader), profile_callback, clock_type);
}; };
if (read_without_marks) if (read_without_marks)
return streams.emplace(*stream_name, create_stream.operator()<MergeTreeReaderStreamSingleColumnWholePart>()); return streams.emplace(stream_name, create_stream.operator()<MergeTreeReaderStreamSingleColumnWholePart>()).first;
marks_loader->startAsyncLoad(); marks_loader->startAsyncLoad();
return streams.emplace(*stream_name, create_stream.operator()<MergeTreeReaderStreamSingleColumn>()); return streams.emplace(stream_name, create_stream.operator()<MergeTreeReaderStreamSingleColumn>()).first;
} }
ReadBuffer * MergeTreeReaderWide::getStream( ReadBuffer * MergeTreeReaderWide::getStream(