Merge pull request #8 from NagaraTech/sprint_01

Sprint 01: new features

This pull request mainly contains two features:

init node basic version. Merge pull request init node basic version #1 from sglk123/poc_1
feat: add new vlc-dag demos of poc. Merge pull request feat: add new vlc-dag demos of poc #3 from NagaraTech/feat/vlc-dag

Author: ai-chen2050

Cargo.toml

@@ -15,6 +15,7 @@ members = [
     "zchronod/zchronod",
     "demos/test_conflict",
     "demos/coll-tx",
+    "demos/vlc-dag"
 ]
 
 [profile.release]

crates/vlc/src/lib.rs

@@ -59,6 +59,12 @@ impl Clock {
         *value += 1;
     }
 
+    /// Get the clock count by id
+    pub fn get(&mut self, id: u128) -> u128 {
+        let value = self.values.entry(id).or_insert(0);
+        *value
+    }
+
     /// Reset the clock.
     pub fn clear(&mut self) {
         self.values.clear();
@@ -73,6 +79,50 @@ impl Clock {
             }
         }
     }
+
+    /// Diff is local clock minus another clock
+    pub fn diff(&self, other: &Clock) -> Clock {
+        let mut ret = Clock::new();
+        for (id, v1) in &self.values {
+            let v2 = other.values.get(id).unwrap_or(&0);
+            if v1 > v2 {
+                ret.values.insert(*id, v1-v2);
+            } else {
+                ret.values.insert(*id, 0);
+            }
+        }
+        ret
+    }
+
+    /// return index key of clock
+    pub fn index_key(&self) -> String {
+        let mut key: String = String::new();
+        for (index, value) in &self.values {
+            key = format!("{}{}-{}-", key, index, value);
+        }
+        key
+    }
+
+    /// return common base clock of two clock
+    pub fn base_common(&self, other: &Clock) -> Clock {
+        let mut ret = Clock::new();
+        for (id, v1) in &self.values {
+            let v2 = other.values.get(id).unwrap_or(&0);
+            if v1 <= v2 {
+                ret.values.insert(*id, *v1);
+            } else {
+                ret.values.insert(*id, *v2);
+            }
+        }
+        ret
+    }
+
+    /// return true when all value is zero in clock dimensions
+    pub fn is_genesis(&self) -> bool {
+        let sum: u128 = self.values.values().sum();
+        sum == 0
+    }
+    
 }
 
 #[cfg(test)]

demos/vlc-dag/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "vlc-dag"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+vlc = { version = "0.1.0", path = "../../crates/vlc" }
+serde = { version = "1", features = ["derive"] }
+serde_json = { version = "1" }
+clap = { version = "4", features = ["derive"] }
+tokio = { version = "1", features = [
+    "net",
+    "rt-multi-thread",
+    "macros",
+    "time",
+] }
+rand = { version = "0.8" }
+lmdb-rs = "0.7.6"

demos/vlc-dag/src/db_client/lldb_client.rs

