Merge pull request #7426 from TCeason/ISSUE-7422/unify-port

docs: unify port, equal with query-config.md

Author: BohuTANG

docker/databend-query-docker.toml

@@ -6,14 +6,14 @@ max_active_sessions = 256
 wait_timeout_mills = 5000
 
 # For flight rpc.
-flight_api_address = "0.0.0.0:9091"
+flight_api_address = "0.0.0.0:9090"
 
 # Databend Query http address.
 # For admin RESET API.
-admin_api_address = "0.0.0.0:8081"
+admin_api_address = "0.0.0.0:8080"
 
 # Databend Query metrics RESET API.
-metric_api_address = "0.0.0.0:7071"
+metric_api_address = "0.0.0.0:7070"
 
 # Databend Query MySQL Handler.
 mysql_handler_host = "0.0.0.0"
@@ -22,11 +22,11 @@ mysql_handler_port = 3307
 
 # Databend Query ClickHouse HTTP Handler.
 clickhouse_http_handler_host = "0.0.0.0"
-clickhouse_http_handler_port = 8125
+clickhouse_http_handler_port = 8124
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"
-http_handler_port = 8001
+http_handler_port = 8000
 
 tenant_id = "test_tenant"
 cluster_id = "test_cluster"

docs/doc/50-manage/01-query/10-query-config.md

@@ -92,12 +92,6 @@ If `endpoints` is configured, the `address` configuration will no longer take ef
 * Default: `"127.0.0.1"`
 * Env variable: `QUERY_CLICKHOUSE_HANDLER_HOST`
 
-### clickhouse_handler_port
-
-* The port to listen on for ClickHouse handler, e.g., `9000`.
-* Default: `9000`
-* Env variable: `QUERY_CLICKHOUSE_HANDLER_PORT`
-
 ### clickhouse_http_handler_host
 
 * The IP address to listen on for ClickHouse HTTP handler, e.g., `0.0.0.0`.

scripts/ci/deploy/config/databend-query-embedded-meta.toml

@@ -6,26 +6,26 @@ max_active_sessions = 256
 wait_timeout_mills = 5000
 
 # For flight rpc.
-flight_api_address = "0.0.0.0:9091"
+flight_api_address = "0.0.0.0:9090"
 
 # Databend Query http address.
 # For admin RESET API.
-admin_api_address = "0.0.0.0:8081"
+admin_api_address = "0.0.0.0:8080"
 
 # Databend Query metrics RESET API.
-metric_api_address = "0.0.0.0:7071"
+metric_api_address = "0.0.0.0:7070"
 
 # Databend Query MySQL Handler.
 mysql_handler_host = "0.0.0.0"
 mysql_handler_port = 3307
 
 # Databend Query ClickHouse HTTP Handler.
 clickhouse_http_handler_host = "0.0.0.0"
-clickhouse_http_handler_port = 8125
+clickhouse_http_handler_port = 8124
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"
-http_handler_port = 8001
+http_handler_port = 8000
 
 tenant_id = "test_tenant"
 cluster_id = "test_cluster"

scripts/ci/deploy/config/databend-query-node-1.toml

@@ -6,26 +6,26 @@ max_active_sessions = 256
 wait_timeout_mills = 5000
 
 # For flight rpc.
-flight_api_address = "0.0.0.0:9091"
+flight_api_address = "0.0.0.0:9090"
 
 # Databend Query http address.
 # For admin RESET API.
-admin_api_address = "0.0.0.0:8081"
+admin_api_address = "0.0.0.0:8080"
 
 # Databend Query metrics RESET API.
-metric_api_address = "0.0.0.0:7071"
+metric_api_address = "0.0.0.0:7070"
 
 # Databend Query MySQL Handler.
 mysql_handler_host = "0.0.0.0"
 mysql_handler_port = 3307
 
 # Databend Query ClickHouse Handler.
 clickhouse_http_handler_host = "0.0.0.0"
-clickhouse_http_handler_port = 8125
+clickhouse_http_handler_port = 8124
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"
-http_handler_port = 8001
+http_handler_port = 8000
 
 tenant_id = "test_tenant"
 cluster_id = "test_cluster"

tests/logictest/config.py

@@ -11,15 +11,15 @@
 http_config = {
     'user': 'root',
     'host': '127.0.0.1',
-    "port": 8001,
+    "port": 8000,
     'database': 'default',
 }
 
 clickhouse_config = {
     'user': 'root',
     'password': '',
     'host': '127.0.0.1',
-    "port": 8125,
+    "port": 8124,
     'database': 'default',
 }
 

tests/shell_env.sh

@@ -7,8 +7,8 @@ export AWS_EC2_METADATA_DISABLED=true
 export MYSQL_DATABASE=${MYSQL_DATABASE:="default"}
 export QUERY_MYSQL_HANDLER_HOST=${QUERY_MYSQL_HANDLER_HOST:="127.0.0.1"}
 export QUERY_MYSQL_HANDLER_PORT=${QUERY_MYSQL_HANDLER_PORT:="3307"}
-export QUERY_HTTP_HANDLER_PORT=${QUERY_HTTP_HANDLER_PORT:="8001"}
-export QUERY_CLICKHOUSE_HTTP_HANDLER_PORT=${QUERY_CLICKHOUSE_HTTP_HANDLER_PORT:="8125"}
+export QUERY_HTTP_HANDLER_PORT=${QUERY_HTTP_HANDLER_PORT:="8000"}
+export QUERY_CLICKHOUSE_HTTP_HANDLER_PORT=${QUERY_CLICKHOUSE_HTTP_HANDLER_PORT:="8124"}
 
 export MYSQL_CLIENT_CONNECT="mysql -uroot --host ${QUERY_MYSQL_HANDLER_HOST} --port ${QUERY_MYSQL_HANDLER_PORT} ${MYSQL_DATABASE} -s"