qrusty 0.20.9

A trusty priority queue server built with Rust
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
// src/memory_storage.rs
// Implements: SYS-0013, SYS-0018, PER-0011

//! # In-Memory Storage Backend
//!
//! Provides a volatile, in-memory implementation of `StorageApi` using a
//! `BTreeMap` for sorted key-value storage. This backend preserves the
//! same key-ordering semantics as the RocksDB backend, ensuring identical
//! functional behavior for priority ordering, locking, ACK/NACK, DLQ,
//! and duplicate detection.
//!
//! ## When to Use
//!
//! - Hardware with failing or absent persistent storage
//! - Development and testing environments
//! - Scenarios where message durability is not required
//!
//! ## Limitations
//!
//! - All data is lost on process restart
//! - No crash recovery or WAL
//! - Write operations hold an exclusive lock on the data store

use anyhow::Result;
use chrono::{DateTime, Utc};
use std::collections::{BTreeMap, HashMap, HashSet};
use std::sync::{Arc, Mutex};
use tokio::sync::RwLock;

use crate::message::{
    BatchAckResult, BatchNackResult, Message, Priority, PriorityOrdering, QueueConfig, QueueStats,
};
use crate::storage::{LockedIdIndex, QueueCounts, RenameQueueError};

/// Computes a 128-bit xxh3 hash of a payload string for duplicate detection.
/// See `storage::hash_payload` for rationale.
// Implements: PER-0014
fn hash_payload(payload: &str) -> [u8; 16] {
    xxhash_rust::xxh3::xxh3_128(payload.as_bytes()).to_ne_bytes()
}

/// In-memory storage backend using a sorted `BTreeMap` to replicate
/// RocksDB's lexicographic key ordering.
pub struct MemoryStorage {
    /// Sorted key-value store. Key format matches RocksDB Storage:
    /// `{queue}/{priority_key}/{timestamp}/{uuid}` for messages,
    /// `_queue_config/{queue}` for configs,
    /// `_dlq/{queue}/{id}` for dead-letter entries.
    data: Arc<RwLock<BTreeMap<String, Vec<u8>>>>,

    /// In-memory lock tracking (identical to Storage).
    locked_index: Arc<RwLock<HashMap<String, DateTime<Utc>>>>,

    /// Secondary index mapping `(queue, message_id) -> storage_key` for
    /// O(1) lookup of locked messages in `ack`, `nack`, `renew`,
    /// `batch_ack`, and `batch_nack`.  Mirrors the persistent backend's
    /// `locked_id_index`.
    ///
    /// MemoryStorage does NOT need the persistent backend's cap or
    /// sticky `untracked_locks_possible` flag: the index is the sole
    /// source of truth for lock state, it has no persistence to drift
    /// from, and there is no post-restart recovery to guard against.
    /// A miss on `(queue, message_id)` therefore provably means the
    /// message is not locked, and the fast paths return `Ok(false)`
    /// without any fallback scan.
    ///
    /// Implements: DLV-0014
    locked_id_index: Arc<RwLock<LockedIdIndex>>,

    /// Queue configurations (identical to Storage).
    queue_configs: Arc<RwLock<HashMap<String, QueueConfig>>>,

    /// Per-queue payload hash sets for duplicate detection (identical to Storage).
    /// Stores 128-bit xxh3 hashes instead of full payload strings (PER-0014).
    payload_sets: Arc<RwLock<HashMap<String, HashSet<[u8; 16]>>>>,

    /// Per-queue available/locked counts for O(n_queues) stats.
    ///
    /// Implements: SYS-0018
    ///
    /// Maintained incrementally by every state-changing operation so that
    /// `get_queue_stats`, `get_all_queue_stats`, and `list_queues` can
    /// read directly from this cache instead of scanning `data`.
    queue_counters: Arc<Mutex<HashMap<String, QueueCounts>>>,
}

impl Default for MemoryStorage {
    fn default() -> Self {
        Self::new()
    }
}

/// Percent-encodes characters that conflict with the storage key separator.
/// See `storage::encode_text_priority` for full documentation.
fn encode_text_priority(s: &str) -> String {
    let mut out = String::with_capacity(s.len());
    for b in s.bytes() {
        match b {
            b'%' => out.push_str("%25"),
            b'/' => out.push_str("%2F"),
            0 => out.push_str("%00"),
            _ => out.push(b as char),
        }
    }
    out
}

impl MemoryStorage {
    /// Creates a new in-memory storage instance.
    ///
    /// Logs a warning that all data will be lost on restart.
    pub fn new() -> Self {
        tracing::warn!("Running with in-memory storage. All data will be lost on restart.");
        Self {
            data: Arc::new(RwLock::new(BTreeMap::new())),
            locked_index: Arc::new(RwLock::new(HashMap::new())),
            locked_id_index: Arc::new(RwLock::new(HashMap::new())),
            queue_configs: Arc::new(RwLock::new(HashMap::new())),
            payload_sets: Arc::new(RwLock::new(HashMap::new())),
            queue_counters: Arc::new(Mutex::new(HashMap::new())),
        }
    }

    /// O(1) lookup of the storage key for a currently-locked
    /// `(queue, message_id)` pair.  Returns `None` if the entry is
    /// not in the secondary index — which, on the MemoryStorage
    /// backend, is conclusive (the message is not locked).
    async fn locked_key_for_inner(&self, queue: &str, message_id: &str) -> Option<String> {
        self.locked_id_index
            .read()
            .await
            .get(queue)
            .and_then(|m| m.get(message_id).cloned())
    }

    /// Removes the (queue, message_id) entry from the secondary index
    /// and cleans up the queue's sub-map if it becomes empty.
    async fn remove_locked_id_index_entry(&self, queue: &str, message_id: &str) {
        let mut idx = self.locked_id_index.write().await;
        if let Some(map) = idx.get_mut(queue) {
            map.remove(message_id);
            if map.is_empty() {
                idx.remove(queue);
            }
        }
    }

