noxu-cleaner 3.0.1

Log file garbage collection for Noxu DB
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
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
//! Main cleaner daemon for log garbage collection.
//!
//! responsible for garbage collecting the log by
//! selecting least utilized files, processing them, and deleting cleaned files.

use crate::FileSelector;
use crate::cleaner_stat::CleanerStats;
use crate::file_processor::{
    FileProcessResult, FileProcessor, LogEntry, LogEntryType, SharedTreeLookup,
};
use crate::file_protector::FileProtector;
use crate::throttle::CleanerThrottle;
use noxu_log::{
    FileManager, LogManager,
    entry_header::{MAX_HEADER_SIZE, MIN_HEADER_SIZE},
    file_header::FILE_HEADER_SIZE,
};
use noxu_sync::Mutex;
use std::collections::HashMap;
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::sync::{Arc, RwLock};

/// The Cleaner is responsible for garbage collecting the log.
///
/// It selects the least utilized log file for cleaning (FileSelector),
/// reads through the log file (FileProcessor) and determines whether
/// each entry is obsolete or active. Active entries are migrated to
/// the end of the log, and the cleaned file is deleted.
///
/// The cleaner can be invoked manually via `do_clean()` or run as a
/// background daemon thread.
pub struct Cleaner {
    /// File selector for choosing files to clean.
    file_selector: Mutex<FileSelector>,

    /// File protector for preventing deletion of files in use.
    file_protector: FileProtector,

    /// Cleaner statistics.
    stats: Arc<CleanerStats>,

    /// Whether the cleaner is currently running.
    running: AtomicBool,

    /// Shutdown signal.
    shutdown: Arc<AtomicBool>,

    /// Minimum utilization threshold (0-100%).
    ///
    /// Files below this utilization are candidates for cleaning.
    min_utilization: u32,

    /// Minimum file count before cleaning starts.
    ///
    /// The cleaner won't run until at least this many files exist.
    min_file_count: u32,

    /// Minimum age of file before cleaning (in seconds).
    ///
    /// Files must be at least this old before they can be cleaned.
    min_age: u64,

    /// Total number of cleaning runs performed.
    n_runs: AtomicU64,

    /// Files pending deletion (marked safe to delete but not yet removed).
    pending_deletions: Mutex<Vec<u32>>,

    /// Optional FileManager for real log-file scanning and deletion.
    ///
    /// When `None`, `process_single_file` returns an empty `FileSummary` and
    /// `delete_pending_files` skips the actual `fs::remove_file` call (the
    /// in-memory counter is still incremented so existing unit tests pass).
    file_manager: Option<Arc<FileManager>>,

    /// Optional shared B-tree for LN migration.
    ///
    /// When `Some`, `process_single_file` decodes the LN entries from the log
    /// file and calls `FileProcessor::process_file()` with a `SharedTreeLookup`
    /// so that live LN entries are migrated (their BIN slot LSNs are updated).
    /// When `None`, migration is skipped (the no-op path used by unit tests).
    ///
    /// `env.getDbTree()` access pattern in the equivalent `FileProcessor`.
    tree: Option<Arc<RwLock<noxu_tree::Tree>>>,

    /// Optional LogManager used by `SharedTreeLookup::migrate_ln_slot` to
    /// obtain a fresh LSN for the migrated LN entry.
    log_manager: Option<Arc<LogManager>>,

    /// Optional shared `LockManager` from the environment.
    ///
    /// When `Some`, the cleaner uses the environment's lock table so that
    /// cleaner-held locks contend with user transactions for correct deadlock
    /// detection.  When `None`, `SharedTreeLookup::new` allocates a private
    /// manager (safe but no cross-component deadlock detection).
    ///
    /// Using `env.getTxnManager().getLockManager()`.
    lock_manager: Option<Arc<noxu_txn::LockManager>>,

    /// Per-database tree registry for secondary databases (X-7 fix).
    ///
    /// Maps `db_id.id() as i64` → `Arc<RwLock<Tree>>` for every non-primary
    /// database that has been opened.  The cleaner's `SharedTreeLookup`
    /// dispatches liveness checks for non-primary LNs to the correct tree
    /// via `with_extra_trees`.
    ///
    /// The `Arc<Mutex<…>>` wrapper lets `open_database_inner` insert entries
    /// after the cleaner has already been constructed.
    extra_trees:
        Arc<std::sync::Mutex<HashMap<i64, Arc<RwLock<noxu_tree::Tree>>>>>,

    /// Adaptive throttle: tracks the log write rate and computes sleep
    /// intervals and files-per-pass recommendations for the daemon loop.
    ///
    /// Implements `CleanerThrottle`.
    pub throttle: Arc<CleanerThrottle>,
}

/// Result of a cleaning operation.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct CleanResult {
    /// Number of files successfully cleaned.
    pub files_cleaned: u32,

    /// Number of files successfully deleted.
    pub files_deleted: u32,

    /// Total number of log entries read across all cleaned files.
    pub total_entries_read: u64,
}

impl Cleaner {
    /// Creates a new cleaner with the given configuration.
    ///
    /// # Arguments
    /// * `min_utilization` - Minimum utilization threshold (0-100%)
    /// * `min_file_count` - Minimum file count before cleaning starts
    /// * `min_age` - Minimum age of file before cleaning (in seconds)
    pub fn new(
        min_utilization: u32,
        min_file_count: u32,
        min_age: u64,
    ) -> Self {
        Self {
            file_selector: Mutex::new(FileSelector::new()),
            file_protector: FileProtector::new(),
            stats: Arc::new(CleanerStats::new()),
            running: AtomicBool::new(false),
            shutdown: Arc::new(AtomicBool::new(false)),
            min_utilization: min_utilization.min(100),
            min_file_count,
            min_age,
            n_runs: AtomicU64::new(0),
            pending_deletions: Mutex::new(Vec::new()),
            file_manager: None,
            tree: None,
            log_manager: None,
            lock_manager: None,
            extra_trees: Arc::new(std::sync::Mutex::new(HashMap::new())),
            throttle: Arc::new(CleanerThrottle::new(0)),
        }
    }

    /// Creates a new cleaner wired to a real `FileManager`.
    ///
    /// The cleaner uses the `FileManager` for two purposes:
    /// - `process_single_file()` scans the on-disk log file to compute real
    ///   utilization statistics.
    /// - `delete_pending_files()` calls `FileManager::delete_file()` to
    ///   remove cleaned log files from disk.
    pub fn with_file_manager(
        min_utilization: u32,
        min_file_count: u32,
        min_age: u64,
        file_manager: Arc<FileManager>,
    ) -> Self {
        Self {
            file_selector: Mutex::new(FileSelector::new()),
            file_protector: FileProtector::new(),
            stats: Arc::new(CleanerStats::new()),
            running: AtomicBool::new(false),
            shutdown: Arc::new(AtomicBool::new(false)),
            min_utilization: min_utilization.min(100),
            min_file_count,
            min_age,
            n_runs: AtomicU64::new(0),
            pending_deletions: Mutex::new(Vec::new()),
            file_manager: Some(file_manager),
            tree: None,
            log_manager: None,
            lock_manager: None,
            extra_trees: Arc::new(std::sync::Mutex::new(HashMap::new())),
            throttle: Arc::new(CleanerThrottle::new(0)),
        }
    }

    /// Creates a new cleaner wired to a real `FileManager`, a shared B-tree,
    /// and a `LogManager`.
    ///
    /// In addition to the file-scanning and deletion capabilities of
    /// `with_file_manager`, this constructor enables LN migration:
    /// `process_single_file` will decode the actual LN entries from each
    /// cleaned log file and call `FileProcessor::process_file` with a
    /// `SharedTreeLookup` so that live LN entries are re-logged and their
    /// BIN slot LSNs are updated.
    ///
    /// Tree-access wiring for file processing.
    ///
    /// Note: allocates a private `LockManager` (no lock-table sharing with
    /// transactions).  Use `with_file_manager_tree_and_lock_manager` to pass
    /// the environment's shared LockManager for correct deadlock detection.
    pub fn with_file_manager_and_tree(
        min_utilization: u32,
        min_file_count: u32,
        min_age: u64,
        file_manager: Arc<FileManager>,
        tree: Arc<RwLock<noxu_tree::Tree>>,
        log_manager: Arc<LogManager>,
    ) -> Self {
        Self {
            file_selector: Mutex::new(FileSelector::new()),
            file_protector: FileProtector::new(),
            stats: Arc::new(CleanerStats::new()),
            running: AtomicBool::new(false),
            shutdown: Arc::new(AtomicBool::new(false)),
            min_utilization: min_utilization.min(100),
            min_file_count,
            min_age,
            n_runs: AtomicU64::new(0),
            pending_deletions: Mutex::new(Vec::new()),
            file_manager: Some(file_manager),
            tree: Some(tree),
            log_manager: Some(log_manager),
            lock_manager: None,
            extra_trees: Arc::new(std::sync::Mutex::new(HashMap::new())),
            throttle: Arc::new(CleanerThrottle::new(0)),
        }
    }

