Merge pull request #48 from bgpkit/fix/47-nullable-column

Properly write nullable values to sqlite
bgpkit · Jun 2, 2023 · c1e1c5e · c1e1c5e
2 parents 0c86d0d + 3350c70
commit c1e1c5e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/src/monocle.rs b/src/monocle.rs
@@ -491,7 +491,7 @@ fn main() {
                     for elem in receiver {
                         msg_count += 1;
                         msg_cache.push(elem);
-                        if msg_cache.len() >= 500 {
+                        if msg_cache.len() >= 100000 {
                             db.insert_elems(&msg_cache);
                             msg_cache.clear();
                         }

diff --git a/src/msg_store.rs b/src/msg_store.rs
@@ -6,9 +6,9 @@ use itertools::Itertools;
 macro_rules! option_to_string {
     ($a:expr) => {
         if let Some(v) = $a {
-            v.to_string()
+            format!("'{}'", v)
         } else {
-            String::new()
+            "NULL".to_string()
         }
     };
 }
@@ -58,14 +58,14 @@ impl MsgStore {
     #[inline(always)]
     fn option_to_string_communities(o: &Option<Vec<MetaCommunity>>) -> String {
         if let Some(v) = o {
-            v.iter().join(" ")
+            format!("'{}'", v.iter().join(" "))
         } else {
-            String::new()
+            "NULL".to_string()
         }
     }
 
     pub fn insert_elems(&self, elems: &[BgpElem]) {
-        for elems in elems.chunks(100) {
+        for elems in elems.chunks(10000) {
             let values = elems
                 .iter()
                 .map(|elem| {
@@ -77,23 +77,23 @@ impl MsgStore {
                     };
                     let origin_string = elem.origin_asns.as_ref().map(|asns| asns.get(0).unwrap());
                     format!(
-                    "('{}','{}','{}','{}','{}','{}','{}','{}','{}','{}','{}','{}','{}','{}','{}')",
-                    elem.timestamp as u32,
-                    t,
-                    elem.peer_ip,
-                    elem.peer_asn,
-                    elem.prefix,
-                    option_to_string!(&elem.next_hop),
-                    option_to_string!(&elem.as_path),
-                    option_to_string!(origin_string),
-                    option_to_string!(&elem.origin),
-                    option_to_string!(&elem.local_pref),
-                    option_to_string!(&elem.med),
-                    Self::option_to_string_communities(&elem.communities),
-                    option_to_string!(&elem.atomic),
-                    option_to_string!(&elem.aggr_asn),
-                    option_to_string!(&elem.aggr_ip),
-                )
+                        "('{}','{}','{}','{}','{}', {},{},{},{},{},{},{},{},{},{})",
+                        elem.timestamp as u32,
+                        t,
+                        elem.peer_ip,
+                        elem.peer_asn,
+                        elem.prefix,
+                        option_to_string!(&elem.next_hop),
+                        option_to_string!(&elem.as_path),
+                        option_to_string!(origin_string),
+                        option_to_string!(&elem.origin),
+                        option_to_string!(&elem.local_pref),
+                        option_to_string!(&elem.med),
+                        Self::option_to_string_communities(&elem.communities),
+                        option_to_string!(&elem.atomic),
+                        option_to_string!(&elem.aggr_asn),
+                        option_to_string!(&elem.aggr_ip),
+                    )
                 })
                 .join(", ")
                 .to_string();