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

Merge pull request #53081 from ClickHouse/Something

Browse Source 
Something with tests
This commit is contained in:
Alexey Milovidov 2023-08-10 17:02:25 +03:00 committed by GitHub
commit 1365fc91c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Interpreters/SystemLog.h
View File

@ -111,7 +111,7 @@ public:
* and new table get created - as if previous table was not exist.
*/
SystemLog(ContextPtr context_,
const SystemLogSettings& settings_,
const SystemLogSettings & settings_,
std::shared_ptr<SystemLogQueue<LogElement>> queue_ = nullptr);
/** Append a record into log.
@ -131,8 +131,6 @@ protected:
using Base::queue;
private:
/* Saving thread data */
const StorageID table_id;
const String storage_def;

15
tests/integration/test_zookeeper_config/test.py
View File

@ -57,11 +57,10 @@ def test_chroot_with_same_root(started_cluster):
for j in range(2): # Second insert to test deduplication
node.query("INSERT INTO simple VALUES ({0}, {0})".format(i))
# Replication might take time
assert_eq_with_retry(node1, "select count() from simple", "2\n")
assert_eq_with_retry(node2, "select count() from simple", "2\n")
node1.query("SYSTEM SYNC REPLICA simple")
assert_eq_with_retry(node1, "select count() from simple", "2")
node2.query("SYSTEM SYNC REPLICA simple")
assert_eq_with_retry(node2, "select count() from simple", "2")
def test_chroot_with_different_root(started_cluster):
@ -78,5 +77,7 @@ def test_chroot_with_different_root(started_cluster):
for j in range(2): # Second insert to test deduplication
node.query("INSERT INTO simple_different VALUES ({0}, {0})".format(i))
assert node1.query("select count() from simple_different").strip() == "1"
assert node3.query("select count() from simple_different").strip() == "1"
node1.query("SYSTEM SYNC REPLICA simple_different")
assert_eq_with_retry(node1, "select count() from simple_different", "1")
node3.query("SYSTEM SYNC REPLICA simple_different")
assert_eq_with_retry(node3, "select count() from simple_different", "1")

2
tests/queries/0_stateless/02263_format_insert_settings.sh
View File

@ -23,10 +23,12 @@ function run_format_both()
# NOTE: that those queries may work slow, due to stack trace obtaining
run_format 'insert into foo settings max_threads=1' 2> >(grep -m1 -o "Syntax error (query): failed at position .* (end of query):")
# compatibility
run_format 'insert into foo format tsv settings max_threads=1' 2> >(grep -m1 -F -o "Can't format ASTInsertQuery with data, since data will be lost.")
run_format_both 'insert into foo format tsv settings max_threads=1' --allow_settings_after_format_in_insert
run_format 'insert into foo settings max_threads=1 format tsv settings max_threads=1' --allow_settings_after_format_in_insert 2> >(grep -m1 -F -o "You have SETTINGS before and after FORMAT")
# and via server (since this is a separate code path)
$CLICKHOUSE_CLIENT -q 'drop table if exists data_02263'
$CLICKHOUSE_CLIENT -q 'create table data_02263 (key Int) engine=Memory()'