Merge remote-tracking branch 'upstream/main' into rbac_deadlock

Author: ygndotgg

Cargo.lock

@@ -63,52 +63,43 @@ base64 = "0.22.0"
 cookie = "0.18.1"
 hex = "0.4"
 openid = { version = "0.18.3", default-features = false, features = ["rustls"] }
-rustls = { version = "0.23", default-features = false, features = [
+rustls = { version = "0.23.40", default-features = false, features = [
     "ring",
     "std",
 ] }
 rustls-pemfile = "2.1.2"
 sha2 = "0.10.8"
 
 # Serialization and Data Formats
-byteorder = "1.4.3"
+byteorder = "1.5.0"
 erased-serde = "=0.3.16"
-serde = { version = "1.0", features = ["rc", "derive"] }
-serde_json = "1.0"
-serde_repr = "0.1.17"
+serde = { version = "1.0.228", features = ["rc", "derive"] }
+serde_json = "1.0.150"
+serde_repr = "0.1.20"
 
 # Async and Runtime
-async-trait = "0.1"
-futures = "0.3"
-futures-util = "0.3"
-tokio = { version = "^1.43", default-features = false, features = [
+async-trait = "0.1.89"
+futures = "0.3.32"
+futures-util = "0.3.32"
+tokio = { version = "^1.52.3", default-features = false, features = [
     "sync",
     "macros",
     "fs",
     "rt-multi-thread",
 ] }
-tokio-stream = { version = "0.1.17", features = ["fs"] }
-tokio-util = { version = "0.7" }
+tokio-stream = { version = "0.1.18", features = ["fs"] }
+tokio-util = { version = "0.7.18" }
 
 # perf
 hotpath = { version = "0.16.0", optional = true, features = [
     "hotpath",
     "hotpath-cpu",
     "hotpath-alloc",
-    "tokio"
+    "tokio",
 ] }
 
 # # Logging and Metrics
-# opentelemetry-proto = { version = "0.30.0", features = [
-#     "gen-tonic",
-#     "with-serde",
-#     "logs",
-#     "metrics",
-#     "trace",
-# ] }
-
-# add custom branch with fix until it gets merged
-opentelemetry-proto = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "b096b70b2ffe9beb65a716cf47d5e5db80a9e930", features = [
+opentelemetry-proto = { version = "0.32.0", features = [
     "gen-tonic",
     "with-serde",
     "logs",
@@ -147,7 +138,7 @@ humantime-serde = "1.1"
 # File System and I/O
 fs_extra = "1.3"
 path-clean = "1.0.1"
-relative-path = { version = "1.7", features = ["serde"] }
+relative-path = { version = "2.0.1", features = ["serde"] }
 
 # CLI and System
 clap = { version = "4.5", default-features = false, features = [
@@ -159,21 +150,21 @@ clap = { version = "4.5", default-features = false, features = [
     "cargo",
     "error-context",
 ] }
-crossterm = "0.28.1"
+crossterm = "0.29.0"
 hostname = "0.4.0"
 human-size = "0.4"
 num_cpus = "1.15"
-sysinfo = "0.33.1"
+sysinfo = { version = "0.34.2", features = ["multithread"] }
 uptime_lib = "0.3.0"
 
 # Utility Libraries
 anyhow = { version = "1.0", features = ["backtrace"] }
 bytes = "1.11"
 clokwerk = "0.4"
 derive_more = { version = "1", features = ["full"] }
-itertools = "0.14"
+itertools = "0.15.0"
 once_cell = "1.20"
-rayon = "1.8"
+rayon = "1.12.0"
 rand = "0.8.5"
 regex = "1.12.2"
 reqwest = { version = "0.12", default-features = false, features = [
@@ -186,30 +177,43 @@ reqwest = { version = "0.12", default-features = false, features = [
 semver = "1.0"
 static-files = "0.2"
 thiserror = "2.0"
-ulid = { version = "1.0", features = ["serde"] }
-uuid = { version = "1", features = ["v4"] }
-xxhash-rust = { version = "0.8", features = ["xxh3"] }
-rustc-hash = "2"
+ulid = { version = "1.2.1", features = ["serde"] }
+uuid = { version = "1.23.3", features = ["v4"] }
+xxhash-rust = { version = "0.8.15", features = ["xxh3"] }
+rustc-hash = "2.1.2"
 futures-core = "0.3.31"
 tempfile = "3.20.0"
 lazy_static = "1.4.0"
 prost = "0.13.1"
-dashmap = "6.1.0"
+dashmap = "6.2.1"
 parking_lot = "0.12.5"
-indexmap = { version = "2.13.0", features = ["serde"] }
+indexmap = { version = "2.14.0", features = ["serde"] }
+
+[target.'cfg(not(target_env = "msvc"))'.dependencies]
+tikv-jemallocator = { version = "0.7.0", features = [
+    "profiling",
+    "stats",
+    "background_threads",
+] }
+tikv-jemalloc-ctl = { version = "0.7.0", features = ["stats"] }
 
 [build-dependencies]
-cargo_toml = "0.21"
+cargo_toml = "0.22.3"
 sha1_smol = { version = "1.0", features = ["std"] }
 static-files = "0.2"
 ureq = "2.12"
 url = "2.5"
-vergen-gitcl = { version = "1.0", features = ["build", "cargo", "rustc", "si"] }
-zip = { version = "2.3", default-features = false, features = ["deflate"] }
+vergen-gitcl = { version = "9.1.0", features = [
+    "build",
+    "cargo",
+    "rustc",
+    "si",
+] }
+zip = { version = "8.6.0", default-features = false, features = ["deflate"] }
 anyhow = "1.0"
 
 [dev-dependencies]
-rstest = "0.23.0"
+rstest = "0.26.1"
 arrow = "58.0.0"
 temp-dir = "0.1.14"
 

Cargo.toml

@@ -196,6 +196,16 @@ pub struct Options {
     )]
     pub max_connections: usize,
 
+    // SQL timeout in seconds
+    #[arg(
+        long,
+        env = "P_SQL_TIMEOUT",
+        default_value = "300",
+        value_parser = value_parser!(u64).range(5..),
+        help = "SQL execution timeout"
+    )]
+    pub sql_timeout: u64,
+
     // DataFusion target partitions
     #[arg(
         long,

src/cli.rs

@@ -127,9 +127,7 @@ pub async fn update_dashboard(
 
     // Validate: either query params OR body, not both
     let has_query_params = !query_map.is_empty();
-    let has_body_update = dashboard
-        .as_ref()
-        .is_some_and(|d| d.title != existing_dashboard.title || d.tiles.is_some());
+    let has_body_update = dashboard.is_some();
 
     if has_query_params && has_body_update {
         return Err(DashboardError::Metadata(

src/handlers/http/users/dashboards.rs

@@ -35,6 +35,14 @@ use tracing_subscriber::{EnvFilter, Registry, fmt};
 #[cfg_attr(feature = "hotpath", hotpath::main)]
 async fn main() -> anyhow::Result<()> {
     init_logger();
+
+    #[cfg(all(not(target_env = "msvc"), not(feature = "hotpath")))]
+    use tikv_jemallocator::Jemalloc;
+
+    #[cfg(all(not(target_env = "msvc"), not(feature = "hotpath")))]
+    #[global_allocator]
+    static GLOBAL: Jemalloc = Jemalloc;
+
     // Install the rustls crypto provider before any TLS operations.
     // This is required for rustls 0.23+ which needs an explicit crypto provider.
     // If the installation fails, log a warning but continue execution.

src/main.rs

@@ -144,7 +144,14 @@ impl InMemorySessionContext {
 pub async fn execute(query: Query, is_streaming: bool, tenant_id: &Option<String>) -> QueryResult {
     let id = tenant_id.clone();
     QUERY_RUNTIME
-        .spawn(async move { query.execute(is_streaming, &id).await })
+        .spawn(async move {
+            tokio::time::timeout(
+                std::time::Duration::from_secs(PARSEABLE.options.sql_timeout),
+                query.execute(is_streaming, &id),
+            )
+            .await
+            .map_err(|e| ExecuteError::Timeout(e, PARSEABLE.options.sql_timeout))?
+        })
         .await
         .expect("The Join should have been successful")
 }
@@ -903,6 +910,7 @@ pub fn flatten_objects_for_count(objects: Vec<Value>) -> Vec<Value> {
 pub mod error {
     use crate::{parseable::StreamNotFound, storage::ObjectStorageError};
     use datafusion::error::DataFusionError;
+    use tokio::time::error::Elapsed;
 
     #[derive(Debug, thiserror::Error)]
     pub enum ExecuteError {
@@ -912,6 +920,8 @@ pub mod error {
         Datafusion(#[from] DataFusionError),
         #[error("{0}")]
         StreamNotFound(#[from] StreamNotFound),
+        #[error("{0}: {1}s")]
+        Timeout(Elapsed, u64),
     }
 }
 

src/query/mod.rs

@@ -60,7 +60,10 @@ pub struct Users;
 impl Users {
     pub fn put_user(&self, user: User) {
         let userid = user.userid().to_owned(); // 1. Clone userid BEFORE moving user
-        let tenant_id = user.tenant.clone().unwrap_or(DEFAULT_TENANT.to_owned());
+        let tenant_id = user
+            .tenant
+            .clone()
+            .unwrap_or_else(|| DEFAULT_TENANT.to_owned());
         // Lock USERS, insert, and DROP IT
         {
             let mut users = mut_users();

src/rbac/mod.rs

@@ -68,6 +68,9 @@ pub struct Dashboard {
     dashboard_type: Option<DashboardType>,
     pub tiles: Option<Vec<Tile>>,
     pub tenant_id: Option<String>,
+    /// all other fields are variable and can be added as needed
+    #[serde(flatten)]
+    pub other_fields: Option<serde_json::Map<String, Value>>,
 }
 
 impl MetastoreObject for Dashboard {