tests.rs 72.1 KB
Newer Older
1
2
3
4
5
6
7
8
9
10
11
12
// SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

use std::sync::Arc;
use std::time::{Duration, Instant};

use rstest::rstest;
use rstest_reuse::{self, *};
use tokio::time;
use tokio_util::sync::CancellationToken;

use super::concurrent_radix_tree::ConcurrentRadixTree;
13
use super::concurrent_radix_tree_compressed::ConcurrentRadixTreeCompressed;
14
15
16
use super::positional::PositionalIndexer;
use super::*;
use crate::protocols::*;
17
use crate::test_utils::{remove_event, router_event, stored_blocks_with_sequence_hashes};
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

// ============================================================================
// Helper functions
// ============================================================================

/// Create a store event with proper sequence hashes computed from local hashes.
fn make_store_event(worker_id: u64, local_hashes: &[u64]) -> RouterEvent {
    make_store_event_with_dp_rank(worker_id, local_hashes, 0)
}

/// Create a store event with a specific dp_rank.
fn make_store_event_with_dp_rank(
    worker_id: u64,
    local_hashes: &[u64],
    dp_rank: u32,
) -> RouterEvent {
    make_store_event_full(worker_id, local_hashes, dp_rank, None)
}

/// Create a store event with parent hash for continuation sequences.
/// `prefix_hashes` are the hashes of the prefix (to compute parent_hash).
/// `local_hashes` are the new blocks being stored.
fn make_store_event_with_parent(
    worker_id: u64,
    prefix_hashes: &[u64],
    local_hashes: &[u64],
) -> RouterEvent {
    // Compute the parent hash from the prefix
    let prefix_block_hashes: Vec<LocalBlockHash> =
        prefix_hashes.iter().map(|&h| LocalBlockHash(h)).collect();
    let prefix_seq_hashes = compute_seq_hash_for_block(&prefix_block_hashes);
    let parent_hash = prefix_seq_hashes
        .last()
        .map(|&h| ExternalSequenceBlockHash(h));

    // Compute the full sequence including prefix for proper seq_hash calculation
    let full_hashes: Vec<u64> = prefix_hashes
        .iter()
        .chain(local_hashes.iter())
        .copied()
        .collect();
    let full_block_hashes: Vec<LocalBlockHash> =
        full_hashes.iter().map(|&h| LocalBlockHash(h)).collect();
    let full_seq_hashes = compute_seq_hash_for_block(&full_block_hashes);

    // Only include the new blocks (skip prefix)
    let new_block_hashes: Vec<LocalBlockHash> =
        local_hashes.iter().map(|&h| LocalBlockHash(h)).collect();
    let new_seq_hashes = &full_seq_hashes[prefix_hashes.len()..];

68
    router_event(
69
        worker_id,
70
71
72
73
74
75
76
        0,
        0,
        KvCacheEventData::Stored(KvCacheStoreData {
            parent_hash,
            blocks: stored_blocks_with_sequence_hashes(&new_block_hashes, new_seq_hashes),
        }),
    )
77
78
79
80
81
82
83
84
85
86
87
88
89
}

/// Create a store event with all options.
fn make_store_event_full(
    worker_id: u64,
    local_hashes: &[u64],
    dp_rank: u32,
    parent_hash: Option<ExternalSequenceBlockHash>,
) -> RouterEvent {
    let local_block_hashes: Vec<LocalBlockHash> =
        local_hashes.iter().map(|&h| LocalBlockHash(h)).collect();
    let seq_hashes = compute_seq_hash_for_block(&local_block_hashes);

90
    router_event(
91
        worker_id,
92
93
94
95
96
97
98
        0,
        dp_rank,
        KvCacheEventData::Stored(KvCacheStoreData {
            parent_hash,
            blocks: stored_blocks_with_sequence_hashes(&local_block_hashes, &seq_hashes),
        }),
    )
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
}

/// Create a remove event for blocks with given local hashes.
fn make_remove_event(worker_id: u64, local_hashes: &[u64]) -> RouterEvent {
    make_remove_event_with_dp_rank(worker_id, local_hashes, 0)
}

/// Create a remove event with a specific dp_rank.
fn make_remove_event_with_dp_rank(
    worker_id: u64,
    local_hashes: &[u64],
    dp_rank: u32,
) -> RouterEvent {
    let local_block_hashes: Vec<LocalBlockHash> =
        local_hashes.iter().map(|&h| LocalBlockHash(h)).collect();
    let seq_hashes = compute_seq_hash_for_block(&local_block_hashes);

116
    remove_event(
117
        worker_id,
118
119
120
121
122
123
124
        0,
        dp_rank,
        seq_hashes
            .iter()
            .map(|&h| ExternalSequenceBlockHash(h))
            .collect(),
    )
125
126
}

127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
/// Create a remove event with parent hash for continuation sequences.
/// `prefix_hashes` are the hashes of the prefix (to compute parent_hash and full seq context).
/// `local_hashes` are the blocks being removed.
fn make_remove_event_with_parent(
    worker_id: u64,
    prefix_hashes: &[u64],
    local_hashes: &[u64],
) -> RouterEvent {
    let full_hashes: Vec<u64> = prefix_hashes
        .iter()
        .chain(local_hashes.iter())
        .copied()
        .collect();
    let full_block_hashes: Vec<LocalBlockHash> =
        full_hashes.iter().map(|&h| LocalBlockHash(h)).collect();
    let full_seq_hashes = compute_seq_hash_for_block(&full_block_hashes);

    let suffix_seq_hashes = &full_seq_hashes[prefix_hashes.len()..];

146
    remove_event(
147
        worker_id,
148
149
150
151
152
153
154
        0,
        0,
        suffix_seq_hashes
            .iter()
            .map(|&h| ExternalSequenceBlockHash(h))
            .collect(),
    )
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
}

/// Snapshot the tree state for deterministic comparison.
/// Dumps all events, zeros out `event_id`, and sorts by `(worker_id, dp_rank, block_hash)`.
async fn snapshot_tree(index: &dyn KvIndexerInterface) -> Vec<RouterEvent> {
    let mut events = index.dump_events().await.unwrap();
    for ev in &mut events {
        ev.event.event_id = 0;
    }
    events.sort_by(|a, b| {
        a.worker_id.cmp(&b.worker_id).then_with(|| {
            a.event.dp_rank.cmp(&b.event.dp_rank).then_with(|| {
                let hash_a = match &a.event.data {
                    KvCacheEventData::Stored(s) => {
                        s.blocks.first().map(|b| b.block_hash.0).unwrap_or(0)
                    }
                    KvCacheEventData::Removed(r) => {
                        r.block_hashes.first().map(|h| h.0).unwrap_or(0)
                    }
                    KvCacheEventData::Cleared => 0,
                };
                let hash_b = match &b.event.data {
                    KvCacheEventData::Stored(s) => {
                        s.blocks.first().map(|b| b.block_hash.0).unwrap_or(0)
                    }
                    KvCacheEventData::Removed(r) => {
                        r.block_hashes.first().map(|h| h.0).unwrap_or(0)
                    }
                    KvCacheEventData::Cleared => 0,
                };
                hash_a.cmp(&hash_b)
            })
        })
    });
    events
}

192
193
194
195
196
197
198
/// Create a clear event for a worker.
fn make_clear_event(worker_id: u64) -> RouterEvent {
    make_clear_event_with_dp_rank(worker_id, 0)
}

/// Create a clear event with a specific dp_rank.
fn make_clear_event_with_dp_rank(worker_id: u64, dp_rank: u32) -> RouterEvent {
199
    router_event(worker_id, 0, dp_rank, KvCacheEventData::Cleared)
200
201
202
203
204
205
206
207
}

// ============================================================================
// KvIndexerInterface tests - parametrized over all implementations
// ============================================================================

#[template]
#[rstest]
208
209
210
211
fn indexer_template(
    #[values("single", "sharded", "flat", "concurrent", "concurrent_compressed")] variant: &str,
) {
}
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230

fn make_indexer(variant: &str) -> Box<dyn KvIndexerInterface> {
    let token = CancellationToken::new();
    let metrics = Arc::new(KvIndexerMetrics::new_unregistered());
    let kv_block_size = 32;

    match variant {
        "single" => Box::new(KvIndexer::new(token, kv_block_size, metrics)),
        "sharded" => Box::new(KvIndexerSharded::new(token, 4, kv_block_size, metrics)),
        "flat" => Box::new(ThreadPoolIndexer::new(
            PositionalIndexer::new(32),
            4,
            kv_block_size,
        )),
        "concurrent" => Box::new(ThreadPoolIndexer::new(
            ConcurrentRadixTree::new(),
            4,
            kv_block_size,
        )),
231
232
233
234
235
        "concurrent_compressed" => Box::new(ThreadPoolIndexer::new(
            ConcurrentRadixTreeCompressed::new(),
            4,
            kv_block_size,
        )),
236
237
238
239
        _ => panic!("Unknown variant: {}", variant),
    }
}

