Skip to content

Commit 4d6641c

Browse files
committed
Merge branch 'jdbc/graph-metadata-integration' of github.com:googleapis/google-cloud-java into jdbc/graph-metadata-integration
2 parents cfe728e + 7abe7a7 commit 4d6641c

5 files changed

Lines changed: 75 additions & 18 deletions

File tree

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
240240
boolean enableGcpLogExporter;
241241
OpenTelemetry customOpenTelemetry;
242242
boolean useGlobalOpenTelemetry;
243+
boolean enableGraphMetadata;
243244
private OpenTelemetry openTelemetry;
244245
private Context otelContext;
245246
Tracer tracer =
@@ -314,7 +315,7 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
314315
}
315316

316317
this.reqGoogleDriveScope =
317-
BigQueryJdbcUrlUtility.convertIntToBoolean(
318+
BigQueryJdbcUrlUtility.convertToBoolean(
318319
String.valueOf(ds.getRequestGoogleDriveScope()),
319320
BigQueryJdbcUrlUtility.REQUEST_GOOGLE_DRIVE_SCOPE_PROPERTY_NAME);
320321

@@ -397,6 +398,7 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
397398
this.connectionPoolSize = ds.getConnectionPoolSize();
398399
this.listenerPoolSize = ds.getListenerPoolSize();
399400
this.partnerToken = ds.getPartnerToken();
401+
this.enableGraphMetadata = ds.getEnableGraphMetadata();
400402

401403
this.headerProvider = createHeaderProvider();
402404
this.enableGcpTraceExporter = ds.getEnableGcpTraceExporter();
@@ -867,6 +869,10 @@ Long getListenerPoolSize() {
867869
return listenerPoolSize;
868870
}
869871

872+
boolean isEnableGraphMetadata() {
873+
return this.enableGraphMetadata;
874+
}
875+
870876
@Override
871877
public boolean isValid(int timeout) throws SQLException {
872878
if (timeout < 0) {
@@ -1644,7 +1650,7 @@ private boolean checkIsReadOnlyTokenUsed(Map<String, String> authProps) {
16441650
String readonlyValue =
16451651
authProps.get(BigQueryJdbcUrlUtility.OAUTH_ACCESS_TOKEN_READONLY_PROPERTY_NAME);
16461652
if (readonlyValue != null) {
1647-
return BigQueryJdbcUrlUtility.convertIntToBoolean(
1653+
return BigQueryJdbcUrlUtility.convertToBoolean(
16481654
readonlyValue, BigQueryJdbcUrlUtility.OAUTH_ACCESS_TOKEN_READONLY_PROPERTY_NAME);
16491655
}
16501656
return false;

‎java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDriver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public Connection connect(String url, Properties info) throws SQLException {
174174
boolean enableGcpLogExporter = false;
175175
if (enableGcpLogExporterStr != null) {
176176
enableGcpLogExporter =
177-
BigQueryJdbcUrlUtility.convertIntToBoolean(
177+
BigQueryJdbcUrlUtility.convertToBoolean(
178178
enableGcpLogExporterStr,
179179
BigQueryJdbcUrlUtility.ENABLE_GCP_LOG_EXPORTER_PROPERTY_NAME);
180180
}

‎java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcUrlUtility.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
193193
static final String MAX_BYTES_BILLED_PROPERTY_NAME = "MaximumBytesBilled";
194194
static final Long DEFAULT_MAX_BYTES_BILLED_VALUE = 0L;
195195
static final String LABELS_PROPERTY_NAME = "Labels";
196+
static final String ENABLE_GRAPH_METADATA_PROPERTY_NAME = "EnableGraphMetadata";
197+
static final boolean DEFAULT_ENABLE_GRAPH_METADATA_VALUE = false;
196198
static final List<String> OVERRIDE_PROPERTIES =
197199
Arrays.asList(
198200
BIGQUERY_ENDPOINT_OVERRIDE_PROPERTY_NAME,
@@ -691,6 +693,11 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
691693
.setDefaultValue(
692694
String.valueOf(
693695
TelemetryPropertyUtility.DEFAULT_ENABLE_DIAGNOSTIC_TELEMETRY_VALUE))
696+
.build(),
697+
BigQueryConnectionProperty.newBuilder()
698+
.setName(ENABLE_GRAPH_METADATA_PROPERTY_NAME)
699+
.setDescription(
700+
"Enables or disables discovery of Property Graphs and related metadata in DatabaseMetaData methods.")
694701
.build())));
695702

696703
private static final List<String> NETWORK_PROPERTIES =
@@ -861,7 +868,7 @@ static String appendPropertiesToURL(String url, String callerClassName, Properti
861868
return urlBuilder.toString();
862869
}
863870

864-
static boolean convertIntToBoolean(String value, String propertyName) {
871+
static boolean convertToBoolean(String value, String propertyName) {
865872
int integerValue;
866873

867874
try {

‎java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/DataSource.java‎

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public class DataSource implements javax.sql.DataSource {
131131
private OpenTelemetry customOpenTelemetry;
132132
private boolean useGlobalOpenTelemetry = BigQueryJdbcUrlUtility.DEFAULT_USE_GLOBAL_OTEL_VALUE;
133133
private Boolean enableDiagnosticTelemetry;
134+
private Boolean enableGraphMetadata;
134135

135136
// Make sure the JDBC driver class is loaded.
136137
static {
@@ -157,13 +158,13 @@ public class DataSource implements javax.sql.DataSource {
157158
BigQueryJdbcUrlUtility.ENABLE_HTAPI_PROPERTY_NAME,
158159
(ds, val) ->
159160
ds.setEnableHighThroughputAPI(
160-
BigQueryJdbcUrlUtility.convertIntToBoolean(
161+
BigQueryJdbcUrlUtility.convertToBoolean(
161162
val, BigQueryJdbcUrlUtility.ENABLE_HTAPI_PROPERTY_NAME)))
162163
.put(
163164
BigQueryJdbcUrlUtility.UNSUPPORTED_HTAPI_FALLBACK_PROPERTY_NAME,
164165
(ds, val) ->
165166
ds.setUnsupportedHTAPIFallback(
166-
BigQueryJdbcUrlUtility.convertIntToBoolean(
167+
BigQueryJdbcUrlUtility.convertToBoolean(
167168
val, BigQueryJdbcUrlUtility.UNSUPPORTED_HTAPI_FALLBACK_PROPERTY_NAME)))
168169
.put(
169170
BigQueryJdbcUrlUtility.HTAPI_MIN_TABLE_SIZE_PROPERTY_NAME,
@@ -182,13 +183,13 @@ public class DataSource implements javax.sql.DataSource {
182183
BigQueryJdbcUrlUtility.ENABLE_SESSION_PROPERTY_NAME,
183184
(ds, val) ->
184185
ds.setEnableSession(
185-
BigQueryJdbcUrlUtility.convertIntToBoolean(
186+
BigQueryJdbcUrlUtility.convertToBoolean(
186187
val, BigQueryJdbcUrlUtility.ENABLE_SESSION_PROPERTY_NAME)))
187188
.put(
188189
BigQueryJdbcUrlUtility.ENABLE_TIMESTAMP_PICOS_PROPERTY_NAME,
189190
(ds, val) ->
190191
ds.setEnableTimestampPicos(
191-
BigQueryJdbcUrlUtility.convertIntToBoolean(
192+
BigQueryJdbcUrlUtility.convertToBoolean(
192193
val, BigQueryJdbcUrlUtility.ENABLE_TIMESTAMP_PICOS_PROPERTY_NAME)))
193194
.put(BigQueryJdbcUrlUtility.LOG_LEVEL_PROPERTY_NAME, DataSource::setLogLevel)
194195
.put(BigQueryJdbcUrlUtility.LOG_PATH_PROPERTY_NAME, DataSource::setLogPath)
@@ -209,7 +210,7 @@ public class DataSource implements javax.sql.DataSource {
209210
BigQueryJdbcUrlUtility.OAUTH_ACCESS_TOKEN_READONLY_PROPERTY_NAME,
210211
(ds, val) ->
211212
ds.setOAuthAccessTokenReadonly(
212-
BigQueryJdbcUrlUtility.convertIntToBoolean(
213+
BigQueryJdbcUrlUtility.convertToBoolean(
213214
val, BigQueryJdbcUrlUtility.OAUTH_ACCESS_TOKEN_READONLY_PROPERTY_NAME)))
214215
.put(
215216
BigQueryJdbcUrlUtility.OAUTH_REFRESH_TOKEN_PROPERTY_NAME,
@@ -218,14 +219,14 @@ public class DataSource implements javax.sql.DataSource {
218219
BigQueryJdbcUrlUtility.USE_QUERY_CACHE_PROPERTY_NAME,
219220
(ds, val) ->
220221
ds.setUseQueryCache(
221-
BigQueryJdbcUrlUtility.convertIntToBoolean(
222+
BigQueryJdbcUrlUtility.convertToBoolean(
222223
val, BigQueryJdbcUrlUtility.USE_QUERY_CACHE_PROPERTY_NAME)))
223224
.put(BigQueryJdbcUrlUtility.QUERY_DIALECT_PROPERTY_NAME, DataSource::setQueryDialect)
224225
.put(
225226
BigQueryJdbcUrlUtility.ALLOW_LARGE_RESULTS_PROPERTY_NAME,
226227
(ds, val) ->
227228
ds.setAllowLargeResults(
228-
BigQueryJdbcUrlUtility.convertIntToBoolean(
229+
BigQueryJdbcUrlUtility.convertToBoolean(
229230
val, BigQueryJdbcUrlUtility.ALLOW_LARGE_RESULTS_PROPERTY_NAME)))
230231
.put(
231232
BigQueryJdbcUrlUtility.LARGE_RESULTS_TABLE_PROPERTY_NAME,
@@ -258,7 +259,7 @@ public class DataSource implements javax.sql.DataSource {
258259
BigQueryJdbcUrlUtility.ENABLE_WRITE_API_PROPERTY_NAME,
259260
(ds, val) ->
260261
ds.setEnableWriteAPI(
261-
BigQueryJdbcUrlUtility.convertIntToBoolean(
262+
BigQueryJdbcUrlUtility.convertToBoolean(
262263
val, BigQueryJdbcUrlUtility.ENABLE_WRITE_API_PROPERTY_NAME)))
263264
.put(
264265
BigQueryJdbcUrlUtility.ADDITIONAL_PROJECTS_PROPERTY_NAME,
@@ -267,14 +268,14 @@ public class DataSource implements javax.sql.DataSource {
267268
BigQueryJdbcUrlUtility.FILTER_TABLES_ON_DEFAULT_DATASET_PROPERTY_NAME,
268269
(ds, val) ->
269270
ds.setFilterTablesOnDefaultDataset(
270-
BigQueryJdbcUrlUtility.convertIntToBoolean(
271+
BigQueryJdbcUrlUtility.convertToBoolean(
271272
val,
272273
BigQueryJdbcUrlUtility.FILTER_TABLES_ON_DEFAULT_DATASET_PROPERTY_NAME)))
273274
.put(
274275
BigQueryJdbcUrlUtility.ENABLE_PROJECT_DISCOVERY_PROPERTY_NAME,
275276
(ds, val) ->
276277
ds.setEnableProjectDiscovery(
277-
BigQueryJdbcUrlUtility.convertIntToBoolean(
278+
BigQueryJdbcUrlUtility.convertToBoolean(
278279
val, BigQueryJdbcUrlUtility.ENABLE_PROJECT_DISCOVERY_PROPERTY_NAME)))
279280
.put(
280281
BigQueryJdbcUrlUtility.REQUEST_GOOGLE_DRIVE_SCOPE_PROPERTY_NAME,
@@ -376,26 +377,32 @@ public class DataSource implements javax.sql.DataSource {
376377
BigQueryJdbcUrlUtility.ENABLE_GCP_TRACE_EXPORTER_PROPERTY_NAME,
377378
(ds, val) ->
378379
ds.setEnableGcpTraceExporter(
379-
BigQueryJdbcUrlUtility.convertIntToBoolean(
380+
BigQueryJdbcUrlUtility.convertToBoolean(
380381
val, BigQueryJdbcUrlUtility.ENABLE_GCP_TRACE_EXPORTER_PROPERTY_NAME)))
381382
.put(
382383
BigQueryJdbcUrlUtility.ENABLE_GCP_LOG_EXPORTER_PROPERTY_NAME,
383384
(ds, val) ->
384385
ds.setEnableGcpLogExporter(
385-
BigQueryJdbcUrlUtility.convertIntToBoolean(
386+
BigQueryJdbcUrlUtility.convertToBoolean(
386387
val, BigQueryJdbcUrlUtility.ENABLE_GCP_LOG_EXPORTER_PROPERTY_NAME)))
387388
.put(
388389
BigQueryJdbcUrlUtility.USE_GLOBAL_OTEL_PROPERTY_NAME,
389390
(ds, val) ->
390391
ds.setUseGlobalOpenTelemetry(
391-
BigQueryJdbcUrlUtility.convertIntToBoolean(
392+
BigQueryJdbcUrlUtility.convertToBoolean(
392393
val, BigQueryJdbcUrlUtility.USE_GLOBAL_OTEL_PROPERTY_NAME)))
393394
.put(
394395
BigQueryJdbcUrlUtility.ENABLE_DIAGNOSTIC_TELEMETRY_PROPERTY_NAME,
395396
(ds, val) ->
396397
ds.setEnableDiagnosticTelemetry(
397-
BigQueryJdbcUrlUtility.convertIntToBoolean(
398+
BigQueryJdbcUrlUtility.convertToBoolean(
398399
val, BigQueryJdbcUrlUtility.ENABLE_DIAGNOSTIC_TELEMETRY_PROPERTY_NAME)))
400+
.put(
401+
BigQueryJdbcUrlUtility.ENABLE_GRAPH_METADATA_PROPERTY_NAME,
402+
(ds, val) ->
403+
ds.setEnableGraphMetadata(
404+
BigQueryJdbcUrlUtility.convertToBoolean(
405+
val, BigQueryJdbcUrlUtility.ENABLE_GRAPH_METADATA_PROPERTY_NAME)))
399406
.build();
400407

401408
public static DataSource fromUrl(String url) {
@@ -738,6 +745,11 @@ Properties createProperties() {
738745
BigQueryJdbcUrlUtility.USE_GLOBAL_OTEL_PROPERTY_NAME,
739746
String.valueOf(this.useGlobalOpenTelemetry));
740747
}
748+
if (this.enableGraphMetadata != null) {
749+
connectionProperties.setProperty(
750+
BigQueryJdbcUrlUtility.ENABLE_GRAPH_METADATA_PROPERTY_NAME,
751+
String.valueOf(this.enableGraphMetadata));
752+
}
741753
connectionProperties.setProperty(
742754
BigQueryJdbcUrlUtility.ENABLE_DIAGNOSTIC_TELEMETRY_PROPERTY_NAME,
743755
String.valueOf(getEnableDiagnosticTelemetry()));
@@ -1537,6 +1549,16 @@ public void setPrivateServiceConnect(String privateServiceConnect) {
15371549
this.privateServiceConnect = privateServiceConnect;
15381550
}
15391551

1552+
public boolean getEnableGraphMetadata() {
1553+
return enableGraphMetadata != null
1554+
? enableGraphMetadata
1555+
: BigQueryJdbcUrlUtility.DEFAULT_ENABLE_GRAPH_METADATA_VALUE;
1556+
}
1557+
1558+
public void setEnableGraphMetadata(Boolean enableGraphMetadata) {
1559+
this.enableGraphMetadata = enableGraphMetadata;
1560+
}
1561+
15401562
@Override
15411563
public PrintWriter getLogWriter() {
15421564
return null;

‎java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcUrlUtilityTest.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,4 +391,26 @@ public void testParseDiagnosticTelemetryProperties() {
391391
assertThat(defaultDs.getEnableDiagnosticTelemetry())
392392
.isEqualTo(TelemetryPropertyUtility.DEFAULT_ENABLE_DIAGNOSTIC_TELEMETRY_VALUE);
393393
}
394+
395+
@Test
396+
public void testEnableGraphMetadataProperties() {
397+
String url =
398+
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
399+
+ "ProjectId=MyBigQueryProject;"
400+
+ "EnableGraphMetadata=1";
401+
402+
assertThat(BigQueryJdbcUrlUtility.parseUriProperty(url, "EnableGraphMetadata")).isEqualTo("1");
403+
404+
DataSource ds = DataSource.fromUrl(url);
405+
assertThat(ds.getEnableGraphMetadata()).isTrue();
406+
407+
Properties props = ds.createProperties();
408+
assertThat(props.getProperty("EnableGraphMetadata")).isEqualTo("true");
409+
410+
String urlWithoutGraph =
411+
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;ProjectId=MyBigQueryProject";
412+
DataSource defaultDs = DataSource.fromUrl(urlWithoutGraph);
413+
assertThat(defaultDs.getEnableGraphMetadata())
414+
.isEqualTo(BigQueryJdbcUrlUtility.DEFAULT_ENABLE_GRAPH_METADATA_VALUE);
415+
}
394416
}

0 commit comments

Comments
 (0)