Move code

crates/nodenet/src/conn.rs

@@ -275,6 +275,7 @@ pub fn events_parse_input_query(frames: Vec<InMemoryFrame>) -> Result<(EventsSub
         },
         Err(e) => return Err(e),
     };
+    info!("parsing json {:?}", qitem.str());
     let frame1: Frame1Parts = serde_json::from_str(&qitem.str()).map_err(|e| {
         let e = Error::with_msg_no_trace(format!("json parse error: {}  inp {}", e, qitem.str()));
         error!("{e}");

crates/nodenet/src/scylla.rs

@@ -7,7 +7,6 @@ use items_0::streamitem::Sitemty;
 use items_0::streamitem::StreamItem;
 use items_2::channelevents::ChannelEvents;
 use netpod::log::*;
-use netpod::ttl::RetentionTime;
 use netpod::ChConf;
 use query::api4::events::EventsSubQuery;
 use scyllaconn::worker::ScyllaQueue;
@@ -24,25 +23,15 @@ pub async fn scylla_channel_event_stream(
     // TODO why both in PlainEventsQuery and as separate parameter? Check other usages.
     // let do_one_before_range = evq.need_one_before_range();
     let do_one_before_range = false;
-    let series = chconf.series();
+    let series = SeriesId::new(chconf.series());
     let scalar_type = chconf.scalar_type();
     let shape = chconf.shape();
     let do_test_stream_error = false;
     let with_values = evq.need_value_data();
-    let stream: Pin<Box<dyn Stream<Item = _> + Send>> = if evq.use_all_rt() {
-        let x = scyllaconn::events2::mergert::MergeRts::new(
-            SeriesId::new(chconf.series()),
-            scalar_type.clone(),
-            shape.clone(),
-            evq.range().into(),
-            with_values,
-            scyqueue.clone(),
-        );
-        Box::pin(x)
-    } else {
+    let stream: Pin<Box<dyn Stream<Item = _> + Send>> = if let Some(rt) = evq.use_rt() {
         let x = scyllaconn::events2::events::EventsStreamRt::new(
-            RetentionTime::Short,
-            SeriesId::new(chconf.series()),
+            rt,
+            series,
             scalar_type.clone(),
             shape.clone(),
             evq.range().into(),
@@ -51,18 +40,17 @@ pub async fn scylla_channel_event_stream(
         )
         .map_err(|e| scyllaconn::events2::mergert::Error::from(e));
         Box::pin(x)
+    } else {
+        let x = scyllaconn::events2::mergert::MergeRts::new(
+            series,
+            scalar_type.clone(),
+            shape.clone(),
+            evq.range().into(),
+            with_values,
+            scyqueue.clone(),
+        );
+        Box::pin(x)
     };
-    /*let stream = scyllaconn::events::EventsStreamScylla::new(
-        RetentionTime::Short,
-        series,
-        evq.range().into(),
-        do_one_before_range,
-        scalar_type.clone(),
-        shape.clone(),
-        with_values,
-        scyqueue.clone(),
-        do_test_stream_error,
-    );*/
     let stream = stream
         .map(move |item| match &item {
             Ok(k) => match k {
@@ -96,7 +84,7 @@ pub async fn scylla_channel_event_stream(
                         item
                     }
                 },
-                Err(e) => Err(Error::with_msg_no_trace(format!("scyllaconn eevents error {e}"))),
+                Err(e) => Err(Error::with_msg_no_trace(format!("scyllaconn events error {e}"))),
             };
             item
         });