240
241
242
243
244
245
246
247
/// Ensure queued indexer work is drained, then give a short settle window.
/// This is intentionally conservative for tests that assert immediately
/// after asynchronous event ingestion.
async fn flush_and_settle(index: &dyn KvIndexerInterface) {
    index.flush().await;
    tokio::time::sleep(Duration::from_millis(100)).await;
}

248
249
250
251
252
253
254
255
#[tokio::test]
#[apply(indexer_template)]
async fn test_store_and_find(variant: &str) {
    let index = make_indexer(variant);

    // Store a sequence for worker 0
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

256
    flush_and_settle(index.as_ref()).await;
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278

    // Find matches using local hashes
    let scores = index
        .find_matches(vec![
            LocalBlockHash(1),
            LocalBlockHash(2),
            LocalBlockHash(3),
        ])
        .await
        .unwrap();
    assert_eq!(scores.scores.len(), 1);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_partial_match(variant: &str) {
    let index = make_indexer(variant);

    // Store [1, 2, 3] for worker 0
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

279
    flush_and_settle(index.as_ref()).await;
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303

    // Find matches for [1, 2, 999] - should match first 2 then stop
    let scores = index
        .find_matches(vec![
            LocalBlockHash(1),
            LocalBlockHash(2),
            LocalBlockHash(999),
        ])
        .await
        .unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 2);
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_remove(variant: &str) {
    let index = make_indexer(variant);

    // Store sequence for worker 0
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

    // Remove all blocks
    index.apply_event(make_remove_event(0, &[1, 2, 3])).await;

304
    flush_and_settle(index.as_ref()).await;
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328

    // Find should return nothing
    let scores = index
        .find_matches(vec![
            LocalBlockHash(1),
            LocalBlockHash(2),
            LocalBlockHash(3),
        ])
        .await
        .unwrap();
    assert!(scores.scores.is_empty());
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_multiple_workers_shared_prefix(variant: &str) {
    let index = make_indexer(variant);

    // Worker 0 has [1, 2], Worker 1 has [1, 3]
    // Since sequence hashes are cumulative, [1] has same hash for both,
    // but [1, 2] and [1, 3] have different hashes.
    index.apply_event(make_store_event(0, &[1, 2])).await;
    index.apply_event(make_store_event(1, &[1, 3])).await;

329
    flush_and_settle(index.as_ref()).await;
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

    // Query [1] - both workers should match
    let scores = index.find_matches(vec![LocalBlockHash(1)]).await.unwrap();
    assert_eq!(scores.scores.len(), 2);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 1);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(), 1);

    // Query [1, 2] - worker 0 matches both, worker 1 matches only first block
    let scores = index
        .find_matches(vec![LocalBlockHash(1), LocalBlockHash(2)])
        .await
        .unwrap();
    assert_eq!(scores.scores.len(), 2);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 2);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(), 1);
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_remove_worker(variant: &str) {
    let index = make_indexer(variant);

    index.apply_event(make_store_event(0, &[1, 2, 3])).await;
    index.apply_event(make_store_event(1, &[1, 2, 3])).await;

    // Allow time for async event processing
356
    flush_and_settle(index.as_ref()).await;
357
358
359
360

    index.remove_worker(0).await;

    // Allow time for async remove_worker processing
361
    flush_and_settle(index.as_ref()).await;
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

    let scores = index
        .find_matches(vec![
            LocalBlockHash(1),
            LocalBlockHash(2),
            LocalBlockHash(3),
        ])
        .await
        .unwrap();
    assert_eq!(scores.scores.len(), 1);
    assert!(scores.scores.contains_key(&WorkerWithDpRank::new(1, 0)));
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_large_stores(variant: &str) {
    let index = make_indexer(variant);

    // Test sequences of increasing sizes
    for i in 0..10u64 {
        let len = 1 << i; // 1, 2, 4, 8, ..., 512
        let worker_id = i;
        let sequence: Vec<u64> = (1..=len).map(|x| x + (i * 10000)).collect();
        index
            .apply_event(make_store_event(worker_id, &sequence))
            .await;
    }

390
    flush_and_settle(index.as_ref()).await;
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409

    // Verify we can find matches for the last stored sequence
    let last_seq: Vec<LocalBlockHash> = (1..=512u64)
        .map(|x| LocalBlockHash(x + (9 * 10000)))
        .collect();
    let scores = index.find_matches(last_seq).await.unwrap();
    assert!(!scores.scores.is_empty());
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_dump_and_restore(variant: &str) {
    let index = make_indexer(variant);

    // Store some data
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;
    index.apply_event(make_store_event(1, &[1, 2, 4])).await;

    // Allow background worker threads to process events.
410
    flush_and_settle(index.as_ref()).await;
411

412
    // Dump the tree as events and replay into a new index
413
414
415
416
417
418
419
420
    let events = index.dump_events().await.unwrap();
    assert!(!events.is_empty());

    let restored = make_indexer(variant);
    for event in events {
        restored.apply_event(event).await;
    }

421
    flush_and_settle(restored.as_ref()).await;
422

423
424
425
426
    assert_eq!(
        snapshot_tree(index.as_ref()).await,
        snapshot_tree(restored.as_ref()).await
    );
427
428
429
430
431
432
433
434
435
436
437
438
439
440
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_clear_all_blocks(variant: &str) {
    let index = make_indexer(variant);

    // Store some data for two workers
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;
    index.apply_event(make_store_event(1, &[1, 2, 3])).await;

    // Clear worker 0's blocks using the Cleared event
    index.apply_event(make_clear_event(0)).await;

441
    flush_and_settle(index.as_ref()).await;
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462

    // Worker 0's blocks should be gone, worker 1's remain
    let scores = index
        .find_matches(vec![
            LocalBlockHash(1),
            LocalBlockHash(2),
            LocalBlockHash(3),
        ])
        .await
        .unwrap();
    assert_eq!(scores.scores.len(), 1);
    assert!(scores.scores.contains_key(&WorkerWithDpRank::new(1, 0)));
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_empty_query(variant: &str) {
    let index = make_indexer(variant);

    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

463
    flush_and_settle(index.as_ref()).await;
464
465
466
467
468
469
470
471
472
473
474
475
476

    // Empty query should return empty scores
    let scores = index.find_matches(vec![]).await.unwrap();
    assert!(scores.scores.is_empty());
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_miss_query(variant: &str) {
    let index = make_indexer(variant);

    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

477
    flush_and_settle(index.as_ref()).await;
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498

    // Query for non-existent blocks
    let scores = index
        .find_matches(vec![LocalBlockHash(999), LocalBlockHash(998)])
        .await
        .unwrap();
    assert!(scores.scores.is_empty());
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_shutdown(variant: &str) {
    let index = make_indexer(variant);
    index.shutdown();
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_shutdown_idempotent(variant: &str) {
    let index = make_indexer(variant);
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;
499
    flush_and_settle(index.as_ref()).await;
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
    index.shutdown();
    index.shutdown();
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_find_matches_for_request(variant: &str) {
    let index = make_indexer(variant);

    // Empty index should return no matches
    let tokens = vec![1, 2, 3, 4];
    let scores = index.find_matches_for_request(&tokens, None).await.unwrap();
    assert!(scores.scores.is_empty());

    // Store some data and verify we can find it via tokens
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

    // Allow time for async processing
518
    flush_and_settle(index.as_ref()).await;
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

    // Note: find_matches_for_request computes block hashes from tokens,
    // so we need tokens that hash to the same LocalBlockHash values.
    // For this test, we just verify the method works without error.
    let scores = index.find_matches_for_request(&tokens, None).await.unwrap();
    // The tokens [1,2,3,4] won't match our stored [1,2,3] local hashes
    // because find_matches_for_request computes different hashes from raw tokens
    assert!(scores.scores.is_empty() || !scores.scores.is_empty());
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_process_routing_decision(variant: &str) {
    let index = make_indexer(variant);

    // Create tokens with hashes
    let tokens = vec![1u32, 2, 3, 4, 5, 6, 7, 8];
    let mut tokens_with_hashes = TokensWithHashes::new(tokens, 32);

    let worker = WorkerWithDpRank::new(0, 0);

    // Process routing decision - should not error
    let result = index
        .process_routing_decision_for_request(&mut tokens_with_hashes, worker)
        .await;
    assert!(result.is_ok());
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_parent_hash_chains(variant: &str) {
    let index = make_indexer(variant);

    // Store initial sequence [1, 2, 3]
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

    // Store continuation [4, 5] with parent pointing to block 3
    index
        .apply_event(make_store_event_with_parent(0, &[1, 2, 3], &[4, 5]))
        .await;

560
    flush_and_settle(index.as_ref()).await;
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

    // Query for full sequence [1, 2, 3, 4, 5] should match all 5 blocks
    let full_seq: Vec<LocalBlockHash> = (1..=5).map(LocalBlockHash).collect();
    let scores = index.find_matches(full_seq).await.unwrap();
    assert_eq!(scores.scores.len(), 1);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 5);

    // Query for just [1, 2, 3] should match 3 blocks
    let prefix_seq: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let scores = index.find_matches(prefix_seq).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_multiple_dp_ranks(variant: &str) {
    let index = make_indexer(variant);

    // Same worker_id but different dp_ranks should be tracked separately
    index
        .apply_event(make_store_event_with_dp_rank(0, &[1, 2, 3], 0))
        .await;
    index
        .apply_event(make_store_event_with_dp_rank(0, &[1, 2, 3], 1))
        .await;
    index
        .apply_event(make_store_event_with_dp_rank(0, &[1, 2, 3], 2))
        .await;

590
    flush_and_settle(index.as_ref()).await;
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609

    // Query should return all 3 dp_ranks as separate entries
    let seq: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq).await.unwrap();

    assert_eq!(scores.scores.len(), 3);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 1)).unwrap(), 3);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 2)).unwrap(), 3);
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_partial_block_removal(variant: &str) {
    let index = make_indexer(variant);

    // Store [1, 2, 3]
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

610
    flush_and_settle(index.as_ref()).await;
611
612
613
614
615
616
617
618
619
620
621
622
623

    // Verify all 3 blocks match
    let seq: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq.clone()).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);

    // Remove only the last block (block 3)
    // To do this correctly, we need to compute the seq_hash for block 3 specifically,
    // which requires the full sequence context [1,2,3].
    let full_hashes: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let seq_hashes = compute_seq_hash_for_block(&full_hashes);
    let block_3_seq_hash = ExternalSequenceBlockHash(seq_hashes[2]); // Last block's hash

624
    let remove_event = remove_event(0, 0, 0, vec![block_3_seq_hash]);
625
626
    index.apply_event(remove_event).await;

627
    flush_and_settle(index.as_ref()).await;
628
629
630
631
632
633
634
635
636
637
638

    // Query [1, 2, 3] - should only match 2 blocks now (block 3 is removed)
    let scores = index.find_matches(seq).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 2);

    // Query [1, 2] - should still match 2 blocks
    let partial_seq: Vec<LocalBlockHash> = (1..=2).map(LocalBlockHash).collect();
    let scores = index.find_matches(partial_seq).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 2);
}