    /// Test-only: inject a secondary-index entry pointing at a storage
    /// key that may or may not exist.  Lets tests exercise stale-entry
    /// cleanup on the fast paths.
    #[cfg(any(test, feature = "test-helpers"))]
    #[doc(hidden)]
    pub async fn __test_insert_locked_id_index_entry(
        &self,
        queue: &str,
        message_id: &str,
        key: &str,
    ) {
        self.locked_id_index
            .write()
            .await
            .entry(queue.to_string())
            .or_default()
            .insert(message_id.to_string(), key.to_string());
    }

    /// Test-only: check whether the secondary index has an entry for a
    /// given `(queue, message_id)`.
    #[cfg(any(test, feature = "test-helpers"))]
    #[doc(hidden)]
    pub async fn __test_locked_id_index_has(&self, queue: &str, message_id: &str) -> bool {
        self.locked_id_index
            .read()
            .await
            .get(queue)
            .is_some_and(|m| m.contains_key(message_id))
    }

    /// Extract the queue name from a storage key like `queue/priority/ts/uuid`.
    /// Returns None for keys outside the message namespace (e.g. `_dlq/…`,
    /// `_queue_config/…`) or malformed keys.
    fn queue_from_key(key: &str) -> Option<&str> {
        if key.starts_with('_') {
            return None;
        }
        let mut parts = key.splitn(2, '/');
        parts.next()
    }

    /// Generate a storage key for a message, identical to Storage::generate_message_key.
    fn generate_message_key(&self, msg: &Message, config: &QueueConfig) -> String {
        let ts = msg.created_at.timestamp_nanos_opt().unwrap_or(0);
        match &msg.priority {
            Priority::Numeric(n) => {
                let priority_key = match config.ordering {
                    PriorityOrdering::MaxFirst => u64::MAX - n,
                    PriorityOrdering::MinFirst => *n,
                    PriorityOrdering::Fifo => 0,
                };
                format!("{}/{:020}/{:016}/{}", msg.queue, priority_key, ts, msg.id)
            }
            Priority::Text(s) => {
                let key_segment = match config.ordering {
                    PriorityOrdering::MaxFirst => {
                        // Pad to fixed width with 0x00 before complementing so
                        // that variable-length strings reverse correctly.
                        let bytes = s.as_bytes();
                        let pad_len = 512usize.max(bytes.len());
                        let mut buf = vec![0u8; pad_len];
                        buf[..bytes.len()].copy_from_slice(bytes);
                        format!(
                            "s:{}",
                            buf.iter()
                                .map(|b| format!("{:02x}", b ^ 0xFF))
                                .collect::<String>()
                        )
                    }
                    PriorityOrdering::MinFirst => format!("s:{}", encode_text_priority(s)),
                    PriorityOrdering::Fifo => "s:".to_string(),
                };
                format!("{}/{}/{:016}/{}", msg.queue, key_segment, ts, msg.id)
            }
        }
    }

    /// Returns the queue config, defaulting to MaxFirst if not configured.
    async fn get_queue_config(&self, queue_name: &str) -> QueueConfig {
        self.queue_configs
            .read()
            .await
            .get(queue_name)
            .cloned()
            .unwrap_or_default()
    }

    /// Checks if a queue has any messages or a stored configuration.
    async fn queue_exists_inner(&self, queue_name: &str) -> Result<bool> {
        // Check in-memory configs first
        if self.queue_configs.read().await.contains_key(queue_name) {
            return Ok(true);
        }
        // Check for any message keys
        let data = self.data.read().await;
        let prefix = format!("{}/", queue_name);
        Ok(data
            .range(prefix.clone()..)
            .next()
            .is_some_and(|(k, _)| k.starts_with(&prefix)))
    }

    /// Creates or updates queue configuration.
    async fn configure_queue_inner(&self, queue_name: &str, config: QueueConfig) {
        let old_config = self.get_queue_config(queue_name).await;
        let existed = self.queue_exists_inner(queue_name).await.unwrap_or(false);

        let mut effective_config = config;
        if existed {
            effective_config.ordering = old_config.ordering;
        }

        // Store in memory configs
        self.queue_configs
            .write()
            .await
            .insert(queue_name.to_string(), effective_config.clone());

        // Persist config in the BTreeMap (mirrors RocksDB _queue_config/ key)
        let config_key = format!("_queue_config/{}", queue_name);
        if let Ok(config_json) = serde_json::to_vec(&effective_config) {
            self.data.write().await.insert(config_key, config_json);
        }

        // SYS-0018: ensure a counter entry exists so list_queues and stats
        // include the queue even when it has no messages yet.
        self.queue_counters
            .lock()
            .unwrap()
            .entry(queue_name.to_string())
            .or_default();

        // If we just disabled duplicates, de-dupe and build payload set
        if old_config.allow_duplicates && !effective_config.allow_duplicates {
            let removed = self.dedupe_unlocked_messages(queue_name).await;
            if removed > 0 {
                tracing::info!(
                    "De-duplicated {} unlocked message(s) in queue '{}' after disabling duplicates",
                    removed,
                    queue_name
                );
            }

            // Rebuild payload set
            let data = self.data.read().await;
            let prefix = format!("{}/", queue_name);
            let mut set = HashSet::new();
            for (k, v) in data.range(prefix.clone()..) {
                if !k.starts_with(&prefix) {
                    break;
                }
                if let Ok(msg) = serde_json::from_slice::<Message>(v) {
                    set.insert(hash_payload(&msg.payload));
                }
            }
            self.payload_sets
                .write()
                .await
                .insert(queue_name.to_string(), set);
        }

        // If we just enabled duplicates, drop the payload set
        if !old_config.allow_duplicates && effective_config.allow_duplicates {
            self.payload_sets.write().await.remove(queue_name);
        }
    }

