diff --git a/Cargo.lock b/Cargo.lock index fcef680d7..4f6269c11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3859,7 +3859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi 0.3.4", - "rustix 0.38.30", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -4556,6 +4556,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -6243,9 +6249,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.34.0" +version = "1.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7de2711cae7bdec993f4d2319352599ceb0d003e9f7900ea7c6ef4c5fc16831" +checksum = "755392e1a2f77afd95580d3f0d0e94ac83eeeb7167552c9b5bca549e61a94d83" dependencies = [ "arrayvec", "borsh", @@ -6288,9 +6294,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.2", "errno", @@ -6344,9 +6350,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" +checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" [[package]] name = "rustls-webpki" @@ -7341,7 +7347,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.30", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -7434,12 +7440,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "fe80ced77cbfb4cb91a94bf72b378b4b6791a0d9b7f09d0be747d1bdff4e68bd" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -7454,10 +7461,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -7497,9 +7505,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -8356,9 +8364,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "which" @@ -8369,7 +8377,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.30", + "rustix 0.38.31", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 610afb655..bae048c77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -189,7 +189,7 @@ base64 = "0.21" bytes = "1.4" byteorder = "1.4.3" chrono = { version = "0.4", default-features = false, features = ["clock"] } -dashmap = { version = "5.4", features = ["serde"] } +dashmap = { version = "5.5", features = ["serde"] } datafusion = "35" datafusion-expr = "35" arrow = { version = "50.0.0", features = ["ipc_compression"] } @@ -197,7 +197,7 @@ arrow-json = "50.0.0" arrow-schema = { version = "50.0.0", features = ["serde"] } parquet = { version = "50.0.0", features = ["arrow", "async", "object_store"] } object_store = { version = "0.9", features = ["aws", "azure", "gcp"] } -dotenv_config = "0.1.7" +dotenv_config = "0.1.8" dotenvy = "0.15" env_logger = "0.10" etcd-client = { version = "0.12", features = ["tls"] } diff --git a/deny.toml b/deny.toml index 84248fece..7ef4a0487 100644 --- a/deny.toml +++ b/deny.toml @@ -20,6 +20,7 @@ exceptions = [ { name = "webpki-roots", allow = ["MPL-2.0"] }, { name = "openobserve", allow = ["AGPL-3.0"] }, { name = "config", allow = ["AGPL-3.0"] }, + { name = "infra", allow = ["AGPL-3.0"] }, { name = "ingester", allow = ["AGPL-3.0"] }, { name = "wal", allow = ["AGPL-3.0"] }, ] diff --git a/src/handler/http/request/search/mod.rs b/src/handler/http/request/search/mod.rs index 8a9fdc284..80802adc8 100644 --- a/src/handler/http/request/search/mod.rs +++ b/src/handler/http/request/search/mod.rs @@ -224,11 +224,6 @@ pub async fn search( res.set_session_id(session_id); res.set_local_took(start.elapsed().as_millis() as usize, took_wait); - println!( - "user {} query {}", - user_id.to_str().unwrap(), - resp.origin_sql - ); let req_stats = RequestStats { records: res.hits.len() as i64, response_time: time, diff --git a/src/service/search/datafusion/exec.rs b/src/service/search/datafusion/exec.rs index e4f56089b..63656d483 100644 --- a/src/service/search/datafusion/exec.rs +++ b/src/service/search/datafusion/exec.rs @@ -1041,7 +1041,7 @@ pub fn create_runtime_env(_work_group: Option) -> Result { if let Ok(wg) = WorkGroup::from_str(&wg) { let (_cpu, mem) = wg.get_resource(); memory_size = memory_size * mem as usize / 100; - log::debug!("[DATAFUSION] group:{} memory size: {}", wg, memory_size); + log::debug!("group:{} memory pool size: {}", wg, memory_size); } } let mem_pool = super::MemoryPoolType::from_str(&CONFIG.memory_cache.datafusion_memory_pool)