Remove new argument from write method

Avogar · Avogar · commit 4c9b7a8070ba · 2025-05-12T11:43:09.000Z
diff --git a/src/AggregateFunctions/AggregateFunctionAny.cpp b/src/AggregateFunctions/AggregateFunctionAny.cpp
@@ -118,7 +118,7 @@ class AggregateFunctionAny final : public IAggregateFunctionDataHelper<Data, Agg
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).write(buf, *serialization, this->result_type);
+        this->data(place).write(buf, *serialization);
     }
 
     void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
@@ -288,7 +288,7 @@ class AggregateFunctionAnyLast final : public IAggregateFunctionDataHelper<Data,
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).write(buf, *serialization, this->result_type);
+        this->data(place).write(buf, *serialization);
     }
 
     void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
diff --git a/src/AggregateFunctions/AggregateFunctionAnyHeavy.cpp b/src/AggregateFunctions/AggregateFunctionAnyHeavy.cpp
@@ -82,9 +82,9 @@ struct AggregateFunctionAnyHeavyData
             add(column, 0, arena);
     }
 
-    void write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr & type) const
+    void write(WriteBuffer & buf, const ISerialization & serialization) const
     {
-        data().write(buf, serialization, type);
+        data().write(buf, serialization);
         writeBinaryLittleEndian(counter, buf);
     }
 
@@ -131,7 +131,7 @@ class AggregateFunctionAnyHeavy final : public IAggregateFunctionDataHelper<Aggr
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        data(place).write(buf, *serialization, result_type);
+        data(place).write(buf, *serialization);
     }
 
     void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
diff --git a/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp b/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp
@@ -78,7 +78,7 @@ struct AggregateFunctionSingleValueOrNullData
 
     /// TODO: Methods write and read lose data (first_value and is_null)
     /// Fixing it requires a breaking change (but it's probably necessary)
-    void write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr & data_type) const { data().write(buf, serialization, data_type); }
+    void write(WriteBuffer & buf, const ISerialization & serialization) const { data().write(buf, serialization); }
 
     void read(ReadBuffer & buf, const ISerialization & serialization, const DataTypePtr & data_type, Arena * arena) { data().read(buf, serialization, data_type, arena); }
 
@@ -164,7 +164,7 @@ class AggregateFunctionSingleValueOrNull final
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        data(place).write(buf, *serialization, result_type);
+        data(place).write(buf, *serialization);
     }
 
     void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
diff --git a/src/AggregateFunctions/AggregateFunctionsArgMinArgMax.cpp b/src/AggregateFunctions/AggregateFunctionsArgMinArgMax.cpp
@@ -227,8 +227,8 @@ class AggregateFunctionArgMinMax final
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).result().write(buf, *serialization_res, data_type_res);
-        this->data(place).value().write(buf, *serialization_val, data_type_val);
+        this->data(place).result().write(buf, *serialization_res);
+        this->data(place).value().write(buf, *serialization_val);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
diff --git a/src/AggregateFunctions/AggregateFunctionsMinMax.cpp b/src/AggregateFunctions/AggregateFunctionsMinMax.cpp
@@ -127,7 +127,7 @@ class AggregateFunctionMinMax final : public IAggregateFunctionDataHelper<Data,
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).write(buf, *serialization, this->result_type);
+        this->data(place).write(buf, *serialization);
     }
 
     void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionCombinatorsArgMinArgMax.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionCombinatorsArgMinArgMax.cpp
@@ -156,7 +156,7 @@ class AggregateFunctionCombinatorArgMinArgMax final : public IAggregateFunctionH
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override
     {
         nested_function->serialize(place, buf, version);
-        data(place).data().write(buf, *serialization, data_type);
+        data(place).data().write(buf, *serialization);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> version, Arena * arena) const override
diff --git a/src/AggregateFunctions/SingleValueData.cpp b/src/AggregateFunctions/SingleValueData.cpp
@@ -171,7 +171,7 @@ void SingleValueDataFixed<T>::insertResultInto(IColumn & to, const DataTypePtr &
 }
 
 template <typename T>
