Skip to content

Commit aac9e9f

Browse files
sakthivelmaniisakthivelmanii
committed
Update connection property name
1 parent e272679 commit aac9e9f

File tree

11 files changed

+650
-650
lines changed

11 files changed

+650
-650
lines changed

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
import static com.google.cloud.spanner.connection.ConnectionProperties.AUTO_BATCH_DML_UPDATE_COUNT;
2626
import static com.google.cloud.spanner.connection.ConnectionProperties.AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION;
2727
import static com.google.cloud.spanner.connection.ConnectionProperties.AUTO_PARTITION_MODE;
28+
import static com.google.cloud.spanner.connection.ConnectionProperties.BATCH_DML_UPDATE_COUNT;
2829
import static com.google.cloud.spanner.connection.ConnectionProperties.DATA_BOOST_ENABLED;
2930
import static com.google.cloud.spanner.connection.ConnectionProperties.DDL_IN_TRANSACTION_MODE;
3031
import static com.google.cloud.spanner.connection.ConnectionProperties.DEFAULT_ISOLATION_LEVEL;
3132
import static com.google.cloud.spanner.connection.ConnectionProperties.DEFAULT_SEQUENCE_KIND;
3233
import static com.google.cloud.spanner.connection.ConnectionProperties.DELAY_TRANSACTION_START_UNTIL_FIRST_WRITE;
3334
import static com.google.cloud.spanner.connection.ConnectionProperties.DIRECTED_READ;
34-
import static com.google.cloud.spanner.connection.ConnectionProperties.DML_BATCH_UPDATE_COUNT;
3535
import static com.google.cloud.spanner.connection.ConnectionProperties.KEEP_TRANSACTION_ALIVE;
3636
import static com.google.cloud.spanner.connection.ConnectionProperties.MAX_COMMIT_DELAY;
3737
import static com.google.cloud.spanner.connection.ConnectionProperties.MAX_PARTITIONED_PARALLELISM;
@@ -1609,7 +1609,7 @@ public long getAutoBatchDmlUpdateCount() {
16091609
}
16101610

16111611
long getDmlBatchUpdateCount() {
1612-
return getConnectionPropertyValue(DML_BATCH_UPDATE_COUNT);
1612+
return getConnectionPropertyValue(BATCH_DML_UPDATE_COUNT);
16131613
}
16141614

16151615
@Override
@@ -1622,8 +1622,8 @@ public boolean isAutoBatchDmlUpdateCountVerification() {
16221622
return getConnectionPropertyValue(AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION);
16231623
}
16241624

