From 370d27587a542ecf960fdc541e600e49b0baff31 Mon Sep 17 00:00:00 2001 From: LFC <990479+MichaelScofield@users.noreply.github.com> Date: Fri, 18 Jul 2025 16:01:30 +0800 Subject: [PATCH] refactor: make greptimedb's tests ran as a submodule (#6544) fix: failed to run a test when as a submodule Signed-off-by: luofucong --- .../src/system_schema/information_schema.rs | 27 ++++++-------- .../information_memory_table.rs | 35 +++++++------------ .../information_schema/table_names.rs | 1 - src/common/catalog/src/consts.rs | 2 -- src/common/error/tests/ext.rs | 14 +++++--- src/query/src/sql.rs | 4 +-- .../explain/multi_partitions.result | 10 +++--- .../distributed/explain/multi_partitions.sql | 8 ++--- .../information_schema/cluster_info.result | 10 +++--- .../information_schema/cluster_info.sql | 10 +++--- .../standalone/common/function/system.result | 2 +- .../standalone/common/function/system.sql | 2 +- .../common/system/information_schema.result | 26 +++----------- .../information_schema/cluster_info.result | 6 ++-- .../information_schema/cluster_info.sql | 6 ++-- 15 files changed, 64 insertions(+), 99 deletions(-) diff --git a/src/catalog/src/system_schema/information_schema.rs b/src/catalog/src/system_schema/information_schema.rs index ca534022b0..82e3b8e68e 100644 --- a/src/catalog/src/system_schema/information_schema.rs +++ b/src/catalog/src/system_schema/information_schema.rs @@ -162,6 +162,16 @@ impl SystemSchemaProviderInner for InformationSchemaProvider { } fn system_table(&self, name: &str) -> Option { + #[cfg(feature = "enterprise")] + if let Some(factory) = self.extra_table_factories.get(name) { + let req = MakeInformationTableRequest { + catalog_name: self.catalog_name.clone(), + catalog_manager: self.catalog_manager.clone(), + kv_backend: self.kv_backend.clone(), + }; + return Some(factory.make_information_table(req)); + } + match name.to_ascii_lowercase().as_str() { TABLES => Some(Arc::new(InformationSchemaTables::new( self.catalog_name.clone(), @@ -240,22 +250,7 @@ impl SystemSchemaProviderInner for InformationSchemaProvider { .process_manager .as_ref() .map(|p| Arc::new(InformationSchemaProcessList::new(p.clone())) as _), - table_name => { - #[cfg(feature = "enterprise")] - return self.extra_table_factories.get(table_name).map(|factory| { - let req = MakeInformationTableRequest { - catalog_name: self.catalog_name.clone(), - catalog_manager: self.catalog_manager.clone(), - kv_backend: self.kv_backend.clone(), - }; - factory.make_information_table(req) - }); - #[cfg(not(feature = "enterprise"))] - { - let _ = table_name; - None - } - } + _ => None, } } } diff --git a/src/catalog/src/system_schema/information_schema/information_memory_table.rs b/src/catalog/src/system_schema/information_schema/information_memory_table.rs index 0b705fe140..20d14a4ba5 100644 --- a/src/catalog/src/system_schema/information_schema/information_memory_table.rs +++ b/src/catalog/src/system_schema/information_schema/information_memory_table.rs @@ -15,7 +15,8 @@ use std::sync::Arc; use common_catalog::consts::{METRIC_ENGINE, MITO_ENGINE}; -use datatypes::schema::{Schema, SchemaRef}; +use datatypes::data_type::ConcreteDataType; +use datatypes::schema::{ColumnSchema, Schema, SchemaRef}; use datatypes::vectors::{Int64Vector, StringVector, VectorRef}; use crate::system_schema::information_schema::table_names::*; @@ -367,28 +368,18 @@ pub(super) fn get_schema_columns(table_name: &str) -> (SchemaRef, Vec TRIGGERS => ( vec![ - string_column("TRIGGER_CATALOG"), - string_column("TRIGGER_SCHEMA"), string_column("TRIGGER_NAME"), - string_column("EVENT_MANIPULATION"), - string_column("EVENT_OBJECT_CATALOG"), - string_column("EVENT_OBJECT_SCHEMA"), - string_column("EVENT_OBJECT_TABLE"), - bigint_column("ACTION_ORDER"), - string_column("ACTION_CONDITION"), - string_column("ACTION_STATEMENT"), - string_column("ACTION_ORIENTATION"), - string_column("ACTION_TIMING"), - string_column("ACTION_REFERENCE_OLD_TABLE"), - string_column("ACTION_REFERENCE_NEW_TABLE"), - string_column("ACTION_REFERENCE_OLD_ROW"), - string_column("ACTION_REFERENCE_NEW_ROW"), - timestamp_micro_column("CREATED"), - string_column("SQL_MODE"), - string_column("DEFINER"), - string_column("CHARACTER_SET_CLIENT"), - string_column("COLLATION_CONNECTION"), - string_column("DATABASE_COLLATION"), + ColumnSchema::new( + "trigger_id", + ConcreteDataType::uint64_datatype(), + false, + ), + string_column("TRIGGER_DEFINITION"), + ColumnSchema::new( + "flownode_id", + ConcreteDataType::uint64_datatype(), + true, + ), ], vec![], ), diff --git a/src/catalog/src/system_schema/information_schema/table_names.rs b/src/catalog/src/system_schema/information_schema/table_names.rs index 809450219c..95e8fe74f4 100644 --- a/src/catalog/src/system_schema/information_schema/table_names.rs +++ b/src/catalog/src/system_schema/information_schema/table_names.rs @@ -48,4 +48,3 @@ pub const FLOWS: &str = "flows"; pub const PROCEDURE_INFO: &str = "procedure_info"; pub const REGION_STATISTICS: &str = "region_statistics"; pub const PROCESS_LIST: &str = "process_list"; -pub const TRIGGER_LIST: &str = "trigger_list"; diff --git a/src/common/catalog/src/consts.rs b/src/common/catalog/src/consts.rs index ad7c5c2a45..ebaccf076c 100644 --- a/src/common/catalog/src/consts.rs +++ b/src/common/catalog/src/consts.rs @@ -104,8 +104,6 @@ pub const INFORMATION_SCHEMA_PROCEDURE_INFO_TABLE_ID: u32 = 34; pub const INFORMATION_SCHEMA_REGION_STATISTICS_TABLE_ID: u32 = 35; /// id for information_schema.process_list pub const INFORMATION_SCHEMA_PROCESS_LIST_TABLE_ID: u32 = 36; -/// id for information_schema.trigger_list (for greptimedb trigger) -pub const INFORMATION_SCHEMA_TRIGGER_TABLE_ID: u32 = 37; // ----- End of information_schema tables ----- diff --git a/src/common/error/tests/ext.rs b/src/common/error/tests/ext.rs index 26eaf2d5e2..82f2ee4440 100644 --- a/src/common/error/tests/ext.rs +++ b/src/common/error/tests/ext.rs @@ -91,8 +91,11 @@ fn test_debug_format() { let normalized_output = debug_output.replace('\\', "/"); assert_eq!( normalized_output, - r#"0: A normal error with "display" attribute, message "blabla", at src/common/error/tests/ext.rs:55:22 -1: PlainError { msg: "", status_code: Unexpected }"# + format!( + r#"0: A normal error with "display" attribute, message "blabla", at {}:55:22 +1: PlainError {{ msg: "", status_code: Unexpected }}"#, + file!() + ) ); let result = transparent_error(); @@ -100,8 +103,11 @@ fn test_debug_format() { let normalized_output = debug_output.replace('\\', "/"); assert_eq!( normalized_output, - r#"0: , at src/common/error/tests/ext.rs:60:5 -1: PlainError { msg: "", status_code: Unexpected }"# + format!( + r#"0: , at {}:60:5 +1: PlainError {{ msg: "", status_code: Unexpected }}"#, + file!() + ) ); } diff --git a/src/query/src/sql.rs b/src/query/src/sql.rs index 23adae2610..44dedd9c8a 100644 --- a/src/query/src/sql.rs +++ b/src/query/src/sql.rs @@ -957,8 +957,6 @@ pub async fn show_triggers( catalog_manager: &CatalogManagerRef, query_ctx: QueryContextRef, ) -> Result { - use catalog::information_schema::TRIGGER_LIST; - const TRIGGER_NAME: &str = "trigger_name"; const TRIGGERS_COLUMN: &str = "Triggers"; @@ -970,7 +968,7 @@ pub async fn show_triggers( query_engine, catalog_manager, query_ctx, - TRIGGER_LIST, + catalog::information_schema::TRIGGERS, vec![], projects, vec![], diff --git a/tests/cases/distributed/explain/multi_partitions.result b/tests/cases/distributed/explain/multi_partitions.result index 19f5c5d044..17d5ab7b2e 100644 --- a/tests/cases/distributed/explain/multi_partitions.result +++ b/tests/cases/distributed/explain/multi_partitions.result @@ -1,4 +1,4 @@ -CREATE TABLE demo( +CREATE TABLE multi_partitions_test_table ( host STRING, ts TIMESTAMP, cpu DOUBLE NULL, @@ -17,22 +17,20 @@ Affected Rows: 0 -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ --- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED --- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED -explain SELECT * FROM demo WHERE ts > cast(1000000000 as timestamp) ORDER BY host; +explain SELECT * FROM multi_partitions_test_table WHERE ts > cast(1000000000 as timestamp) ORDER BY host; +-+-+ | plan_type_| plan_| +-+-+ -| logical_plan_| MergeSort: demo.host ASC NULLS LAST_| +| logical_plan_| MergeSort: multi_partitions_test_table.host ASC NULLS LAST_| |_|_MergeScan [is_placeholder=false]_| | physical_plan | SortPreservingMergeExec: [host@0 ASC NULLS LAST]_| |_|_MergeScanExec: REDACTED |_|_| +-+-+ -drop table demo; +drop table multi_partitions_test_table; Affected Rows: 0 diff --git a/tests/cases/distributed/explain/multi_partitions.sql b/tests/cases/distributed/explain/multi_partitions.sql index 7c10682378..d3f9752775 100644 --- a/tests/cases/distributed/explain/multi_partitions.sql +++ b/tests/cases/distributed/explain/multi_partitions.sql @@ -1,4 +1,4 @@ -CREATE TABLE demo( +CREATE TABLE multi_partitions_test_table ( host STRING, ts TIMESTAMP, cpu DOUBLE NULL, @@ -15,9 +15,7 @@ PARTITION ON COLUMNS (host) ( -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ --- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED --- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED -explain SELECT * FROM demo WHERE ts > cast(1000000000 as timestamp) ORDER BY host; +explain SELECT * FROM multi_partitions_test_table WHERE ts > cast(1000000000 as timestamp) ORDER BY host; -drop table demo; +drop table multi_partitions_test_table; diff --git a/tests/cases/distributed/information_schema/cluster_info.result b/tests/cases/distributed/information_schema/cluster_info.result index e315f6ae99..47ec885a98 100644 --- a/tests/cases/distributed/information_schema/cluster_info.result +++ b/tests/cases/distributed/information_schema/cluster_info.result @@ -18,7 +18,7 @@ DESC TABLE CLUSTER_INFO; +-------------+----------------------+-----+------+---------+---------------+ -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -29,7 +29,7 @@ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; +++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|0|DATANODE|Address|Version|Hash|Start_time|Duration|Duration||1|DATANODE|Address|Version|Hash|Start_time|Duration|Duration||2|DATANODE|Address|Version|Hash|Start_time|Duration|Duration||0|FLOWNODE|Address|Version|Hash|Start_time|Duration|Duration||1|FRONTEND|Address|Version|Hash|Start_time|Duration|Duration||1|METASRV|Address|Version|Hash|Start_time|Duration||+++++++++ -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -40,7 +40,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; +++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|METASRV|Address|Version|Hash|Start_time|Duration||+++++++++ -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -51,7 +51,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; +++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|FRONTEND|Address|Version|Hash|Start_time|Duration|Duration|+++++++++ -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -62,7 +62,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; +++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|0|DATANODE|Address|Version|Hash|Start_time|Duration|Duration||1|DATANODE|Address|Version|Hash|Start_time|Duration|Duration||2|DATANODE|Address|Version|Hash|Start_time|Duration|Duration||0|FLOWNODE|Address|Version|Hash|Start_time|Duration|Duration||1|METASRV|Address|Version|Hash|Start_time|Duration||+++++++++ -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration diff --git a/tests/cases/distributed/information_schema/cluster_info.sql b/tests/cases/distributed/information_schema/cluster_info.sql index 6338409dd6..e57359e2e7 100644 --- a/tests/cases/distributed/information_schema/cluster_info.sql +++ b/tests/cases/distributed/information_schema/cluster_info.sql @@ -3,7 +3,7 @@ USE INFORMATION_SCHEMA; DESC TABLE CLUSTER_INFO; -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -12,7 +12,7 @@ DESC TABLE CLUSTER_INFO; SELECT * FROM CLUSTER_INFO ORDER BY peer_type; -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -21,7 +21,7 @@ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -30,7 +30,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -39,7 +39,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\s\d+\.\d+\.\d+\s) Version +-- SQLNESS REPLACE (\s\d+\.\d+(?:\.\d+)+\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration diff --git a/tests/cases/standalone/common/function/system.result b/tests/cases/standalone/common/function/system.result index 940830b7ca..d3a94148a0 100644 --- a/tests/cases/standalone/common/function/system.result +++ b/tests/cases/standalone/common/function/system.result @@ -8,7 +8,7 @@ SELECT build(); ++|build()|++|branch:BRANCH|commit:COMMIT|commit_short:COMMIT_SHORT|clean:CLEAN|version:VERSION++ --- SQLNESS REPLACE (\d+\.\d+\.\d+) VERSION +-- SQLNESS REPLACE (\d+\.\d+(?:\.\d+)+) VERSION -- SQLNESS REPLACE [\s\-]+ SELECT version(); diff --git a/tests/cases/standalone/common/function/system.sql b/tests/cases/standalone/common/function/system.sql index 28cc099b85..57985edb7c 100644 --- a/tests/cases/standalone/common/function/system.sql +++ b/tests/cases/standalone/common/function/system.sql @@ -6,7 +6,7 @@ -- SQLNESS REPLACE [\s\-]+ SELECT build(); --- SQLNESS REPLACE (\d+\.\d+\.\d+) VERSION +-- SQLNESS REPLACE (\d+\.\d+(?:\.\d+)+) VERSION -- SQLNESS REPLACE [\s\-]+ SELECT version(); diff --git a/tests/cases/standalone/common/system/information_schema.result b/tests/cases/standalone/common/system/information_schema.result index af8533572d..645b5b7c3c 100644 --- a/tests/cases/standalone/common/system/information_schema.result +++ b/tests/cases/standalone/common/system/information_schema.result @@ -416,28 +416,10 @@ select * from information_schema.columns order by table_schema, table_name, colu | greptime | information_schema | tables | temporary | 24 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | Yes | string | | | | greptime | information_schema | tables | update_time | 18 | | | | | 6 | | | | | select,insert | | TimestampMicrosecond | timestamp(6) | FIELD | | Yes | timestamp(6) | | | | greptime | information_schema | tables | version | 12 | | | 20 | 0 | | | | | | select,insert | | UInt64 | bigint unsigned | FIELD | | Yes | bigint unsigned | | | -| greptime | information_schema | triggers | action_condition | 9 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | action_order | 8 | | | 19 | 0 | | | | | | select,insert | | Int64 | bigint | FIELD | | No | bigint | | | -| greptime | information_schema | triggers | action_orientation | 11 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | action_reference_new_row | 16 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | action_reference_new_table | 14 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | action_reference_old_row | 15 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | action_reference_old_table | 13 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | action_statement | 10 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | action_timing | 12 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | character_set_client | 20 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | collation_connection | 21 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | created | 17 | | | | | 6 | | | | | select,insert | | TimestampMicrosecond | timestamp(6) | FIELD | | No | timestamp(6) | | | -| greptime | information_schema | triggers | database_collation | 22 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | definer | 19 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | event_manipulation | 4 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | event_object_catalog | 5 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | event_object_schema | 6 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | event_object_table | 7 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | sql_mode | 18 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | trigger_catalog | 1 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | trigger_name | 3 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | -| greptime | information_schema | triggers | trigger_schema | 2 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | +| greptime | information_schema | triggers | flownode_id | 4 | | | 20 | 0 | | | | | | select,insert | | UInt64 | bigint unsigned | FIELD | | Yes | bigint unsigned | | | +| greptime | information_schema | triggers | trigger_definition | 3 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | +| greptime | information_schema | triggers | trigger_id | 2 | | | 20 | 0 | | | | | | select,insert | | UInt64 | bigint unsigned | FIELD | | No | bigint unsigned | | | +| greptime | information_schema | triggers | trigger_name | 1 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | No | string | | | | greptime | information_schema | views | character_set_client | 9 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | Yes | string | | | | greptime | information_schema | views | check_option | 5 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | Yes | string | | | | greptime | information_schema | views | collation_connection | 10 | 2147483647 | 2147483647 | | | | utf8 | utf8_bin | | | select,insert | | String | string | FIELD | | Yes | string | | | diff --git a/tests/cases/standalone/information_schema/cluster_info.result b/tests/cases/standalone/information_schema/cluster_info.result index 3d4a762ac4..12708640cc 100644 --- a/tests/cases/standalone/information_schema/cluster_info.result +++ b/tests/cases/standalone/information_schema/cluster_info.result @@ -18,7 +18,7 @@ DESC TABLE CLUSTER_INFO; +-------------+----------------------+-----+------+---------+---------------+ -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\d+\.\d+\.\d+) Version +-- SQLNESS REPLACE (\d+\.\d+(?:\.\d+)+) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -28,7 +28,7 @@ SELECT * FROM CLUSTER_INFO; +++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|0|STANDALONE||Version|Hash|Start_time|Duration||+++++++++ -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\d+\.\d+\.\d+) Version +-- SQLNESS REPLACE (\d+\.\d+(?:\.\d+)+) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -43,7 +43,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'STANDALONE'; ++ -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\d+\.\d+\.\d+) Version +-- SQLNESS REPLACE (\d+\.\d+(?:\.\d+)+) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration diff --git a/tests/cases/standalone/information_schema/cluster_info.sql b/tests/cases/standalone/information_schema/cluster_info.sql index c27b605a8e..de36658143 100644 --- a/tests/cases/standalone/information_schema/cluster_info.sql +++ b/tests/cases/standalone/information_schema/cluster_info.sql @@ -3,7 +3,7 @@ USE INFORMATION_SCHEMA; DESC TABLE CLUSTER_INFO; -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\d+\.\d+\.\d+) Version +-- SQLNESS REPLACE (\d+\.\d+(?:\.\d+)+) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -11,7 +11,7 @@ DESC TABLE CLUSTER_INFO; SELECT * FROM CLUSTER_INFO; -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\d+\.\d+\.\d+) Version +-- SQLNESS REPLACE (\d+\.\d+(?:\.\d+)+) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration @@ -21,7 +21,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'STANDALONE'; SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'STANDALONE'; -- SQLNESS REPLACE version node_version --- SQLNESS REPLACE (\d+\.\d+\.\d+) Version +-- SQLNESS REPLACE (\d+\.\d+(?:\.\d+)+) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash -- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration