Skip to content

Commit 33aa21c

Browse files
feat: Default transaction isolation (#1998)
* Added code for supporting not deferrable and setting transaction isolation to default * added tests * Update ClientSideStatementValueConverters.java * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 5e8dc0f commit 33aa21c

File tree

4 files changed

+63
-7
lines changed

4 files changed

+63
-7
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatementValueConverters.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,9 @@ public Class<PgTransactionMode> getParameterClass() {
382382
public PgTransactionMode convert(String value) {
383383
PgTransactionMode mode = new PgTransactionMode();
384384
// Transaction mode may contain multiple spaces.
385+
String valueWithoutDeferrable = value.replaceAll("(?i)(not\\s+deferrable)", " ");
385386
String valueWithSingleSpaces =
386-
value.replaceAll("\\s+", " ").toLowerCase(Locale.ENGLISH).trim();
387+
valueWithoutDeferrable.replaceAll("\\s+", " ").toLowerCase(Locale.ENGLISH).trim();
387388
int currentIndex = 0;
388389
while (currentIndex < valueWithSingleSpaces.length()) {
389390
// This will use the last access mode and isolation level that is encountered in the string.

google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/PG_ClientSideStatements.json

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@
159159
"exampleStatements": []
160160
},
161161
{
162-
"name": "{START | BEGIN} [TRANSACTION | WORK] [{ (READ ONLY|READ WRITE) [[,] (ISOLATION LEVEL (DEFAULT|SERIALIZABLE))] }]",
162+
"name": "{START | BEGIN} [TRANSACTION | WORK] [{ (READ ONLY|READ WRITE) [[,] (ISOLATION LEVEL (DEFAULT|SERIALIZABLE))] [[,] NOT DEFERRABLE]}]",
163163
"executorName": "ClientSideStatementPgBeginExecutor",
164164
"resultType": "NO_RESULT",
165165
"statementType": "BEGIN",
166-
"regex": "(?is)\\A\\s*(?:begin|start)(?:\\s+transaction|\\s+work)?((?:(?:\\s+|\\s*,\\s*)read\\s+only|(?:\\s+|\\s*,\\s*)read\\s+write|(?:\\s+|\\s*,\\s*)isolation\\s+level\\s+default|(?:\\s+|\\s*,\\s*)isolation\\s+level\\s+serializable)*)?\\s*\\z",
166+
"regex": "(?is)\\A\\s*(?:begin|start)(?:\\s+transaction|\\s+work)?((?:(?:\\s+|\\s*,\\s*)read\\s+only|(?:\\s+|\\s*,\\s*)read\\s+write|(?:\\s+|\\s*,\\s*)isolation\\s+level\\s+default|(?:\\s+|\\s*,\\s*)isolation\\s+level\\s+serializable|(?:\\s+|\\s*,\\s*)not\\s+deferrable)*)?\\s*\\z",
167167
"method": "statementBeginPgTransaction",
168168
"exampleStatements": [
169169
"begin", "start", "begin transaction", "start transaction", "begin work", "start work",
@@ -173,7 +173,23 @@
173173
"begin isolation level serializable", "start isolation level serializable", "begin transaction isolation level serializable", "start transaction isolation level serializable", "begin work isolation level serializable", "start work isolation level serializable",
174174
"begin isolation level default read write", "start isolation level default read only", "begin transaction isolation level default read only", "start transaction isolation level default read write", "begin work isolation level default read write", "start work isolation level default read only",
175175
"begin isolation level serializable read write", "start isolation level serializable read write", "begin transaction isolation level serializable read only", "start transaction isolation level serializable read write", "begin work isolation level serializable read write", "start work isolation level serializable read only",
176-
"begin isolation level serializable, read write", "start isolation level serializable, read write", "begin transaction isolation level serializable, read only", "start transaction isolation level serializable, read write", "begin work isolation level serializable, read write", "start work isolation level serializable, read only"
176+
"begin isolation level serializable, read write", "start isolation level serializable, read write", "begin transaction isolation level serializable, read only", "start transaction isolation level serializable, read write", "begin work isolation level serializable, read write", "start work isolation level serializable, read only",
177+
"begin not deferrable", "start not deferrable", "begin transaction not deferrable", "start transaction not deferrable", "begin work not deferrable", "start work not deferrable",
178+
"begin read only not deferrable", "start read only not deferrable", "begin transaction read only not deferrable", "start transaction read only not deferrable", "begin work read only not deferrable", "start work read only not deferrable",
179+
"begin read write not deferrable", "start read write not deferrable", "begin transaction read write not deferrable", "start transaction read write not deferrable", "begin work read write not deferrable", "start work read write not deferrable",
180+
"begin isolation level default not deferrable", "start isolation level default not deferrable", "begin transaction isolation level default not deferrable", "start transaction isolation level default not deferrable", "begin work isolation level default not deferrable", "start work isolation level default not deferrable",
181+
"begin isolation level serializable not deferrable", "start isolation level serializable not deferrable", "begin transaction isolation level serializable not deferrable", "start transaction isolation level serializable not deferrable", "begin work isolation level serializable not deferrable", "start work isolation level serializable not deferrable",
182+
"begin isolation level default read write not deferrable", "start isolation level default read only not deferrable", "begin transaction isolation level default read only not deferrable", "start transaction isolation level default read write not deferrable", "begin work isolation level default read write not deferrable", "start work isolation level default read only not deferrable",
183+
"begin isolation level serializable read write not deferrable", "start isolation level serializable read write not deferrable", "begin transaction isolation level serializable read only not deferrable", "start transaction isolation level serializable read write not deferrable", "begin work isolation level serializable read write not deferrable", "start work isolation level serializable read only not deferrable",
184+
"begin isolation level serializable, read write, not deferrable", "start isolation level serializable, read write, not deferrable", "begin transaction isolation level serializable, read only, not deferrable", "start transaction isolation level serializable, read write, not deferrable", "begin work isolation level serializable, read write, not deferrable", "start work isolation level serializable, read only",
185+
"begin transaction not deferrable", "start transaction not deferrable", "begin work not deferrable", "start work not deferrable",
186+
"begin not deferrable read only", "start read only", "begin transaction not deferrable read only", "start transaction read only", "begin work not deferrable read only", "start work read only",
187+
"begin not deferrable read write", "start read write", "begin transaction not deferrable read write", "start transaction read write", "begin work not deferrable read write", "start work read write",
188+
"begin not deferrable isolation level default", "start isolation level default", "begin transaction not deferrable isolation level default", "start transaction isolation level default", "begin work not deferrable isolation level default", "start work isolation level default",
189+
"begin not deferrable isolation level serializable", "start isolation level serializable", "begin transaction not deferrable isolation level serializable", "start transaction isolation level serializable", "begin work not deferrable isolation level serializable", "start work isolation level serializable",
190+
"begin not deferrable isolation level default read write", "start isolation level default read only", "begin transaction not deferrable isolation level default read only", "start transaction isolation level default read write", "begin work not deferrable isolation level default read write", "start work isolation level default read only",
191+
"begin not deferrable isolation level serializable read write", "start isolation level serializable read write", "begin transaction not deferrable isolation level serializable read only", "start transaction isolation level serializable read write", "begin work not deferrable isolation level serializable read write", "start work isolation level serializable read only",
192+
"begin not deferrable isolation level serializable, read write", "start isolation level serializable, read write", "begin transaction not deferrable isolation level serializable, read only", "start transaction isolation level serializable, read write", "begin work not deferrable isolation level serializable, read write", "start work isolation level serializable, read only"
177193
]
178194
},
179195
{
@@ -360,7 +376,7 @@
360376
}
361377
},
362378
{
363-
"name": "SET DEFAULT_TRANSACTION_ISOLATION =|TO 'SERIALIZABLE'|SERIALIZABLE",
379+
"name": "SET DEFAULT_TRANSACTION_ISOLATION =|TO 'SERIALIZABLE'|SERIALIZABLE|DEFAULT",
364380
"executorName": "ClientSideStatementSetExecutor",
365381
"resultType": "NO_RESULT",
366382
"statementType": "SET_READONLY",
@@ -371,12 +387,14 @@
371387
"set default_transaction_isolation to serializable",
372388
"set default_transaction_isolation to 'serializable'",
373389
"set default_transaction_isolation = 'serializable'",
374-
"set default_transaction_isolation = \"SERIALIZABLE\""
390+
"set default_transaction_isolation = \"SERIALIZABLE\"",
391+
"set default_transaction_isolation = DEFAULT",
392+
"set default_transaction_isolation to DEFAULT"
375393
],
376394
"setStatement": {
377395
"propertyName": "default_transaction_isolation",
378396
"separator": "(?:=|\\s+TO\\s+)",
379-
"allowedValues": "(SERIALIZABLE|'SERIALIZABLE'|\"SERIALIZABLE\")",
397+
"allowedValues": "(SERIALIZABLE|'SERIALIZABLE'|\"SERIALIZABLE\"|DEFAULT)",
380398
"converterName": "ClientSideStatementValueConverters$PgTransactionIsolationConverter"
381399
}
382400
},

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/BeginPgTransactionTest.java

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,37 @@ public void testBeginReadOnlyWithIsolationLevel() {
148148
index++;
149149
}
150150
}
151+
152+
@Test
153+
public void testBeginWithNotDeferrable() {
154+
ConnectionImpl connection = mock(ConnectionImpl.class);
155+
ConnectionStatementExecutorImpl executor = new ConnectionStatementExecutorImpl(connection);
156+
157+
int index = 1;
158+
for (String sql :
159+
ImmutableList.of(
160+
"begin read only isolation level serializable not deferrable",
161+
"begin read only isolation level default not deferrable",
162+
"begin isolation level serializable read only not deferrable",
163+
"begin isolation level default read only not deferrable",
164+
"begin read write isolation level default read only not deferrable",
165+
"begin read write, isolation level default, read only not deferrable",
166+
"begin read write , \nisolation level default\n\t,read only \n\n not \t deferrable",
167+
"begin not deferrable read only isolation level serializable",
168+
"begin not deferrable read only isolation level default",
169+
"begin not deferrable isolation level serializable read only",
170+
"begin not deferrable isolation level default read only",
171+
"begin not deferrable read write isolation level default read only",
172+
"begin not deferrable read write, isolation level default, read only",
173+
"begin not deferrable read write , \nisolation level default\n\t,read only")) {
174+
ParsedStatement statement = parser.parse(Statement.of(sql));
175+
assertEquals(sql, StatementType.CLIENT_SIDE, statement.getType());
176+
statement.getClientSideStatement().execute(executor, sql);
177+
178+
verify(connection, times(index)).beginTransaction();
179+
verify(connection, times(index)).setTransactionMode(TransactionMode.READ_ONLY_TRANSACTION);
180+
verify(connection, never()).setTransactionMode(TransactionMode.READ_WRITE_TRANSACTION);
181+
index++;
182+
}
183+
}
151184
}

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SetPgSessionCharacteristicsTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ public void testDefaultTransactionIsolation() {
147147
"set default_transaction_isolation to 'serializable'",
148148
"set default_transaction_isolation to 'SERIALIZABLE'",
149149
"set default_transaction_isolation to \"SERIALIZABLE\"",
150+
"set default_transaction_isolation to default",
151+
"set default_transaction_isolation to DEFAULT",
152+
"set default_transaction_isolation = default",
153+
"set default_transaction_isolation = DEFAULT"
150154
}) {
151155
ParsedStatement statement = parser.parse(Statement.of(sql));
152156
assertEquals(sql, StatementType.CLIENT_SIDE, statement.getType());

0 commit comments

Comments
 (0)