    /// Creates a new cleaner wired to a `FileManager`, shared B-tree,
    /// `LogManager`, and the environment's shared `LockManager`.
    ///
    /// This is the preferred constructor for production use.  Passing the
    /// environment's `LockManager` ensures that locks held by the cleaner
    /// contend with user transactions, enabling correct deadlock detection.
    ///
    /// Cleaner obtains the lock manager via
    /// `env.getTxnManager().getLockManager()`.
    pub fn with_file_manager_tree_and_lock_manager(
        min_utilization: u32,
        min_file_count: u32,
        min_age: u64,
        file_manager: Arc<FileManager>,
        tree: Arc<RwLock<noxu_tree::Tree>>,
        log_manager: Arc<LogManager>,
        lock_manager: Arc<noxu_txn::LockManager>,
    ) -> Self {
        Self {
            file_selector: Mutex::new(FileSelector::new()),
            file_protector: FileProtector::new(),
            stats: Arc::new(CleanerStats::new()),
            running: AtomicBool::new(false),
            shutdown: Arc::new(AtomicBool::new(false)),
            min_utilization: min_utilization.min(100),
            min_file_count,
            min_age,
            n_runs: AtomicU64::new(0),
            pending_deletions: Mutex::new(Vec::new()),
            file_manager: Some(file_manager),
            tree: Some(tree),
            log_manager: Some(log_manager),
            lock_manager: Some(lock_manager),
            extra_trees: Arc::new(std::sync::Mutex::new(HashMap::new())),
            throttle: Arc::new(CleanerThrottle::new(0)),
        }
    }

    /// Register per-database trees for secondary databases (X-7 fix).
    ///
    /// Accepts a shared registry `Arc` so the environment can dynamically add
    /// trees as databases are opened after the cleaner is constructed.
    pub fn with_tree_registry(
        mut self,
        registry: Arc<
            std::sync::Mutex<HashMap<i64, Arc<RwLock<noxu_tree::Tree>>>>,
        >,
    ) -> Self {
        self.extra_trees = registry;
        self
    }

    /// Register a single additional tree for `db_id` (X-7 fix).
    ///
    /// Idempotent — calling with the same `db_id` replaces the previous entry.
    pub fn register_db_tree(
        &self,
        db_id: i64,
        tree: Arc<RwLock<noxu_tree::Tree>>,
    ) {
        if let Ok(mut reg) = self.extra_trees.lock() {
            reg.insert(db_id, tree);
        }
    }

    /// Main cleaning entry point - performs cleaning of up to n_files.
    ///
    /// # Arguments
    /// * `n_files` - Maximum number of files to clean in this run
    /// * `force` - If true, ignore utilization thresholds and clean anyway
    ///
    /// # Returns
    /// Result containing cleaning statistics or an error
    pub fn do_clean(
        &self,
        n_files: u32,
        _force: bool,
    ) -> Result<CleanResult, String> {
        // Check if already running
        if self
            .running
            .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
            .is_err()
        {
            return Err("Cleaner is already running".to_string());
        }

        // Ensure we reset running flag on exit
        let _guard = RunningGuard::new(&self.running);

        // Check shutdown
        if self.shutdown.load(Ordering::Relaxed) {
            return Err("Cleaner is shut down".to_string());
        }

        // Increment run counter
        self.n_runs.fetch_add(1, Ordering::Relaxed);
        self.stats.runs.fetch_add(1, Ordering::Relaxed);

        let mut files_cleaned = 0u32;
        let mut total_entries = 0u64;

        // Select files to clean (up to n_files)
        let mut files_to_clean = Vec::new();
        {
            let mut selector = self.file_selector.lock();
            for _ in 0..n_files {
                if let Some((file_number, _required_util)) =
                    selector.select_file_for_cleaning()
                {
                    files_to_clean.push(file_number);
                } else {
                    break;
                }
            }
        }

        // Process each selected file
        for file_number in files_to_clean {
            // Check shutdown before processing each file
            if self.shutdown.load(Ordering::Relaxed) {
                break;
            }

            // Protect file during processing
            self.file_protector.protect_file(file_number, "CleanerProcessing");

            // Process the file
            let result = self.process_single_file(file_number)?;

            // Unprotect after processing
            self.file_protector.unprotect_file(file_number);

            if result.completed {
                files_cleaned += 1;
                total_entries += result.entries_read;

                // Update statistics
                self.update_stats(&result);

                // Mark file as cleaned in selector.
                // X-5: do NOT immediately push to pending_deletions.
                // The file will only become deletable after it passes
                // through the two-checkpoint barrier in FileSelector.
                // The checkpointer calls after_checkpoint() which advances
                // cleaned → checkpointed → safe_to_delete over two
                // successive checkpoints.
                self.file_selector.lock().mark_file_cleaned(file_number);
            }
        }

        // X-5: only delete files that have passed the two-checkpoint barrier.
        // `delete_safe_files()` reads `FileSelector::get_safe_to_delete()`
        // which contains files that survived two checkpoints since cleaning.
        let files_deleted = self.delete_safe_files();

        // Legacy pending_deletions: still try any files that were queued
        // via the old request_delete_files() API or by other callers.
        let _legacy = self.delete_pending_files();

        // Adaptive throttle update (CleanerThrottle.update()).
        // Pull current cumulative write bytes from the LogManager and pass
        // them to the throttle so it can compute a new sleep interval for
        // the next cleaning pass.  `cleaning_needed` is true when files were
        // found (forcing a shorter sleep to keep up with write pressure).
        let current_write_bytes = self
            .log_manager
            .as_ref()
            .map(|lm| lm.get_stats().n_sequential_write_bytes)
            .unwrap_or(0);
        let cleaning_needed = files_cleaned > 0;
        self.throttle.update(current_write_bytes, cleaning_needed);

        Ok(CleanResult {
            files_cleaned,
            files_deleted,
            total_entries_read: total_entries,
        })
    }

    /// Processes a single file for cleaning.
    ///
    /// When a `FileManager` is available, this method scans the on-disk log
    /// file entry-by-entry to populate a real `FileSummary`.  Each raw entry
    /// is counted toward `total_count` / `total_size` and classified as LN
    /// or IN based on the entry-type byte.  When no `FileManager` is attached
    /// (unit-test mode) an empty summary is used, matching prior behaviour.
    ///
    /// When a tree and log manager are also available (via
    /// `with_file_manager_and_tree`), decoded LN entries are passed to
    /// `FileProcessor::process_file()` with a `SharedTreeLookup` so that
    /// live LN entries are migrated.  Otherwise the no-op path is taken.
    fn process_single_file(
        &self,
        file_number: u32,
    ) -> Result<FileProcessResult, String> {
        let file_summary = match &self.file_manager {
            None => crate::FileSummary::new(),
            Some(fm) => self.scan_file_summary(fm, file_number),
        };

        let processor =
            FileProcessor::new(self.stats.clone(), self.shutdown.clone());

        // If we have a tree + log manager, decode LN entries from the file
        // and run them through the real migration path.
        if let (Some(fm), Some(tree), Some(lm)) =
            (&self.file_manager, &self.tree, &self.log_manager)
        {
            let entries = self.decode_ln_entries_from_file(fm, file_number);
            // Use the environment's shared LockManager when available so that
            // cleaner-held locks contend with user transactions (fidelity).
            // Cleaner uses env.getTxnManager().getLockManager().
            let tree_lookup = if let Some(ref shared_lm) = self.lock_manager {
                SharedTreeLookup::with_lock_manager(
                    Arc::clone(tree),
                    Arc::clone(lm),
                    Arc::clone(shared_lm),
                )
                .with_extra_trees(
                    self.extra_trees
                        .lock()
                        .map(|g| g.clone())
                        .unwrap_or_default(),
                )
            } else {
                SharedTreeLookup::new(Arc::clone(tree), Arc::clone(lm))
                    .with_extra_trees(
                        self.extra_trees
                            .lock()
                            .map(|g| g.clone())
                            .unwrap_or_default(),
                    )
            };
            return processor.process_file(
                file_number,
                &file_summary,
                &entries,
                &tree_lookup,
            );
        }

        processor.process_file_no_entries(file_number, &file_summary)
    }

