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

Fix remaining tests

Browse Source
This commit is contained in:
avogar 2024-06-21 11:47:33 +00:00
parent c26e7b5067
commit 0b9e6de6fb
5 changed files with 4 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Storages/System/StorageSystemColumns.cpp
View File

@ -134,7 +134,6 @@ protected:
cols_required_for_sorting_key = metadata_snapshot->getColumnsRequiredForSortingKey();
cols_required_for_primary_key = metadata_snapshot->getColumnsRequiredForPrimaryKey();
cols_required_for_sampling = metadata_snapshot->getColumnsRequiredForSampling();
LOG_DEBUG(getLogger("StorageSystemColumns"), "Get column sizes for table {}.{}", database_name, table_name);
column_sizes = storage->getColumnSizes();
}

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

@ -134,3 +134,5 @@ def test_create_or_replace(database, instance_to_create_dictionary, instances_to
expected_result = TSV([[0, 1], [5, 26], [7, 50], [11, 0]])
assert instance.query(select_query) == expected_result
assert instance.query(select_query, user="dictget_user") == expected_result
instance_to_create_dictionary.query(f"DROP DICTIONARY IF EXISTS {database}.dict")

16
tests/queries/0_stateless/02152_http_external_tables_memory_tracking.reference
View File

@ -1,16 +0,0 @@
Checking input_format_parallel_parsing=false&
1
Checking input_format_parallel_parsing=false&cancel_http_readonly_queries_on_client_close=1&readonly=1
1
Checking input_format_parallel_parsing=false&send_progress_in_http_headers=true
1
Checking input_format_parallel_parsing=false&cancel_http_readonly_queries_on_client_close=1&readonly=1&send_progress_in_http_headers=true
1
Checking input_format_parallel_parsing=true&
1
Checking input_format_parallel_parsing=true&cancel_http_readonly_queries_on_client_close=1&readonly=1
1
Checking input_format_parallel_parsing=true&send_progress_in_http_headers=true
1
Checking input_format_parallel_parsing=true&cancel_http_readonly_queries_on_client_close=1&readonly=1&send_progress_in_http_headers=true
1

57
tests/queries/0_stateless/02152_http_external_tables_memory_tracking.sh
View File

@ -1,57 +0,0 @@
#!/usr/bin/env bash
# Tags: no-tsan, no-cpu-aarch64, no-parallel
# TSan does not supports tracing.
# trace_log doesn't work on aarch64
# Regression for proper release of Context,
# via tracking memory of external tables.
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh
. "$CURDIR"/../shell_config.sh
tmp_file=$(mktemp "$CURDIR/clickhouse.XXXXXX.csv")
trap 'rm $tmp_file' EXIT
$CLICKHOUSE_CLIENT -q "SELECT toString(number) FROM numbers(1e6) FORMAT TSV" > "$tmp_file"
function run_and_check()
{
local query_id
query_id="$(${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" --data-binary @- <<<'SELECT generateUUIDv4()')"
echo "Checking $*"
# Run query with external table (implicit StorageMemory user)
$CLICKHOUSE_CURL -sS -F "s=@$tmp_file;" "$CLICKHOUSE_URL&s_structure=key+Int&query=SELECT+count()+FROM+s&memory_profiler_sample_probability=1&max_untracked_memory=0&query_id=$query_id&$*" -o /dev/null
${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" --data-binary @- <<<'SYSTEM FLUSH LOGS'
# Check that temporary table had been destroyed.
${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&allow_introspection_functions=1" --data-binary @- <<<"
WITH arrayStringConcat(arrayMap(x -> demangle(addressToSymbol(x)), trace), '\n') AS sym
SELECT 1 FROM system.trace_log
PREWHERE
query_id = '$query_id' AND
trace_type = 'MemorySample' AND
/* only deallocations */
size < 0 AND
event_date >= yesterday()
WHERE
sym LIKE '%DB::StorageMemory::drop%\n%TemporaryTableHolder::~TemporaryTableHolder%'
LIMIT 1
"
}
for input_format_parallel_parsing in false true; do
query_args_variants=(
""
"cancel_http_readonly_queries_on_client_close=1&readonly=1"
"send_progress_in_http_headers=true"
# nested progress callback
"cancel_http_readonly_queries_on_client_close=1&readonly=1&send_progress_in_http_headers=true"
)
for query_args in "${query_args_variants[@]}"; do
run_and_check "input_format_parallel_parsing=$input_format_parallel_parsing&$query_args"
done
done

2
tests/queries/0_stateless/03173_check_cyclic_dependencies_on_create_and_rename.sql
View File

@ -1,3 +1,5 @@
-- Tags: atomic-database
DROP TABLE IF EXISTS test;
CREATE TABLE test (id UInt64, value String) ENGINE=MergeTree ORDER BY id;
INSERT INTO test SELECT number, 'str_' || toString(number) FROM numbers(10);