fixup! Break ties of PreferDistinct submissions with equal counts

Less pushing

Author: jerbaroo

opsqueue/src/consumer/strategy.rs

@@ -79,14 +79,12 @@ impl Strategy {
         let ffi_is_not_reserved =
             "opsqueue_is_reserved(chunks.submission_id, chunks.chunk_index) = FALSE";
         match self {
-            Oldest => qb
-                .push("SELECT * FROM chunks")
-                .push(format!(" WHERE {ffi_is_not_reserved}"))
-                .push(" ORDER BY submission_id ASC"),
-            Newest => qb
-                .push("SELECT * FROM chunks")
-                .push(format!(" WHERE {ffi_is_not_reserved}"))
-                .push(" ORDER BY submission_id DESC"),
+            Oldest => qb.push(format!(
+                "SELECT * FROM chunks WHERE {ffi_is_not_reserved} ORDER BY submission_id ASC"
+            )),
+            Newest => qb.push(format!(
+                "SELECT * FROM chunks WHERE {ffi_is_not_reserved} ORDER BY submission_id DESC"
+            )),
             Random => Self::push_random_order_query(qb, "*", "chunks", Some(ffi_is_not_reserved)),
             PreferDistinct { .. } => {
                 // Unique submission IDs from the underlying strategy.
@@ -121,16 +119,19 @@ impl Strategy {
             PreferDistinct { .. } => {
                 let mut meta_keys_iter = self.meta_keys();
                 let meta_keys: Vec<&str> = meta_keys_iter.by_ref().collect();
-                if meta_keys.is_empty() {
-                    panic!("`PreferDistinct` always yields at least one meta key.")
-                }
+                assert!(
+                    !meta_keys.is_empty(),
+                    "`PreferDistinct` always yields at least one meta key."
+                );
                 let underlying = meta_keys_iter.take();
 
                 // Unique submission IDs from the underlying strategy. Note how
                 // we also keep the row number from the underlying query, this
                 // is used as a tie-breaker if metadata counts are equal.
-                let qb = qb.push("WITH inner AS NOT MATERIALIZED (");
-                qb.push("SELECT submission_id, ROW_NUMBER() OVER () as underlying_row FROM ( ");
+                let qb = qb.push(
+                    "WITH inner AS NOT MATERIALIZED (
+                  SELECT submission_id, ROW_NUMBER() OVER () as underlying_row FROM ( ",
+                );
                 let qb = underlying.build_query_snippet_returning_submission_ids(qb);
                 qb.push(" ))");