code change for review

Author: 1261385937

clickhouse/columns/array.cpp

@@ -52,8 +52,7 @@ ColumnRef ColumnArray::CloneEmpty() const {
     return std::make_shared<ColumnArray>(data_->CloneEmpty());
 }
 
-void ColumnArray::Reserve(size_t new_cap)
-{
+void ColumnArray::Reserve(size_t new_cap) {
     data_->Reserve(new_cap);
     offsets_->Reserve(new_cap);
 }

clickhouse/columns/decimal.cpp

@@ -191,8 +191,7 @@ Int128 ColumnDecimal::At(size_t i) const {
     }
 }
 
-void ColumnDecimal::Reserve(size_t new_cap)
-{
+void ColumnDecimal::Reserve(size_t new_cap) {
     data_->Reserve(new_cap);
 }
 

clickhouse/columns/enum.cpp

@@ -69,8 +69,7 @@ void ColumnEnum<T>::SetNameAt(size_t n, const std::string& name) {
 }
 
 template<typename T>
-void ColumnEnum<T>::Reserve(size_t new_cap)
-{
+void ColumnEnum<T>::Reserve(size_t new_cap) {
     data_.reserve(new_cap);
 }
 

clickhouse/columns/geo.cpp

@@ -55,8 +55,7 @@ const typename ColumnGeo<NestedColumnType, type_code>::ValueType ColumnGeo<Neste
 }
 
 template<typename NestedColumnType, Type::Code type_code>
-void ColumnGeo<NestedColumnType, type_code>::Reserve(size_t new_cap)
-{
+void ColumnGeo<NestedColumnType, type_code>::Reserve(size_t new_cap) {
     data_->Reserve(new_cap);
 }
 

clickhouse/columns/ip4.cpp

@@ -74,8 +74,7 @@ std::string ColumnIPv4::AsString(size_t n) const {
     return ip_str;
 }
 
-void ColumnIPv4::Reserve(size_t new_cap)
-{
+void ColumnIPv4::Reserve(size_t new_cap) {
     data_->Reserve(new_cap);
 }
 

clickhouse/columns/ip6.cpp

@@ -65,8 +65,7 @@ in6_addr ColumnIPv6::operator [] (size_t n) const {
     return *reinterpret_cast<const in6_addr*>(data_->At(n).data());
 }
 
-void ColumnIPv6::Reserve(size_t new_cap)
-{
+void ColumnIPv6::Reserve(size_t new_cap) {
     data_->Reserve(new_cap);
 }
 

clickhouse/columns/lowcardinality.cpp

@@ -174,8 +174,7 @@ ColumnLowCardinality::ColumnLowCardinality(std::shared_ptr<ColumnNullable> dicti
 ColumnLowCardinality::~ColumnLowCardinality()
 {}
 
-void ColumnLowCardinality::Reserve(size_t new_cap)
-{
+void ColumnLowCardinality::Reserve(size_t new_cap) {
     dictionary_column_->Reserve(new_cap);
     index_column_->Reserve(new_cap);
 }

clickhouse/columns/map.cpp

@@ -33,8 +33,7 @@ ColumnMap::ColumnMap(ColumnRef data)
     : Column(GetMapType(data->GetType())), data_(data->As<ColumnArray>()) {
 }
 
-void ColumnMap::Reserve(size_t new_cap)
-{
+void ColumnMap::Reserve(size_t new_cap) {
     data_->Reserve(new_cap);
 }
 

clickhouse/columns/nullable.cpp

@@ -34,8 +34,7 @@ ColumnRef ColumnNullable::Nulls() const
        return nulls_;
 }
 
-void ColumnNullable::Reserve(size_t new_cap)
-{
+void ColumnNullable::Reserve(size_t new_cap) {
     nested_->Reserve(new_cap);
     nulls_->Reserve(new_cap);
 }

clickhouse/columns/string.cpp

@@ -30,6 +30,10 @@ ColumnFixedString::ColumnFixedString(size_t n)
 {
 }
 
+void ColumnFixedString::Reserve(size_t new_cap) {
+    data_.reserve(string_size_ * new_cap);
+}
+
 void ColumnFixedString::Append(std::string_view str) {
     if (str.size() > string_size_) {
         throw ValidationError("Expected string of length not greater than "
@@ -45,8 +49,10 @@ void ColumnFixedString::Append(std::string_view str) {
 
     data_.insert(data_.size(), str);
     // Pad up to string_size_ with zeroes.
-    const auto padding_size = string_size_ - str.size();
-    data_.resize(data_.size() + padding_size, char(0));
+    if (str.size() < string_size_) {
+        const auto padding_size = string_size_ - str.size();
+        data_.resize(data_.size() + padding_size, char(0));
+    }
 }
 
 void ColumnFixedString::Clear() {
@@ -160,8 +166,8 @@ ColumnString::ColumnString(size_t element_count)
     : Column(Type::CreateString())
 {
     items_.reserve(element_count);
-    // 100 is arbitrary number, assumption that string values are about ~40 bytes long.
-    blocks_.reserve(std::max<size_t>(1, element_count / 100));
+    // 16 is arbitrary number, assumption that string values are about ~256 bytes long.
+    blocks_.reserve(std::max<size_t>(1, element_count / 16));
 }
 
 ColumnString::ColumnString(const std::vector<std::string>& data)
@@ -190,8 +196,7 @@ ColumnString::ColumnString(std::vector<std::string>&& data)
 ColumnString::~ColumnString()
 {}
 
-void ColumnString::Reserve(size_t new_cap)
-{
+void ColumnString::Reserve(size_t new_cap) {
     items_.reserve(new_cap);
     // 16 is arbitrary number, assumption that string values are about ~256 bytes long.
     blocks_.reserve(std::max<size_t>(1, new_cap / 16));