More code

Author: MasloMaslane

Cargo.lock

@@ -12,4 +12,5 @@ tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 sqlx = { version = "0.8.3", features = ["postgres", "sqlite", "runtime-tokio"]}
-log = "0.4.26"
+log = "0.4.26"
+chrono = "0.4.40"

Cargo.toml

@@ -3,10 +3,17 @@
     "level": "debug",
     "json": false
   },
-  "kvstorage_type": "sqlite",
-  "sqlite": {
-    "path": "kv.db",
-    "pool_size": 10
-  },
-  "locks_type": "memory"
+  "buckets": [
+    {
+      "name": "bucket1",
+      "address": "0.0.0.0",
+      "port": 3000,
+      "kvstorage_type": "sqlite",
+      "sqlite": {
+        "path": "kv.db",
+        "pool_size": 10
+      },
+      "locks_type": "memory"
+    }
+  ]
 }

config.json

@@ -8,6 +8,14 @@ use crate::logging::LoggingConfig;
 #[derive(Debug, serde::Deserialize, Clone)]
 pub struct Config {
     pub logging: LoggingConfig,
+    pub buckets: Vec<BucketConfig>,
+}
+
+#[derive(Debug, serde::Deserialize, Clone)]
+pub struct BucketConfig {
+    pub name: String,
+    pub address: String,
+    pub port: u16,
 
     pub kvstorage_type: KVStorageType,
 

src/config.rs

@@ -1,4 +1,4 @@
-use crate::config::Config;
+use crate::config::BucketConfig;
 use serde::Deserialize;
 use std::error::Error;
 use tracing::{debug, info};
@@ -16,7 +16,7 @@ pub enum KVStorageType {
 }
 
 pub(crate) trait KVStorageTrait {
-    async fn new(config: &Config) -> Result<Box<Self>, Box<dyn Error>>
+    async fn new(config: &BucketConfig) -> Result<Box<Self>, Box<dyn Error>>
     where
         Self: Sized;
 
@@ -72,7 +72,7 @@ pub enum KVStorage {
 }
 
 impl KVStorage {
-    pub async fn new(config: &Config) -> Result<Box<Self>, Box<dyn Error>> {
+    pub async fn new(config: &BucketConfig) -> Result<Box<Self>, Box<dyn Error>> {
         match config.kvstorage_type {
             KVStorageType::Postgres => {
                 info!("Using Postgres as KV storage");

src/kvstorage/mod.rs

@@ -1,4 +1,4 @@
-use crate::config::Config;
+use crate::config::BucketConfig;
 use crate::kvstorage::KVStorageTrait;
 use crate::kvstorage::pooled::{RowModified, RowRefFile, RowRefcount};
 use serde::Deserialize;
@@ -23,7 +23,7 @@ pub struct Postgres {
 }
 
 impl KVStorageTrait for Postgres {
-    async fn new(config: &Config) -> Result<Box<Self>, Box<dyn Error>> {
+    async fn new(config: &BucketConfig) -> Result<Box<Self>, Box<dyn Error>> {
         let pg_config = config.postgres.as_ref().unwrap();
         let db_url = format!(
             "postgres://{}:{}@{}:{}/{}",

src/kvstorage/postgres.rs

@@ -1,5 +1,5 @@
 use std::path::Path;
-use crate::config::Config;
+use crate::config::BucketConfig;
 use crate::kvstorage::KVStorageTrait;
 use crate::kvstorage::pooled::{RowModified, RowRefFile, RowRefcount};
 use serde::Deserialize;
@@ -19,7 +19,7 @@ pub struct SQLite {
 }
 
 impl KVStorageTrait for SQLite {
-    async fn new(config: &Config) -> Result<Box<Self>, Box<dyn std::error::Error>> {
+    async fn new(config: &BucketConfig) -> Result<Box<Self>, Box<dyn std::error::Error>> {
         let sqlite_config = config.sqlite.as_ref().unwrap();
 
         if !Path::new(&sqlite_config.path).exists() {

src/kvstorage/sqlite.rs

@@ -3,6 +3,14 @@ use tracing::{debug, info};
 
 pub mod memory;
 
+pub(crate) fn file_lock(bucket: &str, path: &str) -> String {
+    format!("file:{}:{}", bucket, path)
+}
+
+fn hash_lock(bucket: &str, hash: &str) -> String {
+    format!("hash:{}:{}", bucket, hash)
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub(crate) enum LocksType {
     #[serde(rename = "memory")]