Merge remote-tracking branch 'root/main' into feat_refactor_tag

Author: zhyass

.github/actions/test_sqllogic_iceberg_tpch/action.yml

@@ -23,6 +23,13 @@ runs:
       shell: bash
       run: |
         docker compose -f tests/sqllogictests/scripts/docker-compose-iceberg-tpch.yml up -d
+        # Wait for rustfs to be ready
+        for i in $(seq 1 30); do
+          curl -sf http://127.0.0.1:9002/health/ready && break
+          echo "Waiting for rustfs... ($i)"
+          sleep 2
+        done
+        curl -sf http://127.0.0.1:9002/health/ready || { echo "rustfs failed to start after 60s"; exit 1; }
 
         # Prepare Iceberg TPCH data
         data_dir="tests/sqllogictests/data"

Cargo.lock

@@ -166,8 +166,8 @@ databend-storages-common-stage = { path = "src/query/storages/common/stage" }
 databend-storages-common-table-meta = { path = "src/query/storages/common/table_meta" }
 
 # External meta service
-databend-meta = "260312.6.0"
-databend-meta-test-harness = "260312.6.0"
+databend-meta = "260312.7.0"
+databend-meta-test-harness = "260312.7.0"
 
 # External meta client
 databend-meta-client = "260205.5.0"
@@ -619,9 +619,9 @@ backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git", rev = "7226
 color-eyre = { git = "https://github.com/eyre-rs/eyre.git", rev = "e5d92c3" }
 csv-core = { git = "https://github.com/youngsofun/rust-csv.git", rev = "44a0b3c" }
 databend-base = { git = "https://github.com/databendlabs/databend-base", tag = "v0.3.0" }
-databend-meta = { git = "https://github.com/databendlabs/databend-meta", tag = "v260312.6.0" }
+databend-meta = { git = "https://github.com/databendlabs/databend-meta", tag = "v260312.7.0" }
 databend-meta-client = { git = "https://github.com/databendlabs/databend-meta", tag = "v260205.5.0" }
-databend-meta-test-harness = { git = "https://github.com/databendlabs/databend-meta", tag = "v260312.6.0" }
+databend-meta-test-harness = { git = "https://github.com/databendlabs/databend-meta", tag = "v260312.7.0" }
 deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "9954bff" }
 map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.4.2" }
 openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-alpha.17" }

Cargo.toml

@@ -9,8 +9,6 @@ metric_api_address = "0.0.0.0:7070"
 mysql_handler_host = "0.0.0.0"
 mysql_handler_port = 3307
 
-clickhouse_http_handler_host = "0.0.0.0"
-clickhouse_http_handler_port = 8124
 
 http_handler_host = "0.0.0.0"
 http_handler_port = 8000

docker/query-config.toml

@@ -19,9 +19,6 @@ flight_api_address = "0.0.0.0:9091"
 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 = 8124
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"

scripts/ci/deploy/config/databend-query-management-mode.toml

@@ -19,9 +19,6 @@ metric_api_address = "0.0.0.0:7070"
 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 = 8124
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"

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

@@ -19,9 +19,6 @@ metric_api_address = "0.0.0.0:7072"
 mysql_handler_host = "0.0.0.0"
 mysql_handler_port = 3308
 
-# Databend Query ClickHouse Handler.
-clickhouse_http_handler_host = "0.0.0.0"
-clickhouse_http_handler_port = 8126
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"

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

@@ -20,9 +20,6 @@ mysql_handler_host = "0.0.0.0"
 mysql_handler_port = 3309
 
 
-# Databend Query ClickHouse Handler.
-clickhouse_http_handler_host = "0.0.0.0"
-clickhouse_http_handler_port = 8127
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"

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

@@ -19,9 +19,6 @@ metric_api_address = "0.0.0.0:7070"
 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 = 8124
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"

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

@@ -19,9 +19,6 @@ metric_api_address = "0.0.0.0:7070"
 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 = 8124
 
 # Databend Query HTTP Handler.
 http_handler_host = "0.0.0.0"