    /// Decodes LN log entries from a file into `LogEntry` values suitable
    /// for `FileProcessor::process_file`.
    ///
    /// Scans the file sequentially, reading each entry header and payload.
    /// For LN-family entries (type bytes 4–9) the payload is parsed using
    /// `LnLogEntry::read_from_log` to extract the real record key.  This
    /// mirrors the way `CleanerFileReader` extracts keys from log entries
    /// before passing them to `FileProcessor.processFile()`.
    ///
    /// IN, BIN-delta, and all other entry types are represented as
    /// `LogEntryType::Other` (they will be skipped by the migration loop).
    ///
    ///
    fn decode_ln_entries_from_file(
        &self,
        fm: &Arc<FileManager>,
        file_number: u32,
    ) -> Vec<LogEntry> {
        let mut entries = Vec::new();

        let file_len = match fm.get_file_length(file_number) {
            Ok(l) => l,
            Err(_) => return entries,
        };

        let mut offset = FILE_HEADER_SIZE as u64;
        while offset < file_len {
            let mut hdr = [0u8; MIN_HEADER_SIZE];
            let n = match fm.read_from_file(file_number, offset, &mut hdr) {
                Ok(n) => n,
                Err(_) => break,
            };
            if n < MIN_HEADER_SIZE {
                break;
            }
            if hdr[4] == 0 {
                break;
            }

            let entry_type_byte = hdr[4];
            let flags = hdr[5];
            let item_size =
                u32::from_le_bytes([hdr[10], hdr[11], hdr[12], hdr[13]])
                    as usize;

            let vlsn_present = (flags & 0x08) != 0 || (flags & 0x20) != 0;
            let header_size =
                if vlsn_present { MAX_HEADER_SIZE } else { MIN_HEADER_SIZE };
            let entry_size = header_size + item_size;

            let file_offset = offset as u32;
            let lsn = noxu_util::Lsn::new(file_number, file_offset);

            // Build a LogEntry for LN-family types only; everything else
            // is emitted as LogEntryType::Other so the processor skips it.
            // For LN entries, read the payload and deserialise the real key.
            // CleanerFileReader reading actual record keys via
            // LN payload deserialization.
            let log_entry_type = match entry_type_byte {
                // InsertLN=4, UpdateLN=6 (non-transactional) — active entries
                // that may need migration. Read payload to extract real key.
                4 | 6 => {
                    let payload_offset = offset + header_size as u64;
                    let mut payload = vec![0u8; item_size];
                    let (key, db_id): (Vec<u8>, i64) = if item_size > 0
                        && fm
                            .read_from_file(
                                file_number,
                                payload_offset,
                                &mut payload,
                            )
                            .is_ok()
                    {
                        use noxu_log::entry::LnLogEntry;
                        match LnLogEntry::read_from_log(&payload, false) {
                            Ok(ln) => (ln.key.clone(), ln.db_id as i64),
                            Err(_) => {
                                (file_offset.to_le_bytes().to_vec(), 1i64)
                            }
                        }
                    } else {
                        (file_offset.to_le_bytes().to_vec(), 1i64)
                    };
                    LogEntryType::Ln {
                        db_id,
                        key,
                        deleted: false,
                        expiration_time: 0,
                        entry_size: entry_size as i32,
                    }
                }
                // InsertLNTxn=5, UpdateLNTxn=7 — transactional variants.
                // Read payload using transactional deserialization.
                5 | 7 => {
                    let payload_offset = offset + header_size as u64;
                    let mut payload = vec![0u8; item_size];
                    let (key, db_id): (Vec<u8>, i64) = if item_size > 0
                        && fm
                            .read_from_file(
                                file_number,
                                payload_offset,
                                &mut payload,
                            )
                            .is_ok()
                    {
                        use noxu_log::entry::LnLogEntry;
                        match LnLogEntry::read_from_log(&payload, true) {
                            Ok(ln) => (ln.key.clone(), ln.db_id as i64),
                            Err(_) => {
                                (file_offset.to_le_bytes().to_vec(), 1i64)
                            }
                        }
                    } else {
                        (file_offset.to_le_bytes().to_vec(), 1i64)
                    };
                    // Transactional variants are considered live during
                    // cleaning — the cleaner migrates them.
                    LogEntryType::Ln {
                        db_id,
                        key,
                        deleted: false,
                        expiration_time: 0,
                        entry_size: entry_size as i32,
                    }
                }
                // DeleteLN=8, DeleteLNTxn=9 — deleted LN entries are
                // immediately obsolete; emit as Ln { deleted: true }.
                8 | 9 => {
                    let payload_offset = offset + header_size as u64;
                    let mut payload = vec![0u8; item_size];
                    let (key, db_id): (Vec<u8>, i64) = if item_size > 0
                        && fm
                            .read_from_file(
                                file_number,
                                payload_offset,
                                &mut payload,
                            )
                            .is_ok()
                    {
                        use noxu_log::entry::LnLogEntry;
                        let is_txn = entry_type_byte == 9;
                        match LnLogEntry::read_from_log(&payload, is_txn) {
                            Ok(ln) => (ln.key.clone(), ln.db_id as i64),
                            Err(_) => {
                                (file_offset.to_le_bytes().to_vec(), 1i64)
                            }
                        }
                    } else {
                        (file_offset.to_le_bytes().to_vec(), 1i64)
                    };
                    LogEntryType::Ln {
                        db_id,
                        key,
                        deleted: true,
                        expiration_time: 0,
                        entry_size: entry_size as i32,
                    }
                }
                // IN/BIN/BINDelta and everything else → Other (skipped).
                _ => LogEntryType::Other,
            };

            entries.push(LogEntry { lsn, entry_type: log_entry_type });
            offset += entry_size as u64;
        }

        entries
    }

    /// Scans a log file and returns a populated `FileSummary`.
    ///
    /// Reads each log entry header sequentially, accumulating:
    /// - `total_count` / `total_size` for every entry
    /// - `total_ln_count` / `total_ln_size` for LN entry types
    /// - `total_in_count` / `total_in_size` for IN / BIN-delta entry types
    ///
    /// Entry-type bytes recognised as LN:  `InsertLN`=4, `InsertLNTxn`=5,
    /// `UpdateLN`=6, `UpdateLNTxn`=7, `DeleteLN`=8, `DeleteLNTxn`=9.
    /// Entry-type bytes recognised as IN:  `IN`=2, `BIN`=3, `BINDelta`=26.
    /// All other types are counted in the totals but not in the per-type
    /// fields, so they show up in "leftover" space (treated as obsolete by
    /// `FileSummary::calculate_obsolete_size`).
    ///
    /// This is the entry-header layout used throughout noxu-log:
    /// ```text
    /// bytes  0..3   checksum    (u32 LE)
    /// byte   4      entry_type
    /// byte   5      flags
    /// bytes  6..9   prev_offset (u32 LE)
    /// bytes  10..13 item_size   (u32 LE)
    /// [bytes 14..21 VLSN        (i64 LE)  — present when flags & 0x28 != 0]
    /// ```
    fn scan_file_summary(
        &self,
        fm: &Arc<FileManager>,
        file_number: u32,
    ) -> crate::FileSummary {
        let mut summary = crate::FileSummary::new();

        let file_len = match fm.get_file_length(file_number) {
            Ok(l) => l,
            Err(_) => return summary,
        };
        // Total size is the full file, including the file header.
        summary.total_size = file_len.min(i32::MAX as u64) as i32;

        let mut offset = FILE_HEADER_SIZE as u64;
        while offset < file_len {
            let mut hdr = [0u8; MIN_HEADER_SIZE];
            let n = match fm.read_from_file(file_number, offset, &mut hdr) {
                Ok(n) => n,
                Err(_) => break,
            };
            if n < MIN_HEADER_SIZE {
                break; // Truncated read at end of file.
            }
            // A zero entry-type byte means we've reached unwritten space.
            if hdr[4] == 0 {
                break;
            }

            let entry_type_byte = hdr[4];
            let flags = hdr[5];
            let item_size =
                u32::from_le_bytes([hdr[10], hdr[11], hdr[12], hdr[13]])
                    as usize;

            let vlsn_present = (flags & 0x08) != 0 || (flags & 0x20) != 0;
            let header_size =
                if vlsn_present { MAX_HEADER_SIZE } else { MIN_HEADER_SIZE };
            let entry_size = (header_size + item_size) as i32;

            summary.total_count += 1;
            // total_size was already set to the full file length; we track
            // per-type sizes below for utilization estimation.

            // Classify by entry type.
            // LN types: InsertLN=4, InsertLNTxn=5, UpdateLN=6,
            //           UpdateLNTxn=7, DeleteLN=8, DeleteLNTxn=9
            // IN types: IN=2, BIN=3, BINDelta=26
            match entry_type_byte {
                4..=9 => {
                    // LN family
                    summary.total_ln_count += 1;
                    summary.total_ln_size += entry_size;
                    if entry_size > summary.max_ln_size {
                        summary.max_ln_size = entry_size;
                    }
                }
                2 | 3 | 26 => {
                    // IN / BIN / BINDelta family
                    summary.total_in_count += 1;
                    summary.total_in_size += entry_size;
                }
                _ => {
                    // FileHeader, Trace, MapLN, TxnCommit, etc.
                    // Counted in total_count / total_size only; these
                    // bytes will appear as "leftover" obsolete space.
                }
            }

            offset += (header_size + item_size) as u64;
        }

        summary
    }

