Skip to content

Commit acca36d

Browse files
committed
add less expensive setContext instead of registerContext
1 parent 2b9dfdf commit acca36d

11 files changed

Lines changed: 222 additions & 227 deletions

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryArrowResultSet.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,10 @@ public void close() {
212212

213213
@Override
214214
public boolean next() throws SQLException {
215-
try (BigQueryJdbcMdc.MdcCloseable mdc =
216-
BigQueryJdbcMdc.registerInstance(this.connection, this.connectionId)) {
217-
LOG.finest("++enter++");
218-
checkClosed();
219-
return nextImpl();
220-
}
215+
BigQueryJdbcMdc.setContextPersistent(this.connectionId);
216+
LOG.finest("++enter++");
217+
checkClosed();
218+
return nextImpl();
221219
}
222220

223221
private boolean nextImpl() throws SQLException {
@@ -327,13 +325,11 @@ private Object getObjectInternal(int columnIndex) throws SQLException {
327325

328326
@Override
329327
public Object getObject(int columnIndex) throws SQLException {
330-
try (BigQueryJdbcMdc.MdcCloseable mdc =
331-
BigQueryJdbcMdc.registerInstance(this.connection, this.connectionId)) {
332-
// columnIndex is SQL index starting at 1
333-
LOG.finest("++enter++");
334-
checkClosed();
335-
return getObjectImpl(columnIndex);
336-
}
328+
BigQueryJdbcMdc.setContextPersistent(this.connectionId);
329+
// columnIndex is SQL index starting at 1
330+
LOG.finest("++enter++");
331+
checkClosed();
332+
return getObjectImpl(columnIndex);
337333
}
338334

339335
private Object getObjectImpl(int columnIndex) throws SQLException {

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnection.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -745,8 +745,7 @@ Long getListenerPoolSize() {
745745

746746
@Override
747747
public boolean isValid(int timeout) throws SQLException {
748-
try (BigQueryJdbcMdc.MdcCloseable mdc =
749-
BigQueryJdbcMdc.registerInstance(this, this.connectionId)) {
748+
try (BigQueryJdbcMdc.MdcCloseable mdc = BigQueryJdbcMdc.setContext(this.connectionId)) {
750749
LOG.finest("++enter++");
751750
LOG.info("Validating connection");
752751
if (timeout < 0) {
@@ -771,8 +770,7 @@ public boolean isValid(int timeout) throws SQLException {
771770

772771
@Override
773772
public void abort(Executor executor) throws SQLException {
774-
try (BigQueryJdbcMdc.MdcCloseable mdc =
775-
BigQueryJdbcMdc.registerInstance(this, this.connectionId)) {
773+
try (BigQueryJdbcMdc.MdcCloseable mdc = BigQueryJdbcMdc.setContext(this.connectionId)) {
776774
LOG.finest("++enter++");
777775
close();
778776
}
@@ -822,8 +820,7 @@ public void clearWarnings() {
822820

823821
@Override
824822
public boolean getAutoCommit() {
825-
try (BigQueryJdbcMdc.MdcCloseable mdc =
826-
BigQueryJdbcMdc.registerInstance(this, this.connectionId)) {
823+
try (BigQueryJdbcMdc.MdcCloseable mdc = BigQueryJdbcMdc.setContext(this.connectionId)) {
827824
LOG.finest("++enter++");
828825
checkClosed();
829826
return this.autoCommit;
@@ -832,8 +829,7 @@ public boolean getAutoCommit() {
832829

833830
@Override
834831
public void setAutoCommit(boolean autoCommit) throws SQLException {
835-
try (BigQueryJdbcMdc.MdcCloseable mdc =
836-
BigQueryJdbcMdc.registerInstance(this, this.connectionId)) {
832+
try (BigQueryJdbcMdc.MdcCloseable mdc = BigQueryJdbcMdc.setContext(this.connectionId)) {
837833
LOG.finest("++enter++");
838834
checkClosed();
839835
checkIfEnabledSession("setAutoCommit");
@@ -932,8 +928,7 @@ public int getTransactionIsolation() {
932928

933929
@Override
934930
public void setTransactionIsolation(int level) throws SQLException {
935-
try (BigQueryJdbcMdc.MdcCloseable mdc =
936-
BigQueryJdbcMdc.registerInstance(this, this.connectionId)) {
931+
try (BigQueryJdbcMdc.MdcCloseable mdc = BigQueryJdbcMdc.setContext(this.connectionId)) {
937932
LOG.finest("++enter++");
938933
if (level != Connection.TRANSACTION_SERIALIZABLE) {
939934
throw new BigQueryJdbcSqlFeatureNotSupportedException(
@@ -951,8 +946,7 @@ public int getHoldability() {
951946

952947
@Override
953948
public void setHoldability(int holdability) throws SQLException {
954-
try (BigQueryJdbcMdc.MdcCloseable mdc =
955-
BigQueryJdbcMdc.registerInstance(this, this.connectionId)) {
949+
try (BigQueryJdbcMdc.MdcCloseable mdc = BigQueryJdbcMdc.setContext(this.connectionId)) {
956950
if (holdability != ResultSet.CLOSE_CURSORS_AT_COMMIT) {
957951
throw new BigQueryJdbcSqlFeatureNotSupportedException(
958952
"CLOSE_CURSORS_AT_COMMIT not supported");

0 commit comments

Comments
 (0)