From a8fa3914b530567ebb37cea9df636d38b8a18a99 Mon Sep 17 00:00:00 2001 From: Dmitry Novik Date: Wed, 13 Oct 2021 17:54:46 +0300 Subject: [PATCH 1/2] Fix 01939_network_send_bytes_metrics --- tests/queries/0_stateless/01939_network_send_bytes_metrics.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh b/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh index e862a273de4..840b4f54706 100755 --- a/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh +++ b/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh @@ -10,7 +10,7 @@ ${CLICKHOUSE_CLIENT} --query "SELECT number FROM numbers(1000)" > /dev/null ${CLICKHOUSE_CLIENT} --multiquery --query "SYSTEM FLUSH LOGS; WITH ProfileEvents['NetworkSendBytes'] AS bytes - SELECT bytes >= 8000 AND bytes < 9000 ? 1 : bytes FROM system.query_log + SELECT bytes >= 8000 AND bytes < 9500 ? 1 : bytes FROM system.query_log WHERE current_database = currentDatabase() AND query_kind = 'Select' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;" ${CLICKHOUSE_CLIENT} --query "DROP TABLE t" From 4ebb2455d8ad7e4b3a9bf337e4accd2c2eb45450 Mon Sep 17 00:00:00 2001 From: Dmitry Novik Date: Thu, 14 Oct 2021 17:56:34 +0300 Subject: [PATCH 2/2] Delete 01939_network_send_bytes_metrics test --- .../01939_network_send_bytes_metrics.reference | 1 - .../01939_network_send_bytes_metrics.sh | 16 ---------------- 2 files changed, 17 deletions(-) delete mode 100644 tests/queries/0_stateless/01939_network_send_bytes_metrics.reference delete mode 100755 tests/queries/0_stateless/01939_network_send_bytes_metrics.sh diff --git a/tests/queries/0_stateless/01939_network_send_bytes_metrics.reference b/tests/queries/0_stateless/01939_network_send_bytes_metrics.reference deleted file mode 100644 index d00491fd7e5..00000000000 --- a/tests/queries/0_stateless/01939_network_send_bytes_metrics.reference +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh b/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh deleted file mode 100755 index 840b4f54706..00000000000 --- a/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) -# shellcheck source=../shell_config.sh -. "$CURDIR"/../shell_config.sh - -${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;" - -${CLICKHOUSE_CLIENT} --query "SELECT number FROM numbers(1000)" > /dev/null - -${CLICKHOUSE_CLIENT} --multiquery --query "SYSTEM FLUSH LOGS; - WITH ProfileEvents['NetworkSendBytes'] AS bytes - SELECT bytes >= 8000 AND bytes < 9500 ? 1 : bytes FROM system.query_log - WHERE current_database = currentDatabase() AND query_kind = 'Select' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;" - -${CLICKHOUSE_CLIENT} --query "DROP TABLE t"