From cb382d2370032d4dce4abb5e4e1238287300ed97 Mon Sep 17 00:00:00 2001
From: Dominik Werder <dominik.werder@gmail.com>
Date: Fri, 4 Jul 2025 17:32:26 +0200
Subject: [PATCH] Restrict one before range

---
 crates/daqbuffer/Cargo.toml             |  2 +-
 crates/scyllaconn/src/events2/events.rs | 11 ++++++++++-
 crates/scyllaconn/src/events2/msp.rs    |  4 +---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/crates/daqbuffer/Cargo.toml b/crates/daqbuffer/Cargo.toml
index 7cb6d4b..983ca41 100644
--- a/crates/daqbuffer/Cargo.toml
+++ b/crates/daqbuffer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "daqretrieve"
-version = "0.5.5-aa.18"
+version = "0.5.5"
 authors = ["Dominik Werder <dominik.werder@gmail.com>"]
 edition = "2024"
 
diff --git a/crates/scyllaconn/src/events2/events.rs b/crates/scyllaconn/src/events2/events.rs
index e4327a5..424aa96 100644
--- a/crates/scyllaconn/src/events2/events.rs
+++ b/crates/scyllaconn/src/events2/events.rs
@@ -918,6 +918,13 @@ async fn read_lsp_all(
     jobtrace: &mut ReadJobTrace,
 ) -> Result<(Vec<DtNano>,), Error> {
     let selfname = "read_lsp_all";
+    let lsp_max = if opts.ts_msp.ns() >= opts.range.beg() {
+        // TODO should not happen
+        // TODO metrics
+        return Ok((Vec::new(),));
+    } else {
+        opts.range.beg().delta(opts.ts_msp.ns())
+    };
     let mut qu = stmts
         .rt(&opts.rt)
         .lsp_all()
@@ -933,7 +940,9 @@ async fn read_lsp_all(
     let mut it = res.rows_stream::<(i64,)>()?;
     while let Some(row) = it.try_next().await? {
         let lsp = DtNano::from_ns(row.0 as u64);
-        ret.push(lsp);
+        if lsp < lsp_max {
+            ret.push(lsp);
+        }
     }
     Ok((ret,))
 }
diff --git a/crates/scyllaconn/src/events2/msp.rs b/crates/scyllaconn/src/events2/msp.rs
index 62b6c8f..165efd5 100644
--- a/crates/scyllaconn/src/events2/msp.rs
+++ b/crates/scyllaconn/src/events2/msp.rs
@@ -365,9 +365,7 @@ async fn find_ts_msp_bck(
     Ok(ret)
 }
 
-/*
-Workaround because scylla's order by desc is broken at the moment.
-*/
+// Workaround because scylla's order by desc is broken at the moment.
 async fn find_ts_msp_bck_workaround(
     rt: &RetentionTime,
     series: u64,