639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
#[tokio::test]
#[apply(indexer_template)]
async fn test_remove_mid_chain_block(variant: &str) {
    // TODO: positional indexer has no parent-child structure, so mid-chain removal
    // doesn't invalidate later positions — jump search skips over the gap and over-counts.
    if variant == "flat" {
        return;
    }

    let index = make_indexer(variant);

    // Store [1, 2, 3, 4, 5]
    index
        .apply_event(make_store_event(0, &[1, 2, 3, 4, 5]))
        .await;

655
    flush_and_settle(index.as_ref()).await;
656
657
658
659
660
661
662
663
664
665
666

    // Verify all 5 blocks match
    let seq: Vec<LocalBlockHash> = (1..=5).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq.clone()).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 5);

    // Remove only block 3 (index 2) — the middle of the chain
    let full_hashes: Vec<LocalBlockHash> = (1..=5).map(LocalBlockHash).collect();
    let seq_hashes = compute_seq_hash_for_block(&full_hashes);
    let block_3_seq_hash = ExternalSequenceBlockHash(seq_hashes[2]);

667
    let remove_event = remove_event(0, 0, 0, vec![block_3_seq_hash]);
668
669
    index.apply_event(remove_event).await;

670
    flush_and_settle(index.as_ref()).await;
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685

    // Query [1, 2, 3, 4, 5] — only first 2 positions reachable (block 3 removed, orphaning 4 & 5)
    let scores = index.find_matches(seq.clone()).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 2);

    // Query [1, 2] — prefix before the gap is still intact
    let prefix_seq: Vec<LocalBlockHash> = (1..=2).map(LocalBlockHash).collect();
    let scores = index.find_matches(prefix_seq).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 2);

    // Re-store block 3 as a continuation of [1, 2]
    index
        .apply_event(make_store_event_with_parent(0, &[1, 2], &[3]))
        .await;

686
    flush_and_settle(index.as_ref()).await;
687
688
689
690
691
692

    // Query [1, 2, 3, 4, 5] — block 3 is back but 4 & 5 were orphaned, so score = 3
    let scores = index.find_matches(seq).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);
}

693
694
695
696
697
698
699
700
#[tokio::test]
#[apply(indexer_template)]
async fn test_remove_nonexistent_worker(variant: &str) {
    let index = make_indexer(variant);

    // Store data for worker 0
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

701
    flush_and_settle(index.as_ref()).await;
702
703
704
705
706

    // Remove non-existent worker 999 - should not error or affect worker 0
    index.remove_worker(999).await;

    // Allow time for async processing
707
    flush_and_settle(index.as_ref()).await;
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726

    // Worker 0's data should still be there
    let seq: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq).await.unwrap();
    assert_eq!(scores.scores.len(), 1);
    assert!(scores.scores.contains_key(&WorkerWithDpRank::new(0, 0)));
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_remove_nonexistent_blocks(variant: &str) {
    let index = make_indexer(variant);

    // Store [1, 2, 3]
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

    // Try to remove blocks [999, 998] that don't exist - should not error
    index.apply_event(make_remove_event(0, &[999, 998])).await;

727
    flush_and_settle(index.as_ref()).await;
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745

    // Original data should still be there
    let seq: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_clear_then_reuse(variant: &str) {
    let index = make_indexer(variant);

    // Store initial data
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

    // Clear the worker
    index.apply_event(make_clear_event(0)).await;

746
    flush_and_settle(index.as_ref()).await;
747
748
749
750
751
752
753
754
755

    // Verify data is gone
    let seq: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq.clone()).await.unwrap();
    assert!(scores.scores.is_empty());

    // Store new data for the same worker
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;

756
    flush_and_settle(index.as_ref()).await;
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776

    // Verify new data is accessible
    let scores = index.find_matches(seq).await.unwrap();
    assert_eq!(scores.scores.len(), 1);
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_multiple_sequences_per_worker(variant: &str) {
    let index = make_indexer(variant);

    // Store two disjoint sequences for the same worker
    // Sequence 1: [1, 2, 3]
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;
    // Sequence 2: [100, 101, 102] (completely different, no parent)
    index
        .apply_event(make_store_event(0, &[100, 101, 102]))
        .await;

777
    flush_and_settle(index.as_ref()).await;
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

    // Query first sequence
    let seq1: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq1).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);

    // Query second sequence
    let seq2: Vec<LocalBlockHash> = (100..=102).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq2).await.unwrap();
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 3);

    // Query a mix that doesn't exist as a sequence - should only match first block
    let mixed: Vec<LocalBlockHash> = vec![LocalBlockHash(1), LocalBlockHash(100)];
    let scores = index.find_matches(mixed).await.unwrap();
    // Only block 1 matches because [1, 100] is not a valid prefix
    assert_eq!(*scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(), 1);
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_clear_clears_all_dp_ranks(variant: &str) {
    let index = make_indexer(variant);

    // Store same sequence for different dp_ranks
    index
        .apply_event(make_store_event_with_dp_rank(0, &[1, 2, 3], 0))
        .await;
    index
        .apply_event(make_store_event_with_dp_rank(0, &[1, 2, 3], 1))
        .await;

809
    flush_and_settle(index.as_ref()).await;
810
811
812
813
814
815
816
817
818

    // Verify both dp_ranks are present
    let seq: Vec<LocalBlockHash> = (1..=3).map(LocalBlockHash).collect();
    let scores = index.find_matches(seq.clone()).await.unwrap();
    assert_eq!(scores.scores.len(), 2);

    // Clear event clears ALL blocks for the worker_id, regardless of dp_rank
    index.apply_event(make_clear_event_with_dp_rank(0, 0)).await;

819
    flush_and_settle(index.as_ref()).await;
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

    // Both dp_ranks should be cleared
    let scores = index.find_matches(seq).await.unwrap();
    assert!(
        scores.scores.is_empty(),
        "Cleared event should clear all dp_ranks for a worker"
    );
}

