Skip to content

Commit 417a4a9

Browse files
authored
Merge pull request #10528 from TCeason/ISSUE-10562
feat(query): system.tables add engine_full column
2 parents e9142ae + 4bece32 commit 417a4a9

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

src/query/service/tests/it/servers/http/http_query_handlers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ async fn test_simple_sql() -> Result<()> {
126126
assert_eq!(result.state, ExecuteStateKind::Succeeded, "{:?}", result);
127127
assert_eq!(result.next_uri, Some(final_uri.clone()), "{:?}", result);
128128
assert_eq!(result.data.len(), 10, "{:?}", result);
129-
assert_eq!(result.schema.len(), 11, "{:?}", result);
129+
assert_eq!(result.schema.len(), 12, "{:?}", result);
130130

131131
// get state
132132
let uri = make_state_uri(query_id);

src/query/service/tests/it/storages/testdata/columns_table.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
9292
| "engine" | "information_schema" | "tables" | "String" | "VARCHAR" | "" | "" | "NO" | "" |
9393
| "engine" | "system" | "tables" | "String" | "VARCHAR" | "" | "" | "NO" | "" |
9494
| "engine" | "system" | "tables_with_history" | "String" | "VARCHAR" | "" | "" | "NO" | "" |
95+
| "engine_full" | "system" | "tables" | "String" | "VARCHAR" | "" | "" | "NO" | "" |
96+
| "engine_full" | "system" | "tables_with_history" | "String" | "VARCHAR" | "" | "" | "NO" | "" |
9597
| "entry" | "system" | "tracing" | "String" | "VARCHAR" | "" | "" | "NO" | "" |
9698
| "event_date" | "system" | "query_log" | "Date" | "DATE" | "" | "" | "NO" | "" |
9799
| "event_time" | "system" | "query_log" | "Timestamp" | "TIMESTAMP" | "" | "" | "NO" | "" |

src/query/storages/system/src/tables_table.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ where TablesTable<T>: HistoryAware
136136
.iter()
137137
.map(|v| v.engine().as_bytes().to_vec())
138138
.collect();
139+
let engines_full: Vec<Vec<u8>> = engines.clone();
139140
let created_owns: Vec<String> = database_tables
140141
.iter()
141142
.map(|v| {
@@ -177,6 +178,7 @@ where TablesTable<T>: HistoryAware
177178
StringType::from_data(databases),
178179
StringType::from_data(names),
179180
StringType::from_data(engines),
181+
StringType::from_data(engines_full),
180182
StringType::from_data(cluster_bys),
181183
StringType::from_data(created_owns),
182184
StringType::from_data(dropped_owns),
@@ -197,6 +199,7 @@ where TablesTable<T>: HistoryAware
197199
TableField::new("database", TableDataType::String),
198200
TableField::new("name", TableDataType::String),
199201
TableField::new("engine", TableDataType::String),
202+
TableField::new("engine_full", TableDataType::String),
200203
TableField::new("cluster_by", TableDataType::String),
201204
TableField::new("created_on", TableDataType::String),
202205
TableField::new("dropped_on", TableDataType::String),

0 commit comments

Comments
 (0)