thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-19 12:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pr-3-way-joins

Browse Source
This commit is contained in:
Igor Nikonov 2024-12-10 11:25:25 +00:00
commit 270d8a3eaf
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
View File

@ -256,7 +256,7 @@ PostgreSQLTableStructure::ColumnsInfoPtr readNamesAndTypesList(
{ {
throw Exception( throw Exception(
ErrorCodes::BAD_ARGUMENTS, ErrorCodes::BAD_ARGUMENTS,
"PostgreSQL cannot infer dimensions of an empty array: {}.{}", "PostgreSQL cannot infer dimensions of an empty array: {}.{}. Make sure no empty array values in the first row.",
postgres_table, postgres_table,
postgres_column); postgres_column);
} }

2
tests/integration/test_storage_postgresql/test.py
View File

@ -267,7 +267,7 @@ def test_postgres_array_ndim_error_messges(started_cluster):
assert False assert False
except Exception as error: except Exception as error:
assert ( assert (
'PostgreSQL cannot infer dimensions of an empty array: array_ndim_view."Mixed-case with spaces"' 'PostgreSQL cannot infer dimensions of an empty array: array_ndim_view."Mixed-case with spaces". Make sure no empty array values in the first row.'
in str(error) in str(error)
) )

2
tests/queries/0_stateless/01290_max_execution_speed_distributed.reference
View File

@ -1,3 +1,3 @@
2000000 200000
1 1
1 1

8
tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
View File

@ -1,15 +1,12 @@
-- Tags: distributed -- Tags: distributed
SET max_execution_speed = 1000000;
SET timeout_before_checking_execution_speed = 0;
SET max_block_size = 100;
SET log_queries=1; SET log_queries=1;
CREATE TEMPORARY TABLE times (t DateTime); CREATE TEMPORARY TABLE times (t DateTime);
INSERT INTO times SELECT now(); INSERT INTO times SELECT now();
SELECT count('special query for 01290_max_execution_speed_distributed') FROM remote('127.0.0.{2,3}', numbers(1000000)); SELECT count('special query for 01290_max_execution_speed_distributed') FROM remote('127.0.0.{2,3}', numbers(100000))
SETTINGS max_execution_speed = 100000, timeout_before_checking_execution_speed = 0, max_block_size = 100;
INSERT INTO times SELECT now(); INSERT INTO times SELECT now();
SELECT max(t) - min(t) >= 1 FROM times; SELECT max(t) - min(t) >= 1 FROM times;
@ -21,6 +18,7 @@ FROM system.query_log
WHERE WHERE
current_database = currentDatabase() AND current_database = currentDatabase() AND
event_date >= yesterday() AND event_date >= yesterday() AND
event_time >= now() - INTERVAL '5 MINUTES' AND -- time limit for tests not marked `long` is 3 minutes, 5 should be more than enough
query LIKE '%special query for 01290_max_execution_speed_distributed%' AND query LIKE '%special query for 01290_max_execution_speed_distributed%' AND
query NOT LIKE '%system.query_log%' AND query NOT LIKE '%system.query_log%' AND
type = 2; type = 2;

3
tests/queries/0_stateless/03271_ghdata_object_to_json_alter.sh
View File

@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Tags: no-fasttest, long # Tags: no-fasttest, long, no-s3-storage
# ^ no-s3-storage: too slow
CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh # shellcheck source=../shell_config.sh