Merge pull request #172 from weibocom/dev_ci

Dev ci

.github/workflows/rust.yml

@@ -11,6 +11,7 @@ env:
   redis: localhost:56810
   counterservice: localhost:9302
   mc: localhost:9301
+  phantom: localhost:9303
   min_key: 1
   max_key: 10000
 
@@ -20,8 +21,13 @@ jobs:
 
     steps:
       - name: Prepare Vintage_MC_Redis
-        run: docker run  -d    -v /home/runner/work/breeze:/data1/resource/breeze  --net="host"  --name breeze_github_ci ficohu/breeze:githubci0011
+        run: docker run  -d    -v /home/runner/work/breeze:/data1/resource/breeze  --net="host"  --name breeze_github_ci 12323312323223/breeze:githubci105
       - uses: actions/checkout@v3
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
       - name: Build
         run: cargo build 
       - name: Check Vintage
@@ -30,6 +36,8 @@ jobs:
           curl http://127.0.0.1:8080/config/cloud/redis/testbreeze/redismeshtest
           curl http://127.0.0.1:8080/config/v1/cache.service.testbreeze.pool.yf/all
           curl http://127.0.0.1:8080/config/cloud/counterservice/testbreeze/meshtest
+          curl http://127.0.0.1:8080/config/cloud/phantom/testbreeze/phantomtest
+          curl http://127.0.0.1:8080/config/cloud/mq/testbreeze/mcqmeshtest
       - name: Create Socks
         run: |
           #ps -aux|grep breeze
@@ -39,6 +47,7 @@ jobs:
           touch /home/runner/work/breeze/socks/config+cloud+redis+testbreeze+redismeshtest@redis:56810@rs
           touch /home/runner/work/breeze/socks/config+v1+cache.service.testbreeze.pool.yf+all:meshtest@mc:9301@cs 
           touch /home/runner/work/breeze/socks/config+cloud+counterservice+testbreeze+meshtest@redis:9302@rs
+          touch /home/runner/work/breeze/socks/config+cloud+phantom+testbreeze+phantomtest@phantom:9303@pt
           ls -all /home/runner/work/breeze/snapshot
           ls -all /home/runner/work/breeze/socks
           ls -all /home/runner/work/breeze/logs
@@ -57,5 +66,10 @@ jobs:
           tail -10 /home/runner/work/breeze/logs/breeze.log
           #cat /home/runner/work/breeze/logs/log.file
           #cat /home/runner/work/breeze/logs/breeze.log
+      - name: Run cargo-tarpaulin
+        uses: actions-rs/[email protected]
+        with:
+          version: '0.15.0'
+          args: '-v'
       - name: Run tests
         run: cargo test 

Cargo.toml

@@ -13,7 +13,7 @@ members = [
   "ds",
   "rt",
   "tests",
-  "tests_ci",
+  "tests_integration",
 ]
 
 exclude = ["api", "tests"]

tests/src/all.rs

@@ -1,5 +1,3 @@
-// mod offset;
-//mod bit_map;
 //mod cow;
 // mod distribute;
 // mod hash_test;
@@ -13,6 +11,6 @@ mod protocol;
 mod hash_test;
 mod redis;
 mod ring_slice;
-//mod size;
+mod size;
 //mod slice;
 mod layout;

tests/src/cow.rs

@@ -1,27 +1,24 @@
-#[cfg(test)]
-mod bit_map_test {
-    //#[derive(Clone)]
-    //struct T {
-    //    name: String,
-    //    cfg: String,
-    //}
-    //#[test]
-    //fn test_cow() {
-    //    let t = T {
-    //        name: "icy0".to_string(),
-    //        cfg: "cfg0".to_string(),
-    //    };
-    //    let (mut tx, rx) = ds::cow(t);
-    //    rx.read(|o| {
-    //        assert_eq!(o.name, "icy0");
-    //        assert_eq!(o.cfg, "cfg0");
-    //    });
+//#[derive(Clone)]
+//struct T {
+//    name: String,
+//    cfg: String,
+//}
+//#[test]
+//fn test_cow() {
+//    let t = T {
+//        name: "icy0".to_string(),
+//        cfg: "cfg0".to_string(),
+//    };
+//    let (mut tx, rx) = ds::cow(t);
+//    rx.read(|o| {
+//        assert_eq!(o.name, "icy0");
+//        assert_eq!(o.cfg, "cfg0");
+//    });
 
-    //    tx.write(&("icy1", "cfg1"));
+//    tx.write(&("icy1", "cfg1"));
 
-    //    rx.read(|o| {
-    //        assert_eq!(o.name, "icy1");
-    //        assert_eq!(o.cfg, "cfg1");
-    //    });
-    //}
-}
+//    rx.read(|o| {
+//        assert_eq!(o.name, "icy1");
+//        assert_eq!(o.cfg, "cfg1");
+//    });
+//}

tests/src/shard_test.rs

@@ -31,6 +31,7 @@ fn crc32_short() {
     assert_eq!(h_point, 2642712869, "crc32-point hash");
 }
 
+#[allow(dead_code)]
 fn build_servers() -> Vec<String> {
     let shard_count = 8;
     let mut servers = Vec::with_capacity(shard_count);
@@ -39,6 +40,7 @@ fn build_servers() -> Vec<String> {
     }
     servers
 }
+#[allow(dead_code)]
 fn root_path() -> &'static str {
     "./records"
 }
@@ -221,6 +223,7 @@ fn raw_hash() {
     assert_eq!(hash2, val1);
 }
 
+#[allow(dead_code)]
 fn bkdr_check(path: &str) {
     let file = File::open(path).unwrap();
     let mut reader = BufReader::new(file);
@@ -327,6 +330,7 @@ fn shard_check(path: &str, hasher: &Hasher, dist: &Distribute) {
     println!("check crc32 from file: {} completed!", path);
 }
 
+#[allow(dead_code)]
 fn consistent_check(path: &str) {
     let file = File::open(path).unwrap();
     let mut reader = BufReader::new(file);
@@ -377,12 +381,14 @@ fn consistent_check(path: &str) {
     println!("check consistent hash from file: {}", path);
 }
 
+#[allow(dead_code)]
 struct ConsistentHashInstance {
     consistent_map: BTreeMap<i64, usize>,
     shards: Vec<&'static str>,
 }
 
 impl ConsistentHashInstance {
+    #[allow(dead_code)]
     fn from(shards: Vec<&'static str>) -> Self {
         let mut consistent_map = BTreeMap::new();
         for idx in 0..shards.len() {
@@ -418,6 +424,7 @@ impl ConsistentHashInstance {
         }
     }
 
+    #[allow(dead_code)]
     fn get_hash_server(&self, key: &str) -> (i64, String) {
         // 一致性hash，选择hash环的第一个节点，不支持漂移，避免脏数据 fishermen
         let bk = Bkdr {};

tests/src/size.rs

@@ -1,11 +1,8 @@
-#[cfg(test)]
-mod size_test {
-    #[test]
-    fn test_size() {
-        //use crossbeam_channel::{bounded, Receiver, Sender};
-        //use std::mem::size_of;
-        //use stream::{MpmcStream, Request};
-        //println!("size of MpmcStream:{}", size_of::<MpmcStream>());
-        //println!("size of request:{}", size_of::<Request>());
-    }
+#[test]
+fn test_size() {
+    //use crossbeam_channel::{bounded, Receiver, Sender};
+    //use std::mem::size_of;
+    //use stream::{MpmcStream, Request};
+    //println!("size of MpmcStream:{}", size_of::<MpmcStream>());
+    //println!("size of request:{}", size_of::<Request>());
 }