Skip to content

Commit

Permalink
Merge pull request #5217 from 5kbpers/remove-stale-config
Browse files Browse the repository at this point in the history 
ISSUE-5170 remove stale config items
  • Loading branch information
@BohuTANG
BohuTANG authored May 7, 2022
2 parents d824fd9 + 24c858b commit f139e0c
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 33 deletions.
2 changes: 0 additions & 2 deletions docs/doc/30-reference/30-sql/70-system-tables/system-configs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
Expand Down
2 changes: 1 addition & 1 deletion docs/doc/30-reference/30-sql/70-system-tables/system-tracing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions query/src/configs/config_query.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 0 additions & 8 deletions query/tests/it/configs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions query/tests/it/storages/system/configs_table.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |",
Expand Down Expand Up @@ -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 | |",
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci/deploy/config/databend-query-embedded-meta.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci/deploy/config/databend-query-node-1.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci/deploy/config/databend-query-node-2.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci/deploy/config/databend-query-node-3.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

1 comment on commit f139e0c

@vercel
Copy link

@vercel vercel bot commented on f139e0c May 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

databend – ./

databend.vercel.app
databend-git-main-databend.vercel.app
databend-databend.vercel.app
databend.rs

Please sign in to comment.