-void SingleValueDataFixed<T>::write(WriteBuffer & buf, const ISerialization &, const DataTypePtr &) const
+void SingleValueDataFixed<T>::write(WriteBuffer & buf, const ISerialization &) const
 {
     writeBinary(has(), buf);
     if (has())
@@ -941,9 +941,9 @@ void SingleValueDataNumeric<T>::insertResultInto(IColumn & to, const DataTypePtr
 }
 
 template <typename T>
-void SingleValueDataNumeric<T>::write(DB::WriteBuffer & buf, const DB::ISerialization & serialization, const DataTypePtr & type) const
+void SingleValueDataNumeric<T>::write(DB::WriteBuffer & buf, const DB::ISerialization & serialization) const
 {
-    return memory.get().write(buf, serialization, type);
+    return memory.get().write(buf, serialization);
 }
 
 template <typename T>
@@ -1176,7 +1176,7 @@ void SingleValueDataString::insertResultInto(DB::IColumn & to, const DataTypePtr
         assert_cast<ColumnString &>(to).insertDefault();
 }
 
-void SingleValueDataString::write(WriteBuffer & buf, const ISerialization & /*serialization*/, const DataTypePtr & /*type*/) const
+void SingleValueDataString::write(WriteBuffer & buf, const ISerialization & /*serialization*/) const
 {
     if (unlikely(MAX_STRING_SIZE < size))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "String size is too big ({}), it's a bug", size);
@@ -1320,7 +1320,7 @@ void SingleValueDataGeneric::insertResultInto(IColumn & to, const DataTypePtr &
         type->insertDefaultInto(to);
 }
 
-void SingleValueDataGeneric::write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr &) const
+void SingleValueDataGeneric::write(WriteBuffer & buf, const ISerialization & serialization) const
 {
     if (!value.isNull())
     {
@@ -1429,7 +1429,7 @@ void SingleValueDataGenericWithColumn::insertResultInto(IColumn & to, const Data
         type->insertDefaultInto(to);
 }
 
-void SingleValueDataGenericWithColumn::write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr &) const
+void SingleValueDataGenericWithColumn::write(WriteBuffer & buf, const ISerialization & serialization) const
 {
     if (value)
     {
diff --git a/src/AggregateFunctions/SingleValueData.h b/src/AggregateFunctions/SingleValueData.h
@@ -27,7 +27,7 @@ struct SingleValueDataBase
     virtual ~SingleValueDataBase() = default;
     virtual bool has() const = 0;
     virtual void insertResultInto(IColumn &, const DataTypePtr & type) const = 0;
-    virtual void write(WriteBuffer &, const ISerialization &, const DataTypePtr & type) const = 0;
+    virtual void write(WriteBuffer &, const ISerialization &) const = 0;
     virtual void read(ReadBuffer &, const ISerialization &, const DataTypePtr & type, Arena *) = 0;
 
     virtual bool isEqualTo(const IColumn & column, size_t row_num) const = 0;
@@ -94,7 +94,7 @@ struct SingleValueDataFixed
 
     bool has() const { return has_value; }
     void insertResultInto(IColumn & to, const DataTypePtr & type) const;
-    void write(WriteBuffer & buf, const ISerialization &, const DataTypePtr &) const;
+    void write(WriteBuffer & buf, const ISerialization &) const;
     void read(ReadBuffer & buf, const ISerialization &, const DataTypePtr &, Arena *);
     bool isEqualTo(const IColumn & column, size_t index) const;
     bool isEqualTo(const Self & to) const;
@@ -207,7 +207,7 @@ struct SingleValueDataNumeric final : public SingleValueDataBase
 
     bool has() const override;
     void insertResultInto(IColumn & to, const DataTypePtr & type) const override;
-    void write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr & type) const override;
+    void write(WriteBuffer & buf, const ISerialization & serialization) const override;
     void read(ReadBuffer & buf, const ISerialization & serialization, const DataTypePtr &, Arena * arena) override;
     bool isEqualTo(const IColumn & column, size_t index) const override;
     bool isEqualTo(const SingleValueDataBase & to) const override;
@@ -293,7 +293,7 @@ struct SingleValueDataString final : public SingleValueDataBase
 public:
     bool has() const override { return size != 0; }
     void insertResultInto(IColumn & to, const DataTypePtr & type) const override;
-    void write(WriteBuffer & buf, const ISerialization & /*serialization*/, const DataTypePtr & /*type*/) const override;
+    void write(WriteBuffer & buf, const ISerialization & /*serialization*/) const override;
     void read(ReadBuffer & buf, const ISerialization & /*serialization*/, const DataTypePtr & /*type*/, Arena * arena) override;
 
     bool isEqualTo(const IColumn & column, size_t row_num) const override;
@@ -325,7 +325,7 @@ struct SingleValueDataGeneric final : public SingleValueDataBase
 public:
     bool has() const override { return !value.isNull(); }
     void insertResultInto(IColumn & to, const DataTypePtr & type) const override;
-    void write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr & /*type*/) const override;
+    void write(WriteBuffer & buf, const ISerialization & serialization) const override;
     void read(ReadBuffer & buf, const ISerialization & serialization, const DataTypePtr & type, Arena *) override;
 
     bool isEqualTo(const IColumn & column, size_t row_num) const override;
@@ -358,7 +358,7 @@ struct SingleValueDataGenericWithColumn final : public SingleValueDataBase
 public:
     bool has() const override { return value.operator bool(); }
     void insertResultInto(IColumn & to, const DataTypePtr & type) const override;
-    void write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr & type) const override;
+    void write(WriteBuffer & buf, const ISerialization & serialization) const override;
     void read(ReadBuffer & buf, const ISerialization & serialization, const DataTypePtr & type, Arena *) override;
 
     bool isEqualTo(const IColumn & column, size_t row_num) const override;

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ class AggregateFunctionAny final : public IAggregateFunctionDataHelper<Data, Agg`
`118`	`118`
`119`	`119`	`void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override`
`120`	`120`	`{`
`121`		`- this->data(place).write(buf, *serialization, this->result_type);`
	`121`	`+ this->data(place).write(buf, *serialization);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version /, Arena arena) const override`
`@@ -288,7 +288,7 @@ class AggregateFunctionAnyLast final : public IAggregateFunctionDataHelper<Data,`
`288`	`288`
`289`	`289`	`void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override`
`290`	`290`	`{`
`291`		`- this->data(place).write(buf, *serialization, this->result_type);`
	`291`	`+ this->data(place).write(buf, *serialization);`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version /, Arena arena) const override`
Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,9 @@ struct AggregateFunctionAnyHeavyData`
`82`	`82`	`add(column, 0, arena);`
`83`	`83`	`}`
`84`	`84`
`85`		`- void write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr & type) const`
	`85`	`+ void write(WriteBuffer & buf, const ISerialization & serialization) const`
`86`	`86`	`{`
`87`		`- data().write(buf, serialization, type);`
	`87`	`+ data().write(buf, serialization);`
`88`	`88`	`writeBinaryLittleEndian(counter, buf);`
`89`	`89`	`}`
`90`	`90`
`@@ -131,7 +131,7 @@ class AggregateFunctionAnyHeavy final : public IAggregateFunctionDataHelper<Aggr`
`131`	`131`
`132`	`132`	`void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override`
`133`	`133`	`{`
`134`		`- data(place).write(buf, *serialization, result_type);`
	`134`	`+ data(place).write(buf, *serialization);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version /, Arena arena) const override`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ struct AggregateFunctionSingleValueOrNullData`