// ============================================================================
// LoRA isolation tests
// ============================================================================

#[tokio::test]
#[apply(indexer_template)]
async fn test_lora_and_base_model_blocks_do_not_conflict(variant: &str) {
    let index = make_indexer(variant);
    let kv_block_size: u32 = 32;

    // Same token sequence for both base model and LoRA adapter
    let tokens: Vec<u32> = (0..kv_block_size * 3).collect();

    let base_hashes = compute_block_hash_for_seq(&tokens, kv_block_size, None, None);
    let lora_hashes = compute_block_hash_for_seq(&tokens, kv_block_size, None, Some("my-adapter"));

    // Hashes must differ despite identical tokens
    assert_ne!(
        base_hashes, lora_hashes,
        "Base and LoRA hashes must differ for the same tokens"
    );

    let base_seq = compute_seq_hash_for_block(&base_hashes);
    let lora_seq = compute_seq_hash_for_block(&lora_hashes);

    // Store base-model blocks on worker 0
855
856
857
858
859
860
861
862
863
    let base_event = router_event(
        0,
        0,
        0,
        KvCacheEventData::Stored(KvCacheStoreData {
            parent_hash: None,
            blocks: stored_blocks_with_sequence_hashes(&base_hashes, &base_seq),
        }),
    );
864
865
866
    index.apply_event(base_event).await;

    // Store LoRA blocks on worker 1
867
868
869
870
871
872
873
874
875
    let lora_event = router_event(
        1,
        0,
        0,
        KvCacheEventData::Stored(KvCacheStoreData {
            parent_hash: None,
            blocks: stored_blocks_with_sequence_hashes(&lora_hashes, &lora_seq),
        }),
    );
876
877
    index.apply_event(lora_event).await;

878
    flush_and_settle(index.as_ref()).await;
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

    // Query with base-model hashes → only worker 0
    let base_scores = index.find_matches(base_hashes.clone()).await.unwrap();
    assert_eq!(
        base_scores.scores.len(),
        1,
        "Only base-model worker should match"
    );
    assert_eq!(
        *base_scores
            .scores
            .get(&WorkerWithDpRank::new(0, 0))
            .unwrap(),
        3
    );

    // Query with LoRA hashes → only worker 1
    let lora_scores = index.find_matches(lora_hashes.clone()).await.unwrap();
    assert_eq!(lora_scores.scores.len(), 1, "Only LoRA worker should match");
    assert_eq!(
        *lora_scores
            .scores
            .get(&WorkerWithDpRank::new(1, 0))
            .unwrap(),
        3
    );
}

