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

code style check

Browse Source
This commit is contained in:
terrylin 2021-07-31 20:36:40 +08:00
parent b0df75626b
commit 09a4f82d0f
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DataStreams/TTLUpdateInfoAlgorithm.cpp
View File

@ -24,7 +24,7 @@ void TTLUpdateInfoAlgorithm::execute(Block & block)
void TTLUpdateInfoAlgorithm::finalize(const MutableDataPartPtr & data_part) const void TTLUpdateInfoAlgorithm::finalize(const MutableDataPartPtr & data_part) const
{ {
if (description.mode == TTLMode::RECOMPRESS) if (description.mode == TTLMode::RECOMPRESS)
{ {
data_part->ttl_infos.recompression_ttl[description.result_column] = new_ttl_info; data_part->ttl_infos.recompression_ttl[description.result_column] = new_ttl_info;
} }
@ -46,7 +46,7 @@ void TTLUpdateInfoAlgorithm::finalize(const MutableDataPartPtr & data_part) cons
data_part->ttl_infos.updatePartMinMaxTTL(new_ttl_info.min, new_ttl_info.max); data_part->ttl_infos.updatePartMinMaxTTL(new_ttl_info.min, new_ttl_info.max);
} }
} }
} }

4
src/Interpreters/MutationsInterpreter.cpp
View File

@ -623,8 +623,8 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
plan.addStep(std::make_unique<ReadFromPreparedSource>(Pipe(std::move(source)))); plan.addStep(std::make_unique<ReadFromPreparedSource>(Pipe(std::move(source))));
auto pipeline = addStreamsForLaterStages(stages_copy, plan); auto pipeline = addStreamsForLaterStages(stages_copy, plan);
updated_header = std::make_unique<Block>(pipeline->getHeader()); updated_header = std::make_unique<Block>(pipeline->getHeader());
} }
else else
{ {
//no column updated in mutations. maybe just materialize(index\projection\ttl) //no column updated in mutations. maybe just materialize(index\projection\ttl)
updated_header = std::make_unique<Block>(Block{}); updated_header = std::make_unique<Block>(Block{});

2
src/Storages/StorageInMemoryMetadata.cpp
View File

@ -257,7 +257,7 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(const NameSet
updated_ttl_columns.insert(column.name); updated_ttl_columns.insert(column.name);
} }
} }
for (const auto & entry : getRecompressionTTLs()) for (const auto & entry : getRecompressionTTLs())
add_dependent_columns(entry.expression, required_ttl_columns); add_dependent_columns(entry.expression, required_ttl_columns);

2
tests/queries/0_stateless/01070_materialize_ttl.reference
View File

@ -48,4 +48,4 @@
4 d 4 d
1 1
2 2
4 d 4 d

2
tests/queries/0_stateless/01070_modify_ttl.reference
View File

@ -58,4 +58,4 @@
4 d 4 d
1 1
============= =============
0 0

2
tests/queries/0_stateless/01070_mutations_with_dependencies.reference
View File

@ -19,4 +19,4 @@
2 2
2 2
1 2 3 2000-01-01 1 2 3 2000-01-01
1 2 42 2000-01-01 1 2 42 2000-01-01

1
tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
View File

@ -6,6 +6,7 @@ CREATE TABLE table_rename_with_ttl
value1 String value1 String
) )
ENGINE = ReplicatedMergeTree('/clickhouse/test/table_rename_with_ttl_01378', '1') ENGINE = ReplicatedMergeTree('/clickhouse/test/table_rename_with_ttl_01378', '1')
order by value1
SETTINGS merge_with_ttl_timeout=0,max_number_of_merges_with_ttl_in_pool=0; SETTINGS merge_with_ttl_timeout=0,max_number_of_merges_with_ttl_in_pool=0;
ORDER BY tuple(); ORDER BY tuple();