`78`	`78`
`79`	`79`	`/// TODO: Methods write and read lose data (first_value and is_null)`
`80`	`80`	`/// Fixing it requires a breaking change (but it's probably necessary)`
`81`		`- void write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr & data_type) const { data().write(buf, serialization, data_type); }`
	`81`	`+ void write(WriteBuffer & buf, const ISerialization & serialization) const { data().write(buf, serialization); }`
`82`	`82`
`83`	`83`	`void read(ReadBuffer & buf, const ISerialization & serialization, const DataTypePtr & data_type, Arena * arena) { data().read(buf, serialization, data_type, arena); }`
`84`	`84`
`@@ -164,7 +164,7 @@ class AggregateFunctionSingleValueOrNull final`
`164`	`164`
`165`	`165`	`void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override`
`166`	`166`	`{`
`167`		`- data(place).write(buf, *serialization, result_type);`
	`167`	`+ data(place).write(buf, *serialization);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version /, Arena arena) const override`
Original file line number	Diff line number	Diff line change
`@@ -227,8 +227,8 @@ class AggregateFunctionArgMinMax final`
`227`	`227`
`228`	`228`	`void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override`
`229`	`229`	`{`
`230`		`- this->data(place).result().write(buf, *serialization_res, data_type_res);`
`231`		`- this->data(place).value().write(buf, *serialization_val, data_type_val);`
	`230`	`+ this->data(place).result().write(buf, *serialization_res);`
	`231`	`+ this->data(place).value().write(buf, *serialization_val);`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version /, Arena arena) const override`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ class AggregateFunctionMinMax final : public IAggregateFunctionDataHelper<Data,`