1625-
void setDmlBatchUpdateCount(long updateCount, boolean local) {
1626-
setConnectionPropertyValue(DML_BATCH_UPDATE_COUNT, updateCount, local);
1625+
void setBatchDmlUpdateCount(long updateCount, boolean local) {
1626+
setConnectionPropertyValue(BATCH_DML_UPDATE_COUNT, updateCount, local);
16271627
}
16281628

16291629
@Override

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public class ConnectionOptions {
181181
static final boolean DEFAULT_ENABLE_END_TO_END_TRACING = false;
182182
static final boolean DEFAULT_AUTO_BATCH_DML = false;
183183
static final long DEFAULT_AUTO_BATCH_DML_UPDATE_COUNT = 1L;
184-
static final long DEFAULT_DML_BATCH_UPDATE_COUNT = -1L;
184+
static final long DEFAULT_BATCH_DML_UPDATE_COUNT = -1L;
185185
static final boolean DEFAULT_AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION = true;
186186
private static final String EXPERIMENTAL_HOST_PROJECT_ID = "default";
187187
private static final String DEFAULT_EXPERIMENTAL_HOST_INSTANCE_ID = "default";
@@ -315,7 +315,7 @@ public class ConnectionOptions {
315315
"auto_batch_dml_update_count";
316316
public static final String AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION_PROPERTY_NAME =
317317
"auto_batch_dml_update_count_verification";
318-
public static final String DML_BATCH_UPDATE_COUNT_PROPERTY_NAME = "dml_batch_update_count";
318+
public static final String BATCH_DML_UPDATE_COUNT_PROPERTY_NAME = "batch_dml_update_count";
319319

320320
private static final String GUARDED_CONNECTION_PROPERTY_ERROR_MESSAGE =
321321
"%s can only be used if the system property %s has been set to true. "

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionProperties.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static com.google.cloud.spanner.connection.ConnectionOptions.AUTO_BATCH_DML_UPDATE_COUNT_PROPERTY_NAME;
2222
import static com.google.cloud.spanner.connection.ConnectionOptions.AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION_PROPERTY_NAME;
2323
import static com.google.cloud.spanner.connection.ConnectionOptions.AUTO_PARTITION_MODE_PROPERTY_NAME;
24+
import static com.google.cloud.spanner.connection.ConnectionOptions.BATCH_DML_UPDATE_COUNT_PROPERTY_NAME;
2425
import static com.google.cloud.spanner.connection.ConnectionOptions.CHANNEL_PROVIDER_PROPERTY_NAME;
2526
import static com.google.cloud.spanner.connection.ConnectionOptions.CLIENT_CERTIFICATE_PROPERTY_NAME;
2627
import static com.google.cloud.spanner.connection.ConnectionOptions.CLIENT_KEY_PROPERTY_NAME;
@@ -34,6 +35,7 @@
3435
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_AUTO_BATCH_DML_UPDATE_COUNT;
3536
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION;
3637
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_AUTO_PARTITION_MODE;
38+
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_BATCH_DML_UPDATE_COUNT;
3739
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_CHANNEL_PROVIDER;
3840
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_CLIENT_CERTIFICATE;
3941
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_CLIENT_KEY;
@@ -43,7 +45,6 @@
4345
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_DDL_IN_TRANSACTION_MODE;
4446
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_DEFAULT_SEQUENCE_KIND;
4547
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_DELAY_TRANSACTION_START_UNTIL_FIRST_WRITE;
46-
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_DML_BATCH_UPDATE_COUNT;
4748
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_ENABLE_API_TRACING;
4849
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_ENABLE_END_TO_END_TRACING;
4950
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_ENABLE_EXTENDED_TRACING;
@@ -73,7 +74,6 @@
7374
import static com.google.cloud.spanner.connection.ConnectionOptions.DEFAULT_USE_VIRTUAL_THREADS;
7475
import static com.google.cloud.spanner.connection.ConnectionOptions.DELAY_TRANSACTION_START_UNTIL_FIRST_WRITE_NAME;
7576
import static com.google.cloud.spanner.connection.ConnectionOptions.DIALECT_PROPERTY_NAME;
76-
import static com.google.cloud.spanner.connection.ConnectionOptions.DML_BATCH_UPDATE_COUNT_PROPERTY_NAME;
7777
import static com.google.cloud.spanner.connection.ConnectionOptions.ENABLE_API_TRACING_PROPERTY_NAME;
7878
import static com.google.cloud.spanner.connection.ConnectionOptions.ENABLE_END_TO_END_TRACING_PROPERTY_NAME;
7979
import static com.google.cloud.spanner.connection.ConnectionOptions.ENABLE_EXTENDED_TRACING_PROPERTY_NAME;
@@ -749,13 +749,13 @@ public class ConnectionProperties {
749749
BOOLEANS,
750750
BooleanConverter.INSTANCE,
751751
Context.USER);
752-
static final ConnectionProperty<Long> DML_BATCH_UPDATE_COUNT =
752+
static final ConnectionProperty<Long> BATCH_DML_UPDATE_COUNT =
753753
create(
754-
DML_BATCH_UPDATE_COUNT_PROPERTY_NAME,
754+
BATCH_DML_UPDATE_COUNT_PROPERTY_NAME,
755755
"The update count that is returned for DML statements that are executed in an "
756756
+ "explicit DML batch. The default is "
757-
+ DEFAULT_DML_BATCH_UPDATE_COUNT,
758-
DEFAULT_DML_BATCH_UPDATE_COUNT,
757+
+ DEFAULT_BATCH_DML_UPDATE_COUNT,
758+
DEFAULT_BATCH_DML_UPDATE_COUNT,
759759
LongConverter.INSTANCE,
760760
Context.USER);
761761

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ StatementResult statementSetPgSessionCharacteristicsTransactionMode(
184184

185185
StatementResult statementRunPartitionedQuery(Statement statement);
186186

187-
StatementResult statementSetDmlBatchUpdateCount(Long updateCount, Boolean local);
187+
StatementResult statementSetBatchDmlUpdateCount(Long updateCount, Boolean local);
188188

189189
StatementResult statementSetAutoBatchDml(Boolean autoBatchDml);
190190

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_AUTO_BATCH_DML_UPDATE_COUNT;
3030
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION;
3131
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_AUTO_PARTITION_MODE;
32+
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_BATCH_DML_UPDATE_COUNT;
3233
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_DATA_BOOST_ENABLED;
3334
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_DEFAULT_TRANSACTION_ISOLATION;
3435
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_DELAY_TRANSACTION_START_UNTIL_FIRST_WRITE;
3536
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_DIRECTED_READ;
36-
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_DML_BATCH_UPDATE_COUNT;
3737
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_EXCLUDE_TXN_FROM_CHANGE_STREAMS;
3838
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_KEEP_TRANSACTION_ALIVE;
3939
import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_MAX_COMMIT_DELAY;
@@ -728,9 +728,9 @@ public StatementResult statementRunPartitionedQuery(Statement statement) {
728728
}
729729

730730
@Override
731-
public StatementResult statementSetDmlBatchUpdateCount(Long updateCount, Boolean local) {
732-
getConnection().setDmlBatchUpdateCount(updateCount, local);
733-
return noResult(SET_DML_BATCH_UPDATE_COUNT);
731+
public StatementResult statementSetBatchDmlUpdateCount(Long updateCount, Boolean local) {
732+
getConnection().setBatchDmlUpdateCount(updateCount, local);
733+
return noResult(SET_BATCH_DML_UPDATE_COUNT);
734734
}
735735

736736
@Override

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/StatementResult.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ enum ClientSideStatementType {
120120
SHOW_AUTO_BATCH_DML,
121121
SET_AUTO_BATCH_DML_UPDATE_COUNT,
122122
SHOW_AUTO_BATCH_DML_UPDATE_COUNT,
123-
SET_DML_BATCH_UPDATE_COUNT,
123+
SET_BATCH_DML_UPDATE_COUNT,
124124
SET_AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION,
125125
SHOW_AUTO_BATCH_DML_UPDATE_COUNT_VERIFICATION,
126126
SHOW_READ_LOCK_MODE,

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -754,21 +754,21 @@
754754
}
755755
},
756756
{
757-
"name": "SET [LOCAL] DML_BATCH_UPDATE_COUNT = <INT64>",
757+
"name": "SET [LOCAL] BATCH_DML_UPDATE_COUNT = <INT64>",
758758
"executorName": "ClientSideStatementSetExecutor",
759759
"resultType": "NO_RESULT",
760-
"statementType": "SET_DML_BATCH_UPDATE_COUNT",
761-
"regex": "(?is)\\A\\s*set\\s+((?:session|local)\\s+)?dml_batch_update_count\\s*(?:=)\\s*(.*)\\z",
762-
"method": "statementSetDmlBatchUpdateCount",
760+
"statementType": "SET_BATCH_DML_UPDATE_COUNT",
761+
"regex": "(?is)\\A\\s*set\\s+((?:session|local)\\s+)?batch_dml_update_count\\s*(?:=)\\s*(.*)\\z",
762+
"method": "statementSetBatchDmlUpdateCount",
763763
"exampleStatements": [
764-
"set local dml_batch_update_count = 0",
765-
"set local dml_batch_update_count = 100",
766-
"set dml_batch_update_count = 1",
767-
"set dml_batch_update_count = 100"
764+
"set local batch_dml_update_count = 0",
765+
"set local batch_dml_update_count = 100",
766+
"set batch_dml_update_count = 1",
767+
"set batch_dml_update_count = 100"
768768
],
769769
"examplePrerequisiteStatements": ["set readonly = false", "set autocommit = false"],
770770
"setStatement": {
771-
"propertyName": "DML_BATCH_UPDATE_COUNT",
771+
"propertyName": "BATCH_DML_UPDATE_COUNT",
772772
"separator": "(?:=|\\s+TO\\s+)",
773773
"allowedValues": "(\\d{1,19})",
774774
"converterName": "ClientSideStatementValueConverters$LongConverter"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -967,22 +967,22 @@
967967
}
968968
},
969969
{
970-
"name": "SET [LOCAL] SPANNER.DML_BATCH_UPDATE_COUNT =|TO <bigint>",
970+
"name": "SET [LOCAL] SPANNER.BATCH_DML_UPDATE_COUNT =|TO <bigint>",
971971
"executorName": "ClientSideStatementSetExecutor",
972972
"resultType": "NO_RESULT",
973-
"statementType": "SET_DML_BATCH_UPDATE_COUNT",
974-
"regex": "(?is)\\A\\s*set\\s+((?:session|local)\\s+)?spanner\\.dml_batch_update_count(?:\\s*=\\s*|\\s+to\\s+)(.*)\\z",
975-
"method": "statementSetDmlBatchUpdateCount",
973+
"statementType": "SET_BATCH_DML_UPDATE_COUNT",
974+
"regex": "(?is)\\A\\s*set\\s+((?:session|local)\\s+)?spanner\\.batch_dml_update_count(?:\\s*=\\s*|\\s+to\\s+)(.*)\\z",
975+
"method": "statementSetBatchDmlUpdateCount",
976976
"exampleStatements": [
977-
"set local spanner.dml_batch_update_count = 0",
978-
"set local spanner.dml_batch_update_count = 100",
979-
"set local spanner.dml_batch_update_count to 1",
980-
"set spanner.dml_batch_update_count to 1",
981-
"set spanner.dml_batch_update_count = 1"
977+
"set local spanner.batch_dml_update_count = 0",
978+
"set local spanner.batch_dml_update_count = 100",
979+
"set local spanner.batch_dml_update_count to 1",
980+
"set spanner.batch_dml_update_count to 1",
981+
"set spanner.batch_dml_update_count = 1"
982982
],
983983
"examplePrerequisiteStatements": ["set spanner.readonly = false", "set autocommit = false"],
984984
"setStatement": {
985-
"propertyName": "SPANNER.DML_BATCH_UPDATE_COUNT",
985+
"propertyName": "SPANNER.BATCH_DML_UPDATE_COUNT",
986986
"separator": "(?:=|\\s+TO\\s+)",
987987
"allowedValues": "(\\d{1,19})",
988988
"converterName": "ClientSideStatementValueConverters$LongConverter"

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionAsyncApiTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public void testDmlBatchUpdateCount() {
351351
try {
352352
try (Connection connection = createConnection()) {
353353
connection.execute(
354-
Statement.of("set local " + prefix + "dml_batch_update_count = 1"));
354+
Statement.of("set local " + prefix + "batch_dml_update_count = 1"));
355355
connection.execute(Statement.of("START BATCH DML"));
356356
List<Statement> statements = Arrays.asList(INSERT_STATEMENT, INSERT_STATEMENT);
357357
long[] updateCounts = connection.executeBatchUpdate(statements);

0 commit comments

Comments
 (0)