Move code

crates/query/src/api4/events.rs

@@ -7,6 +7,7 @@ use netpod::query::api1::Api1Query;
 use netpod::query::PulseRangeQuery;
 use netpod::query::TimeRangeQuery;
 use netpod::range::evrange::SeriesRange;
+use netpod::ttl::RetentionTime;
 use netpod::AppendToUrl;
 use netpod::ByteSize;
 use netpod::ChannelTypeConfigGen;
@@ -57,7 +58,7 @@ pub struct PlainEventsQuery {
     #[serde(default)]
     log_level: String,
     #[serde(default)]
-    use_all_rt: bool,
+    use_rt: Option<RetentionTime>,
 }
 
 impl PlainEventsQuery {
@@ -83,7 +84,7 @@ impl PlainEventsQuery {
             merger_out_len_max: None,
             create_errors: Vec::new(),
             log_level: String::new(),
-            use_all_rt: false,
+            use_rt: None,
         }
     }
 
@@ -210,8 +211,8 @@ impl PlainEventsQuery {
         &self.log_level
     }
 
-    pub fn use_all_rt(&self) -> bool {
-        self.use_all_rt
+    pub fn use_rt(&self) -> Option<RetentionTime> {
+        self.use_rt.clone()
     }
 }
 
@@ -290,11 +291,11 @@ impl FromUrl for PlainEventsQuery {
                 .map(|x| x.split(",").map(|x| x.to_string()).collect())
                 .unwrap_or(Vec::new()),
             log_level: pairs.get("log_level").map_or(String::new(), String::from),
-            use_all_rt: pairs
-                .get("useAllRt")
-                .map_or("false", |k| k)
-                .parse()
-                .map_err(|e| Error::with_public_msg_no_trace(format!("can not parse useAllRt: {}", e)))?,
+            use_rt: pairs.get("useRt").map_or(Ok(None), |k| {
+                k.parse()
+                    .map(Some)
+                    .map_err(|_| Error::with_public_msg_no_trace(format!("can not parse useRt: {}", k)))
+            })?,
         };
         Ok(ret)
     }
@@ -354,8 +355,8 @@ impl AppendToUrl for PlainEventsQuery {
         if self.log_level.len() != 0 {
             g.append_pair("log_level", &self.log_level);
         }
-        if self.use_all_rt {
-            g.append_pair("useAllRt", "true");
+        if let Some(x) = self.use_rt.as_ref() {
+            g.append_pair("useRt", &x.to_string());
         }
     }
 }
@@ -400,7 +401,7 @@ pub struct EventsSubQuerySettings {
     buf_len_disk_io: Option<usize>,
     queue_len_disk_io: Option<usize>,
     create_errors: Vec<String>,
-    use_all_rt: bool,
+    use_rt: Option<RetentionTime>,
 }
 
 impl Default for EventsSubQuerySettings {
@@ -414,7 +415,7 @@ impl Default for EventsSubQuerySettings {
             buf_len_disk_io: None,
             queue_len_disk_io: None,
             create_errors: Vec::new(),
-            use_all_rt: true,
+            use_rt: None,
         }
     }
 }
@@ -431,7 +432,7 @@ impl From<&PlainEventsQuery> for EventsSubQuerySettings {
             // TODO add to query
             queue_len_disk_io: None,
             create_errors: value.create_errors.clone(),
-            use_all_rt: value.use_all_rt(),
+            use_rt: value.use_rt(),
         }
     }
 }
@@ -449,7 +450,7 @@ impl From<&BinnedQuery> for EventsSubQuerySettings {
             // TODO add to query
             queue_len_disk_io: None,
             create_errors: Vec::new(),
-            use_all_rt: true,
+            use_rt: None,
         }
     }
 }
@@ -467,7 +468,7 @@ impl From<&Api1Query> for EventsSubQuerySettings {
             buf_len_disk_io: Some(disk_io_tune.read_buffer_len),
             queue_len_disk_io: Some(disk_io_tune.read_queue_len),
             create_errors: Vec::new(),
-            use_all_rt: false,
+            use_rt: None,
         }
     }
 }
@@ -572,8 +573,8 @@ impl EventsSubQuery {
         &self.log_level
     }
 
-    pub fn use_all_rt(&self) -> bool {
-        self.settings.use_all_rt
+    pub fn use_rt(&self) -> Option<RetentionTime> {
+        self.settings.use_rt.clone()
     }
 }