Restore working code

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "herodb"
 version = "0.0.1"
-authors = ["Pin Fang <fpfangpin@hotmail.com>"]
-edition = "2021"
+authors = ["ThreeFold Tech NV"]
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.59"
@@ -24,7 +24,7 @@ age = "0.10"
 secrecy = "0.8"
 ed25519-dalek = "2"
 base64 = "0.22"
-tantivy = "0.25.0"
+jsonrpsee = { version = "0.26.0", features = ["http-client", "ws-client", "server", "macros"] }
 
 [dev-dependencies]
 redis = { version = "0.24", features = ["aio", "tokio-comp"] }

README.md

@@ -47,13 +47,13 @@ You can start HeroDB with different backends and encryption options:
 #### `redb` with Encryption
 
 ```bash
-./target/release/herodb --dir /tmp/herodb_encrypted --port 6379 --encrypt --key mysecretkey
+./target/release/herodb --dir /tmp/herodb_encrypted --port 6379 --encrypt --encryption_key mysecretkey
 ```
 
 #### `sled` with Encryption
 
 ```bash
-./target/release/herodb --dir /tmp/herodb_sled_encrypted --port 6379 --sled --encrypt --key mysecretkey
+./target/release/herodb --dir /tmp/herodb_sled_encrypted --port 6379 --sled --encrypt --encryption_key mysecretkey
 ```
 
 ## Usage with Redis Clients

examples/age_persist_demo.rs

@@ -14,31 +14,25 @@ fn read_reply(s: &mut TcpStream) -> String {
     let n = s.read(&mut buf).unwrap();
     String::from_utf8_lossy(&buf[..n]).to_string()
 }