    /// Remove duplicate unlocked messages by payload, keeping the first occurrence.
    async fn dedupe_unlocked_messages(&self, queue_name: &str) -> usize {
        let mut data = self.data.write().await;
        let prefix = format!("{}/", queue_name);
        let now = Utc::now();

        let mut seen: HashSet<String> = HashSet::new();
        let mut keys_to_remove: Vec<String> = Vec::new();

        for (k, v) in data.range(prefix.clone()..) {
            if !k.starts_with(&prefix) {
                break;
            }
            if let Ok(msg) = serde_json::from_slice::<Message>(v) {
                let is_locked = msg.locked_until.is_some_and(|lu| lu > now);
                if is_locked {
                    // Locked messages always count towards "seen" but aren't removed
                    seen.insert(msg.payload);
                    continue;
                }
                if !seen.insert(msg.payload.clone()) {
                    keys_to_remove.push(k.clone());
                }
            }
        }

        let count = keys_to_remove.len();
        for k in keys_to_remove {
            data.remove(&k);
        }

        // SYS-0018: these were all unlocked messages, so available -= count.
        if count > 0 {
            let mut counters = self.queue_counters.lock().unwrap();
            if let Some(entry) = counters.get_mut(queue_name) {
                entry.available = entry.available.saturating_sub(count as u64);
            }
        }

        count
    }

    /// Unlocks a single message by storage key. Returns true if actually
    /// unlocked.  Also removes the secondary-index entry so the fast
    /// paths (DLV-0014) don't serve a now-stale key.
    async fn unlock_message_by_key(&self, key: &str) -> Result<bool> {
        let unlocked_info: Option<(String, String)> = {
            let mut data = self.data.write().await;
            match data.get(key) {
                Some(value) => {
                    let mut msg: Message = serde_json::from_slice(value)?;
                    if msg.locked_until.is_some() {
                        msg.locked_until = None;
                        msg.locked_by = None;
                        let new_value = serde_json::to_vec(&msg)?;
                        data.insert(key.to_string(), new_value);
                        Some((msg.queue, msg.id))
                    } else {
                        None
                    }
                }
                None => None,
            }
        };

        if let Some((queue, id)) = unlocked_info {
            // DLV-0014: keep the secondary index consistent with
            // locked_index; expired locks removed here must not serve
            // stale keys to later fast-path lookups.
            self.remove_locked_id_index_entry(&queue, &id).await;
            Ok(true)
        } else {
            Ok(false)
        }
    }
}

#[async_trait::async_trait]
impl crate::api::StorageApi for MemoryStorage {
    async fn queue_exists(&self, queue_name: &str) -> Result<bool> {
        self.queue_exists_inner(queue_name).await
    }

    async fn create_queue(&self, queue_name: &str, config: QueueConfig) {
        self.configure_queue_inner(queue_name, config).await;
    }

    async fn rename_queue(
        &self,
        from: &str,
        to: &str,
    ) -> std::result::Result<(), RenameQueueError> {
        if from.trim().is_empty() || to.trim().is_empty() {
            return Err(RenameQueueError::Storage(anyhow::anyhow!(
                "queue names cannot be empty"
            )));
        }
        if from == to {
            return Ok(());
        }
        if !self
            .queue_exists_inner(from)
            .await
            .map_err(RenameQueueError::Storage)?
        {
            return Err(RenameQueueError::NotFound);
        }
        if self
            .queue_exists_inner(to)
            .await
            .map_err(RenameQueueError::Storage)?
        {
            return Err(RenameQueueError::AlreadyExists);
        }

        let existing_config = self.get_queue_config(from).await;
        let now = Utc::now();

        let mut data = self.data.write().await;
        // (old_key, new_key, locked_until) for still-locked messages so
        // the primary locked_index update below can remove exact keys
        // instead of retain()-scanning the whole cross-queue map.
        let mut moved_locked: Vec<(String, String, DateTime<Utc>)> = Vec::new();
        // DLV-0014: (message_id, new_storage_key) to rebuild the
        // secondary index under the new queue name.
        let mut moved_locked_ids: Vec<(String, String)> = Vec::new();

        // Collect and move message keys
        let prefix_from = format!("{}/", from);
        let entries: Vec<(String, Vec<u8>)> = data
            .range(prefix_from.clone()..)
            .take_while(|(k, _)| k.starts_with(&prefix_from))
            .map(|(k, v)| (k.clone(), v.clone()))
            .collect();

        for (key, value) in entries {
            let mut msg: Message = serde_json::from_slice(&value).map_err(|e| {
                RenameQueueError::Storage(anyhow::anyhow!("deserialize message failed: {e}"))
            })?;
            msg.queue = to.to_string();

            let new_key = self.generate_message_key(&msg, &existing_config);
            let new_value = serde_json::to_vec(&msg).map_err(|e| {
                RenameQueueError::Storage(anyhow::anyhow!("serialize message failed: {e}"))
            })?;

            if let Some(locked_until) = msg.locked_until {
                if locked_until > now {
                    moved_locked.push((key.clone(), new_key.clone(), locked_until));
                    moved_locked_ids.push((msg.id.clone(), new_key.clone()));
                }
            }

            data.insert(new_key, new_value);
            data.remove(&key);
        }

        // Move DLQ entries
        let dlq_prefix_from = format!("_dlq/{}/", from);
        let dlq_entries: Vec<(String, Vec<u8>)> = data
            .range(dlq_prefix_from.clone()..)
            .take_while(|(k, _)| k.starts_with(&dlq_prefix_from))
            .map(|(k, v)| (k.clone(), v.clone()))
            .collect();

        for (key, value) in dlq_entries {
            let suffix = key
                .strip_prefix(&dlq_prefix_from)
                .unwrap_or_default()
                .to_string();
            let mut msg: Message = serde_json::from_slice(&value).map_err(|e| {
                RenameQueueError::Storage(anyhow::anyhow!("deserialize DLQ message failed: {e}"))
            })?;
            msg.queue = to.to_string();
            let new_value = serde_json::to_vec(&msg).map_err(|e| {
                RenameQueueError::Storage(anyhow::anyhow!("serialize DLQ message failed: {e}"))
            })?;

            let new_key = format!("_dlq/{}/{}", to, suffix);
            data.insert(new_key, new_value);
            data.remove(&key);
        }

        // Update config keys
        let config_key_from = format!("_queue_config/{}", from);
        let config_key_to = format!("_queue_config/{}", to);
        let config_json = serde_json::to_vec(&existing_config).map_err(|e| {
            RenameQueueError::Storage(anyhow::anyhow!("serialize config failed: {e}"))
        })?;
        data.remove(&config_key_from);
        data.insert(config_key_to, config_json);

        // Drop data lock before acquiring other locks
        drop(data);

        // Update in-memory configs
        {
            let mut configs = self.queue_configs.write().await;
            configs.remove(from);
            configs.insert(to.to_string(), existing_config);
        }

        // Update locked_index: remove old keys by exact match and insert
        // new keys.  Precisely targeted instead of a retain() pass so
        // rename cost stays proportional to the source queue's locked
        // set, not the total locked set across all queues.
        {
            let mut index = self.locked_index.write().await;
            for (old_key, new_key, until) in moved_locked {
                index.remove(&old_key);
                index.insert(new_key, until);
            }
        }

        // DLV-0014: rebuild the secondary index under the new queue
        // name.  Drop the entire `from` sub-map and insert moved
        // (msg_id, new_storage_key) pairs into the `to` sub-map.
        {
            let mut id_index = self.locked_id_index.write().await;
            id_index.remove(from);
            if !moved_locked_ids.is_empty() {
                let entry = id_index.entry(to.to_string()).or_default();
                for (msg_id, new_key) in moved_locked_ids {
                    entry.insert(msg_id, new_key);
                }
            }
        }

        // Move payload set
        {
            let mut sets = self.payload_sets.write().await;
            if let Some(set) = sets.remove(from) {
                sets.insert(to.to_string(), set);
            }
        }

        // SYS-0018: move counter entry to the new name.
        {
            let mut counters = self.queue_counters.lock().unwrap();
            if let Some(entry) = counters.remove(from) {
                counters.insert(to.to_string(), entry);
            }
        }

        Ok(())
    }

