thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-tests

Browse Source
This commit is contained in:
mergify[bot] 2022-03-05 23:26:36 +00:00 committed by GitHub
commit 275ce197c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/zh/sql-reference/statements/alter/row-policy.md
View File

@ -1 +0,0 @@
../../../../en/sql-reference/statements/alter/row-policy.md

19
docs/zh/sql-reference/statements/alter/row-policy.md Normal file
View File

@ -0,0 +1,19 @@
---
toc_priority: 47
toc_title: 行策略
---
# 操作行策略 {#alter-row-policy-statement}
修改行策略.
语法:
``` sql
ALTER [ROW] POLICY [IF EXISTS] name1 [ON CLUSTER cluster_name1] ON [database1.]table1 [RENAME TO new_name1]
[, name2 [ON CLUSTER cluster_name2] ON [database2.]table2 [RENAME TO new_name2] ...]
[AS {PERMISSIVE | RESTRICTIVE}]
[FOR SELECT]
[USING {condition | NONE}][,...]
[TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
```

15
src/Storages/System/StorageSystemAsynchronousInserts.cpp
View File

@ -62,8 +62,19 @@ void StorageSystemAsynchronousInserts::fillData(MutableColumns & res_columns, Co
size_t i = 0;
res_columns[i++]->insert(queryToString(insert_query));
res_columns[i++]->insert(insert_query.table_id.getDatabaseName());
res_columns[i++]->insert(insert_query.table_id.getTableName());
/// If query is "INSERT INTO FUNCTION" then table_id is empty.
if (insert_query.table_id)
{
res_columns[i++]->insert(insert_query.table_id.getDatabaseName());
res_columns[i++]->insert(insert_query.table_id.getTableName());
}
else
{
res_columns[i++]->insertDefault();
res_columns[i++]->insertDefault();
}
res_columns[i++]->insert(insert_query.format);
res_columns[i++]->insert(time_in_microseconds(elem->data->first_update));
res_columns[i++]->insert(time_in_microseconds(elem->data->last_update));

10
tests/queries/0_stateless/02015_async_inserts_stress_long.sh
View File

@ -27,6 +27,14 @@ function insert2()
done
}
function insert3()
{
url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
while true; do
${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO FUNCTION remote('127.0.0.1', $CLICKHOUSE_DATABASE, async_inserts) VALUES (7, 'g') (8, 'h')"
done
}
function select1()
{
while true; do
@ -56,6 +64,7 @@ TIMEOUT=10
export -f insert1
export -f insert2
export -f insert3
export -f select1
export -f select2
export -f truncate1
@ -63,6 +72,7 @@ export -f truncate1
for _ in {1..5}; do
timeout $TIMEOUT bash -c insert1 &
timeout $TIMEOUT bash -c insert2 &
timeout $TIMEOUT bash -c insert3 &
done
timeout $TIMEOUT bash -c select1 &