chore(query): system.tables add table_option, is_external and storage_param filed (#18016)

* chore(query): system.tables add table_option, is_external, storage_param filed

* modify field order

* Pluralize some variables

Author: TCeason

Cargo.lock

@@ -206,8 +206,12 @@ impl Display for StorageParams {
             StorageParams::S3(v) => {
                 write!(
                     f,
-                    "s3 | bucket={},root={},endpoint={}",
-                    v.bucket, v.root, v.endpoint_url
+                    "s3 | bucket={},root={},endpoint={},ak={},iam_role={}",
+                    v.bucket,
+                    v.root,
+                    v.endpoint_url,
+                    &mask_string(&v.access_key_id, 3),
+                    v.role_arn,
                 )
             }
             StorageParams::Webhdfs(v) => {

src/meta/app/src/storage/storage_params.rs

@@ -327,7 +327,7 @@ async fn test_simple_sql() -> Result<()> {
     assert_eq!(result.state, ExecuteStateKind::Succeeded, "{:?}", result);
     assert_eq!(result.next_uri, Some(final_uri.clone()), "{:?}", result);
     assert_eq!(result.data.len(), 10, "{:?}", result);
-    assert_eq!(result.schema.len(), 23, "{:?}", result);
+    assert_eq!(result.schema.len(), 26, "{:?}", result);
 
     // get state
     let uri = result.stats_uri.unwrap();

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

@@ -223,6 +223,8 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
 | 'is_attach'                       | 'system'             | 'tables'                 | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'is_attach'                       | 'system'             | 'tables_with_history'    | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'is_configured'                   | 'system'             | 'users'                  | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
+| 'is_external'                     | 'system'             | 'tables'                 | 'Boolean'             | 'BOOLEAN'           | ''       | ''       | 'NO'     | ''       |
+| 'is_external'                     | 'system'             | 'tables_with_history'    | 'Boolean'             | 'BOOLEAN'           | ''       | ''       | 'NO'     | ''       |
 | 'is_insertable_into'              | 'information_schema' | 'views'                  | 'Boolean'             | 'BOOLEAN'           | ''       | ''       | 'NO'     | ''       |
 | 'is_nullable'                     | 'information_schema' | 'columns'                | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'is_nullable'                     | 'system'             | 'columns'                | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
@@ -406,6 +408,8 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
 | 'status'                          | 'system'             | 'locks'                  | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'status'                          | 'system'             | 'notification_history'   | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'status'                          | 'system'             | 'processes'              | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
+| 'storage_param'                   | 'system'             | 'tables'                 | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
+| 'storage_param'                   | 'system'             | 'tables_with_history'    | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'stream_id'                       | 'system'             | 'streams'                | 'UInt64'              | 'BIGINT UNSIGNED'   | ''       | ''       | 'NO'     | ''       |
 | 'sub_part'                        | 'information_schema' | 'statistics'             | 'NULL'                | 'NULL'              | ''       | ''       | 'NO'     | ''       |
 | 'suspend_task_after_num_failures' | 'system'             | 'tasks'                  | 'Nullable(UInt64)'    | 'BIGINT UNSIGNED'   | ''       | ''       | 'YES'    | ''       |
@@ -434,6 +438,8 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
 | 'table_name'                      | 'information_schema' | 'views'                  | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'table_name'                      | 'system'             | 'streams'                | 'Nullable(String)'    | 'VARCHAR'           | ''       | ''       | 'YES'    | ''       |
 | 'table_name'                      | 'system'             | 'streams_terse'          | 'Nullable(String)'    | 'VARCHAR'           | ''       | ''       | 'YES'    | ''       |
+| 'table_option'                    | 'system'             | 'tables'                 | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
+| 'table_option'                    | 'system'             | 'tables_with_history'    | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'table_rows'                      | 'information_schema' | 'tables'                 | 'Nullable(UInt64)'    | 'BIGINT UNSIGNED'   | ''       | ''       | 'YES'    | ''       |
 | 'table_schema'                    | 'information_schema' | 'columns'                | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'table_schema'                    | 'information_schema' | 'key_column_usage'       | 'NULL'                | 'NULL'              | ''       | ''       | 'NO'     | ''       |

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

@@ -35,6 +35,7 @@ databend-common-storages-stream = { workspace = true }
 databend-common-storages-view = { workspace = true }
 databend-common-users = { workspace = true }
 databend-storages-common-cache = { workspace = true }
+databend-storages-common-table-meta = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
 jiff = { workspace = true }