Skip to content

Commit 4c320a5

Browse files
committed
Fix TestQueryExecutorConsolidatorWaiterCapReject: set consolidator total waiter count
The test was setting per-query WaiterCount but not the consolidator's TotalWaiterCount, which is what the actual code checks to decide whether the cap is exceeded. Also corrected assertions to match the actual code path (one AddWaiterCounter(-1) call, not two). Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com> AI disclosure: Claude Code assisted with development. Every line of code was either written by or carefully reviewed by me :)
1 parent b64e3eb commit 4c320a5

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

go/vt/vttablet/tabletserver/query_executor_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,6 +1574,7 @@ func TestQueryExecutorConsolidatorWaiterCapReject(t *testing.T) {
15741574

15751575
// Start with waiter count above the cap (2 > 1), so the condition fails
15761576
fakePendingResult.WaiterCount = 2
1577+
fakeConsolidator.SetTotalWaiterCount(2)
15771578

15781579
fakeConsolidator.CreateReturn = &sync2.FakeConsolidatorCreateReturn{
15791580
Created: false, // Simulate identical query already running
@@ -1602,10 +1603,9 @@ func TestQueryExecutorConsolidatorWaiterCapReject(t *testing.T) {
16021603
// Verify we did NOT broadcast (because we're not the original)
16031604
require.Equal(t, 0, fakePendingResult.BroadcastCalls)
16041605

1605-
// Verify AddWaiterCounter was called: once with 0 (to check count), once with -1 (cleanup)
1606-
require.Len(t, fakePendingResult.AddWaiterCounterCalls, 2)
1607-
require.Equal(t, int64(0), fakePendingResult.AddWaiterCounterCalls[0]) // Check current count
1608-
require.Equal(t, int64(-1), fakePendingResult.AddWaiterCounterCalls[1]) // Decrement
1606+
// Verify AddWaiterCounter was called once with -1 (cleanup before reject)
1607+
require.Len(t, fakePendingResult.AddWaiterCounterCalls, 1)
1608+
require.Equal(t, int64(-1), fakePendingResult.AddWaiterCounterCalls[0])
16091609

16101610
// Verify no database query was executed (rejected before fallback)
16111611
require.Equal(t, 0, db.GetQueryCalledNum(input))

0 commit comments

Comments
 (0)