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

Update functional tests. Add materialization in UNION ALL queries. [#METR-14099]

Browse Source
This commit is contained in:
Alexey Arno 2014-12-17 00:44:03 +03:00
parent 56849b4d0c
commit 10b33bdc2e
10 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -15,6 +15,7 @@
#include <DB/DataStreams/narrowBlockInputStreams.h>
#include <DB/DataStreams/copyData.h>
#include <DB/DataStreams/CreatingSetsBlockInputStream.h>
#include <DB/DataStreams/MaterializingBlockInputStream.h>
#include <DB/Parsers/ASTSelectQuery.h>
#include <DB/Parsers/ASTIdentifier.h>
@ -226,6 +227,9 @@ BlockInputStreamPtr InterpreterSelectQuery::execute()
if (streams.empty())
return new NullBlockInputStream;
for (auto & stream : streams)
stream = new MaterializingBlockInputStream(stream);
executeUnion(streams);
}
else

4
dbms/tests/queries/0_stateless/00098_1_union_all.reference
View File

@ -1,2 +1,2 @@
1
2
1000
2000

21
dbms/tests/queries/0_stateless/00098_1_union_all.sql
View File

@ -1 +1,20 @@
SELECT 1 UNION ALL SELECT 2;
DROP TABLE IF EXISTS data2013;
DROP TABLE IF EXISTS data2014;
CREATE TABLE data2013 (name String, value UInt32) ENGINE = TinyLog;
CREATE TABLE data2014 (name String, value UInt32) ENGINE = TinyLog;
INSERT INTO data2013(name,value) VALUES('Alice', 1000);
INSERT INTO data2013(name,value) VALUES('Bob', 2000);
INSERT INTO data2013(name,value) VALUES('Carol', 5000);
INSERT INTO data2014(name,value) VALUES('Alice', 2000);
INSERT INTO data2014(name,value) VALUES('Bob', 2000);
INSERT INTO data2014(name,value) VALUES('Dennis', 35000);
SELECT val FROM
(SELECT value AS val FROM data2013 WHERE name = 'Alice'
UNION ALL
SELECT value AS val FROM data2014 WHERE name = 'Alice')
ORDER BY val ASC;

4
dbms/tests/queries/0_stateless/00098_2_union_all.reference
View File

@ -1,2 +1,2 @@
1
2
1000
2000

7
dbms/tests/queries/0_stateless/00098_2_union_all.sql
View File

@ -1 +1,6 @@
SELECT 1 UNION ALL SELECT 2;
SELECT val FROM
(SELECT value AS val FROM data2013 WHERE name = 'Alice'
UNION ALL
SELECT value AS val FROM data2014 WHERE name = 'Alice')
ORDER BY val ASC;

4
dbms/tests/queries/0_stateless/00098_3_union_all.reference
View File

@ -1,2 +1,2 @@
1
2
1000
2000

6
dbms/tests/queries/0_stateless/00098_3_union_all.sql
View File

@ -1,2 +1,6 @@
SELECT 1 UNION /*comment*/ ALL SELECT 2;
SELECT val FROM
(SELECT value AS val FROM data2013 WHERE name = 'Alice'
UNION /*comment*/ ALL
SELECT value AS val FROM data2014 WHERE name = 'Alice')
ORDER BY val ASC;

6
dbms/tests/queries/0_stateless/00098_4_union_all.reference
View File

@ -1,3 +1,3 @@
1 2
3 4
5 6
1000
2000
35000

8
dbms/tests/queries/0_stateless/00098_4_union_all.sql
View File

@ -1 +1,7 @@
SELECT 1,2 UNION ALL SELECT 3,4 UNION ALL SELECT 5,6;
SELECT val FROM
(SELECT value AS val FROM data2013 WHERE name = 'Alice'
UNION ALL
SELECT value AS val FROM data2014 WHERE name = 'Alice'
UNION ALL
SELECT value AS val FROM data2014 WHERE name = 'Dennis')
ORDER BY val ASC;

14
dbms/tests/queries/0_stateless/00098_5_union_all.sql
View File

@ -1,15 +1 @@
DROP TABLE IF EXISTS data2013;
DROP TABLE IF EXISTS data2014;
CREATE TABLE data2013 (name String, value UInt32) ENGINE = Memory;
CREATE TABLE data2014 (name String, value UInt32) ENGINE = Memory;
INSERT INTO data2013(name,value) VALUES('Alice', 1000);
INSERT INTO data2013(name,value) VALUES('Bob', 2000);
INSERT INTO data2013(name,value) VALUES('Carol', 5000);
INSERT INTO data2014(name,value) VALUES('Alice', 2000);
INSERT INTO data2014(name,value) VALUES('Bob', 2000);
INSERT INTO data2014(name,value) VALUES('Dennis', 35000);
SELECT nn,vv FROM (SELECT name AS nn, value AS vv FROM data2013 UNION ALL SELECT name AS nn, value AS vv FROM data2014) ORDER BY nn ASC;