Merge pull request #69626 from yariks5s/small_tests_fix

Reorder some tests (follow-up to #69514)
This commit is contained in:
Yarik Briukhovetskyi 2024-09-17 09:09:06 +00:00 committed by GitHub
commit 2c1c1a93c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 45 deletions

View File

@ -33,6 +33,7 @@ c String NO PRI SOR \N
c String NO PRI SOR \N
c String NO PRI SOR \N
c String NO PRI SOR \N
c String NO PRI SOR \N
--- Original table
int32 Nullable(Int32) YES \N
str String NO SOR \N
@ -45,7 +46,3 @@ uint64 UInt64 NO PRI SOR \N
int32 Int32 NO \N
str String NO \N
uint64 UInt64 NO PRI SOR \N
--- SHOW COLUMNS FROM table with dots
int32 Nullable(Int32) YES \N
str String NO SOR \N
uint64 UInt64 NO PRI SOR \N

View File

@ -55,6 +55,11 @@ CREATE TABLE NULL (c String) ENGINE = MergeTree ORDER BY c;
SHOW COLUMNS FROM NULL;
DROP TABLE NULL;
DROP TABLE IF EXISTS `tab.with.dots`;
CREATE TABLE `tab.with.dots` (c String) ENGINE = MergeTree ORDER BY c;
SHOW COLUMNS FROM `tab.with.dots`;
DROP TABLE `tab.with.dots`;
DROP DATABASE IF EXISTS `'`;
CREATE DATABASE `'`;
CREATE TABLE `'`.`'` (c String) ENGINE = MergeTree ORDER BY c;
@ -90,18 +95,3 @@ SHOW COLUMNS FROM database_123456789abcde.tab;
DROP DATABASE database_123456789abcde;
DROP TABLE tab;
DROP TABLE IF EXISTS `tab.with.dots`;
CREATE TABLE `tab.with.dots`
(
`uint64` UInt64,
`int32` Nullable(Int32) COMMENT 'example comment',
`str` String,
INDEX idx str TYPE set(1000)
)
ENGINE = MergeTree
PRIMARY KEY (uint64)
ORDER BY (uint64, str);
SELECT '--- SHOW COLUMNS FROM table with dots';
SHOW COLUMNS FROM `tab.with.dots`;
DROP TABLE `tab.with.dots`;

View File

@ -34,6 +34,12 @@ tbl 1 set_idx 1 \N 0 \N \N \N SET YES e
--- Check with weird table names
$4@^7 1 PRIMARY 1 c A 0 \N \N \N PRIMARY YES
NULL 1 PRIMARY 1 c A 0 \N \N \N PRIMARY YES
tab.with.dots 1 blf_idx 1 \N 0 \N \N \N BLOOM_FILTER YES d, b
tab.with.dots 1 mm1_idx 1 \N 0 \N \N \N MINMAX YES a, c, d
tab.with.dots 1 mm2_idx 1 \N 0 \N \N \N MINMAX YES c, d, e
tab.with.dots 1 PRIMARY 1 c A 0 \N \N \N PRIMARY YES
tab.with.dots 1 PRIMARY 2 a A 0 \N \N \N PRIMARY YES
tab.with.dots 1 set_idx 1 \N 0 \N \N \N SET YES e
\' 1 PRIMARY 1 c A 0 \N \N \N PRIMARY YES
\' 1 PRIMARY 1 c A 0 \N \N \N PRIMARY YES
--- Original table
@ -49,10 +55,3 @@ tbl 1 PRIMARY 1 a A 0 \N \N \N PRIMARY YES
--- Short form
tbl 1 mmi_idx 1 \N 0 \N \N \N MINMAX YES b
tbl 1 PRIMARY 1 a A 0 \N \N \N PRIMARY YES
--- SHOW INDEX FROM table with dots
tab.with.dots 1 blf_idx 1 \N 0 \N \N \N BLOOM_FILTER YES d, b
tab.with.dots 1 mm1_idx 1 \N 0 \N \N \N MINMAX YES a, c, d
tab.with.dots 1 mm2_idx 1 \N 0 \N \N \N MINMAX YES c, d, e
tab.with.dots 1 PRIMARY 1 c A 0 \N \N \N PRIMARY YES
tab.with.dots 1 PRIMARY 2 a A 0 \N \N \N PRIMARY YES
tab.with.dots 1 set_idx 1 \N 0 \N \N \N SET YES e

View File

@ -43,6 +43,24 @@ CREATE TABLE NULL (c String) ENGINE = MergeTree ORDER BY c;
SHOW INDEX FROM NULL;
DROP TABLE NULL;
DROP TABLE IF EXISTS `tab.with.dots`;
CREATE TABLE `tab.with.dots`
(
a UInt64,
b UInt64,
c UInt64,
d UInt64,
e UInt64,
INDEX mm1_idx (a, c, d) TYPE minmax,
INDEX mm2_idx (c, d, e) TYPE minmax,
INDEX set_idx (e) TYPE set(100),
INDEX blf_idx (d, b) TYPE bloom_filter(0.8)
)
ENGINE = MergeTree
PRIMARY KEY (c, a);
SHOW INDEX FROM `tab.with.dots`;
DROP TABLE `tab.with.dots`;
DROP DATABASE IF EXISTS `'`;
CREATE DATABASE `'`;
CREATE TABLE `'`.`'` (c String) ENGINE = MergeTree ORDER BY c;
@ -78,22 +96,3 @@ SHOW INDEX FROM database_123456789abcde.tbl;
DROP DATABASE database_123456789abcde;
DROP TABLE tbl;
DROP TABLE IF EXISTS `tab.with.dots`;
CREATE TABLE `tab.with.dots`
(
a UInt64,
b UInt64,
c UInt64,
d UInt64,
e UInt64,
INDEX mm1_idx (a, c, d) TYPE minmax,
INDEX mm2_idx (c, d, e) TYPE minmax,
INDEX set_idx (e) TYPE set(100),
INDEX blf_idx (d, b) TYPE bloom_filter(0.8)
)
ENGINE = MergeTree
PRIMARY KEY (c, a);
SELECT '--- SHOW INDEX FROM table with dots';
SHOW INDEX FROM `tab.with.dots`;
DROP TABLE `tab.with.dots`;