From 9aa98d7b991bcaed538cb2b9baaa5ee350b82f52 Mon Sep 17 00:00:00 2001
From: vxider <lb@vxider.com>
Date: Fri, 10 Dec 2021 11:09:04 +0000
Subject: [PATCH] fix flaky window view tests

---
 ...1053_window_view_proc_hop_to_now.reference |  1 -
 .../01053_window_view_proc_hop_to_now.sh      | 27 +++++++++++++++++++
 .../01053_window_view_proc_hop_to_now.sql     | 17 ------------
 ...01054_window_view_proc_tumble_to.reference |  1 -
 .../01054_window_view_proc_tumble_to.sh       | 27 +++++++++++++++++++
 .../01054_window_view_proc_tumble_to.sql      | 18 -------------
 .../01055_window_view_proc_hop_to.reference   |  1 -
 .../01055_window_view_proc_hop_to.sh          | 27 +++++++++++++++++++
 .../01055_window_view_proc_hop_to.sql         | 18 -------------
 9 files changed, 81 insertions(+), 56 deletions(-)
 create mode 100755 tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
 delete mode 100644 tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sql
 create mode 100755 tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
 delete mode 100644 tests/queries/0_stateless/01054_window_view_proc_tumble_to.sql
 create mode 100755 tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
 delete mode 100644 tests/queries/0_stateless/01055_window_view_proc_hop_to.sql

diff --git a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.reference b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.reference
index 0d66ea1aee9..d00491fd7e5 100644
--- a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.reference
+++ b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.reference
@@ -1,2 +1 @@
-0
 1
diff --git a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
new file mode 100755
index 00000000000..5c649b4c64b
--- /dev/null
+++ b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+SET allow_experimental_window_view = 1;
+DROP TABLE IF EXISTS mt;
+DROP TABLE IF EXISTS dst;
+DROP TABLE IF EXISTS wv;
+
+CREATE TABLE dst(count UInt64) Engine=MergeTree ORDER BY tuple();
+CREATE TABLE mt(a Int32) ENGINE=MergeTree ORDER BY tuple();
+CREATE WINDOW VIEW wv TO dst AS SELECT count(a) AS count FROM mt GROUP BY hop(now('US/Samoa'), INTERVAL '1' SECOND, INTERVAL '1' SECOND, 'US/Samoa') AS wid;
+ 
+INSERT INTO mt VALUES (1);
+EOF
+
+while true; do
+	$CLICKHOUSE_CLIENT --query="SELECT count FROM dst" | grep -q "1" && break || sleep 1 ||:
+done
+
+$CLICKHOUSE_CLIENT --query="SELECT count FROM dst"
+$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sql b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sql
deleted file mode 100644
index 9f3dc3ca89e..00000000000
--- a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-SET allow_experimental_window_view = 1;
-
-DROP TABLE IF EXISTS mt;
-DROP TABLE IF EXISTS dst;
-DROP TABLE IF EXISTS wv;
-
-CREATE TABLE dst(count UInt64) Engine=MergeTree ORDER BY tuple();
-CREATE TABLE mt(a Int32) ENGINE=MergeTree ORDER BY tuple();
-CREATE WINDOW VIEW wv TO dst AS SELECT count(a) AS count FROM mt GROUP BY hop(now('US/Samoa'), INTERVAL '1' SECOND, INTERVAL '1' SECOND, 'US/Samoa') AS wid;
-
-INSERT INTO mt VALUES (1);
-SELECT sleep(3);
-SELECT count from dst;
-
-DROP TABLE wv;
-DROP TABLE mt;
-DROP TABLE dst;
diff --git a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.reference b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.reference
index 0d66ea1aee9..d00491fd7e5 100644
--- a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.reference
+++ b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.reference
@@ -1,2 +1 @@
-0
 1