-fn parse_two_bulk(reply: &str) -> Option<(String, String)> {
+fn parse_two_bulk(reply: &str) -> Option<(String,String)> {
     let mut lines = reply.split("\r\n");
-    if lines.next()? != "*2" {
-        return None;
-    }
+    if lines.next()? != "*2" { return None; }
     let _n = lines.next()?;
     let a = lines.next()?.to_string();
     let _m = lines.next()?;
     let b = lines.next()?.to_string();
-    Some((a, b))
+    Some((a,b))
 }
 fn parse_bulk(reply: &str) -> Option<String> {
     let mut lines = reply.split("\r\n");
     let hdr = lines.next()?;
-    if !hdr.starts_with('$') {
-        return None;
-    }
+    if !hdr.starts_with('$') { return None; }
     Some(lines.next()?.to_string())
 }
 fn parse_simple(reply: &str) -> Option<String> {
     let mut lines = reply.split("\r\n");
     let hdr = lines.next()?;
-    if !hdr.starts_with('+') {
-        return None;
-    }
+    if !hdr.starts_with('+') { return None; }
     Some(hdr[1..].to_string())
 }
 
@@ -51,43 +45,37 @@ fn main() {
     let mut s = TcpStream::connect(addr).expect("connect");
 
     // Generate & persist X25519 enc keys under name "alice"
-    s.write_all(arr(&["age", "keygen", "alice"]).as_bytes())
-        .unwrap();
+    s.write_all(arr(&["age","keygen","alice"]).as_bytes()).unwrap();
     let (_alice_recip, _alice_ident) = parse_two_bulk(&read_reply(&mut s)).expect("gen enc");
 
     // Generate & persist Ed25519 signing key under name "signer"
-    s.write_all(arr(&["age", "signkeygen", "signer"]).as_bytes())
-        .unwrap();
+    s.write_all(arr(&["age","signkeygen","signer"]).as_bytes()).unwrap();
     let (_verify, _secret) = parse_two_bulk(&read_reply(&mut s)).expect("gen sign");
 
     // Encrypt by name
     let msg = "hello from persistent keys";
-    s.write_all(arr(&["age", "encryptname", "alice", msg]).as_bytes())
-        .unwrap();
+    s.write_all(arr(&["age","encryptname","alice", msg]).as_bytes()).unwrap();
     let ct_b64 = parse_bulk(&read_reply(&mut s)).expect("ct b64");
     println!("ciphertext b64: {}", ct_b64);
 
     // Decrypt by name
-    s.write_all(arr(&["age", "decryptname", "alice", &ct_b64]).as_bytes())
-        .unwrap();
+    s.write_all(arr(&["age","decryptname","alice", &ct_b64]).as_bytes()).unwrap();
     let pt = parse_bulk(&read_reply(&mut s)).expect("pt");
     assert_eq!(pt, msg);
     println!("decrypted ok");
 
     // Sign by name
-    s.write_all(arr(&["age", "signname", "signer", msg]).as_bytes())
-        .unwrap();
+    s.write_all(arr(&["age","signname","signer", msg]).as_bytes()).unwrap();
     let sig_b64 = parse_bulk(&read_reply(&mut s)).expect("sig b64");
 
     // Verify by name
-    s.write_all(arr(&["age", "verifyname", "signer", msg, &sig_b64]).as_bytes())
-        .unwrap();
+    s.write_all(arr(&["age","verifyname","signer", msg, &sig_b64]).as_bytes()).unwrap();
     let ok = parse_simple(&read_reply(&mut s)).expect("verify");
     assert_eq!(ok, "1");
     println!("signature verified");
 
     // List names
-    s.write_all(arr(&["age", "list"]).as_bytes()).unwrap();
+    s.write_all(arr(&["age","list"]).as_bytes()).unwrap();
     let list = read_reply(&mut s);
     println!("LIST -> {list}");
 

examples/tantivy_search_demo.sh

@@ -1,239 +0,0 @@
-#!/bin/bash
-
-# HeroDB Tantivy Search Demo
-# This script demonstrates full-text search capabilities using Redis commands
-# HeroDB server should be running on port 6381
-
-set -e  # Exit on any error
-
-# Configuration
-REDIS_HOST="localhost"
-REDIS_PORT="6382"
-REDIS_CLI="redis-cli -h $REDIS_HOST -p $REDIS_PORT"
-
-# Start the herodb server in the background
-echo "Starting herodb server..."
-cargo run -p herodb -- --dir /tmp/herodbtest --port ${REDIS_PORT} --debug &
-SERVER_PID=$!
-echo
-sleep 2 # Give the server a moment to start
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-BLUE='\033[0;34m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-# Function to print colored output
-print_header() {
-    echo -e "${BLUE}=== $1 ===${NC}"
-}
-
-print_success() {
-    echo -e "${GREEN}✓ $1${NC}"
-}
-
-print_info() {
-    echo -e "${YELLOW}ℹ $1${NC}"
-}
-
-print_error() {
-    echo -e "${RED}✗ $1${NC}"
-}
-
-# Function to check if HeroDB is running
-check_herodb() {
-    print_info "Checking if HeroDB is running on port $REDIS_PORT..."
-    if ! $REDIS_CLI ping > /dev/null 2>&1; then
-        print_error "HeroDB is not running on port $REDIS_PORT"
-        print_info "Please start HeroDB with: cargo run -- --port $REDIS_PORT"
-        exit 1
-    fi
-    print_success "HeroDB is running and responding"
-}
-
-# Function to execute Redis command with error handling
-execute_cmd() {
-    local description="${@: -1}"
-    set -- "${@:1:$(($#-1))}"
-    
-    echo -e "${YELLOW}Command:${NC} $(printf '%q ' "$@")"
-    if result=$($REDIS_CLI "$@" 2>&1); then
-        echo -e "${GREEN}Result:${NC} $result"
-        return 0
-    else
-        print_error "Failed: $description"
-        echo "Error: $result"
-        return 1
-    fi
-}
-
-# Function to pause for readability
-pause() {
-    echo
-    read -p "Press Enter to continue..."
-    echo
-}
-
-# Main demo function
-main() {
-    clear
-    print_header "HeroDB Tantivy Search Demonstration"
-    echo "This demo shows full-text search capabilities using Redis commands"
-    echo "HeroDB runs on port $REDIS_PORT (instead of Redis default 6379)"
-    echo
-
-    # Check if HeroDB is running
-    check_herodb
-    echo
-
-    print_header "Step 1: Create Search Index"
-    print_info "Creating a product catalog search index with various field types"
-    
-    # Create search index with schema
-    execute_cmd FT.CREATE product_catalog SCHEMA title TEXT description TEXT category TAG price NUMERIC rating NUMERIC location GEO \
-                "Creating search index"
-    
-    print_success "Search index 'product_catalog' created successfully"
-    pause
-
-    print_header "Step 2: Add Sample Products"
-    print_info "Adding sample products to demonstrate different search scenarios"
-    
-    # Add sample products using FT.ADD
-    execute_cmd FT.ADD product_catalog product:1 1.0 title 'Wireless Bluetooth Headphones' description 'Premium noise-canceling headphones with 30-hour battery life' category 'electronics,audio' price 299.99 rating 4.5 location '-122.4194,37.7749' "Adding product 1"
-    execute_cmd FT.ADD product_catalog product:2 1.0 title 'Organic Coffee Beans' description 'Single-origin Ethiopian coffee beans, medium roast' category 'food,beverages,organic' price 24.99 rating 4.8 location '-74.0060,40.7128' "Adding product 2"
-    execute_cmd FT.ADD product_catalog product:3 1.0 title 'Yoga Mat Premium' description 'Eco-friendly yoga mat with superior grip and cushioning' category 'fitness,wellness,eco-friendly' price 89.99 rating 4.3 location '-118.2437,34.0522' "Adding product 3"
-    execute_cmd FT.ADD product_catalog product:4 1.0 title 'Smart Home Speaker' description 'Voice-controlled smart speaker with AI assistant' category 'electronics,smart-home' price 149.99 rating 4.2 location '-87.6298,41.8781' "Adding product 4"
-    execute_cmd FT.ADD product_catalog product:5 1.0 title 'Organic Green Tea' description 'Premium organic green tea leaves from Japan' category 'food,beverages,organic,tea' price 18.99 rating 4.7 location '139.6503,35.6762' "Adding product 5"
-    execute_cmd FT.ADD product_catalog product:6 1.0 title 'Wireless Gaming Mouse' description 'High-precision gaming mouse with RGB lighting' category 'electronics,gaming' price 79.99 rating 4.4 location '-122.3321,47.6062' "Adding product 6"
-    execute_cmd FT.ADD product_catalog product:7 1.0 title 'Comfortable meditation cushion for mindfulness practice' description 'Meditation cushion with premium materials' category 'wellness,meditation' price 45.99 rating 4.6 location '-122.4194,37.7749' "Adding product 7"
-    execute_cmd FT.ADD product_catalog product:8 1.0 title 'Bluetooth Earbuds' description 'True wireless earbuds with active noise cancellation' category 'electronics,audio' price 199.99 rating 4.1 location '-74.0060,40.7128' "Adding product 8"
-    
-    print_success "Added 8 products to the index"
-    pause
-
-    print_header "Step 3: Basic Text Search"
-    print_info "Searching for 'wireless' products"
-    
-    execute_cmd FT.SEARCH product_catalog wireless "Basic text search"
-    pause
-
-    print_header "Step 4: Search with Filters"
-    print_info "Searching for 'organic' products"
-    
-    execute_cmd FT.SEARCH product_catalog organic "Filtered search"
-    pause
-
-    print_header "Step 5: Numeric Range Search"
-    print_info "Searching for 'premium' products"
-    
-    execute_cmd FT.SEARCH product_catalog premium "Text search"
-    pause
-
-    print_header "Step 6: Sorting Results"
-    print_info "Searching for electronics"
-    
-    execute_cmd FT.SEARCH product_catalog electronics "Category search"
-    pause
-
-    print_header "Step 7: Limiting Results"
-    print_info "Searching for wireless products with limit"
-    
-    execute_cmd FT.SEARCH product_catalog wireless LIMIT 0 3 "Limited results"
-    pause
-
-    print_header "Step 8: Complex Query"
-    print_info "Finding audio products with noise cancellation"
-    
-    execute_cmd FT.SEARCH product_catalog 'noise cancellation' "Complex query"
-    pause
-
-    print_header "Step 9: Geographic Search"
-    print_info "Searching for meditation products"
-    
-    execute_cmd FT.SEARCH product_catalog meditation "Text search"
-    pause
-
-    print_header "Step 10: Aggregation Example"
-    print_info "Getting index information and statistics"
-    
-    execute_cmd FT.INFO product_catalog "Index information"
-    pause
-
-    print_header "Step 11: Search Comparison"
-    print_info "Comparing Tantivy search vs simple key matching"
-    
-    echo -e "${YELLOW}Tantivy Full-Text Search:${NC}"
-    execute_cmd FT.SEARCH product_catalog 'battery life' "Full-text search for 'battery life'"
-    
-    echo
-    echo -e "${YELLOW}Simple Key Pattern Matching:${NC}"
-    execute_cmd KEYS *battery* "Simple pattern matching for 'battery'"
-    
-    print_info "Notice how full-text search finds relevant results even when exact words don't match keys"
-    pause
-
-    print_header "Step 12: Fuzzy Search"
-    print_info "Searching for headphones"
-    
-    execute_cmd FT.SEARCH product_catalog headphones "Text search"
-    pause
-
-    print_header "Step 13: Phrase Search"
-    print_info "Searching for coffee products"
-    
-    execute_cmd FT.SEARCH product_catalog coffee "Text search"
-    pause
-
-    print_header "Step 14: Boolean Queries"
-    print_info "Searching for gaming products"
-    
-    execute_cmd FT.SEARCH product_catalog gaming "Text search"
-    echo
-    execute_cmd FT.SEARCH product_catalog tea "Text search"
-    pause
-
-    print_header "Step 15: Cleanup"
-    print_info "Removing test data"
-    
-    # Delete the search index
-    execute_cmd FT.DROP product_catalog "Dropping search index"
-    
-    # Clean up documents from search index
-    for i in {1..8}; do
-        execute_cmd FT.DEL product_catalog product:$i "Deleting product:$i from index"
-    done
-    
-    print_success "Cleanup completed"
-    echo
-
-    print_header "Demo Summary"
-    echo "This demonstration showed:"
-    echo "• Creating search indexes with different field types"
-    echo "• Adding documents to the search index"
-    echo "• Basic and advanced text search queries"
-    echo "• Filtering by categories and numeric ranges"
-    echo "• Sorting and limiting results"
-    echo "• Geographic searches"
-    echo "• Fuzzy matching and phrase searches"
-    echo "• Boolean query operators"
-    echo "• Comparison with simple pattern matching"
-    echo
-    print_success "HeroDB Tantivy search demo completed successfully!"
-    echo
-    print_info "Key advantages of Tantivy full-text search:"
-    echo "  - Relevance scoring and ranking"
-    echo "  - Fuzzy matching and typo tolerance"
-    echo "  - Complex boolean queries"
-    echo "  - Field-specific searches and filters"
-    echo "  - Geographic and numeric range queries"
-    echo "  - Much faster than pattern matching on large datasets"
-    echo
-    print_info "To run HeroDB server: cargo run -- --port 6381"
-    print_info "To connect with redis-cli: redis-cli -h localhost -p 6381"
-}
-
-# Run the demo
-main "$@"

examples/test_tantivy_integration.sh

@@ -1,101 +0,0 @@
-#!/bin/bash
-
-# Simple Tantivy Search Integration Test for HeroDB
-# This script tests the full-text search functionality we just integrated
-
-set -e
-
-echo "🔍 Testing Tantivy Search Integration..."
-
-# Build the project first
-echo "📦 Building HeroDB..."
-cargo build --release
-
-# Start the server in the background
-echo "🚀 Starting HeroDB server on port 6379..."
-cargo run --release -- --port 6379 --dir ./test_data &
-SERVER_PID=$!
-
-# Wait for server to start
-sleep 3
-
-# Function to cleanup on exit
-cleanup() {
-    echo "🧹 Cleaning up..."
-    kill $SERVER_PID 2>/dev/null || true
-    rm -rf ./test_data
-    exit
-}
-
-# Set trap for cleanup
-trap cleanup EXIT INT TERM
-
-# Function to execute Redis command
-execute_cmd() {
-    local cmd="$1"
-    local description="$2"
-    
-    echo "📝 $description"
-    echo "   Command: $cmd"
-    
-    if result=$(redis-cli -p 6379 $cmd 2>&1); then
-        echo "   ✅ Result: $result"
-        echo
-        return 0
-    else
-        echo "   ❌ Failed: $result"
-        echo
-        return 1
-    fi
-}
-
-echo "🧪 Running Tantivy Search Tests..."
-echo
-
-# Test 1: Create a search index
-execute_cmd "ft.create books SCHEMA title TEXT description TEXT author TEXT category TAG price NUMERIC" \
-           "Creating search index 'books'"
-
-# Test 2: Add documents to the index
-execute_cmd "ft.add books book1 1.0 title \"The Great Gatsby\" description \"A classic American novel about the Jazz Age\" author \"F. Scott Fitzgerald\" category \"fiction,classic\" price \"12.99\"" \
-           "Adding first book"
-
-execute_cmd "ft.add books book2 1.0 title \"To Kill a Mockingbird\" description \"A novel about racial injustice in the American South\" author \"Harper Lee\" category \"fiction,classic\" price \"14.99\"" \
-           "Adding second book"
-
-execute_cmd "ft.add books book3 1.0 title \"Programming Rust\" description \"A comprehensive guide to Rust programming language\" author \"Jim Blandy\" category \"programming,technical\" price \"49.99\"" \
-           "Adding third book"
-
-execute_cmd "ft.add books book4 1.0 title \"The Rust Programming Language\" description \"The official book on Rust programming\" author \"Steve Klabnik\" category \"programming,technical\" price \"39.99\"" \
-           "Adding fourth book"
-
-# Test 3: Basic search
-execute_cmd "ft.search books Rust" \
-           "Searching for 'Rust'"
-
-# Test 4: Search with filters
-execute_cmd "ft.search books programming FILTER category programming" \
-           "Searching for 'programming' with category filter"
-
-# Test 5: Search with limit
-execute_cmd "ft.search books \"*\" LIMIT 0 2" \
-           "Getting first 2 documents"
-
-# Test 6: Get index info
-execute_cmd "ft.info books" \
-           "Getting index information"
-
-# Test 7: Delete a document
-execute_cmd "ft.del books book1" \
-           "Deleting book1"
-
-# Test 8: Search again to verify deletion
-execute_cmd "ft.search books Gatsby" \
-           "Searching for deleted book"
-
-# Test 9: Drop the index
-execute_cmd "ft.drop books" \
-           "Dropping the index"
-
-echo "🎉 All tests completed successfully!"
-echo "✅ Tantivy search integration is working correctly"

src/age.rs

@@ -12,17 +12,17 @@
 
 use std::str::FromStr;
 
-use age::x25519;
-use age::{Decryptor, Encryptor};
 use secrecy::ExposeSecret;
+use age::{Decryptor, Encryptor};
+use age::x25519;
 
-use ed25519_dalek::{Signature, Signer, SigningKey, Verifier, VerifyingKey};
+use ed25519_dalek::{Signature, Signer, Verifier, SigningKey, VerifyingKey};
 
 use base64::{engine::general_purpose::STANDARD as B64, Engine as _};
 
-use crate::error::DBError;
 use crate::protocol::Protocol;
 use crate::server::Server;
+use crate::error::DBError;
 
 // ---------- Internal helpers ----------
 
@@ -83,8 +83,8 @@ pub fn gen_enc_keypair() -> (String, String) {
 }
 
 pub fn gen_sign_keypair() -> (String, String) {
-    use rand::rngs::OsRng;
     use rand::RngCore;
+    use rand::rngs::OsRng;
     
     // Generate random 32 bytes for the signing key
     let mut secret_bytes = [0u8; 32];
@@ -103,18 +103,14 @@ pub fn gen_sign_keypair() -> (String, String) {
 /// Encrypt `msg` for `recipient_str` (X25519). Returns base64(ciphertext).
 pub fn encrypt_b64(recipient_str: &str, msg: &str) -> Result<String, AgeWireError> {
     let recipient = parse_recipient(recipient_str)?;
-    let enc =
-        Encryptor::with_recipients(vec![Box::new(recipient)]).expect("failed to create encryptor"); // Handle Option<Encryptor>
+    let enc = Encryptor::with_recipients(vec![Box::new(recipient)])
+        .expect("failed to create encryptor"); // Handle Option<Encryptor>
     let mut out = Vec::new();
     {
         use std::io::Write;
-        let mut w = enc
-            .wrap_output(&mut out)
-            .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-        w.write_all(msg.as_bytes())
-            .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
-        w.finish()
-            .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
+        let mut w = enc.wrap_output(&mut out).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
+        w.write_all(msg.as_bytes()).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
+        w.finish().map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     }
     Ok(B64.encode(out))
 }
@@ -122,27 +118,19 @@ pub fn encrypt_b64(recipient_str: &str, msg: &str) -> Result<String, AgeWireErro
 /// Decrypt base64(ciphertext) with `identity_str`. Returns plaintext String.
 pub fn decrypt_b64(identity_str: &str, ct_b64: &str) -> Result<String, AgeWireError> {
     let id = parse_identity(identity_str)?;
-    let ct = B64
-        .decode(ct_b64.as_bytes())
-        .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
+    let ct = B64.decode(ct_b64.as_bytes()).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     let dec = Decryptor::new(&ct[..]).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     
     // The decrypt method returns a Result<StreamReader, DecryptError>
     let mut r = match dec {
-        Decryptor::Recipients(d) => d
-            .decrypt(std::iter::once(&id as &dyn age::Identity))
+        Decryptor::Recipients(d) => d.decrypt(std::iter::once(&id as &dyn age::Identity))
             .map_err(|e| AgeWireError::Crypto(e.to_string()))?,
-        Decryptor::Passphrase(_) => {
-            return Err(AgeWireError::Crypto(
-                "Expected recipients, got passphrase".to_string(),
-            ))
-        }
+        Decryptor::Passphrase(_) => return Err(AgeWireError::Crypto("Expected recipients, got passphrase".to_string())),
     };
     
     let mut pt = Vec::new();
     use std::io::Read;
-    r.read_to_end(&mut pt)
-        .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
+    r.read_to_end(&mut pt).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     String::from_utf8(pt).map_err(|_| AgeWireError::Utf8)
 }
 
@@ -156,9 +144,7 @@ pub fn sign_b64(signing_secret_str: &str, msg: &str) -> Result<String, AgeWireEr
 /// Verify detached signature (base64) for `msg` with pubkey.
 pub fn verify_b64(verify_pub_str: &str, msg: &str, sig_b64: &str) -> Result<bool, AgeWireError> {
     let verifying_key = parse_ed25519_verifying_key(verify_pub_str)?;
-    let sig_bytes = B64
-        .decode(sig_b64.as_bytes())
-        .map_err(|e| AgeWireError::Crypto(e.to_string()))?;
+    let sig_bytes = B64.decode(sig_b64.as_bytes()).map_err(|e| AgeWireError::Crypto(e.to_string()))?;
     if sig_bytes.len() != 64 {
         return Err(AgeWireError::SignatureLen);
     }
@@ -169,49 +155,30 @@ pub fn verify_b64(verify_pub_str: &str, msg: &str, sig_b64: &str) -> Result<bool
 // ---------- Storage helpers ----------
 
 fn sget(server: &Server, key: &str) -> Result<Option<String>, AgeWireError> {
-    let st = server
-        .current_storage()
-        .map_err(|e| AgeWireError::Storage(e.0))?;
+    let st = server.current_storage().map_err(|e| AgeWireError::Storage(e.0))?;
     st.get(key).map_err(|e| AgeWireError::Storage(e.0))
 }
 fn sset(server: &Server, key: &str, val: &str) -> Result<(), AgeWireError> {
-    let st = server
-        .current_storage()
-        .map_err(|e| AgeWireError::Storage(e.0))?;
-    st.set(key.to_string(), val.to_string())
-        .map_err(|e| AgeWireError::Storage(e.0))
+    let st = server.current_storage().map_err(|e| AgeWireError::Storage(e.0))?;
+    st.set(key.to_string(), val.to_string()).map_err(|e| AgeWireError::Storage(e.0))
 }
 
-fn enc_pub_key_key(name: &str) -> String {
-    format!("age:key:{name}")
-}
-fn enc_priv_key_key(name: &str) -> String {
-    format!("age:privkey:{name}")
-}
-fn sign_pub_key_key(name: &str) -> String {
-    format!("age:signpub:{name}")
-}
-fn sign_priv_key_key(name: &str) -> String {
-    format!("age:signpriv:{name}")
-}
+fn enc_pub_key_key(name: &str) -> String { format!("age:key:{name}") }
+fn enc_priv_key_key(name: &str) -> String { format!("age:privkey:{name}") }
+fn sign_pub_key_key(name: &str) -> String { format!("age:signpub:{name}") }
+fn sign_priv_key_key(name: &str) -> String { format!("age:signpriv:{name}") }
 
 // ---------- Command handlers (RESP Protocol) ----------
 // Basic (stateless) ones kept for completeness
 
 pub async fn cmd_age_genenc() -> Protocol {
     let (recip, ident) = gen_enc_keypair();
-    Protocol::Array(vec![
-        Protocol::BulkString(recip),
-        Protocol::BulkString(ident),
-    ])
+    Protocol::Array(vec![Protocol::BulkString(recip), Protocol::BulkString(ident)])
 }
 
 pub async fn cmd_age_gensign() -> Protocol {
     let (verify, secret) = gen_sign_keypair();
-    Protocol::Array(vec![
-        Protocol::BulkString(verify),
-        Protocol::BulkString(secret),
-    ])
+    Protocol::Array(vec![Protocol::BulkString(verify), Protocol::BulkString(secret)])
 }
 
 pub async fn cmd_age_encrypt(recipient: &str, message: &str) -> Protocol {
@@ -247,30 +214,16 @@ pub async fn cmd_age_verify(verify_pub: &str, message: &str, sig_b64: &str) -> P
 
 pub async fn cmd_age_keygen(server: &Server, name: &str) -> Protocol {
     let (recip, ident) = gen_enc_keypair();
-    if let Err(e) = sset(server, &enc_pub_key_key(name), &recip) {
-        return e.to_protocol();
-    }
-    if let Err(e) = sset(server, &enc_priv_key_key(name), &ident) {
-        return e.to_protocol();
-    }
-    Protocol::Array(vec![
-        Protocol::BulkString(recip),
-        Protocol::BulkString(ident),
-    ])
+    if let Err(e) = sset(server, &enc_pub_key_key(name), &recip) { return e.to_protocol(); }
+    if let Err(e) = sset(server, &enc_priv_key_key(name), &ident) { return e.to_protocol(); }
+    Protocol::Array(vec![Protocol::BulkString(recip), Protocol::BulkString(ident)])
 }
 
 pub async fn cmd_age_signkeygen(server: &Server, name: &str) -> Protocol {
     let (verify, secret) = gen_sign_keypair();
-    if let Err(e) = sset(server, &sign_pub_key_key(name), &verify) {
-        return e.to_protocol();
-    }
-    if let Err(e) = sset(server, &sign_priv_key_key(name), &secret) {
-        return e.to_protocol();
-    }
-    Protocol::Array(vec![
-        Protocol::BulkString(verify),
-        Protocol::BulkString(secret),
-    ])
+    if let Err(e) = sset(server, &sign_pub_key_key(name), &verify) { return e.to_protocol(); }
+    if let Err(e) = sset(server, &sign_priv_key_key(name), &secret) { return e.to_protocol(); }
+    Protocol::Array(vec![Protocol::BulkString(verify), Protocol::BulkString(secret)])
 }
 
 pub async fn cmd_age_encrypt_name(server: &Server, name: &str, message: &str) -> Protocol {
@@ -300,9 +253,7 @@ pub async fn cmd_age_decrypt_name(server: &Server, name: &str, ct_b64: &str) ->
 pub async fn cmd_age_sign_name(server: &Server, name: &str, message: &str) -> Protocol {
     let sec = match sget(server, &sign_priv_key_key(name)) {
         Ok(Some(v)) => v,
-        Ok(None) => {
-            return AgeWireError::NotFound("signing secret (age:signpriv:{name})").to_protocol()
-        }
+        Ok(None) => return AgeWireError::NotFound("signing secret (age:signpriv:{name})").to_protocol(),
         Err(e) => return e.to_protocol(),
     };
     match sign_b64(&sec, message) {
@@ -311,17 +262,10 @@ pub async fn cmd_age_sign_name(server: &Server, name: &str, message: &str) -> Pr
     }
 }
 
-pub async fn cmd_age_verify_name(
-    server: &Server,
-    name: &str,
-    message: &str,
-    sig_b64: &str,
-) -> Protocol {
+pub async fn cmd_age_verify_name(server: &Server, name: &str, message: &str, sig_b64: &str) -> Protocol {
     let pubk = match sget(server, &sign_pub_key_key(name)) {
         Ok(Some(v)) => v,
-        Ok(None) => {
-            return AgeWireError::NotFound("verify pubkey (age:signpub:{name})").to_protocol()
-        }
+        Ok(None) => return AgeWireError::NotFound("verify pubkey (age:signpub:{name})").to_protocol(),
         Err(e) => return e.to_protocol(),
     };
     match verify_b64(&pubk, message, sig_b64) {
@@ -333,43 +277,25 @@ pub async fn cmd_age_verify_name(
 
 pub async fn cmd_age_list(server: &Server) -> Protocol {
     // Returns 4 arrays: ["encpub", <names...>], ["encpriv", ...], ["signpub", ...], ["signpriv", ...]
-    let st = match server.current_storage() {
-        Ok(s) => s,
-        Err(e) => return Protocol::err(&e.0),
-    };
+    let st = match server.current_storage() { Ok(s) => s, Err(e) => return Protocol::err(&e.0) };
 
     let pull = |pat: &str, prefix: &str| -> Result<Vec<String>, DBError> {
         let keys = st.keys(pat)?;
-        let mut names: Vec<String> = keys
-            .into_iter()
+        let mut names: Vec<String> = keys.into_iter()
             .filter_map(|k| k.strip_prefix(prefix).map(|x| x.to_string()))
             .collect();
         names.sort();
         Ok(names)
     };
 
-    let encpub = match pull("age:key:*", "age:key:") {
-        Ok(v) => v,
-        Err(e) => return Protocol::err(&e.0),
-    };
-    let encpriv = match pull("age:privkey:*", "age:privkey:") {
-        Ok(v) => v,
-        Err(e) => return Protocol::err(&e.0),
-    };
-    let signpub = match pull("age:signpub:*", "age:signpub:") {
-        Ok(v) => v,
-        Err(e) => return Protocol::err(&e.0),
-    };
-    let signpriv = match pull("age:signpriv:*", "age:signpriv:") {
-        Ok(v) => v,
-        Err(e) => return Protocol::err(&e.0),
-    };
+    let encpub  = match pull("age:key:*",      "age:key:")      { Ok(v) => v, Err(e)=> return Protocol::err(&e.0) };
+    let encpriv = match pull("age:privkey:*",  "age:privkey:")  { Ok(v) => v, Err(e)=> return Protocol::err(&e.0) };
+    let signpub = match pull("age:signpub:*",  "age:signpub:")  { Ok(v) => v, Err(e)=> return Protocol::err(&e.0) };
+    let signpriv= match pull("age:signpriv:*", "age:signpriv:") { Ok(v) => v, Err(e)=> return Protocol::err(&e.0) };
 
     let to_arr = |label: &str, v: Vec<String>| {
         let mut out = vec![Protocol::BulkString(label.to_string())];
-        out.push(Protocol::Array(
-            v.into_iter().map(Protocol::BulkString).collect(),
-        ));
+        out.push(Protocol::Array(v.into_iter().map(Protocol::BulkString).collect()));
         Protocol::Array(out)
     };
 

src/error.rs

@@ -1,8 +1,9 @@
 use std::num::ParseIntError;
 
-use bincode;
-use redb;
 use tokio::sync::mpsc;
+use redb;
+use bincode;
+
 
 // todo: more error types
 #[derive(Debug)]

src/lib.rs

@@ -4,9 +4,9 @@ pub mod crypto;
 pub mod error;
 pub mod options;
 pub mod protocol;
-pub mod search_cmd; // Add this
+pub mod rpc;
+pub mod rpc_server;
 pub mod server;
 pub mod storage;
-pub mod storage_sled; // Add this
 pub mod storage_trait;  // Add this
-pub mod tantivy_search;
+pub mod storage_sled;   // Add this

src/main.rs

@@ -3,6 +3,7 @@
 use tokio::net::TcpListener;
 
 use herodb::server;
+use herodb::rpc_server;
 
 use clap::Parser;
 
@@ -22,6 +23,7 @@ struct Args {
     #[arg(long)]
     debug: bool,
 
+
     /// Master encryption key for encrypted databases
     #[arg(long)]
     encryption_key: Option<String>,
@@ -30,6 +32,14 @@ struct Args {
     #[arg(long)]
     encrypt: bool,
 
+    /// Enable RPC management server
+    #[arg(long)]
+    enable_rpc: bool,
+
+    /// RPC server port (default: 8080)
+    #[arg(long, default_value = "8080")]
+    rpc_port: u16,
+
     /// Use the sled backend
     #[arg(long)]
     sled: bool,
@@ -49,7 +59,7 @@ async fn main() {
 
     // new DB option
     let option = herodb::options::DBOption {
-        dir: args.dir,
+        dir: args.dir.clone(),
         port,
         debug: args.debug,
         encryption_key: args.encryption_key,
@@ -61,12 +71,36 @@ async fn main() {
         },
     };
 
+    let backend = option.backend.clone();
+
     // new server
-    let server = server::Server::new(option).await;
+    let mut server = server::Server::new(option).await;
+
+    // Initialize the default database storage
+    let _ = server.current_storage();
 
     // Add a small delay to ensure the port is ready
     tokio::time::sleep(std::time::Duration::from_millis(100)).await;
 
+    // Start RPC server if enabled
+    let rpc_handle = if args.enable_rpc {
+        let rpc_addr = format!("127.0.0.1:{}", args.rpc_port).parse().unwrap();
+        let base_dir = args.dir.clone();
+
+        match rpc_server::start_rpc_server(rpc_addr, base_dir, backend).await {
+            Ok(handle) => {
+                println!("RPC management server started on port {}", args.rpc_port);
+                Some(handle)
+            }
+            Err(e) => {
+                eprintln!("Failed to start RPC server: {}", e);
+                None
+            }
+        }
+    } else {
+        None
+    };
+
     // accept new connections
     loop {
         let stream = listener.accept().await;

src/protocol.rs

@@ -92,10 +92,7 @@ impl Protocol {
 
     fn parse_simple_string_sfx(protocol: &str) -> Result<(Self, &str), DBError> {
         match protocol.find("\r\n") {
-            Some(x) => Ok((
-                Self::SimpleString(protocol[..x].to_string()),
-                &protocol[x + 2..],
-            )),
+            Some(x) => Ok((Self::SimpleString(protocol[..x].to_string()), &protocol[x + 2..])),
             _ => Err(DBError(format!(
                 "[new simple string] unsupported protocol: {:?}",
                 protocol

src/rpc.rs

@@ -0,0 +1,342 @@
+use std::collections::HashMap;
+use std::sync::Arc;
+use tokio::sync::RwLock;
+use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+use serde::{Deserialize, Serialize};
+
+use crate::server::Server;
+use crate::options::DBOption;
+
+/// Database backend types
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum BackendType {
+    Redb,
+    Sled,
+    // Future: InMemory, Custom(String)
+}
+
+/// Database configuration
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DatabaseConfig {
+    pub name: Option<String>,
+    pub storage_path: Option<String>,
+    pub max_size: Option<u64>,
+    pub redis_version: Option<String>,
+}
+
+/// Database information returned by metadata queries
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DatabaseInfo {
+    pub id: u64,
+    pub name: Option<String>,
+    pub backend: BackendType,
+    pub encrypted: bool,
+    pub redis_version: Option<String>,
+    pub storage_path: Option<String>,
+    pub size_on_disk: Option<u64>,
+    pub key_count: Option<u64>,
+    pub created_at: u64,
+    pub last_access: Option<u64>,
+}
+
+/// RPC trait for HeroDB management
+#[rpc(server, client, namespace = "herodb")]
+pub trait Rpc {
+    /// Create a new database with specified configuration
+    #[method(name = "createDatabase")]
+    async fn create_database(
+        &self,
+        backend: BackendType,
+        config: DatabaseConfig,
+        encryption_key: Option<String>,
+    ) -> RpcResult<u64>;
+
+    /// Set encryption for an existing database (write-only key)
+    #[method(name = "setEncryption")]
+    async fn set_encryption(&self, db_id: u64, encryption_key: String) -> RpcResult<bool>;
+
+    /// List all managed databases
+    #[method(name = "listDatabases")]
+    async fn list_databases(&self) -> RpcResult<Vec<DatabaseInfo>>;
+
+    /// Get detailed information about a specific database
+    #[method(name = "getDatabaseInfo")]
+    async fn get_database_info(&self, db_id: u64) -> RpcResult<DatabaseInfo>;
+
+    /// Delete a database
+    #[method(name = "deleteDatabase")]
+    async fn delete_database(&self, db_id: u64) -> RpcResult<bool>;
+
+    /// Get server statistics
+    #[method(name = "getServerStats")]
+    async fn get_server_stats(&self) -> RpcResult<HashMap<String, serde_json::Value>>;
+}
+
+/// RPC Server implementation
+pub struct RpcServerImpl {
+    /// Base directory for database files
+    base_dir: String,
+    /// Managed database servers
+    servers: Arc<RwLock<HashMap<u64, Arc<Server>>>>,
+    /// Next unencrypted database ID to assign
+    next_unencrypted_id: Arc<RwLock<u64>>,
+    /// Next encrypted database ID to assign
+    next_encrypted_id: Arc<RwLock<u64>>,
+    /// Default backend type
+    backend: crate::options::BackendType,
+}
+
+impl RpcServerImpl {
+    /// Create a new RPC server instance
+    pub fn new(base_dir: String, backend: crate::options::BackendType) -> Self {
+        Self {
+            base_dir,
+            servers: Arc::new(RwLock::new(HashMap::new())),
+            next_unencrypted_id: Arc::new(RwLock::new(0)),
+            next_encrypted_id: Arc::new(RwLock::new(10)),
+            backend,
+        }
+    }
+
+    /// Get or create a server instance for the given database ID
+    async fn get_or_create_server(&self, db_id: u64) -> Result<Arc<Server>, jsonrpsee::types::ErrorObjectOwned> {
+        // Check if server already exists
+        {
+            let servers = self.servers.read().await;
+            if let Some(server) = servers.get(&db_id) {
+                return Ok(server.clone());
+            }
+        }
+
+        // Check if database file exists
+        let db_path = std::path::PathBuf::from(&self.base_dir).join(format!("{}.db", db_id));
+        if !db_path.exists() {
+            return Err(jsonrpsee::types::ErrorObjectOwned::owned(
+                -32000,
+                format!("Database {} not found", db_id),
+                None::<()>
+            ));
+        }
+
+        // Create server instance with default options
+        let db_option = DBOption {
+            dir: self.base_dir.clone(),
+            port: 0, // Not used for RPC-managed databases
+            debug: false,
+            encryption_key: None,
+            encrypt: false,
+            backend: self.backend.clone(),
+        };
+
+        let mut server = Server::new(db_option).await;
+
+        // Set the selected database to the db_id for proper file naming
+        server.selected_db = db_id;
+
+        // Store the server
+        let mut servers = self.servers.write().await;
+        servers.insert(db_id, Arc::new(server.clone()));
+
+        Ok(Arc::new(server))
+    }
+
+    /// Discover existing database files in the base directory
+    async fn discover_databases(&self) -> Vec<u64> {
+        let mut db_ids = Vec::new();
+
+        if let Ok(entries) = std::fs::read_dir(&self.base_dir) {
+            for entry in entries.flatten() {
+                if let Ok(file_name) = entry.file_name().into_string() {
+                    // Check if it's a database file (ends with .db)
+                    if file_name.ends_with(".db") {
+                        // Extract database ID from filename (e.g., "11.db" -> 11)
+                        if let Some(id_str) = file_name.strip_suffix(".db") {
+                            if let Ok(db_id) = id_str.parse::<u64>() {
+                                db_ids.push(db_id);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        db_ids
+    }
+
+    /// Get the next available database ID
+    async fn get_next_db_id(&self, is_encrypted: bool) -> u64 {
+        if is_encrypted {
+            let mut id = self.next_encrypted_id.write().await;
+            let current_id = *id;
+            *id += 1;
+            current_id
+        } else {
+            let mut id = self.next_unencrypted_id.write().await;
+            let current_id = *id;
+            *id += 1;
+            current_id
+        }
+    }
+}
+
+#[jsonrpsee::core::async_trait]
+impl RpcServer for RpcServerImpl {
+    async fn create_database(
+        &self,
+        backend: BackendType,
+        config: DatabaseConfig,
+        encryption_key: Option<String>,
+    ) -> RpcResult<u64> {
+        let db_id = self.get_next_db_id(encryption_key.is_some()).await;
+
+        // Handle both Redb and Sled backends
+        match backend {
+            BackendType::Redb | BackendType::Sled => {
+                // Create database directory
+                let db_dir = if let Some(path) = &config.storage_path {
+                    std::path::PathBuf::from(path)
+                } else {
+                    std::path::PathBuf::from(&self.base_dir).join(format!("rpc_db_{}", db_id))
+                };
+
+                // Ensure directory exists
+                std::fs::create_dir_all(&db_dir)
+                    .map_err(|e| jsonrpsee::types::ErrorObjectOwned::owned(
+                        -32000,
+                        format!("Failed to create directory: {}", e),
+                        None::<()>
+                    ))?;
+
+                // Create DB options
+                let encrypt = encryption_key.is_some();
+                let option = DBOption {
+                    dir: db_dir.to_string_lossy().to_string(),
+                    port: 0, // Not used for RPC-managed databases
+                    debug: false,
+                    encryption_key,
+                    encrypt,
+                    backend: match backend {
+                        BackendType::Redb => crate::options::BackendType::Redb,
+                        BackendType::Sled => crate::options::BackendType::Sled,
+                    },
+                };
+
+                // Create server instance
+                let mut server = Server::new(option).await;
+
+                // Set the selected database to the db_id for proper file naming
+                server.selected_db = db_id;
+
+                // Initialize the storage to create the database file
+                let _ = server.current_storage();
+
+                // Store the server
+                let mut servers = self.servers.write().await;
+                servers.insert(db_id, Arc::new(server));
+
+                Ok(db_id)
+            }
+        }
+    }
+
+    async fn set_encryption(&self, db_id: u64, _encryption_key: String) -> RpcResult<bool> {
+        // Note: In a real implementation, we'd need to modify the existing database
+        // For now, return false as encryption can only be set during creation
+        let _servers = self.servers.read().await;
+        // TODO: Implement encryption setting for existing databases
+        Ok(false)
+    }
+
+    async fn list_databases(&self) -> RpcResult<Vec<DatabaseInfo>> {
+        let db_ids = self.discover_databases().await;
+        let mut result = Vec::new();
+
+        for db_id in db_ids {
+            // Try to get or create server for this database
+            if let Ok(server) = self.get_or_create_server(db_id).await {
+                let backend = match server.option.backend {
+                    crate::options::BackendType::Redb => BackendType::Redb,
+                    crate::options::BackendType::Sled => BackendType::Sled,
+                };
+
+                let info = DatabaseInfo {
+                    id: db_id,
+                    name: None, // TODO: Store name in server metadata
+                    backend,
+                    encrypted: server.option.encrypt,
+                    redis_version: Some("7.0".to_string()), // Default Redis compatibility
+                    storage_path: Some(server.option.dir.clone()),
+                    size_on_disk: None, // TODO: Calculate actual size
+                    key_count: None, // TODO: Get key count from storage
+                    created_at: std::time::SystemTime::now()
+                        .duration_since(std::time::UNIX_EPOCH)
+                        .unwrap()
+                        .as_secs(),
+                    last_access: None,
+                };
+                result.push(info);
+            }
+        }
+
+        Ok(result)
+    }
+
+    async fn get_database_info(&self, db_id: u64) -> RpcResult<DatabaseInfo> {
+        let server = self.get_or_create_server(db_id).await?;
+
+        let backend = match server.option.backend {
+            crate::options::BackendType::Redb => BackendType::Redb,
+            crate::options::BackendType::Sled => BackendType::Sled,
+        };
+
+        Ok(DatabaseInfo {
+            id: db_id,
+            name: None,
+            backend,
+            encrypted: server.option.encrypt,
+            redis_version: Some("7.0".to_string()),
+            storage_path: Some(server.option.dir.clone()),
+            size_on_disk: None,
+            key_count: None,
+            created_at: std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap()
+                .as_secs(),
+            last_access: None,
+        })
+    }
+
+    async fn delete_database(&self, db_id: u64) -> RpcResult<bool> {
+        let mut servers = self.servers.write().await;
+
+        if let Some(_server) = servers.remove(&db_id) {
+            // Clean up database files
+            let db_path = std::path::PathBuf::from(&self.base_dir).join(format!("{}.db", db_id));
+            if db_path.exists() {
+                if db_path.is_dir() {
+                    std::fs::remove_dir_all(&db_path).ok();
+                } else {
+                    std::fs::remove_file(&db_path).ok();
+                }
+            }
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    async fn get_server_stats(&self) -> RpcResult<HashMap<String, serde_json::Value>> {
+        let db_ids = self.discover_databases().await;
+        let mut stats = HashMap::new();
+
+        stats.insert("total_databases".to_string(), serde_json::json!(db_ids.len()));
+        stats.insert("uptime".to_string(), serde_json::json!(
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap()
+                .as_secs()
+        ));
+
+        Ok(stats)
+    }
+}

src/rpc_server.rs

@@ -0,0 +1,49 @@
+use std::net::SocketAddr;
+use jsonrpsee::server::{ServerBuilder, ServerHandle};
+use jsonrpsee::RpcModule;
+
+use crate::rpc::{RpcServer, RpcServerImpl};
+
+/// Start the RPC server on the specified address
+pub async fn start_rpc_server(addr: SocketAddr, base_dir: String, backend: crate::options::BackendType) -> Result<ServerHandle, Box<dyn std::error::Error + Send + Sync>> {
+    // Create the RPC server implementation
+    let rpc_impl = RpcServerImpl::new(base_dir, backend);
+
+    // Create the RPC module
+    let mut module = RpcModule::new(());
+    module.merge(RpcServer::into_rpc(rpc_impl))?;
+
+    // Build the server with both HTTP and WebSocket support
+    let server = ServerBuilder::default()
+        .build(addr)
+        .await?;
+
+    // Start the server
+    let handle = server.start(module);
+
+    println!("RPC server started on {}", addr);
+
+    Ok(handle)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::time::Duration;
+
+    #[tokio::test]
+    async fn test_rpc_server_startup() {
+        let addr = "127.0.0.1:0".parse().unwrap(); // Use port 0 for auto-assignment
+        let base_dir = "/tmp/test_rpc".to_string();
+        let backend = crate::options::BackendType::Redb; // Default for test
+
+        let handle = start_rpc_server(addr, base_dir, backend).await.unwrap();
+
+        // Give the server a moment to start
+        tokio::time::sleep(Duration::from_millis(100)).await;
+
+        // Stop the server
+        handle.stop().unwrap();
+        handle.stopped().await;
+    }
+}

src/search_cmd.rs

@@ -1,273 +0,0 @@
-use crate::{
-    error::DBError,
-    protocol::Protocol,
-    server::Server,
-    tantivy_search::{
-        FieldDef, Filter, FilterType, IndexConfig, NumericType, SearchOptions, TantivySearch,
-    },
-};
-use std::collections::HashMap;
-use std::sync::Arc;
-
-pub async fn ft_create_cmd(
-    server: &Server,
-    index_name: String,
-    schema: Vec<(String, String, Vec<String>)>,
-) -> Result<Protocol, DBError> {
-    // Parse schema into field definitions
-    let mut field_definitions = Vec::new();
-
-    for (field_name, field_type, options) in schema {
-        let field_def = match field_type.to_uppercase().as_str() {
-            "TEXT" => {
-                let mut weight = 1.0;
-                let mut sortable = false;
-                let mut no_index = false;
-
-                for opt in &options {
-                    match opt.to_uppercase().as_str() {
-                        "WEIGHT" => {
-                            // Next option should be the weight value
-                            if let Some(idx) = options.iter().position(|x| x == opt) {
-                                if idx + 1 < options.len() {
-                                    weight = options[idx + 1].parse().unwrap_or(1.0);
-                                }
-                            }
-                        }
-                        "SORTABLE" => sortable = true,
-                        "NOINDEX" => no_index = true,
-                        _ => {}
-                    }
-                }
-
-                FieldDef::Text {
-                    stored: true,
-                    indexed: !no_index,
-                    tokenized: true,
-                    fast: sortable,
-                }
-            }
-            "NUMERIC" => {
-                let mut sortable = false;
-
-                for opt in &options {
-                    if opt.to_uppercase() == "SORTABLE" {
-                        sortable = true;
-                    }
-                }
-
-                FieldDef::Numeric {
-                    stored: true,
-                    indexed: true,
-                    fast: sortable,
-                    precision: NumericType::F64,
-                }
-            }
-            "TAG" => {
-                let mut separator = ",".to_string();
-                let mut case_sensitive = false;
-
-                for i in 0..options.len() {
-                    match options[i].to_uppercase().as_str() {
-                        "SEPARATOR" => {
-                            if i + 1 < options.len() {
-                                separator = options[i + 1].clone();
-                            }
-                        }
-                        "CASESENSITIVE" => case_sensitive = true,
-                        _ => {}
-                    }
-                }
-
-                FieldDef::Tag {
-                    stored: true,
-                    separator,
-                    case_sensitive,
-                }
-            }
-            "GEO" => FieldDef::Geo { stored: true },
-            _ => {
-                return Err(DBError(format!("Unknown field type: {}", field_type)));
-            }
-        };
-
-        field_definitions.push((field_name, field_def));
-    }
-
-    // Create the search index
-    let search_path = server.search_index_path();
-    let config = IndexConfig::default();
-
-    println!(
-        "Creating search index '{}' at path: {:?}",
-        index_name, search_path
-    );
-    println!("Field definitions: {:?}", field_definitions);
-
-    let search_index = TantivySearch::new_with_schema(
-        search_path,
-        index_name.clone(),
-        field_definitions,
-        Some(config),
-    )?;
-
-    println!("Search index '{}' created successfully", index_name);
-
-    // Store in registry
-    let mut indexes = server.search_indexes.write().unwrap();
-    indexes.insert(index_name, Arc::new(search_index));
-
-    Ok(Protocol::SimpleString("OK".to_string()))
-}
-
-pub async fn ft_add_cmd(
-    server: &Server,
-    index_name: String,
-    doc_id: String,
-    _score: f64,
-    fields: HashMap<String, String>,
-) -> Result<Protocol, DBError> {
-    let indexes = server.search_indexes.read().unwrap();
-
-    let search_index = indexes
-        .get(&index_name)
-        .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
-
-    search_index.add_document_with_fields(&doc_id, fields)?;
-
-    Ok(Protocol::SimpleString("OK".to_string()))
-}
-
-pub async fn ft_search_cmd(
-    server: &Server,
-    index_name: String,
-    query: String,
-    filters: Vec<(String, String)>,
-    limit: Option<usize>,
-    offset: Option<usize>,
-    return_fields: Option<Vec<String>>,
-) -> Result<Protocol, DBError> {
-    let indexes = server.search_indexes.read().unwrap();
-
-    let search_index = indexes
-        .get(&index_name)
-        .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
-
-    // Convert filters to search filters
-    let search_filters = filters
-        .into_iter()
-        .map(|(field, value)| Filter {
-            field,
-            filter_type: FilterType::Equals(value),
-        })
-        .collect();
-
-    let options = SearchOptions {
-        limit: limit.unwrap_or(10),
-        offset: offset.unwrap_or(0),
-        filters: search_filters,
-        sort_by: None,
-        return_fields,
-        highlight: false,
-    };
-
-    let results = search_index.search_with_options(&query, options)?;
-
-    // Format results as Redis protocol
-    let mut response = Vec::new();
-
-    // First element is the total count
-    response.push(Protocol::SimpleString(results.total.to_string()));
-
-    // Then each document
-    for doc in results.documents {
-        let mut doc_array = Vec::new();
-
-        // Add document ID if it exists
-        if let Some(id) = doc.fields.get("_id") {
-            doc_array.push(Protocol::BulkString(id.clone()));
-        }
-
-        // Add score
-        doc_array.push(Protocol::BulkString(doc.score.to_string()));
-
-        // Add fields as key-value pairs
-        for (field_name, field_value) in doc.fields {
-            if field_name != "_id" {
-                doc_array.push(Protocol::BulkString(field_name));
-                doc_array.push(Protocol::BulkString(field_value));
-            }
-        }
-
-        response.push(Protocol::Array(doc_array));
-    }
-
-    Ok(Protocol::Array(response))
-}
-
-pub async fn ft_del_cmd(
-    server: &Server,
-    index_name: String,
-    doc_id: String,
-) -> Result<Protocol, DBError> {
-    let indexes = server.search_indexes.read().unwrap();
-
-    let _search_index = indexes
-        .get(&index_name)
-        .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
-
-    // For now, return success
-    // In a full implementation, we'd need to add a delete method to TantivySearch
-    println!("Deleting document '{}' from index '{}'", doc_id, index_name);
-
-    Ok(Protocol::SimpleString("1".to_string()))
-}
-
-pub async fn ft_info_cmd(server: &Server, index_name: String) -> Result<Protocol, DBError> {
-    let indexes = server.search_indexes.read().unwrap();
-
-    let search_index = indexes
-        .get(&index_name)
-        .ok_or_else(|| DBError(format!("Index '{}' not found", index_name)))?;
-
-    let info = search_index.get_info()?;
-
-    // Format info as Redis protocol
-    let mut response = Vec::new();
-
-    response.push(Protocol::BulkString("index_name".to_string()));
-    response.push(Protocol::BulkString(info.name));
-
-    response.push(Protocol::BulkString("num_docs".to_string()));
-    response.push(Protocol::BulkString(info.num_docs.to_string()));
-
-    response.push(Protocol::BulkString("num_fields".to_string()));
-    response.push(Protocol::BulkString(info.fields.len().to_string()));
-
-    response.push(Protocol::BulkString("fields".to_string()));
-    let fields_str = info
-        .fields
-        .iter()
-        .map(|f| format!("{}:{}", f.name, f.field_type))
-        .collect::<Vec<_>>()
-        .join(", ");
-    response.push(Protocol::BulkString(fields_str));
-
-    Ok(Protocol::Array(response))
-}
-
-pub async fn ft_drop_cmd(server: &Server, index_name: String) -> Result<Protocol, DBError> {
-    let mut indexes = server.search_indexes.write().unwrap();
-
-    if indexes.remove(&index_name).is_some() {
-        // Also remove the index files from disk
-        let index_path = server.search_index_path().join(&index_name);
-        if index_path.exists() {
-            std::fs::remove_dir_all(index_path)
-                .map_err(|e| DBError(format!("Failed to remove index files: {}", e)))?;
-        }
-        Ok(Protocol::SimpleString("OK".to_string()))
-    } else {
-        Err(DBError(format!("Index '{}' not found", index_name)))
-    }
-}

src/server.rs

@@ -1,10 +1,9 @@
 use core::str;
 use std::collections::HashMap;
 use std::sync::Arc;
-use std::sync::RwLock;
 use tokio::io::AsyncReadExt;
 use tokio::io::AsyncWriteExt;
-use tokio::sync::{oneshot, Mutex};
+use tokio::sync::{Mutex, oneshot};
 
 use std::sync::atomic::{AtomicU64, Ordering};
 
@@ -15,12 +14,10 @@ use crate::protocol::Protocol;
 use crate::storage::Storage;
 use crate::storage_sled::SledStorage;
 use crate::storage_trait::StorageBackend;
-use crate::tantivy_search::TantivySearch;
 
 #[derive(Clone)]
 pub struct Server {
-    pub db_cache: Arc<RwLock<HashMap<u64, Arc<dyn StorageBackend>>>>,
-    pub search_indexes: Arc<RwLock<HashMap<String, Arc<TantivySearch>>>>,
+    pub db_cache: std::sync::Arc<std::sync::RwLock<HashMap<u64, Arc<dyn StorageBackend>>>>,
     pub option: options::DBOption,
     pub client_name: Option<String>,
     pub selected_db: u64, // Changed from usize to u64
@@ -46,8 +43,7 @@ pub enum PopSide {
 impl Server {
     pub async fn new(option: options::DBOption) -> Self {
         Server {
-            db_cache: Arc::new(RwLock::new(HashMap::new())),
-            search_indexes: Arc::new(RwLock::new(HashMap::new())),
+            db_cache: Arc::new(std::sync::RwLock::new(HashMap::new())),
             option,
             client_name: None,
             selected_db: 0,
@@ -65,6 +61,7 @@ impl Server {
             return Ok(storage.clone());
         }
         
+        
         // Create new database file
         let db_file_path = std::path::PathBuf::from(self.option.dir.clone())
             .join(format!("{}.db", self.selected_db));
@@ -72,27 +69,27 @@ impl Server {
         // Ensure the directory exists before creating the database file
         if let Some(parent_dir) = db_file_path.parent() {
             std::fs::create_dir_all(parent_dir).map_err(|e| {
-                DBError(format!(
-                    "Failed to create directory {}: {}",
-                    parent_dir.display(),
-                    e
-                ))
+                DBError(format!("Failed to create directory {}: {}", parent_dir.display(), e))
             })?;
         }
         
         println!("Creating new db file: {}", db_file_path.display());
         
         let storage: Arc<dyn StorageBackend> = match self.option.backend {
-            options::BackendType::Redb => Arc::new(Storage::new(
+            options::BackendType::Redb => {
+                Arc::new(Storage::new(
                     db_file_path,
                     self.should_encrypt_db(self.selected_db),
-                self.option.encryption_key.as_deref(),
-            )?),
-            options::BackendType::Sled => Arc::new(SledStorage::new(
+                    self.option.encryption_key.as_deref()
+                )?)
+            }
+            options::BackendType::Sled => {
+                Arc::new(SledStorage::new(
                     db_file_path,
                     self.should_encrypt_db(self.selected_db),
-                self.option.encryption_key.as_deref(),
-            )?),
+                    self.option.encryption_key.as_deref()
+                )?)
+            }
         };
         
         cache.insert(self.selected_db, storage.clone());
@@ -104,19 +101,9 @@ impl Server {
         self.option.encrypt && db_index >= 10
     }
 
-    // Add method to get search index path
-    pub fn search_index_path(&self) -> std::path::PathBuf {
-        std::path::PathBuf::from(&self.option.dir).join("search_indexes")
-    }
-
     // ----- BLPOP waiter helpers -----
 
-    pub async fn register_waiter(
-        &self,
-        db_index: u64,
-        key: &str,
-        side: PopSide,
-    ) -> (u64, oneshot::Receiver<(String, String)>) {
+    pub async fn register_waiter(&self, db_index: u64, key: &str, side: PopSide) -> (u64, oneshot::Receiver<(String, String)>) {
         let id = self.waiter_seq.fetch_add(1, Ordering::Relaxed);
         let (tx, rx) = oneshot::channel::<(String, String)>();
 
@@ -192,7 +179,10 @@ impl Server {
         Ok(())
     }
 
-    pub async fn handle(&mut self, mut stream: tokio::net::TcpStream) -> Result<(), DBError> {
+    pub async fn handle(
+        &mut self,
+        mut stream: tokio::net::TcpStream,
+    ) -> Result<(), DBError> {
         // Accumulate incoming bytes to handle partial RESP frames
         let mut acc = String::new();
         let mut buf = vec![0u8; 8192];
@@ -229,10 +219,7 @@ impl Server {
                 acc = remaining.to_string();
 
                 if self.option.debug {
-                    println!(
-                        "\x1b[34;1mgot command: {:?}, protocol: {:?}\x1b[0m",
-                        cmd, protocol
-                    );
+                    println!("\x1b[34;1mgot command: {:?}, protocol: {:?}\x1b[0m", cmd, protocol);
                 } else {
                     println!("got command: {:?}, protocol: {:?}", cmd, protocol);
                 }

src/storage/mod.rs

@@ -12,9 +12,9 @@ use crate::error::DBError;
 
 // Re-export modules
 mod storage_basic;
-mod storage_extra;
 mod storage_hset;
 mod storage_lists;
+mod storage_extra;
 
 // Re-export implementations
 // Note: These imports are used by the impl blocks in the submodules
@@ -28,8 +28,7 @@ const STRINGS_TABLE: TableDefinition<&str, &[u8]> = TableDefinition::new("string
 const HASHES_TABLE: TableDefinition<(&str, &str), &[u8]> = TableDefinition::new("hashes");
 const LISTS_TABLE: TableDefinition<&str, &[u8]> = TableDefinition::new("lists");
 const STREAMS_META_TABLE: TableDefinition<&str, &[u8]> = TableDefinition::new("streams_meta");
-const STREAMS_DATA_TABLE: TableDefinition<(&str, &str), &[u8]> =
-    TableDefinition::new("streams_data");
+const STREAMS_DATA_TABLE: TableDefinition<(&str, &str), &[u8]> = TableDefinition::new("streams_data");
 const ENCRYPTED_TABLE: TableDefinition<&str, u8> = TableDefinition::new("encrypted");
 const EXPIRATION_TABLE: TableDefinition<&str, u64> = TableDefinition::new("expiration");
 
@@ -56,11 +55,7 @@ pub struct Storage {
 }
 
 impl Storage {
-    pub fn new(
-        path: impl AsRef<Path>,
-        should_encrypt: bool,
-        master_key: Option<&str>,
-    ) -> Result<Self, DBError> {
+    pub fn new(path: impl AsRef<Path>, should_encrypt: bool, master_key: Option<&str>) -> Result<Self, DBError> {
         let db = Database::create(path)?;
         
         // Create tables if they don't exist
@@ -80,19 +75,14 @@ impl Storage {
         // Check if database was previously encrypted
         let read_txn = db.begin_read()?;
         let encrypted_table = read_txn.open_table(ENCRYPTED_TABLE)?;
-        let was_encrypted = encrypted_table
-            .get("encrypted")?
-            .map(|v| v.value() == 1)
-            .unwrap_or(false);
+        let was_encrypted = encrypted_table.get("encrypted")?.map(|v| v.value() == 1).unwrap_or(false);
         drop(read_txn);
         
         let crypto = if should_encrypt || was_encrypted {
             if let Some(key) = master_key {
                 Some(CryptoFactory::new(key.as_bytes()))
             } else {
-                return Err(DBError(
-                    "Encryption requested but no master key provided".to_string(),
-                ));
+                return Err(DBError("Encryption requested but no master key provided".to_string()));
             }
         } else {
             None
@@ -108,7 +98,10 @@ impl Storage {
             write_txn.commit()?;
         }
         
-        Ok(Storage { db, crypto })
+        Ok(Storage {
+            db,
+            crypto,
+        })
     }
     
     pub fn is_encrypted(&self) -> bool {
@@ -172,22 +165,11 @@ impl StorageBackend for Storage {
         self.get_key_type(key)
     }
 
-    fn scan(
-        &self,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
+    fn scan(&self, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
         self.scan(cursor, pattern, count)
     }
 
-    fn hscan(
-        &self,
-        key: &str,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
+    fn hscan(&self, key: &str, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
         self.hscan(key, cursor, pattern, count)
     }
 

src/storage/storage_basic.rs

@@ -1,6 +1,6 @@
-use super::*;
+use redb::{ReadableTable};
 use crate::error::DBError;
-use redb::ReadableTable;
+use super::*;
 
 impl Storage {
     pub fn flushdb(&self) -> Result<(), DBError> {
@@ -15,17 +15,11 @@ impl Storage {
             let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
 
             // inefficient, but there is no other way
-            let keys: Vec<String> = types_table
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
+            let keys: Vec<String> = types_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
             for key in keys {
                 types_table.remove(key.as_str())?;
             }
-            let keys: Vec<String> = strings_table
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
+            let keys: Vec<String> = strings_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
             for key in keys {
                 strings_table.remove(key.as_str())?;
             }
@@ -40,35 +34,23 @@ impl Storage {
             for (key, field) in keys {
                 hashes_table.remove((key.as_str(), field.as_str()))?;
             }
-            let keys: Vec<String> = lists_table
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
+            let keys: Vec<String> = lists_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
             for key in keys {
                 lists_table.remove(key.as_str())?;
             }
-            let keys: Vec<String> = streams_meta_table
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
+            let keys: Vec<String> = streams_meta_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
             for key in keys {
                 streams_meta_table.remove(key.as_str())?;
             }
-            let keys: Vec<(String, String)> = streams_data_table
-                .iter()?
-                .map(|item| {
+            let keys: Vec<(String,String)> = streams_data_table.iter()?.map(|item| {
                 let binding = item.unwrap();
                 let (key, field) = binding.0.value();
                 (key.to_string(), field.to_string())
-                })
-                .collect();
+            }).collect();
             for (key, field) in keys {
                 streams_data_table.remove((key.as_str(), field.as_str()))?;
             }
-            let keys: Vec<String> = expiration_table
-                .iter()?
-                .map(|item| item.unwrap().0.value().to_string())
-                .collect();
+            let keys: Vec<String> = expiration_table.iter()?.map(|item| item.unwrap().0.value().to_string()).collect();
             for key in keys {
                 expiration_table.remove(key.as_str())?;
             }
@@ -181,8 +163,7 @@ impl Storage {
         {
             let mut types_table = write_txn.open_table(TYPES_TABLE)?;
             let mut strings_table = write_txn.open_table(STRINGS_TABLE)?;
-            let mut hashes_table: redb::Table<(&str, &str), &[u8]> =
-                write_txn.open_table(HASHES_TABLE)?;
+            let mut hashes_table: redb::Table<(&str, &str), &[u8]> = write_txn.open_table(HASHES_TABLE)?;
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
             
             // Remove from type table

src/storage/storage_extra.rs

@@ -1,15 +1,10 @@
-use super::*;
+use redb::{ReadableTable};
 use crate::error::DBError;
-use redb::ReadableTable;
+use super::*;
 
 impl Storage {
     // ✅ ENCRYPTION APPLIED: Values are decrypted after retrieval
-    pub fn scan(
-        &self,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
+    pub fn scan(&self, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
         let strings_table = read_txn.open_table(STRINGS_TABLE)?;
@@ -55,11 +50,7 @@ impl Storage {
             current_cursor += 1;
         }
         
-        let next_cursor = if result.len() < limit {
-            0
-        } else {
-            current_cursor
-        };
+        let next_cursor = if result.len() < limit { 0 } else { current_cursor };
         Ok((next_cursor, result))
     }
 
@@ -187,12 +178,8 @@ impl Storage {
                 .unwrap_or(false);
             if is_string {
                 let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
-                let expires_at_ms: u128 = if ts_secs <= 0 {
-                    0
-                } else {
-                    (ts_secs as u128) * 1000
-                };
-                expiration_table.insert(key, &(expires_at_ms as u64))?;
+                let expires_at_ms: u128 = if ts_secs <= 0 { 0 } else { (ts_secs as u128) * 1000 };
+                expiration_table.insert(key, &((expires_at_ms as u64)))?;
                 applied = true;
             }
         }
@@ -214,7 +201,7 @@ impl Storage {
             if is_string {
                 let mut expiration_table = write_txn.open_table(EXPIRATION_TABLE)?;
                 let expires_at_ms: u128 = if ts_ms <= 0 { 0 } else { ts_ms as u128 };
-                expiration_table.insert(key, &(expires_at_ms as u64))?;
+                expiration_table.insert(key, &((expires_at_ms as u64)))?;
                 applied = true;
             }
         }

src/storage/storage_hset.rs

@@ -1,6 +1,6 @@
-use super::*;
+use redb::{ReadableTable};
 use crate::error::DBError;
-use redb::ReadableTable;
+use super::*;
 
 impl Storage {
     // ✅ ENCRYPTION APPLIED: Values are encrypted before storage
@@ -18,8 +18,7 @@ impl Storage {
             };
 
             match key_type.as_deref() {
-                Some("hash") | None => {
-                    // Proceed if hash or new key
+                Some("hash") | None => { // Proceed if hash or new key
                     // Set the type to hash (only if new key or existing hash)
                     types_table.insert(key, "hash")?;
                     
@@ -36,12 +35,7 @@ impl Storage {
                         }
                     }
                 }
-                Some(_) => {
-                    return Err(DBError(
-                        "WRONGTYPE Operation against a key holding the wrong kind of value"
-                            .to_string(),
-                    ))
-                }
+                Some(_) => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             }
         }
         
@@ -68,9 +62,7 @@ impl Storage {
                     None => Ok(None),
                 }
             }
-            Some(_) => Err(DBError(
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => Ok(None),
         }
     }
@@ -102,9 +94,7 @@ impl Storage {
                 
                 Ok(result)
             }
-            Some(_) => Err(DBError(
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => Ok(Vec::new()),
         }
     }
@@ -148,11 +138,7 @@ impl Storage {
                     types_table.remove(key)?;
                 }
             }
-            Some(_) => {
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
+            Some(_) => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => {} // Key does not exist, nothing to delete, return 0 deleted
         }
         
@@ -173,9 +159,7 @@ impl Storage {
                 let hashes_table = read_txn.open_table(HASHES_TABLE)?;
                 Ok(hashes_table.get((key, field))?.is_some())
             }
-            Some(_) => Err(DBError(
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => Ok(false),
         }
     }
@@ -204,9 +188,7 @@ impl Storage {
                 
                 Ok(result)
             }
-            Some(_) => Err(DBError(
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => Ok(Vec::new()),
         }
     }
@@ -238,9 +220,7 @@ impl Storage {
                 
                 Ok(result)
             }
-            Some(_) => Err(DBError(
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => Ok(Vec::new()),
         }
     }
@@ -269,9 +249,7 @@ impl Storage {
                 
                 Ok(count)
             }
-            Some(_) => Err(DBError(
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => Ok(0),
         }
     }
@@ -303,9 +281,7 @@ impl Storage {
                 
                 Ok(result)
             }
-            Some(_) => Err(DBError(
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => Ok(fields.into_iter().map(|_| None).collect()),
         }
     }
@@ -325,8 +301,7 @@ impl Storage {
             };
 
             match key_type.as_deref() {
-                Some("hash") | None => {
-                    // Proceed if hash or new key
+                Some("hash") | None => { // Proceed if hash or new key
                     // Check if field already exists
                     if hashes_table.get((key, field))?.is_none() {
                         // Set the type to hash (only if new key or existing hash)
@@ -338,12 +313,7 @@ impl Storage {
                         result = true;
                     }
                 }
-                Some(_) => {
-                    return Err(DBError(
-                        "WRONGTYPE Operation against a key holding the wrong kind of value"
-                            .to_string(),
-                    ))
-                }
+                Some(_) => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             }
         }
         
@@ -352,13 +322,7 @@ impl Storage {
     }
 
     // ✅ ENCRYPTION APPLIED: Values are decrypted after retrieval
-    pub fn hscan(
-        &self,
-        key: &str,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
+    pub fn hscan(&self, key: &str, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
         let read_txn = self.db.begin_read()?;
         let types_table = read_txn.open_table(TYPES_TABLE)?;
         let key_type = {
@@ -403,16 +367,10 @@ impl Storage {
                     }
                 }
                 
-                let next_cursor = if result.len() < limit {
-                    0
-                } else {
-                    current_cursor
-                };
+                let next_cursor = if result.len() < limit { 0 } else { current_cursor };
                 Ok((next_cursor, result))
             }
-            Some(_) => Err(DBError(
-                "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-            )),
+            Some(_) => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
             None => Ok((0, Vec::new())),
         }
     }

src/storage/storage_lists.rs

@@ -1,6 +1,6 @@
-use super::*;
+use redb::{ReadableTable};
 use crate::error::DBError;
-use redb::ReadableTable;
+use super::*;
 
 impl Storage {
     // ✅ ENCRYPTION APPLIED: Elements are encrypted before storage
@@ -248,16 +248,8 @@ impl Storage {
                         }
                         
                         let len = list.len() as i64;
-                        let start_idx = if start < 0 {
-                            std::cmp::max(0, len + start)
-                        } else {
-                            std::cmp::min(start, len)
-                        };
-                        let stop_idx = if stop < 0 {
-                            std::cmp::max(-1, len + stop)
-                        } else {
-                            std::cmp::min(stop, len - 1)
-                        };
+                        let start_idx = if start < 0 { std::cmp::max(0, len + start) } else { std::cmp::min(start, len) };
+                        let stop_idx = if stop < 0 { std::cmp::max(-1, len + stop) } else { std::cmp::min(stop, len - 1) };
                         
                         if start_idx > stop_idx || start_idx >= len {
                             return Ok(Vec::new());
@@ -306,16 +298,8 @@ impl Storage {
             }
             
             let len = list.len() as i64;
-            let start_idx = if start < 0 {
-                std::cmp::max(0, len + start)
-            } else {
-                std::cmp::min(start, len)
-            };
-            let stop_idx = if stop < 0 {
-                std::cmp::max(-1, len + stop)
-            } else {
-                std::cmp::min(stop, len - 1)
-            };
+            let start_idx = if start < 0 { std::cmp::max(0, len + start) } else { std::cmp::min(start, len) };
+            let stop_idx = if stop < 0 { std::cmp::max(-1, len + stop) } else { std::cmp::min(stop, len - 1) };
             
             let mut lists_table = write_txn.open_table(LISTS_TABLE)?;
             if start_idx > stop_idx || start_idx >= len {

src/storage_sled/mod.rs

@@ -1,12 +1,12 @@
 // src/storage_sled/mod.rs
-use crate::crypto::CryptoFactory;
-use crate::error::DBError;
-use crate::storage_trait::StorageBackend;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 use std::path::Path;
 use std::sync::Arc;
+use std::collections::HashMap;
 use std::time::{SystemTime, UNIX_EPOCH};
+use serde::{Deserialize, Serialize};
+use crate::error::DBError;
+use crate::storage_trait::StorageBackend;
+use crate::crypto::CryptoFactory;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 enum ValueType {
@@ -28,22 +28,13 @@ pub struct SledStorage {
 }
 
 impl SledStorage {
-    pub fn new(
-        path: impl AsRef<Path>,
-        should_encrypt: bool,
-        master_key: Option<&str>,
-    ) -> Result<Self, DBError> {
+    pub fn new(path: impl AsRef<Path>, should_encrypt: bool, master_key: Option<&str>) -> Result<Self, DBError> {
         let db = sled::open(path).map_err(|e| DBError(format!("Failed to open sled: {}", e)))?;
-        let types = db
-            .open_tree("types")
-            .map_err(|e| DBError(format!("Failed to open types tree: {}", e)))?;
+        let types = db.open_tree("types").map_err(|e| DBError(format!("Failed to open types tree: {}", e)))?;
         
         // Check if database was previously encrypted
-        let encrypted_tree = db
-            .open_tree("encrypted")
-            .map_err(|e| DBError(e.to_string()))?;
-        let was_encrypted = encrypted_tree
-            .get("encrypted")
+        let encrypted_tree = db.open_tree("encrypted").map_err(|e| DBError(e.to_string()))?;
+        let was_encrypted = encrypted_tree.get("encrypted")
             .map_err(|e| DBError(e.to_string()))?
             .map(|v| v[0] == 1)
             .unwrap_or(false);
@@ -52,9 +43,7 @@ impl SledStorage {
             if let Some(key) = master_key {
                 Some(CryptoFactory::new(key.as_bytes()))
             } else {
-                return Err(DBError(
-                    "Encryption requested but no master key provided".to_string(),
-                ));
+                return Err(DBError("Encryption requested but no master key provided".to_string()));
             }
         } else {
             None
@@ -62,8 +51,7 @@ impl SledStorage {
         
         // Mark database as encrypted if enabling encryption
         if should_encrypt && !was_encrypted {
-            encrypted_tree
-                .insert("encrypted", &[1u8])
+            encrypted_tree.insert("encrypted", &[1u8])
                 .map_err(|e| DBError(e.to_string()))?;
             encrypted_tree.flush().map_err(|e| DBError(e.to_string()))?;
         }
@@ -113,7 +101,7 @@ impl SledStorage {
                 
                 Ok(Some(storage_val))
             }
-            None => Ok(None),
+            None => Ok(None)
         }
     }
     
@@ -121,9 +109,7 @@ impl SledStorage {
         let data = bincode::serialize(&storage_val)
             .map_err(|e| DBError(format!("Serialization error: {}", e)))?;
         let encrypted = self.encrypt_if_needed(&data)?;
-        self.db
-            .insert(key, encrypted)
-            .map_err(|e| DBError(e.to_string()))?;
+        self.db.insert(key, encrypted).map_err(|e| DBError(e.to_string()))?;
         
         // Store type info (unencrypted for efficiency)
         let type_str = match &storage_val.value {
@@ -131,9 +117,7 @@ impl SledStorage {
             ValueType::Hash(_) => "hash",
             ValueType::List(_) => "list",
         };
-        self.types
-            .insert(key, type_str.as_bytes())
-            .map_err(|e| DBError(e.to_string()))?;
+        self.types.insert(key, type_str.as_bytes()).map_err(|e| DBError(e.to_string()))?;
         
         Ok(())
     }
@@ -184,9 +168,9 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::String(s) => Ok(Some(s)),
-                _ => Ok(None),
-            },
-            None => Ok(None),
+                _ => Ok(None)
+            }
+            None => Ok(None)
         }
     }
     
@@ -212,9 +196,7 @@ impl StorageBackend for SledStorage {
     
     fn del(&self, key: String) -> Result<(), DBError> {
         self.db.remove(&key).map_err(|e| DBError(e.to_string()))?;
-        self.types
-            .remove(&key)
-            .map_err(|e| DBError(e.to_string()))?;
+        self.types.remove(&key).map_err(|e| DBError(e.to_string()))?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
         Ok(())
     }
@@ -240,12 +222,7 @@ impl StorageBackend for SledStorage {
         Ok(keys)
     }
     
-    fn scan(
-        &self,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
+    fn scan(&self, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
         let mut result = Vec::new();
         let mut current_cursor = 0u64;
         let limit = count.unwrap_or(10) as usize;
@@ -281,11 +258,7 @@ impl StorageBackend for SledStorage {
             current_cursor += 1;
         }
         
-        let next_cursor = if result.len() < limit {
-            0
-        } else {
-            current_cursor
-        };
+        let next_cursor = if result.len() < limit { 0 } else { current_cursor };
         Ok((next_cursor, result))
     }
     
@@ -313,7 +286,7 @@ impl StorageBackend for SledStorage {
         if self.get_storage_value(key)?.is_some() {
             match self.types.get(key).map_err(|e| DBError(e.to_string()))? {
                 Some(data) => Ok(Some(String::from_utf8_lossy(&data).to_string())),
-                None => Ok(None),
+                None => Ok(None)
             }
         } else {
             Ok(None)
@@ -329,11 +302,7 @@ impl StorageBackend for SledStorage {
         
         let hash = match &mut storage_val.value {
             ValueType::Hash(h) => h,
-            _ => {
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
+            _ => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
         };
         
         let mut new_fields = 0i64;
@@ -353,9 +322,9 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.get(field).cloned()),
-                _ => Ok(None),
-            },
-            None => Ok(None),
+                _ => Ok(None)
+            }
+            None => Ok(None)
         }
     }
     
@@ -363,19 +332,13 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.into_iter().collect()),
-                _ => Ok(Vec::new()),
-            },
-            None => Ok(Vec::new()),
+                _ => Ok(Vec::new())
+            }
+            None => Ok(Vec::new())
         }
     }
     
-    fn hscan(
-        &self,
-        key: &str,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError> {
+    fn hscan(&self, key: &str, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => {
@@ -402,30 +365,24 @@ impl StorageBackend for SledStorage {
                         current_cursor += 1;
                     }
                     
-                    let next_cursor = if result.len() < limit {
-                        0
-                    } else {
-                        current_cursor
-                    };
+                    let next_cursor = if result.len() < limit { 0 } else { current_cursor };
                     Ok((next_cursor, result))
                 }
-                _ => Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                )),
-            },
-            None => Ok((0, Vec::new())),
+                _ => Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string()))
+            }
+            None => Ok((0, Vec::new()))
         }
     }
     
     fn hdel(&self, key: &str, fields: Vec<String>) -> Result<i64, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(0),
+            None => return Ok(0)
         };
         
         let hash = match &mut storage_val.value {
             ValueType::Hash(h) => h,
-            _ => return Ok(0),
+            _ => return Ok(0)
         };
         
         let mut deleted = 0i64;
@@ -449,9 +406,9 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.contains_key(field)),
-                _ => Ok(false),
-            },
-            None => Ok(false),
+                _ => Ok(false)
+            }
+            None => Ok(false)
         }
     }
     
@@ -459,9 +416,9 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.keys().cloned().collect()),
-                _ => Ok(Vec::new()),
-            },
-            None => Ok(Vec::new()),
+                _ => Ok(Vec::new())
+            }
+            None => Ok(Vec::new())
         }
     }
     
@@ -469,9 +426,9 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.values().cloned().collect()),
-                _ => Ok(Vec::new()),
-            },
-            None => Ok(Vec::new()),
+                _ => Ok(Vec::new())
+            }
+            None => Ok(Vec::new())
         }
     }
     
@@ -479,19 +436,21 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::Hash(h) => Ok(h.len() as i64),
-                _ => Ok(0),
-            },
-            None => Ok(0),
+                _ => Ok(0)
+            }
+            None => Ok(0)
         }
     }
     
     fn hmget(&self, key: &str, fields: Vec<String>) -> Result<Vec<Option<String>>, DBError> {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
-                ValueType::Hash(h) => Ok(fields.into_iter().map(|f| h.get(&f).cloned()).collect()),
-                _ => Ok(fields.into_iter().map(|_| None).collect()),
-            },
-            None => Ok(fields.into_iter().map(|_| None).collect()),
+                ValueType::Hash(h) => {
+                    Ok(fields.into_iter().map(|f| h.get(&f).cloned()).collect())
+                }
+                _ => Ok(fields.into_iter().map(|_| None).collect())
+            }
+            None => Ok(fields.into_iter().map(|_| None).collect())
         }
     }
     
@@ -503,11 +462,7 @@ impl StorageBackend for SledStorage {
         
         let hash = match &mut storage_val.value {
             ValueType::Hash(h) => h,
-            _ => {
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
+            _ => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
         };
         
         if hash.contains_key(field) {
@@ -529,11 +484,7 @@ impl StorageBackend for SledStorage {
         
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => {
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
+            _ => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
         };
         
         for element in elements.into_iter().rev() {
@@ -554,11 +505,7 @@ impl StorageBackend for SledStorage {
         
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => {
-                return Err(DBError(
-                    "WRONGTYPE Operation against a key holding the wrong kind of value".to_string(),
-                ))
-            }
+            _ => return Err(DBError("WRONGTYPE Operation against a key holding the wrong kind of value".to_string())),
         };
         
         list.extend(elements);
@@ -571,12 +518,12 @@ impl StorageBackend for SledStorage {
     fn lpop(&self, key: &str, count: u64) -> Result<Vec<String>, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(Vec::new()),
+            None => return Ok(Vec::new())
         };
         
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => return Ok(Vec::new()),
+            _ => return Ok(Vec::new())
         };
         
         let mut result = Vec::new();
@@ -600,12 +547,12 @@ impl StorageBackend for SledStorage {
     fn rpop(&self, key: &str, count: u64) -> Result<Vec<String>, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(Vec::new()),
+            None => return Ok(Vec::new())
         };
         
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => return Ok(Vec::new()),
+            _ => return Ok(Vec::new())
         };
         
         let mut result = Vec::new();
@@ -629,9 +576,9 @@ impl StorageBackend for SledStorage {
         match self.get_storage_value(key)? {
             Some(storage_val) => match storage_val.value {
                 ValueType::List(l) => Ok(l.len() as i64),
-                _ => Ok(0),
-            },
-            None => Ok(0),
+                _ => Ok(0)
+            }
+            None => Ok(0)
         }
     }
     
@@ -651,9 +598,9 @@ impl StorageBackend for SledStorage {
                         Ok(None)
                     }
                 }
-                _ => Ok(None),
-            },
-            None => Ok(None),
+                _ => Ok(None)
+            }
+            None => Ok(None)
         }
     }
     
@@ -686,21 +633,21 @@ impl StorageBackend for SledStorage {
                     
                     Ok(list[start_usize..std::cmp::min(stop_usize, list.len())].to_vec())
                 }
-                _ => Ok(Vec::new()),
-            },
-            None => Ok(Vec::new()),
+                _ => Ok(Vec::new())
+            }
+            None => Ok(Vec::new())
         }
     }
     
     fn ltrim(&self, key: &str, start: i64, stop: i64) -> Result<(), DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(()),
+            None => return Ok(())
         };
         
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => return Ok(()),
+            _ => return Ok(())
         };
         
         if list.is_empty() {
@@ -740,12 +687,12 @@ impl StorageBackend for SledStorage {
     fn lrem(&self, key: &str, count: i64, element: &str) -> Result<i64, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(0),
+            None => return Ok(0)
         };
         
         let list = match &mut storage_val.value {
             ValueType::List(l) => l,
-            _ => return Ok(0),
+            _ => return Ok(0)
         };
         
         let mut removed = 0i64;
@@ -804,14 +751,14 @@ impl StorageBackend for SledStorage {
                     Ok(-1) // Key exists but has no expiration
                 }
             }
-            None => Ok(-2), // Key does not exist
+            None => Ok(-2) // Key does not exist
         }
     }
     
     fn expire_seconds(&self, key: &str, secs: u64) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
         
         storage_val.expires_at = Some(Self::now_millis() + (secs as u128) * 1000);
@@ -823,7 +770,7 @@ impl StorageBackend for SledStorage {
     fn pexpire_millis(&self, key: &str, ms: u128) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
         
         storage_val.expires_at = Some(Self::now_millis() + ms);
@@ -835,7 +782,7 @@ impl StorageBackend for SledStorage {
     fn persist(&self, key: &str) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
         
         if storage_val.expires_at.is_some() {
@@ -851,14 +798,10 @@ impl StorageBackend for SledStorage {
     fn expire_at_seconds(&self, key: &str, ts_secs: i64) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
         
-        let expires_at_ms: u128 = if ts_secs <= 0 {
-            0
-        } else {
-            (ts_secs as u128) * 1000
-        };
+        let expires_at_ms: u128 = if ts_secs <= 0 { 0 } else { (ts_secs as u128) * 1000 };
         storage_val.expires_at = Some(expires_at_ms);
         self.set_storage_value(key, storage_val)?;
         self.db.flush().map_err(|e| DBError(e.to_string()))?;
@@ -868,7 +811,7 @@ impl StorageBackend for SledStorage {
     fn pexpire_at_millis(&self, key: &str, ts_ms: i64) -> Result<bool, DBError> {
         let mut storage_val = match self.get_storage_value(key)? {
             Some(sv) => sv,
-            None => return Ok(false),
+            None => return Ok(false)
         };
         
         let expires_at_ms: u128 = if ts_ms <= 0 { 0 } else { ts_ms as u128 };

src/storage_trait.rs

@@ -15,19 +15,8 @@ pub trait StorageBackend: Send + Sync {
     fn get_key_type(&self, key: &str) -> Result<Option<String>, DBError>;
     
     // Scanning
-    fn scan(
-        &self,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError>;
-    fn hscan(
-        &self,
-        key: &str,
-        cursor: u64,
-        pattern: Option<&str>,
-        count: Option<u64>,
-    ) -> Result<(u64, Vec<(String, String)>), DBError>;
+    fn scan(&self, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError>;
+    fn hscan(&self, key: &str, cursor: u64, pattern: Option<&str>, count: Option<u64>) -> Result<(u64, Vec<(String, String)>), DBError>;
     
     // Hash operations
     fn hset(&self, key: &str, pairs: Vec<(String, String)>) -> Result<i64, DBError>;

src/tantivy_search.rs

@@ -1,657 +0,0 @@
-use crate::error::DBError;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::path::PathBuf;
-use std::sync::{Arc, RwLock};
-use tantivy::{
-    collector::TopDocs,
-    directory::MmapDirectory,
-    query::{BooleanQuery, Occur, Query, QueryParser, TermQuery},
-    schema::{Field, Schema, TextFieldIndexing, TextOptions, Value, STORED, STRING},
-    tokenizer::TokenizerManager,
-    DateTime, Index, IndexReader, IndexWriter, ReloadPolicy, TantivyDocument, Term,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum FieldDef {
-    Text {
-        stored: bool,
-        indexed: bool,
-        tokenized: bool,
-        fast: bool,
-    },
-    Numeric {
-        stored: bool,
-        indexed: bool,
-        fast: bool,
-        precision: NumericType,
-    },
-    Tag {
-        stored: bool,
-        separator: String,
-        case_sensitive: bool,
-    },
-    Geo {
-        stored: bool,
-    },
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum NumericType {
-    I64,
-    U64,
-    F64,
-    Date,
-}
-
-pub struct IndexSchema {
-    schema: Schema,
-    fields: HashMap<String, (Field, FieldDef)>,
-    default_search_fields: Vec<Field>,
-}
-
-pub struct TantivySearch {
-    index: Index,
-    writer: Arc<RwLock<IndexWriter>>,
-    reader: IndexReader,
-    index_schema: IndexSchema,
-    name: String,
-    config: IndexConfig,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct IndexConfig {
-    pub language: String,
-    pub stopwords: Vec<String>,
-    pub stemming: bool,
-    pub max_doc_count: Option<usize>,
-    pub default_score: f64,
-}
-
-impl Default for IndexConfig {
-    fn default() -> Self {
-        IndexConfig {
-            language: "english".to_string(),
-            stopwords: vec![],
-            stemming: true,
-            max_doc_count: None,
-            default_score: 1.0,
-        }
-    }
-}
-
-impl TantivySearch {
-    pub fn new_with_schema(
-        base_path: PathBuf,
-        name: String,
-        field_definitions: Vec<(String, FieldDef)>,
-        config: Option<IndexConfig>,
-    ) -> Result<Self, DBError> {
-        let index_path = base_path.join(&name);
-        std::fs::create_dir_all(&index_path)
-            .map_err(|e| DBError(format!("Failed to create index dir: {}", e)))?;
-
-        // Build schema from field definitions
-        let mut schema_builder = Schema::builder();
-        let mut fields = HashMap::new();
-        let mut default_search_fields = Vec::new();
-
-        // Always add a document ID field
-        let id_field = schema_builder.add_text_field("_id", STRING | STORED);
-        fields.insert(
-            "_id".to_string(),
-            (
-                id_field,
-                FieldDef::Text {
-                    stored: true,
-                    indexed: true,
-                    tokenized: false,
-                    fast: false,
-                },
-            ),
-        );
-
-        // Add user-defined fields
-        for (field_name, field_def) in field_definitions {
-            let field = match &field_def {
-                FieldDef::Text {
-                    stored,
-                    indexed,
-                    tokenized,
-                    fast: _fast,
-                } => {
-                    let mut text_options = TextOptions::default();
-
-                    if *stored {
-                        text_options = text_options.set_stored();
-                    }
-
-                    if *indexed {
-                        let indexing_options = if *tokenized {
-                            TextFieldIndexing::default()
-                                .set_tokenizer("default")
-                                .set_index_option(
-                                    tantivy::schema::IndexRecordOption::WithFreqsAndPositions,
-                                )
-                        } else {
-                            TextFieldIndexing::default()
-                                .set_tokenizer("raw")
-                                .set_index_option(tantivy::schema::IndexRecordOption::Basic)
-                        };
-                        text_options = text_options.set_indexing_options(indexing_options);
-
-                        let f = schema_builder.add_text_field(&field_name, text_options);
-                        if *tokenized {
-                            default_search_fields.push(f);
-                        }
-                        f
-                    } else {
-                        schema_builder.add_text_field(&field_name, text_options)
-                    }
-                }
-                FieldDef::Numeric {
-                    stored,
-                    indexed,
-                    fast,
-                    precision,
-                } => match precision {
-                    NumericType::I64 => {
-                        let mut opts = tantivy::schema::NumericOptions::default();
-                        if *stored {
-                            opts = opts.set_stored();
-                        }
-                        if *indexed {
-                            opts = opts.set_indexed();
-                        }
-                        if *fast {
-                            opts = opts.set_fast();
-                        }
-                        schema_builder.add_i64_field(&field_name, opts)
-                    }
-                    NumericType::U64 => {
-                        let mut opts = tantivy::schema::NumericOptions::default();
-                        if *stored {
-                            opts = opts.set_stored();
-                        }
-                        if *indexed {
-                            opts = opts.set_indexed();
-                        }
-                        if *fast {
-                            opts = opts.set_fast();
-                        }
-                        schema_builder.add_u64_field(&field_name, opts)
-                    }
-                    NumericType::F64 => {
-                        let mut opts = tantivy::schema::NumericOptions::default();
-                        if *stored {
-                            opts = opts.set_stored();
-                        }
-                        if *indexed {
-                            opts = opts.set_indexed();
-                        }
-                        if *fast {
-                            opts = opts.set_fast();
-                        }
-                        schema_builder.add_f64_field(&field_name, opts)
-                    }
-                    NumericType::Date => {
-                        let mut opts = tantivy::schema::DateOptions::default();
-                        if *stored {
-                            opts = opts.set_stored();
-                        }
-                        if *indexed {
-                            opts = opts.set_indexed();
-                        }
-                        if *fast {
-                            opts = opts.set_fast();
-                        }
-                        schema_builder.add_date_field(&field_name, opts)
-                    }
-                },
-                FieldDef::Tag {
-                    stored,
-                    separator: _,
-                    case_sensitive: _,
-                } => {
-                    let mut text_options = TextOptions::default();
-                    if *stored {
-                        text_options = text_options.set_stored();
-                    }
-                    text_options = text_options.set_indexing_options(
-                        TextFieldIndexing::default()
-                            .set_tokenizer("raw")
-                            .set_index_option(tantivy::schema::IndexRecordOption::Basic),
-                    );
-                    schema_builder.add_text_field(&field_name, text_options)
-                }
-                FieldDef::Geo { stored } => {
-                    // For now, store as two f64 fields for lat/lon
-                    let mut opts = tantivy::schema::NumericOptions::default();
-                    if *stored {
-                        opts = opts.set_stored();
-                    }
-                    opts = opts.set_indexed().set_fast();
-
-                    let lat_field =
-                        schema_builder.add_f64_field(&format!("{}_lat", field_name), opts.clone());
-                    let lon_field =
-                        schema_builder.add_f64_field(&format!("{}_lon", field_name), opts);
-
-                    fields.insert(
-                        format!("{}_lat", field_name),
-                        (
-                            lat_field,
-                            FieldDef::Numeric {
-                                stored: *stored,
-                                indexed: true,
-                                fast: true,
-                                precision: NumericType::F64,
-                            },
-                        ),
-                    );
-                    fields.insert(
-                        format!("{}_lon", field_name),
-                        (
-                            lon_field,
-                            FieldDef::Numeric {
-                                stored: *stored,
-                                indexed: true,
-                                fast: true,
-                                precision: NumericType::F64,
-                            },
-                        ),
-                    );
-                    continue; // Skip adding the geo field itself
-                }
-            };
-
-            fields.insert(field_name.clone(), (field, field_def));
-        }
-
-        let schema = schema_builder.build();
-        let index_schema = IndexSchema {
-            schema: schema.clone(),
-            fields,
-            default_search_fields,
-        };
-
-        // Create or open index
-        let dir = MmapDirectory::open(&index_path)
-            .map_err(|e| DBError(format!("Failed to open index directory: {}", e)))?;
-
-        let mut index = Index::open_or_create(dir, schema)
-            .map_err(|e| DBError(format!("Failed to create index: {}", e)))?;
-
-        // Configure tokenizers
-        let tokenizer_manager = TokenizerManager::default();
-        index.set_tokenizers(tokenizer_manager);
-
-        let writer = index
-            .writer(15_000_000)
-            .map_err(|e| DBError(format!("Failed to create index writer: {}", e)))?;
-
-        let reader = index
-            .reader_builder()
-            .reload_policy(ReloadPolicy::OnCommitWithDelay)
-            .try_into()
-            .map_err(|e| DBError(format!("Failed to create reader: {}", e)))?;
-
-        let config = config.unwrap_or_default();
-
-        Ok(TantivySearch {
-            index,
-            writer: Arc::new(RwLock::new(writer)),
-            reader,
-            index_schema,
-            name,
-            config,
-        })
-    }
-
-    pub fn add_document_with_fields(
-        &self,
-        doc_id: &str,
-        fields: HashMap<String, String>,
-    ) -> Result<(), DBError> {
-        let mut writer = self
-            .writer
-            .write()
-            .map_err(|e| DBError(format!("Failed to acquire writer lock: {}", e)))?;
-
-        // Delete existing document with same ID
-        if let Some((id_field, _)) = self.index_schema.fields.get("_id") {
-            writer.delete_term(Term::from_field_text(*id_field, doc_id));
-        }
-
-        // Create new document
-        let mut doc = tantivy::doc!();
-
-        // Add document ID
-        if let Some((id_field, _)) = self.index_schema.fields.get("_id") {
-            doc.add_text(*id_field, doc_id);
-        }
-
-        // Add other fields based on schema
-        for (field_name, field_value) in fields {
-            if let Some((field, field_def)) = self.index_schema.fields.get(&field_name) {
-                match field_def {
-                    FieldDef::Text { .. } => {
-                        doc.add_text(*field, &field_value);
-                    }
-                    FieldDef::Numeric { precision, .. } => match precision {
-                        NumericType::I64 => {
-                            if let Ok(v) = field_value.parse::<i64>() {
-                                doc.add_i64(*field, v);
-                            }
-                        }
-                        NumericType::U64 => {
-                            if let Ok(v) = field_value.parse::<u64>() {
-                                doc.add_u64(*field, v);
-                            }
-                        }
-                        NumericType::F64 => {
-                            if let Ok(v) = field_value.parse::<f64>() {
-                                doc.add_f64(*field, v);
-                            }
-                        }
-                        NumericType::Date => {
-                            if let Ok(v) = field_value.parse::<i64>() {
-                                doc.add_date(*field, DateTime::from_timestamp_millis(v));
-                            }
-                        }
-                    },
-                    FieldDef::Tag {
-                        separator,
-                        case_sensitive,
-                        ..
-                    } => {
-                        let tags = if !case_sensitive {
-                            field_value.to_lowercase()
-                        } else {
-                            field_value.clone()
-                        };
-
-                        // Store tags as separate terms for efficient filtering
-                        for tag in tags.split(separator.as_str()) {
-                            doc.add_text(*field, tag.trim());
-                        }
-                    }
-                    FieldDef::Geo { .. } => {
-                        // Parse "lat,lon" format
-                        let parts: Vec<&str> = field_value.split(',').collect();
-                        if parts.len() == 2 {
-                            if let (Ok(lat), Ok(lon)) =
-                                (parts[0].parse::<f64>(), parts[1].parse::<f64>())
-                            {
-                                if let Some((lat_field, _)) =
-                                    self.index_schema.fields.get(&format!("{}_lat", field_name))
-                                {
-                                    doc.add_f64(*lat_field, lat);
-                                }
-                                if let Some((lon_field, _)) =
-                                    self.index_schema.fields.get(&format!("{}_lon", field_name))
-                                {
-                                    doc.add_f64(*lon_field, lon);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        writer
-            .add_document(doc)
-            .map_err(|e| DBError(format!("Failed to add document: {}", e)))?;
-
-        writer
-            .commit()
-            .map_err(|e| DBError(format!("Failed to commit: {}", e)))?;
-
-        Ok(())
-    }
-
-    pub fn search_with_options(
-        &self,
-        query_str: &str,
-        options: SearchOptions,
-    ) -> Result<SearchResults, DBError> {
-        let searcher = self.reader.searcher();
-
-        // Parse query based on search fields
-        let query: Box<dyn Query> = if self.index_schema.default_search_fields.is_empty() {
-            return Err(DBError(
-                "No searchable fields defined in schema".to_string(),
-            ));
-        } else {
-            let query_parser = QueryParser::for_index(
-                &self.index,
-                self.index_schema.default_search_fields.clone(),
-            );
-
-            Box::new(
-                query_parser
-                    .parse_query(query_str)
-                    .map_err(|e| DBError(format!("Failed to parse query: {}", e)))?,
-            )
-        };
-
-        // Apply filters if any
-        let final_query = if !options.filters.is_empty() {
-            let mut clauses: Vec<(Occur, Box<dyn Query>)> = vec![(Occur::Must, query)];
-
-            // Add filters
-            for filter in options.filters {
-                if let Some((field, _)) = self.index_schema.fields.get(&filter.field) {
-                    match filter.filter_type {
-                        FilterType::Equals(value) => {
-                            let term_query = TermQuery::new(
-                                Term::from_field_text(*field, &value),
-                                tantivy::schema::IndexRecordOption::Basic,
-                            );
-                            clauses.push((Occur::Must, Box::new(term_query)));
-                        }
-                        FilterType::Range { min: _, max: _ } => {
-                            // Would need numeric field handling here
-                            // Simplified for now
-                        }
-                        FilterType::InSet(values) => {
-                            let mut sub_clauses: Vec<(Occur, Box<dyn Query>)> = vec![];
-                            for value in values {
-                                let term_query = TermQuery::new(
-                                    Term::from_field_text(*field, &value),
-                                    tantivy::schema::IndexRecordOption::Basic,
-                                );
-                                sub_clauses.push((Occur::Should, Box::new(term_query)));
-                            }
-                            clauses.push((Occur::Must, Box::new(BooleanQuery::new(sub_clauses))));
-                        }
-                    }
-                }
-            }
-
-            Box::new(BooleanQuery::new(clauses))
-        } else {
-            query
-        };
-
-        // Execute search
-        let top_docs = searcher
-            .search(
-                &*final_query,
-                &TopDocs::with_limit(options.limit + options.offset),
-            )
-            .map_err(|e| DBError(format!("Search failed: {}", e)))?;
-
-        let total_hits = top_docs.len();
-        let mut documents = Vec::new();
-
-        for (score, doc_address) in top_docs.iter().skip(options.offset).take(options.limit) {
-            let retrieved_doc: TantivyDocument = searcher
-                .doc(*doc_address)
-                .map_err(|e| DBError(format!("Failed to retrieve doc: {}", e)))?;
-
-            let mut doc_fields = HashMap::new();
-
-            // Extract all stored fields
-            for (field_name, (field, field_def)) in &self.index_schema.fields {
-                match field_def {
-                    FieldDef::Text { stored, .. } | FieldDef::Tag { stored, .. } => {
-                        if *stored {
-                            if let Some(value) = retrieved_doc.get_first(*field) {
-                                if let Some(text) = value.as_str() {
-                                    doc_fields.insert(field_name.clone(), text.to_string());
-                                }
-                            }
-                        }
-                    }
-                    FieldDef::Numeric {
-                        stored, precision, ..
-                    } => {
-                        if *stored {
-                            let value_str = match precision {
-                                NumericType::I64 => retrieved_doc
-                                    .get_first(*field)
-                                    .and_then(|v| v.as_i64())
-                                    .map(|v| v.to_string()),
-                                NumericType::U64 => retrieved_doc
-                                    .get_first(*field)
-                                    .and_then(|v| v.as_u64())
-                                    .map(|v| v.to_string()),
-                                NumericType::F64 => retrieved_doc
-                                    .get_first(*field)
-                                    .and_then(|v| v.as_f64())
-                                    .map(|v| v.to_string()),
-                                NumericType::Date => retrieved_doc
-                                    .get_first(*field)
-                                    .and_then(|v| v.as_datetime())
-                                    .map(|v| v.into_timestamp_millis().to_string()),
-                            };
-
-                            if let Some(v) = value_str {
-                                doc_fields.insert(field_name.clone(), v);
-                            }
-                        }
-                    }
-                    FieldDef::Geo { stored } => {
-                        if *stored {
-                            let lat_field = self
-                                .index_schema
-                                .fields
-                                .get(&format!("{}_lat", field_name))
-                                .unwrap()
-                                .0;
-                            let lon_field = self
-                                .index_schema
-                                .fields
-                                .get(&format!("{}_lon", field_name))
-                                .unwrap()
-                                .0;
-
-                            let lat = retrieved_doc.get_first(lat_field).and_then(|v| v.as_f64());
-                            let lon = retrieved_doc.get_first(lon_field).and_then(|v| v.as_f64());
-
-                            if let (Some(lat), Some(lon)) = (lat, lon) {
-                                doc_fields.insert(field_name.clone(), format!("{},{}", lat, lon));
-                            }
-                        }
-                    }
-                }
-            }
-
-            documents.push(SearchDocument {
-                fields: doc_fields,
-                score: *score,
-            });
-        }
-
-        Ok(SearchResults {
-            total: total_hits,
-            documents,
-        })
-    }
-
-    pub fn get_info(&self) -> Result<IndexInfo, DBError> {
-        let searcher = self.reader.searcher();
-        let num_docs = searcher.num_docs();
-
-        let fields_info: Vec<FieldInfo> = self
-            .index_schema
-            .fields
-            .iter()
-            .map(|(name, (_, def))| FieldInfo {
-                name: name.clone(),
-                field_type: format!("{:?}", def),
-            })
-            .collect();
-
-        Ok(IndexInfo {
-            name: self.name.clone(),
-            num_docs,
-            fields: fields_info,
-            config: self.config.clone(),
-        })
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct SearchOptions {
-    pub limit: usize,
-    pub offset: usize,
-    pub filters: Vec<Filter>,
-    pub sort_by: Option<String>,
-    pub return_fields: Option<Vec<String>>,
-    pub highlight: bool,
-}
-
-impl Default for SearchOptions {
-    fn default() -> Self {
-        SearchOptions {
-            limit: 10,
-            offset: 0,
-            filters: vec![],
-            sort_by: None,
-            return_fields: None,
-            highlight: false,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Filter {
-    pub field: String,
-    pub filter_type: FilterType,
-}
-
-#[derive(Debug, Clone)]
-pub enum FilterType {
-    Equals(String),
-    Range { min: String, max: String },
-    InSet(Vec<String>),
-}
-
-#[derive(Debug)]
-pub struct SearchResults {
-    pub total: usize,
-    pub documents: Vec<SearchDocument>,
-}
-
-#[derive(Debug)]
-pub struct SearchDocument {
-    pub fields: HashMap<String, String>,
-    pub score: f32,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct IndexInfo {
-    pub name: String,
-    pub num_docs: u64,
-    pub fields: Vec<FieldInfo>,
-    pub config: IndexConfig,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FieldInfo {
-    pub name: String,
-    pub field_type: String,
-}

tests/debug_hset.rs

@@ -1,4 +1,4 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
@@ -47,31 +47,17 @@ async fn debug_hset_simple() {
     
     sleep(Duration::from_millis(200)).await;
     
-    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port))
-        .await
-        .unwrap();
+    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port)).await.unwrap();
     
     // Test simple HSET
     println!("Testing HSET...");
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n").await;
     println!("HSET response: {}", response);
     assert!(response.contains("1"), "Expected '1' but got: {}", response);
     
     // Test HGET
     println!("Testing HGET...");
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
     println!("HGET response: {}", response);
-    assert!(
-        response.contains("value1"),
-        "Expected 'value1' but got: {}",
-        response
-    );
+    assert!(response.contains("value1"), "Expected 'value1' but got: {}", response);
 }

tests/debug_hset_simple.rs

@@ -1,4 +1,4 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
@@ -53,9 +53,5 @@ async fn debug_hset_return_value() {
     println!("Response bytes: {:?}", &buffer[..n]);
     
     // Check if response contains "1"
-    assert!(
-        response.contains("1"),
-        "Expected response to contain '1', got: {}",
-        response
-    );
+    assert!(response.contains("1"), "Expected response to contain '1', got: {}", response);
 }

tests/debug_protocol.rs

@@ -1,14 +1,11 @@
-use herodb::cmd::Cmd;
 use herodb::protocol::Protocol;
+use herodb::cmd::Cmd;
 
 #[test]
 fn test_protocol_parsing() {
     // Test TYPE command parsing
     let type_cmd = "*2\r\n$4\r\nTYPE\r\n$7\r\nnoexist\r\n";
-    println!(
-        "Parsing TYPE command: {}",
-        type_cmd.replace("\r\n", "\\r\\n")
-    );
+    println!("Parsing TYPE command: {}", type_cmd.replace("\r\n", "\\r\\n"));
     
     match Protocol::from(type_cmd) {
         Ok((protocol, _)) => {
@@ -23,10 +20,7 @@ fn test_protocol_parsing() {
     
     // Test HEXISTS command parsing
     let hexists_cmd = "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n";
-    println!(
-        "\nParsing HEXISTS command: {}",
-        hexists_cmd.replace("\r\n", "\\r\\n")
-    );
+    println!("\nParsing HEXISTS command: {}", hexists_cmd.replace("\r\n", "\\r\\n"));
     
     match Protocol::from(hexists_cmd) {
         Ok((protocol, _)) => {

tests/redis_integration_tests.rs

@@ -206,9 +206,7 @@ async fn test_expiration(conn: &mut Connection) {
 async fn test_scan_operations(conn: &mut Connection) {
     cleanup_keys(conn).await;
     for i in 0..5 {
-        let _: () = conn
-            .set(format!("key{}", i), format!("value{}", i))
-            .unwrap();
+        let _: () = conn.set(format!("key{}", i), format!("value{}", i)).unwrap();
     }
     let result: (u64, Vec<String>) = redis::cmd("SCAN")
         .arg(0)
@@ -255,9 +253,7 @@ async fn test_scan_with_count(conn: &mut Connection) {
 async fn test_hscan_operations(conn: &mut Connection) {
     cleanup_keys(conn).await;
     for i in 0..3 {
-        let _: () = conn
-            .hset("testhash", format!("field{}", i), format!("value{}", i))
-            .unwrap();
+        let _: () = conn.hset("testhash", format!("field{}", i), format!("value{}", i)).unwrap();
     }
     let result: (u64, Vec<String>) = redis::cmd("HSCAN")
         .arg("testhash")
@@ -277,16 +273,8 @@ async fn test_hscan_operations(conn: &mut Connection) {
 async fn test_transaction_operations(conn: &mut Connection) {
     cleanup_keys(conn).await;
     let _: () = redis::cmd("MULTI").query(conn).unwrap();
-    let _: () = redis::cmd("SET")
-        .arg("key1")
-        .arg("value1")
-        .query(conn)
-        .unwrap();
-    let _: () = redis::cmd("SET")
-        .arg("key2")
-        .arg("value2")
-        .query(conn)
-        .unwrap();
+    let _: () = redis::cmd("SET").arg("key1").arg("value1").query(conn).unwrap();
+    let _: () = redis::cmd("SET").arg("key2").arg("value2").query(conn).unwrap();
     let _: Vec<String> = redis::cmd("EXEC").query(conn).unwrap();
     let result: String = conn.get("key1").unwrap();
     assert_eq!(result, "value1");
@@ -298,11 +286,7 @@ async fn test_transaction_operations(conn: &mut Connection) {
 async fn test_discard_transaction(conn: &mut Connection) {
     cleanup_keys(conn).await;
     let _: () = redis::cmd("MULTI").query(conn).unwrap();
-    let _: () = redis::cmd("SET")
-        .arg("discard")
-        .arg("value")
-        .query(conn)
-        .unwrap();
+    let _: () = redis::cmd("SET").arg("discard").arg("value").query(conn).unwrap();
     let _: () = redis::cmd("DISCARD").query(conn).unwrap();
     let result: Option<String> = conn.get("discard").unwrap();
     assert_eq!(result, None);
@@ -322,6 +306,7 @@ async fn test_type_command(conn: &mut Connection) {
     cleanup_keys(conn).await;
 }
 
+
 async fn test_info_command(conn: &mut Connection) {
     cleanup_keys(conn).await;
     let result: String = redis::cmd("INFO").query(conn).unwrap();

tests/redis_tests.rs

@@ -1,4 +1,4 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
@@ -99,11 +99,7 @@ async fn test_string_operations() {
     let mut stream = connect_to_server(port).await;
     
     // Test SET
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n").await;
     assert!(response.contains("OK"));
     
     // Test GET
@@ -152,11 +148,7 @@ async fn test_incr_operations() {
     assert!(response.contains("2"));
     
     // Test INCR on string value (should fail)
-    send_command(
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nhello\r\n",
-    )
-    .await;
+    send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nhello\r\n").await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nINCR\r\n$6\r\nstring\r\n").await;
     assert!(response.contains("ERR"));
 }
@@ -182,19 +174,11 @@ async fn test_hash_operations() {
     let mut stream = connect_to_server(port).await;
     
     // Test HSET
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n").await;
     assert!(response.contains("1")); // 1 new field
     
     // Test HGET
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
     assert!(response.contains("value1"));
     
     // Test HSET multiple fields
@@ -213,26 +197,14 @@ async fn test_hash_operations() {
     assert!(response.contains("3"));
     
     // Test HEXISTS
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
     assert!(response.contains("1"));
     
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n").await;
     assert!(response.contains("0"));
     
     // Test HDEL
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$4\r\nHDEL\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHDEL\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
     assert!(response.contains("1"));
     
     // Test HKEYS
@@ -268,11 +240,7 @@ async fn test_expiration() {
     let mut stream = connect_to_server(port).await;
     
     // Test SETEX (expire in 1 second)
-    let response = send_command(
-        &mut stream,
-        "*5\r\n$3\r\nSET\r\n$6\r\nexpkey\r\n$5\r\nvalue\r\n$2\r\nEX\r\n$1\r\n1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*5\r\n$3\r\nSET\r\n$6\r\nexpkey\r\n$5\r\nvalue\r\n$2\r\nEX\r\n$1\r\n1\r\n").await;
     assert!(response.contains("OK"));
     
     // Test TTL
@@ -326,11 +294,7 @@ async fn test_scan_operations() {
     }
     
     // Test SCAN
-    let response = send_command(
-        &mut stream,
-        "*6\r\n$4\r\nSCAN\r\n$1\r\n0\r\n$5\r\nMATCH\r\n$1\r\n*\r\n$5\r\nCOUNT\r\n$2\r\n10\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*6\r\n$4\r\nSCAN\r\n$1\r\n0\r\n$5\r\nMATCH\r\n$1\r\n*\r\n$5\r\nCOUNT\r\n$2\r\n10\r\n").await;
     assert!(response.contains("key"));
     
     // Test KEYS
@@ -361,10 +325,7 @@ async fn test_hscan_operations() {
     
     // Set up hash data
     for i in 0..3 {
-        let cmd = format!(
-            "*4\r\n$4\r\nHSET\r\n$8\r\ntesthash\r\n$6\r\nfield{}\r\n$6\r\nvalue{}\r\n",
-            i, i
-        );
+        let cmd = format!("*4\r\n$4\r\nHSET\r\n$8\r\ntesthash\r\n$6\r\nfield{}\r\n$6\r\nvalue{}\r\n", i, i);
         send_command(&mut stream, &cmd).await;
     }
     
@@ -399,18 +360,10 @@ async fn test_transaction_operations() {
     assert!(response.contains("OK"));
     
     // Test queued commands
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n").await;
     assert!(response.contains("QUEUED"));
     
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n").await;
     assert!(response.contains("QUEUED"));
     
     // Test EXEC
@@ -450,11 +403,7 @@ async fn test_discard_transaction() {
     assert!(response.contains("OK"));
     
     // Test queued command
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$7\r\ndiscard\r\n$5\r\nvalue\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$7\r\ndiscard\r\n$5\r\nvalue\r\n").await;
     assert!(response.contains("QUEUED"));
     
     // Test DISCARD
@@ -487,20 +436,12 @@ async fn test_type_command() {
     let mut stream = connect_to_server(port).await;
     
     // Test string type
-    send_command(
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n",
-    )
-    .await;
+    send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n").await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$6\r\nstring\r\n").await;
     assert!(response.contains("string"));
     
     // Test hash type
-    send_command(
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n",
-    )
-    .await;
+    send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n").await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$4\r\nhash\r\n").await;
     assert!(response.contains("hash"));
     
@@ -530,20 +471,12 @@ async fn test_config_commands() {
     let mut stream = connect_to_server(port).await;
     
     // Test CONFIG GET databases
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$6\r\nCONFIG\r\n$3\r\nGET\r\n$9\r\ndatabases\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$6\r\nCONFIG\r\n$3\r\nGET\r\n$9\r\ndatabases\r\n").await;
     assert!(response.contains("databases"));
     assert!(response.contains("16"));
     
     // Test CONFIG GET dir
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$6\r\nCONFIG\r\n$3\r\nGET\r\n$3\r\ndir\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$6\r\nCONFIG\r\n$3\r\nGET\r\n$3\r\ndir\r\n").await;
     assert!(response.contains("dir"));
     assert!(response.contains("/tmp/herodb_test_config"));
 }
@@ -598,16 +531,8 @@ async fn test_error_handling() {
     let mut stream = connect_to_server(port).await;
     
     // Test WRONGTYPE error - try to use hash command on string
-    send_command(
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n",
-    )
-    .await;
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$4\r\nHGET\r\n$6\r\nstring\r\n$5\r\nfield\r\n",
-    )
-    .await;
+    send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n").await;
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHGET\r\n$6\r\nstring\r\n$5\r\nfield\r\n").await;
     assert!(response.contains("WRONGTYPE"));
     
     // Test unknown command
@@ -644,19 +569,11 @@ async fn test_list_operations() {
     let mut stream = connect_to_server(port).await;
     
     // Test LPUSH
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$5\r\nLPUSH\r\n$4\r\nlist\r\n$1\r\na\r\n$1\r\nb\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*4\r\n$5\r\nLPUSH\r\n$4\r\nlist\r\n$1\r\na\r\n$1\r\nb\r\n").await;
     assert!(response.contains("2")); // 2 elements
     
     // Test RPUSH
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$5\r\nRPUSH\r\n$4\r\nlist\r\n$1\r\nc\r\n$1\r\nd\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*4\r\n$5\r\nRPUSH\r\n$4\r\nlist\r\n$1\r\nc\r\n$1\r\nd\r\n").await;
     assert!(response.contains("4")); // 4 elements
 
     // Test LLEN
@@ -664,22 +581,11 @@ async fn test_list_operations() {
     assert!(response.contains("4"));
 
     // Test LRANGE
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$6\r\nLRANGE\r\n$4\r\nlist\r\n$1\r\n0\r\n$2\r\n-1\r\n",
-    )
-    .await;
-    assert_eq!(
-        response,
-        "*4\r\n$1\r\nb\r\n$1\r\na\r\n$1\r\nc\r\n$1\r\nd\r\n"
-    );
+    let response = send_command(&mut stream, "*4\r\n$6\r\nLRANGE\r\n$4\r\nlist\r\n$1\r\n0\r\n$2\r\n-1\r\n").await;
+    assert_eq!(response, "*4\r\n$1\r\nb\r\n$1\r\na\r\n$1\r\nc\r\n$1\r\nd\r\n");
     
     // Test LINDEX
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$6\r\nLINDEX\r\n$4\r\nlist\r\n$1\r\n0\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$6\r\nLINDEX\r\n$4\r\nlist\r\n$1\r\n0\r\n").await;
     assert_eq!(response, "$1\r\nb\r\n");
     
     // Test LPOP
@@ -691,24 +597,12 @@ async fn test_list_operations() {
     assert_eq!(response, "$1\r\nd\r\n");
 
     // Test LREM
-    send_command(
-        &mut stream,
-        "*3\r\n$5\r\nLPUSH\r\n$4\r\nlist\r\n$1\r\na\r\n",
-    )
-    .await; // list is now a, c, a
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$4\r\nLREM\r\n$4\r\nlist\r\n$1\r\n1\r\n$1\r\na\r\n",
-    )
-    .await;
+    send_command(&mut stream, "*3\r\n$5\r\nLPUSH\r\n$4\r\nlist\r\n$1\r\na\r\n").await; // list is now a, c, a
+    let response = send_command(&mut stream, "*4\r\n$4\r\nLREM\r\n$4\r\nlist\r\n$1\r\n1\r\n$1\r\na\r\n").await;
     assert!(response.contains("1"));
 
     // Test LTRIM
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$5\r\nLTRIM\r\n$4\r\nlist\r\n$1\r\n0\r\n$1\r\n0\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*4\r\n$5\r\nLTRIM\r\n$4\r\nlist\r\n$1\r\n0\r\n$1\r\n0\r\n").await;
     assert!(response.contains("OK"));
     let response = send_command(&mut stream, "*2\r\n$4\r\nLLEN\r\n$4\r\nlist\r\n").await;
     assert!(response.contains("1"));

tests/rpc_tests.rs

@@ -0,0 +1,62 @@
+use std::net::SocketAddr;
+use jsonrpsee::http_client::HttpClientBuilder;
+use jsonrpsee::core::client::ClientT;
+use serde_json::json;
+
+use herodb::rpc::{RpcClient, BackendType, DatabaseConfig};
+
+#[tokio::test]
+async fn test_rpc_server_basic() {
+    // This test would require starting the RPC server in a separate thread
+    // For now, we'll just test that the types compile correctly
+
+    // Test serialization of types
+    let backend = BackendType::Redb;
+    let config = DatabaseConfig {
+        name: Some("test_db".to_string()),
+        storage_path: Some("/tmp/test".to_string()),
+        max_size: Some(1024 * 1024),
+        redis_version: Some("7.0".to_string()),
+    };
+
+    let backend_json = serde_json::to_string(&backend).unwrap();
+    let config_json = serde_json::to_string(&config).unwrap();
+
+    assert_eq!(backend_json, "\"Redb\"");
+    assert!(config_json.contains("test_db"));
+}
+
+#[tokio::test]
+async fn test_database_config_serialization() {
+    let config = DatabaseConfig {
+        name: Some("my_db".to_string()),
+        storage_path: None,
+        max_size: Some(1000000),
+        redis_version: Some("7.0".to_string()),
+    };
+
+    let json = serde_json::to_value(&config).unwrap();
+    assert_eq!(json["name"], "my_db");
+    assert_eq!(json["max_size"], 1000000);
+    assert_eq!(json["redis_version"], "7.0");
+}
+
+#[tokio::test]
+async fn test_backend_type_serialization() {
+    // Test that both Redb and Sled backends serialize correctly
+    let redb_backend = BackendType::Redb;
+    let sled_backend = BackendType::Sled;
+
+    let redb_json = serde_json::to_string(&redb_backend).unwrap();
+    let sled_json = serde_json::to_string(&sled_backend).unwrap();
+
+    assert_eq!(redb_json, "\"Redb\"");
+    assert_eq!(sled_json, "\"Sled\"");
+
+    // Test deserialization
+    let redb_deserialized: BackendType = serde_json::from_str(&redb_json).unwrap();
+    let sled_deserialized: BackendType = serde_json::from_str(&sled_json).unwrap();
+
+    assert!(matches!(redb_deserialized, BackendType::Redb));
+    assert!(matches!(sled_deserialized, BackendType::Sled));
+}

tests/simple_integration_test.rs

@@ -1,8 +1,8 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
 use std::time::Duration;
+use tokio::time::sleep;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
-use tokio::time::sleep;
 
 // Helper function to start a test server with clean data directory
 async fn start_test_server(test_name: &str) -> (Server, u16) {
@@ -33,9 +33,7 @@ async fn start_test_server(test_name: &str) -> (Server, u16) {
 
 // Helper function to send Redis command and get response
 async fn send_redis_command(port: u16, command: &str) -> String {
-    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port))
-        .await
-        .unwrap();
+    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port)).await.unwrap();
     stream.write_all(command.as_bytes()).await.unwrap();
     
     let mut buffer = [0; 1024];
@@ -68,8 +66,7 @@ async fn test_basic_redis_functionality() {
     assert!(response.contains("PONG"));
     
     // Test SET
-    let response =
-        send_redis_command(port, "*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n").await;
+    let response = send_redis_command(port, "*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n").await;
     assert!(response.contains("OK"));
     
     // Test GET
@@ -77,16 +74,11 @@ async fn test_basic_redis_functionality() {
     assert!(response.contains("value"));
     
     // Test HSET
-    let response = send_redis_command(
-        port,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n",
-    )
-    .await;
+    let response = send_redis_command(port, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n").await;
     assert!(response.contains("1"));
     
     // Test HGET
-    let response =
-        send_redis_command(port, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$5\r\nfield\r\n").await;
+    let response = send_redis_command(port, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$5\r\nfield\r\n").await;
     assert!(response.contains("value"));
     
     // Test EXISTS
@@ -102,13 +94,8 @@ async fn test_basic_redis_functionality() {
     assert!(response.contains("string"));
     
     // Test QUIT to close connection gracefully
-    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port))
-        .await
-        .unwrap();
-    stream
-        .write_all("*1\r\n$4\r\nQUIT\r\n".as_bytes())
-        .await
-        .unwrap();
+    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port)).await.unwrap();
+    stream.write_all("*1\r\n$4\r\nQUIT\r\n".as_bytes()).await.unwrap();
     let mut buffer = [0; 1024];
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
@@ -155,11 +142,7 @@ async fn test_hash_operations() {
     assert!(response.contains("value2"));
     
     // Test HEXISTS
-    let response = send_redis_command(
-        port,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
+    let response = send_redis_command(port, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
     assert!(response.contains("1"));
     
     // Test HLEN
@@ -202,59 +185,39 @@ async fn test_transaction_operations() {
     sleep(Duration::from_millis(100)).await;
     
     // Use a single connection for the transaction
-    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port))
-        .await
-        .unwrap();
+    let mut stream = TcpStream::connect(format!("127.0.0.1:{}", port)).await.unwrap();
     
     // Test MULTI
-    stream
-        .write_all("*1\r\n$5\r\nMULTI\r\n".as_bytes())
-        .await
-        .unwrap();
+    stream.write_all("*1\r\n$5\r\nMULTI\r\n".as_bytes()).await.unwrap();
     let mut buffer = [0; 1024];
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("OK"));
     
     // Test queued commands
-    stream
-        .write_all("*3\r\n$3\r\nSET\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n".as_bytes())
-        .await
-        .unwrap();
+    stream.write_all("*3\r\n$3\r\nSET\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n".as_bytes()).await.unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("QUEUED"));
     
-    stream
-        .write_all("*3\r\n$3\r\nSET\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n".as_bytes())
-        .await
-        .unwrap();
+    stream.write_all("*3\r\n$3\r\nSET\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n".as_bytes()).await.unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("QUEUED"));
     
     // Test EXEC
-    stream
-        .write_all("*1\r\n$4\r\nEXEC\r\n".as_bytes())
-        .await
-        .unwrap();
+    stream.write_all("*1\r\n$4\r\nEXEC\r\n".as_bytes()).await.unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("OK")); // Should contain array of OK responses
     
     // Verify commands were executed
-    stream
-        .write_all("*2\r\n$3\r\nGET\r\n$4\r\nkey1\r\n".as_bytes())
-        .await
-        .unwrap();
+    stream.write_all("*2\r\n$3\r\nGET\r\n$4\r\nkey1\r\n".as_bytes()).await.unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("value1"));
     
-    stream
-        .write_all("*2\r\n$3\r\nGET\r\n$4\r\nkey2\r\n".as_bytes())
-        .await
-        .unwrap();
+    stream.write_all("*2\r\n$3\r\nGET\r\n$4\r\nkey2\r\n".as_bytes()).await.unwrap();
     let n = stream.read(&mut buffer).await.unwrap();
     let response = String::from_utf8_lossy(&buffer[..n]);
     assert!(response.contains("value2"));

tests/simple_redis_test.rs

@@ -1,4 +1,4 @@
-use herodb::{options::DBOption, server::Server};
+use herodb::{server::Server, options::DBOption};
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
@@ -99,24 +99,12 @@ async fn test_hset_clean_db() {
     let mut stream = connect_to_server(port).await;
     
     // Test HSET - should return 1 for new field
-    let response = send_command(
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n").await;
     println!("HSET response: {}", response);
-    assert!(
-        response.contains("1"),
-        "Expected HSET to return 1, got: {}",
-        response
-    );
+    assert!(response.contains("1"), "Expected HSET to return 1, got: {}", response);
     
     // Test HGET
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$4\r\nHGET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
     println!("HGET response: {}", response);
     assert!(response.contains("value1"));
 }
@@ -143,21 +131,13 @@ async fn test_type_command_simple() {
     let mut stream = connect_to_server(port).await;
     
     // Test string type
-    send_command(
-        &mut stream,
-        "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n",
-    )
-    .await;
+    send_command(&mut stream, "*3\r\n$3\r\nSET\r\n$6\r\nstring\r\n$5\r\nvalue\r\n").await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$6\r\nstring\r\n").await;
     println!("TYPE string response: {}", response);
     assert!(response.contains("string"));
     
     // Test hash type
-    send_command(
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n",
-    )
-    .await;
+    send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$5\r\nfield\r\n$5\r\nvalue\r\n").await;
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$4\r\nhash\r\n").await;
     println!("TYPE hash response: {}", response);
     assert!(response.contains("hash"));
@@ -165,11 +145,7 @@ async fn test_type_command_simple() {
     // Test non-existent key
     let response = send_command(&mut stream, "*2\r\n$4\r\nTYPE\r\n$7\r\nnoexist\r\n").await;
     println!("TYPE noexist response: {}", response);
-    assert!(
-        response.contains("none"),
-        "Expected 'none' for non-existent key, got: {}",
-        response
-    );
+    assert!(response.contains("none"), "Expected 'none' for non-existent key, got: {}", response);
 }
 
 #[tokio::test]
@@ -194,31 +170,15 @@ async fn test_hexists_simple() {
     let mut stream = connect_to_server(port).await;
     
     // Set up hash
-    send_command(
-        &mut stream,
-        "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n",
-    )
-    .await;
+    send_command(&mut stream, "*4\r\n$4\r\nHSET\r\n$4\r\nhash\r\n$6\r\nfield1\r\n$6\r\nvalue1\r\n").await;
     
     // Test HEXISTS for existing field
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$6\r\nfield1\r\n").await;
     println!("HEXISTS existing field response: {}", response);
     assert!(response.contains("1"));
     
     // Test HEXISTS for non-existent field
-    let response = send_command(
-        &mut stream,
-        "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n",
-    )
-    .await;
+    let response = send_command(&mut stream, "*3\r\n$7\r\nHEXISTS\r\n$4\r\nhash\r\n$7\r\nnoexist\r\n").await;
     println!("HEXISTS non-existent field response: {}", response);
-    assert!(
-        response.contains("0"),
-        "Expected HEXISTS to return 0 for non-existent field, got: {}",
-        response
-    );
+    assert!(response.contains("0"), "Expected HEXISTS to return 0 for non-existent field, got: {}", response);
 }

tests/usage_suite.rs

@@ -325,11 +325,7 @@ async fn test_03_scan_and_keys() {
     let mut s = connect(port).await;
 
     for i in 0..5 {
-        let _ = send_cmd(
-            &mut s,
-            &["SET", &format!("key{}", i), &format!("value{}", i)],
-        )
-        .await;
+        let _ = send_cmd(&mut s, &["SET", &format!("key{}", i), &format!("value{}", i)]).await;
     }
 
     let scan = send_cmd(&mut s, &["SCAN", "0", "MATCH", "key*", "COUNT", "10"]).await;
@@ -362,11 +358,7 @@ async fn test_04_hashes_suite() {
     assert_contains(&h2, "2", "HSET added 2 new fields");
 
     // HMGET
-    let hmg = send_cmd(
-        &mut s,
-        &["HMGET", "profile:1", "name", "age", "city", "nope"],
-    )
-    .await;
+    let hmg = send_cmd(&mut s, &["HMGET", "profile:1", "name", "age", "city", "nope"]).await;
     assert_contains(&hmg, "alice", "HMGET name");
     assert_contains(&hmg, "30", "HMGET age");
     assert_contains(&hmg, "paris", "HMGET city");
@@ -400,11 +392,7 @@ async fn test_04_hashes_suite() {
     assert_contains(&hnx1, "1", "HSETNX new field -> 1");
 
     // HSCAN
-    let hscan = send_cmd(
-        &mut s,
-        &["HSCAN", "profile:1", "0", "MATCH", "n*", "COUNT", "10"],
-    )
-    .await;
+    let hscan = send_cmd(&mut s, &["HSCAN", "profile:1", "0", "MATCH", "n*", "COUNT", "10"]).await;
     assert_contains(&hscan, "name", "HSCAN matches fields starting with n");
     assert_contains(&hscan, "nickname", "HSCAN nickname present");
 
@@ -436,21 +424,13 @@ async fn test_05_lists_suite_including_blpop() {
     assert_eq_resp(&lidx, "$1\r\nb\r\n", "LINDEX q:jobs 0 should be b");
 
     let lr = send_cmd(&mut a, &["LRANGE", "q:jobs", "0", "-1"]).await;
-    assert_eq_resp(
-        &lr,
-        "*3\r\n$1\r\nb\r\n$1\r\na\r\n$1\r\nc\r\n",
-        "LRANGE q:jobs 0 -1 should be [b,a,c]",
-    );
+    assert_eq_resp(&lr, "*3\r\n$1\r\nb\r\n$1\r\na\r\n$1\r\nc\r\n", "LRANGE q:jobs 0 -1 should be [b,a,c]");
 
     // LTRIM
     let ltrim = send_cmd(&mut a, &["LTRIM", "q:jobs", "0", "1"]).await;
     assert_contains(&ltrim, "OK", "LTRIM OK");
     let lr_post = send_cmd(&mut a, &["LRANGE", "q:jobs", "0", "-1"]).await;
-    assert_eq_resp(
-        &lr_post,
-        "*2\r\n$1\r\nb\r\n$1\r\na\r\n",
-        "After LTRIM, list [b,a]",
-    );
+    assert_eq_resp(&lr_post, "*2\r\n$1\r\nb\r\n$1\r\na\r\n", "After LTRIM, list [b,a]");
 
     // LREM remove first occurrence of b
     let lrem = send_cmd(&mut a, &["LREM", "q:jobs", "1", "b"]).await;
@@ -464,11 +444,7 @@ async fn test_05_lists_suite_including_blpop() {
 
     // LPOP with count on empty -> []
     let lpop0 = send_cmd(&mut a, &["LPOP", "q:jobs", "2"]).await;
-    assert_eq_resp(
-        &lpop0,
-        "*0\r\n",
-        "LPOP with count on empty returns empty array",
-    );
+    assert_eq_resp(&lpop0, "*0\r\n", "LPOP with count on empty returns empty array");
 
     // BLPOP: block on one client, push from another
     let c1 = connect(port).await;
@@ -525,11 +501,11 @@ async fn test_07_age_stateless_suite() {
     let mut s = connect(port).await;
 
     // GENENC -> [recipient, identity]
-    let gen = send_cmd(&mut s, &["AGE", "GENENC"]).await;
+    let genenc = send_cmd(&mut s, &["AGE", "GENENC"]).await;
     assert!(
-        gen.starts_with("*2\r\n$"),
+        genenc.starts_with("*2\r\n$"),
         "AGE GENENC should return array [recipient, identity], got:\n{}",
-        gen
+        genenc
     );
 
     // Parse simple RESP array of two bulk strings to extract keys
@@ -544,7 +520,7 @@ async fn test_07_age_stateless_suite() {
         let ident = lines.next().unwrap_or("").to_string();
         (recip, ident)
     }
-    let (recipient, identity) = parse_two_bulk_array(&gen);
+    let (recipient, identity) = parse_two_bulk_array(&genenc);
     assert!(
         recipient.starts_with("age1") && identity.starts_with("AGE-SECRET-KEY-1"),
         "Unexpected AGE key formats.\nrecipient: {}\nidentity: {}",
@@ -572,16 +548,8 @@ async fn test_07_age_stateless_suite() {
     let v_ok = send_cmd(&mut s, &["AGE", "VERIFY", &verify_pub, "msg", &sig_b64]).await;
     assert_contains(&v_ok, "1", "VERIFY should be 1 for valid signature");
 
-    let v_bad = send_cmd(
-        &mut s,
-        &["AGE", "VERIFY", &verify_pub, "tampered", &sig_b64],
-    )
-    .await;
-    assert_contains(
-        &v_bad,
-        "0",
-        "VERIFY should be 0 for invalid message/signature",
-    );
+    let v_bad = send_cmd(&mut s, &["AGE", "VERIFY", &verify_pub, "tampered", &sig_b64]).await;
+    assert_contains(&v_bad, "0", "VERIFY should be 0 for invalid message/signature");
 }
 
 #[tokio::test]
@@ -613,7 +581,7 @@ async fn test_08_age_persistent_named_suite() {
         skg
     );
 
-    let sig = send_cmd(&mut s, &["AGE", "SIGNNAME", "app1", "m"]).await;
+    let sig = send_cmd(&mut s, &["AGE", "SIGNNAME", "app1", "m"] ).await;
     let sig_b64 = extract_bulk_payload(&sig).expect("Failed to parse bulk payload from SIGNNAME");
     let v1 = send_cmd(&mut s, &["AGE", "VERIFYNAME", "app1", "m", &sig_b64]).await;
     assert_contains(&v1, "1", "VERIFYNAME valid => 1");
@@ -672,12 +640,7 @@ async fn test_10_expire_pexpire_persist() {
    let _ = send_cmd(&mut s, &["EXPIRE", "exp:persist", "5"]).await;
    let ttl_pre = send_cmd(&mut s, &["TTL", "exp:persist"]).await;
    assert!(
-        ttl_pre.contains("5")
-            || ttl_pre.contains("4")
-            || ttl_pre.contains("3")
-            || ttl_pre.contains("2")
-            || ttl_pre.contains("1")
-            || ttl_pre.contains("0"),
+       ttl_pre.contains("5") || ttl_pre.contains("4") || ttl_pre.contains("3") || ttl_pre.contains("2") || ttl_pre.contains("1") || ttl_pre.contains("0"),
        "TTL exp:persist should be >=0 before persist, got: {}",
        ttl_pre
    );
@@ -687,11 +650,7 @@ async fn test_10_expire_pexpire_persist() {
    assert_contains(&ttl_post, "-1", "TTL after PERSIST -> -1 (no expiration)");
    // Second persist should return 0 (nothing to remove)
    let persist2 = send_cmd(&mut s, &["PERSIST", "exp:persist"]).await;
-    assert_contains(
-        &persist2,
-        "0",
-        "PERSIST again -> 0 (no expiration to remove)",
-    );
+   assert_contains(&persist2, "0", "PERSIST again -> 0 (no expiration to remove)");
 }
 
 #[tokio::test]
@@ -704,11 +663,7 @@ async fn test_11_set_with_options() {
 
     // SET with GET on non-existing key -> returns Null, sets value
     let set_get1 = send_cmd(&mut s, &["SET", "s1", "v1", "GET"]).await;
-    assert_contains(
-        &set_get1,
-        "$-1",
-        "SET s1 v1 GET returns Null when key didn't exist",
-    );
+    assert_contains(&set_get1, "$-1", "SET s1 v1 GET returns Null when key didn't exist");
     let g1 = send_cmd(&mut s, &["GET", "s1"]).await;
     assert_contains(&g1, "v1", "GET s1 after first SET");
 
@@ -907,16 +862,9 @@ async fn test_14_expireat_pexpireat() {
     let mut s = connect(port).await;
 
     // EXPIREAT: seconds since epoch
-    let now_secs = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap()
-        .as_secs() as i64;
+    let now_secs = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() as i64;
     let _ = send_cmd(&mut s, &["SET", "exp:at:s", "v"]).await;
-    let exat = send_cmd(
-        &mut s,
-        &["EXPIREAT", "exp:at:s", &format!("{}", now_secs + 1)],
-    )
-    .await;
+    let exat = send_cmd(&mut s, &["EXPIREAT", "exp:at:s", &format!("{}", now_secs + 1)]).await;
     assert_contains(&exat, "1", "EXPIREAT exp:at:s now+1s -> 1 (applied)");
     let ttl1 = send_cmd(&mut s, &["TTL", "exp:at:s"]).await;
     assert!(
@@ -926,23 +874,12 @@ async fn test_14_expireat_pexpireat() {
     );
     sleep(Duration::from_millis(1200)).await;
     let exists_after_exat = send_cmd(&mut s, &["EXISTS", "exp:at:s"]).await;
-    assert_contains(
-        &exists_after_exat,
-        "0",
-        "EXISTS exp:at:s after EXPIREAT expiry -> 0",
-    );
+    assert_contains(&exists_after_exat, "0", "EXISTS exp:at:s after EXPIREAT expiry -> 0");
 
     // PEXPIREAT: milliseconds since epoch
-    let now_ms = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
+    let now_ms = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis() as i64;
     let _ = send_cmd(&mut s, &["SET", "exp:at:ms", "v"]).await;
-    let pexat = send_cmd(
-        &mut s,
-        &["PEXPIREAT", "exp:at:ms", &format!("{}", now_ms + 450)],
-    )
-    .await;
+    let pexat = send_cmd(&mut s, &["PEXPIREAT", "exp:at:ms", &format!("{}", now_ms + 450)]).await;
     assert_contains(&pexat, "1", "PEXPIREAT exp:at:ms now+450ms -> 1 (applied)");
     let ttl2 = send_cmd(&mut s, &["TTL", "exp:at:ms"]).await;
     assert!(
@@ -952,9 +889,5 @@ async fn test_14_expireat_pexpireat() {
     );
     sleep(Duration::from_millis(600)).await;
     let exists_after_pexat = send_cmd(&mut s, &["EXISTS", "exp:at:ms"]).await;
-    assert_contains(
-        &exists_after_pexat,
-        "0",
-        "EXISTS exp:at:ms after PEXPIREAT expiry -> 0",
-    );
+    assert_contains(&exists_after_pexat, "0", "EXISTS exp:at:ms after PEXPIREAT expiry -> 0");
 }