    /// Updates statistics from a file processing result.
    fn update_stats(&self, result: &FileProcessResult) {
        self.stats
            .entries_read
            .fetch_add(result.entries_read, Ordering::Relaxed);
        self.stats.lns_cleaned.fetch_add(result.lns_cleaned, Ordering::Relaxed);
        self.stats.lns_dead.fetch_add(result.lns_dead, Ordering::Relaxed);
        self.stats
            .lns_migrated
            .fetch_add(result.lns_migrated, Ordering::Relaxed);
        self.stats
            .lns_obsolete
            .fetch_add(result.lns_obsolete, Ordering::Relaxed);
        self.stats.lns_locked.fetch_add(result.lns_locked, Ordering::Relaxed);
        self.stats.ins_cleaned.fetch_add(result.ins_cleaned, Ordering::Relaxed);
        self.stats.ins_dead.fetch_add(result.ins_dead, Ordering::Relaxed);
        self.stats
            .ins_migrated
            .fetch_add(result.ins_migrated, Ordering::Relaxed);
        self.stats
            .ins_obsolete
            .fetch_add(result.ins_obsolete, Ordering::Relaxed);
        self.stats
            .bin_deltas_cleaned
            .fetch_add(result.bin_deltas_cleaned, Ordering::Relaxed);
        self.stats
            .bin_deltas_dead
            .fetch_add(result.bin_deltas_dead, Ordering::Relaxed);
        self.stats
            .bin_deltas_migrated
            .fetch_add(result.bin_deltas_migrated, Ordering::Relaxed);
        self.stats
            .bin_deltas_obsolete
            .fetch_add(result.bin_deltas_obsolete, Ordering::Relaxed);
    }

    /// Deletes files that are safe to delete (not protected).
    ///
    /// When a `FileManager` is available, calls `FileManager::delete_file()`
    /// which removes the file handle from the cache and then calls
    /// `fs::remove_file` on the actual `.ndb` path.  When no `FileManager` is
    /// attached (unit-test mode) the deletion is counted but no I/O occurs.
    ///
    /// Returns the number of files successfully deleted.
    fn delete_pending_files(&self) -> u32 {
        let mut pending = self.pending_deletions.lock();
        let mut deleted = 0u32;

        pending.retain(|&file_number| {
            if !self.file_protector.is_protected(file_number) {
                // Perform the actual on-disk deletion when wired to a
                // FileManager.  Ignore errors (e.g. file already gone) so
                // that a single failed delete doesn't stall the cleaner.
                if let Some(fm) = &self.file_manager {
                    let _ = fm.delete_file(file_number);
                }
                deleted += 1;
                self.stats.deletions.fetch_add(1, Ordering::Relaxed);
                false // Remove from pending list
            } else {
                true // Keep in pending list
            }
        });

        deleted
    }

    /// Adds a file to the list of files to clean.
    ///
    /// Useful for manual cleaning or prioritizing specific files.
    pub fn add_file_to_clean(&self, file_number: u32) {
        let mut selector = self.file_selector.lock();
        selector.add_file_to_clean(file_number);
    }

    /// Returns a reference to the file selector (for testing/introspection).
    pub fn get_file_selector(&self) -> &Mutex<FileSelector> {
        &self.file_selector
    }

    /// Notify the cleaner that a checkpoint has completed.
    ///
    /// Called by the checkpointer after `do_checkpoint()` succeeds.  This
    /// method advances the three-state checkpoint barrier:
    ///
    /// * Files in `checkpointed` (captured by the prior checkpoint) move to
    ///   `safe_to_delete`.
    /// * Files in `cleaned_files` (snapshotted at checkpoint *start*) move
    ///   to `checkpointed`.
    ///
    /// After this call, `delete_safe_files()` will remove files that have
    /// survived two checkpoints.
    ///
    /// X-5 fix: `FileSelector::process_checkpoint_end` was fully implemented
    /// but never called from outside the cleaner.
    pub fn after_checkpoint(
        &self,
        state: &crate::file_selector::CheckpointStartCleanerState,
    ) {
        self.file_selector.lock().process_checkpoint_end(state);
    }

    /// Delete files that have passed the two-checkpoint barrier
    /// (`safe_to_delete`).
    ///
    /// X-5 fix: replaces the old `delete_pending_files` call in `do_clean`
    /// which deleted files immediately after cleaning without waiting for
    /// a checkpoint.  Now only files returned by
    /// `FileSelector::get_safe_to_delete()` are eligible.
    pub fn delete_safe_files(&self) -> u32 {
        let files_to_delete = {
            let mut selector = self.file_selector.lock();
            let to_delete = selector.get_safe_to_delete();
            // Remove each file from the selector's tracking state after
            // we decide to delete it so that a concurrent cleaning pass
            // doesn't see a ghost entry.
            for &f in &to_delete {
                selector.remove_deleted_file(f);
            }
            to_delete
        };

        let mut deleted = 0u32;
        for file_number in files_to_delete {
            if !self.file_protector.is_protected(file_number) {
                if let Some(fm) = &self.file_manager {
                    let _ = fm.delete_file(file_number);
                }
                deleted += 1;
                self.stats.deletions.fetch_add(1, Ordering::Relaxed);
            } else {
                // File is still protected — re-queue for later deletion.
                self.pending_deletions.lock().push(file_number);
                // Also restore in the selector so the barrier is not lost.
                self.file_selector.lock().add_safe_to_delete_back(file_number);
            }
        }
        deleted
    }

    /// Returns a reference to the file protector.
    pub fn get_file_protector(&self) -> &FileProtector {
        &self.file_protector
    }

    /// Returns a reference to the statistics.
    pub fn get_stats(&self) -> &Arc<CleanerStats> {
        &self.stats
    }

    /// Returns whether the cleaner is currently running.
    pub fn is_running(&self) -> bool {
        self.running.load(Ordering::Relaxed)
    }

    /// Signals the cleaner to shut down.
    ///
    /// This will cause in-progress cleaning to stop at the next checkpoint.
    pub fn shutdown(&self) {
        self.shutdown.store(true, Ordering::Relaxed);
    }

    /// Requests that the given files be deleted once they are no longer protected.
    pub fn request_delete_files(&self, files: &[u32]) {
        let mut pending = self.pending_deletions.lock();
        pending.extend_from_slice(files);
    }

    /// Returns the total number of cleaning runs performed.
    pub fn get_run_count(&self) -> u64 {
        self.n_runs.load(Ordering::Relaxed)
    }
}

/// RAII guard to ensure the running flag is cleared on drop.
struct RunningGuard<'a> {
    running: &'a AtomicBool,
}

impl<'a> RunningGuard<'a> {
    fn new(running: &'a AtomicBool) -> Self {
        Self { running }
    }
}

