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

Trying to fix issue with calculating default expressions. (Not working yet)

Browse Source
This commit is contained in:
Vitaliy Zakaznikov 2020-01-22 14:34:00 +01:00
parent 507609b611
commit 78ab3127ce
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/src/DataStreams/PushingToViewsBlockOutputStream.cpp
View File

@ -1,4 +1,5 @@
#include <DataStreams/AddingDefaultBlockOutputStream.h> #include <DataStreams/AddingDefaultBlockOutputStream.h>
#include <DataStreams/AddingMissedBlockInputStream.h>
#include <DataStreams/ConvertingBlockInputStream.h> #include <DataStreams/ConvertingBlockInputStream.h>
#include <DataStreams/PushingToViewsBlockOutputStream.h> #include <DataStreams/PushingToViewsBlockOutputStream.h>
#include <DataStreams/SquashingBlockInputStream.h> #include <DataStreams/SquashingBlockInputStream.h>
@ -230,7 +231,9 @@ void PushingToViewsBlockOutputStream::process(const Block & block, size_t view_n
/// and two-level aggregation is triggered). /// and two-level aggregation is triggered).
in = std::make_shared<SquashingBlockInputStream>( in = std::make_shared<SquashingBlockInputStream>(
in, context.getSettingsRef().min_insert_block_size_rows, context.getSettingsRef().min_insert_block_size_bytes); in, context.getSettingsRef().min_insert_block_size_rows, context.getSettingsRef().min_insert_block_size_bytes);
in = std::make_shared<ConvertingBlockInputStream>(context, in, view.out->getHeader(), ConvertingBlockInputStream::MatchColumnsMode::NameOrDefault); in = std::make_shared<AddingMissedBlockInputStream>(
in, view.out->getHeader(), storage->getColumns().getDefaults(), local_context);
in = std::make_shared<ConvertingBlockInputStream>(context, in, view.out->getHeader(), ConvertingBlockInputStream::MatchColumnsMode::Name);
} }
else else
in = std::make_shared<OneBlockInputStream>(block); in = std::make_shared<OneBlockInputStream>(block);

1
dbms/tests/queries/0_stateless/01069_materialized_view_alter_target_table.sql
View File

@ -1,3 +1,4 @@
DROP TABLE IF EXISTS mv;
DROP TABLE IF EXISTS mv_source; DROP TABLE IF EXISTS mv_source;
DROP TABLE IF EXISTS mv_target; DROP TABLE IF EXISTS mv_target;

8
dbms/tests/queries/0_stateless/01069_materialized_view_alter_target_table_with_default_expression.reference Normal file
View File

@ -0,0 +1,8 @@
1
1
2
3
1 0
1 2
2 3
3 4

16
dbms/tests/queries/0_stateless/01069_materialized_view_alter_target_table_with_default_expression.sql Normal file
View File

@ -0,0 +1,16 @@
DROP TABLE IF EXISTS mv;
DROP TABLE IF EXISTS mv_source;
DROP TABLE IF EXISTS mv_target;
CREATE TABLE mv_source (`a` UInt64) ENGINE = MergeTree ORDER BY tuple();
CREATE TABLE mv_target (`a` UInt64) ENGINE = MergeTree ORDER BY tuple();
CREATE MATERIALIZED VIEW mv TO mv_target AS SELECT * FROM mv_source;
INSERT INTO mv_source VALUES (1);
ALTER TABLE mv_target ADD COLUMN b UInt8 DEFAULT a + 1;
INSERT INTO mv_source VALUES (1),(2),(3);
SELECT * FROM mv ORDER BY a;
SELECT * FROM mv_target ORDER BY a;