/// Reproduces the "block_hash mismatch: sequence hashes should be uniform
/// across workers" warning seen when the same prompt is sent to both a base
/// model worker and a LoRA worker.
///
/// On main (without LoRA-aware hashing), both workers compute the same
/// LocalBlockHash for identical tokens.  But vLLM's engine includes the
/// adapter in its rolling ExternalSequenceBlockHash, so the radix tree
/// sees conflicting sequence hashes at the same tree node.
///
/// With LoRA-aware hashing, compute_block_hash_for_seq produces distinct
/// LocalBlockHash values for different adapters, so the blocks land on
/// separate tree paths and no mismatch occurs.
#[tokio::test]
#[apply(indexer_template)]
async fn test_lora_base_same_tokens_no_seq_hash_mismatch(variant: &str) {
    let index = make_indexer(variant);
    let kv_block_size: u32 = 32;

    let tokens: Vec<u32> = (0..kv_block_size * 3).collect();

    // With LoRA-aware hashing, base and adapter produce different LocalBlockHash
    let base_local = compute_block_hash_for_seq(&tokens, kv_block_size, None, None);
    let lora_local = compute_block_hash_for_seq(&tokens, kv_block_size, None, Some("my-adapter"));

    assert_ne!(
        base_local, lora_local,
        "LoRA-aware hashing must produce different LocalBlockHash values"
    );

    // Simulate what vLLM does: same tokens, different rolling seq hashes
    // because the engine accounts for the adapter internally.
    let base_seq = compute_seq_hash_for_block(&base_local);
    let lora_seq = compute_seq_hash_for_block(&lora_local);

    // Worker 0: base model
    index
943
944
945
946
947
948
949
950
951
        .apply_event(router_event(
            0,
            0,
            0,
            KvCacheEventData::Stored(KvCacheStoreData {
                parent_hash: None,
                blocks: stored_blocks_with_sequence_hashes(&base_local, &base_seq),
            }),
        ))
952
953
954
955
956
        .await;

    // Worker 1: LoRA adapter — different LocalBlockHash, so this goes to
    // a separate tree path instead of colliding with worker 0's node.
    index
957
958
959
960
961
962
963
964
965
        .apply_event(router_event(
            1,
            0,
            0,
            KvCacheEventData::Stored(KvCacheStoreData {
                parent_hash: None,
                blocks: stored_blocks_with_sequence_hashes(&lora_local, &lora_seq),
            }),
        ))
966
967
        .await;

968
    flush_and_settle(index.as_ref()).await;
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

    // Base query finds only worker 0
    let base_scores = index.find_matches(base_local.clone()).await.unwrap();
    assert_eq!(base_scores.scores.len(), 1);
    assert_eq!(
        *base_scores
            .scores
            .get(&WorkerWithDpRank::new(0, 0))
            .unwrap(),
        3
    );

    // LoRA query finds only worker 1
    let lora_scores = index.find_matches(lora_local.clone()).await.unwrap();
    assert_eq!(lora_scores.scores.len(), 1);
    assert_eq!(
        *lora_scores
            .scores
            .get(&WorkerWithDpRank::new(1, 0))
            .unwrap(),
        3
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_different_lora_adapters_do_not_conflict(variant: &str) {
    let index = make_indexer(variant);
    let kv_block_size: u32 = 32;

    let tokens: Vec<u32> = (0..kv_block_size * 2).collect();

    let hashes_a = compute_block_hash_for_seq(&tokens, kv_block_size, None, Some("adapter-a"));
    let hashes_b = compute_block_hash_for_seq(&tokens, kv_block_size, None, Some("adapter-b"));

    assert_ne!(
        hashes_a, hashes_b,
        "Different adapters must produce different hashes"
    );

    let seq_a = compute_seq_hash_for_block(&hashes_a);
    let seq_b = compute_seq_hash_for_block(&hashes_b);

    // Store adapter-a blocks on worker 0
    index
1014
1015
1016
1017
1018
1019
1020
1021
1022
        .apply_event(router_event(
            0,
            0,
            0,
            KvCacheEventData::Stored(KvCacheStoreData {
                parent_hash: None,
                blocks: stored_blocks_with_sequence_hashes(&hashes_a, &seq_a),
            }),
        ))
1023
1024
1025
1026
        .await;

    // Store adapter-b blocks on worker 1
    index
1027
1028
1029
1030
1031
1032
1033
1034
1035
        .apply_event(router_event(
            1,
            0,
            0,
            KvCacheEventData::Stored(KvCacheStoreData {
                parent_hash: None,
                blocks: stored_blocks_with_sequence_hashes(&hashes_b, &seq_b),
            }),
        ))
1036
1037
        .await;

1038
    flush_and_settle(index.as_ref()).await;
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

    // Query adapter-a → only worker 0
    let scores_a = index.find_matches(hashes_a.clone()).await.unwrap();
    assert_eq!(scores_a.scores.len(), 1);
    assert!(scores_a.scores.contains_key(&WorkerWithDpRank::new(0, 0)));
    assert!(!scores_a.scores.contains_key(&WorkerWithDpRank::new(1, 0)));

    // Query adapter-b → only worker 1
    let scores_b = index.find_matches(hashes_b.clone()).await.unwrap();
    assert_eq!(scores_b.scores.len(), 1);
    assert!(scores_b.scores.contains_key(&WorkerWithDpRank::new(1, 0)));
    assert!(!scores_b.scores.contains_key(&WorkerWithDpRank::new(0, 0)));
}

// ============================================================================
// Long sequence tests - especially important for NestedMap/PositionalIndexer
// ============================================================================

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_single_store(variant: &str) {
    let index = make_indexer(variant);

    // Store a long sequence (128 blocks) in a single event
    let seq_len = 128;
    let sequence: Vec<u64> = (1..=seq_len).collect();
    index.apply_event(make_store_event(0, &sequence)).await;

1067
    flush_and_settle(index.as_ref()).await;
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

    // Query full sequence - should match all blocks
    let full_query: Vec<LocalBlockHash> = sequence.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(full_query).await.unwrap();
    assert_eq!(scores.scores.len(), 1);
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        seq_len as u32
    );

    // Query prefix (first 64 blocks)
    let prefix_query: Vec<LocalBlockHash> = (1..=64).map(LocalBlockHash).collect();
    let scores = index.find_matches(prefix_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        64
    );

    // Query with divergence at position 50
    let mut divergent_query: Vec<LocalBlockHash> = (1..=100).map(LocalBlockHash).collect();
    divergent_query[49] = LocalBlockHash(99999); // Position 49 (0-indexed) diverges
    let scores = index.find_matches(divergent_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        49
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_multiple_continuations(variant: &str) {
    let index = make_indexer(variant);

    // Build a long sequence through multiple continuations
    // First store: blocks 1-50
    let first_chunk: Vec<u64> = (1..=50).collect();
    index.apply_event(make_store_event(0, &first_chunk)).await;

    // Second store: blocks 51-100 (continuation of first)
    let second_chunk: Vec<u64> = (51..=100).collect();
    index
        .apply_event(make_store_event_with_parent(0, &first_chunk, &second_chunk))
        .await;

    // Third store: blocks 101-150 (continuation of second)
    let prefix_1_2: Vec<u64> = (1..=100).collect();
    let third_chunk: Vec<u64> = (101..=150).collect();
    index
        .apply_event(make_store_event_with_parent(0, &prefix_1_2, &third_chunk))
        .await;

1119
    flush_and_settle(index.as_ref()).await;
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

    // Query full sequence - should match all 150 blocks
    let full_query: Vec<LocalBlockHash> = (1..=150).map(LocalBlockHash).collect();
    let scores = index.find_matches(full_query).await.unwrap();
    assert_eq!(scores.scores.len(), 1);
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        150
    );

    // Query crossing continuation boundaries
    let cross_boundary_query: Vec<LocalBlockHash> = (45..=105).map(LocalBlockHash).collect();
    let scores = index.find_matches(cross_boundary_query).await.unwrap();
    // Query starts at block 45, but stored sequence starts at 1, so this won't match
    // because the sequence hash at position 0 of our query (block 45) won't match
    // the stored sequence hash at position 0 (block 1)
    assert!(scores.scores.is_empty() || !scores.scores.contains_key(&WorkerWithDpRank::new(0, 0)));
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_branching_continuations(variant: &str) {
    let index = make_indexer(variant);

    // Common prefix: blocks 1-30
    let common_prefix: Vec<u64> = (1..=30).collect();
    index.apply_event(make_store_event(0, &common_prefix)).await;

    // Branch A: blocks 31-60 on worker 0
    let branch_a: Vec<u64> = (31..=60).collect();
    index
        .apply_event(make_store_event_with_parent(0, &common_prefix, &branch_a))
        .await;

    // Branch B: blocks 131-160 (different content) on worker 1
    // First store the common prefix for worker 1
    index.apply_event(make_store_event(1, &common_prefix)).await;
    let branch_b: Vec<u64> = (131..=160).collect();
    index
        .apply_event(make_store_event_with_parent(1, &common_prefix, &branch_b))
        .await;

1162
    flush_and_settle(index.as_ref()).await;
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

    // Query common prefix - both workers should match
    let prefix_query: Vec<LocalBlockHash> = (1..=30).map(LocalBlockHash).collect();
    let scores = index.find_matches(prefix_query).await.unwrap();
    assert_eq!(scores.scores.len(), 2);
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        30
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(),
        30
    );

    // Query branch A path - only worker 0 should match fully
    let branch_a_query: Vec<LocalBlockHash> = (1..=60).map(LocalBlockHash).collect();
    let scores = index.find_matches(branch_a_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        60
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(),
        30
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_partial_removal(variant: &str) {
    let index = make_indexer(variant);

    // Store a long sequence
    let sequence: Vec<u64> = (1..=100).collect();
    index.apply_event(make_store_event(0, &sequence)).await;

1199
    flush_and_settle(index.as_ref()).await;
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216

    // Verify full match
    let full_query: Vec<LocalBlockHash> = sequence.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(full_query.clone()).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        100
    );

    // Remove blocks 80-100 (the tail)
    let tail_hashes: Vec<LocalBlockHash> = (1..=100).map(LocalBlockHash).collect();
    let seq_hashes = compute_seq_hash_for_block(&tail_hashes);
    let remove_hashes: Vec<ExternalSequenceBlockHash> = seq_hashes[79..100]
        .iter()
        .map(|&h| ExternalSequenceBlockHash(h))
        .collect();

1217
    let remove_event = remove_event(0, 0, 0, remove_hashes);
1218
1219
    index.apply_event(remove_event).await;

1220
    flush_and_settle(index.as_ref()).await;
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

    // Query should now only match first 79 blocks
    let scores = index.find_matches(full_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        79
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_interleaved_workers(variant: &str) {
    let index = make_indexer(variant);

    // Multiple workers storing overlapping long sequences concurrently
    // Worker 0: blocks 1-100
    // Worker 1: blocks 1-75
    // Worker 2: blocks 1-50
    // Worker 3: blocks 1-25

    let seq_100: Vec<u64> = (1..=100).collect();
    let seq_75: Vec<u64> = (1..=75).collect();
    let seq_50: Vec<u64> = (1..=50).collect();
    let seq_25: Vec<u64> = (1..=25).collect();

    index.apply_event(make_store_event(0, &seq_100)).await;
    index.apply_event(make_store_event(1, &seq_75)).await;
    index.apply_event(make_store_event(2, &seq_50)).await;
    index.apply_event(make_store_event(3, &seq_25)).await;

1251
    flush_and_settle(index.as_ref()).await;
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

    // Query for 60 blocks - workers 0,1 match 60, worker 2 matches 50, worker 3 matches 25
    let query_60: Vec<LocalBlockHash> = (1..=60).map(LocalBlockHash).collect();
    let scores = index.find_matches(query_60).await.unwrap();
    assert_eq!(scores.scores.len(), 4);
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        60
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(),
        60
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(2, 0)).unwrap(),
        50
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(3, 0)).unwrap(),
        25
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_exact_jump_size_boundaries(variant: &str) {
    let index = make_indexer(variant);

    // Test sequences that align exactly with jump_size boundaries (32 for PositionalIndexer)
    // This tests edge cases in the jump search algorithm

    // Store sequence of exactly 32 blocks
    let seq_32: Vec<u64> = (1..=32).collect();
    index.apply_event(make_store_event(0, &seq_32)).await;

    // Store sequence of exactly 64 blocks (2x jump_size)
    let seq_64: Vec<u64> = (1001..=1064).collect();
    index.apply_event(make_store_event(1, &seq_64)).await;

    // Store sequence of exactly 96 blocks (3x jump_size)
    let seq_96: Vec<u64> = (2001..=2096).collect();
    index.apply_event(make_store_event(2, &seq_96)).await;

1295
    flush_and_settle(index.as_ref()).await;
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

    // Verify all sequences match correctly
    let query_32: Vec<LocalBlockHash> = seq_32.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query_32).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        32
    );

    let query_64: Vec<LocalBlockHash> = seq_64.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query_64).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(),
        64
    );

    let query_96: Vec<LocalBlockHash> = seq_96.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query_96).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(2, 0)).unwrap(),
        96
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_off_by_one_jump_boundaries(variant: &str) {
    let index = make_indexer(variant);

    // Test sequences at jump_size +/- 1 boundaries to catch off-by-one errors
    let seq_31: Vec<u64> = (1..=31).collect();
    let seq_33: Vec<u64> = (101..=133).collect();
    let seq_63: Vec<u64> = (201..=263).collect();
    let seq_65: Vec<u64> = (301..=365).collect();

    index.apply_event(make_store_event(0, &seq_31)).await;
    index.apply_event(make_store_event(1, &seq_33)).await;
    index.apply_event(make_store_event(2, &seq_63)).await;
    index.apply_event(make_store_event(3, &seq_65)).await;

1336
    flush_and_settle(index.as_ref()).await;
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

    // Verify all sequences match correctly
    let query_31: Vec<LocalBlockHash> = seq_31.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query_31).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        31
    );

    let query_33: Vec<LocalBlockHash> = seq_33.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query_33).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(),
        33
    );

    let query_63: Vec<LocalBlockHash> = seq_63.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query_63).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(2, 0)).unwrap(),
        63
    );

    let query_65: Vec<LocalBlockHash> = seq_65.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query_65).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(3, 0)).unwrap(),
        65
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_divergence_at_jump_boundaries(variant: &str) {
    let index = make_indexer(variant);

    // Store a long sequence
    let sequence: Vec<u64> = (1..=128).collect();
    index.apply_event(make_store_event(0, &sequence)).await;

1377
    flush_and_settle(index.as_ref()).await;
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

    // Test divergence exactly at jump boundaries (position 31, 32, 33, 63, 64, 65)
    for diverge_pos in [31usize, 32, 33, 63, 64, 65, 95, 96, 97] {
        let mut query: Vec<LocalBlockHash> = (1..=128).map(LocalBlockHash).collect();
        query[diverge_pos] = LocalBlockHash(99999);

        let scores = index.find_matches(query).await.unwrap();
        assert_eq!(
            *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
            diverge_pos as u32,
            "Divergence at position {} should match {} blocks",
            diverge_pos,
            diverge_pos
        );
    }
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_deep_continuation_chain(variant: &str) {
    let index = make_indexer(variant);

    // Build a very long sequence through many small continuations
    // This tests the parent_hash chain handling
    let chunk_size = 10;
    let num_chunks = 20; // Total 200 blocks

    let mut full_prefix: Vec<u64> = Vec::new();

    for chunk_idx in 0..num_chunks {
        let chunk_start = chunk_idx * chunk_size + 1;
        let chunk: Vec<u64> = (chunk_start..chunk_start + chunk_size)
            .map(|x| x as u64)
            .collect();

        if chunk_idx == 0 {
            index.apply_event(make_store_event(0, &chunk)).await;
        } else {
            index
                .apply_event(make_store_event_with_parent(0, &full_prefix, &chunk))
                .await;
        }

        full_prefix.extend(&chunk);
    }

1424
    flush_and_settle(index.as_ref()).await;
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

    // Query full sequence
    let full_query: Vec<LocalBlockHash> = (1..=200).map(LocalBlockHash).collect();
    let scores = index.find_matches(full_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        200
    );

    // Query partial prefix crossing multiple chunk boundaries
    let partial_query: Vec<LocalBlockHash> = (1..=75).map(LocalBlockHash).collect();
    let scores = index.find_matches(partial_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        75
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_clear_and_rebuild(variant: &str) {
    let index = make_indexer(variant);

    // Store a long sequence
    let sequence: Vec<u64> = (1..=100).collect();
    index.apply_event(make_store_event(0, &sequence)).await;

1452
    flush_and_settle(index.as_ref()).await;
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464

    // Verify it's stored
    let query: Vec<LocalBlockHash> = sequence.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query.clone()).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        100
    );

    // Clear the worker
    index.apply_event(make_clear_event(0)).await;

1465
    flush_and_settle(index.as_ref()).await;
1466
1467
1468
1469
1470
1471
1472
1473
1474

    // Verify it's cleared
    let scores = index.find_matches(query.clone()).await.unwrap();
    assert!(scores.scores.is_empty());

    // Rebuild with a different sequence
    let new_sequence: Vec<u64> = (1001..=1100).collect();
    index.apply_event(make_store_event(0, &new_sequence)).await;

1475
    flush_and_settle(index.as_ref()).await;
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

    // Verify new sequence works
    let new_query: Vec<LocalBlockHash> = new_sequence.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(new_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        100
    );

    // Verify old sequence no longer matches
    let scores = index.find_matches(query).await.unwrap();
    assert!(scores.scores.is_empty());
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_multiple_workers_diverging(variant: &str) {
    let index = make_indexer(variant);

    // Multiple workers with long sequences that share a prefix then diverge
    // This tests precise drain point tracking across workers

    // All workers share prefix 1-40
    let shared_prefix: Vec<u64> = (1..=40).collect();

    // Worker 0: prefix + 41-100 (stores full sequence 1-100)
    let worker_0_full: Vec<u64> = (1..=100).collect();

    // Worker 1: prefix + 141-180 (diverges at block 41)
    let worker_1_suffix: Vec<u64> = (141..=180).collect();

    // Worker 2: prefix + 241-300 (diverges at block 41)
    let worker_2_suffix: Vec<u64> = (241..=300).collect();

    // Store for all workers
    index.apply_event(make_store_event(0, &worker_0_full)).await;

    index.apply_event(make_store_event(1, &shared_prefix)).await;
    index
        .apply_event(make_store_event_with_parent(
            1,
            &shared_prefix,
            &worker_1_suffix,
        ))
        .await;

    index.apply_event(make_store_event(2, &shared_prefix)).await;
    index
        .apply_event(make_store_event_with_parent(
            2,
            &shared_prefix,
            &worker_2_suffix,
        ))
        .await;

1531
    flush_and_settle(index.as_ref()).await;
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

    // Query 1-100 - worker 0 matches 100, workers 1&2 match 40
    let query: Vec<LocalBlockHash> = worker_0_full.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(query).await.unwrap();

    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        100
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(),
        40
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(2, 0)).unwrap(),
        40
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_long_sequence_staggered_lengths(variant: &str) {
    let index = make_indexer(variant);

    // Workers with sequences of staggered lengths to test drain tracking
    // Worker 0: 10 blocks
    // Worker 1: 20 blocks
    // Worker 2: 35 blocks (just past first jump)
    // Worker 3: 64 blocks (exactly 2 jumps)
    // Worker 4: 100 blocks

    for (worker_id, len) in [(0, 10), (1, 20), (2, 35), (3, 64), (4, 100)] {
        let sequence: Vec<u64> = (1..=len).collect();
        index
            .apply_event(make_store_event(worker_id, &sequence))
            .await;
    }

1570
    flush_and_settle(index.as_ref()).await;
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

    // Query for 100 blocks - each worker should match their stored length
    let query: Vec<LocalBlockHash> = (1..=100).map(LocalBlockHash).collect();
    let scores = index.find_matches(query).await.unwrap();

    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        10
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(1, 0)).unwrap(),
        20
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(2, 0)).unwrap(),
        35
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(3, 0)).unwrap(),
        64
    );
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(4, 0)).unwrap(),
        100
    );
}

