Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mismatch column sizes when inserting defaults #8606

Merged
merged 2 commits into from Jan 10, 2020
Merged

Fix mismatch column sizes when inserting defaults #8606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45d0089
fix defaults mismatch size
tavplubix Jan 9, 2020
fe714ad
modify test because there is another bug
tavplubix Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions dbms/src/DataStreams/AddingDefaultsBlockInputStream.cpp
View file
Open in desktop
Expand Up @@ -62,6 +62,9 @@ Block AddingDefaultsBlockInputStream::readImpl()
if (evaluate_block.has(column.first))
evaluate_block.erase(column.first);

if (!evaluate_block.columns())
evaluate_block.insert({ColumnConst::create(ColumnUInt8::create(1, 0), res.rows()), std::make_shared<DataTypeUInt8>(), "_dummy"});

evaluateMissingDefaults(evaluate_block, header.getNamesAndTypesList(), column_defaults, context, false);

std::unordered_map<size_t, MutableColumnPtr> mixed_columns;
Expand Down
4 changes: 4 additions & 0 deletions dbms/tests/queries/0_stateless/01060_defaults_all_columns.reference
View file
Open in desktop
@@ -0,0 +1,4 @@
1 hello
2 test42
42 test42
42 world
10 changes: 10 additions & 0 deletions dbms/tests/queries/0_stateless/01060_defaults_all_columns.sql
View file
Open in desktop
@@ -0,0 +1,10 @@
DROP TABLE IF EXISTS defaults_all_columns;

CREATE TABLE defaults_all_columns (n UInt8 DEFAULT 42, s String DEFAULT concat('test', CAST(n, 'String'))) ENGINE = Memory;

INSERT INTO defaults_all_columns FORMAT JSONEachRow {"n": 1, "s": "hello"} {};
INSERT INTO defaults_all_columns FORMAT JSONEachRow {"n": 2}, {"s": "world"};

SELECT * FROM defaults_all_columns ORDER BY n, s;

DROP TABLE defaults_all_columns;
4 changes: 4 additions & 0 deletions dbms/tests/queries/bugs/01060_defaults_all_columns.reference
View file
Open in desktop
@@ -0,0 +1,4 @@
1 hello
2 test2
42 test42
42 world