diff --git a/dbms/tests/integration/test_filesystem_layout/test.py b/dbms/tests/integration/test_filesystem_layout/test.py index c8cbbcef793..16d63cbf2b7 100644 --- a/dbms/tests/integration/test_filesystem_layout/test.py +++ b/dbms/tests/integration/test_filesystem_layout/test.py @@ -24,6 +24,5 @@ def test_file_path_escaping(started_cluster): node.query('''INSERT INTO test.`T.a_b,l-e!` VALUES (1);''') node.query('''ALTER TABLE test.`T.a_b,l-e!` FREEZE;''') - node.exec_in_container(["bash", "-c", "test -f /var/lib/clickhouse/data/test/T%2Ea_b%2Cl%2De%21/1_1_1_0_1/%7EId.bin"]) - node.exec_in_container(["bash", "-c", "test -f /var/lib/clickhouse/shadow/1/data/test/T%2Ea_b%2Cl%2De%21/1_1_1_0_1/%7EId.bin"]) - + node.exec_in_container(["bash", "-c", "test -f /var/lib/clickhouse/data/test/T%2Ea_b%2Cl%2De%21/1_1_1_0/%7EId.bin"]) + node.exec_in_container(["bash", "-c", "test -f /var/lib/clickhouse/shadow/1/data/test/T%2Ea_b%2Cl%2De%21/1_1_1_0/%7EId.bin"]) diff --git a/dbms/tests/integration/test_insert_into_distributed/test.py b/dbms/tests/integration/test_insert_into_distributed/test.py index 3b0cec21a34..8d656cef3ea 100644 --- a/dbms/tests/integration/test_insert_into_distributed/test.py +++ b/dbms/tests/integration/test_insert_into_distributed/test.py @@ -146,11 +146,11 @@ def test_inserts_batching(started_cluster): # 4. Full batch of inserts after ALTER (that have different block structure). # 5. What was left to insert with the column structure before ALTER. expected = '''\ -20000101_20000101_1_1_0_1\t[1] -20000101_20000101_2_2_0_2\t[2,3,4] -20000101_20000101_3_3_0_3\t[5,6,7] -20000101_20000101_4_4_0_4\t[10,11,12] -20000101_20000101_5_5_0_5\t[8,9] +20000101_20000101_1_1_0\t[1] +20000101_20000101_2_2_0\t[2,3,4] +20000101_20000101_3_3_0\t[5,6,7] +20000101_20000101_4_4_0\t[10,11,12] +20000101_20000101_5_5_0\t[8,9] ''' assert TSV(result) == TSV(expected) diff --git a/dbms/tests/integration/test_partition/test.py b/dbms/tests/integration/test_partition/test.py index 41770ae9e23..659b9a89069 100644 --- a/dbms/tests/integration/test_partition/test.py +++ b/dbms/tests/integration/test_partition/test.py @@ -65,30 +65,30 @@ def partition_complex_assert_checksums(): " | sort" \ " | uniq" - checksums = "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition/19700102_2_2_0_2/k.bin\n" \ - "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition/19700201_1_1_0_1/v1.bin\n" \ - "13cae8e658e0ca4f75c56b1fc424e150\tshadow/1/data/test/partition/19700102_2_2_0_2/minmax_p.idx\n" \ - "25daad3d9e60b45043a70c4ab7d3b1c6\tshadow/1/data/test/partition/19700102_2_2_0_2/partition.dat\n" \ - "3726312af62aec86b64a7708d5751787\tshadow/1/data/test/partition/19700201_1_1_0_1/partition.dat\n" \ - "37855b06a39b79a67ea4e86e4a3299aa\tshadow/1/data/test/partition/19700102_2_2_0_2/checksums.txt\n" \ - "38e62ff37e1e5064e9a3f605dfe09d13\tshadow/1/data/test/partition/19700102_2_2_0_2/v1.bin\n" \ - "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700102_2_2_0_2/k.mrk\n" \ - "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700102_2_2_0_2/p.mrk\n" \ - "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700102_2_2_0_2/v1.mrk\n" \ - "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700201_1_1_0_1/k.mrk\n" \ - "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700201_1_1_0_1/p.mrk\n" \ - "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700201_1_1_0_1/v1.mrk\n" \ - "55a54008ad1ba589aa210d2629c1df41\tshadow/1/data/test/partition/19700201_1_1_0_1/primary.idx\n" \ - "5f087cb3e7071bf9407e095821e2af8f\tshadow/1/data/test/partition/19700201_1_1_0_1/checksums.txt\n" \ - "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition/19700102_2_2_0_2/columns.txt\n" \ - "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition/19700201_1_1_0_1/columns.txt\n" \ - "88cdc31ded355e7572d68d8cde525d3a\tshadow/1/data/test/partition/19700201_1_1_0_1/p.bin\n" \ - "9e688c58a5487b8eaf69c9e1005ad0bf\tshadow/1/data/test/partition/19700102_2_2_0_2/primary.idx\n" \ - "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition/19700102_2_2_0_2/count.txt\n" \ - "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition/19700201_1_1_0_1/count.txt\n" \ - "cfcb770c3ecd0990dcceb1bde129e6c6\tshadow/1/data/test/partition/19700102_2_2_0_2/p.bin\n" \ - "e2af3bef1fd129aea73a890ede1e7a30\tshadow/1/data/test/partition/19700201_1_1_0_1/k.bin\n" \ - "f2312862cc01adf34a93151377be2ddf\tshadow/1/data/test/partition/19700201_1_1_0_1/minmax_p.idx\n" + checksums = "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition/19700102_2_2_0/k.bin\n" \ + "082814b5aa5109160d5c0c5aff10d4df\tshadow/1/data/test/partition/19700201_1_1_0/v1.bin\n" \ + "13cae8e658e0ca4f75c56b1fc424e150\tshadow/1/data/test/partition/19700102_2_2_0/minmax_p.idx\n" \ + "25daad3d9e60b45043a70c4ab7d3b1c6\tshadow/1/data/test/partition/19700102_2_2_0/partition.dat\n" \ + "3726312af62aec86b64a7708d5751787\tshadow/1/data/test/partition/19700201_1_1_0/partition.dat\n" \ + "37855b06a39b79a67ea4e86e4a3299aa\tshadow/1/data/test/partition/19700102_2_2_0/checksums.txt\n" \ + "38e62ff37e1e5064e9a3f605dfe09d13\tshadow/1/data/test/partition/19700102_2_2_0/v1.bin\n" \ + "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700102_2_2_0/k.mrk\n" \ + "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700102_2_2_0/p.mrk\n" \ + "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700102_2_2_0/v1.mrk\n" \ + "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700201_1_1_0/k.mrk\n" \ + "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700201_1_1_0/p.mrk\n" \ + "4ae71336e44bf9bf79d2752e234818a5\tshadow/1/data/test/partition/19700201_1_1_0/v1.mrk\n" \ + "55a54008ad1ba589aa210d2629c1df41\tshadow/1/data/test/partition/19700201_1_1_0/primary.idx\n" \ + "5f087cb3e7071bf9407e095821e2af8f\tshadow/1/data/test/partition/19700201_1_1_0/checksums.txt\n" \ + "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition/19700102_2_2_0/columns.txt\n" \ + "77d5af402ada101574f4da114f242e02\tshadow/1/data/test/partition/19700201_1_1_0/columns.txt\n" \ + "88cdc31ded355e7572d68d8cde525d3a\tshadow/1/data/test/partition/19700201_1_1_0/p.bin\n" \ + "9e688c58a5487b8eaf69c9e1005ad0bf\tshadow/1/data/test/partition/19700102_2_2_0/primary.idx\n" \ + "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition/19700102_2_2_0/count.txt\n" \ + "c4ca4238a0b923820dcc509a6f75849b\tshadow/1/data/test/partition/19700201_1_1_0/count.txt\n" \ + "cfcb770c3ecd0990dcceb1bde129e6c6\tshadow/1/data/test/partition/19700102_2_2_0/p.bin\n" \ + "e2af3bef1fd129aea73a890ede1e7a30\tshadow/1/data/test/partition/19700201_1_1_0/k.bin\n" \ + "f2312862cc01adf34a93151377be2ddf\tshadow/1/data/test/partition/19700201_1_1_0/minmax_p.idx\n" assert TSV(exec_bash(cmd).replace(' ', '\t')) == TSV(checksums) @@ -149,7 +149,7 @@ def test_cannot_attach_active_part(cannot_attach_active_part_table): assert 0 <= error.find('Invalid part name') res = q("SElECT name FROM system.parts WHERE table='attach_active' AND database='test' ORDER BY name") - assert TSV(res) == TSV('0_1_1_0_1\n1_2_2_0_2\n2_3_3_0_3\n3_4_4_0_4') + assert TSV(res) == TSV('0_1_1_0\n1_2_2_0\n2_3_3_0\n3_4_4_0') assert TSV(q("SElECT count(), sum(n) FROM test.attach_active")) == TSV('16\t120') @@ -171,30 +171,30 @@ def test_attach_check_all_parts(attach_check_all_parts_table): q("ALTER TABLE test.attach_partition DETACH PARTITION 0") path_to_detached = path_to_data + 'data/test/attach_partition/detached/' - exec_bash('mkdir {}'.format(path_to_detached + '0_5_5_0_5')) - exec_bash('cp -pr {} {}'.format(path_to_detached + '0_1_1_0_1', path_to_detached + 'attaching_0_6_6_0_6')) - exec_bash('cp -pr {} {}'.format(path_to_detached + '0_3_3_0_3', path_to_detached + 'deleting_0_7_7_0_7')) + exec_bash('mkdir {}'.format(path_to_detached + '0_5_5_0')) + exec_bash('cp -pr {} {}'.format(path_to_detached + '0_1_1_0', path_to_detached + 'attaching_0_6_6_0')) + exec_bash('cp -pr {} {}'.format(path_to_detached + '0_3_3_0', path_to_detached + 'deleting_0_7_7_0')) error = instance.client.query_and_get_error("ALTER TABLE test.attach_partition ATTACH PARTITION 0") assert 0 <= error.find('No columns in part 0_5_5_0') parts = q("SElECT name FROM system.parts WHERE table='attach_partition' AND database='test' ORDER BY name") - assert TSV(parts) == TSV('1_2_2_0_2\n1_4_4_0_4') + assert TSV(parts) == TSV('1_2_2_0\n1_4_4_0') detached = q("SELECT name FROM system.detached_parts " "WHERE table='attach_partition' AND database='test' ORDER BY name") - assert TSV(detached) == TSV('0_1_1_0_1\n0_3_3_0_3\n0_5_5_0_5\nattaching_0_6_6_0_6\ndeleting_0_7_7_0_7') + assert TSV(detached) == TSV('0_1_1_0\n0_3_3_0\n0_5_5_0\nattaching_0_6_6_0\ndeleting_0_7_7_0') - exec_bash('rm -r {}'.format(path_to_detached + '0_5_5_0_5')) + exec_bash('rm -r {}'.format(path_to_detached + '0_5_5_0')) q("ALTER TABLE test.attach_partition ATTACH PARTITION 0") parts = q("SElECT name FROM system.parts WHERE table='attach_partition' AND database='test' ORDER BY name") - expected = '0_5_5_0_5\n0_6_6_0_6\n1_2_2_0_2\n1_4_4_0_4' + expected = '0_5_5_0\n0_6_6_0\n1_2_2_0\n1_4_4_0' assert TSV(parts) == TSV(expected) assert TSV(q("SElECT count(), sum(n) FROM test.attach_partition")) == TSV('16\t120') detached = q("SELECT name FROM system.detached_parts " "WHERE table='attach_partition' AND database='test' ORDER BY name") - assert TSV(detached) == TSV('attaching_0_6_6_0_6\ndeleting_0_7_7_0_7') + assert TSV(detached) == TSV('attaching_0_6_6_0\ndeleting_0_7_7_0') @pytest.fixture @@ -217,28 +217,27 @@ def test_drop_detached_parts(drop_detached_parts_table): q("ALTER TABLE test.drop_detached DETACH PARTITION 1") path_to_detached = path_to_data + 'data/test/drop_detached/detached/' - exec_bash('mkdir {}'.format(path_to_detached + 'attaching_0_6_6_0_6')) - exec_bash('mkdir {}'.format(path_to_detached + 'deleting_0_7_7_0_7')) + exec_bash('mkdir {}'.format(path_to_detached + 'attaching_0_6_6_0')) + exec_bash('mkdir {}'.format(path_to_detached + 'deleting_0_7_7_0')) exec_bash('mkdir {}'.format(path_to_detached + 'any_other_name')) - exec_bash('mkdir {}'.format(path_to_detached + 'prefix_1_2_2_0_2')) + exec_bash('mkdir {}'.format(path_to_detached + 'prefix_1_2_2_0_0')) - error = instance.client.query_and_get_error("ALTER TABLE test.drop_detached DROP DETACHED PART '../1_2_2_0_2'", settings=s) + error = instance.client.query_and_get_error("ALTER TABLE test.drop_detached DROP DETACHED PART '../1_2_2_0'", settings=s) assert 0 <= error.find('Invalid part name') - q("ALTER TABLE test.drop_detached DROP DETACHED PART '0_1_1_0_1'", settings=s) + q("ALTER TABLE test.drop_detached DROP DETACHED PART '0_1_1_0'", settings=s) - error = instance.client.query_and_get_error("ALTER TABLE test.drop_detached DROP DETACHED PART 'attaching_0_6_6_0_6'", settings=s) + error = instance.client.query_and_get_error("ALTER TABLE test.drop_detached DROP DETACHED PART 'attaching_0_6_6_0'", settings=s) assert 0 <= error.find('Cannot drop part') - error = instance.client.query_and_get_error("ALTER TABLE test.drop_detached DROP DETACHED PART 'deleting_0_7_7_0_7'", settings=s) + error = instance.client.query_and_get_error("ALTER TABLE test.drop_detached DROP DETACHED PART 'deleting_0_7_7_0'", settings=s) assert 0 <= error.find('Cannot drop part') q("ALTER TABLE test.drop_detached DROP DETACHED PART 'any_other_name'", settings=s) detached = q("SElECT name FROM system.detached_parts WHERE table='drop_detached' AND database='test' ORDER BY name") - assert TSV(detached) == TSV('0_3_3_0_3\n1_2_2_0_2\n1_4_4_0_4\nattaching_0_6_6_0_6\ndeleting_0_7_7_0_7\nprefix_1_2_2_0_2') + assert TSV(detached) == TSV('0_3_3_0\n1_2_2_0\n1_4_4_0\nattaching_0_6_6_0\ndeleting_0_7_7_0\nprefix_1_2_2_0_0') q("ALTER TABLE test.drop_detached DROP DETACHED PARTITION 1", settings=s) detached = q("SElECT name FROM system.detached_parts WHERE table='drop_detached' AND database='test' ORDER BY name") - assert TSV(detached) == TSV('0_3_3_0_3\nattaching_0_6_6_0_6\ndeleting_0_7_7_0_7') - + assert TSV(detached) == TSV('0_3_3_0\nattaching_0_6_6_0\ndeleting_0_7_7_0') diff --git a/dbms/tests/queries/0_stateless/00502_custom_partitioning_local.reference b/dbms/tests/queries/0_stateless/00502_custom_partitioning_local.reference index dd15d95cc8c..7b14a2d4edc 100644 --- a/dbms/tests/queries/0_stateless/00502_custom_partitioning_local.reference +++ b/dbms/tests/queries/0_stateless/00502_custom_partitioning_local.reference @@ -1,60 +1,60 @@ *** Not partitioned *** Parts before OPTIMIZE: -tuple() all_1_1_0_1 -tuple() all_2_2_0_2 +tuple() all_1_1_0 +tuple() all_2_2_0 Parts after OPTIMIZE: -tuple() all_1_2_1_2 +tuple() all_1_2_1 Sum before DETACH PARTITION: 15 Sum after DETACH PARTITION: 0 system.detached_parts after DETACH PARTITION: -default not_partitioned all all_1_2_1_2 default 1 2 1 +default not_partitioned all all_1_2_1 default 1 2 1 *** Partitioned by week *** Parts before OPTIMIZE: -1999-12-27 19991227_1_1_0_1 -2000-01-03 20000103_2_2_0_2 -2000-01-03 20000103_3_3_0_3 +1999-12-27 19991227_1_1_0 +2000-01-03 20000103_2_2_0 +2000-01-03 20000103_3_3_0 Parts after OPTIMIZE: -1999-12-27 19991227_1_1_0_1 -2000-01-03 20000103_2_3_1_3 +1999-12-27 19991227_1_1_0 +2000-01-03 20000103_2_3_1 Sum before DROP PARTITION: 15 Sum after DROP PARTITION: 12 *** Partitioned by a (Date, UInt8) tuple *** Parts before OPTIMIZE: -(\'2000-01-01\',1) 20000101-1_1_1_0_1 -(\'2000-01-01\',1) 20000101-1_5_5_0_5 -(\'2000-01-01\',2) 20000101-2_2_2_0_2 -(\'2000-01-02\',1) 20000102-1_3_3_0_3 -(\'2000-01-02\',1) 20000102-1_4_4_0_4 +(\'2000-01-01\',1) 20000101-1_1_1_0 +(\'2000-01-01\',1) 20000101-1_5_5_0 +(\'2000-01-01\',2) 20000101-2_2_2_0 +(\'2000-01-02\',1) 20000102-1_3_3_0 +(\'2000-01-02\',1) 20000102-1_4_4_0 Parts after OPTIMIZE: -(\'2000-01-01\',1) 20000101-1_1_5_1_5 -(\'2000-01-01\',2) 20000101-2_2_2_0_2 -(\'2000-01-02\',1) 20000102-1_3_4_1_4 +(\'2000-01-01\',1) 20000101-1_1_5_1 +(\'2000-01-01\',2) 20000101-2_2_2_0 +(\'2000-01-02\',1) 20000102-1_3_4_1 Sum before DETACH PARTITION: 15 Sum after DETACH PARTITION: 9 *** Partitioned by String *** Parts before OPTIMIZE: -bbb 7d878f3d88441d2b3dc371e2a3050f6d_2_2_0_2 -bbb 7d878f3d88441d2b3dc371e2a3050f6d_3_3_0_3 -aaa 9b50856126a8a6064f11f027d455bf58_1_1_0_1 -aaa 9b50856126a8a6064f11f027d455bf58_4_4_0_4 +bbb 7d878f3d88441d2b3dc371e2a3050f6d_2_2_0 +bbb 7d878f3d88441d2b3dc371e2a3050f6d_3_3_0 +aaa 9b50856126a8a6064f11f027d455bf58_1_1_0 +aaa 9b50856126a8a6064f11f027d455bf58_4_4_0 Parts after OPTIMIZE: -bbb 7d878f3d88441d2b3dc371e2a3050f6d_2_2_0_2 -bbb 7d878f3d88441d2b3dc371e2a3050f6d_3_3_0_3 -aaa 9b50856126a8a6064f11f027d455bf58_1_4_1_4 +bbb 7d878f3d88441d2b3dc371e2a3050f6d_2_2_0 +bbb 7d878f3d88441d2b3dc371e2a3050f6d_3_3_0 +aaa 9b50856126a8a6064f11f027d455bf58_1_4_1 Sum before DROP PARTITION: 15 Sum after DROP PARTITION: 8 *** Table without columns with fixed size *** Parts: -1 1_1_1_0_1 2 -2 2_2_2_0_2 2 +1 1_1_1_0 2 +2 2_2_2_0 2 Before DROP PARTITION: a aa diff --git a/dbms/tests/queries/0_stateless/00834_kill_mutation.sh b/dbms/tests/queries/0_stateless/00834_kill_mutation.sh index 88d5ce1c2fd..03369dbff7a 100755 --- a/dbms/tests/queries/0_stateless/00834_kill_mutation.sh +++ b/dbms/tests/queries/0_stateless/00834_kill_mutation.sh @@ -17,7 +17,7 @@ ${CLICKHOUSE_CLIENT} --query="SELECT '*** Create and kill a single invalid mutat ${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE toUInt32(s) = 1" sleep 0.1 -${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, latest_failed_part IN ('20000101_1_1_0_1', '20010101_2_2_0_2'), latest_fail_time != 0, substr(latest_fail_reason, 1, 8) FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation'" +${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, latest_failed_part IN ('20000101_1_1_0', '20010101_2_2_0'), latest_fail_time != 0, substr(latest_fail_reason, 1, 8) FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation'" ${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation'" @@ -29,7 +29,7 @@ ${CLICKHOUSE_CLIENT} --query="SELECT '*** Create and kill invalid mutation that ${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE toUInt32(s) = 1" ${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE x = 1" -${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, latest_failed_part IN ('20000101_1_1_0_1', '20010101_2_2_0_2'), latest_fail_time != 0, substr(latest_fail_reason, 1, 8) FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation' AND mutation_id = 'mutation_4.txt'" +${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, latest_failed_part IN ('20000101_1_1_0', '20010101_2_2_0'), latest_fail_time != 0, substr(latest_fail_reason, 1, 8) FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation' AND mutation_id = 'mutation_4.txt'" sleep 0.1 ${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation' AND mutation_id = 'mutation_4.txt'" diff --git a/dbms/tests/queries/0_stateless/00952_part_frozen_info.reference b/dbms/tests/queries/0_stateless/00952_part_frozen_info.reference index 319ebcb4df2..99b7e2d3fbf 100644 --- a/dbms/tests/queries/0_stateless/00952_part_frozen_info.reference +++ b/dbms/tests/queries/0_stateless/00952_part_frozen_info.reference @@ -1,19 +1,19 @@ -19701001_1_1_0_1 0 -19701002_2_2_0_2 0 -19701003_3_3_0_3 0 +19701001_1_1_0 0 +19701002_2_2_0 0 +19701003_3_3_0 0 freeze one -19701001_1_1_0_1 0 -19701002_2_2_0_2 1 -19701003_3_3_0_3 0 +19701001_1_1_0 0 +19701002_2_2_0 1 +19701003_3_3_0 0 freeze all -19701001_1_1_0_1 1 -19701002_2_2_0_2 1 -19701003_3_3_0_3 1 +19701001_1_1_0 1 +19701002_2_2_0 1 +19701003_3_3_0 1 1970-10-01 00:00:01 1970-10-02 00:00:01 1970-10-02 00:00:02 1970-10-03 00:00:01 -19701001_1_1_0_1 1 -19701002_2_2_0_2 1 -19701002_4_4_0_4 0 -19701003_3_3_0_3 1 +19701001_1_1_0 1 +19701002_2_2_0 1 +19701002_4_4_0 0 +19701003_3_3_0 1 diff --git a/dbms/tests/queries/0_stateless/00961_check_table.reference b/dbms/tests/queries/0_stateless/00961_check_table.reference index ed7c96970ee..d85c66db622 100644 --- a/dbms/tests/queries/0_stateless/00961_check_table.reference +++ b/dbms/tests/queries/0_stateless/00961_check_table.reference @@ -1,11 +1,11 @@ -201901_1_1_0_1 1 +201901_1_1_0 1 ======== -201901_1_1_0_1 1 -201901_2_2_0_2 1 +201901_1_1_0 1 +201901_2_2_0 1 ======== -201901_1_2_1_2 1 +201901_1_2_1 1 ======== -201901_1_2_1_2 1 -201902_3_3_0_3 1 +201901_1_2_1 1 +201902_3_3_0 1 ======== -201902_3_4_1_4 1 +201902_3_4_1 1 diff --git a/dbms/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference b/dbms/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference index 80ffcf44704..282b0ddca7b 100644 --- a/dbms/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference +++ b/dbms/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference @@ -1 +1 @@ -20000101_20000101_1_1_0_1 test_00961 1c63ae7a38eb76e2a71c28aaf0b3ae4d 0053df9b467cc5483e752ec62e91cfd4 da96ff1e527a8a1f908ddf2b1d0af239 +20000101_20000101_1_1_0 test_00961 1c63ae7a38eb76e2a71c28aaf0b3ae4d 0053df9b467cc5483e752ec62e91cfd4 da96ff1e527a8a1f908ddf2b1d0af239 diff --git a/dbms/tests/queries/0_stateless/01015_attach_part.sql b/dbms/tests/queries/0_stateless/01015_attach_part.sql index 4b01a0fce8a..290b5eb967f 100644 --- a/dbms/tests/queries/0_stateless/01015_attach_part.sql +++ b/dbms/tests/queries/0_stateless/01015_attach_part.sql @@ -15,7 +15,7 @@ ALTER TABLE table_01 DETACH PARTITION ID '20191001'; SELECT COUNT() FROM table_01; -ALTER TABLE table_01 ATTACH PART '20191001_1_1_0_1'; +ALTER TABLE table_01 ATTACH PART '20191001_1_1_0'; SELECT COUNT() FROM table_01; diff --git a/dbms/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.reference b/dbms/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.reference index af4edac6667..c47539e2301 100644 --- a/dbms/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.reference +++ b/dbms/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.reference @@ -1,2 +1,2 @@ -all_1_1_0_1 1 +all_1_1_0 1 all_0_0_0 1 diff --git a/dbms/tests/queries/0_stateless/01042_check_query_and_last_granule_size.reference b/dbms/tests/queries/0_stateless/01042_check_query_and_last_granule_size.reference index 33914e15969..a4fac158712 100644 --- a/dbms/tests/queries/0_stateless/01042_check_query_and_last_granule_size.reference +++ b/dbms/tests/queries/0_stateless/01042_check_query_and_last_granule_size.reference @@ -1,7 +1,7 @@ -all_1_1_0_1 1 -all_1_1_0_1 1 -all_1_1_0_1 1 -all_1_1_0_1 1 -all_1_1_0_1 1 -all_2_2_0_2 1 -all_1_2_1_2 1 +all_1_1_0 1 +all_1_1_0 1 +all_1_1_0 1 +all_1_1_0 1 +all_1_1_0 1 +all_2_2_0 1 +all_1_2_1 1