From e576919626ff2d150ebd7a1dfccd587efe94e150 Mon Sep 17 00:00:00 2001 From: Andrey Chulkov Date: Fri, 29 May 2020 22:48:41 +0300 Subject: [PATCH] delete old tests, rename and (hopefully) fix new tests --- ...grid_polygon_dict_multi_polygons.reference | 118 --------------- ...01037_grid_polygon_dict_multi_polygons.sql | 107 ------------- ...rid_polygon_dict_simple_polygons.reference | 142 ------------------ ...1037_grid_polygon_dict_simple_polygons.sql | 108 ------------- ...1037_polygon_dict_multi_polygons.reference | 118 --------------- .../01037_polygon_dict_multi_polygons.sql | 107 ------------- ...037_polygon_dict_simple_polygons.reference | 142 ------------------ .../01037_polygon_dict_simple_polygons.sql | 108 ------------- ...> 01037_polygon_dicts_correctness_all.ans} | 0 ...7_polygon_dicts_correctness_all.reference} | 0 ...=> 01037_polygon_dicts_correctness_all.sh} | 4 +- ... 01037_polygon_dicts_correctness_fast.ans} | 0 ..._polygon_dicts_correctness_fast.reference} | 0 ...> 01037_polygon_dicts_correctness_fast.sh} | 4 +- ... 01037_polygon_dicts_simple_functions.ans} | 0 ..._polygon_dicts_simple_functions.reference} | 0 ...> 01037_polygon_dicts_simple_functions.sh} | 6 +- 17 files changed, 7 insertions(+), 957 deletions(-) delete mode 100644 tests/queries/0_stateless/01037_grid_polygon_dict_multi_polygons.reference delete mode 100644 tests/queries/0_stateless/01037_grid_polygon_dict_multi_polygons.sql delete mode 100644 tests/queries/0_stateless/01037_grid_polygon_dict_simple_polygons.reference delete mode 100644 tests/queries/0_stateless/01037_grid_polygon_dict_simple_polygons.sql delete mode 100644 tests/queries/0_stateless/01037_polygon_dict_multi_polygons.reference delete mode 100644 tests/queries/0_stateless/01037_polygon_dict_multi_polygons.sql delete mode 100644 tests/queries/0_stateless/01037_polygon_dict_simple_polygons.reference delete mode 100644 tests/queries/0_stateless/01037_polygon_dict_simple_polygons.sql rename tests/queries/0_stateless/{01037_polygon_search_test.ans => 01037_polygon_dicts_correctness_all.ans} (100%) rename tests/queries/0_stateless/{01037_polygon_perf_test.reference => 01037_polygon_dicts_correctness_all.reference} (100%) rename tests/queries/0_stateless/{01037_polygon_search_test.sh => 01037_polygon_dicts_correctness_all.sh} (95%) rename tests/queries/0_stateless/{01037_polygon_perf_test.ans => 01037_polygon_dicts_correctness_fast.ans} (100%) rename tests/queries/0_stateless/{01037_polygon_search_test.reference => 01037_polygon_dicts_correctness_fast.reference} (100%) rename tests/queries/0_stateless/{01037_polygon_perf_test.sh => 01037_polygon_dicts_correctness_fast.sh} (95%) rename tests/queries/0_stateless/{01037_polygon_simple_test.ans => 01037_polygon_dicts_simple_functions.ans} (100%) rename tests/queries/0_stateless/{01037_polygon_simple_test.reference => 01037_polygon_dicts_simple_functions.reference} (100%) rename tests/queries/0_stateless/{01037_polygon_simple_test.sh => 01037_polygon_dicts_simple_functions.sh} (98%) diff --git a/tests/queries/0_stateless/01037_grid_polygon_dict_multi_polygons.reference b/tests/queries/0_stateless/01037_grid_polygon_dict_multi_polygons.reference deleted file mode 100644 index 80af8a52400..00000000000 --- a/tests/queries/0_stateless/01037_grid_polygon_dict_multi_polygons.reference +++ /dev/null @@ -1,118 +0,0 @@ -dictGet test_01037.dict_array (-100,-42) qqq 101 -dictGet test_01037.dict_array (-1,0) Click South 423 -dictGet test_01037.dict_array (-0.1,0) Click South 423 -dictGet test_01037.dict_array (0,-2) Click West 424 -dictGet test_01037.dict_array (0,-1.1) Click West 424 -dictGet test_01037.dict_array (0,1.1) Click North 422 -dictGet test_01037.dict_array (0,2) Click North 422 -dictGet test_01037.dict_array (0.1,0) Click East 421 -dictGet test_01037.dict_array (0.99,2.99) Click North 422 -dictGet test_01037.dict_array (1,0) Click East 421 -dictGet test_01037.dict_array (3,3) House 314159 -dictGet test_01037.dict_array (5,6) Click 42 -dictGet test_01037.dict_array (7.01,7.01) qqq 101 -dictGetOrDefault test_01037.dict_array (-100,-42) www 1234 -dictGetOrDefault test_01037.dict_array (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_array (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_array (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_array (0,2) Click North 422 -dictGetOrDefault test_01037.dict_array (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_array (1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (3,3) House 314159 -dictGetOrDefault test_01037.dict_array (5,6) Click 42 -dictGetOrDefault test_01037.dict_array (7.01,7.01) www 1234 -dictGetOrDefault test_01037.dict_array (-100,-42) dd 44 -dictGetOrDefault test_01037.dict_array (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_array (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_array (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_array (0,2) Click North 422 -dictGetOrDefault test_01037.dict_array (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_array (1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (3,3) House 314159 -dictGetOrDefault test_01037.dict_array (5,6) Click 42 -dictGetOrDefault test_01037.dict_array (7.01,7.01) ee 55 -dictGet test_01037.dict_tuple (-100,-42) qqq 101 -dictGet test_01037.dict_tuple (-1,0) Click South 423 -dictGet test_01037.dict_tuple (-0.1,0) Click South 423 -dictGet test_01037.dict_tuple (0,-2) Click West 424 -dictGet test_01037.dict_tuple (0,-1.1) Click West 424 -dictGet test_01037.dict_tuple (0,1.1) Click North 422 -dictGet test_01037.dict_tuple (0,2) Click North 422 -dictGet test_01037.dict_tuple (0.1,0) Click East 421 -dictGet test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGet test_01037.dict_tuple (1,0) Click East 421 -dictGet test_01037.dict_tuple (3,3) House 314159 -dictGet test_01037.dict_tuple (5,6) Click 42 -dictGet test_01037.dict_tuple (7.01,7.01) qqq 101 -dictGetOrDefault test_01037.dict_tuple (-100,-42) www 1234 -dictGetOrDefault test_01037.dict_tuple (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0,2) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_tuple (1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (3,3) House 314159 -dictGetOrDefault test_01037.dict_tuple (5,6) Click 42 -dictGetOrDefault test_01037.dict_tuple (7.01,7.01) www 1234 -dictGetOrDefault test_01037.dict_tuple (-100,-42) dd 44 -dictGetOrDefault test_01037.dict_tuple (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0,2) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_tuple (1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (3,3) House 314159 -dictGetOrDefault test_01037.dict_tuple (5,6) Click 42 -dictGetOrDefault test_01037.dict_tuple (7.01,7.01) ee 55 -dictHas test_01037.dict_array (-100,-42) 0 -dictHas test_01037.dict_array (-1,0) 1 -dictHas test_01037.dict_array (-0.1,0) 1 -dictHas test_01037.dict_array (0,-2) 1 -dictHas test_01037.dict_array (0,-1.1) 1 -dictHas test_01037.dict_array (0,-1) 1 -dictHas test_01037.dict_array (0,0) 1 -dictHas test_01037.dict_array (0,1) 1 -dictHas test_01037.dict_array (0,1.1) 1 -dictHas test_01037.dict_array (0,2) 1 -dictHas test_01037.dict_array (0.1,0) 1 -dictHas test_01037.dict_array (0.99,2.99) 1 -dictHas test_01037.dict_array (1,0) 1 -dictHas test_01037.dict_array (1,1) 1 -dictHas test_01037.dict_array (1,3) 1 -dictHas test_01037.dict_array (3,3) 1 -dictHas test_01037.dict_array (5,1) 1 -dictHas test_01037.dict_array (5,5) 1 -dictHas test_01037.dict_array (5,6) 1 -dictHas test_01037.dict_array (7.01,7.01) 0 -dictHas test_01037.dict_tuple (-100,-42) 0 -dictHas test_01037.dict_tuple (-1,0) 1 -dictHas test_01037.dict_tuple (-0.1,0) 1 -dictHas test_01037.dict_tuple (0,-2) 1 -dictHas test_01037.dict_tuple (0,-1.1) 1 -dictHas test_01037.dict_tuple (0,-1) 1 -dictHas test_01037.dict_tuple (0,0) 1 -dictHas test_01037.dict_tuple (0,1) 1 -dictHas test_01037.dict_tuple (0,1.1) 1 -dictHas test_01037.dict_tuple (0,2) 1 -dictHas test_01037.dict_tuple (0.1,0) 1 -dictHas test_01037.dict_tuple (0.99,2.99) 1 -dictHas test_01037.dict_tuple (1,0) 1 -dictHas test_01037.dict_tuple (1,1) 1 -dictHas test_01037.dict_tuple (1,3) 1 -dictHas test_01037.dict_tuple (3,3) 1 -dictHas test_01037.dict_tuple (5,1) 1 -dictHas test_01037.dict_tuple (5,5) 1 -dictHas test_01037.dict_tuple (5,6) 1 -dictHas test_01037.dict_tuple (7.01,7.01) 0 diff --git a/tests/queries/0_stateless/01037_grid_polygon_dict_multi_polygons.sql b/tests/queries/0_stateless/01037_grid_polygon_dict_multi_polygons.sql deleted file mode 100644 index 4c446c28b51..00000000000 --- a/tests/queries/0_stateless/01037_grid_polygon_dict_multi_polygons.sql +++ /dev/null @@ -1,107 +0,0 @@ -SET send_logs_level = 'none'; - -DROP DATABASE IF EXISTS test_01037; - -CREATE DATABASE test_01037 Engine = Ordinary; - -DROP DICTIONARY IF EXISTS test_01037.dict_array; -DROP TABLE IF EXISTS test_01037.polygons_array; - -CREATE TABLE test_01037.polygons_array (key Array(Array(Array(Array(Float64)))), name String, value UInt64) ENGINE = Memory; -INSERT INTO test_01037.polygons_array VALUES ([[[[1, 3], [1, 1], [3, 1], [3, -1], [1, -1], [1, -3], [-1, -3], [-1, -1], [-3, -1], [-3, 1], [-1, 1], [-1, 3]]], [[[5, 5], [5, 1], [7, 1], [7, 7], [1, 7], [1, 5]]]], 'Click', 42); -INSERT INTO test_01037.polygons_array VALUES ([[[[5, 5], [5, -5], [-5, -5], [-5, 5]], [[1, 3], [1, 1], [3, 1], [3, -1], [1, -1], [1, -3], [-1, -3], [-1, -1], [-3, -1], [-3, 1], [-1, 1], [-1, 3]]]], 'House', 314159); -INSERT INTO test_01037.polygons_array VALUES ([[[[3, 1], [0, 1], [0, -1], [3, -1]]]], 'Click East', 421); -INSERT INTO test_01037.polygons_array VALUES ([[[[-1, 1], [1, 1], [1, 3], [-1, 3]]]], 'Click North', 422); -INSERT INTO test_01037.polygons_array VALUES ([[[[-3, 1], [-3, -1], [0, -1], [0, 1]]]], 'Click South', 423); -INSERT INTO test_01037.polygons_array VALUES ([[[[-1, -1], [1, -1], [1, -3], [-1, -3]]]], 'Click West', 424); - -CREATE DICTIONARY test_01037.dict_array -( - key Array(Array(Array(Array(Float64)))), - name String DEFAULT 'qqq', - value UInt64 DEFAULT 101 -) -PRIMARY KEY key -SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_array' PASSWORD '' DB 'test_01037')) -LIFETIME(MIN 1 MAX 10) -LAYOUT(POLYGON()); - -DROP DICTIONARY IF EXISTS test_01037.dict_tuple; -DROP TABLE IF EXISTS test_01037.polygons_tuple; - -CREATE TABLE test_01037.polygons_tuple (key Array(Array(Array(Tuple(Float64, Float64)))), name String, value UInt64) ENGINE = Memory; -INSERT INTO test_01037.polygons_tuple VALUES ([[[(1, 3), (1, 1), (3, 1), (3, -1), (1, -1), (1, -3), (-1, -3), (-1, -1), (-3, -1), (-3, 1), (-1, 1), (-1, 3)]], [[(5, 5), (5, 1), (7, 1), (7, 7), (1, 7), (1, 5)]]], 'Click', 42); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(5, 5), (5, -5), (-5, -5), (-5, 5)], [(1, 3), (1, 1), (3, 1), (3, -1), (1, -1), (1, -3), (-1, -3), (-1, -1), (-3, -1), (-3, 1), (-1, 1), (-1, 3)]]], 'House', 314159); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(3, 1), (0, 1), (0, -1), (3, -1)]]], 'Click East', 421); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(-1, 1), (1, 1), (1, 3), (-1, 3)]]], 'Click North', 422); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(-3, 1), (-3, -1), (0, -1), (0, 1)]]], 'Click South', 423); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(-1, -1), (1, -1), (1, -3), (-1, -3)]]], 'Click West', 424); - -CREATE DICTIONARY test_01037.dict_tuple -( - key Array(Array(Array(Tuple(Float64, Float64)))), - name String DEFAULT 'qqq', - value UInt64 DEFAULT 101 -) -PRIMARY KEY key -SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_tuple' PASSWORD '' DB 'test_01037')) -LIFETIME(MIN 1 MAX 10) -LAYOUT(POLYGON()); - -DROP TABLE IF EXISTS test_01037.points; - -CREATE TABLE test_01037.points (x Float64, y Float64, def_i UInt64, def_s String) ENGINE = Memory; -INSERT INTO test_01037.points VALUES (0.1, 0.0, 112, 'aax'); -INSERT INTO test_01037.points VALUES (-0.1, 0.0, 113, 'aay'); -INSERT INTO test_01037.points VALUES (0.0, 1.1, 114, 'aaz'); -INSERT INTO test_01037.points VALUES (0.0, -1.1, 115, 'aat'); -INSERT INTO test_01037.points VALUES (3.0, 3.0, 22, 'bb'); -INSERT INTO test_01037.points VALUES (5.0, 6.0, 33, 'cc'); -INSERT INTO test_01037.points VALUES (-100.0, -42.0, 44, 'dd'); -INSERT INTO test_01037.points VALUES (7.01, 7.01, 55, 'ee') -INSERT INTO test_01037.points VALUES (0.99, 2.99, 66, 'ee'); -INSERT INTO test_01037.points VALUES (1.0, 0.0, 771, 'ffa'); -INSERT INTO test_01037.points VALUES (-1.0, 0.0, 772, 'ffb'); -INSERT INTO test_01037.points VALUES (0.0, 2.0, 773, 'ffc'); -INSERT INTO test_01037.points VALUES (0.0, -2.0, 774, 'ffd'); - -select 'dictGet', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGet(dict_name, 'name', key), - dictGet(dict_name, 'value', key) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, 'www'), - dictGetOrDefault(dict_name, 'value', key, toUInt64(1234)) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, def_s), - dictGetOrDefault(dict_name, 'value', key, def_i) from test_01037.points order by x, y; - -select 'dictGet', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGet(dict_name, 'name', key), - dictGet(dict_name, 'value', key) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, 'www'), - dictGetOrDefault(dict_name, 'value', key, toUInt64(1234)) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, def_s), - dictGetOrDefault(dict_name, 'value', key, def_i) from test_01037.points order by x, y; - -INSERT INTO test_01037.points VALUES (5.0, 5.0, 0, ''); -INSERT INTO test_01037.points VALUES (5.0, 1.0, 0, ''); -INSERT INTO test_01037.points VALUES (1.0, 3.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, 0.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, 1.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, -1.0, 0, ''); -INSERT INTO test_01037.points VALUES (1.0, 1.0, 0, ''); - -select 'dictHas', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictHas(dict_name, key) from test_01037.points order by x, y; - -select 'dictHas', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictHas(dict_name, key) from test_01037.points order by x, y; - -DROP DICTIONARY test_01037.dict_array; -DROP DICTIONARY test_01037.dict_tuple; -DROP TABLE test_01037.polygons_array; -DROP TABLE test_01037.polygons_tuple; -DROP TABLE test_01037.points; -DROP DATABASE test_01037; diff --git a/tests/queries/0_stateless/01037_grid_polygon_dict_simple_polygons.reference b/tests/queries/0_stateless/01037_grid_polygon_dict_simple_polygons.reference deleted file mode 100644 index bc40521f692..00000000000 --- a/tests/queries/0_stateless/01037_grid_polygon_dict_simple_polygons.reference +++ /dev/null @@ -1,142 +0,0 @@ -dictGet test_01037.dict_array (-100,-42) qqq 101 -dictGet test_01037.dict_array (-1,0) Click South 423 -dictGet test_01037.dict_array (-0.1,0) Click South 423 -dictGet test_01037.dict_array (0,-2) Click West 424 -dictGet test_01037.dict_array (0,-1.1) Click West 424 -dictGet test_01037.dict_array (0,1.1) Click North 422 -dictGet test_01037.dict_array (0,2) Click North 422 -dictGet test_01037.dict_array (0.1,0) Click East 421 -dictGet test_01037.dict_array (0.99,2.99) Click North 422 -dictGet test_01037.dict_array (1,0) Click East 421 -dictGet test_01037.dict_array (2,4) House 523 -dictGet test_01037.dict_array (2,4.1) qqq 101 -dictGet test_01037.dict_array (3,3) House 523 -dictGet test_01037.dict_array (4,4) House 523 -dictGet test_01037.dict_array (5,6) qqq 101 -dictGet test_01037.dict_array (7.01,7.01) qqq 101 -dictGetOrDefault test_01037.dict_array (-100,-42) www 1234 -dictGetOrDefault test_01037.dict_array (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_array (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_array (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_array (0,2) Click North 422 -dictGetOrDefault test_01037.dict_array (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_array (1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (2,4) House 523 -dictGetOrDefault test_01037.dict_array (2,4.1) www 1234 -dictGetOrDefault test_01037.dict_array (3,3) House 523 -dictGetOrDefault test_01037.dict_array (4,4) House 523 -dictGetOrDefault test_01037.dict_array (5,6) www 1234 -dictGetOrDefault test_01037.dict_array (7.01,7.01) www 1234 -dictGetOrDefault test_01037.dict_array (-100,-42) dd 44 -dictGetOrDefault test_01037.dict_array (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_array (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_array (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_array (0,2) Click North 422 -dictGetOrDefault test_01037.dict_array (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_array (1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (2,4) House 523 -dictGetOrDefault test_01037.dict_array (2,4.1) gac 803 -dictGetOrDefault test_01037.dict_array (3,3) House 523 -dictGetOrDefault test_01037.dict_array (4,4) House 523 -dictGetOrDefault test_01037.dict_array (5,6) cc 33 -dictGetOrDefault test_01037.dict_array (7.01,7.01) ee 55 -dictGet test_01037.dict_tuple (-100,-42) qqq 101 -dictGet test_01037.dict_tuple (-1,0) Click South 423 -dictGet test_01037.dict_tuple (-0.1,0) Click South 423 -dictGet test_01037.dict_tuple (0,-2) Click West 424 -dictGet test_01037.dict_tuple (0,-1.1) Click West 424 -dictGet test_01037.dict_tuple (0,1.1) Click North 422 -dictGet test_01037.dict_tuple (0,2) Click North 422 -dictGet test_01037.dict_tuple (0.1,0) Click East 421 -dictGet test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGet test_01037.dict_tuple (1,0) Click East 421 -dictGet test_01037.dict_tuple (2,4) House 523 -dictGet test_01037.dict_tuple (2,4.1) qqq 101 -dictGet test_01037.dict_tuple (3,3) House 523 -dictGet test_01037.dict_tuple (4,4) House 523 -dictGet test_01037.dict_tuple (5,6) qqq 101 -dictGet test_01037.dict_tuple (7.01,7.01) qqq 101 -dictGetOrDefault test_01037.dict_tuple (-100,-42) www 1234 -dictGetOrDefault test_01037.dict_tuple (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0,2) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_tuple (1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (2,4) House 523 -dictGetOrDefault test_01037.dict_tuple (2,4.1) www 1234 -dictGetOrDefault test_01037.dict_tuple (3,3) House 523 -dictGetOrDefault test_01037.dict_tuple (4,4) House 523 -dictGetOrDefault test_01037.dict_tuple (5,6) www 1234 -dictGetOrDefault test_01037.dict_tuple (7.01,7.01) www 1234 -dictGetOrDefault test_01037.dict_tuple (-100,-42) dd 44 -dictGetOrDefault test_01037.dict_tuple (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0,2) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_tuple (1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (2,4) House 523 -dictGetOrDefault test_01037.dict_tuple (2,4.1) gac 803 -dictGetOrDefault test_01037.dict_tuple (3,3) House 523 -dictGetOrDefault test_01037.dict_tuple (4,4) House 523 -dictGetOrDefault test_01037.dict_tuple (5,6) cc 33 -dictGetOrDefault test_01037.dict_tuple (7.01,7.01) ee 55 -dictHas test_01037.dict_array (-100,-42) 0 -dictHas test_01037.dict_array (-1,0) 1 -dictHas test_01037.dict_array (-0.1,0) 1 -dictHas test_01037.dict_array (0,-2) 1 -dictHas test_01037.dict_array (0,-1.1) 1 -dictHas test_01037.dict_array (0,-1) 1 -dictHas test_01037.dict_array (0,0) 1 -dictHas test_01037.dict_array (0,1) 1 -dictHas test_01037.dict_array (0,1.1) 1 -dictHas test_01037.dict_array (0,2) 1 -dictHas test_01037.dict_array (0.1,0) 1 -dictHas test_01037.dict_array (0.99,2.99) 1 -dictHas test_01037.dict_array (1,0) 1 -dictHas test_01037.dict_array (1,1) 1 -dictHas test_01037.dict_array (1,3) 1 -dictHas test_01037.dict_array (2,4) 1 -dictHas test_01037.dict_array (2,4.1) 0 -dictHas test_01037.dict_array (3,3) 1 -dictHas test_01037.dict_array (4,4) 1 -dictHas test_01037.dict_array (5,1) 1 -dictHas test_01037.dict_array (5,5) 1 -dictHas test_01037.dict_array (5,6) 0 -dictHas test_01037.dict_array (7.01,7.01) 0 -dictHas test_01037.dict_tuple (-100,-42) 0 -dictHas test_01037.dict_tuple (-1,0) 1 -dictHas test_01037.dict_tuple (-0.1,0) 1 -dictHas test_01037.dict_tuple (0,-2) 1 -dictHas test_01037.dict_tuple (0,-1.1) 1 -dictHas test_01037.dict_tuple (0,-1) 1 -dictHas test_01037.dict_tuple (0,0) 1 -dictHas test_01037.dict_tuple (0,1) 1 -dictHas test_01037.dict_tuple (0,1.1) 1 -dictHas test_01037.dict_tuple (0,2) 1 -dictHas test_01037.dict_tuple (0.1,0) 1 -dictHas test_01037.dict_tuple (0.99,2.99) 1 -dictHas test_01037.dict_tuple (1,0) 1 -dictHas test_01037.dict_tuple (1,1) 1 -dictHas test_01037.dict_tuple (1,3) 1 -dictHas test_01037.dict_tuple (2,4) 1 -dictHas test_01037.dict_tuple (2,4.1) 0 -dictHas test_01037.dict_tuple (3,3) 1 -dictHas test_01037.dict_tuple (4,4) 1 -dictHas test_01037.dict_tuple (5,1) 1 -dictHas test_01037.dict_tuple (5,5) 1 -dictHas test_01037.dict_tuple (5,6) 0 -dictHas test_01037.dict_tuple (7.01,7.01) 0 diff --git a/tests/queries/0_stateless/01037_grid_polygon_dict_simple_polygons.sql b/tests/queries/0_stateless/01037_grid_polygon_dict_simple_polygons.sql deleted file mode 100644 index 56e5865a5a1..00000000000 --- a/tests/queries/0_stateless/01037_grid_polygon_dict_simple_polygons.sql +++ /dev/null @@ -1,108 +0,0 @@ -SET send_logs_level = 'none'; - -DROP DATABASE IF EXISTS test_01037; - -CREATE DATABASE test_01037 Engine = Ordinary; - -DROP DICTIONARY IF EXISTS test_01037.dict_array; -DROP TABLE IF EXISTS test_01037.polygons_array; - -CREATE TABLE test_01037.polygons_array (key Array(Array(Float64)), name String, value UInt64) ENGINE = Memory; -INSERT INTO test_01037.polygons_array VALUES ([[3, 1], [0, 1], [0, -1], [3, -1]], 'Click East', 421); -INSERT INTO test_01037.polygons_array VALUES ([[-1, 1], [1, 1], [1, 3], [-1, 3]], 'Click North', 422); -INSERT INTO test_01037.polygons_array VALUES ([[-3, 1], [-3, -1], [0, -1], [0, 1]], 'Click South', 423); -INSERT INTO test_01037.polygons_array VALUES ([[-1, -1], [1, -1], [1, -3], [-1, -3]], 'Click West', 424); -INSERT INTO test_01037.polygons_array VALUES ([[1, 1], [1, 3], [3, 5], [5, 5], [5, 1]], 'House', 523); - -CREATE DICTIONARY test_01037.dict_array -( - key Array(Array(Float64)), - name String DEFAULT 'qqq', - value UInt64 DEFAULT 101 -) -PRIMARY KEY key -SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_array' PASSWORD '' DB 'test_01037')) -LIFETIME(MIN 1 MAX 10) -LAYOUT(POLYGON()); - -DROP DICTIONARY IF EXISTS test_01037.dict_tuple; -DROP TABLE IF EXISTS test_01037.polygons_tuple; - -CREATE TABLE test_01037.polygons_tuple (key Array(Tuple(Float64, Float64)), name String, value UInt64) ENGINE = Memory; -INSERT INTO test_01037.polygons_tuple VALUES ([(3.0, 1.0), (0.0, 1.0), (0.0, -1.0), (3.0, -1.0)], 'Click East', 421); -INSERT INTO test_01037.polygons_tuple VALUES ([(-1, 1), (1, 1), (1, 3), (-1, 3)], 'Click North', 422); -INSERT INTO test_01037.polygons_tuple VALUES ([(-3, 1), (-3, -1), (0, -1), (0, 1)], 'Click South', 423); -INSERT INTO test_01037.polygons_tuple VALUES ([(-1, -1), (1, -1), (1, -3), (-1, -3)], 'Click West', 424); -INSERT INTO test_01037.polygons_tuple VALUES ([(1, 1), (1, 3), (3, 5), (5, 5), (5, 1)], 'House', 523); - -CREATE DICTIONARY test_01037.dict_tuple -( - key Array(Tuple(Float64, Float64)), - name String DEFAULT 'qqq', - value UInt64 DEFAULT 101 -) -PRIMARY KEY key -SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_tuple' PASSWORD '' DB 'test_01037')) -LIFETIME(MIN 1 MAX 10) -LAYOUT(POLYGON()); - -DROP TABLE IF EXISTS test_01037.points; - -CREATE TABLE test_01037.points (x Float64, y Float64, def_i UInt64, def_s String) ENGINE = Memory; -INSERT INTO test_01037.points VALUES (0.1, 0.0, 112, 'aax'); -INSERT INTO test_01037.points VALUES (-0.1, 0.0, 113, 'aay'); -INSERT INTO test_01037.points VALUES (0.0, 1.1, 114, 'aaz'); -INSERT INTO test_01037.points VALUES (0.0, -1.1, 115, 'aat'); -INSERT INTO test_01037.points VALUES (3.0, 3.0, 22, 'bb'); -INSERT INTO test_01037.points VALUES (5.0, 6.0, 33, 'cc'); -INSERT INTO test_01037.points VALUES (-100.0, -42.0, 44, 'dd'); -INSERT INTO test_01037.points VALUES (7.01, 7.01, 55, 'ee') -INSERT INTO test_01037.points VALUES (0.99, 2.99, 66, 'ee'); -INSERT INTO test_01037.points VALUES (1.0, 0.0, 771, 'ffa'); -INSERT INTO test_01037.points VALUES (-1.0, 0.0, 772, 'ffb'); -INSERT INTO test_01037.points VALUES (0.0, 2.0, 773, 'ffc'); -INSERT INTO test_01037.points VALUES (0.0, -2.0, 774, 'ffd'); -INSERT INTO test_01037.points VALUES (2.0, 4.0, 801, 'gaa') -INSERT INTO test_01037.points VALUES (4.0, 4.0, 802, 'gab') -INSERT INTO test_01037.points VALUES (2.0, 4.1, 803, 'gac') - -select 'dictGet', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGet(dict_name, 'name', key), - dictGet(dict_name, 'value', key) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, 'www'), - dictGetOrDefault(dict_name, 'value', key, toUInt64(1234)) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, def_s), - dictGetOrDefault(dict_name, 'value', key, def_i) from test_01037.points order by x, y; - -select 'dictGet', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGet(dict_name, 'name', key), - dictGet(dict_name, 'value', key) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, 'www'), - dictGetOrDefault(dict_name, 'value', key, toUInt64(1234)) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, def_s), - dictGetOrDefault(dict_name, 'value', key, def_i) from test_01037.points order by x, y; - -INSERT INTO test_01037.points VALUES (5.0, 5.0, 0, ''); -INSERT INTO test_01037.points VALUES (5.0, 1.0, 0, ''); -INSERT INTO test_01037.points VALUES (1.0, 3.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, 0.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, 1.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, -1.0, 0, ''); -INSERT INTO test_01037.points VALUES (1.0, 1.0, 0, ''); - -select 'dictHas', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictHas(dict_name, key) from test_01037.points order by x, y; - -select 'dictHas', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictHas(dict_name, key) from test_01037.points order by x, y; - -DROP DICTIONARY test_01037.dict_array; -DROP DICTIONARY test_01037.dict_tuple; -DROP TABLE test_01037.polygons_array; -DROP TABLE test_01037.polygons_tuple; -DROP TABLE test_01037.points; -DROP DATABASE test_01037; diff --git a/tests/queries/0_stateless/01037_polygon_dict_multi_polygons.reference b/tests/queries/0_stateless/01037_polygon_dict_multi_polygons.reference deleted file mode 100644 index 80af8a52400..00000000000 --- a/tests/queries/0_stateless/01037_polygon_dict_multi_polygons.reference +++ /dev/null @@ -1,118 +0,0 @@ -dictGet test_01037.dict_array (-100,-42) qqq 101 -dictGet test_01037.dict_array (-1,0) Click South 423 -dictGet test_01037.dict_array (-0.1,0) Click South 423 -dictGet test_01037.dict_array (0,-2) Click West 424 -dictGet test_01037.dict_array (0,-1.1) Click West 424 -dictGet test_01037.dict_array (0,1.1) Click North 422 -dictGet test_01037.dict_array (0,2) Click North 422 -dictGet test_01037.dict_array (0.1,0) Click East 421 -dictGet test_01037.dict_array (0.99,2.99) Click North 422 -dictGet test_01037.dict_array (1,0) Click East 421 -dictGet test_01037.dict_array (3,3) House 314159 -dictGet test_01037.dict_array (5,6) Click 42 -dictGet test_01037.dict_array (7.01,7.01) qqq 101 -dictGetOrDefault test_01037.dict_array (-100,-42) www 1234 -dictGetOrDefault test_01037.dict_array (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_array (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_array (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_array (0,2) Click North 422 -dictGetOrDefault test_01037.dict_array (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_array (1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (3,3) House 314159 -dictGetOrDefault test_01037.dict_array (5,6) Click 42 -dictGetOrDefault test_01037.dict_array (7.01,7.01) www 1234 -dictGetOrDefault test_01037.dict_array (-100,-42) dd 44 -dictGetOrDefault test_01037.dict_array (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_array (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_array (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_array (0,2) Click North 422 -dictGetOrDefault test_01037.dict_array (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_array (1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (3,3) House 314159 -dictGetOrDefault test_01037.dict_array (5,6) Click 42 -dictGetOrDefault test_01037.dict_array (7.01,7.01) ee 55 -dictGet test_01037.dict_tuple (-100,-42) qqq 101 -dictGet test_01037.dict_tuple (-1,0) Click South 423 -dictGet test_01037.dict_tuple (-0.1,0) Click South 423 -dictGet test_01037.dict_tuple (0,-2) Click West 424 -dictGet test_01037.dict_tuple (0,-1.1) Click West 424 -dictGet test_01037.dict_tuple (0,1.1) Click North 422 -dictGet test_01037.dict_tuple (0,2) Click North 422 -dictGet test_01037.dict_tuple (0.1,0) Click East 421 -dictGet test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGet test_01037.dict_tuple (1,0) Click East 421 -dictGet test_01037.dict_tuple (3,3) House 314159 -dictGet test_01037.dict_tuple (5,6) Click 42 -dictGet test_01037.dict_tuple (7.01,7.01) qqq 101 -dictGetOrDefault test_01037.dict_tuple (-100,-42) www 1234 -dictGetOrDefault test_01037.dict_tuple (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0,2) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_tuple (1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (3,3) House 314159 -dictGetOrDefault test_01037.dict_tuple (5,6) Click 42 -dictGetOrDefault test_01037.dict_tuple (7.01,7.01) www 1234 -dictGetOrDefault test_01037.dict_tuple (-100,-42) dd 44 -dictGetOrDefault test_01037.dict_tuple (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0,2) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_tuple (1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (3,3) House 314159 -dictGetOrDefault test_01037.dict_tuple (5,6) Click 42 -dictGetOrDefault test_01037.dict_tuple (7.01,7.01) ee 55 -dictHas test_01037.dict_array (-100,-42) 0 -dictHas test_01037.dict_array (-1,0) 1 -dictHas test_01037.dict_array (-0.1,0) 1 -dictHas test_01037.dict_array (0,-2) 1 -dictHas test_01037.dict_array (0,-1.1) 1 -dictHas test_01037.dict_array (0,-1) 1 -dictHas test_01037.dict_array (0,0) 1 -dictHas test_01037.dict_array (0,1) 1 -dictHas test_01037.dict_array (0,1.1) 1 -dictHas test_01037.dict_array (0,2) 1 -dictHas test_01037.dict_array (0.1,0) 1 -dictHas test_01037.dict_array (0.99,2.99) 1 -dictHas test_01037.dict_array (1,0) 1 -dictHas test_01037.dict_array (1,1) 1 -dictHas test_01037.dict_array (1,3) 1 -dictHas test_01037.dict_array (3,3) 1 -dictHas test_01037.dict_array (5,1) 1 -dictHas test_01037.dict_array (5,5) 1 -dictHas test_01037.dict_array (5,6) 1 -dictHas test_01037.dict_array (7.01,7.01) 0 -dictHas test_01037.dict_tuple (-100,-42) 0 -dictHas test_01037.dict_tuple (-1,0) 1 -dictHas test_01037.dict_tuple (-0.1,0) 1 -dictHas test_01037.dict_tuple (0,-2) 1 -dictHas test_01037.dict_tuple (0,-1.1) 1 -dictHas test_01037.dict_tuple (0,-1) 1 -dictHas test_01037.dict_tuple (0,0) 1 -dictHas test_01037.dict_tuple (0,1) 1 -dictHas test_01037.dict_tuple (0,1.1) 1 -dictHas test_01037.dict_tuple (0,2) 1 -dictHas test_01037.dict_tuple (0.1,0) 1 -dictHas test_01037.dict_tuple (0.99,2.99) 1 -dictHas test_01037.dict_tuple (1,0) 1 -dictHas test_01037.dict_tuple (1,1) 1 -dictHas test_01037.dict_tuple (1,3) 1 -dictHas test_01037.dict_tuple (3,3) 1 -dictHas test_01037.dict_tuple (5,1) 1 -dictHas test_01037.dict_tuple (5,5) 1 -dictHas test_01037.dict_tuple (5,6) 1 -dictHas test_01037.dict_tuple (7.01,7.01) 0 diff --git a/tests/queries/0_stateless/01037_polygon_dict_multi_polygons.sql b/tests/queries/0_stateless/01037_polygon_dict_multi_polygons.sql deleted file mode 100644 index 4c446c28b51..00000000000 --- a/tests/queries/0_stateless/01037_polygon_dict_multi_polygons.sql +++ /dev/null @@ -1,107 +0,0 @@ -SET send_logs_level = 'none'; - -DROP DATABASE IF EXISTS test_01037; - -CREATE DATABASE test_01037 Engine = Ordinary; - -DROP DICTIONARY IF EXISTS test_01037.dict_array; -DROP TABLE IF EXISTS test_01037.polygons_array; - -CREATE TABLE test_01037.polygons_array (key Array(Array(Array(Array(Float64)))), name String, value UInt64) ENGINE = Memory; -INSERT INTO test_01037.polygons_array VALUES ([[[[1, 3], [1, 1], [3, 1], [3, -1], [1, -1], [1, -3], [-1, -3], [-1, -1], [-3, -1], [-3, 1], [-1, 1], [-1, 3]]], [[[5, 5], [5, 1], [7, 1], [7, 7], [1, 7], [1, 5]]]], 'Click', 42); -INSERT INTO test_01037.polygons_array VALUES ([[[[5, 5], [5, -5], [-5, -5], [-5, 5]], [[1, 3], [1, 1], [3, 1], [3, -1], [1, -1], [1, -3], [-1, -3], [-1, -1], [-3, -1], [-3, 1], [-1, 1], [-1, 3]]]], 'House', 314159); -INSERT INTO test_01037.polygons_array VALUES ([[[[3, 1], [0, 1], [0, -1], [3, -1]]]], 'Click East', 421); -INSERT INTO test_01037.polygons_array VALUES ([[[[-1, 1], [1, 1], [1, 3], [-1, 3]]]], 'Click North', 422); -INSERT INTO test_01037.polygons_array VALUES ([[[[-3, 1], [-3, -1], [0, -1], [0, 1]]]], 'Click South', 423); -INSERT INTO test_01037.polygons_array VALUES ([[[[-1, -1], [1, -1], [1, -3], [-1, -3]]]], 'Click West', 424); - -CREATE DICTIONARY test_01037.dict_array -( - key Array(Array(Array(Array(Float64)))), - name String DEFAULT 'qqq', - value UInt64 DEFAULT 101 -) -PRIMARY KEY key -SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_array' PASSWORD '' DB 'test_01037')) -LIFETIME(MIN 1 MAX 10) -LAYOUT(POLYGON()); - -DROP DICTIONARY IF EXISTS test_01037.dict_tuple; -DROP TABLE IF EXISTS test_01037.polygons_tuple; - -CREATE TABLE test_01037.polygons_tuple (key Array(Array(Array(Tuple(Float64, Float64)))), name String, value UInt64) ENGINE = Memory; -INSERT INTO test_01037.polygons_tuple VALUES ([[[(1, 3), (1, 1), (3, 1), (3, -1), (1, -1), (1, -3), (-1, -3), (-1, -1), (-3, -1), (-3, 1), (-1, 1), (-1, 3)]], [[(5, 5), (5, 1), (7, 1), (7, 7), (1, 7), (1, 5)]]], 'Click', 42); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(5, 5), (5, -5), (-5, -5), (-5, 5)], [(1, 3), (1, 1), (3, 1), (3, -1), (1, -1), (1, -3), (-1, -3), (-1, -1), (-3, -1), (-3, 1), (-1, 1), (-1, 3)]]], 'House', 314159); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(3, 1), (0, 1), (0, -1), (3, -1)]]], 'Click East', 421); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(-1, 1), (1, 1), (1, 3), (-1, 3)]]], 'Click North', 422); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(-3, 1), (-3, -1), (0, -1), (0, 1)]]], 'Click South', 423); -INSERT INTO test_01037.polygons_tuple VALUES ([[[(-1, -1), (1, -1), (1, -3), (-1, -3)]]], 'Click West', 424); - -CREATE DICTIONARY test_01037.dict_tuple -( - key Array(Array(Array(Tuple(Float64, Float64)))), - name String DEFAULT 'qqq', - value UInt64 DEFAULT 101 -) -PRIMARY KEY key -SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_tuple' PASSWORD '' DB 'test_01037')) -LIFETIME(MIN 1 MAX 10) -LAYOUT(POLYGON()); - -DROP TABLE IF EXISTS test_01037.points; - -CREATE TABLE test_01037.points (x Float64, y Float64, def_i UInt64, def_s String) ENGINE = Memory; -INSERT INTO test_01037.points VALUES (0.1, 0.0, 112, 'aax'); -INSERT INTO test_01037.points VALUES (-0.1, 0.0, 113, 'aay'); -INSERT INTO test_01037.points VALUES (0.0, 1.1, 114, 'aaz'); -INSERT INTO test_01037.points VALUES (0.0, -1.1, 115, 'aat'); -INSERT INTO test_01037.points VALUES (3.0, 3.0, 22, 'bb'); -INSERT INTO test_01037.points VALUES (5.0, 6.0, 33, 'cc'); -INSERT INTO test_01037.points VALUES (-100.0, -42.0, 44, 'dd'); -INSERT INTO test_01037.points VALUES (7.01, 7.01, 55, 'ee') -INSERT INTO test_01037.points VALUES (0.99, 2.99, 66, 'ee'); -INSERT INTO test_01037.points VALUES (1.0, 0.0, 771, 'ffa'); -INSERT INTO test_01037.points VALUES (-1.0, 0.0, 772, 'ffb'); -INSERT INTO test_01037.points VALUES (0.0, 2.0, 773, 'ffc'); -INSERT INTO test_01037.points VALUES (0.0, -2.0, 774, 'ffd'); - -select 'dictGet', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGet(dict_name, 'name', key), - dictGet(dict_name, 'value', key) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, 'www'), - dictGetOrDefault(dict_name, 'value', key, toUInt64(1234)) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, def_s), - dictGetOrDefault(dict_name, 'value', key, def_i) from test_01037.points order by x, y; - -select 'dictGet', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGet(dict_name, 'name', key), - dictGet(dict_name, 'value', key) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, 'www'), - dictGetOrDefault(dict_name, 'value', key, toUInt64(1234)) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, def_s), - dictGetOrDefault(dict_name, 'value', key, def_i) from test_01037.points order by x, y; - -INSERT INTO test_01037.points VALUES (5.0, 5.0, 0, ''); -INSERT INTO test_01037.points VALUES (5.0, 1.0, 0, ''); -INSERT INTO test_01037.points VALUES (1.0, 3.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, 0.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, 1.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, -1.0, 0, ''); -INSERT INTO test_01037.points VALUES (1.0, 1.0, 0, ''); - -select 'dictHas', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictHas(dict_name, key) from test_01037.points order by x, y; - -select 'dictHas', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictHas(dict_name, key) from test_01037.points order by x, y; - -DROP DICTIONARY test_01037.dict_array; -DROP DICTIONARY test_01037.dict_tuple; -DROP TABLE test_01037.polygons_array; -DROP TABLE test_01037.polygons_tuple; -DROP TABLE test_01037.points; -DROP DATABASE test_01037; diff --git a/tests/queries/0_stateless/01037_polygon_dict_simple_polygons.reference b/tests/queries/0_stateless/01037_polygon_dict_simple_polygons.reference deleted file mode 100644 index bc40521f692..00000000000 --- a/tests/queries/0_stateless/01037_polygon_dict_simple_polygons.reference +++ /dev/null @@ -1,142 +0,0 @@ -dictGet test_01037.dict_array (-100,-42) qqq 101 -dictGet test_01037.dict_array (-1,0) Click South 423 -dictGet test_01037.dict_array (-0.1,0) Click South 423 -dictGet test_01037.dict_array (0,-2) Click West 424 -dictGet test_01037.dict_array (0,-1.1) Click West 424 -dictGet test_01037.dict_array (0,1.1) Click North 422 -dictGet test_01037.dict_array (0,2) Click North 422 -dictGet test_01037.dict_array (0.1,0) Click East 421 -dictGet test_01037.dict_array (0.99,2.99) Click North 422 -dictGet test_01037.dict_array (1,0) Click East 421 -dictGet test_01037.dict_array (2,4) House 523 -dictGet test_01037.dict_array (2,4.1) qqq 101 -dictGet test_01037.dict_array (3,3) House 523 -dictGet test_01037.dict_array (4,4) House 523 -dictGet test_01037.dict_array (5,6) qqq 101 -dictGet test_01037.dict_array (7.01,7.01) qqq 101 -dictGetOrDefault test_01037.dict_array (-100,-42) www 1234 -dictGetOrDefault test_01037.dict_array (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_array (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_array (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_array (0,2) Click North 422 -dictGetOrDefault test_01037.dict_array (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_array (1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (2,4) House 523 -dictGetOrDefault test_01037.dict_array (2,4.1) www 1234 -dictGetOrDefault test_01037.dict_array (3,3) House 523 -dictGetOrDefault test_01037.dict_array (4,4) House 523 -dictGetOrDefault test_01037.dict_array (5,6) www 1234 -dictGetOrDefault test_01037.dict_array (7.01,7.01) www 1234 -dictGetOrDefault test_01037.dict_array (-100,-42) dd 44 -dictGetOrDefault test_01037.dict_array (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_array (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_array (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_array (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_array (0,2) Click North 422 -dictGetOrDefault test_01037.dict_array (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_array (1,0) Click East 421 -dictGetOrDefault test_01037.dict_array (2,4) House 523 -dictGetOrDefault test_01037.dict_array (2,4.1) gac 803 -dictGetOrDefault test_01037.dict_array (3,3) House 523 -dictGetOrDefault test_01037.dict_array (4,4) House 523 -dictGetOrDefault test_01037.dict_array (5,6) cc 33 -dictGetOrDefault test_01037.dict_array (7.01,7.01) ee 55 -dictGet test_01037.dict_tuple (-100,-42) qqq 101 -dictGet test_01037.dict_tuple (-1,0) Click South 423 -dictGet test_01037.dict_tuple (-0.1,0) Click South 423 -dictGet test_01037.dict_tuple (0,-2) Click West 424 -dictGet test_01037.dict_tuple (0,-1.1) Click West 424 -dictGet test_01037.dict_tuple (0,1.1) Click North 422 -dictGet test_01037.dict_tuple (0,2) Click North 422 -dictGet test_01037.dict_tuple (0.1,0) Click East 421 -dictGet test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGet test_01037.dict_tuple (1,0) Click East 421 -dictGet test_01037.dict_tuple (2,4) House 523 -dictGet test_01037.dict_tuple (2,4.1) qqq 101 -dictGet test_01037.dict_tuple (3,3) House 523 -dictGet test_01037.dict_tuple (4,4) House 523 -dictGet test_01037.dict_tuple (5,6) qqq 101 -dictGet test_01037.dict_tuple (7.01,7.01) qqq 101 -dictGetOrDefault test_01037.dict_tuple (-100,-42) www 1234 -dictGetOrDefault test_01037.dict_tuple (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0,2) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_tuple (1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (2,4) House 523 -dictGetOrDefault test_01037.dict_tuple (2,4.1) www 1234 -dictGetOrDefault test_01037.dict_tuple (3,3) House 523 -dictGetOrDefault test_01037.dict_tuple (4,4) House 523 -dictGetOrDefault test_01037.dict_tuple (5,6) www 1234 -dictGetOrDefault test_01037.dict_tuple (7.01,7.01) www 1234 -dictGetOrDefault test_01037.dict_tuple (-100,-42) dd 44 -dictGetOrDefault test_01037.dict_tuple (-1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (-0.1,0) Click South 423 -dictGetOrDefault test_01037.dict_tuple (0,-2) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,-1.1) Click West 424 -dictGetOrDefault test_01037.dict_tuple (0,1.1) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0,2) Click North 422 -dictGetOrDefault test_01037.dict_tuple (0.1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (0.99,2.99) Click North 422 -dictGetOrDefault test_01037.dict_tuple (1,0) Click East 421 -dictGetOrDefault test_01037.dict_tuple (2,4) House 523 -dictGetOrDefault test_01037.dict_tuple (2,4.1) gac 803 -dictGetOrDefault test_01037.dict_tuple (3,3) House 523 -dictGetOrDefault test_01037.dict_tuple (4,4) House 523 -dictGetOrDefault test_01037.dict_tuple (5,6) cc 33 -dictGetOrDefault test_01037.dict_tuple (7.01,7.01) ee 55 -dictHas test_01037.dict_array (-100,-42) 0 -dictHas test_01037.dict_array (-1,0) 1 -dictHas test_01037.dict_array (-0.1,0) 1 -dictHas test_01037.dict_array (0,-2) 1 -dictHas test_01037.dict_array (0,-1.1) 1 -dictHas test_01037.dict_array (0,-1) 1 -dictHas test_01037.dict_array (0,0) 1 -dictHas test_01037.dict_array (0,1) 1 -dictHas test_01037.dict_array (0,1.1) 1 -dictHas test_01037.dict_array (0,2) 1 -dictHas test_01037.dict_array (0.1,0) 1 -dictHas test_01037.dict_array (0.99,2.99) 1 -dictHas test_01037.dict_array (1,0) 1 -dictHas test_01037.dict_array (1,1) 1 -dictHas test_01037.dict_array (1,3) 1 -dictHas test_01037.dict_array (2,4) 1 -dictHas test_01037.dict_array (2,4.1) 0 -dictHas test_01037.dict_array (3,3) 1 -dictHas test_01037.dict_array (4,4) 1 -dictHas test_01037.dict_array (5,1) 1 -dictHas test_01037.dict_array (5,5) 1 -dictHas test_01037.dict_array (5,6) 0 -dictHas test_01037.dict_array (7.01,7.01) 0 -dictHas test_01037.dict_tuple (-100,-42) 0 -dictHas test_01037.dict_tuple (-1,0) 1 -dictHas test_01037.dict_tuple (-0.1,0) 1 -dictHas test_01037.dict_tuple (0,-2) 1 -dictHas test_01037.dict_tuple (0,-1.1) 1 -dictHas test_01037.dict_tuple (0,-1) 1 -dictHas test_01037.dict_tuple (0,0) 1 -dictHas test_01037.dict_tuple (0,1) 1 -dictHas test_01037.dict_tuple (0,1.1) 1 -dictHas test_01037.dict_tuple (0,2) 1 -dictHas test_01037.dict_tuple (0.1,0) 1 -dictHas test_01037.dict_tuple (0.99,2.99) 1 -dictHas test_01037.dict_tuple (1,0) 1 -dictHas test_01037.dict_tuple (1,1) 1 -dictHas test_01037.dict_tuple (1,3) 1 -dictHas test_01037.dict_tuple (2,4) 1 -dictHas test_01037.dict_tuple (2,4.1) 0 -dictHas test_01037.dict_tuple (3,3) 1 -dictHas test_01037.dict_tuple (4,4) 1 -dictHas test_01037.dict_tuple (5,1) 1 -dictHas test_01037.dict_tuple (5,5) 1 -dictHas test_01037.dict_tuple (5,6) 0 -dictHas test_01037.dict_tuple (7.01,7.01) 0 diff --git a/tests/queries/0_stateless/01037_polygon_dict_simple_polygons.sql b/tests/queries/0_stateless/01037_polygon_dict_simple_polygons.sql deleted file mode 100644 index 56e5865a5a1..00000000000 --- a/tests/queries/0_stateless/01037_polygon_dict_simple_polygons.sql +++ /dev/null @@ -1,108 +0,0 @@ -SET send_logs_level = 'none'; - -DROP DATABASE IF EXISTS test_01037; - -CREATE DATABASE test_01037 Engine = Ordinary; - -DROP DICTIONARY IF EXISTS test_01037.dict_array; -DROP TABLE IF EXISTS test_01037.polygons_array; - -CREATE TABLE test_01037.polygons_array (key Array(Array(Float64)), name String, value UInt64) ENGINE = Memory; -INSERT INTO test_01037.polygons_array VALUES ([[3, 1], [0, 1], [0, -1], [3, -1]], 'Click East', 421); -INSERT INTO test_01037.polygons_array VALUES ([[-1, 1], [1, 1], [1, 3], [-1, 3]], 'Click North', 422); -INSERT INTO test_01037.polygons_array VALUES ([[-3, 1], [-3, -1], [0, -1], [0, 1]], 'Click South', 423); -INSERT INTO test_01037.polygons_array VALUES ([[-1, -1], [1, -1], [1, -3], [-1, -3]], 'Click West', 424); -INSERT INTO test_01037.polygons_array VALUES ([[1, 1], [1, 3], [3, 5], [5, 5], [5, 1]], 'House', 523); - -CREATE DICTIONARY test_01037.dict_array -( - key Array(Array(Float64)), - name String DEFAULT 'qqq', - value UInt64 DEFAULT 101 -) -PRIMARY KEY key -SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_array' PASSWORD '' DB 'test_01037')) -LIFETIME(MIN 1 MAX 10) -LAYOUT(POLYGON()); - -DROP DICTIONARY IF EXISTS test_01037.dict_tuple; -DROP TABLE IF EXISTS test_01037.polygons_tuple; - -CREATE TABLE test_01037.polygons_tuple (key Array(Tuple(Float64, Float64)), name String, value UInt64) ENGINE = Memory; -INSERT INTO test_01037.polygons_tuple VALUES ([(3.0, 1.0), (0.0, 1.0), (0.0, -1.0), (3.0, -1.0)], 'Click East', 421); -INSERT INTO test_01037.polygons_tuple VALUES ([(-1, 1), (1, 1), (1, 3), (-1, 3)], 'Click North', 422); -INSERT INTO test_01037.polygons_tuple VALUES ([(-3, 1), (-3, -1), (0, -1), (0, 1)], 'Click South', 423); -INSERT INTO test_01037.polygons_tuple VALUES ([(-1, -1), (1, -1), (1, -3), (-1, -3)], 'Click West', 424); -INSERT INTO test_01037.polygons_tuple VALUES ([(1, 1), (1, 3), (3, 5), (5, 5), (5, 1)], 'House', 523); - -CREATE DICTIONARY test_01037.dict_tuple -( - key Array(Tuple(Float64, Float64)), - name String DEFAULT 'qqq', - value UInt64 DEFAULT 101 -) -PRIMARY KEY key -SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_tuple' PASSWORD '' DB 'test_01037')) -LIFETIME(MIN 1 MAX 10) -LAYOUT(POLYGON()); - -DROP TABLE IF EXISTS test_01037.points; - -CREATE TABLE test_01037.points (x Float64, y Float64, def_i UInt64, def_s String) ENGINE = Memory; -INSERT INTO test_01037.points VALUES (0.1, 0.0, 112, 'aax'); -INSERT INTO test_01037.points VALUES (-0.1, 0.0, 113, 'aay'); -INSERT INTO test_01037.points VALUES (0.0, 1.1, 114, 'aaz'); -INSERT INTO test_01037.points VALUES (0.0, -1.1, 115, 'aat'); -INSERT INTO test_01037.points VALUES (3.0, 3.0, 22, 'bb'); -INSERT INTO test_01037.points VALUES (5.0, 6.0, 33, 'cc'); -INSERT INTO test_01037.points VALUES (-100.0, -42.0, 44, 'dd'); -INSERT INTO test_01037.points VALUES (7.01, 7.01, 55, 'ee') -INSERT INTO test_01037.points VALUES (0.99, 2.99, 66, 'ee'); -INSERT INTO test_01037.points VALUES (1.0, 0.0, 771, 'ffa'); -INSERT INTO test_01037.points VALUES (-1.0, 0.0, 772, 'ffb'); -INSERT INTO test_01037.points VALUES (0.0, 2.0, 773, 'ffc'); -INSERT INTO test_01037.points VALUES (0.0, -2.0, 774, 'ffd'); -INSERT INTO test_01037.points VALUES (2.0, 4.0, 801, 'gaa') -INSERT INTO test_01037.points VALUES (4.0, 4.0, 802, 'gab') -INSERT INTO test_01037.points VALUES (2.0, 4.1, 803, 'gac') - -select 'dictGet', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGet(dict_name, 'name', key), - dictGet(dict_name, 'value', key) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, 'www'), - dictGetOrDefault(dict_name, 'value', key, toUInt64(1234)) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, def_s), - dictGetOrDefault(dict_name, 'value', key, def_i) from test_01037.points order by x, y; - -select 'dictGet', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGet(dict_name, 'name', key), - dictGet(dict_name, 'value', key) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, 'www'), - dictGetOrDefault(dict_name, 'value', key, toUInt64(1234)) from test_01037.points order by x, y; -select 'dictGetOrDefault', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictGetOrDefault(dict_name, 'name', key, def_s), - dictGetOrDefault(dict_name, 'value', key, def_i) from test_01037.points order by x, y; - -INSERT INTO test_01037.points VALUES (5.0, 5.0, 0, ''); -INSERT INTO test_01037.points VALUES (5.0, 1.0, 0, ''); -INSERT INTO test_01037.points VALUES (1.0, 3.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, 0.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, 1.0, 0, ''); -INSERT INTO test_01037.points VALUES (0.0, -1.0, 0, ''); -INSERT INTO test_01037.points VALUES (1.0, 1.0, 0, ''); - -select 'dictHas', 'test_01037.dict_array' as dict_name, tuple(x, y) as key, - dictHas(dict_name, key) from test_01037.points order by x, y; - -select 'dictHas', 'test_01037.dict_tuple' as dict_name, tuple(x, y) as key, - dictHas(dict_name, key) from test_01037.points order by x, y; - -DROP DICTIONARY test_01037.dict_array; -DROP DICTIONARY test_01037.dict_tuple; -DROP TABLE test_01037.polygons_array; -DROP TABLE test_01037.polygons_tuple; -DROP TABLE test_01037.points; -DROP DATABASE test_01037; diff --git a/tests/queries/0_stateless/01037_polygon_search_test.ans b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.ans similarity index 100% rename from tests/queries/0_stateless/01037_polygon_search_test.ans rename to tests/queries/0_stateless/01037_polygon_dicts_correctness_all.ans diff --git a/tests/queries/0_stateless/01037_polygon_perf_test.reference b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.reference similarity index 100% rename from tests/queries/0_stateless/01037_polygon_perf_test.reference rename to tests/queries/0_stateless/01037_polygon_dicts_correctness_all.reference diff --git a/tests/queries/0_stateless/01037_polygon_search_test.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh similarity index 95% rename from tests/queries/0_stateless/01037_polygon_search_test.sh rename to tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh index 2b6350f2825..afe119e43df 100755 --- a/tests/queries/0_stateless/01037_polygon_search_test.sh +++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh @@ -50,7 +50,7 @@ do ) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_array' PASSWORD '' DB 'test_01037')) - LIFETIME(MIN 1 MAX 10) + LIFETIME(0) LAYOUT($type());" outputFile="${TMP_DIR}/results${type}.out" @@ -60,7 +60,7 @@ do dictGet(dict_name, 'value', key) from test_01037.points order by x, y; " > $outputFile - diff -q "${CURDIR}/01037_polygon_search_test.ans" "$outputFile" + diff -q "${CURDIR}/01037_polygon_dicts_correctness_all.ans" "$outputFile" $CLICKHOUSE_CLIENT --query="DROP DICTIONARY test_01037.dict_array;" done diff --git a/tests/queries/0_stateless/01037_polygon_perf_test.ans b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.ans similarity index 100% rename from tests/queries/0_stateless/01037_polygon_perf_test.ans rename to tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.ans diff --git a/tests/queries/0_stateless/01037_polygon_search_test.reference b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.reference similarity index 100% rename from tests/queries/0_stateless/01037_polygon_search_test.reference rename to tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.reference diff --git a/tests/queries/0_stateless/01037_polygon_perf_test.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh similarity index 95% rename from tests/queries/0_stateless/01037_polygon_perf_test.sh rename to tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh index 895a2669c52..ba06d14daff 100755 --- a/tests/queries/0_stateless/01037_polygon_perf_test.sh +++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh @@ -50,7 +50,7 @@ do ) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_array' PASSWORD '' DB 'test_01037')) - LIFETIME(MIN 1 MAX 10) + LIFETIME(0) LAYOUT($type());" outputFile="${TMP_DIR}/results${type}.out" @@ -60,7 +60,7 @@ do dictGet(dict_name, 'value', key) from test_01037.points order by x, y; " > $outputFile - diff -q "${CURDIR}/01037_polygon_perf_test.ans" "$outputFile" + diff -q "${CURDIR}/01037_polygon_dicts_correctness_fast.ans" "$outputFile" $CLICKHOUSE_CLIENT --query="DROP DICTIONARY test_01037.dict_array;" done diff --git a/tests/queries/0_stateless/01037_polygon_simple_test.ans b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.ans similarity index 100% rename from tests/queries/0_stateless/01037_polygon_simple_test.ans rename to tests/queries/0_stateless/01037_polygon_dicts_simple_functions.ans diff --git a/tests/queries/0_stateless/01037_polygon_simple_test.reference b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.reference similarity index 100% rename from tests/queries/0_stateless/01037_polygon_simple_test.reference rename to tests/queries/0_stateless/01037_polygon_dicts_simple_functions.reference diff --git a/tests/queries/0_stateless/01037_polygon_simple_test.sh b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh similarity index 98% rename from tests/queries/0_stateless/01037_polygon_simple_test.sh rename to tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh index 8b3b2772226..576b7c974f7 100755 --- a/tests/queries/0_stateless/01037_polygon_simple_test.sh +++ b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh @@ -62,7 +62,7 @@ do ) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_array' PASSWORD '' DB 'test_01037')) - LIFETIME(MIN 1 MAX 10) + LIFETIME(0) LAYOUT($type()); " @@ -77,7 +77,7 @@ do ) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'polygons_tuple' PASSWORD '' DB 'test_01037')) - LIFETIME(MIN 1 MAX 10) + LIFETIME(0) LAYOUT($type()); " @@ -124,7 +124,7 @@ do dictHas(dict_name, key) from test_01037.points order by x, y; " >> $outputFile - diff -q "${CURDIR}/01037_polygon_simple_test.ans" "$outputFile" + diff -q "${CURDIR}/01037_polygon_dicts_simple_functions.ans" "$outputFile" done $CLICKHOUSE_CLIENT --query="DROP DICTIONARY test_01037.dict_array;"