diff --git a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
new file mode 100755
index 00000000000..e51a9b557e1
--- /dev/null
+++ b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+SET allow_experimental_window_view = 1;
+DROP TABLE IF EXISTS mt;
+DROP TABLE IF EXISTS dst;
+DROP TABLE IF EXISTS wv;
+
+CREATE TABLE dst(count UInt64) Engine=MergeTree ORDER BY tuple();
+CREATE TABLE mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
+CREATE WINDOW VIEW wv TO dst AS SELECT count(a) AS count FROM mt GROUP BY tumble(timestamp, INTERVAL '1' SECOND, 'US/Samoa') AS wid;
+ 
+INSERT INTO mt VALUES (1, now('US/Samoa') + 1);
+EOF
+
+while true; do
+	$CLICKHOUSE_CLIENT --query="SELECT count FROM dst" | grep -q "1" && break || sleep 1 ||:
+done
+
+$CLICKHOUSE_CLIENT --query="SELECT count FROM dst"
+$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sql b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sql
deleted file mode 100644
index 86b7ab89150..00000000000
--- a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-SET allow_experimental_window_view = 1;
-
-DROP TABLE IF EXISTS mt;
-DROP TABLE IF EXISTS dst;
-DROP TABLE IF EXISTS wv;
-DROP TABLE IF EXISTS `.inner.wv`;
-
-CREATE TABLE dst(count UInt64) Engine=MergeTree ORDER BY tuple();
-CREATE TABLE mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
-CREATE WINDOW VIEW wv TO dst AS SELECT count(a) AS count FROM mt GROUP BY tumble(timestamp, INTERVAL '1' SECOND, 'US/Samoa') AS wid;
-
-INSERT INTO mt VALUES (1, now('US/Samoa') + 1);
-SELECT sleep(3);
-SELECT count from dst;
-
-DROP TABLE wv;
-DROP TABLE mt;
-DROP TABLE dst;
diff --git a/tests/queries/0_stateless/01055_window_view_proc_hop_to.reference b/tests/queries/0_stateless/01055_window_view_proc_hop_to.reference
index 0d66ea1aee9..d00491fd7e5 100644
--- a/tests/queries/0_stateless/01055_window_view_proc_hop_to.reference
+++ b/tests/queries/0_stateless/01055_window_view_proc_hop_to.reference
@@ -1,2 +1 @@
-0
 1
diff --git a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
new file mode 100755
index 00000000000..d0c2952fbfd
--- /dev/null
+++ b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+SET allow_experimental_window_view = 1;
+DROP TABLE IF EXISTS mt;
+DROP TABLE IF EXISTS dst;
+DROP TABLE IF EXISTS wv;
+
+CREATE TABLE dst(count UInt64) Engine=MergeTree ORDER BY tuple();
+CREATE TABLE mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
+CREATE WINDOW VIEW wv TO dst AS SELECT count(a) AS count FROM mt GROUP BY hop(timestamp, INTERVAL '1' SECOND, INTERVAL '1' SECOND, 'US/Samoa') AS wid;
+ 
+INSERT INTO mt VALUES (1, now('US/Samoa') + 1);
+EOF
+
+while true; do
+	$CLICKHOUSE_CLIENT --query="SELECT count FROM dst" | grep -q "1" && break || sleep 1 ||:
+done
+
+$CLICKHOUSE_CLIENT --query="SELECT count FROM dst"
+$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
+$CLICKHOUSE_CLIENT --query="DROP TABLE dst"
diff --git a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sql b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sql
deleted file mode 100644
index 1da497092c5..00000000000
--- a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-SET allow_experimental_window_view = 1;
-
-DROP TABLE IF EXISTS mt;
-DROP TABLE IF EXISTS dst;
-DROP TABLE IF EXISTS wv;
-DROP TABLE IF EXISTS `.inner.wv`;
-
-CREATE TABLE dst(count UInt64) Engine=MergeTree ORDER BY tuple();
-CREATE TABLE mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
-CREATE WINDOW VIEW wv TO dst AS SELECT count(a) AS count FROM mt GROUP BY hop(timestamp, INTERVAL '1' SECOND, INTERVAL '1' SECOND, 'US/Samoa') AS wid;
-
-INSERT INTO mt VALUES (1, now('US/Samoa') + 1);
-SELECT sleep(3);
-SELECT count from dst;
-
-DROP TABLE wv;
-DROP TABLE mt;
-DROP TABLE dst;