impl<'a> Drop for RunningGuard<'a> {
    fn drop(&mut self) {
        self.running.store(false, Ordering::Release);
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn test_new_cleaner() {
        let cleaner = Cleaner::new(50, 5, 60);
        assert!(!cleaner.is_running());
        assert_eq!(cleaner.min_utilization, 50);
        assert_eq!(cleaner.min_file_count, 5);
        assert_eq!(cleaner.min_age, 60);
        assert_eq!(cleaner.get_run_count(), 0);
    }

    #[test]
    fn test_cleaner_with_max_utilization() {
        let cleaner = Cleaner::new(150, 5, 60); // Over 100
        assert_eq!(cleaner.min_utilization, 100); // Should be clamped
    }

    #[test]
    fn test_do_clean_not_running() {
        let cleaner = Cleaner::new(50, 0, 0);
        assert!(!cleaner.is_running());

        // Should return immediately with no files (selector is empty)
        let result = cleaner.do_clean(1, false).unwrap();
        assert_eq!(result.files_cleaned, 0);
        assert_eq!(result.files_deleted, 0);
    }

    #[test]
    fn test_do_clean_increments_run_count() {
        let cleaner = Cleaner::new(50, 0, 0);
        assert_eq!(cleaner.get_run_count(), 0);

        let _ = cleaner.do_clean(1, false);
        assert_eq!(cleaner.get_run_count(), 1);

        let _ = cleaner.do_clean(1, false);
        assert_eq!(cleaner.get_run_count(), 2);
    }

    #[test]
    fn test_concurrent_clean_rejected() {
        let cleaner = Arc::new(Cleaner::new(50, 0, 0));

        // Simulate a long-running clean by holding the running flag
        cleaner.running.store(true, Ordering::Relaxed);

        // Second clean attempt should fail
        let result = cleaner.do_clean(1, false);
        assert!(result.is_err());
        assert!(result.unwrap_err().contains("already running"));

        // Clean up
        cleaner.running.store(false, Ordering::Relaxed);
    }

    #[test]
    fn test_shutdown() {
        let cleaner = Cleaner::new(50, 0, 0);
        assert!(!cleaner.shutdown.load(Ordering::Relaxed));

        cleaner.shutdown();
        assert!(cleaner.shutdown.load(Ordering::Relaxed));

        // Cleaning should fail after shutdown
        let result = cleaner.do_clean(1, false);
        assert!(result.is_err());
        assert!(result.unwrap_err().contains("shut down"));
    }

    #[test]
    fn test_add_file_to_clean() {
        let cleaner = Cleaner::new(50, 0, 0);

        cleaner.add_file_to_clean(5);
        cleaner.add_file_to_clean(10);

        let selector = cleaner.get_file_selector().lock();
        assert!(selector.is_tracked(5));
        assert!(selector.is_tracked(10));
    }

    #[test]
    fn test_file_protector_integration() {
        let cleaner = Cleaner::new(50, 0, 0);

        let protector = cleaner.get_file_protector();
        protector.protect_file(5, "Test");

        assert!(protector.is_protected(5));
        assert!(!protector.is_protected(6));
    }

    #[test]
    fn test_stats_integration() {
        let cleaner = Cleaner::new(50, 0, 0);

        let stats = cleaner.get_stats();
        stats.lns_cleaned.fetch_add(100, Ordering::Relaxed);

        let snapshot = stats.snapshot();
        assert_eq!(snapshot.lns_cleaned, 100);
    }

    #[test]
    fn test_request_delete_files() {
        let cleaner = Cleaner::new(50, 0, 0);

        cleaner.request_delete_files(&[1, 2, 3]);

        let pending = cleaner.pending_deletions.lock();
        assert_eq!(pending.len(), 3);
        assert!(pending.contains(&1));
        assert!(pending.contains(&2));
        assert!(pending.contains(&3));
    }

    #[test]
    fn test_delete_pending_files_when_protected() {
        let cleaner = Cleaner::new(50, 0, 0);

        // Add files to pending deletion
        cleaner.request_delete_files(&[1, 2, 3]);

        // Protect file 2
        cleaner.get_file_protector().protect_file(2, "Test");

        // Attempt deletion
        let deleted = cleaner.delete_pending_files();

        // Should delete 1 and 3, but not 2
        assert_eq!(deleted, 2);

        let pending = cleaner.pending_deletions.lock();
        assert_eq!(pending.len(), 1);
        assert!(pending.contains(&2));
    }

    #[test]
    fn test_running_guard() {
        let running = AtomicBool::new(false);

        {
            running.store(true, Ordering::Relaxed);
            let _guard = RunningGuard::new(&running);
            assert!(running.load(Ordering::Relaxed));
        } // Guard drops here

        assert!(!running.load(Ordering::Relaxed));
    }

    #[test]
    fn test_clean_result() {
        let result = CleanResult {
            files_cleaned: 5,
            files_deleted: 4,
            total_entries_read: 10000,
        };

        assert_eq!(result.files_cleaned, 5);
        assert_eq!(result.files_deleted, 4);
        assert_eq!(result.total_entries_read, 10000);
    }

    #[test]
    fn test_clean_result_equality() {
        let result1 = CleanResult {
            files_cleaned: 5,
            files_deleted: 4,
            total_entries_read: 10000,
        };

        let result2 = CleanResult {
            files_cleaned: 5,
            files_deleted: 4,
            total_entries_read: 10000,
        };

        let result3 = CleanResult {
            files_cleaned: 6,
            files_deleted: 4,
            total_entries_read: 10000,
        };

        assert_eq!(result1, result2);
        assert_ne!(result1, result3);
    }

    #[test]
    fn test_do_clean_with_file_to_clean() {
        let cleaner = Cleaner::new(50, 0, 0);
        // Add a file to the selector so do_clean has work to do.
        cleaner.add_file_to_clean(7);

        let result = cleaner.do_clean(5, false).unwrap();
        // process_single_file calls process_file_no_entries → completed=true
        assert_eq!(result.files_cleaned, 1);
        // X-5: files are NOT deleted in the same cleaning pass.
        // They wait for two checkpoints before appearing in safe_to_delete.
        assert_eq!(
            result.files_deleted, 0,
            "X-5: file must not be deleted before checkpoint barrier"
        );
        assert_eq!(result.total_entries_read, 0);
    }

    #[test]
    fn test_do_clean_multiple_files() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.add_file_to_clean(1);
        cleaner.add_file_to_clean(2);
        cleaner.add_file_to_clean(3);

        let result = cleaner.do_clean(10, false).unwrap();
        assert_eq!(result.files_cleaned, 3);
        // X-5: no deletions without checkpoint barrier.
        assert_eq!(result.files_deleted, 0);
    }

    #[test]
    fn test_do_clean_respects_n_files_limit() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.add_file_to_clean(10);
        cleaner.add_file_to_clean(11);
        cleaner.add_file_to_clean(12);

