Skip to content

Commit 120c9bf

Browse files
yangzhgyangzhengguo01
authored andcommitted
remove serialize function row by row (apache#10)
Change-Id: I1b97d0217b1fcd1647bd13a6565c6cce412e5a38 Co-authored-by: yangzhengguo01 <[email protected]>
1 parent a576431 commit 120c9bf

12 files changed

Lines changed: 8 additions & 58 deletions

‎be/src/vec/data_types/data_type.cpp‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,12 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18+
#include "vec/data_types/data_type.h"
19+
1820
#include "vec/columns/column.h"
1921
#include "vec/columns/column_const.h"
2022
#include "vec/common/exception.h"
21-
// #include <vec/Common/escapeForFileName.h>
22-
2323
#include "vec/core/defines.h"
24-
25-
// #include <IO/WriteHelpers.h>
26-
27-
#include "vec/data_types/data_type.h"
28-
// #include <vec/DataTypes/DataTypeCustom.h>
2924
#include "vec/data_types/nested_utils.h"
3025

3126
namespace doris::vectorized {

‎be/src/vec/data_types/data_type.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "vec/common/cow.h"
2424
#include "vec/common/string_buffer.hpp"
2525
#include "vec/core/types.h"
26-
// #include <vec/DataTypes/DataTypeCustom.h>
2726

2827
namespace doris {
2928
class PBlock;
@@ -459,7 +458,6 @@ class IDataType : private boost::noncopyable {
459458
/// Updates avg_value_size_hint for newly read column. Uses to optimize deserialization. Zero expected for first column.
460459
static void updateAvgValueSizeHint(const IColumn& column, double& avg_value_size_hint);
461460

462-
virtual void serialize(const IColumn& column, size_t row_num, PColumn* pcolumn) const = 0;
463461
virtual void serialize(const IColumn& column, PColumn* pcolumn) const = 0;
464462
virtual void deserialize(const PColumn& pcolumn, IColumn* column) const = 0;
465463

‎be/src/vec/data_types/data_type_nothing.cpp‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,9 @@
1717

1818
#include "vec/data_types/data_type_nothing.h"
1919

20-
#include "vec/common/typeid_cast.h"
21-
// #include <vec/DataTypes/DataTypeFactory.h>
22-
#include "vec/columns/column_nothing.h"
2320
#include "gen_cpp/data.pb.h"
24-
25-
// #include <vec/IO/ReadBuffer.h>
26-
// #include <vec/IO/WriteBuffer.h>
21+
#include "vec/columns/column_nothing.h"
22+
#include "vec/common/typeid_cast.h"
2723

2824
namespace doris::vectorized {
2925

@@ -47,12 +43,9 @@ MutableColumnPtr DataTypeNothing::createColumn() const {
4743
// typeid_cast<ColumnNothing &>(column).addSize(istr.tryIgnore(limit));
4844
// }
4945

50-
void DataTypeNothing::serialize(const IColumn& column, PColumn* pcolumn) const {
51-
}
52-
void DataTypeNothing::serialize(const IColumn& column, size_t row_num, PColumn* pcolumn) const {
53-
}
54-
void DataTypeNothing::deserialize(const PColumn& pcolumn, IColumn* column) const {
55-
}
46+
void DataTypeNothing::serialize(const IColumn& column, PColumn* pcolumn) const {}
47+
48+
void DataTypeNothing::deserialize(const PColumn& pcolumn, IColumn* column) const {}
5649
bool DataTypeNothing::equals(const IDataType& rhs) const {
5750
return typeid(rhs) == typeid(*this);
5851
}

‎be/src/vec/data_types/data_type_nothing.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#pragma once
1919

20-
// #include <vec/DataTypes/IDataTypeDummy.h>
2120
#include <vec/common/exception.h>
2221

2322
#include "vec/core/field.h"
@@ -50,7 +49,6 @@ class DataTypeNothing final : public IDataType {
5049
size_t getSizeOfValueInMemory() const override { return 0; }
5150
bool canBeInsideNullable() const override { return true; }
5251

53-
void serialize(const IColumn& column, size_t row_num, PColumn* pcolumn) const override;
5452
void serialize(const IColumn& column, PColumn* pcolumn) const override;
5553
void deserialize(const PColumn& pcolumn, IColumn* column) const override;
5654
Field getDefault() const override {

‎be/src/vec/data_types/data_type_nullable.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -476,18 +476,13 @@ bool DataTypeNullable::onlyNull() const {
476476
// }
477477
// }
478478

479-
void DataTypeNullable::serialize(const IColumn& column, size_t row_num, PColumn* pcolumn) const {
480-
const ColumnNullable& col = assert_cast<const ColumnNullable&>(column);
481-
pcolumn->set_is_null(row_num, col.isNullAt(row_num));
482-
nested_data_type->serialize(column, row_num, pcolumn);
483-
}
484479
void DataTypeNullable::serialize(const IColumn& column, PColumn* pcolumn) const {
485480
const ColumnNullable& col = assert_cast<const ColumnNullable&>(column);
486481
for (size_t i = 0; i < column.size(); ++i) {
487482
bool is_null = col.isNullAt(i);
488483
pcolumn->add_is_null(is_null);
489-
nested_data_type->serialize(col.getNestedColumn(), i, pcolumn);
490484
}
485+
nested_data_type->serialize(col.getNestedColumn(), pcolumn);
491486
}
492487
void DataTypeNullable::deserialize(const PColumn& pcolumn, IColumn* column) const {
493488
ColumnNullable* col = assert_cast<ColumnNullable*>(column);

‎be/src/vec/data_types/data_type_nullable.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ class DataTypeNullable final : public IDataType {
9292
// void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf, size_t & value_index) const override;
9393
// void deserializeProtobuf(IColumn & column, ProtobufReader & protobuf, bool allow_add_row, bool & row_added) const override;
9494

95-
void serialize(const IColumn& column, size_t row_num, PColumn* pcolumn) const override;
9695
void serialize(const IColumn& column, PColumn* pcolumn) const override;
9796
void deserialize(const PColumn& pcolumn, IColumn* column) const override;
9897
MutableColumnPtr createColumn() const override;

‎be/src/vec/data_types/data_type_number_base.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,14 +262,6 @@ void DataTypeNumberBase<T>::serialize(const IColumn& column, PColumn* pcolumn) c
262262
write_binary(buf, pcolumn);
263263
}
264264

265-
template <typename T>
266-
void DataTypeNumberBase<T>::serialize(const IColumn& column, size_t row_num,
267-
PColumn* pcolumn) const {
268-
std::ostringstream buf;
269-
writeBinary(assert_cast<const ColumnVector<T>&>(column).getData()[row_num], buf);
270-
pcolumn->mutable_binary()->append(buf.str());
271-
}
272-
273265
template <typename T>
274266
void DataTypeNumberBase<T>::deserialize(const PColumn& pcolumn, IColumn* column) const {
275267
std::string uncompressed;

‎be/src/vec/data_types/data_type_number_base.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include "vec/core/types.h"
2323
#include "vec/data_types/data_type.h"
2424

25-
// #include <vec/DataTypes/DataTypeWithSimpleSerialization.h>
26-
2725
namespace doris::vectorized {
2826

2927
/** Implements part of the IDataType interface, common to all numbers and for Date and DateTime.
@@ -57,7 +55,6 @@ class DataTypeNumberBase : public IDataType {
5755
// void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf, size_t & value_index) const override;
5856
// void deserializeProtobuf(IColumn & column, ProtobufReader & protobuf, bool allow_add_row, bool & row_added) const override;
5957

60-
void serialize(const IColumn& column, size_t row_num, PColumn* pcolumn) const override;
6158
void serialize(const IColumn& column, PColumn* pcolumn) const override;
6259
void deserialize(const PColumn& pcolumn, IColumn* column) const override;
6360
MutableColumnPtr createColumn() const override;

‎be/src/vec/data_types/data_type_string.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,6 @@ void DataTypeString::serialize(const IColumn& column, PColumn* pcolumn) const {
256256
write_binary(buf, pcolumn);
257257
}
258258

259-
void DataTypeString::serialize(const IColumn& column, size_t row_num, PColumn* pcolumn) const {
260-
std::ostringstream buf;
261-
const StringRef& s = assert_cast<const ColumnString&>(column).getDataAt(row_num);
262-
writeStringBinary(s, buf);
263-
pcolumn->mutable_binary()->append(buf.str());
264-
}
265-
266259
void DataTypeString::deserialize(const PColumn& pcolumn, IColumn* column) const {
267260
ColumnString* column_string = assert_cast<ColumnString*>(column);
268261
ColumnString::Chars& data = column_string->getChars();

‎be/src/vec/data_types/data_type_string.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class DataTypeString final : public IDataType {
5959
//
6060
// void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf, size_t & value_index) const override;
6161
// void deserializeProtobuf(IColumn & column, ProtobufReader & protobuf, bool allow_add_row, bool & row_added) const override;
62-
void serialize(const IColumn& column, size_t row_num, PColumn* pcolumn) const override;
6362
void serialize(const IColumn& column, PColumn* pcolumn) const override;
6463
void deserialize(const PColumn& pcolumn, IColumn* column) const override;
6564

0 commit comments

Comments
 (0)