    async fn push(&self, msg: Message) -> Result<String> {
        // Implements: DLV-0012 (lock-order: data → payload_sets)
        let config = self.get_queue_config(&msg.queue).await;

        // Enforce priority kind matches queue configuration
        if msg.priority.kind() != config.priority_kind {
            return Err(anyhow::anyhow!(
                "Priority kind mismatch: queue expects {:?} but got {:?}",
                config.priority_kind,
                msg.priority.kind()
            ));
        }

        // Validate text priority constraints
        if let Priority::Text(ref s) = msg.priority {
            if s.is_empty() {
                return Err(anyhow::anyhow!("Text priority must not be empty"));
            }
        }

        if !config.allow_duplicates {
            // Acquire data first, then payload_sets — consistent with ack/nack/batch
            // (DLV-0012).  Reversed order (payload_sets → data) caused lock-order
            // inversions and deadlocks under concurrent producer+consumer load.
            let payload_hash = hash_payload(&msg.payload);
            let mut data = self.data.write().await;
            let mut sets = self.payload_sets.write().await;
            let set = sets.entry(msg.queue.clone()).or_default();
            if set.contains(&payload_hash) {
                return Err(anyhow::anyhow!("Duplicate payload rejected"));
            }
            let key = self.generate_message_key(&msg, &config);
            let value = serde_json::to_vec(&msg)?;
            data.insert(key, value);
            set.insert(payload_hash);

            // SYS-0018: available++
            self.queue_counters
                .lock()
                .unwrap()
                .entry(msg.queue.clone())
                .or_default()
                .available += 1;

            return Ok(msg.id);
        }

        let key = self.generate_message_key(&msg, &config);
        let value = serde_json::to_vec(&msg)?;
        self.data.write().await.insert(key, value);

        // SYS-0018: available++
        self.queue_counters
            .lock()
            .unwrap()
            .entry(msg.queue.clone())
            .or_default()
            .available += 1;

        Ok(msg.id)
    }

    async fn pop(
        &self,
        queue: &str,
        consumer_id: &str,
        timeout_secs: u64,
    ) -> Result<Option<Message>> {
        let prefix = format!("{}/", queue);
        let now = Utc::now();
        let lock_until = now + chrono::Duration::seconds(timeout_secs as i64);

        let mut data = self.data.write().await;

        // Find the first available message.  Capture whether the
        // selected message was already in the locked state (expired
        // lock) so we can avoid double-counting in the counter update
        // below — see SYS-0018 comment in pop's counter block.
        let found = {
            let mut result = None;
            for (k, v) in data.range(prefix.clone()..) {
                if !k.starts_with(&prefix) {
                    break;
                }
                let msg: Message = serde_json::from_slice(v)?;
                let was_already_locked = if let Some(locked_until) = msg.locked_until {
                    if locked_until > now {
                        continue;
                    }
                    true
                } else {
                    false
                };
                result = Some((k.clone(), msg, was_already_locked));
                break;
            }
            result
        };

        if let Some((key, mut msg, was_already_locked)) = found {
            msg.locked_until = Some(lock_until);
            msg.locked_by = Some(consumer_id.to_string());
            msg.retry_count += 1;

            let new_value = serde_json::to_vec(&msg)?;
            data.insert(key.clone(), new_value);

            self.locked_index
                .write()
                .await
                .insert(key.clone(), lock_until);

            // DLV-0014: populate the secondary index for O(1) lookup
            // by (queue, message_id) in ack/nack/renew/batch ops.
            self.locked_id_index
                .write()
                .await
                .entry(queue.to_string())
                .or_default()
                .insert(msg.id.clone(), key);

            // SYS-0018: counter update.
            //
            // Fresh pop (was_already_locked=false): available -> locked.
            //
            // Re-pop of expired lock (was_already_locked=true): the
            // message is already on the locked count from the prior
            // pop; do not double-count.  Without this guard the counter
            // drifts by +1 locked per uncleared expiry, which manifests
            // as "queues with a few messages that never get processed."
            if !was_already_locked {
                let mut counters = self.queue_counters.lock().unwrap();
                let entry = counters.entry(queue.to_string()).or_default();
                entry.available = entry.available.saturating_sub(1);
                entry.locked += 1;
            }

            Ok(Some(msg))
        } else {
            Ok(None)
        }
    }