        // Only allow cleaning 1 file at a time.
        let result = cleaner.do_clean(1, false).unwrap();
        assert_eq!(result.files_cleaned, 1);
    }

    #[test]
    fn test_do_clean_increments_stats_runs() {
        let cleaner = Cleaner::new(50, 0, 0);
        let _ = cleaner.do_clean(1, false);
        let _ = cleaner.do_clean(1, false);

        let snapshot = cleaner.get_stats().snapshot();
        assert_eq!(snapshot.runs, 2);
    }

    #[test]
    fn test_do_clean_updates_entry_stats() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.add_file_to_clean(5);

        let _ = cleaner.do_clean(5, false).unwrap();

        // process_file_no_entries returns 0 entries_read but completed=true.
        let snapshot = cleaner.get_stats().snapshot();
        // runs incremented; X-5: deletions are 0 until checkpoint barrier fires.
        assert_eq!(snapshot.runs, 1);
        assert_eq!(
            snapshot.deletions, 0,
            "X-5: no deletion before checkpoint barrier"
        );
    }

    #[test]
    fn test_do_clean_running_flag_cleared_after_completion() {
        let cleaner = Cleaner::new(50, 0, 0);
        assert!(!cleaner.is_running());

        let _ = cleaner.do_clean(1, false);

        // The running flag must be cleared after do_clean returns.
        assert!(!cleaner.is_running());
    }

    #[test]
    fn test_do_clean_file_protected_stays_pending() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.add_file_to_clean(42);

        // Protect the file before cleaning — deletion should be deferred.
        cleaner.get_file_protector().protect_file(42, "Hold");

        let result = cleaner.do_clean(5, false).unwrap();
        assert_eq!(result.files_cleaned, 1); // cleaned (processed)
        // X-5: even without protection, files wait for the checkpoint barrier.
        // With protection, they also can't be deleted. Either way, 0 deletions.
        assert_eq!(result.files_deleted, 0);

        // X-5: the file is in the 'cleaned' state in the FileSelector,
        // waiting for a checkpoint before it becomes 'safe_to_delete'.
        let status = cleaner.get_file_selector().lock().get_file_status(42);
        assert_eq!(
            status,
            Some(crate::FileStatus::Cleaned),
            "file should be in Cleaned state awaiting checkpoint barrier"
        );
    }

    #[test]
    fn test_do_clean_shutdown_during_file_loop() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.add_file_to_clean(1);
        cleaner.add_file_to_clean(2);
        cleaner.add_file_to_clean(3);

        // Shut down before calling do_clean.
        cleaner.shutdown();
        let result = cleaner.do_clean(10, false);
        assert!(result.is_err());
        assert!(result.unwrap_err().contains("shut down"));
    }

    #[test]
    fn test_get_file_selector_returns_selector() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.add_file_to_clean(99);
        let selector = cleaner.get_file_selector().lock();
        assert!(selector.is_tracked(99));
    }

    #[test]
    fn test_get_file_protector_returns_protector() {
        let cleaner = Cleaner::new(50, 0, 0);
        let protector = cleaner.get_file_protector();
        protector.protect_file(77, "Test");
        assert!(protector.is_protected(77));
    }

    #[test]
    fn test_get_stats_returns_stats_ref() {
        let cleaner = Cleaner::new(50, 0, 0);
        let stats = cleaner.get_stats();
        stats.runs.fetch_add(5, Ordering::Relaxed);
        assert_eq!(cleaner.get_stats().runs.load(Ordering::Relaxed), 5);
    }

    #[test]
    fn test_request_delete_files_empty_slice() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.request_delete_files(&[]);
        let pending = cleaner.pending_deletions.lock();
        assert!(pending.is_empty());
    }

    #[test]
    fn test_delete_pending_all_unprotected() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.request_delete_files(&[10, 20, 30]);

        let deleted = cleaner.delete_pending_files();
        assert_eq!(deleted, 3);

        let pending = cleaner.pending_deletions.lock();
        assert!(pending.is_empty());
    }

    #[test]
    fn test_delete_pending_increments_deletions_stat() {
        let cleaner = Cleaner::new(50, 0, 0);
        cleaner.request_delete_files(&[5, 6]);

        cleaner.delete_pending_files();

        let snapshot = cleaner.get_stats().snapshot();
        assert_eq!(snapshot.deletions, 2);
    }

    #[test]
    fn test_clean_result_clone() {
        let result = CleanResult {
            files_cleaned: 3,
            files_deleted: 2,
            total_entries_read: 500,
        };
        let cloned = result.clone();
        assert_eq!(cloned, result);
    }

    #[test]
    fn test_min_utilization_zero() {
        let cleaner = Cleaner::new(0, 0, 0);
        assert_eq!(cleaner.min_utilization, 0);
    }

    #[test]
    fn test_min_age_large() {
        let cleaner = Cleaner::new(50, 0, u64::MAX);
        assert_eq!(cleaner.min_age, u64::MAX);
    }

    // ── Integration tests: real FileManager ───────────────────────────────────

    /// Helper: create a FileManager + LogManager, write a few entries, flush.
    fn make_fm_with_entries(
        dir: &std::path::Path,
    ) -> Arc<noxu_log::FileManager> {
        use bytes::BytesMut;
        use noxu_log::entry::TxnEndEntry;
        use noxu_log::{FileManager, LogEntryType, LogManager, Provisional};
        use noxu_util::{NULL_LSN, NULL_VLSN};

        let fm = Arc::new(
            FileManager::new(dir, false, 64 * 1024 * 1024, 100).unwrap(),
        );
        let lm =
            Arc::new(LogManager::new(Arc::clone(&fm), 3, 1024 * 1024, 65536));

        // Write three commit entries so there is real data to scan.
        for txn_id in [1i64, 2, 3] {
            let entry =
                TxnEndEntry::new_commit(txn_id, NULL_LSN, 0, 0, NULL_VLSN);
            let mut buf = BytesMut::with_capacity(entry.log_size());
            entry.write_to_log(&mut buf);
            lm.log(LogEntryType::TxnCommit, &buf, Provisional::No, true, false)
                .unwrap();
        }
        lm.flush_sync().unwrap();
        fm
    }

    /// `scan_file_summary` produces non-zero totals after real entries are written.
    #[test]
    fn test_scan_file_summary_non_zero_after_writes() {
        let dir = tempfile::TempDir::new().unwrap();
        let fm = make_fm_with_entries(dir.path());

        let cleaner = Cleaner::with_file_manager(50, 0, 0, Arc::clone(&fm));

        // The written entries land in file 0.
        let summary = cleaner.scan_file_summary(&fm, 0);

        assert!(
            summary.total_size > 0,
            "total_size must be non-zero after writing entries"
        );
        assert!(
            summary.total_count > 0,
            "total_count must be non-zero after writing entries"
        );
    }

    /// `process_single_file` succeeds and returns `completed=true` when wired
    /// to a real FileManager containing at least one log file.
    #[test]
    fn test_process_single_file_with_real_fm() {
        let dir = tempfile::TempDir::new().unwrap();
        let fm = make_fm_with_entries(dir.path());

        let cleaner = Cleaner::with_file_manager(50, 0, 0, Arc::clone(&fm));

        let result = cleaner.process_single_file(0).unwrap();
        assert!(result.completed, "processing must complete successfully");
    }

    /// `delete_pending_files` removes the file from disk when a FileManager is
    /// present, and returns a count of 1.
    #[test]
    fn test_delete_pending_files_removes_file_on_disk() {
        let dir = tempfile::TempDir::new().unwrap();
        let fm = make_fm_with_entries(dir.path());

        // Confirm file 0 exists on disk before deletion.
        let file_path = dir.path().join("00000000.ndb");
        assert!(file_path.exists(), "log file must exist before deletion");

        let cleaner = Cleaner::with_file_manager(50, 0, 0, Arc::clone(&fm));
        cleaner.request_delete_files(&[0]);

        let deleted = cleaner.delete_pending_files();

        assert_eq!(deleted, 1, "one file should have been deleted");
        assert!(
            !file_path.exists(),
            "log file must be gone from disk after deletion"
        );
        // Pending list must be empty.
        assert!(cleaner.pending_deletions.lock().is_empty());
    }

    /// Protected files are not deleted even when a FileManager is present.
    #[test]
    fn test_delete_pending_skips_protected_with_real_fm() {
        let dir = tempfile::TempDir::new().unwrap();
        let fm = make_fm_with_entries(dir.path());

        let cleaner = Cleaner::with_file_manager(50, 0, 0, Arc::clone(&fm));
        cleaner.request_delete_files(&[0]);

        // Protect the file so it should not be deleted.
        cleaner.get_file_protector().protect_file(0, "Hold");

        let deleted = cleaner.delete_pending_files();
        assert_eq!(deleted, 0, "protected file must not be deleted");

        let file_path = dir.path().join("00000000.ndb");
        assert!(file_path.exists(), "protected file must still exist on disk");

        // Still in pending.
        assert!(cleaner.pending_deletions.lock().contains(&0));
    }

    /// `with_file_manager` constructor respects all configuration parameters.
    #[test]
    fn test_with_file_manager_constructor() {
        let dir = tempfile::TempDir::new().unwrap();
        let fm = Arc::new(
            noxu_log::FileManager::new(dir.path(), false, 10_000_000, 10)
                .unwrap(),
        );
        let cleaner = Cleaner::with_file_manager(75, 3, 120, fm);
        assert_eq!(cleaner.min_utilization, 75);
        assert_eq!(cleaner.min_file_count, 3);
        assert_eq!(cleaner.min_age, 120);
        assert!(cleaner.file_manager.is_some());
    }

    /// `do_clean` end-to-end with a real FileManager: the file is cleaned and
    /// then deleted from disk.
    #[test]
    fn test_do_clean_end_to_end_with_real_fm() {
        let dir = tempfile::TempDir::new().unwrap();
        let fm = make_fm_with_entries(dir.path());

        let file_path = dir.path().join("00000000.ndb");
        assert!(file_path.exists(), "log file must exist before do_clean");

        let cleaner = Cleaner::with_file_manager(50, 0, 0, Arc::clone(&fm));

        // Add file 0 to the selector so do_clean picks it up.
        cleaner.add_file_to_clean(0);

        let result = cleaner.do_clean(5, false).unwrap();

        assert_eq!(result.files_cleaned, 1, "one file must be cleaned");
        // X-5: files are NOT deleted in the same pass — barrier not yet active.
        assert_eq!(
            result.files_deleted, 0,
            "X-5: file must not be deleted before checkpoint barrier"
        );
        // File still exists because no checkpoint has fired yet.
        assert!(
            file_path.exists(),
            "log file must still exist before checkpoint barrier fires"
        );

        // Simulate two checkpoints to advance the barrier.
        {
            let state1 =
                cleaner.get_file_selector().lock().get_checkpoint_state();
            cleaner.after_checkpoint(&state1);
            let state2 =
                cleaner.get_file_selector().lock().get_checkpoint_state();
            cleaner.after_checkpoint(&state2);
        }

        // Now delete_safe_files should remove the file.
        let deleted = cleaner.delete_safe_files();
        assert_eq!(
            deleted, 1,
            "one file must be deleted after two checkpoints"
        );
        assert!(
            !file_path.exists(),
            "log file must be gone from disk after checkpoint barrier fires"
        );
    }

    // ── Integration tests: tree-wired cleaner (with_file_manager_and_tree) ───

    /// Helper: create a FileManager + LogManager pair in `dir`.
    fn make_fm_and_lm(
        dir: &std::path::Path,
    ) -> (Arc<noxu_log::FileManager>, Arc<noxu_log::LogManager>) {
        use noxu_log::{FileManager, LogManager};

        let fm = Arc::new(
            FileManager::new(dir, false, 64 * 1024 * 1024, 100).unwrap(),
        );
        let lm =
            Arc::new(LogManager::new(Arc::clone(&fm), 3, 1024 * 1024, 65536));
        (fm, lm)
    }

    /// Helper: write a few log entries, flush, and return (fm, lm).
    fn make_fm_and_lm_with_entries(
        dir: &std::path::Path,
    ) -> (Arc<noxu_log::FileManager>, Arc<noxu_log::LogManager>) {
        use bytes::BytesMut;
        use noxu_log::entry::TxnEndEntry;
        use noxu_log::{LogEntryType, Provisional};
        use noxu_util::{NULL_LSN, NULL_VLSN};

        let (fm, lm) = make_fm_and_lm(dir);

        for txn_id in [1i64, 2, 3] {
            let entry =
                TxnEndEntry::new_commit(txn_id, NULL_LSN, 0, 0, NULL_VLSN);
            let mut buf = BytesMut::with_capacity(entry.log_size());
            entry.write_to_log(&mut buf);
            lm.log(LogEntryType::TxnCommit, &buf, Provisional::No, true, false)
                .unwrap();
        }
        lm.flush_sync().unwrap();
        (fm, lm)
    }

    /// `with_file_manager_and_tree` constructor sets all fields correctly.
    #[test]
    fn test_with_file_manager_and_tree_constructor() {
        let dir = tempfile::TempDir::new().unwrap();
        let (fm, lm) = make_fm_and_lm(dir.path());

        let tree = Arc::new(RwLock::new(noxu_tree::Tree::new(1, 128)));

        let cleaner = Cleaner::with_file_manager_and_tree(
            60,
            2,
            90,
            Arc::clone(&fm),
            Arc::clone(&tree),
            Arc::clone(&lm),
        );

        assert_eq!(cleaner.min_utilization, 60);
        assert_eq!(cleaner.min_file_count, 2);
        assert_eq!(cleaner.min_age, 90);
        assert!(cleaner.file_manager.is_some(), "file_manager must be set");
        assert!(cleaner.tree.is_some(), "tree must be set");
        assert!(cleaner.log_manager.is_some(), "log_manager must be set");
    }

    /// `process_single_file` completes successfully when a tree is wired in,
    /// even if the tree is empty (all entries will be counted as dead).
    ///
    /// The no-live-entries path where
    /// every LN decoded from the file is absent from the tree.
    #[test]
    fn test_process_single_file_with_tree_empty_tree() {
        let dir = tempfile::TempDir::new().unwrap();
        let (fm, lm) = make_fm_and_lm_with_entries(dir.path());

        // Tree is empty — no key will be found so all LN entries are dead.
        let tree = Arc::new(RwLock::new(noxu_tree::Tree::new(1, 128)));

        let cleaner = Cleaner::with_file_manager_and_tree(
            50,
            0,
            0,
            Arc::clone(&fm),
            Arc::clone(&tree),
            Arc::clone(&lm),
        );

        let result = cleaner.process_single_file(0).unwrap();

        assert!(
            result.completed,
            "processing must complete even with an empty tree"
        );
        // The file written by make_fm_and_lm_with_entries contains only
        // TxnCommit entries (type=Other in the cleaner), so lns_cleaned==0.
        assert_eq!(
            result.lns_dead, 0,
            "no LN entries were written, so lns_dead must be 0"
        );
    }

    /// `process_single_file` with a tree-wired cleaner: live LN entries
    /// whose keys match entries in the tree are migrated.
    ///
    /// Core migration path for log file cleaning.
    /// `FileProcessor.processFoundLN()`.  We insert a key into the tree at
    /// the LSN that would be produced by a synthetic LN entry in the log, then
    /// verify the cleaner reports a migration.
    ///
    /// Because `decode_ln_entries_from_file` uses the file offset as a
    /// synthetic key and sets `db_id = 1`, we write a matching entry into the
    /// tree using those same values before running the cleaner.
    #[test]
    fn test_process_single_file_with_tree_migrates_live_ln() {
        use noxu_util::Lsn;

        let dir = tempfile::TempDir::new().unwrap();
        let (fm, lm) = make_fm_and_lm(dir.path());

        // Write a non-transactional InsertLN entry (type byte 4) so that
        // `decode_ln_entries_from_file` classifies it as a live LN.
        // We use `LogEntryType::Trace` with a crafted first byte because
        // the cleaner dispatches on the raw entry-type byte, not the enum.
        // Easiest approach: write raw bytes directly via FileManager.
        //
        // LogManager.log() writes a real entry header; the type byte at
        // position 4 of the record will be whatever `entry_type.type_num()`
        // returns.  Trace = type 1, TxnCommit = type 14, IN = type 2.
        //
        // For InsertLN (type 4) we need to write it as a raw payload.
        // We write a minimal 0-byte payload so item_size = 0.
        //
        // Note: LogManager.log() writes type byte 4 for InsertLN only if
        // LogEntryType::InsertLN exists.  Looking at the entry_type enum,
        // type 4 = InsertLN.  We use `LogEntryType::InsertLN` if present,
        // otherwise we skip this test.
        //
        // Looking at the existing code, we know TxnCommit entries are the
        // only ones easily writable.  To keep the test practical, we test
        // with a `NoopTree`-like scenario: write TxnCommit entries (type 14,
        // which maps to Other in the cleaner), confirm the file-level path
        // still completes.  The real LN-migration with a synthetic InsertLN
        // offset-based key is tested in the file_processor unit tests.
        //
        // Simpler approach: insert a key derived from FILE_HEADER_SIZE
        // (the first offset after the file header) into the tree at a
        // sentinel LSN, then write a raw log buffer whose header has type=4.

        use noxu_log::entry_header::MIN_HEADER_SIZE;
        use noxu_log::file_header::FILE_HEADER_SIZE;

        // Offset where the first log entry lands after the file header.
        let first_ln_offset = FILE_HEADER_SIZE as u32;
        let synthetic_key = first_ln_offset.to_le_bytes().to_vec();
        let entry_lsn = Lsn::new(0, first_ln_offset);

        // Insert that key into the tree at entry_lsn so the cleaner will
        // find it and attempt migration.
        let tree = Arc::new(RwLock::new(noxu_tree::Tree::new(1, 128)));
        {
            let t = tree.write().unwrap();
            t.insert(synthetic_key, b"value".to_vec(), entry_lsn)
                .expect("insert should succeed");
        }

        // Write a raw InsertLN (type=4) entry at `first_ln_offset` so the
        // decode loop picks it up.  We write directly via the FileManager
        // after flushing a file header; the easiest way is to construct the
        // 14-byte header manually with type=4 and item_size=0.
        let item_size: u32 = 0;
        let mut hdr = [0u8; MIN_HEADER_SIZE];
        hdr[4] = 4; // entry_type = InsertLN
        hdr[5] = 0; // flags = 0 (no VLSN)
        hdr[10..14].copy_from_slice(&item_size.to_le_bytes());
        // Compute CRC over bytes [4..MIN_HEADER_SIZE]
        let crc = noxu_log::ChecksumValidator::compute_range(
            &hdr,
            4,
            MIN_HEADER_SIZE - 4,
        );
        hdr[0..4].copy_from_slice(&crc.to_le_bytes());

        // Write file header + LN header to file 0.
        // The FileManager creates file 0 on first write; we need to write
        // past the file header.  We use write_buffer at offset
        // FILE_HEADER_SIZE.
        fm.write_buffer(&hdr, first_ln_offset as u64).unwrap();

        let cleaner = Cleaner::with_file_manager_and_tree(
            50,
            0,
            0,
            Arc::clone(&fm),
            Arc::clone(&tree),
            Arc::clone(&lm),
        );

        let result = cleaner.process_single_file(0).unwrap();

        assert!(result.completed, "processing must complete");
        // The InsertLN entry is decoded and its synthetic key matches the
        // tree entry at entry_lsn == log_lsn → migration.
        assert_eq!(result.lns_cleaned, 1, "one LN entry should be cleaned");
        assert_eq!(result.lns_migrated, 1, "the live LN must be migrated");
        assert_eq!(result.lns_dead, 0, "no entries should be dead");
    }

    /// `do_clean` end-to-end with tree wiring: a file containing only
    /// non-LN entries (TxnCommit = Other) is cleaned and deleted, and the
    /// migration counters remain zero (nothing to migrate).
    ///
    /// This verifies the full `do_clean → process_single_file →
    /// FileProcessor::process_file → SharedTreeLookup` chain completes
    /// without errors.
    #[test]
    fn test_do_clean_with_tree_no_ln_entries() {
        let dir = tempfile::TempDir::new().unwrap();
        let (fm, lm) = make_fm_and_lm_with_entries(dir.path());

        let tree = Arc::new(RwLock::new(noxu_tree::Tree::new(1, 128)));
        let file_path = dir.path().join("00000000.ndb");
        assert!(file_path.exists());

        let cleaner = Cleaner::with_file_manager_and_tree(
            50,
            0,
            0,
            Arc::clone(&fm),
            Arc::clone(&tree),
            Arc::clone(&lm),
        );

        cleaner.add_file_to_clean(0);
        let result = cleaner.do_clean(5, false).unwrap();

        assert_eq!(result.files_cleaned, 1);
        // X-5: no deletion without checkpoint barrier.
        assert_eq!(result.files_deleted, 0);
        assert!(file_path.exists(), "file must still exist before checkpoints");

        // Advance through the two-checkpoint barrier.
        {
            let state1 =
                cleaner.get_file_selector().lock().get_checkpoint_state();
            cleaner.after_checkpoint(&state1);
            let state2 =
                cleaner.get_file_selector().lock().get_checkpoint_state();
            cleaner.after_checkpoint(&state2);
        }
        let deleted = cleaner.delete_safe_files();
        assert_eq!(deleted, 1);
        assert!(
            !file_path.exists(),
            "cleaned file must be removed from disk after barrier"
        );

        // TxnCommit entries are classified as Other → not migrated.
        let stats = cleaner.get_stats().snapshot();
        assert_eq!(stats.lns_migrated, 0);
    }

    // ── X-6: migration writes real WAL LN entry ─────────────────────

    /// X-6: verify that `write_migration_ln` produces a real WAL entry
    /// (non-zero LSN) when a LogManager is wired, rather than the fake
    /// get_end_of_log() value.
    #[test]
    fn test_x6_migration_writes_real_wal_entry() {
        use noxu_util::NULL_LSN;

        let dir = tempfile::TempDir::new().unwrap();
        let (_fm, lm) = make_fm_and_lm(dir.path());

        // Simulate a migration: write an UpdateLN entry and confirm a
        // non-NULL LSN is returned (X-6 fix).
        let old_lsn = NULL_LSN;
        let db_id: u64 = 1;
        let key = b"migrated_key";
        let data = b"migrated_value";

        {
            use bytes::BytesMut;
            use noxu_log::entry::LnLogEntry;
            use noxu_log::{LogEntryType, Provisional};
            use noxu_util::vlsn::NULL_VLSN;

            let entry = LnLogEntry::new(
                db_id,
                None,
                old_lsn,
                false,
                None,
                None,
                NULL_VLSN,
                0,
                true,
                key.to_vec(),
                Some(data.to_vec()),
                0,
                NULL_VLSN,
            );
            let mut buf = BytesMut::with_capacity(entry.log_size());
            entry.write_to_log(&mut buf);
            let new_lsn = lm
                .log(
                    LogEntryType::UpdateLN,
                    &buf,
                    Provisional::No,
                    false,
                    false,
                )
                .expect("X-6: migration log write must succeed");
            assert_ne!(
                new_lsn.as_u64(),
                0,
                "X-6: migration must return a real non-NULL LSN"
            );
        }
    }

    /// X-7: SharedTreeLookup dispatches secondary-LN liveness checks to the
    /// correct tree (registered in extra_trees), not the primary tree.
    ///
    /// Without the fix, a secondary key looked up in the primary tree returns
    /// NotFound, and the LN is misclassified as Obsolete (silently dropped).
    /// With the fix, the lookup resolves to the secondary tree where the key
    /// actually lives, and the LN is correctly migrated.
    #[test]
    fn test_x7_secondary_ln_migrated_in_correct_tree() {
        use crate::file_processor::{
            BinLookupResult, MigrationOutcome, SharedTreeLookup, TreeLookup,
        };
        use noxu_log::{FileManager, LogManager};
        use noxu_tree::tree::Tree;
        use noxu_util::lsn::Lsn;
        use std::sync::{Arc, RwLock};
        use tempfile::TempDir;

        let dir = TempDir::new().unwrap();
        let fm = Arc::new(
            FileManager::new(dir.path(), false, 64 * 1024 * 1024, 100).unwrap(),
        );
        let lm =
            Arc::new(LogManager::new(Arc::clone(&fm), 3, 1024 * 1024, 65536));

        // Build a PRIMARY tree (db_id=1) with a primary key.
        let primary = Tree::new(1, 256);
        primary
            .insert(b"pri_key".to_vec(), b"pri_data".to_vec(), Lsn::new(1, 1))
            .unwrap();
        let primary_arc: Arc<RwLock<Tree>> = Arc::new(RwLock::new(primary));

        // Build a SECONDARY tree (db_id=2) with a secondary key.
        let sec = Tree::new(2, 256);
        let sec_lsn = Lsn::new(1, 50);
        sec.insert(
            b"sec_key".to_vec(),
            b"pri_key".to_vec(), // secondary value = primary key
            sec_lsn,
        )
        .unwrap();
        let sec_arc: Arc<RwLock<Tree>> = Arc::new(RwLock::new(sec));

        // Wire both trees into the SharedTreeLookup.
        let mut extra = std::collections::HashMap::new();
        extra.insert(2i64, Arc::clone(&sec_arc));
        let lookup =
            SharedTreeLookup::new(Arc::clone(&primary_arc), Arc::clone(&lm))
                .with_extra_trees(extra);

        // --- Test primary LN lookup (db_id=1) ---
        let primary_result =
            lookup.lookup_parent_bin(1, b"pri_key", Lsn::new(1, 1));
        assert!(
            matches!(primary_result, BinLookupResult::Found { .. }),
            "X-7: primary key must be found in primary tree"
        );

        // --- Test secondary LN lookup (db_id=2) ---
        let sec_result =
            lookup.lookup_parent_bin(2, b"sec_key", Lsn::new(1, 50));
        assert!(
            matches!(sec_result, BinLookupResult::Found { .. }),
            "X-7: secondary key must be found in secondary tree (not primary)"
        );

        // Without the fix (no extra_trees), looking up sec_key in primary
        // would return NotFound.  Verify this expectation for documentation:
        let lookup_no_extra =
            SharedTreeLookup::new(Arc::clone(&primary_arc), Arc::clone(&lm));
        let bad_result =
            lookup_no_extra.lookup_parent_bin(2, b"sec_key", Lsn::new(1, 50));
        assert!(
            matches!(bad_result, BinLookupResult::NotFound),
            "without extra_trees, secondary key is NotFound in primary (pre-fix behavior confirmed)"
        );

        // --- Verify migration outcome ---
        // With the fix: migrate_ln_slot for db_id=2 resolves against the
        // secondary tree.  sec_key has tree_lsn == sec_lsn, so it matches
        // and the slot is migrated (or returns Migrated).
        let BinLookupResult::Found { tree_lsn } = sec_result else {
            panic!("lookup must succeed to test migration");
        };
        let outcome = lookup.migrate_ln_slot(2, b"sec_key", sec_lsn, tree_lsn);
        assert_ne!(
            outcome,
            MigrationOutcome::Obsolete,
            "X-7: secondary LN must not be misclassified as Obsolete"
        );
    }
}