Merge branch 'main' into toolchain-11-28

Cargo.toml

@@ -450,6 +450,7 @@ sled = { version = "0.34", default-features = false }
 snailquote = "0.3.1"
 snap = "1"
 socket2 = "0.5.3"
+span-map = { version = "0.2.0" }
 sqlx = { version = "0.8", features = ["mysql", "runtime-tokio"] }
 state = "0.6.0"
 stream-more = "0.1.3"

benchmark/clickbench/benchmark_cloud.sh

@@ -71,13 +71,15 @@ until bendsql --query="SHOW WAREHOUSES LIKE '${CLOUD_WAREHOUSE}'" | grep -q "Run
     sleep 10
 done
 
-export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443/${BENCHMARK_DATABASE}?warehouse=${CLOUD_WAREHOUSE}"
+export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443?warehouse=${CLOUD_WAREHOUSE}"
 
 if [[ "${BENCHMARK_DATASET}" == "load" ]]; then
     echo "Creating database..."
     echo "CREATE DATABASE ${BENCHMARK_DATABASE};" | bendsql --database default
 fi
 
+export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443/${BENCHMARK_DATABASE}?warehouse=${CLOUD_WAREHOUSE}"
+
 echo "Checking session settings..."
 bendsql --query="select * from system.settings where value != default;" -o table
 
@@ -117,6 +119,7 @@ for query in "${BENCHMARK_DATASET}"/queries/*.sql; do
 done
 
 echo "Cleaning up..."
+export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443?login=disable"
 if [[ "${BENCHMARK_DATASET}" == "load" ]]; then
     echo "Dropping database..."
     echo "DROP DATABASE IF EXISTS ${BENCHMARK_DATABASE};" | bendsql

src/common/base/src/rangemap/mod.rs

@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod range_map;
-mod range_map_key;
 mod range_merger;
 
-pub use range_map::RangeMap;
-pub use range_map_key::RangeMapKey;
 pub use range_merger::RangeMerger;