thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

impr

Browse Source
This commit is contained in:
Nikita Vasilev 2020-01-27 22:29:23 +03:00
parent bbcba746b2
commit 6803196d93
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dbms/src/Dictionaries/SSDCacheDictionary.cpp
View File

@ -424,13 +424,14 @@ void CachePartition::getValue(const size_t attribute_index, const PaddedPODArray
}
}
auto set_value = [&](const size_t index, ReadBuffer & buf)
getValueFromMemory(indices, [&](const size_t index, ReadBuffer & buf)
{
readValueFromBuffer(attribute_index, out, index, buf);
};
getValueFromMemory(indices, set_value);
getValueFromStorage(indices, set_value);
readValueFromBuffer(attribute_index, out[index], buf);
});
getValueFromStorage(indices, [&](const size_t index, ReadBuffer & buf)
{
readValueFromBuffer(attribute_index, out[index], buf);
});
}
template <typename SetFunc>
@ -561,7 +562,7 @@ void CachePartition::getValueFromStorage(const PaddedPODArray<Index> & indices,
}
template <typename Out>
void CachePartition::readValueFromBuffer(const size_t attribute_index, Out & dst, const size_t index, ReadBuffer & buf) const
void CachePartition::readValueFromBuffer(const size_t attribute_index, Out & dst, ReadBuffer & buf) const
{
for (size_t i = 0; i < attribute_index; ++i)
{
@ -569,9 +570,7 @@ void CachePartition::readValueFromBuffer(const size_t attribute_index, Out & dst
{
#define DISPATCH(TYPE) \
case AttributeUnderlyingType::ut##TYPE: \
{ \
buf.ignore(sizeof(TYPE)); \
} \
buf.ignore(sizeof(TYPE)); \
break;
DISPATCH(UInt8)
@ -601,7 +600,7 @@ void CachePartition::readValueFromBuffer(const size_t attribute_index, Out & dst
}
//if constexpr (!std::is_same_v<ColumnString, Out>)
readBinary(dst[index], buf);
readBinary(dst, buf);
/*else
{
LOG_DEBUG(&Poco::Logger::get("kek"), "string READ");
@ -1018,8 +1017,7 @@ CachePartition::Attributes CacheStorage::createAttributesFromBlock(
case AttributeUnderlyingType::ut##TYPE: \
{ \
CachePartition::Attribute::Container<TYPE> values(column->size()); \
const auto raw_data = column->getRawData(); \
memcpy(&values[0], raw_data.data, raw_data.size * sizeof(TYPE)); \
memcpy(&values[0], column->getRawData().data, sizeof(TYPE) * values.size()); \
attributes.emplace_back(); \
attributes.back().type = structure[i]; \
attributes.back().values = std::move(values); \

2
dbms/src/Dictionaries/SSDCacheDictionary.h
View File

@ -154,7 +154,7 @@ private:
void getValueFromStorage(const PaddedPODArray<Index> & indices, SetFunc set) const;
template <typename Out>
void readValueFromBuffer(const size_t attribute_index, Out & dst, const size_t index, ReadBuffer & buf) const;
void readValueFromBuffer(const size_t attribute_index, Out & dst, ReadBuffer & buf) const;
const size_t file_id;
const size_t max_size;