Skip to content

fix(bqjdbc): lazily instantiate Statement in BigQueryDatabaseMetaData #12752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Neenu1995 merged 3 commits into from
Apr 13, 2026
Merged

fix(bqjdbc): lazily instantiate Statement in BigQueryDatabaseMetaData #12752

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9426d1d
fix(bqjdbc): only create Statement object when necessary in BDMetaData
Neenu1995 Apr 10, 2026
11037e9
lint and closeOnCompletion
Neenu1995 Apr 10, 2026
dacadcc
chore: make dbMetadata field in Connection static
Neenu1995 Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion java-bigquery/google-cloud-bigquery-jdbc/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
drivers/**
target-it/**
target-it/**
*logs/**
59 changes: 29 additions & 30 deletions ...-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import java.sql.ResultSet;
import java.sql.RowIdLifetime;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -138,7 +139,6 @@ class BigQueryDatabaseMetaData implements DatabaseMetaData {

String URL;
BigQueryConnection connection;
private final BigQueryStatement statement;
private final BigQuery bigquery;
private final int metadataFetchThreadCount;
private static final AtomicReference<String> parsedDriverVersion = new AtomicReference<>(null);
Expand All @@ -150,7 +150,6 @@ class BigQueryDatabaseMetaData implements DatabaseMetaData {
BigQueryDatabaseMetaData(BigQueryConnection connection) throws SQLException {
this.URL = connection.getConnectionUrl();
this.connection = connection;
this.statement = connection.createStatement().unwrap(BigQueryStatement.class);
this.bigquery = connection.getBigQuery();
this.metadataFetchThreadCount = connection.getMetadataFetchThreadCount();
loadDriverVersionProperties();
Expand Down Expand Up @@ -945,7 +944,7 @@ public ResultSet getProcedures(
Thread fetcherThread = new Thread(procedureFetcher, "getProcedures-fetcher-" + catalog);
BigQueryJsonResultSet resultSet =
BigQueryJsonResultSet.of(
resultSchema, -1, queue, this.statement, new Thread[] {fetcherThread});
resultSchema, -1, queue, null, new Thread[] {fetcherThread});

fetcherThread.start();
LOG.info("Started background thread for getProcedures");
Expand Down Expand Up @@ -1208,7 +1207,7 @@ public ResultSet getProcedureColumns(
new Thread(procedureColumnFetcher, "getProcedureColumns-fetcher-" + catalog);
BigQueryJsonResultSet resultSet =
BigQueryJsonResultSet.of(
resultSchema, -1, queue, this.statement, new Thread[] {fetcherThread});
resultSchema, -1, queue, null, new Thread[] {fetcherThread});

fetcherThread.start();
LOG.info("Started background thread for getProcedureColumns for catalog: " + catalog);
Expand Down Expand Up @@ -1870,7 +1869,7 @@ public ResultSet getTables(
Thread fetcherThread = new Thread(tableFetcher, "getTables-fetcher-" + effectiveCatalog);
BigQueryJsonResultSet resultSet =
BigQueryJsonResultSet.of(
resultSchema, -1, queue, this.statement, new Thread[] {fetcherThread});
resultSchema, -1, queue, null, new Thread[] {fetcherThread});

fetcherThread.start();
LOG.info("Started background thread for getTables");
Expand Down Expand Up @@ -2011,7 +2010,7 @@ public ResultSet getCatalogs() {
signalEndOfData(queue, schemaFields);

return BigQueryJsonResultSet.of(
catalogsSchema, catalogRows.size(), queue, this.statement, new Thread[0]);
catalogsSchema, catalogRows.size(), queue, null, new Thread[0]);
}

Schema defineGetCatalogsSchema() {
Expand Down Expand Up @@ -2043,7 +2042,7 @@ public ResultSet getTableTypes() {
signalEndOfData(queue, tableTypesSchema.getFields());

return BigQueryJsonResultSet.of(
tableTypesSchema, tableTypeRows.size(), queue, this.statement, new Thread[0]);
tableTypesSchema, tableTypeRows.size(), queue, null, new Thread[0]);
}

static Schema defineGetTableTypesSchema() {
Expand Down Expand Up @@ -2495,7 +2494,7 @@ public ResultSet getColumnPrivileges(
final BlockingQueue<BigQueryFieldValueListWrapper> queue = new LinkedBlockingQueue<>(1);
signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetColumnPrivilegesSchema() {
Expand Down Expand Up @@ -2523,7 +2522,7 @@ public ResultSet getTablePrivileges(
final BlockingQueue<BigQueryFieldValueListWrapper> queue = new LinkedBlockingQueue<>(1);
signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetTablePrivilegesSchema() {
Expand All @@ -2545,7 +2544,7 @@ public ResultSet getBestRowIdentifier(
final BlockingQueue<BigQueryFieldValueListWrapper> queue = new LinkedBlockingQueue<>(1);
signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetBestRowIdentifierSchema() {
Expand Down Expand Up @@ -2595,7 +2594,7 @@ public ResultSet getVersionColumns(String catalog, String schema, String table)
final BlockingQueue<BigQueryFieldValueListWrapper> queue = new LinkedBlockingQueue<>(1);
signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetVersionColumnsSchema() {
Expand Down Expand Up @@ -2636,9 +2635,9 @@ Schema defineGetVersionColumnsSchema() {
@Override
public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
String sql = readSqlFromFile(GET_PRIMARY_KEYS_SQL);
try {
try(Statement stmt = this.connection.createStatement()) {
String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
return this.statement.executeQuery(formattedSql);
return stmt.executeQuery(formattedSql);
} catch (SQLException e) {
throw new BigQueryJdbcException(e);
}
Comment thread
Neenu1995 marked this conversation as resolved.
Outdated
Expand All @@ -2648,9 +2647,9 @@ public ResultSet getPrimaryKeys(String catalog, String schema, String table) thr
public ResultSet getImportedKeys(String catalog, String schema, String table)
throws SQLException {
String sql = readSqlFromFile(GET_IMPORTED_KEYS_SQL);
try {
try(Statement stmt = this.connection.createStatement()) {
String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
return this.statement.executeQuery(formattedSql);
return stmt.executeQuery(formattedSql);
} catch (SQLException e) {
throw new BigQueryJdbcException(e);
}
Comment thread
Neenu1995 marked this conversation as resolved.
Outdated
Expand All @@ -2660,9 +2659,9 @@ public ResultSet getImportedKeys(String catalog, String schema, String table)
public ResultSet getExportedKeys(String catalog, String schema, String table)
throws SQLException {
String sql = readSqlFromFile(GET_EXPORTED_KEYS_SQL);
try {
try(Statement stmt = this.connection.createStatement()) {
String formattedSql = replaceSqlParameters(sql, catalog, schema, table);
return this.statement.executeQuery(formattedSql);
return stmt.executeQuery(formattedSql);
} catch (SQLException e) {
throw new BigQueryJdbcException(e);
}
Comment thread
Neenu1995 marked this conversation as resolved.
Outdated
Expand All @@ -2678,7 +2677,7 @@ public ResultSet getCrossReference(
String foreignTable)
throws SQLException {
String sql = readSqlFromFile(GET_CROSS_REFERENCE_SQL);
try {
try(Statement stmt = this.connection.createStatement()) {
String formattedSql =
replaceSqlParameters(
sql,
Expand All @@ -2688,7 +2687,7 @@ public ResultSet getCrossReference(
foreignCatalog,
foreignSchema,
foreignTable);
return this.statement.executeQuery(formattedSql);
return stmt.executeQuery(formattedSql);
} catch (SQLException e) {
throw new BigQueryJdbcException(e);
}
Expand All @@ -2710,7 +2709,7 @@ public ResultSet getTypeInfo() {
populateQueue(typeInfoRows, queue, schemaFields);
signalEndOfData(queue, schemaFields);
return BigQueryJsonResultSet.of(
typeInfoSchema, typeInfoRows.size(), queue, this.statement, new Thread[0]);
typeInfoSchema, typeInfoRows.size(), queue, null, new Thread[0]);
}

Schema defineGetTypeInfoSchema() {
Expand Down Expand Up @@ -3172,7 +3171,7 @@ public ResultSet getIndexInfo(
final BlockingQueue<BigQueryFieldValueListWrapper> queue = new LinkedBlockingQueue<>(1);
signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetIndexInfoSchema() {
Expand Down Expand Up @@ -3303,7 +3302,7 @@ public ResultSet getUDTs(
final BlockingQueue<BigQueryFieldValueListWrapper> queue = new LinkedBlockingQueue<>(1);
signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetUDTsSchema() {
Expand Down Expand Up @@ -3377,7 +3376,7 @@ public ResultSet getSuperTables(String catalog, String schemaPattern, String tab

signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetSuperTablesSchema() {
Expand Down Expand Up @@ -3414,7 +3413,7 @@ public ResultSet getSuperTypes(String catalog, String schemaPattern, String type

signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetSuperTypesSchema() {
Expand Down Expand Up @@ -3460,7 +3459,7 @@ public ResultSet getAttributes(
final BlockingQueue<BigQueryFieldValueListWrapper> queue = new LinkedBlockingQueue<>(1);
signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetAttributesSchema() {
Expand Down Expand Up @@ -3706,7 +3705,7 @@ public ResultSet getSchemas(String catalog, String schemaPattern) {
Thread fetcherThread = new Thread(schemaFetcher, "getSchemas-fetcher-" + catalog);
BigQueryJsonResultSet resultSet =
BigQueryJsonResultSet.of(
resultSchema, -1, queue, this.statement, new Thread[] {fetcherThread});
resultSchema, -1, queue, null, new Thread[] {fetcherThread});

fetcherThread.start();
LOG.info("Started background thread for getSchemas");
Expand Down Expand Up @@ -3825,7 +3824,7 @@ public ResultSet getClientInfoProperties() {
signalEndOfData(queue, resultSchemaFields);
}
return BigQueryJsonResultSet.of(
resultSchema, collectedResults.size(), queue, this.statement, new Thread[0]);
resultSchema, collectedResults.size(), queue, null, new Thread[0]);
}

Schema defineGetClientInfoPropertiesSchema() {
Expand Down Expand Up @@ -4001,7 +4000,7 @@ public ResultSet getFunctions(String catalog, String schemaPattern, String funct
Thread fetcherThread = new Thread(functionFetcher, "getFunctions-fetcher-" + catalog);
BigQueryJsonResultSet resultSet =
BigQueryJsonResultSet.of(
resultSchema, -1, queue, this.statement, new Thread[] {fetcherThread});
resultSchema, -1, queue, null, new Thread[] {fetcherThread});

fetcherThread.start();
LOG.info("Started background thread for getFunctions");
Expand Down Expand Up @@ -4256,7 +4255,7 @@ public ResultSet getFunctionColumns(
new Thread(functionColumnFetcher, "getFunctionColumns-fetcher-" + catalog);
BigQueryJsonResultSet resultSet =
BigQueryJsonResultSet.of(
resultSchema, -1, queue, this.statement, new Thread[] {fetcherThread});
resultSchema, -1, queue, null, new Thread[] {fetcherThread});

fetcherThread.start();
LOG.info("Started background thread for getFunctionColumns for catalog: " + catalog);
Expand Down Expand Up @@ -4663,7 +4662,7 @@ public ResultSet getPseudoColumns(
final BlockingQueue<BigQueryFieldValueListWrapper> queue = new LinkedBlockingQueue<>(1);
signalEndOfData(queue, resultSchemaFields);

return BigQueryJsonResultSet.of(resultSchema, 0, queue, this.statement, null);
return BigQueryJsonResultSet.of(resultSchema, 0, queue, null, null);
}

Schema defineGetPseudoColumnsSchema() {
Expand Down
Loading