    async fn ack(&self, queue: &str, message_id: &str, consumer_id: &str) -> Result<bool> {
        // Fast path (DLV-0014): O(1) lookup via the secondary index.
        let key = match self.locked_key_for_inner(queue, message_id).await {
            Some(k) => k,
            None => return Ok(false),
        };

        let msg = {
            let mut data = self.data.write().await;
            let value = match data.get(&key) {
                Some(v) => v.clone(),
                None => {
                    // Stale secondary-index entry — clean up and bail.
                    drop(data);
                    self.remove_locked_id_index_entry(queue, message_id).await;
                    return Ok(false);
                }
            };
            let msg: Message = serde_json::from_slice(&value)?;
            if msg.locked_by.as_deref() != Some(consumer_id) {
                return Ok(false);
            }
            data.remove(&key);
            msg
        };

        self.locked_index.write().await.remove(&key);
        self.remove_locked_id_index_entry(queue, message_id).await;

        {
            let mut sets = self.payload_sets.write().await;
            if let Some(set) = sets.get_mut(queue) {
                set.remove(&hash_payload(&msg.payload));
            }
        }

        // SYS-0018: locked--
        {
            let mut counters = self.queue_counters.lock().unwrap();
            if let Some(entry) = counters.get_mut(queue) {
                entry.locked = entry.locked.saturating_sub(1);
            }
        }

        Ok(true)
    }

    async fn nack(&self, queue: &str, message_id: &str, consumer_id: &str) -> Result<bool> {
        // Fast path (DLV-0014): O(1) lookup via the secondary index.
        let key = match self.locked_key_for_inner(queue, message_id).await {
            Some(k) => k,
            None => return Ok(false),
        };

        let (msg, moved_to_dlq) = {
            let mut data = self.data.write().await;
            let value = match data.get(&key) {
                Some(v) => v.clone(),
                None => {
                    drop(data);
                    self.remove_locked_id_index_entry(queue, message_id).await;
                    return Ok(false);
                }
            };
            let mut msg: Message = serde_json::from_slice(&value)?;
            if msg.locked_by.as_deref() != Some(consumer_id) {
                return Ok(false);
            }

            let moved_to_dlq = msg.retry_count >= msg.max_retries;
            if moved_to_dlq {
                let dlq_key = format!("_dlq/{}/{}", queue, msg.id);
                data.insert(dlq_key, value);
                data.remove(&key);
            } else {
                msg.locked_until = None;
                msg.locked_by = None;
                let new_value = serde_json::to_vec(&msg)?;
                data.insert(key.clone(), new_value);
            }
            (msg, moved_to_dlq)
        };

        self.locked_index.write().await.remove(&key);
        self.remove_locked_id_index_entry(queue, message_id).await;

        if moved_to_dlq {
            let mut sets = self.payload_sets.write().await;
            if let Some(set) = sets.get_mut(queue) {
                set.remove(&hash_payload(&msg.payload));
            }
        }

        // SYS-0018: locked--; if retry, available++
        {
            let mut counters = self.queue_counters.lock().unwrap();
            if let Some(entry) = counters.get_mut(queue) {
                entry.locked = entry.locked.saturating_sub(1);
                if !moved_to_dlq {
                    entry.available += 1;
                }
            }
        }

        Ok(true)
    }

    async fn renew(
        &self,
        queue: &str,
        message_id: &str,
        consumer_id: &str,
        timeout_secs: u64,
    ) -> Result<bool> {
        let now = Utc::now();
        let new_expiry = now + chrono::Duration::seconds(timeout_secs as i64);

        // Fast path (DLV-0014): O(1) lookup via the secondary index.
        let key = match self.locked_key_for_inner(queue, message_id).await {
            Some(k) => k,
            None => return Ok(false),
        };

        {
            let mut data = self.data.write().await;
            let value = match data.get(&key) {
                Some(v) => v.clone(),
                None => {
                    drop(data);
                    self.remove_locked_id_index_entry(queue, message_id).await;
                    return Ok(false);
                }
            };
            let mut msg: Message = serde_json::from_slice(&value)?;
            if msg.locked_by.as_deref() != Some(consumer_id) {
                return Ok(false);
            }
            msg.locked_until = Some(new_expiry);
            data.insert(key.clone(), serde_json::to_vec(&msg)?);
        }

        self.locked_index.write().await.insert(key, new_expiry);

        Ok(true)
    }

