Fix duplicate in RT

daqingest/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "daqingest"
-version = "0.2.5-aa.2"
+version = "0.2.5-aa.4"
 authors = ["Dominik Werder <dominik.werder@gmail.com>"]
 edition = "2021"
 

netfetch/src/ca/conn.rs

@@ -195,7 +195,7 @@ pub enum Error {
     MissingTimestamp,
     EnumFetch(#[from] enumfetch::Error),
     SeriesLookup(#[from] dbpg::seriesbychannel::Error),
-    Netpod(#[from] netpod::NetpodError),
+    Netpod(#[from] netpod::Error),
 }
 
 impl err::ToErr for Error {

scywr/Cargo.toml

@@ -12,6 +12,7 @@ smallvec = "1.11.0"
 pin-project = "1.1.5"
 stackfuture = "0.3.0"
 bytes = "1.7.1"
+autoerr = "0.0.3"
 serde = { version = "1", features = ["derive"] }
 log = { path = "../log" }
 stats = { path = "../stats" }

scywr/src/store.rs

@@ -1,7 +1,5 @@
 use crate::config::ScyllaIngestConfig;
 use crate::session::create_session;
-use err::thiserror;
-use err::ThisError;
 use netpod::ttl::RetentionTime;
 use scylla::prepared_statement::PreparedStatement;
 use scylla::transport::errors::NewSessionError;
@@ -9,13 +7,14 @@ use scylla::transport::errors::QueryError;
 use scylla::Session as ScySession;
 use std::sync::Arc;
 
-#[derive(Debug, ThisError)]
-#[cstm(name = "ScyllaStore")]
-pub enum Error {
-    NewSessionError(#[from] NewSessionError),
-    QueryError(#[from] QueryError),
-    NewSession,
-}
+autoerr::create_error_v1!(
+    name(Error, "ScyllaStore"),
+    enum variants {
+        NewSessionError(#[from] NewSessionError),
+        QueryError(#[from] QueryError),
+        NewSession,
+    },
+);
 
 pub struct DataStore {
     pub rett: RetentionTime,

serieswriter/src/rtwriter.rs

@@ -156,17 +156,17 @@ where
         // TODO
         // Optimize for the common case that we only write into one of the stores.
         // Make the decision first, based on ref, then clone only as required.
-        let mut res_lt = WriteRtRes::default();
+        let res_lt;
         let mut res_mt = WriteRtRes::default();
         let mut res_st = WriteRtRes::default();
-        if true {
+        {
             res_lt = Self::write_inner(&mut self.state_lt, item.clone(), ts_net, tsev, &mut iqdqs.lt_rf3_qu)?;
-        }
-        if !res_lt.accept {
-            res_mt = Self::write_inner(&mut self.state_mt, item.clone(), ts_net, tsev, &mut iqdqs.mt_rf3_qu)?;
-        }
-        if !res_mt.accept {
-            res_st = Self::write_inner(&mut self.state_st, item.clone(), ts_net, tsev, &mut iqdqs.st_rf3_qu)?;
+            if !res_lt.accept {
+                res_mt = Self::write_inner(&mut self.state_mt, item.clone(), ts_net, tsev, &mut iqdqs.mt_rf3_qu)?;
+                if !res_mt.accept {
+                    res_st = Self::write_inner(&mut self.state_st, item.clone(), ts_net, tsev, &mut iqdqs.st_rf3_qu)?;
+                }
+            }
         }
         let ret = WriteRes {
             st: res_st,