Date: Wed, 14 Jul 2021 10:44:28 +0200
Subject: [PATCH 07/16] feat: add support for tagging to JDBC connection (#270)
* feat: add support for tagging to JDBC connection
* fix: add ignored differences + default implementations
---
clirr-ignored-differences.xml | 22 ++++++++++
.../jdbc/CloudSpannerJdbcConnection.java | 41 +++++++++++++++++++
.../cloud/spanner/jdbc/JdbcConnection.java | 32 +++++++++++++++
3 files changed, 95 insertions(+)
diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml
index ac9c147d1..0962d5e12 100644
--- a/clirr-ignored-differences.xml
+++ b/clirr-ignored-differences.xml
@@ -111,4 +111,26 @@
com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection
void setReturnCommitStats(boolean)
+
+
+
+ 7012
+ com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection
+ java.lang.String getTransactionTag()
+
+
+ 7012
+ com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection
+ void setTransactionTag(java.lang.String)
+
+
+ 7012
+ com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection
+ java.lang.String getStatementTag()
+
+
+ 7012
+ com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection
+ void setStatementTag(java.lang.String)
+
diff --git a/src/main/java/com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection.java b/src/main/java/com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection.java
index 4a5f001a8..50ae71c56 100644
--- a/src/main/java/com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection.java
+++ b/src/main/java/com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection.java
@@ -39,6 +39,47 @@
*/
public interface CloudSpannerJdbcConnection extends Connection {
+ /**
+ * Sets the transaction tag to use for the current transaction. This method may only be called
+ * when in a transaction, and before the transaction is actually started, i.e. before any
+ * statements have been executed in the transaction.
+ *
+ * The tag will be set as the transaction tag of all statements during the transaction, and as
+ * the transaction tag of the commit.
+ *
+ *
The transaction tag will automatically be cleared after the transaction has ended.
+ *
+ * @param tag The tag to use.
+ */
+ default void setTransactionTag(String tag) throws SQLException {
+ throw new UnsupportedOperationException();
+ };
+
+ /** @return The transaction tag of the current transaction. */
+ default String getTransactionTag() throws SQLException {
+ throw new UnsupportedOperationException();
+ };
+
+ /**
+ * Sets the statement tag to use for the next statement that will be executed. The tag is
+ * automatically cleared after the statement is executed. Statement tags can be used both with
+ * autocommit=true and autocommit=false, and can be used for partitioned DML.
+ *
+ * @param tag The statement tag to use with the next statement that will be executed on this
+ * connection.
+ */
+ default void setStatementTag(String tag) throws SQLException {
+ throw new UnsupportedOperationException();
+ };
+
+ /**
+ * @return The statement tag that will be used with the next statement that is executed on this
+ * connection.
+ */
+ default String getStatementTag() throws SQLException {
+ throw new UnsupportedOperationException();
+ };
+
/**
* Sets the transaction mode to use for current transaction. This method may only be called when
* in a transaction, and before the transaction is actually started, i.e. before any statements
diff --git a/src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java b/src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java
index bf9120f53..53c1dc096 100644
--- a/src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java
+++ b/src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java
@@ -78,6 +78,38 @@ public String nativeSQL(String sql) throws SQLException {
.sqlWithNamedParameters;
}
+ @Override
+ public String getStatementTag() throws SQLException {
+ checkClosed();
+ return getSpannerConnection().getStatementTag();
+ }
+
+ @Override
+ public void setStatementTag(String tag) throws SQLException {
+ checkClosed();
+ try {
+ getSpannerConnection().setStatementTag(tag);
+ } catch (SpannerException e) {
+ throw JdbcSqlExceptionFactory.of(e);
+ }
+ }
+
+ @Override
+ public String getTransactionTag() throws SQLException {
+ checkClosed();
+ return getSpannerConnection().getTransactionTag();
+ }
+
+ @Override
+ public void setTransactionTag(String tag) throws SQLException {
+ checkClosed();
+ try {
+ getSpannerConnection().setTransactionTag(tag);
+ } catch (SpannerException e) {
+ throw JdbcSqlExceptionFactory.of(e);
+ }
+ }
+
@Override
public void setTransactionMode(TransactionMode mode) throws SQLException {
checkClosed();
From 7a6953004fd1401a98f95ea3b351662eb8ab81d7 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot
Date: Wed, 14 Jul 2021 02:06:08 -0700
Subject: [PATCH 08/16] chore: regenerate README (#535)
This PR was generated using Autosynth. :rainbow:
Log from Synthtool
```
2021-07-14 08:46:45,315 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-spanner-jdbc/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-07-14 08:46:46,598 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.
```
googleapis/java-shared-config
### [`v0.13.1`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#0131-httpswwwgithubcomgoogleapisjava-shared-configcomparev0130v0131-2021-07-27)
[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.13.0...v0.13.1)
### [`v0.13.0`](https://togithub.com/googleapis/java-shared-config/releases/v0.13.0)
##### Features
- add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#264](https://www.github.com/googleapis/java-shared-config/issues/264)) ([d274af8](https://www.github.com/googleapis/java-shared-config/commit/d274af836ac9b3e98be84e551b7e9e552397ecc1))
##### Bug Fixes
- Add shopt -s nullglob to dependencies script ([865ca3c](https://www.github.com/googleapis/java-shared-config/commit/865ca3cbf106a7aaae1a989320a1ad5a47b6ffaf))
- Update dependencies.sh to not break on mac ([#276](https://www.github.com/googleapis/java-shared-config/issues/276)) ([865ca3c](https://www.github.com/googleapis/java-shared-config/commit/865ca3cbf106a7aaae1a989320a1ad5a47b6ffaf))
##### Dependencies
- update auto-value-annotation.version to v1.8.2 ([#275](https://www.github.com/googleapis/java-shared-config/issues/275)) ([4d15246](https://www.github.com/googleapis/java-shared-config/commit/4d152461a5592940a8be762c7a8698a02dbe26cf))
- update dependency com.puppycrawl.tools:checkstyle to v8.43 ([#266](https://www.github.com/googleapis/java-shared-config/issues/266)) ([fae7961](https://www.github.com/googleapis/java-shared-config/commit/fae7961412b33e34e8fcfec78d1451894d4e61d9))
- update dependency com.puppycrawl.tools:checkstyle to v8.44 ([#274](https://www.github.com/googleapis/java-shared-config/issues/274)) ([d53d0e0](https://www.github.com/googleapis/java-shared-config/commit/d53d0e0935e908d16f4e7cf763577cf3fd8128d3))
***
---
### Configuration
📅 **Schedule**: At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, check this box.
---
This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-spanner-jdbc).
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b5fc0bb7e..81b02cdd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 0.12.0
+ 0.13.1
From 96d3835e07def00057d17751dcbb847ee457cca9 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot
Date: Tue, 27 Jul 2021 14:12:31 -0700
Subject: [PATCH 12/16] chore: regenerate README (#542)
This PR was generated using Autosynth. :rainbow:
Log from Synthtool
```
2021-07-27 20:52:25,206 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-spanner-jdbc/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-07-27 20:52:26,466 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.
```