`127`	`127`
`128`	`128`	`void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override`
`129`	`129`	`{`
`130`		`- this->data(place).write(buf, *serialization, this->result_type);`
	`130`	`+ this->data(place).write(buf, *serialization);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version /, Arena arena) const override`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ class AggregateFunctionCombinatorArgMinArgMax final : public IAggregateFunctionH`
`156`	`156`	`void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override`
`157`	`157`	`{`
`158`	`158`	`nested_function->serialize(place, buf, version);`
`159`		`- data(place).data().write(buf, *serialization, data_type);`
	`159`	`+ data(place).data().write(buf, *serialization);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> version, Arena * arena) const override`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ void SingleValueDataFixed<T>::insertResultInto(IColumn & to, const DataTypePtr &`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`template <typename T>`
`174`		`-void SingleValueDataFixed<T>::write(WriteBuffer & buf, const ISerialization &, const DataTypePtr &) const`
	`174`	`+void SingleValueDataFixed<T>::write(WriteBuffer & buf, const ISerialization &) const`
`175`	`175`	`{`
`176`	`176`	`writeBinary(has(), buf);`
`177`	`177`	`if (has())`
`@@ -941,9 +941,9 @@ void SingleValueDataNumeric<T>::insertResultInto(IColumn & to, const DataTypePtr`
`941`	`941`	`}`
`942`	`942`
`943`	`943`	`template <typename T>`
`944`		`-void SingleValueDataNumeric<T>::write(DB::WriteBuffer & buf, const DB::ISerialization & serialization, const DataTypePtr & type) const`
	`944`	`+void SingleValueDataNumeric<T>::write(DB::WriteBuffer & buf, const DB::ISerialization & serialization) const`
`945`	`945`	`{`
`946`		`- return memory.get().write(buf, serialization, type);`
	`946`	`+ return memory.get().write(buf, serialization);`
`947`	`947`	`}`
`948`	`948`
`949`	`949`	`template <typename T>`
`@@ -1176,7 +1176,7 @@ void SingleValueDataString::insertResultInto(DB::IColumn & to, const DataTypePtr`
`1176`	`1176`	`assert_cast<ColumnString &>(to).insertDefault();`
`1177`	`1177`	`}`
`1178`	`1178`
`1179`		`-void SingleValueDataString::write(WriteBuffer & buf, const ISerialization & /serialization/, const DataTypePtr & /type/) const`
	`1179`	`+void SingleValueDataString::write(WriteBuffer & buf, const ISerialization & /serialization/) const`
`1180`	`1180`	`{`
`1181`	`1181`	`if (unlikely(MAX_STRING_SIZE < size))`
`1182`	`1182`	`throw Exception(ErrorCodes::LOGICAL_ERROR, "String size is too big ({}), it's a bug", size);`
`@@ -1320,7 +1320,7 @@ void SingleValueDataGeneric::insertResultInto(IColumn & to, const DataTypePtr &`
`1320`	`1320`	`type->insertDefaultInto(to);`
`1321`	`1321`	`}`
`1322`	`1322`
`1323`		`-void SingleValueDataGeneric::write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr &) const`
	`1323`	`+void SingleValueDataGeneric::write(WriteBuffer & buf, const ISerialization & serialization) const`
`1324`	`1324`	`{`
`1325`	`1325`	`if (!value.isNull())`
`1326`	`1326`	`{`
`@@ -1429,7 +1429,7 @@ void SingleValueDataGenericWithColumn::insertResultInto(IColumn & to, const Data`
`1429`	`1429`	`type->insertDefaultInto(to);`
`1430`	`1430`	`}`
`1431`	`1431`
`1432`		`-void SingleValueDataGenericWithColumn::write(WriteBuffer & buf, const ISerialization & serialization, const DataTypePtr &) const`
	`1432`	`+void SingleValueDataGenericWithColumn::write(WriteBuffer & buf, const ISerialization & serialization) const`
`1433`	`1433`	`{`
`1434`	`1434`	`if (value)`
`1435`	`1435`	`{`