[WIP] CockroachDB

divviup · Nov 17, 2023 · da228b1 · da228b1
1 parent 08bfa82
commit da228b1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aggregator_core/src/datastore.rs b/aggregator_core/src/datastore.rs
@@ -2483,7 +2483,7 @@ impl<C: Clock> Transaction<'_, C> {
                 WHERE tasks.task_id = $1
                   AND collection_jobs.min_batch_timestamp < $3
                   AND collection_jobs.max_batch_timestamp >= $2
-                  AND collection_jobs.min_batch_timestamp >= COALESCE($3::TIMESTAMP - tasks.report_expiry_age * '1 second'::INTERVAL, '-infinity'::TIMESTAMP)",
+                  AND collection_jobs.min_batch_timestamp >= COALESCE($4::TIMESTAMP - tasks.report_expiry_age * '1 second'::INTERVAL, '-infinity'::TIMESTAMP)",
             )
             .await?;
         self.query(
@@ -4184,7 +4184,7 @@ impl<C: Clock> Transaction<'_, C> {
             .as_ref()
             .map(Time::from_naive_date_time);
         let max_client_timestamp = row
-            .get::<_, Option<NaiveDateTime>>("min_client_timestamp")
+            .get::<_, Option<NaiveDateTime>>("max_client_timestamp")
             .as_ref()
             .map(Time::from_naive_date_time);
         let client_timestamp_interval =