Skip to content

Commit b6c97a4

Browse files
authored
chore(query): Tuning sort spill memory usage (#18520)
* refine * update * update * update * update * dump fastrace * update * update * fix * fix * test * fix
1 parent 2ba98f2 commit b6c97a4

26 files changed

+928
-268
lines changed

Cargo.lock

Lines changed: 78 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ byte-unit = "5.1.6"
274274
bytemuck = { version = "1", features = ["derive"] }
275275
byteorder = "1.4.3"
276276
bytes = "1.5.0"
277-
bytesize = "1.1.0"
277+
bytesize = "2"
278278
cbordata = { version = "0.6.0" }
279279
cfg-if = "1.0.0"
280280
chrono = { version = "0.4.40", features = ["serde"] }
@@ -568,19 +568,22 @@ vergen = { version = "8.3.1", default-features = false, features = ["build", "ca
568568

569569
# Observability
570570
env_logger = "0.11"
571-
fastrace = { version = "0.7.4", features = ["enable"] }
572-
fastrace-opentelemetry = "0.7.4"
571+
fastrace = { version = "0.7.14", features = ["enable"] }
572+
fastrace-opentelemetry = "0.10"
573573
log = { version = "0.4.27", features = ["serde", "kv_unstable_std"] }
574574
logcall = "0.1.9"
575-
opentelemetry = { version = "0.26.0", features = ["trace", "logs"] }
576-
opentelemetry-otlp = { version = "0.26.0", features = [
575+
opentelemetry = { version = "0.29", features = ["trace", "logs"] }
576+
opentelemetry-otlp = { version = "0.29", default-features = false, features = [
577577
"trace",
578578
"logs",
579+
"metrics",
580+
"internal-logs",
579581
"grpc-tonic",
582+
"gzip-tonic",
580583
"http-proto",
581584
"reqwest-client",
582585
] }
583-
opentelemetry_sdk = { version = "0.26.0", features = ["trace", "logs", "rt-tokio"] }
586+
opentelemetry_sdk = { version = "0.29", features = ["trace", "logs", "rt-tokio"] }
584587
prometheus-client = "0.22"
585588
prometheus-parse = "0.2.3"
586589
tracing = "0.1.40"

scripts/ci/deploy/databend-query-cluster-tracing.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,22 @@ python3 scripts/ci/wait_tcp.py --timeout 30 --port 9191
2929

3030
export RUST_BACKTRACE=1
3131
export LOG_TRACING_ON=true
32+
export LOG_TRACING_CAPTURE_LOG_LEVEL="Warn,databend_=Debug"
3233

3334
echo 'Start databend-query node-1'
34-
nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-1.toml --internal-enable-sandbox-tenant --log-tracing-level Warn,databend_=Debug,openraft=Info >./.databend/query-1.out 2>&1 &
35+
nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-1.toml --internal-enable-sandbox-tenant >./.databend/query-1.out 2>&1 &
3536

3637
echo "Waiting on node-1..."
3738
python3 scripts/ci/wait_tcp.py --timeout 30 --port 9091
3839

3940
echo 'Start databend-query node-2'
40-
nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-2.toml --internal-enable-sandbox-tenant --log-tracing-level Warn,databend_=Debug,openraft=Info >./.databend/query-2.out 2>&1 &
41+
nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-2.toml --internal-enable-sandbox-tenant >./.databend/query-2.out 2>&1 &
4142

4243
echo "Waiting on node-2..."
4344
python3 scripts/ci/wait_tcp.py --timeout 30 --port 9092
4445

4546
echo 'Start databend-query node-3'
46-
nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-3.toml --internal-enable-sandbox-tenant --log-tracing-level Warn,databend_=Debug,openraft=Info >./.databend/query-3.out 2>&1 &
47+
nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-3.toml --internal-enable-sandbox-tenant >./.databend/query-3.out 2>&1 &
4748

4849
echo "Waiting on node-3..."
4950
python3 scripts/ci/wait_tcp.py --timeout 30 --port 9093

src/common/tracing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ log = { workspace = true }
2626
logforth = { workspace = true }
2727
opendal = { workspace = true }
2828
opentelemetry = { workspace = true }
29-
opentelemetry-otlp = { workspace = true, features = ["reqwest-client"] }
29+
opentelemetry-otlp = { workspace = true }
3030
opentelemetry_sdk = { workspace = true }
3131
parquet = { workspace = true }
3232
serde = { workspace = true }

0 commit comments

Comments
 (0)