From 746e9513a0c6f78e80987038ac9d0bc94f2720bd Mon Sep 17 00:00:00 2001 From: Dennis Zhuang Date: Mon, 29 Apr 2024 21:52:32 +0800 Subject: [PATCH] chore: simplify sqlness commands --- .../information_schema/cluster_info.result | 25 ++++++++----------- .../information_schema/cluster_info.sql | 25 ++++++++----------- .../information_schema/cluster_info.result | 15 +++++------ .../information_schema/cluster_info.sql | 15 +++++------ 4 files changed, 32 insertions(+), 48 deletions(-) diff --git a/tests/cases/distributed/information_schema/cluster_info.result b/tests/cases/distributed/information_schema/cluster_info.result index 1306cfd052bd..e0c31e42ab68 100644 --- a/tests/cases/distributed/information_schema/cluster_info.result +++ b/tests/cases/distributed/information_schema/cluster_info.result @@ -20,9 +20,8 @@ DESC TABLE CLUSTER_INFO; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s\s*)+) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; @@ -32,9 +31,8 @@ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; @@ -44,9 +42,8 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; @@ -56,9 +53,8 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; @@ -68,9 +64,8 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_ID > 1 ORDER BY peer_type; diff --git a/tests/cases/distributed/information_schema/cluster_info.sql b/tests/cases/distributed/information_schema/cluster_info.sql index 7167c233023f..8fc6631ea5a2 100644 --- a/tests/cases/distributed/information_schema/cluster_info.sql +++ b/tests/cases/distributed/information_schema/cluster_info.sql @@ -6,9 +6,8 @@ DESC TABLE CLUSTER_INFO; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s\s*)+) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; @@ -16,9 +15,8 @@ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; @@ -26,9 +24,8 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; @@ -36,9 +33,8 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; @@ -46,9 +42,8 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; -- SQLNESS REPLACE unknown UNKNOWN -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_ID > 1 ORDER BY peer_type; diff --git a/tests/cases/standalone/information_schema/cluster_info.result b/tests/cases/standalone/information_schema/cluster_info.result index 7f519b32546b..7c8031aa59ea 100644 --- a/tests/cases/standalone/information_schema/cluster_info.result +++ b/tests/cases/standalone/information_schema/cluster_info.result @@ -19,9 +19,8 @@ DESC TABLE CLUSTER_INFO; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\d\.\d\.\d) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO; @@ -30,9 +29,8 @@ SELECT * FROM CLUSTER_INFO; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\d\.\d\.\d) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'STANDALONE'; @@ -46,9 +44,8 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'STANDALONE'; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\d\.\d\.\d) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_ID = 0; diff --git a/tests/cases/standalone/information_schema/cluster_info.sql b/tests/cases/standalone/information_schema/cluster_info.sql index f6da6fb2f170..f9b59edc1e45 100644 --- a/tests/cases/standalone/information_schema/cluster_info.sql +++ b/tests/cases/standalone/information_schema/cluster_info.sql @@ -5,18 +5,16 @@ DESC TABLE CLUSTER_INFO; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\d\.\d\.\d) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\d\.\d\.\d) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'STANDALONE'; @@ -25,9 +23,8 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'STANDALONE'; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\d\.\d\.\d) Version -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{23}\s) Start_time --- SQLNESS REPLACE (\s+uptime\s+) uptime --- SQLNESS REPLACE (\s+(\d+(s|ms|m)\s)+\s*) Uptime +-- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time +-- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Uptime -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_ID = 0;