From 3661f7a6adbcb05be08bde3d4363da59a264e65d Mon Sep 17 00:00:00 2001 From: 5kbpers Date: Sat, 7 May 2022 18:39:29 +0800 Subject: [PATCH 1/2] ISSUE-5170 remove stale config items Signed-off-by: 5kbpers --- .../30-sql/70-system-tables/system-configs.md | 2 -- .../30-sql/70-system-tables/system-tracing.md | 2 +- query/src/configs/config_query.rs | 10 ---------- query/tests/it/configs.rs | 8 -------- query/tests/it/storages/system/configs_table.rs | 4 ---- 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/docs/doc/30-reference/30-sql/70-system-tables/system-configs.md b/docs/doc/30-reference/30-sql/70-system-tables/system-configs.md index 6fc02b0f784d1..cc8eda8ac41e3 100644 --- a/docs/doc/30-reference/30-sql/70-system-tables/system-configs.md +++ b/docs/doc/30-reference/30-sql/70-system-tables/system-configs.md @@ -32,8 +32,6 @@ SELECT * FROM system.configs; | rpc_tls_server_key | | query | | | rpc_tls_query_server_root_ca_cert | | query | | | rpc_tls_query_service_domain_name | localhost | query | | -| table_engine_csv_enabled | false | query | | -| table_engine_parquet_enabled | false | query | | | table_engine_memory_enabled | true | query | | | database_engine_github_enabled | true | query | | | wait_timeout_mills | 5000 | query | | diff --git a/docs/doc/30-reference/30-sql/70-system-tables/system-tracing.md b/docs/doc/30-reference/30-sql/70-system-tables/system-tracing.md index 9a3754730278d..38e3f9478ab07 100644 --- a/docs/doc/30-reference/30-sql/70-system-tables/system-tracing.md +++ b/docs/doc/30-reference/30-sql/70-system-tables/system-tracing.md @@ -9,7 +9,7 @@ SELECT * FROM system.tracing LIMIT 1\G *************************** 1. row *************************** v: 0 name: databend-query-test_cluster@0.0.0.0:3307 - msg: Config { config_file: "scripts/ci/deploy/config/databend-query-node-1.toml", query: QueryConfig { tenant_id: "test_tenant", cluster_id: "test_cluster", num_cpus: 10, mysql_handler_host: "0.0.0.0", mysql_handler_port: 3307, max_active_sessions: 256, clickhouse_handler_host: "0.0.0.0", clickhouse_handler_port: 9001, http_handler_host: "0.0.0.0", http_handler_port: 8001, http_handler_result_timeout_millis: 10000, flight_api_address: "0.0.0.0:9091", admin_api_address: "0.0.0.0:8081", metric_api_address: "0.0.0.0:7071", http_handler_tls_server_cert: "", http_handler_tls_server_key: "", http_handler_tls_server_root_ca_cert: "", api_tls_server_cert: "", api_tls_server_key: "", api_tls_server_root_ca_cert: "", rpc_tls_server_cert: "", rpc_tls_server_key: "", rpc_tls_query_server_root_ca_cert: "", rpc_tls_query_service_domain_name: "localhost", table_engine_csv_enabled: true, table_engine_parquet_enabled: true, table_engine_memory_enabled: true, database_engine_github_enabled: true, wait_timeout_mills: 5000, max_query_log_size: 10000, table_cache_enabled: true, table_cache_snapshot_count: 256, table_cache_segment_count: 10240, table_cache_block_meta_count: 102400, table_memory_cache_mb_size: 1024, table_disk_cache_root: "_cache", table_disk_cache_mb_size: 10240, management_mode: false, jwt_key_file: "" }, log: LogConfig { log_level: "INFO", log_dir: "./_logs", log_query_enabled: false }, meta: {meta_address: "0.0.0.0:9191", meta_user: "root", meta_password: "******"}, storage: StorageConfig { storage_type: "disk", storage_num_cpus: 0, disk: FsStorageConfig { data_path: "stateless_test_data", temp_data_path: "" }, s3: {s3.storage.region: "", s3.storage.endpoint_url: "https://s3.amazonaws.com", s3.storage.bucket: "", s3.storage.access_key_id: "", s3.storage.secret_access_key: "", }, azure_storage_blob: {Azure.storage.container: "", } } } + msg: Config { config_file: "scripts/ci/deploy/config/databend-query-node-1.toml", query: QueryConfig { tenant_id: "test_tenant", cluster_id: "test_cluster", num_cpus: 10, mysql_handler_host: "0.0.0.0", mysql_handler_port: 3307, max_active_sessions: 256, clickhouse_handler_host: "0.0.0.0", clickhouse_handler_port: 9001, http_handler_host: "0.0.0.0", http_handler_port: 8001, http_handler_result_timeout_millis: 10000, flight_api_address: "0.0.0.0:9091", admin_api_address: "0.0.0.0:8081", metric_api_address: "0.0.0.0:7071", http_handler_tls_server_cert: "", http_handler_tls_server_key: "", http_handler_tls_server_root_ca_cert: "", api_tls_server_cert: "", api_tls_server_key: "", api_tls_server_root_ca_cert: "", rpc_tls_server_cert: "", rpc_tls_server_key: "", rpc_tls_query_server_root_ca_cert: "", rpc_tls_query_service_domain_name: "localhost", table_engine_memory_enabled: true, database_engine_github_enabled: true, wait_timeout_mills: 5000, max_query_log_size: 10000, table_cache_enabled: true, table_cache_snapshot_count: 256, table_cache_segment_count: 10240, table_cache_block_meta_count: 102400, table_memory_cache_mb_size: 1024, table_disk_cache_root: "_cache", table_disk_cache_mb_size: 10240, management_mode: false, jwt_key_file: "" }, log: LogConfig { log_level: "INFO", log_dir: "./_logs", log_query_enabled: false }, meta: {meta_address: "0.0.0.0:9191", meta_user: "root", meta_password: "******"}, storage: StorageConfig { storage_type: "disk", storage_num_cpus: 0, disk: FsStorageConfig { data_path: "stateless_test_data", temp_data_path: "" }, s3: {s3.storage.region: "", s3.storage.endpoint_url: "https://s3.amazonaws.com", s3.storage.bucket: "", s3.storage.access_key_id: "", s3.storage.secret_access_key: "", }, azure_storage_blob: {Azure.storage.container: "", } } } level: 30 hostname: localhost pid: 24640 diff --git a/query/src/configs/config_query.rs b/query/src/configs/config_query.rs index 051441abfc3b4..bd964fc63ceeb 100644 --- a/query/src/configs/config_query.rs +++ b/query/src/configs/config_query.rs @@ -97,14 +97,6 @@ pub struct QueryConfig { #[clap(long, default_value = "localhost")] pub rpc_tls_query_service_domain_name: String, - /// Table engine csv enabled - #[clap(long)] - pub table_engine_csv_enabled: bool, - - /// Table engine parquet enabled - #[clap(long)] - pub table_engine_parquet_enabled: bool, - /// Table engine memory enabled #[clap(long, parse(try_from_str), default_value = "true")] pub table_engine_memory_enabled: bool, @@ -182,8 +174,6 @@ impl Default for QueryConfig { rpc_tls_server_key: "".to_string(), rpc_tls_query_server_root_ca_cert: "".to_string(), rpc_tls_query_service_domain_name: "localhost".to_string(), - table_engine_csv_enabled: false, - table_engine_parquet_enabled: false, table_engine_memory_enabled: true, database_engine_github_enabled: true, wait_timeout_mills: 5000, diff --git a/query/tests/it/configs.rs b/query/tests/it/configs.rs index 1c2e5092310f0..febdb534d5d72 100644 --- a/query/tests/it/configs.rs +++ b/query/tests/it/configs.rs @@ -52,8 +52,6 @@ rpc_tls_server_cert = "" rpc_tls_server_key = "" rpc_tls_query_server_root_ca_cert = "" rpc_tls_query_service_domain_name = "localhost" -table_engine_csv_enabled = false -table_engine_parquet_enabled = false table_engine_memory_enabled = true database_engine_github_enabled = true wait_timeout_mills = 5000 @@ -140,8 +138,6 @@ fn test_env_config() -> Result<()> { ("STORAGE_S3_ACCESS_KEY_ID", Some("us.key.id")), ("STORAGE_S3_SECRET_ACCESS_KEY", Some("us.key")), ("STORAGE_S3_BUCKET", Some("us.bucket")), - ("QUERY_TABLE_ENGINE_CSV_ENABLED", Some("true")), - ("QUERY_TABLE_ENGINE_PARQUET_ENABLED", Some("true")), ("QUERY_TABLE_ENGINE_MEMORY_ENABLED", Some("true")), ("QUERY_DATABASE_ENGINE_GITHUB_ENABLED", Some("false")), ("CONFIG_FILE", None), @@ -175,8 +171,6 @@ fn test_env_config() -> Result<()> { assert_eq!("us.key", configured.storage.s3.secret_access_key); assert_eq!("us.bucket", configured.storage.s3.bucket); - assert!(configured.query.table_engine_csv_enabled); - assert!(configured.query.table_engine_parquet_enabled); assert!(configured.query.table_engine_memory_enabled); assert!(!configured.query.database_engine_github_enabled); @@ -224,8 +218,6 @@ rpc_tls_server_cert = "" rpc_tls_server_key = "" rpc_tls_query_server_root_ca_cert = "" rpc_tls_query_service_domain_name = "localhost" -table_engine_csv_enabled = false -table_engine_parquet_enabled = false table_engine_memory_enabled = true database_engine_github_enabled = true wait_timeout_mills = 5000 diff --git a/query/tests/it/storages/system/configs_table.rs b/query/tests/it/storages/system/configs_table.rs index 2df856de23d27..56b3ddaaa513e 100644 --- a/query/tests/it/storages/system/configs_table.rs +++ b/query/tests/it/storages/system/configs_table.rs @@ -80,9 +80,7 @@ async fn test_configs_table() -> Result<()> { "| query | table_cache_snapshot_count | 256 | |", "| query | table_disk_cache_mb_size | 1024 | |", "| query | table_disk_cache_root | _cache | |", - "| query | table_engine_csv_enabled | false | |", "| query | table_engine_memory_enabled | true | |", - "| query | table_engine_parquet_enabled | false | |", "| query | table_memory_cache_mb_size | 256 | |", "| query | tenant_id | test | |", "| query | wait_timeout_mills | 5000 | |", @@ -169,9 +167,7 @@ async fn test_configs_table_redact() -> Result<()> { "| query | table_cache_snapshot_count | 256 | |", "| query | table_disk_cache_mb_size | 1024 | |", "| query | table_disk_cache_root | _cache | |", - "| query | table_engine_csv_enabled | false | |", "| query | table_engine_memory_enabled | true | |", - "| query | table_engine_parquet_enabled | false | |", "| query | table_memory_cache_mb_size | 256 | |", "| query | tenant_id | test | |", "| query | wait_timeout_mills | 5000 | |", From 533b3093d310b88c94b87621e3a1869c605810be Mon Sep 17 00:00:00 2001 From: 5kbpers Date: Sat, 7 May 2022 19:11:43 +0800 Subject: [PATCH 2/2] address comments Signed-off-by: 5kbpers --- scripts/ci/deploy/config/databend-query-embedded-meta.toml | 2 -- scripts/ci/deploy/config/databend-query-node-1.toml | 2 -- scripts/ci/deploy/config/databend-query-node-2.toml | 2 -- scripts/ci/deploy/config/databend-query-node-3.toml | 2 -- 4 files changed, 8 deletions(-) diff --git a/scripts/ci/deploy/config/databend-query-embedded-meta.toml b/scripts/ci/deploy/config/databend-query-embedded-meta.toml index 2aee747c51ecf..f0cdd01fab769 100644 --- a/scripts/ci/deploy/config/databend-query-embedded-meta.toml +++ b/scripts/ci/deploy/config/databend-query-embedded-meta.toml @@ -31,8 +31,6 @@ tenant_id = "test_tenant" cluster_id = "test_cluster" table_engine_memory_enabled = true -table_engine_csv_enabled = true -table_engine_parquet_enabled = true database_engine_github_enabled = true [log] diff --git a/scripts/ci/deploy/config/databend-query-node-1.toml b/scripts/ci/deploy/config/databend-query-node-1.toml index 1da20c75c375f..73870bf886ef5 100644 --- a/scripts/ci/deploy/config/databend-query-node-1.toml +++ b/scripts/ci/deploy/config/databend-query-node-1.toml @@ -31,8 +31,6 @@ tenant_id = "test_tenant" cluster_id = "test_cluster" table_engine_memory_enabled = true -table_engine_csv_enabled = true -table_engine_parquet_enabled = true database_engine_github_enabled = true table_cache_enabled = true diff --git a/scripts/ci/deploy/config/databend-query-node-2.toml b/scripts/ci/deploy/config/databend-query-node-2.toml index 556588f291975..8e8186921b942 100644 --- a/scripts/ci/deploy/config/databend-query-node-2.toml +++ b/scripts/ci/deploy/config/databend-query-node-2.toml @@ -31,8 +31,6 @@ tenant_id = "test_tenant" cluster_id = "test_cluster" table_engine_memory_enabled = true -table_engine_csv_enabled = true -table_engine_parquet_enabled = true database_engine_github_enabled = true table_cache_enabled = true diff --git a/scripts/ci/deploy/config/databend-query-node-3.toml b/scripts/ci/deploy/config/databend-query-node-3.toml index 89d5f4faea2f3..de557215c7991 100644 --- a/scripts/ci/deploy/config/databend-query-node-3.toml +++ b/scripts/ci/deploy/config/databend-query-node-3.toml @@ -31,8 +31,6 @@ tenant_id = "test_tenant" cluster_id = "test_cluster" table_engine_memory_enabled = true -table_engine_csv_enabled = true -table_engine_parquet_enabled = true database_engine_github_enabled = true table_cache_enabled = true