@@ -0,0 +1,59 @@
+use crate::{lmdb::{DbFlags, DbHandle, Environment}, ClockInfo, MergeLog};
+
+#[derive(Clone)]
+pub struct VLCLLDb {
+    env: Environment,
+    merge_log: DbHandle,
+    clock_infos: DbHandle,
+    cur_count: DbHandle,
+}
+
+impl VLCLLDb {
+    pub fn new(path: &str, mode: Option<u32>) -> Self {
+        let mut USER_DIR_MODE: u32 = 0o777;
+        if let Some(mode) = mode {
+            USER_DIR_MODE = mode;
+        }
+
+        let env = Environment::new()
+            .max_dbs(5)
+            .open(path, USER_DIR_MODE)
+            .expect("Failed to open the environment");
+
+        let merge_log = env
+            .create_db("merge_log", DbFlags::empty())
+            .expect("Failed to create the merge_log database");
+
+        let clock_infos = env
+            .create_db("clock_infos", DbFlags::empty())
+            .expect("Failed to create the clock_infos database");
+
+        let cur_count = env
+            .create_db("cur_count", DbFlags::empty())
+            .expect("Failed to create the cur_count database");
+
+        VLCLLDb { env, merge_log, clock_infos, cur_count }
+    }
+
+    pub(crate) fn add_clock_infos(&mut self, key: String, clock_info: ClockInfo) {
+        let txn = self.env.new_transaction().unwrap();
+        let db = txn.bind(&self.clock_infos);
+
+        let _ = db.set(&key, &serde_json::to_string(&clock_info).unwrap());
+        println!("[insert clock to DB]: \nkey: {},\nvalue: {:#?}", key, clock_info);
+    }
+
+    pub(crate) fn add_merge_log(&mut self, key: String, merge_log: MergeLog) {
+        let txn = self.env.new_transaction().unwrap();
+        let db = txn.bind(&self.merge_log);
+
+        let _ = db.set(&key, &serde_json::to_string(&merge_log).unwrap());
+        println!("[insert merge_log to DB]:  \nkey: {},\nvalue: {:#?}", key, merge_log);
+    }
+
+    pub fn get_clock_info(&mut self, key: String) -> String {
+        let txn = self.env.new_transaction().unwrap();
+        let db = txn.bind(&self.clock_infos);
+        db.get::<&str>(&key).unwrap_or("").to_string()
+    }
+}

demos/vlc-dag/src/db_client/lldb_test.rs

@@ -0,0 +1,85 @@
+use lmdb_rs as lmdb;
+use lmdb::{DbFlags, DbHandle, Environment};
+use serde::{Deserialize, Serialize};
+use std::collections::HashSet;
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+struct Commit {
+    pub id: String,
+    parent_ids: HashSet<String>,
+    message: String,
+}
+
+struct Repository {
+    env: Environment,
+    commits_db: DbHandle,
+}
+
+impl Repository {
+    
+    fn new(path: &str, db: &str) -> Self {
+        const USER_DIR: u32 = 0o777;
+        let env = Environment::new()
+            .max_dbs(5)
+            .open(path, USER_DIR)
+            .expect("Failed to open the environment");
+
+        let commits_db = env
+            .create_db(db, DbFlags::empty())
+            .expect("Failed to create the commits database");
+
+        Repository { env, commits_db }
+    }
+ 
+    fn add_commit(&mut self, commit: &Commit) {
+        // let db = self.env.get_default_db(DbFlags::empty()).unwrap();
+        let txn = self.env.new_transaction().unwrap();
+        let db = txn.bind(&self.commits_db);
+
+        let _ = db.set(&commit.id, &serde_json::to_string(&commit).unwrap());
+        println!("Get From DB: {}", db.get::<&str>(&commit.id).unwrap());
+    }
+
+    // other methods
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    #[test]
+    fn submit_to_repo() {
+        let mut repo = Repository::new("./db", "commit");
+
+        let commit1 = Commit {
+            id: "commit1".to_string(),
+            parent_ids: HashSet::new(),
+            message: "Initial commit".to_string(),
+        };
+        repo.add_commit(&commit1);
+
+        let commit2 = Commit {
+            id: "commit2".to_string(),
+            parent_ids: vec!["commit1".to_string()].into_iter().collect(),
+            message: "Add feature X".to_string(),
+        };
+        repo.add_commit(&commit2);
+
+        let commit3 = Commit {
+            id: "commit3".to_string(),
+            parent_ids: vec!["commit1".to_string()].into_iter().collect(),
+            message: "Add feature Y".to_string(),
+        };
+        repo.add_commit(&commit3);
+
+        let commit4 = Commit {
+            id: "commit4".to_string(),
+            parent_ids: vec!["commit2".to_string(), "commit3".to_string()]
+                .into_iter()
+                .collect(),
+            message: "Merge feature X and Y".to_string(),
+        };
+        repo.add_commit(&commit4);
+    }
+}

demos/vlc-dag/src/db_client/mod.rs

@@ -0,0 +1,2 @@
+pub mod lldb_client;
+mod lldb_test;