    async fn batch_ack(
        &self,
        queue: &str,
        consumer_id: &str,
        message_ids: &[String],
    ) -> Result<BatchAckResult> {
        if message_ids.is_empty() {
            return Ok(BatchAckResult::default());
        }

        // Fast path (DLV-0014): resolve each id to its storage key via
        // the secondary index in O(batch_size) instead of scanning the
        // whole queue.  MemoryStorage has no cap or sticky flag, so a
        // missing entry provably means the message is not locked.
        let snapshot: Vec<(String, String)> = {
            let idx = self.locked_id_index.read().await;
            match idx.get(queue) {
                Some(map) => message_ids
                    .iter()
                    .filter_map(|id| map.get(id).map(|key| (id.clone(), key.clone())))
                    .collect(),
                None => Vec::new(),
            }
        };

        let mut acked: Vec<String> = Vec::new();
        let mut acked_payloads: Vec<[u8; 16]> = Vec::new();
        let mut keys_to_remove: Vec<String> = Vec::new();
        let mut stale: Vec<String> = Vec::new();

        {
            let mut data = self.data.write().await;
            for (id, key) in snapshot {
                let value = match data.get(&key) {
                    Some(v) => v.clone(),
                    None => {
                        stale.push(id);
                        continue;
                    }
                };
                let msg: Message = serde_json::from_slice(&value)?;
                if msg.locked_by.as_deref() == Some(consumer_id) {
                    data.remove(&key);
                    acked.push(id);
                    acked_payloads.push(hash_payload(&msg.payload));
                    keys_to_remove.push(key);
                }
            }
        }

        // Clean up stale secondary-index entries.
        for id in stale {
            self.remove_locked_id_index_entry(queue, &id).await;
        }

        if !keys_to_remove.is_empty() {
            let mut locked_index = self.locked_index.write().await;
            for key in &keys_to_remove {
                locked_index.remove(key);
            }
        }

        // DLV-0014: drop acked entries from the secondary index.
        if !acked.is_empty() {
            let mut idx = self.locked_id_index.write().await;
            if let Some(map) = idx.get_mut(queue) {
                for id in &acked {
                    map.remove(id);
                }
                if map.is_empty() {
                    idx.remove(queue);
                }
            }
        }

        if !acked_payloads.is_empty() {
            let mut sets = self.payload_sets.write().await;
            if let Some(set) = sets.get_mut(queue) {
                for payload_hash in &acked_payloads {
                    set.remove(payload_hash);
                }
            }
        }

        // SYS-0018: locked -= acked_count
        if !acked.is_empty() {
            let mut counters = self.queue_counters.lock().unwrap();
            if let Some(entry) = counters.get_mut(queue) {
                entry.locked = entry.locked.saturating_sub(acked.len() as u64);
            }
        }

        let acked_set: HashSet<&str> = acked.iter().map(String::as_str).collect();
        let not_found = message_ids
            .iter()
            .filter(|id| !acked_set.contains(id.as_str()))
            .cloned()
            .collect();

        Ok(BatchAckResult { acked, not_found })
    }

    async fn batch_nack(
        &self,
        queue: &str,
        consumer_id: &str,
        message_ids: &[String],
    ) -> Result<BatchNackResult> {
        if message_ids.is_empty() {
            return Ok(BatchNackResult::default());
        }

        // Fast path (DLV-0014): resolve each id via the secondary index.
        let snapshot: Vec<(String, String)> = {
            let idx = self.locked_id_index.read().await;
            match idx.get(queue) {
                Some(map) => message_ids
                    .iter()
                    .filter_map(|id| map.get(id).map(|key| (id.clone(), key.clone())))
                    .collect(),
                None => Vec::new(),
            }
        };

        struct Found {
            id: String,
            key: String,
            msg: Message,
        }

        let mut targets: Vec<Found> = Vec::new();
        let mut stale: Vec<String> = Vec::new();

        {
            let data = self.data.read().await;
            for (id, key) in snapshot {
                let value = match data.get(&key) {
                    Some(v) => v.clone(),
                    None => {
                        stale.push(id);
                        continue;
                    }
                };
                let msg: Message = serde_json::from_slice(&value)?;
                if msg.locked_by.as_deref() == Some(consumer_id) {
                    targets.push(Found { id, key, msg });
                }
            }
        }

        for id in stale {
            self.remove_locked_id_index_entry(queue, &id).await;
        }

        let mut result = BatchNackResult::default();
        let mut index_keys: Vec<String> = Vec::new();
        let mut processed_ids: Vec<String> = Vec::new();
        let mut dlq_payloads: Vec<[u8; 16]> = Vec::new();

        {
            let mut data = self.data.write().await;
            for Found { id, key, mut msg } in targets {
                if msg.retry_count >= msg.max_retries {
                    let dlq_key = format!("_dlq/{}/{}", queue, msg.id);
                    let value = data.get(&key).cloned().unwrap_or_default();
                    data.insert(dlq_key, value);
                    data.remove(&key);
                    result.dead_lettered.push(msg.id.clone());
                    dlq_payloads.push(hash_payload(&msg.payload));
                } else {
                    msg.locked_until = None;
                    msg.locked_by = None;
                    let new_value = serde_json::to_vec(&msg)?;
                    data.insert(key.clone(), new_value);
                    result.unlocked.push(msg.id.clone());
                }
                index_keys.push(key);
                processed_ids.push(id);
            }
        }

        let processed: HashSet<&str> = result
            .unlocked
            .iter()
            .chain(result.dead_lettered.iter())
            .chain(result.dropped.iter())
            .map(String::as_str)
            .collect();
        result.not_found = message_ids
            .iter()
            .filter(|id| !processed.contains(id.as_str()))
            .cloned()
            .collect();

        if !index_keys.is_empty() {
            let mut locked_index = self.locked_index.write().await;
            for key in index_keys {
                locked_index.remove(&key);
            }
        }

        // DLV-0014: drop every processed entry from the secondary index.
        if !processed_ids.is_empty() {
            let mut idx = self.locked_id_index.write().await;
            if let Some(map) = idx.get_mut(queue) {
                for id in &processed_ids {
                    map.remove(id);
                }
                if map.is_empty() {
                    idx.remove(queue);
                }
            }
        }

        if !dlq_payloads.is_empty() {
            let mut sets = self.payload_sets.write().await;
            if let Some(set) = sets.get_mut(queue) {
                for payload_hash in dlq_payloads {
                    set.remove(&payload_hash);
                }
            }
        }

        // SYS-0018: locked -= (unlocked + dead_lettered); available += unlocked
        {
            let total_processed = result.unlocked.len() + result.dead_lettered.len();
            if total_processed > 0 {
                let mut counters = self.queue_counters.lock().unwrap();
                if let Some(entry) = counters.get_mut(queue) {
                    entry.locked = entry.locked.saturating_sub(total_processed as u64);
                    entry.available += result.unlocked.len() as u64;
                }
            }
        }

        Ok(result)
    }

