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

add spaces amp

Browse Source
This commit is contained in:
ivan-kush 2019-05-10 17:29:13 +03:00
parent 2a356791ab
commit ab6558b8b4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -1439,10 +1439,10 @@ void MergeTreeData::alterDataPart(
const NamesAndTypesList & new_columns,
const IndicesASTs & new_indices,
bool skip_sanity_checks,
AlterDataPartTransactionPtr& transaction)
AlterDataPartTransactionPtr & transaction)
{
ExpressionActionsPtr expression;
const auto& part = transaction->getDataPart();
const auto & part = transaction->getDataPart();
bool force_update_metadata;
createConvertExpression(part, part->columns, new_columns,
getIndices().indices, new_indices,

2
dbms/src/Storages/MergeTree/MergeTreeData.h
View File

@ -228,7 +228,7 @@ public:
const DataPart::Checksums & getNewChecksums() const { return new_checksums; }
AlterDataPartTransaction(DataPartPtr data_part_) : data_part(data_part_), alter_lock(data_part->alter_mutex) {}
const DataPartPtr& getDataPart() const { return data_part; }
const DataPartPtr & getDataPart() const { return data_part; }
bool isValid() const;
private:

4
dbms/src/Storages/StorageMergeTree.cpp
View File

@ -203,7 +203,7 @@ std::vector<MergeTreeData::AlterDataPartTransactionPtr> StorageMergeTree::prepar
std::vector<MergeTreeData::AlterDataPartTransactionPtr> transactions;
transactions.reserve(parts.size());
const auto& columns_for_parts = new_columns.getAllPhysical();
const auto & columns_for_parts = new_columns.getAllPhysical();
const Settings & settings = context.getSettingsRef();
size_t thread_pool_size = std::min<size_t>(parts.size(), settings.max_alter_threads);
@ -215,7 +215,7 @@ std::vector<MergeTreeData::AlterDataPartTransactionPtr> StorageMergeTree::prepar
transactions.push_back(std::make_unique<MergeTreeData::AlterDataPartTransaction>(part));
thread_pool.schedule(
[this, &transaction = transactions.back(), &columns_for_parts, &new_indices = new_indices.indices]
[this, & transaction = transactions.back(), & columns_for_parts, & new_indices = new_indices.indices]
{
this->alterDataPart(columns_for_parts, new_indices, false, transaction);
}