Skip to content

Commit 2f33c29

Browse files
antonio2368antonio2368
committed
Fix build
1 parent ad6d844 commit 2f33c29

File tree

9 files changed

+12
-60
lines changed

9 files changed

+12
-60
lines changed

‎src/AggregateFunctions/Combinators/AggregateFunctionDistinct.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ struct AggregateFunctionDistinctMultipleGenericData : public AggregateFunctionDi
119119
auto settings = IColumn::SerializationSettings::createForAggregationState();
120120
auto cur_ref = columns[i]->serializeValueIntoArena(row_num, *arena, begin, &settings);
121121
value.data = cur_ref.data - value.size;
122-
value.size += cur_ref.size
122+
value.size += cur_ref.size;
123123
}
124124

125125
Set::LookupResult it;

‎src/Columns/ColumnObjectDeprecated.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ class ColumnObjectDeprecated final : public COWHelper<IColumnHelper<ColumnObject
250250
StringRef getDataAt(size_t) const override { throwMustBeConcrete(); }
251251
bool isDefaultAt(size_t) const override { throwMustBeConcrete(); }
252252
void insertData(const char *, size_t) override { throwMustBeConcrete(); }
253-
StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override { throwMustBeConcrete(); }
254-
char * serializeValueIntoMemory(size_t, char *) const override { throwMustBeConcrete(); }
255-
void deserializeAndInsertFromArena(ReadBuffer &) override { throwMustBeConcrete(); }
253+
StringRef serializeValueIntoArena(size_t, Arena &, char const *&, const IColumn::SerializationSettings *) const override { throwMustBeConcrete(); }
254+
char * serializeValueIntoMemory(size_t, char *, const IColumn::SerializationSettings *) const override { throwMustBeConcrete(); }
255+
void deserializeAndInsertFromArena(ReadBuffer &, const IColumn::SerializationSettings *) override { throwMustBeConcrete(); }
256256
void skipSerializedInArena(ReadBuffer &) const override { throwMustBeConcrete(); }
257257
void updateHashWithValue(size_t, SipHash &) const override { throwMustBeConcrete(); }
258258
WeakHash32 getWeakHash32() const override { throwMustBeConcrete(); }

‎src/Columns/ColumnTuple.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <Common/typeid_cast.h>
1515
#include <Columns/ColumnsCommon.h>
1616
#include <DataTypes/Serializations/SerializationInfoTuple.h>
17-
#include <base/StringRef.h>
1817
#include <base/sort.h>
1918

2019

‎src/Columns/ColumnUnique.h‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -457,12 +457,8 @@ void ColumnUnique<ColumnType>::collectSerializedValueSizes(PaddedPODArray<UInt64
457457
}
458458