    async fn delete_queue(&self, queue_name: &str) -> Result<usize> {
        let mut data = self.data.write().await;
        let prefix = format!("{}/", queue_name);

        // Collect message keys to delete
        let keys: Vec<String> = data
            .range(prefix.clone()..)
            .take_while(|(k, _)| k.starts_with(&prefix))
            .map(|(k, _)| k.clone())
            .collect();

        let deleted_count = keys.len();
        for key in &keys {
            data.remove(key);
        }

        // Delete dead letter queue entries for this queue
        let dlq_prefix = format!("_dlq/{}/", queue_name);
        let dlq_keys: Vec<String> = data
            .range(dlq_prefix.clone()..)
            .take_while(|(k, _)| k.starts_with(&dlq_prefix))
            .map(|(k, _)| k.clone())
            .collect();
        for key in &dlq_keys {
            data.remove(key);
        }

        // Remove config key
        let config_key = format!("_queue_config/{}", queue_name);
        data.remove(&config_key);

        drop(data);

        // Clean up locked index
        if deleted_count > 0 {
            let mut locked_index = self.locked_index.write().await;
            for key in &keys {
                locked_index.remove(key);
            }
        }

        // Remove in-memory config and payload set
        self.queue_configs.write().await.remove(queue_name);
        self.payload_sets.write().await.remove(queue_name);

        // DLV-0014: drop the queue's sub-map from the secondary index.
        self.locked_id_index.write().await.remove(queue_name);

        // SYS-0018: drop the counter entry.
        self.queue_counters.lock().unwrap().remove(queue_name);

        Ok(deleted_count)
    }

    async fn purge_queue(&self, queue_name: &str) -> Result<usize> {
        let mut data = self.data.write().await;
        let prefix = format!("{}/", queue_name);

        // Collect message keys to delete (not config keys)
        let keys: Vec<String> = data
            .range(prefix.clone()..)
            .take_while(|(k, _)| k.starts_with(&prefix))
            .map(|(k, _)| k.clone())
            .collect();

        let purged_count = keys.len();
        for key in &keys {
            data.remove(key);
        }

        drop(data);

        // Clean up locked index
        if purged_count > 0 {
            let mut locked_index = self.locked_index.write().await;
            for key in &keys {
                locked_index.remove(key);
            }
        }

        // Clear payload set (queue still exists, just empty)
        let mut sets = self.payload_sets.write().await;
        if let Some(set) = sets.get_mut(queue_name) {
            set.clear();
        }

        // DLV-0014: drop the queue's sub-map from the secondary index.
        self.locked_id_index.write().await.remove(queue_name);

        // SYS-0018: queue still exists — zero the counter instead of removing.
        if let Some(entry) = self.queue_counters.lock().unwrap().get_mut(queue_name) {
            entry.available = 0;
            entry.locked = 0;
        }

        Ok(purged_count)
    }

    // Implements: SYS-0018
    async fn get_all_queue_stats(&self) -> Result<Vec<QueueStats>> {
        // Snapshot counters under a short-lived lock, release before the
        // async config read.  SYS-0018 mandates this path does not scan
        // `data`.
        let snapshot: Vec<(String, QueueCounts)> = {
            let counters = self.queue_counters.lock().unwrap();
            counters
                .iter()
                .map(|(k, v)| (k.clone(), v.clone()))
                .collect()
        };

        let configs = self.queue_configs.read().await;

        let mut stats: Vec<QueueStats> = snapshot
            .into_iter()
            .map(|(queue_name, counts)| {
                let config = configs.get(&queue_name).cloned().unwrap_or_default();
                QueueStats {
                    name: queue_name,
                    available: counts.available as usize,
                    locked: counts.locked as usize,
                    total: (counts.available + counts.locked) as usize,
                    config,
                }
            })
            .collect();

        stats.sort_by(|a, b| a.name.cmp(&b.name));
        Ok(stats)
    }

    // Implements: SYS-0018
    async fn get_queue_stats(&self, queue_name: &str) -> Result<QueueStats> {
        let counts = self
            .queue_counters
            .lock()
            .unwrap()
            .get(queue_name)
            .cloned()
            .unwrap_or_default();

        Ok(QueueStats {
            name: queue_name.to_string(),
            available: counts.available as usize,
            locked: counts.locked as usize,
            total: (counts.available + counts.locked) as usize,
            config: self.get_queue_config(queue_name).await,
        })
    }

    // Implements: SYS-0018
    async fn list_queues(&self) -> Result<Vec<String>> {
        let mut queues: Vec<String> = self
            .queue_counters
            .lock()
            .unwrap()
            .keys()
            .cloned()
            .collect();
        queues.sort();
        Ok(queues)
    }

    async fn unlock_expired_messages(&self) -> Result<usize> {
        let now = Utc::now();
        let mut expired_keys = Vec::new();

        {
            let locked_index = self.locked_index.read().await;
            for (key, lock_until) in locked_index.iter() {
                if *lock_until <= now {
                    expired_keys.push(key.clone());
                }
            }
        }

        let mut unlocked_count = 0;
        // SYS-0018: track per-queue transitions so we can update counters
        // after the unlock loop without holding multiple locks.
        let mut per_queue_unlocks: HashMap<String, u64> = HashMap::new();

        for key in &expired_keys {
            match self.unlock_message_by_key(key).await {
                Ok(true) => {
                    unlocked_count += 1;
                    if let Some(q) = Self::queue_from_key(key) {
                        *per_queue_unlocks.entry(q.to_string()).or_insert(0) += 1;
                    }
                }
                Ok(false) => {}
                Err(e) => {
                    tracing::error!("Failed to unlock message {}: {}", key, e);
                }
            }
        }

        if !expired_keys.is_empty() {
            let mut locked_index = self.locked_index.write().await;
            for key in expired_keys {
                locked_index.remove(&key);
            }
        }

        // SYS-0018: locked -= N, available += N per queue.
        if !per_queue_unlocks.is_empty() {
            let mut counters = self.queue_counters.lock().unwrap();
            for (queue, n) in per_queue_unlocks {
                if let Some(entry) = counters.get_mut(&queue) {
                    entry.locked = entry.locked.saturating_sub(n);
                    entry.available += n;
                }
            }
        }

        Ok(unlocked_count)
    }

