From 0c4d30273efa112188dc1afab321beb201605c69 Mon Sep 17 00:00:00 2001
From: Dominik Werder <dominik.werder@gmail.com>
Date: Fri, 8 Nov 2024 14:34:28 +0100
Subject: [PATCH] Fix field typo, small cleanup

---
 scywr/src/insertworker.rs         | 4 ----
 scywr/src/store.rs                | 2 +-
 serieswriter/src/binwriter.rs     | 2 --
 serieswriter/src/binwritergrid.rs | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/scywr/src/insertworker.rs b/scywr/src/insertworker.rs
index 392c10e..5bbf9d8 100644
--- a/scywr/src/insertworker.rs
+++ b/scywr/src/insertworker.rs
@@ -202,10 +202,6 @@ async fn worker_streamed(
         let stream = stream
             .map(|x| futures_util::stream::iter(x))
             .flatten_unordered(Some(1))
-            // .map(|x| async move {
-            //     drop(x);
-            //     Ok(())
-            // })
             .buffer_unordered(concurrency);
         let mut stream = Box::pin(stream);
         debug_setup!("waiting for item");
diff --git a/scywr/src/store.rs b/scywr/src/store.rs
index 086d1b4..3a357d5 100644
--- a/scywr/src/store.rs
+++ b/scywr/src/store.rs
@@ -151,7 +151,7 @@ impl DataStore {
 
         let qu_insert_binned_scalar_f32_v02 = prep_qu_ins_c!(
             "binned_scalar_f32_v02",
-            "series, binlen, msp, off, count, min, max, avg, dev",
+            "series, binlen, msp, off, cnt, min, max, avg, dev",
             "?, ?, ?, ?, ?, ?, ?, ?, ?",
             rett,
             scy
diff --git a/serieswriter/src/binwriter.rs b/serieswriter/src/binwriter.rs
index 344b82d..7bab828 100644
--- a/serieswriter/src/binwriter.rs
+++ b/serieswriter/src/binwriter.rs
@@ -62,8 +62,6 @@ impl BinWriter {
                     DtMs::from_ms_u64(1000 * 60 * 1)
                 } else if dur < Duration::from_millis(1000 * 60 * 20) {
                     DtMs::from_ms_u64(1000 * 60 * 10)
-                } else if dur < Duration::from_millis(1000 * 60 * 60 * 2) {
-                    DtMs::from_ms_u64(1000 * 60 * 60 * 1)
                 } else {
                     DtMs::from_ms_u64(1000 * 60 * 60 * 1)
                 };
diff --git a/serieswriter/src/binwritergrid.rs b/serieswriter/src/binwritergrid.rs
index a490b5a..2678ccc 100644
--- a/serieswriter/src/binwritergrid.rs
+++ b/serieswriter/src/binwritergrid.rs
@@ -110,7 +110,6 @@ impl BinWriterGrid {
                 } else if bin_len == DtMs::from_ms_u64(1000 * 60 * 60 * 1) {
                     DtMs::from_ms_u64(1000 * 60 * 60 * 24 * 28)
                 } else {
-                    // TODO
                     return Err(Error::UnsupportedBinGrid(bin_len));
                 };
                 if div.ns() % bin_len.ns() != 0 {