Skip to content

Commit

Permalink
opt: fix autocommit_nonmetamorphic
Browse files Browse the repository at this point in the history 
Another instance of a test that was not updated because it didn't run
in the original CI or bors run.

Release note: None
  • Loading branch information
@RaduBerinde
RaduBerinde committed Jan 20, 2021
1 parent d367a98 commit d252400
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions pkg/sql/opt/exec/execbuilder/testdata/autocommit_nonmetamorphic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut, 1 EndTxn to (n1,s1):1

# TODO(radu): allow non-side-effecting projections.
Expand All @@ -133,6 +134,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Insert with RETURNING statement with side-effects should not auto-commit.
Expand All @@ -157,6 +159,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Another way to test the scenario above: generate an error and ensure that the
Expand Down Expand Up @@ -192,6 +195,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 Put, 1 EndTxn to (n1,s1):1

# Multi-row upsert should auto-commit.
Expand All @@ -213,6 +217,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 Put, 1 EndTxn to (n1,s1):1

# No auto-commit inside a transaction.
Expand Down Expand Up @@ -261,6 +266,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 2 Put, 1 EndTxn to (n1,s1):1

# TODO(radu): allow non-side-effecting projections.
Expand All @@ -284,6 +290,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Upsert with RETURNING statement with side-effects should not auto-commit.
Expand All @@ -308,6 +315,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Another way to test the scenario above: generate an error and ensure that the
Expand Down Expand Up @@ -343,6 +351,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put, 1 EndTxn to (n1,s1):1

Expand Down Expand Up @@ -394,6 +403,8 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put, 1 EndTxn to (n1,s1):1

# TODO(radu): allow non-side-effecting projections.
Expand All @@ -418,6 +429,8 @@ WHERE message LIKE '%r$rangeid: sending batch%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Update with RETURNING statement with side-effects should not auto-commit.
Expand All @@ -443,6 +456,8 @@ WHERE message LIKE '%r$rangeid: sending batch%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

# Another way to test the scenario above: generate an error and ensure that the
Expand Down Expand Up @@ -478,6 +493,8 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 DelRng, 1 EndTxn to (n1,s1):1

# Multi-row delete should auto-commit.
Expand All @@ -499,6 +516,8 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Put to (n1,s1):1
dist sender send r35: sending batch 1 DelRng, 1 EndTxn to (n1,s1):1

# No auto-commit inside a transaction.
Expand Down Expand Up @@ -547,6 +566,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%PushTxn%'
AND message NOT LIKE '%QueryTxn%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Del, 1 EndTxn to (n1,s1):1

Expand All @@ -570,6 +590,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Del to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
Expand All @@ -595,6 +616,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 2 Del to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
Expand Down Expand Up @@ -644,6 +666,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 Scan to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
Expand All @@ -667,6 +690,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 1 Put to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
Expand All @@ -692,6 +716,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 1 Del to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
Expand Down Expand Up @@ -720,6 +745,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 1 Scan to (n1,s1):1
dist sender send r35: sending batch 1 Del, 1 EndTxn to (n1,s1):1

Expand Down Expand Up @@ -749,6 +775,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1
Expand All @@ -774,6 +801,7 @@ WHERE message LIKE '%r$rangeid: sending batch%'
AND message NOT LIKE '%QueryTxn%'
AND operation NOT LIKE '%async%'
----
dist sender send r35: sending batch 1 DelRng to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 2 CPut to (n1,s1):1
dist sender send r35: sending batch 1 EndTxn to (n1,s1):1

0 comments on commit d252400

Please sign in to comment.