    // Implements: API-0014
    async fn force_unlock_queue(&self, queue_name: &str) -> Result<usize> {
        let prefix = format!("{}/", queue_name);

        // Collect keys of locked messages on this queue.
        let keys_to_unlock: Vec<String> = {
            let data = self.data.read().await;
            data.range(prefix.clone()..)
                .take_while(|(k, _)| k.starts_with(&prefix))
                .filter_map(|(k, v)| {
                    serde_json::from_slice::<Message>(v)
                        .ok()
                        .filter(|m| m.locked_until.is_some())
                        .map(|_| k.clone())
                })
                .collect()
        };

        // Unlock each one via the existing helper (clears locked_until/locked_by
        // and writes back to the BTreeMap).
        let mut unlocked = 0usize;
        for key in &keys_to_unlock {
            if self.unlock_message_by_key(key).await.unwrap_or(false) {
                unlocked += 1;
            }
        }

        // Remove from locked_index.
        if !keys_to_unlock.is_empty() {
            let mut locked_index = self.locked_index.write().await;
            for key in &keys_to_unlock {
                locked_index.remove(key);
            }
        }

        // DLV-0014: defensively drop the queue's entire sub-map from
        // the secondary index.  `unlock_message_by_key` already removes
        // each unlocked message individually, but this guarantees
        // consistency for any entry that might have been skipped (e.g.
        // a message whose record failed to deserialize and therefore
        // never reached unlock_message_by_key).  Matches the
        // persistent backend's force_unlock_queue_sync behavior.
        self.locked_id_index.write().await.remove(queue_name);

        // SYS-0018: locked -= unlocked, available += unlocked.
        if unlocked > 0 {
            let mut counters = self.queue_counters.lock().unwrap();
            if let Some(entry) = counters.get_mut(queue_name) {
                entry.locked = entry.locked.saturating_sub(unlocked as u64);
                entry.available += unlocked as u64;
            }
        }

        Ok(unlocked)
    }

    async fn diagnose_queue(
        &self,
        queue_name: &str,
    ) -> Result<Option<crate::message::QueueDiagnostic>> {
        let prefix = format!("{}/", queue_name);
        let dlq_prefix = format!("_dlq/{}/", queue_name);
        let now = Utc::now();

        let mut scanned_total: u64 = 0;
        let mut scanned_available: u64 = 0;
        let mut scanned_locked_active: u64 = 0;
        let mut scanned_locked_expired: u64 = 0;
        let mut scanned_dlq: u64 = 0;

        {
            let data = self.data.read().await;
            for (k, v) in data.range(prefix.clone()..) {
                if !k.starts_with(&prefix) {
                    break;
                }
                if k.starts_with("_queue_config/") || k.starts_with("_dlq/") {
                    continue;
                }
                let msg: Message = match serde_json::from_slice(v) {
                    Ok(m) => m,
                    Err(_) => continue,
                };
                scanned_total += 1;
                match msg.locked_until {
                    Some(t) if t > now => scanned_locked_active += 1,
                    Some(_) => scanned_locked_expired += 1,
                    None => scanned_available += 1,
                }
            }
            for (k, _) in data.range(dlq_prefix.clone()..) {
                if !k.starts_with(&dlq_prefix) {
                    break;
                }
                scanned_dlq += 1;
            }
        }

        let (counter_available, counter_locked) = self
            .queue_counters
            .lock()
            .unwrap()
            .get(queue_name)
            .map(|c| (c.available, c.locked))
            .unwrap_or((0, 0));

        let locked_index_for_queue = self
            .locked_index
            .read()
            .await
            .keys()
            .filter(|k| k.starts_with(&prefix))
            .count() as u64;

        let locked_id_index_for_queue = self
            .locked_id_index
            .read()
            .await
            .get(queue_name)
            .map(|m| m.len() as u64)
            .unwrap_or(0);

        let expected_counter_available = scanned_available + scanned_locked_expired;
        let mut discrepancies = Vec::new();
        if counter_available != expected_counter_available {
            discrepancies.push(format!(
                "counter.available mismatch: counter={}, scan_available+scan_locked_expired={} (drift {:+})",
                counter_available,
                expected_counter_available,
                counter_available as i64 - expected_counter_available as i64
            ));
        }
        if counter_locked != scanned_locked_active {
            discrepancies.push(format!(
                "counter.locked mismatch: counter={}, scan_locked_active={} (drift {:+})",
                counter_locked,
                scanned_locked_active,
                counter_locked as i64 - scanned_locked_active as i64
            ));
        }
        if scanned_locked_expired > 0 {
            discrepancies.push(format!(
                "{} message(s) have expired locks not yet swept by unlock_expired_messages",
                scanned_locked_expired
            ));
        }

        Ok(Some(crate::message::QueueDiagnostic {
            queue: queue_name.to_string(),
            counter_available,
            counter_locked,
            scanned_total,
            scanned_available,
            scanned_locked_active,
            scanned_locked_expired,
            scanned_dlq,
            locked_index_for_queue,
            locked_id_index_for_queue,
            // MemoryStorage has no hot tier — there is no separate
            // cache layer between the BTreeMap and the consumer.
            hot_tier_size: 0,
            discrepancies,
        }))
    }

    async fn reseed_queue_counters(&self, queue_name: &str) -> Result<Option<(u64, u64)>> {
        let diag = match self.diagnose_queue(queue_name).await? {
            Some(d) => d,
            None => return Ok(None),
        };
        let new_available = diag.scanned_available + diag.scanned_locked_expired;
        let new_locked = diag.scanned_locked_active;
        let mut counters = self.queue_counters.lock().unwrap();
        let entry = counters.entry(queue_name.to_string()).or_default();
        entry.available = new_available;
        entry.locked = new_locked;
        tracing::info!(
            queue = queue_name,
            available = new_available,
            locked = new_locked,
            "reseed_queue_counters: counters reset from scan"
        );
        Ok(Some((new_available, new_locked)))
    }
}