459459
template <typename ColumnType>
460-
<<<<<<< HEAD
461-
std::string_view ColumnUnique<ColumnType>::serializeValueIntoArena(
460+
StringRef ColumnUnique<ColumnType>::serializeValueIntoArena(
462461
size_t n, Arena & arena, char const *& begin, const IColumn::SerializationSettings * settings) const
463-
=======
464-
StringRef ColumnUnique<ColumnType>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
465-
>>>>>>> backport/25.8/90880
466462
{
467463
if (is_nullable)
468464
{
@@ -502,34 +498,7 @@ char * ColumnUnique<ColumnType>::serializeValueIntoMemory(size_t n, char * memor
502498
}
503499

504500
template <typename ColumnType>
505-
<<<<<<< HEAD
506501
size_t ColumnUnique<ColumnType>::uniqueDeserializeAndInsertFromArena(ReadBuffer & in, const IColumn::SerializationSettings * settings)
507-
=======
508-
StringRef ColumnUnique<ColumnType>::serializeAggregationStateValueIntoArena(size_t n, Arena & arena, char const *& begin) const
509-
{
510-
if (is_nullable)
511-
{
512-
static constexpr auto s = sizeof(UInt8);
513-
514-
auto * pos = arena.allocContinue(s, begin);
515-
UInt8 flag = (n == getNullValueIndex() ? 1 : 0);
516-
unalignedStore<UInt8>(pos, flag);
517-
518-
if (n == getNullValueIndex())
519-
return StringRef(pos, s);
520-
521-
auto nested_ref = column_holder->serializeAggregationStateValueIntoArena(n, arena, begin);
522-
523-
/// serializeAggregationStateValueIntoArena may reallocate memory. Have to use ptr from nested_ref.data and move it back.
524-
return StringRef(nested_ref.data - s, nested_ref.size + s);
525-
}
526-
527-
return column_holder->serializeAggregationStateValueIntoArena(n, arena, begin);
528-
}
529-
530-
template <typename ColumnType>
531-
size_t ColumnUnique<ColumnType>::uniqueDeserializeAndInsertFromArena(ReadBuffer & in)
532-
>>>>>>> backport/25.8/90880
533502
{
534503
if (is_nullable)
535504
{

‎src/Columns/IColumn.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void IColumn::batchSerializeValueIntoMemoryWithNull(
173173
throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method batchSerializeValueIntoMemoryWithNull is not supported for {}", getName());
174174
}
175175

176-
void IColumn::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null, const SerializationSettings * settings) const
176+
void IColumn::collectSerializedValueSizes(PaddedPODArray<UInt64> & /* sizes */, const UInt8 * /* is_null */, const SerializationSettings * /*settings*/) const
177177
{
178178
throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method collectSerializedValueSizes is not supported for {}", getName());
179179
}

‎src/Common/ColumnsHashing.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ struct HashMethodSerialized
369369
PaddedPODArray<UInt64> row_sizes;
370370
size_t total_size = 0;
371371
IColumn::SerializationSettings serialization_settings;
372-
PaddedPODArray<char> serialized_buffer;
372+
PODArray<char> serialized_buffer;
373373
std::vector<StringRef> serialized_keys;
374374

375375
HashMethodSerialized(const ColumnRawPtrs & key_columns_, const Sizes & /*key_sizes*/, const HashMethodContextPtr & context)

‎src/Interpreters/AggregationMethod.cpp‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,8 @@ template struct AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUIn
5252
template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64KeyTwoLevel>;
5353

5454
template <typename TData, bool nullable>
55-
<<<<<<< HEAD
5655
void AggregationMethodStringNoCache<TData, nullable>::insertKeyIntoColumns(
57-
std::string_view key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
58-
=======
59-
void AggregationMethodStringNoCache<TData, nullable>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
60-
>>>>>>> backport/25.8/90880
56+
StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
6157
{
6258
if constexpr (nullable)
6359
{
@@ -76,12 +72,8 @@ template struct AggregationMethodStringNoCache<AggregatedDataWithNullableShortSt
7672
template struct AggregationMethodStringNoCache<AggregatedDataWithNullableShortStringKeyTwoLevel, true>;
7773

7874
template <typename TData>
79-
<<<<<<< HEAD
8075
void AggregationMethodFixedString<TData>::insertKeyIntoColumns(
81-
std::string_view key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
82-
=======
83-
void AggregationMethodFixedString<TData>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
84-
>>>>>>> backport/25.8/90880
76+
StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
8577
{
8678
assert_cast<ColumnFixedString &>(*key_columns[0]).insertData(key.data, key.size);
8779
}
@@ -91,11 +83,7 @@ template struct AggregationMethodFixedString<AggregatedDataWithNullableStringKey
9183

9284

9385
template <typename TData, bool nullable>
94-
<<<<<<< HEAD
95-
void AggregationMethodFixedStringNoCache<TData, nullable>::insertKeyIntoColumns(std::string_view key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
96-
=======
97-
void AggregationMethodFixedStringNoCache<TData, nullable>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
98-
>>>>>>> backport/25.8/90880
86+
void AggregationMethodFixedStringNoCache<TData, nullable>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings *)
9987
{
10088
if constexpr (nullable)
10189
assert_cast<ColumnNullable &>(*key_columns[0]).insertData(key.data, key.size);
@@ -211,12 +199,8 @@ template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel, fa
211199

212200

213201
template <typename TData, bool nullable, bool prealloc>
214-
<<<<<<< HEAD
215202
void AggregationMethodSerialized<TData, nullable, prealloc>::insertKeyIntoColumns(
216-
std::string_view key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings * settings)
217-
=======
218-
void AggregationMethodSerialized<TData, nullable, prealloc>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
219-
>>>>>>> backport/25.8/90880
203+
StringRef key, std::vector<IColumn *> & key_columns, const Sizes &, const IColumn::SerializationSettings * settings)
220204
{
221205
ReadBufferFromString buf({key.data, key.size});
222206
for (auto & column : key_columns)

‎src/Interpreters/InterpreterSelectQuery.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,6 @@ static void executeMergeAggregatedImpl(
21842184
settings[Setting::max_block_size],
21852185
settings[Setting::min_hit_rate_to_use_consecutive_keys_optimization],
21862186
settings[Setting::serialize_string_in_memory_with_zero_byte]);
2187-
21882187
auto grouping_sets_params = getAggregatorGroupingSetsParams(aggregation_keys_list, keys);
21892188

21902189
auto merging_aggregated = std::make_unique<MergingAggregatedStep>(

‎src/Processors/TTL/TTLAggregationAlgorithm.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ TTLAggregationAlgorithm::TTLAggregationAlgorithm(
6666
/*only_merge=*/false,
6767
settings[Setting::optimize_group_by_constant_keys],
6868
settings[Setting::min_chunk_bytes_for_parallel_parsing],
69+
/*stats_collecting_params_=*/{},
6970
settings[Setting::serialize_string_in_memory_with_zero_byte]);
7071

7172
aggregator = std::make_unique<Aggregator>(header, params);

0 commit comments

Comments
 (0)