Skip to content

Commit 70d3329

Browse files
authored
Minor: stype + DEFAULT_BLOCK_SIZE
1 parent 8637285 commit 70d3329

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

clickhouse/columns/string.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55

66
namespace {
77

8+
constexpr size_t DEFAULT_BLOCK_SIZE = 4096;
9+
810
template <typename Container>
9-
size_t ComputeTotalSize(const Container & strings, size_t begin = 0, size_t len = -1)
10-
{
11+
size_t ComputeTotalSize(const Container & strings, size_t begin = 0, size_t len = -1) {
1112
size_t result = 0;
1213
if (begin < strings.size()) {
1314
len = std::min(len, strings.size() - begin);
@@ -63,8 +64,7 @@ std::string_view ColumnFixedString::operator [](size_t n) const {
6364
return std::string_view(&data_[pos], string_size_);
6465
}
6566

66-
size_t ColumnFixedString::FixedSize() const
67-
{
67+
size_t ColumnFixedString::FixedSize() const {
6868
return string_size_;
6969
}
7070

@@ -202,30 +202,26 @@ void ColumnString::Append(std::string_view str) {
202202
items_.emplace_back(blocks_.back().AppendUnsafe(str));
203203
}
204204

205-
void ColumnString::Append(std::string&& steal_value)
206-
{
205+
void ColumnString::Append(std::string&& steal_value) {
207206
append_data_.emplace_back(std::move(steal_value));
208207
auto& last_data = append_data_.back();
209208
items_.emplace_back(std::string_view{ last_data.data(),last_data.length() });
210209
}
211210

212211
void ColumnString::Append(const char* str) {
213212
auto len = strlen(str);
214-
if (blocks_.size() == 0 || blocks_.back().GetAvailable() < len)
215-
{
213+
if (blocks_.size() == 0 || blocks_.back().GetAvailable() < len) {
216214
blocks_.emplace_back(std::max(DEFAULT_BLOCK_SIZE, len));
217215
}
218216

219217
items_.emplace_back(blocks_.back().AppendUnsafe(str));
220218
}
221219

222-
void ColumnString::AppendNoManagedLifetime(std::string_view str)
223-
{
220+
void ColumnString::AppendNoManagedLifetime(std::string_view str) {
224221
items_.emplace_back(str);
225222
}
226223

227-
void ColumnString::AppendUnsafe(std::string_view str)
228-
{
224+
void ColumnString::AppendUnsafe(std::string_view str) {
229225
items_.emplace_back(blocks_.back().AppendUnsafe(str));
230226
}
231227

0 commit comments

Comments
 (0)