thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 09:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Less wrong [#MOBMET-3953].

Browse Source
This commit is contained in:
Alexey Milovidov 2016-08-07 11:12:58 +03:00
parent 7dfcdbfb86
commit 0ae29e867b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/include/DB/Dictionaries/ComplexKeyCacheDictionary.h
View File

@ -240,6 +240,7 @@ private:
StringRef placeKeysInFixedSizePool(
const std::size_t row, const ConstColumnPlainPtrs & key_columns) const;
static StringRef copyIntoArena(StringRef src, Arena & arena);
StringRef copyKey(const StringRef key) const;
const std::string name;

21
dbms/src/Dictionaries/ComplexKeyCacheDictionary.cpp
View File

@ -412,6 +412,7 @@ void ComplexKeyCacheDictionary::getItemsNumberImpl(
});
}
template <typename DefaultGetter>
void ComplexKeyCacheDictionary::getItemsString(
attribute_t & attribute, const ConstColumnPlainPtrs & key_columns, ColumnString * out,
@ -471,7 +472,7 @@ void ComplexKeyCacheDictionary::getItemsString(
/// Mapping: <key> -> { all indices `i` of `key_columns` such that `key_columns[i]` = <key> }
MapType<std::vector<size_t>> outdated_keys;
/// we are going to store every string separately
MapType<String> map;
MapType<StringRef> map;
PODArray<StringRef> keys_array(rows);
size_t total_length = 0;
@ -516,13 +517,12 @@ void ComplexKeyCacheDictionary::getItemsString(
{
const auto attribute_value = attribute_array[cell_idx];
/// We must copy key to own memory, because it may be replaced with another
/// We must copy key and value to own memory, because it may be replaced with another
/// in next iterations of inner loop of update.
char * allocated = temporary_keys_pool.alloc(key.size);
memcpy(allocated, key.data, key.size);
const StringRef copied_key{ allocated, key.size };
const StringRef copied_key = copyIntoArena(key, temporary_keys_pool);
const StringRef copied_value = copyIntoArena(attribute_value, temporary_keys_pool);
map[copied_key] = String{attribute_value};
map[copied_key] = copied_value;
total_length += (attribute_value.size + 1) * outdated_keys[key].size();
},
[&] (const StringRef key, const size_t cell_idx)
@ -538,7 +538,7 @@ void ComplexKeyCacheDictionary::getItemsString(
{
const StringRef key = keys_array[row];
const auto it = map.find(key);
const auto string_ref = it != std::end(map) ? StringRef{it->second} : get_default(row);
const auto string_ref = it != std::end(map) ? it->second : get_default(row);
out->insertData(string_ref.data, string_ref.size);
}
}
@ -821,6 +821,13 @@ StringRef ComplexKeyCacheDictionary::placeKeysInFixedSizePool(
return { res, key_size };
}
StringRef ComplexKeyCacheDictionary::copyIntoArena(StringRef src, Arena & arena)
{
char * allocated = arena.alloc(src.size);
memcpy(allocated, src.data, src.size);
return { allocated, src.size };
}
StringRef ComplexKeyCacheDictionary::copyKey(const StringRef key) const
{
const auto res = key_size_is_fixed ? fixed_size_keys_pool->alloc() : keys_pool->alloc(key.size);