Skip to content

Commit 2c0decf

Browse files
olavloiteolavloite
committed
Merge branch 'main' into spanner-lib
2 parents 900e003 + 785aa77 commit 2c0decf

15 files changed

+420
-368
lines changed

‎aborted_transactions_test.go‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ func TestCommitAborted(t *testing.T) {
4848
if err != nil {
4949
t.Fatalf("commit failed: %v", err)
5050
}
51-
reqs := drainRequestsFromServer(server.TestSpanner)
52-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
51+
reqs := server.TestSpanner.DrainRequestsFromServer()
52+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
5353
if g, w := len(commitReqs), 2; g != w {
5454
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
5555
}
@@ -92,8 +92,8 @@ func TestCommitWithMutationsAborted(t *testing.T) {
9292
if err != nil {
9393
t.Fatalf("commit failed: %v", err)
9494
}
95-
reqs := drainRequestsFromServer(server.TestSpanner)
96-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
95+
reqs := server.TestSpanner.DrainRequestsFromServer()
96+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
9797
if g, w := len(commitReqs), 2; g != w {
9898
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
9999
}
@@ -125,8 +125,8 @@ func TestCommitAbortedWithInternalRetriesDisabled(t *testing.T) {
125125
if g, w := spanner.ErrCode(err), codes.Aborted; g != w {
126126
t.Fatalf("commit error code mismatch\nGot: %v\nWant: %v", g, w)
127127
}
128-
reqs := drainRequestsFromServer(server.TestSpanner)
129-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
128+
reqs := server.TestSpanner.DrainRequestsFromServer()
129+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
130130
if g, w := len(commitReqs), 1; g != w {
131131
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
132132
}
@@ -167,12 +167,12 @@ func TestUpdateAborted(t *testing.T) {
167167
if err != nil {
168168
t.Fatalf("commit failed: %v", err)
169169
}
170-
reqs := drainRequestsFromServer(server.TestSpanner)
171-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
170+
reqs := server.TestSpanner.DrainRequestsFromServer()
171+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
172172
if g, w := len(execReqs), 2; g != w {
173173
t.Fatalf("execute request count mismatch\nGot: %v\nWant: %v", g, w)
174174
}
175-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
175+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
176176
if g, w := len(commitReqs), 1; g != w {
177177
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
178178
}
@@ -211,12 +211,12 @@ func TestBatchUpdateAborted(t *testing.T) {
211211
if err != nil {
212212
t.Fatalf("commit failed: %v", err)
213213
}
214-
reqs := drainRequestsFromServer(server.TestSpanner)
215-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
214+
reqs := server.TestSpanner.DrainRequestsFromServer()
215+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
216216
if g, w := len(execReqs), 2; g != w {
217217
t.Fatalf("batch request count mismatch\nGot: %v\nWant: %v", g, w)
218218
}
219-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
219+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
220220
if g, w := len(commitReqs), 1; g != w {
221221
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
222222
}
@@ -488,12 +488,12 @@ func testRetryReadWriteTransactionWithQuery(t *testing.T, setupServer func(serve
488488
if err != wantCommitErr {
489489
t.Fatalf("commit error mismatch\nGot: %v\nWant: %v", err, wantCommitErr)
490490
}
491-
reqs := drainRequestsFromServer(server.TestSpanner)
492-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
491+
reqs := server.TestSpanner.DrainRequestsFromServer()
492+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
493493
if g, w := len(execReqs), wantSqlExecuteCount; g != w {
494494
t.Fatalf("execute request count mismatch\nGot: %v\nWant: %v", g, w)
495495
}
496-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
496+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
497497
if g, w := len(commitReqs), wantCommitCount; g != w {
498498
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
499499
}
@@ -568,8 +568,8 @@ func TestQueryAbortedHalfway_WithDifferentResultsInFirstHalf(t *testing.T) {
568568
t.Fatalf("failed to rollback transaction: %v", err)
569569
}
570570

571-
reqs := drainRequestsFromServer(server.TestSpanner)
572-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
571+
reqs := server.TestSpanner.DrainRequestsFromServer()
572+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
573573
if g, w := len(execReqs), 2; g != w {
574574
t.Fatalf("execute request count mismatch\nGot: %v\nWant: %v", g, w)
575575
}
@@ -651,8 +651,8 @@ func TestQueryAbortedHalfway_WithDifferentResultsInSecondHalf(t *testing.T) {
651651
t.Fatalf("failed to commit transaction: %v", err)
652652
}
653653

654-
reqs := drainRequestsFromServer(server.TestSpanner)
655-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
654+
reqs := server.TestSpanner.DrainRequestsFromServer()
655+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
656656
if g, w := len(execReqs), 2; g != w {
657657
t.Fatalf("execute request count mismatch\nGot: %v\nWant: %v", g, w)
658658
}
@@ -702,14 +702,14 @@ func TestSecondUpdateAborted(t *testing.T) {
702702
if err != nil {
703703
t.Fatalf("commit failed: %v", err)
704704
}
705-
reqs := drainRequestsFromServer(server.TestSpanner)
706-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
705+
reqs := server.TestSpanner.DrainRequestsFromServer()
706+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
707707
// The server should receive 4 execute statements, as each update statement should
708708
// be executed twice.
709709
if g, w := len(execReqs), 4; g != w {
710710
t.Fatalf("execute request count mismatch\nGot: %v\nWant: %v", g, w)
711711
}
712-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
712+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
713713
if g, w := len(commitReqs), 1; g != w {
714714
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
715715
}
@@ -761,14 +761,14 @@ func TestSecondBatchUpdateAborted(t *testing.T) {
761761
if err := tx.Commit(); err != nil {
762762
t.Fatalf("commit failed: %v", err)
763763
}
764-
reqs := drainRequestsFromServer(server.TestSpanner)
765-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
764+
reqs := server.TestSpanner.DrainRequestsFromServer()
765+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
766766
// The server should receive 4 batch statements, as each update statement should
767767
// be executed twice.
768768
if g, w := len(execReqs), 4; g != w {
769769
t.Fatalf("batch request count mismatch\nGot: %v\nWant: %v", g, w)
770770
}
771-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
771+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
772772
if g, w := len(commitReqs), 1; g != w {
773773
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
774774
}
@@ -823,14 +823,14 @@ func TestSecondUpdateAborted_FirstStatementWithSameError(t *testing.T) {
823823
if err != nil {
824824
t.Fatalf("commit failed: %v", err)
825825
}
826-
reqs := drainRequestsFromServer(server.TestSpanner)
827-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
826+
reqs := server.TestSpanner.DrainRequestsFromServer()
827+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
828828
// The server should receive 4 execute statements, as each update statement should
829829
// be executed twice.
830830
if g, w := len(execReqs), 4; g != w {
831831
t.Fatalf("execute request count mismatch\nGot: %v\nWant: %v", g, w)
832832
}
833-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
833+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
834834
if g, w := len(commitReqs), 1; g != w {
835835
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
836836
}
@@ -912,8 +912,8 @@ func testSecondUpdateAborted_FirstResultChanged(t *testing.T, firstResult *testu
912912
if err := tx.Rollback(); err != nil {
913913
t.Fatalf("failed to rollback transaction: %v", err)
914914
}
915-
reqs := drainRequestsFromServer(server.TestSpanner)
916-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
915+
reqs := server.TestSpanner.DrainRequestsFromServer()
916+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
917917
// The server should receive 3 execute statements, as only the first statement is retried.
918918
if g, w := len(execReqs), 3; g != w {
919919
t.Fatalf("execute request count mismatch\nGot: %v\nWant: %v", g, w)
@@ -973,12 +973,12 @@ func TestBatchUpdateAbortedWithError(t *testing.T) {
973973
if err != nil {
974974
t.Fatalf("commit failed: %v", err)
975975
}
976-
reqs := drainRequestsFromServer(server.TestSpanner)
977-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
976+
reqs := server.TestSpanner.DrainRequestsFromServer()
977+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
978978
if g, w := len(execReqs), 2; g != w {
979979
t.Fatalf("batch request count mismatch\nGot: %v\nWant: %v", g, w)
980980
}
981-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
981+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
982982
if g, w := len(commitReqs), 2; g != w {
983983
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
984984
}
@@ -1037,12 +1037,12 @@ func TestBatchUpdateAbortedWithError_DifferentRowCountDuringRetry(t *testing.T)
10371037
if err != ErrAbortedDueToConcurrentModification {
10381038
t.Fatalf("commit error mismatch\nGot: %v\nWant: %v", err, ErrAbortedDueToConcurrentModification)
10391039
}
1040-
reqs := drainRequestsFromServer(server.TestSpanner)
1041-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
1040+
reqs := server.TestSpanner.DrainRequestsFromServer()
1041+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
10421042
if g, w := len(execReqs), 2; g != w {
10431043
t.Fatalf("batch request count mismatch\nGot: %v\nWant: %v", g, w)
10441044
}
1045-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
1045+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
10461046
// The commit should be attempted only once.
10471047
if g, w := len(commitReqs), 1; g != w {
10481048
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
@@ -1096,8 +1096,8 @@ func TestBatchUpdateAbortedWithError_DifferentErrorDuringRetry(t *testing.T) {
10961096
if err != ErrAbortedDueToConcurrentModification {
10971097
t.Fatalf("commit error mismatch\n Got: %v\nWant: %v", err, ErrAbortedDueToConcurrentModification)
10981098
}
1099-
reqs := drainRequestsFromServer(server.TestSpanner)
1100-
execReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
1099+
reqs := server.TestSpanner.DrainRequestsFromServer()
1100+
execReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.ExecuteBatchDmlRequest{}))
11011101
// There are 3 ExecuteBatchDmlRequests sent to Spanner:
11021102
// 1. An initial attempt with a BeginTransaction RPC, but this returns a NotFound error.
11031103
// This causes the transaction to be retried with an explicit BeginTransaction request.
@@ -1106,7 +1106,7 @@ func TestBatchUpdateAbortedWithError_DifferentErrorDuringRetry(t *testing.T) {
11061106
if g, w := len(execReqs), 3; g != w {
11071107
t.Fatalf("batch request count mismatch\n Got: %v\nWant: %v", g, w)
11081108
}
1109-
commitReqs := requestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
1109+
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
11101110
// The commit should be attempted only once.
11111111
if g, w := len(commitReqs), 1; g != w {
11121112
t.Fatalf("commit request count mismatch\n Got: %v\nWant: %v", g, w)
@@ -1121,7 +1121,7 @@ func TestBatchUpdateAbortedWithError_DifferentErrorDuringRetry(t *testing.T) {
11211121
if req2.GetTransaction() == nil || req2.GetTransaction().GetId() == nil {
11221122
t.Fatal("the second ExecuteBatchDmlRequest should have a transaction id")
11231123
}
1124-
beginRequests := requestsOfType(reqs, reflect.TypeOf(&sppb.BeginTransactionRequest{}))
1124+
beginRequests := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.BeginTransactionRequest{}))
11251125
if g, w := len(beginRequests), 2; g != w {
11261126
t.Fatalf("begin request count mismatch\n Got: %v\nWant: %v", g, w)
11271127
}

0 commit comments

Comments
 (0)