#[tokio::test]
#[apply(indexer_template)]
async fn test_very_long_sequence(variant: &str) {
    let index = make_indexer(variant);

    // Test with a very long sequence (1000 blocks)
    let seq_len = 1000u64;
    let sequence: Vec<u64> = (1..=seq_len).collect();
    index.apply_event(make_store_event(0, &sequence)).await;

1608
    flush_and_settle(index.as_ref()).await;
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

    // Full match
    let full_query: Vec<LocalBlockHash> = sequence.iter().map(|&i| LocalBlockHash(i)).collect();
    let scores = index.find_matches(full_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        seq_len as u32
    );

    // Partial match (first 500)
    let partial_query: Vec<LocalBlockHash> = (1..=500).map(LocalBlockHash).collect();
    let scores = index.find_matches(partial_query).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        500
    );

    // Divergence in the middle
    let mut mid_diverge: Vec<LocalBlockHash> = (1..=1000).map(LocalBlockHash).collect();
    mid_diverge[499] = LocalBlockHash(99999);
    let scores = index.find_matches(mid_diverge).await.unwrap();
    assert_eq!(
        *scores.scores.get(&WorkerWithDpRank::new(0, 0)).unwrap(),
        499
    );
}

// ============================================================================
// Tests specific to tree-based implementations (KvIndexer, KvIndexerSharded)
// These use features not available in PositionalIndexer
// ============================================================================

#[template]
#[rstest]
fn tree_indexer_template(#[values("single", "sharded")] variant: &str) {}

fn make_tree_indexer_with_frequency(
    variant: &str,
    expiration: Duration,
) -> Box<dyn KvIndexerInterface> {
    let token = CancellationToken::new();
    let metrics = Arc::new(KvIndexerMetrics::new_unregistered());
    let kv_block_size = 32;

    match variant {
        "single" => Box::new(KvIndexer::new_with_frequency(
            token,
            Some(expiration),
            kv_block_size,
            metrics,
            None,
        )),
        "sharded" => Box::new(KvIndexerSharded::new_with_frequency(
            token,
            4,
            Some(expiration),
            kv_block_size,
            metrics,
            None,
        )),
        _ => panic!("Unknown variant: {}", variant),
    }
}

#[tokio::test]
#[apply(tree_indexer_template)]
async fn test_frequency(variant: &str) {
    const ONE_MILLIS: Duration = Duration::from_millis(1);

    let expiration = Duration::from_millis(50);
    let kv_indexer = make_tree_indexer_with_frequency(variant, expiration);

    // The blocks
    let block_hashes = vec![
        LocalBlockHash(1),
        LocalBlockHash(2),
        LocalBlockHash(3),
        LocalBlockHash(4),
    ];

    let overlap = kv_indexer.find_matches(block_hashes.clone()).await.unwrap();
    assert_eq!(
        overlap.frequencies.len(),
        0,
        "Should be no cached blocks yet"
    );

    // Blocks go in cache
    let event = make_store_event(0, &[1, 2, 3, 4]);
    kv_indexer.apply_event(event).await;

    // First access - poll briefly since store event is applied async
    let mut overlap = OverlapScores::default();
    let timeout = Duration::from_millis(10);
    let start = Instant::now();
    while overlap.scores.is_empty() && Instant::now().duration_since(start) < timeout {
        time::sleep(ONE_MILLIS).await;
        overlap = kv_indexer.find_matches(block_hashes.clone()).await.unwrap();
    }
    assert_eq!(
        overlap.scores.len(),
        1,
        "One worker has these blocks cached"
    );
    assert_eq!(
        overlap.frequencies.len(),
        0,
        "Blocks have not previously been accessed"
    );

    // Second access
    let overlap = kv_indexer.find_matches(block_hashes.clone()).await.unwrap();
    assert_eq!(overlap.scores.len(), 1, "Still one worker matches");
    assert_eq!(
        overlap.frequencies,
        vec![1, 1, 1, 1],
        "We should see the first access now"
    );

    // Let those two accesses expire
    time::sleep(expiration + Duration::from_millis(10)).await;

    // New first access
    let overlap = kv_indexer.find_matches(block_hashes.clone()).await.unwrap();
    assert_eq!(
        overlap.frequencies.len(),
        0,
        "Blocks were accessed too long ago"
    );

    // New second access
    let _ = kv_indexer.find_matches(block_hashes.clone()).await.unwrap();

    // Access only the first three blocks
    let overlap = kv_indexer
        .find_matches(block_hashes[0..3].to_vec())
        .await
        .unwrap();
    // We see the previous two new accesses
    assert_eq!(overlap.frequencies, vec![2, 2, 2]);

    // The third access did not touch the last block
    let overlap = kv_indexer.find_matches(block_hashes.clone()).await.unwrap();
    assert_eq!(overlap.frequencies, vec![3, 3, 3, 2]);
}

// ============================================================================
// KvIndexerMetrics tests
// ============================================================================

1759
#[cfg(feature = "metrics")]
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
#[test]
fn test_increment_event_applied() {
    let metrics = KvIndexerMetrics::new_unregistered();

    metrics.increment_event_applied(METRIC_EVENT_STORED, Ok(()));
    assert_eq!(
        metrics
            .kv_cache_events_applied
            .get_metric_with_label_values(&[METRIC_EVENT_STORED, METRIC_STATUS_OK])
            .unwrap()
            .get(),
        1
    );

    metrics.increment_event_applied(
        METRIC_EVENT_STORED,
        Err(KvCacheEventError::ParentBlockNotFound),
    );
    assert_eq!(
        metrics
            .kv_cache_events_applied
            .get_metric_with_label_values(&[METRIC_EVENT_STORED, METRIC_STATUS_PARENT_NOT_FOUND])
            .unwrap()
            .get(),
        1
    );

    metrics.increment_event_applied(METRIC_EVENT_REMOVED, Err(KvCacheEventError::BlockNotFound));
    assert_eq!(
        metrics
            .kv_cache_events_applied
            .get_metric_with_label_values(&[METRIC_EVENT_REMOVED, METRIC_STATUS_BLOCK_NOT_FOUND])
            .unwrap()
            .get(),
        1
    );
}

// ============================================================================
// LocalKvIndexer tests
// ============================================================================

fn make_local_indexer_with_events(ids: &[u64]) -> LocalKvIndexer {
    let indexer = LocalKvIndexer::new(
        CancellationToken::new(),
        4,
        Arc::new(KvIndexerMetrics::new_unregistered()),
        32,
    );
    {
        let mut buffer = indexer.event_buffer.lock().unwrap();
        for &id in ids {
            buffer.push_back(RouterEvent::new(
                0,
                KvCacheEvent {
                    event_id: id,
                    data: KvCacheEventData::Cleared,
                    dp_rank: 0,
                },
            ));
        }
    }
    indexer
}

#[tokio::test]
async fn test_local_indexer_slice_within_range() {
    let indexer = make_local_indexer_with_events(&[1, 2, 3, 4, 5]);

    // Helper to extract events from response
    let extract_events = |resp: WorkerKvQueryResponse| -> Vec<RouterEvent> {
        match resp {
            WorkerKvQueryResponse::Events(e) => e,
1833
            WorkerKvQueryResponse::TreeDump { events: e, .. } => e,
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
            _ => panic!("Unexpected response type"),
        }
    };

    let get_ids = |events: Vec<RouterEvent>| -> Vec<u64> {
        events.iter().map(|e| e.event.event_id).collect()
    };

    // Test get_events_in_id_range (buffer queries)
    // Range is [start, end] inclusive
    let result = indexer.get_events_in_id_range(Some(2), Some(4)).await;
    let ids = get_ids(extract_events(result));
    assert_eq!(ids, vec![2, 3, 4]); // inclusive range [2, 4]

    let result = indexer.get_events_in_id_range(Some(2), Some(6)).await;
    let ids = get_ids(extract_events(result));
    assert_eq!(ids, vec![2, 3, 4, 5]); // clamp end to buffer max

    // start_id=0 is before buffer (first is 1), so should trigger tree dump
    let result = indexer.get_events_in_id_range(Some(0), Some(4)).await;
1854
    assert!(matches!(result, WorkerKvQueryResponse::TreeDump { .. }));
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

    let result = indexer.get_events_in_id_range(Some(3), Some(3)).await;
    let ids = get_ids(extract_events(result));
    assert_eq!(ids, vec![3]); // single element when start == end

    // Invalid range: end < start
    let result = indexer.get_events_in_id_range(Some(5), Some(2)).await;
    assert!(matches!(result, WorkerKvQueryResponse::InvalidRange { .. }));
}

#[tokio::test]
async fn test_local_indexer_get_events_in_id_range_all_cases() {
    // Create indexer with small buffer (5 events max)
    let indexer = LocalKvIndexer::new(
        CancellationToken::new(),
        4,
        Arc::new(KvIndexerMetrics::new_unregistered()),
        5,
    );

    // Helper to create a test event
    let make_event = |id: u64| {
        RouterEvent::new(
            0,
            KvCacheEvent {
                event_id: id,
                data: KvCacheEventData::Stored(KvCacheStoreData {
                    parent_hash: None,
                    blocks: vec![KvCacheStoredBlockData {
                        block_hash: ExternalSequenceBlockHash(id * 100),
                        tokens_hash: LocalBlockHash(id * 200),
                        mm_extra_info: None,
                    }],
                }),
                dp_rank: 0,
            },
        )
    };

    // Add 10 events (IDs 5-14), buffer keeps last 5: events 10-14
    for id in 5..15 {
        indexer
            .apply_event_with_buffer(make_event(id))
            .await
            .unwrap();
    }

    // Wait for events to be processed
1903
    indexer.flush().await;
1904
1905
1906
1907

    let extract_events = |resp: WorkerKvQueryResponse| -> Vec<RouterEvent> {
        match resp {
            WorkerKvQueryResponse::Events(e) => e,
1908
            WorkerKvQueryResponse::TreeDump { events: e, .. } => e,
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
            _ => panic!("Unexpected response type: {:?}", resp),
        }
    };

    let get_ids = |events: Vec<RouterEvent>| -> Vec<u64> {
        events.iter().map(|e| e.event.event_id).collect()
    };

    // Verify buffer state
    let buffer_events = indexer.get_all_events_in_buffer();
    assert_eq!(get_ids(buffer_events), vec![10, 11, 12, 13, 14]);

    // Buffer path tests
    let result = indexer.get_events_in_id_range(Some(11), None).await;
    assert_eq!(get_ids(extract_events(result)), vec![11, 12, 13, 14]);

    let result = indexer.get_events_in_id_range(Some(10), Some(14)).await;
    assert_eq!(get_ids(extract_events(result)), vec![10, 11, 12, 13, 14]);

    // Tree dump path tests
    let result = indexer.get_events_in_id_range(None, None).await;
1930
    assert!(matches!(&result, WorkerKvQueryResponse::TreeDump { .. }));
1931
1932
1933
    assert_eq!(extract_events(result).len(), 10);

    let result = indexer.get_events_in_id_range(Some(7), None).await;
1934
    assert!(matches!(result, WorkerKvQueryResponse::TreeDump { .. }));
1935
1936
1937
1938
1939
1940
1941
1942
1943

    // Edge cases
    let result = indexer.get_events_in_id_range(Some(15), Some(10)).await;
    assert!(matches!(result, WorkerKvQueryResponse::InvalidRange { .. }));

    let result = indexer.get_events_in_id_range(Some(100), Some(200)).await;
    assert!(matches!(result, WorkerKvQueryResponse::TooNew { .. }));
}

1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
#[tokio::test]
async fn test_tree_dump_includes_last_event_id() {
    // Create indexer with small buffer (5 events max)
    let indexer = LocalKvIndexer::new(
        CancellationToken::new(),
        4,
        Arc::new(KvIndexerMetrics::new_unregistered()),
        5,
    );

    let make_event = |id: u64| {
        RouterEvent::new(
            0,
            KvCacheEvent {
                event_id: id,
                data: KvCacheEventData::Stored(KvCacheStoreData {
                    parent_hash: None,
                    blocks: vec![KvCacheStoredBlockData {
                        block_hash: ExternalSequenceBlockHash(id * 100),
                        tokens_hash: LocalBlockHash(id * 200),
                        mm_extra_info: None,
                    }],
                }),
                dp_rank: 0,
            },
        )
    };

    // Add 10 events (IDs 5-14), buffer keeps last 5: events 10-14
    for id in 5..15 {
        indexer
            .apply_event_with_buffer(make_event(id))
            .await
            .unwrap();
    }
    indexer.flush().await;

    // Request with start_id=None -> tree dump should include last_event_id=14
    let result = indexer.get_events_in_id_range(None, None).await;
    match result {
        WorkerKvQueryResponse::TreeDump {
            last_event_id,
            events,
        } => {
            assert_eq!(
                last_event_id, 14,
                "last_event_id should be the buffer's newest event ID"
            );
            assert!(!events.is_empty(), "tree dump should contain events");
        }
        other => panic!("Expected TreeDump, got: {other:?}"),
    }

    // Request with start_id older than buffer -> tree dump should include last_event_id=14
    let result = indexer.get_events_in_id_range(Some(7), None).await;
    match result {
        WorkerKvQueryResponse::TreeDump {
            last_event_id,
            events,
        } => {
            assert_eq!(
                last_event_id, 14,
                "last_event_id should be the buffer's newest event ID"
            );
            assert!(!events.is_empty(), "tree dump should contain events");
        }
        other => panic!("Expected TreeDump, got: {other:?}"),
    }

    // Empty buffer case: create a fresh indexer with no events
    let empty_indexer = LocalKvIndexer::new(
        CancellationToken::new(),
        4,
        Arc::new(KvIndexerMetrics::new_unregistered()),
        5,
    );
    let result = empty_indexer.get_events_in_id_range(None, None).await;
    match result {
        WorkerKvQueryResponse::TreeDump {
            last_event_id,
            events,
        } => {
            assert_eq!(
                last_event_id, 0,
                "empty buffer should return last_event_id=0"
            );
            assert!(events.is_empty(), "empty indexer should have no events");
        }
        other => panic!("Expected TreeDump, got: {other:?}"),
    }
}

2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
#[tokio::test]
async fn test_local_indexer_buffer_and_serialization() {
    let worker_id = 42u64;
    let token = CancellationToken::new();
    let metrics = Arc::new(KvIndexerMetrics::new_unregistered());
    let local_indexer = Arc::new(LocalKvIndexer::new(token, 4, metrics, 100));

    let test_event = RouterEvent::new(
        worker_id,
        KvCacheEvent {
            event_id: 1,
            data: KvCacheEventData::Stored(KvCacheStoreData {
                parent_hash: None,
                blocks: vec![KvCacheStoredBlockData {
                    block_hash: ExternalSequenceBlockHash(100),
                    tokens_hash: LocalBlockHash(200),
                    mm_extra_info: None,
                }],
            }),
            dp_rank: 0,
        },
    );

    local_indexer
        .apply_event_with_buffer(test_event)
        .await
        .unwrap();

2064
    local_indexer.flush().await;
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081

    let buffered_events = local_indexer.get_all_events_in_buffer();
    assert_eq!(buffered_events.len(), 1);
    assert_eq!(buffered_events[0].worker_id, worker_id);

    // Test serialization round-trip
    let response = WorkerKvQueryResponse::Events(buffered_events);
    let serialized = serde_json::to_vec(&response).unwrap();
    let deserialized: WorkerKvQueryResponse = serde_json::from_slice(&serialized).unwrap();

    let events = match deserialized {
        WorkerKvQueryResponse::Events(e) => e,
        _ => panic!("Expected Events variant"),
    };
    assert_eq!(events.len(), 1);
    assert_eq!(events[0].worker_id, worker_id);
}
2082

2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
#[tokio::test]
async fn test_local_indexer_does_not_buffer_failed_send() {
    let local_indexer = LocalKvIndexer::new(
        CancellationToken::new(),
        4,
        Arc::new(KvIndexerMetrics::new_unregistered()),
        5,
    );

    let test_event = RouterEvent::new(
        7,
        KvCacheEvent {
            event_id: 1,
            data: KvCacheEventData::Stored(KvCacheStoreData {
                parent_hash: None,
                blocks: vec![KvCacheStoredBlockData {
                    block_hash: ExternalSequenceBlockHash(100),
                    tokens_hash: LocalBlockHash(200),
                    mm_extra_info: None,
                }],
            }),
            dp_rank: 0,
        },
    );

    let event_tx = local_indexer.event_sender();
    local_indexer.shutdown();
    event_tx.closed().await;

    let result = local_indexer.apply_event_with_buffer(test_event).await;
    assert!(matches!(result, Err(KvRouterError::IndexerOffline)));
    assert_eq!(local_indexer.buffer_len(), 0);

    match local_indexer.get_events_in_id_range(None, None).await {
        WorkerKvQueryResponse::TreeDump {
            events,
            last_event_id,
        } => {
            assert!(events.is_empty());
            assert_eq!(last_event_id, 0);
        }
        other => panic!("Expected TreeDump, got: {other:?}"),
    }
}

2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
#[tokio::test]
#[apply(indexer_template)]
async fn test_apply_events_idempotent(variant: &str) {
    let index = make_indexer(variant);

    // Setup: build initial tree
    index.apply_event(make_store_event(0, &[1, 2, 3])).await;
    index.apply_event(make_store_event(1, &[4, 5, 6])).await;
    index
        .apply_event(make_store_event_with_parent(0, &[1, 2, 3], &[7, 8]))
        .await;
2139
    flush_and_settle(index.as_ref()).await;
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
    let s0 = snapshot_tree(index.as_ref()).await;

    // Mutation events: each add paired with its remove
    let adds = [
        make_store_event(2, &[1, 2, 9]),
        make_store_event_with_parent(1, &[4, 5, 6], &[10, 11, 12]),
    ];
    let removes = [
        make_remove_event(2, &[1, 2, 9]),
        make_remove_event_with_parent(1, &[4, 5, 6], &[10, 11, 12]),
    ];

    // Phase 1: interleaved add/remove
    index.apply_event(adds[0].clone()).await;
    index.apply_event(removes[0].clone()).await;
    index.apply_event(adds[1].clone()).await;
    index.apply_event(removes[1].clone()).await;
2157
    flush_and_settle(index.as_ref()).await;
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
    let s1 = snapshot_tree(index.as_ref()).await;
    assert_eq!(
        s0, s1,
        "Phase 1: interleaved add/remove should restore tree"
    );

    // Phase 2: same interleaved again (idempotence of the full cycle)
    index.apply_event(adds[0].clone()).await;
    index.apply_event(removes[0].clone()).await;
    index.apply_event(adds[1].clone()).await;
    index.apply_event(removes[1].clone()).await;
2169
    flush_and_settle(index.as_ref()).await;
2170
2171
2172
2173
2174
2175
2176
2177
    let s2 = snapshot_tree(index.as_ref()).await;
    assert_eq!(s1, s2, "Phase 2: repeated cycle should be idempotent");

    // Phase 3: non-interleaved (all adds then all removes)
    index.apply_event(adds[0].clone()).await;
    index.apply_event(adds[1].clone()).await;
    index.apply_event(removes[0].clone()).await;
    index.apply_event(removes[1].clone()).await;
2178
    flush_and_settle(index.as_ref()).await;
2179
2180
2181
2182
2183
2184
    let s3 = snapshot_tree(index.as_ref()).await;
    assert_eq!(
        s2, s3,
        "Phase 3: non-interleaved ordering should restore tree"
    );
}