-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kv: only scan intents span for QueryIntent request
Change QueryIntent to only read from the lock table. Previously the request required merging the read from the MVCC iterator with the lock table. This should improve performance. Also, add unit testing for QueryIntent. Fixes #69716 Release note: None
- Loading branch information
1 parent
5d67ba5
commit d6ec1ee
Showing
4 changed files
with
206 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
// Copyright 2022 The Cockroach Authors. | ||
// | ||
// Use of this software is governed by the Business Source License | ||
// included in the file licenses/BSL.txt. | ||
// | ||
// As of the Change Date specified in that file, in accordance with | ||
// the Business Source License, use of this software will be governed | ||
// by the Apache License, Version 2.0, included in the file | ||
// licenses/APL.txt. | ||
|
||
package batcheval | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
"time" | ||
|
||
"github.com/cockroachdb/cockroach/pkg/roachpb" | ||
"github.com/cockroachdb/cockroach/pkg/settings/cluster" | ||
"github.com/cockroachdb/cockroach/pkg/storage" | ||
"github.com/cockroachdb/cockroach/pkg/util/hlc" | ||
"github.com/cockroachdb/cockroach/pkg/util/leaktest" | ||
"github.com/cockroachdb/cockroach/pkg/util/log" | ||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func TestQueryIntent(t *testing.T) { | ||
defer leaktest.AfterTest(t)() | ||
defer log.Scope(t).Close(t) | ||
|
||
ctx := context.Background() | ||
db := storage.NewDefaultInMemForTesting() | ||
defer db.Close() | ||
|
||
makeTS := func(ts int64) hlc.Timestamp { | ||
return hlc.Timestamp{WallTime: ts} | ||
} | ||
|
||
writeIntent := func(k roachpb.Key, ts int64) roachpb.Transaction { | ||
txn := roachpb.MakeTransaction("test", k, 0, makeTS(ts), 0, 1) | ||
require.NoError(t, storage.MVCCDelete(ctx, db, nil, k, makeTS(ts), hlc.ClockTimestamp{}, &txn)) | ||
return txn | ||
} | ||
|
||
// Write three keys in three separate transactions. | ||
keyA := roachpb.Key("a") | ||
keyAA := roachpb.Key("aa") | ||
keyB := roachpb.Key("b") | ||
|
||
txA := writeIntent(keyA, 5) | ||
txAA := writeIntent(keyAA, 6) | ||
txB := writeIntent(keyB, 7) | ||
|
||
st := cluster.MakeTestingClusterSettings() | ||
clock := hlc.NewClock(hlc.NewManualClock(10).UnixNano, time.Nanosecond) | ||
evalCtx := &MockEvalCtx{ClusterSettings: st, Clock: clock} | ||
|
||
// Since we can't move the intents clock after they are written, created | ||
// cloned transactions with the clock shifted instead. | ||
txABack := *txA.Clone() | ||
txAForward := *txA.Clone() | ||
txABack.WriteTimestamp = txABack.WriteTimestamp.Add(-2, 0) | ||
txAForward.WriteTimestamp = txAForward.WriteTimestamp.Add(20, 0) | ||
|
||
tests := []struct { | ||
name string | ||
hTransaction roachpb.Transaction | ||
argTransaction roachpb.Transaction | ||
key roachpb.Key | ||
errorFlag bool | ||
expectError bool | ||
}{ | ||
// Perform standard reading of all three keys. | ||
{"readA", txA, txA, keyA, true, false}, | ||
{"readAA", txAA, txAA, keyAA, true, false}, | ||
{"readB", txB, txB, keyB, true, false}, | ||
|
||
// This tries reading a different key than this tx was written with. The | ||
// returned error depends on the error flag setting. | ||
{"wrongTx", txA, txA, keyB, true, true}, | ||
{"wrongTx", txA, txA, keyB, false, false}, | ||
|
||
// This sets a mismatch for transactions in the header and the body. An | ||
// error is returned regardless of the errorFlag. | ||
{"mismatchTx", txA, txB, keyA, true, true}, | ||
{"mismatchTx", txA, txB, keyA, false, true}, | ||
|
||
// This simulates pushed intents by moving the tx clock backwards in time. | ||
// An error is only returned if the error flag is set. | ||
{"clockBack", txABack, txABack, keyA, true, true}, | ||
{"clockBack", txABack, txABack, keyA, false, false}, | ||
|
||
// This simulates pushed transactions by moving the tx clock forward in time. | ||
{"clockFwd", txAForward, txAForward, keyA, true, false}, | ||
|
||
// This simulates a mismatch in the header and arg write timestamps. This is | ||
// always an error regardless of flag. | ||
{"mismatchTxClock", txA, txAForward, keyA, true, true}, | ||
{"mismatchTxClock", txA, txAForward, keyA, false, true}, | ||
|
||
// It is OK if the time on the arg transaction is moved backwards, its | ||
// unclear if this happens in practice. | ||
{"mismatchTxClock", txA, txABack, keyA, true, false}, | ||
} | ||
|
||
for _, test := range tests { | ||
t.Run(test.name, func(t *testing.T) { | ||
cArgs := CommandArgs{ | ||
Header: roachpb.Header{Timestamp: clock.Now(), Txn: &test.hTransaction}, | ||
Args: &roachpb.QueryIntentRequest{ | ||
RequestHeader: roachpb.RequestHeader{Key: test.key}, | ||
Txn: test.argTransaction.TxnMeta, | ||
ErrorIfMissing: test.errorFlag, | ||
}, | ||
} | ||
// TODO: Verify the response also. | ||
cArgs.EvalCtx = evalCtx.EvalContext() | ||
var resp roachpb.QueryIntentResponse | ||
_, err := QueryIntent(ctx, db, cArgs, &resp) | ||
if test.expectError { | ||
require.Error(t, err) | ||
} else { | ||
require.NoError(t, err) | ||
} | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters