Skip to content

Commit

Permalink
chore(query): enable lib test (#15397)
Browse files Browse the repository at this point in the history
* chore(query): enable lib test

* chore(query): enable lib test for all crate

* chore(query): enable lib test for all crate
  • Loading branch information
zhang2014 committed May 6, 2024
1 parent d01fa36 commit 51065f3
Show file tree
Hide file tree
Showing 62 changed files with 71 additions and 135 deletions.
2 changes: 1 addition & 1 deletion src/common/arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "Arrow implementation forked from arrow2 and native format impleme

[lib]
doctest = false
test = false
test = true

[features]
default = ["arrow-default", "parquet-default"]
Expand Down
2 changes: 1 addition & 1 deletion src/common/auth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
base64 = "0.21.0"
Expand Down
2 changes: 1 addition & 1 deletion src/common/base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[features]
tracing = ["tokio/tracing"]
Expand Down
12 changes: 11 additions & 1 deletion src/common/base/src/runtime/memory/mem_stat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl MemStat {
let mut used = self.used.fetch_add(batch_memory_used, Ordering::Relaxed);

used += batch_memory_used;
self.peak_used.fetch_max(used, Ordering::Relaxed);
let old_peak_used = self.peak_used.fetch_max(used, Ordering::Relaxed);

for (idx, parent_memory_stat) in self.parent_memory_stat.iter().enumerate() {
if let Err(cause) = parent_memory_stat
Expand All @@ -108,6 +108,11 @@ impl MemStat {
// We only roll back the memory that alloc failed
self.used.fetch_sub(current_memory_alloc, Ordering::Relaxed);

if used > old_peak_used {
self.peak_used
.fetch_sub(current_memory_alloc, Ordering::Relaxed);
}

for index in 0..idx {
self.parent_memory_stat[index].rollback(current_memory_alloc);
}
Expand All @@ -119,6 +124,11 @@ impl MemStat {

if let Err(cause) = self.check_limit(used) {
if NEED_ROLLBACK {
if used > old_peak_used {
self.peak_used
.fetch_sub(current_memory_alloc, Ordering::Relaxed);
}

// NOTE: we cannot rollback peak_used of parent mem stat in this case
// self.peak_used.store(peak_used, Ordering::Relaxed);
self.rollback(current_memory_alloc);
Expand Down
2 changes: 1 addition & 1 deletion src/common/building/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
anyhow = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/common/cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[features]
heapsize = ["heapsize_"]
Expand Down
2 changes: 1 addition & 1 deletion src/common/cloud_control/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
async-backtrace = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/common/exception/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies] # In alphabetical order
databend-common-arrow = { path = "../arrow" }
Expand Down
2 changes: 1 addition & 1 deletion src/common/grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/common/hashtable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/common/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[features]
memory-profiling = ["tempfile"]
Expand Down
2 changes: 1 addition & 1 deletion src/common/io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/common/license/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/common/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[features]
enable-histogram = ["metrics/enable-histogram"]
Expand Down
2 changes: 1 addition & 1 deletion src/common/openai/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/common/tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[features]
console = ["console-subscriber", "tracing", "tracing-subscriber"]
Expand Down
2 changes: 1 addition & 1 deletion src/common/vector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies] # In alphabetical order
databend-common-exception = { path = "../exception" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/ast/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = false
name = "fuzz_parse_sql"
path = "fuzz_targets/fuzz_parse_sql.rs"
doctest = false
test = false
test = true

[dependencies]
databend-common-ast = { path = ".." }
Expand Down
2 changes: 1 addition & 1 deletion src/query/catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
doctest = false
test = false
test = true

[dependencies]
databend-common-arrow = { path = "../../common/arrow" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[[bin]]
name = "codegen"
Expand Down
2 changes: 1 addition & 1 deletion src/query/constraint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = { workspace = true }
edition = { workspace = true }

[lib]
test = false
test = true

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/datavalues/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies] # In alphabetical order
# Crates.io dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/aggregating_index/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/background_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/data_mask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/inverted_index/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/storage_encryption/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/storage_quota/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/stream_handler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/vacuum_handler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/ee_features/virtual_column/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/expression/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = { workspace = true }
edition = { workspace = true }

[lib]
test = false
test = true

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/query/formats/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies] # In alphabetical order
aho-corasick = { version = "1.0.1" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/management/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[dependencies]
databend-common-base = { path = "../../common/base" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/pipeline/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
doctest = false
test = false
test = true

[dependencies]
databend-common-base = { path = "../../../common/base" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/pipeline/sinks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
doctest = false
test = false
test = true

[dependencies]
databend-common-base = { path = "../../../common/base" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/pipeline/sources/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
doctest = false
test = false
test = true

[package.metadata.cargo-machete]
ignored = ["xml-rs"]
Expand Down
2 changes: 1 addition & 1 deletion src/query/pipeline/transforms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
doctest = false
test = false
test = true

[dependencies]
databend-common-base = { path = "../../../common/base" }
Expand Down
2 changes: 1 addition & 1 deletion src/query/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }

[lib]
doctest = false
test = false
test = true

[features]
default = ["simd", "z3-prove"]
Expand Down
2 changes: 1 addition & 1 deletion src/query/settings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
doctest = false
test = false
test = true

[dependencies]
databend-common-ast = { path = "../ast" }
Expand Down
Loading

0 comments on commit 51065f3

Please sign in to comment.