thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve

Browse Source
This commit is contained in:
Yatsishin Ilya 2021-06-09 11:43:49 +03:00
parent 82b8d45cd7
commit df27e2754b
5 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/NuRaft vendored

@ -1 +1 @@
Subproject commit 2a1bf7d87b4a03561fc66fbb49cee8a288983c5d
Subproject commit 95d6bbba579b3a4e4c2dede954f541ff6f3dba51

2
contrib/cassandra vendored

@ -1 +1 @@
Subproject commit eb9b68dadbb4417a2c132ad4a1c2fa76e65e6fc1
Subproject commit c097fb5c7e63cc430016d9a8b240d8e63fbefa52

4
debian/changelog vendored
View File

@ -1,5 +1,5 @@
clickhouse (21.7.1.1) unstable; urgency=low
clickhouse (21.7.1+asan) unstable; urgency=low
* Modified source code
-- clickhouse-release <clickhouse-release@yandex-team.ru> Thu, 20 May 2021 22:23:29 +0300
-- <root@yandex-team.ru> Fri, 04 Jun 2021 07:31:14 +0000

14
tests/integration/test_cleanup_dir_after_bad_zk_conn/test.py
View File

@ -45,19 +45,19 @@ def test_cleanup_dir_after_bad_zk_conn(start_cluster):
"All connection tries failed while connecting to ZooKeeper" in error
error = node1.query_and_get_error(query_create)
assert "Directory for table data data/replica/test/ already exists" not in error
node1.query(query_create)
node1.query('''INSERT INTO replica.test VALUES (1, now())''')
node1.query_with_retry(query_create)
node1.query_with_retry('''INSERT INTO replica.test VALUES (1, now())''')
assert "1\n" in node1.query('''SELECT count() from replica.test FORMAT TSV''')
def test_cleanup_dir_after_wrong_replica_name(start_cluster):
node1.query(
"CREATE TABLE test2_r1 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test2/', 'r1') ORDER BY n")
node1.query_with_retry(
"CREATE TABLE IF NOT EXISTS test2_r1 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test2/', 'r1') ORDER BY n")
error = node1.query_and_get_error(
"CREATE TABLE test2_r2 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test2/', 'r1') ORDER BY n")
assert "already exists" in error
node1.query(
"CREATE TABLE test_r2 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test2/', 'r2') ORDER BY n")
node1.query_with_retry(
"CREATE TABLE IF NOT EXISTS test_r2 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test2/', 'r2') ORDER BY n")
def test_cleanup_dir_after_wrong_zk_path(start_cluster):
@ -71,7 +71,7 @@ def test_cleanup_dir_after_wrong_zk_path(start_cluster):
def test_attach_without_zk(start_cluster):
node1.query(
node1.query_with_retry(
"CREATE TABLE test4_r1 (n UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test4/', 'r1') ORDER BY n")
node1.query("DETACH TABLE test4_r1")
with PartitionManager() as pm:

27
tests/integration/test_partition/test.py
View File

@ -1,6 +1,6 @@
import pytest
from helpers.cluster import ClickHouseCluster
from helpers.cluster import ClickHouseCluster, subprocess_check_call
from helpers.test_tools import TSV
cluster = ClickHouseCluster(__file__)
@ -41,18 +41,13 @@ def test_partition_simple(partition_table_simple):
q("OPTIMIZE TABLE test.partition")
def exec_bash(cmd):
cmd = ["/bin/bash", "-c", cmd.replace('"', '\\"')]
return instance.exec_in_container(cmd)
def partition_complex_assert_columns_txt():
path_to_parts = path_to_data + 'data/test/partition/'
parts = TSV(q("SELECT name FROM system.parts WHERE database='test' AND table='partition'"))
for part_name in parts.lines:
path_to_columns = path_to_parts + part_name + '/columns.txt'
# 2 header lines + 3 columns
assert exec_bash('cat {} | wc -l'.format(path_to_columns)) == '5\n'
assert subprocess_check_call('cat {} | wc -l'.format(path_to_columns)) == '5\n'
def partition_complex_assert_checksums():
@ -91,7 +86,7 @@ def partition_complex_assert_checksums():
"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)
assert TSV(subprocess_check_call(cmd).replace(' ', '\t')) == TSV(checksums)
@pytest.fixture
@ -171,9 +166,9 @@ 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'))
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'))
subprocess_check_call('mkdir {}'.format(path_to_detached + '0_5_5_0'))
subprocess_check_call('cp -pr {} {}'.format(path_to_detached + '0_1_1_0', path_to_detached + 'attaching_0_6_6_0'))
subprocess_check_call('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') or 0 <= error.find('No columns.txt in part 0_5_5_0')
@ -184,7 +179,7 @@ def test_attach_check_all_parts(attach_check_all_parts_table):
"WHERE table='attach_partition' AND database='test' ORDER BY name")
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'))
subprocess_check_call('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")
@ -217,10 +212,10 @@ 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'))
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_0'))
subprocess_check_call('mkdir {}'.format(path_to_detached + 'attaching_0_6_6_0'))
subprocess_check_call('mkdir {}'.format(path_to_detached + 'deleting_0_7_7_0'))
subprocess_check_call('mkdir {}'.format(path_to_detached + 'any_other_name'))
subprocess_check_call('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'",
settings=s)