From b6c45a75c0ece6b1de12f98d14f08b8cdffd96a9 Mon Sep 17 00:00:00 2001 From: Oh-Hyun Kwon Date: Thu, 9 Jan 2025 14:42:10 -0500 Subject: [PATCH] define default values for app as constants --- packages/duckdb-server-rust/src/app.rs | 10 +++++++--- packages/duckdb-server-rust/src/main.rs | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/duckdb-server-rust/src/app.rs b/packages/duckdb-server-rust/src/app.rs index 68f56a75..1fed80e5 100644 --- a/packages/duckdb-server-rust/src/app.rs +++ b/packages/duckdb-server-rust/src/app.rs @@ -34,6 +34,10 @@ async fn handle_get( } } +pub const DEFAULT_DB_PATH: &str = ":memory:"; +pub const DEFAULT_CONNECTION_POOL_SIZE: u32 = 10; +pub const DEFAULT_CACHE_SIZE: usize = 1000; + #[axum::debug_handler] async fn handle_post( State(state): State>, @@ -49,10 +53,10 @@ pub fn app( ) -> Result { // Database and state setup let db = ConnectionPool::new( - dp_path.unwrap_or(":memory:"), - connection_pool_size.unwrap_or(10), + dp_path.unwrap_or(DEFAULT_DB_PATH), + connection_pool_size.unwrap_or(DEFAULT_CONNECTION_POOL_SIZE), )?; - let cache = lru::LruCache::new(cache_size.unwrap_or(1000).try_into()?); + let cache = lru::LruCache::new(cache_size.unwrap_or(DEFAULT_CACHE_SIZE).try_into()?); let state = Arc::new(AppState { db: Box::new(db), diff --git a/packages/duckdb-server-rust/src/main.rs b/packages/duckdb-server-rust/src/main.rs index 141cf074..d2d1ea7a 100644 --- a/packages/duckdb-server-rust/src/main.rs +++ b/packages/duckdb-server-rust/src/main.rs @@ -7,6 +7,10 @@ use std::{net::IpAddr, net::Ipv4Addr, net::SocketAddr, path::PathBuf}; use tokio::net; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; +use crate::app::DEFAULT_DB_PATH; +use crate::app::DEFAULT_CONNECTION_POOL_SIZE; +use crate::app::DEFAULT_CACHE_SIZE; + mod app; mod bundle; mod cache; @@ -19,7 +23,7 @@ mod websocket; #[command(version, about, long_about = None)] struct Args { /// Path of database file (e.g., "database.db". ":memory:" for in-memory database) - #[arg(default_value = ":memory:")] + #[arg(default_value = DEFAULT_DB_PATH)] database: String, /// HTTP Address @@ -31,11 +35,11 @@ struct Args { port: u16, /// Max connection pool size - #[arg(long, default_value_t = 10)] + #[arg(long, default_value_t = DEFAULT_CONNECTION_POOL_SIZE)] connection_pool_size: u32, /// Max number of cache entries - #[arg(long, default_value_t = 1000)] + #[arg(long, default_value_t = DEFAULT_CACHE_SIZE)] cache_size: usize, }