thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed error

Browse Source
This commit is contained in:
Alexey Milovidov 2020-04-22 21:41:19 +03:00
parent 73dd78bac1
commit 282b5785c1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Dictionaries/HashedDictionary.cpp
View File

@ -772,7 +772,7 @@ BlockInputStreamPtr HashedDictionary::getBlockInputStream(const Names & column_n
void registerDictionaryHashed(DictionaryFactory & factory)
{
auto create_layout = [=](const std::string & full_name,
auto create_layout = [](const std::string & full_name,
const DictionaryStructure & dict_struct,
const Poco::Util::AbstractConfiguration & config,
const std::string & config_prefix,
@ -796,9 +796,9 @@ void registerDictionaryHashed(DictionaryFactory & factory)
};
using namespace std::placeholders;
factory.registerLayout("hashed",
[&](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), /* sparse = */ false); }, false);
[=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), /* sparse = */ false); }, false);
factory.registerLayout("sparse_hashed",
[&](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), /* sparse = */ true); }, false);
[=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), /* sparse = */ true); }, false);
}
}

5
src/Interpreters/Aggregator.cpp
View File

@ -1683,7 +1683,8 @@ private:
return;
parallel_merge_data->pool.scheduleOrThrowOnError(
[this, group = CurrentThread::getGroup()]{ return thread(max_scheduled_bucket_num, group); });
[this, max_scheduled_bucket_num = max_scheduled_bucket_num, group = CurrentThread::getGroup()]
{ return thread(max_scheduled_bucket_num, group); });
}
void thread(Int32 bucket_num, ThreadGroupStatusPtr thread_group)
@ -2033,7 +2034,7 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
result.aggregates_pools.push_back(std::make_shared<Arena>());
Arena * aggregates_pool = result.aggregates_pools.back().get();
auto task = [group = CurrentThread::getGroup(), bucket, &merge_bucket, &aggregates_pool]{ return merge_bucket(bucket, aggregates_pool, group); };
auto task = [group = CurrentThread::getGroup(), bucket, &merge_bucket, aggregates_pool]{ return merge_bucket(bucket, aggregates_pool, group); };
if (thread_pool)
thread_pool->scheduleOrThrowOnError(task);