From 10fa5e3e2e35039d6bed7fe7d11c01e5d391117a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 1 Jan 2022 22:26:22 +0800
Subject: [PATCH] 1

---
 server/notifyserver/src/main.rs | 23 +++++++++++++++++++++--
 third_party/r9                  |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/server/notifyserver/src/main.rs b/server/notifyserver/src/main.rs
index 99a24ef..07f50ab 100755
--- a/server/notifyserver/src/main.rs
+++ b/server/notifyserver/src/main.rs
@@ -1,4 +1,5 @@
 use std::rc::Rc;
+use std::cell::RefCell;
 use std::fs::File;
 use protobuf::Message;
 use protobuf::descriptor::FieldDescriptorProto_Type;
@@ -21,11 +22,13 @@ impl r9::ProtoMsg for MessagesUnion {
                    obj: &serde_json::Map<String, serde_json::Value>,
                    id_key: &mut i64,
                    name_key: &mut String) {
+        println!("abcd1");
         if let MessagesUnion::MtwAliKeyConf(meta) = self {
             let pb = &mut meta.p.borrow_mut();
             let desc = pb.descriptor();
             let mut v = Vec::<u8>::new();
             {
+                v.resize(1024 * 1000, 0);
                 let mut os = ::protobuf::CodedOutputStream::bytes(&mut v);
                 for field in desc.fields() {
                     let field_desc = field.proto();
@@ -33,6 +36,7 @@ impl r9::ProtoMsg for MessagesUnion {
                         Some(v) => {
                             match field_desc.get_field_type() {
                                 FieldDescriptorProto_Type::TYPE_STRING => {
+                                    println!("abcd3");
                                     os.write_string(field_desc.get_number() as u32, "hello");
                                 },
                                 _ => {
@@ -46,6 +50,7 @@ impl r9::ProtoMsg for MessagesUnion {
                     }
                 }
             }
+            println!("{}", v.len());
             let mut slice: &[u8] = v.as_slice();
             let is = &mut ::protobuf::CodedInputStream::new(&mut slice);
             pb.merge_from(is);
@@ -73,11 +78,25 @@ macro_rules! getMeta {
 fn main() {
     let mut metamgr = MetaMgr::new();
     let c = metamgr.get_metalist(1);
-    let idx = 100;
+    let idx = 0;
+    let p = metawrap::MtwAliKeyConf{
+        p: RefCell::new(crate::mt::AliKeyConf::new())
+    };
+    let dummy = Rc::new(p);
+    metamgr.register_meta(
+        "/var/data/conf_test/analyseapi/ali_key.json".to_string(),
+        0,
+        "".to_string(),
+        "".to_string(),
+        MessagesUnion::MtwAliKeyConf(dummy)
+    );
+    metamgr.load();
     let b = getMeta!(metamgr, MtwAliKeyConf, idx);
     match b {
         Some(v) => {
-            //v.get_i64();
+            println!("abcde22222");
+            println!("{}", v.p.borrow().get_access_keyid());
+            println!("{}", v.p.borrow().get_access_secret());
         }
         None => {
 
diff --git a/third_party/r9 b/third_party/r9
index 706be6c..c8ca016 160000
--- a/third_party/r9
+++ b/third_party/r9
@@ -1 +1 @@
-Subproject commit 706be6c8faa1dac2d0824715ab53797e57aaa7af
+Subproject commit c8ca016ae7387baf4291feb2769c5475e1a2ae4c