提交 2176c0c4 编写于 作者: V Vitaly Baranov

IDataType::[de]serializeBinaryBulk() functions, "limit" parameter: change type UInt64 -> size_t.

上级 309df832
...@@ -100,7 +100,7 @@ void DataTypeAggregateFunction::deserializeBinary(IColumn & column, ReadBuffer & ...@@ -100,7 +100,7 @@ void DataTypeAggregateFunction::deserializeBinary(IColumn & column, ReadBuffer &
column_concrete.getData().push_back(place); column_concrete.getData().push_back(place);
} }
void DataTypeAggregateFunction::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const void DataTypeAggregateFunction::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
{ {
const ColumnAggregateFunction & real_column = typeid_cast<const ColumnAggregateFunction &>(column); const ColumnAggregateFunction & real_column = typeid_cast<const ColumnAggregateFunction &>(column);
const ColumnAggregateFunction::Container & vec = real_column.getData(); const ColumnAggregateFunction::Container & vec = real_column.getData();
...@@ -115,7 +115,7 @@ void DataTypeAggregateFunction::serializeBinaryBulk(const IColumn & column, Writ ...@@ -115,7 +115,7 @@ void DataTypeAggregateFunction::serializeBinaryBulk(const IColumn & column, Writ
function->serialize(*it, ostr); function->serialize(*it, ostr);
} }
void DataTypeAggregateFunction::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double /*avg_value_size_hint*/) const void DataTypeAggregateFunction::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
{ {
ColumnAggregateFunction & real_column = typeid_cast<ColumnAggregateFunction &>(column); ColumnAggregateFunction & real_column = typeid_cast<ColumnAggregateFunction &>(column);
ColumnAggregateFunction::Container & vec = real_column.getData(); ColumnAggregateFunction::Container & vec = real_column.getData();
......
...@@ -44,8 +44,8 @@ public: ...@@ -44,8 +44,8 @@ public:
void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override; void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
void deserializeBinary(IColumn & column, ReadBuffer & istr) const override; void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const override; void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double avg_value_size_hint) const override; void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override; void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override; void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override; void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
......
...@@ -188,7 +188,7 @@ void DataTypeArray::deserializeBinaryBulkStatePrefix( ...@@ -188,7 +188,7 @@ void DataTypeArray::deserializeBinaryBulkStatePrefix(
void DataTypeArray::serializeBinaryBulkWithMultipleStreams( void DataTypeArray::serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & state) const SerializeBinaryBulkStatePtr & state) const
{ {
...@@ -234,7 +234,7 @@ void DataTypeArray::serializeBinaryBulkWithMultipleStreams( ...@@ -234,7 +234,7 @@ void DataTypeArray::serializeBinaryBulkWithMultipleStreams(
void DataTypeArray::deserializeBinaryBulkWithMultipleStreams( void DataTypeArray::deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & state) const DeserializeBinaryBulkStatePtr & state) const
{ {
......
...@@ -74,13 +74,13 @@ public: ...@@ -74,13 +74,13 @@ public:
void serializeBinaryBulkWithMultipleStreams( void serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & state) const override; SerializeBinaryBulkStatePtr & state) const override;
void deserializeBinaryBulkWithMultipleStreams( void deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & state) const override; DeserializeBinaryBulkStatePtr & state) const override;
......
...@@ -201,7 +201,7 @@ void DataTypeEnum<Type>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, ...@@ -201,7 +201,7 @@ void DataTypeEnum<Type>::deserializeTextCSV(IColumn & column, ReadBuffer & istr,
template <typename Type> template <typename Type>
void DataTypeEnum<Type>::serializeBinaryBulk( void DataTypeEnum<Type>::serializeBinaryBulk(
const IColumn & column, WriteBuffer & ostr, const UInt64 offset, UInt64 limit) const const IColumn & column, WriteBuffer & ostr, const size_t offset, size_t limit) const
{ {
const auto & x = typeid_cast<const ColumnType &>(column).getData(); const auto & x = typeid_cast<const ColumnType &>(column).getData();
const auto size = x.size(); const auto size = x.size();
...@@ -214,7 +214,7 @@ void DataTypeEnum<Type>::serializeBinaryBulk( ...@@ -214,7 +214,7 @@ void DataTypeEnum<Type>::serializeBinaryBulk(
template <typename Type> template <typename Type>
void DataTypeEnum<Type>::deserializeBinaryBulk( void DataTypeEnum<Type>::deserializeBinaryBulk(
IColumn & column, ReadBuffer & istr, const UInt64 limit, const double /*avg_value_size_hint*/) const IColumn & column, ReadBuffer & istr, const size_t limit, const double /*avg_value_size_hint*/) const
{ {
auto & x = typeid_cast<ColumnType &>(column).getData(); auto & x = typeid_cast<ColumnType &>(column).getData();
const auto initial_size = x.size(); const auto initial_size = x.size();
......
...@@ -102,8 +102,8 @@ public: ...@@ -102,8 +102,8 @@ public:
void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override; void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override; void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, const UInt64 offset, UInt64 limit) const override; void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, const size_t offset, size_t limit) const override;
void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, const UInt64 limit, const double avg_value_size_hint) const override; void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, const size_t limit, const double avg_value_size_hint) const override;
void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf) const override; void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf) const override;
......
...@@ -78,7 +78,7 @@ void DataTypeFixedString::deserializeBinary(IColumn & column, ReadBuffer & istr) ...@@ -78,7 +78,7 @@ void DataTypeFixedString::deserializeBinary(IColumn & column, ReadBuffer & istr)
} }
void DataTypeFixedString::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const void DataTypeFixedString::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
{ {
const ColumnFixedString::Chars & data = typeid_cast<const ColumnFixedString &>(column).getChars(); const ColumnFixedString::Chars & data = typeid_cast<const ColumnFixedString &>(column).getChars();
...@@ -92,7 +92,7 @@ void DataTypeFixedString::serializeBinaryBulk(const IColumn & column, WriteBuffe ...@@ -92,7 +92,7 @@ void DataTypeFixedString::serializeBinaryBulk(const IColumn & column, WriteBuffe
} }
void DataTypeFixedString::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double /*avg_value_size_hint*/) const void DataTypeFixedString::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
{ {
ColumnFixedString::Chars & data = typeid_cast<ColumnFixedString &>(column).getChars(); ColumnFixedString::Chars & data = typeid_cast<ColumnFixedString &>(column).getChars();
......
...@@ -45,8 +45,8 @@ public: ...@@ -45,8 +45,8 @@ public:
void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override; void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
void deserializeBinary(IColumn & column, ReadBuffer & istr) const override; void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const override; void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double avg_value_size_hint) const override; void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override; void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
......
...@@ -476,7 +476,7 @@ namespace ...@@ -476,7 +476,7 @@ namespace
void DataTypeLowCardinality::serializeBinaryBulkWithMultipleStreams( void DataTypeLowCardinality::serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & state) const SerializeBinaryBulkStatePtr & state) const
{ {
...@@ -572,7 +572,7 @@ void DataTypeLowCardinality::serializeBinaryBulkWithMultipleStreams( ...@@ -572,7 +572,7 @@ void DataTypeLowCardinality::serializeBinaryBulkWithMultipleStreams(
void DataTypeLowCardinality::deserializeBinaryBulkWithMultipleStreams( void DataTypeLowCardinality::deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & state) const DeserializeBinaryBulkStatePtr & state) const
{ {
......
...@@ -39,13 +39,13 @@ public: ...@@ -39,13 +39,13 @@ public:
void serializeBinaryBulkWithMultipleStreams( void serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & state) const override; SerializeBinaryBulkStatePtr & state) const override;
void deserializeBinaryBulkWithMultipleStreams( void deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & state) const override; DeserializeBinaryBulkStatePtr & state) const override;
......
...@@ -14,7 +14,7 @@ MutableColumnPtr DataTypeNothing::createColumn() const ...@@ -14,7 +14,7 @@ MutableColumnPtr DataTypeNothing::createColumn() const
return ColumnNothing::create(0); return ColumnNothing::create(0);
} }
void DataTypeNothing::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const void DataTypeNothing::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
{ {
size_t size = column.size(); size_t size = column.size();
...@@ -25,7 +25,7 @@ void DataTypeNothing::serializeBinaryBulk(const IColumn & column, WriteBuffer & ...@@ -25,7 +25,7 @@ void DataTypeNothing::serializeBinaryBulk(const IColumn & column, WriteBuffer &
ostr.write('0'); ostr.write('0');
} }
void DataTypeNothing::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double /*avg_value_size_hint*/) const void DataTypeNothing::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
{ {
typeid_cast<ColumnNothing &>(column).addSize(istr.tryIgnore(limit)); typeid_cast<ColumnNothing &>(column).addSize(istr.tryIgnore(limit));
} }
......
...@@ -21,8 +21,8 @@ public: ...@@ -21,8 +21,8 @@ public:
MutableColumnPtr createColumn() const override; MutableColumnPtr createColumn() const override;
/// These methods read and write zero bytes just to allow to figure out size of column. /// These methods read and write zero bytes just to allow to figure out size of column.
void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const override; void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double avg_value_size_hint) const override; void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
bool equals(const IDataType & rhs) const override; bool equals(const IDataType & rhs) const override;
......
...@@ -80,7 +80,7 @@ void DataTypeNullable::deserializeBinaryBulkStatePrefix( ...@@ -80,7 +80,7 @@ void DataTypeNullable::deserializeBinaryBulkStatePrefix(
void DataTypeNullable::serializeBinaryBulkWithMultipleStreams( void DataTypeNullable::serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & state) const SerializeBinaryBulkStatePtr & state) const
{ {
...@@ -101,7 +101,7 @@ void DataTypeNullable::serializeBinaryBulkWithMultipleStreams( ...@@ -101,7 +101,7 @@ void DataTypeNullable::serializeBinaryBulkWithMultipleStreams(
void DataTypeNullable::deserializeBinaryBulkWithMultipleStreams( void DataTypeNullable::deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & state) const DeserializeBinaryBulkStatePtr & state) const
{ {
......
...@@ -35,13 +35,13 @@ public: ...@@ -35,13 +35,13 @@ public:
void serializeBinaryBulkWithMultipleStreams( void serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & state) const override; SerializeBinaryBulkStatePtr & state) const override;
void deserializeBinaryBulkWithMultipleStreams( void deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & state) const override; DeserializeBinaryBulkStatePtr & state) const override;
......
...@@ -179,7 +179,7 @@ void DataTypeNumberBase<T>::deserializeBinary(IColumn & column, ReadBuffer & ist ...@@ -179,7 +179,7 @@ void DataTypeNumberBase<T>::deserializeBinary(IColumn & column, ReadBuffer & ist
} }
template <typename T> template <typename T>
void DataTypeNumberBase<T>::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const void DataTypeNumberBase<T>::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
{ {
const typename ColumnVector<T>::Container & x = typeid_cast<const ColumnVector<T> &>(column).getData(); const typename ColumnVector<T>::Container & x = typeid_cast<const ColumnVector<T> &>(column).getData();
...@@ -193,7 +193,7 @@ void DataTypeNumberBase<T>::serializeBinaryBulk(const IColumn & column, WriteBuf ...@@ -193,7 +193,7 @@ void DataTypeNumberBase<T>::serializeBinaryBulk(const IColumn & column, WriteBuf
} }
template <typename T> template <typename T>
void DataTypeNumberBase<T>::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double /*avg_value_size_hint*/) const void DataTypeNumberBase<T>::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
{ {
typename ColumnVector<T>::Container & x = typeid_cast<ColumnVector<T> &>(column).getData(); typename ColumnVector<T>::Container & x = typeid_cast<ColumnVector<T> &>(column).getData();
size_t initial_size = x.size(); size_t initial_size = x.size();
......
...@@ -33,8 +33,8 @@ public: ...@@ -33,8 +33,8 @@ public:
void deserializeBinary(Field & field, ReadBuffer & istr) const override; void deserializeBinary(Field & field, ReadBuffer & istr) const override;
void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override; void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
void deserializeBinary(IColumn & column, ReadBuffer & istr) const override; void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const override; void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double avg_value_size_hint) const override; void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf) const override; void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf) const override;
......
...@@ -78,7 +78,7 @@ void DataTypeString::deserializeBinary(IColumn & column, ReadBuffer & istr) cons ...@@ -78,7 +78,7 @@ void DataTypeString::deserializeBinary(IColumn & column, ReadBuffer & istr) cons
} }
void DataTypeString::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const void DataTypeString::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
{ {
const ColumnString & column_string = typeid_cast<const ColumnString &>(column); const ColumnString & column_string = typeid_cast<const ColumnString &>(column);
const ColumnString::Chars & data = column_string.getChars(); const ColumnString::Chars & data = column_string.getChars();
...@@ -111,7 +111,7 @@ void DataTypeString::serializeBinaryBulk(const IColumn & column, WriteBuffer & o ...@@ -111,7 +111,7 @@ void DataTypeString::serializeBinaryBulk(const IColumn & column, WriteBuffer & o
template <int UNROLL_TIMES> template <int UNROLL_TIMES>
static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars & data, ColumnString::Offsets & offsets, ReadBuffer & istr, UInt64 limit) static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars & data, ColumnString::Offsets & offsets, ReadBuffer & istr, size_t limit)
{ {
size_t offset = data.size(); size_t offset = data.size();
for (size_t i = 0; i < limit; ++i) for (size_t i = 0; i < limit; ++i)
...@@ -171,7 +171,7 @@ static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars & data, ColumnSt ...@@ -171,7 +171,7 @@ static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars & data, ColumnSt
} }
void DataTypeString::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double avg_value_size_hint) const void DataTypeString::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const
{ {
ColumnString & column_string = typeid_cast<ColumnString &>(column); ColumnString & column_string = typeid_cast<ColumnString &>(column);
ColumnString::Chars & data = column_string.getChars(); ColumnString::Chars & data = column_string.getChars();
......
...@@ -26,8 +26,8 @@ public: ...@@ -26,8 +26,8 @@ public:
void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override; void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
void deserializeBinary(IColumn & column, ReadBuffer & istr) const override; void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const override; void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double avg_value_size_hint) const override; void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override; void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
......
...@@ -372,7 +372,7 @@ void DataTypeTuple::deserializeBinaryBulkStatePrefix( ...@@ -372,7 +372,7 @@ void DataTypeTuple::deserializeBinaryBulkStatePrefix(
void DataTypeTuple::serializeBinaryBulkWithMultipleStreams( void DataTypeTuple::serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & state) const SerializeBinaryBulkStatePtr & state) const
{ {
...@@ -390,7 +390,7 @@ void DataTypeTuple::serializeBinaryBulkWithMultipleStreams( ...@@ -390,7 +390,7 @@ void DataTypeTuple::serializeBinaryBulkWithMultipleStreams(
void DataTypeTuple::deserializeBinaryBulkWithMultipleStreams( void DataTypeTuple::deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & state) const DeserializeBinaryBulkStatePtr & state) const
{ {
......
...@@ -67,13 +67,13 @@ public: ...@@ -67,13 +67,13 @@ public:
void serializeBinaryBulkWithMultipleStreams( void serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & state) const override; SerializeBinaryBulkStatePtr & state) const override;
void deserializeBinaryBulkWithMultipleStreams( void deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & state) const override; DeserializeBinaryBulkStatePtr & state) const override;
......
...@@ -94,7 +94,7 @@ void DataTypeDecimal<T>::serializeBinary(const IColumn & column, size_t row_num, ...@@ -94,7 +94,7 @@ void DataTypeDecimal<T>::serializeBinary(const IColumn & column, size_t row_num,
} }
template <typename T> template <typename T>
void DataTypeDecimal<T>::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const void DataTypeDecimal<T>::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
{ {
const typename ColumnType::Container & x = typeid_cast<const ColumnType &>(column).getData(); const typename ColumnType::Container & x = typeid_cast<const ColumnType &>(column).getData();
...@@ -124,7 +124,7 @@ void DataTypeDecimal<T>::deserializeBinary(IColumn & column, ReadBuffer & istr) ...@@ -124,7 +124,7 @@ void DataTypeDecimal<T>::deserializeBinary(IColumn & column, ReadBuffer & istr)
} }
template <typename T> template <typename T>
void DataTypeDecimal<T>::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double) const void DataTypeDecimal<T>::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double) const
{ {
typename ColumnType::Container & x = typeid_cast<ColumnType &>(column).getData(); typename ColumnType::Container & x = typeid_cast<ColumnType &>(column).getData();
size_t initial_size = x.size(); size_t initial_size = x.size();
......
...@@ -94,11 +94,11 @@ public: ...@@ -94,11 +94,11 @@ public:
void serializeBinary(const Field & field, WriteBuffer & ostr) const override; void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override; void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const override; void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
void deserializeBinary(Field & field, ReadBuffer & istr) const override; void deserializeBinary(Field & field, ReadBuffer & istr) const override;
void deserializeBinary(IColumn & column, ReadBuffer & istr) const override; void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double avg_value_size_hint) const override; void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf) const override; void serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf) const override;
......
...@@ -173,7 +173,7 @@ public: ...@@ -173,7 +173,7 @@ public:
virtual void serializeBinaryBulkWithMultipleStreams( virtual void serializeBinaryBulkWithMultipleStreams(
const IColumn & column, const IColumn & column,
size_t offset, size_t offset,
UInt64 limit, size_t limit,
SerializeBinaryBulkSettings & settings, SerializeBinaryBulkSettings & settings,
SerializeBinaryBulkStatePtr & /*state*/) const SerializeBinaryBulkStatePtr & /*state*/) const
{ {
...@@ -184,7 +184,7 @@ public: ...@@ -184,7 +184,7 @@ public:
/// Read no more than limit values and append them into column. /// Read no more than limit values and append them into column.
virtual void deserializeBinaryBulkWithMultipleStreams( virtual void deserializeBinaryBulkWithMultipleStreams(
IColumn & column, IColumn & column,
UInt64 limit, size_t limit,
DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkSettings & settings,
DeserializeBinaryBulkStatePtr & /*state*/) const DeserializeBinaryBulkStatePtr & /*state*/) const
{ {
...@@ -194,8 +194,8 @@ public: ...@@ -194,8 +194,8 @@ public:
/** Override these methods for data types that require just single stream (most of data types). /** Override these methods for data types that require just single stream (most of data types).
*/ */
virtual void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit) const; virtual void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const;
virtual void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, UInt64 limit, double avg_value_size_hint) const; virtual void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const;
/** Serialization/deserialization of individual values. /** Serialization/deserialization of individual values.
* *
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册