Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eb45973

Browse files
jbeluchgcf-owl-bot[bot]Neenu1995
authoredMar 7, 2023
fix: external table definition parquet format options (#2535)
* fix: set parquet format options for external tables * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: set parquet format options for external tables * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: set parquet format options for external tables --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Neenu Shaji <Neenu1995@users.noreply.github.com>
1 parent f4b8412 commit eb45973

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed
 

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ implementation 'com.google.cloud:google-cloud-bigquery'
5959
If you are using Gradle without BOM, add this to your dependencies:
6060

6161
```Groovy
62-
implementation 'com.google.cloud:google-cloud-bigquery:2.23.0'
62+
implementation 'com.google.cloud:google-cloud-bigquery:2.23.1'
6363
```
6464

6565
If you are using SBT, add this to your dependencies:
6666

6767
```Scala
68-
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "2.23.0"
68+
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "2.23.1"
6969
```
7070

7171
## Authentication

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java

+3
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,9 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toExternalDataC
311311
if (getDecimalTargetTypes() != null) {
312312
externalConfigurationPb.setDecimalTargetTypes(getDecimalTargetTypes());
313313
}
314+
if (getFormatOptions() != null && FormatOptions.PARQUET.equals(getFormatOptions().getType())) {
315+
externalConfigurationPb.setParquetOptions(((ParquetOptions) getFormatOptions()).toPb());
316+
}
314317
if (getFormatOptions() != null && FormatOptions.AVRO.equals(getFormatOptions().getType())) {
315318
externalConfigurationPb.setAvroOptions(((AvroOptions) getFormatOptions()).toPb());
316319
}

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public static FormatOptions googleSheets() {
107107

108108
/** Default options for PARQUET format. */
109109
public static FormatOptions parquet() {
110-
return new FormatOptions(PARQUET);
110+
return ParquetOptions.newBuilder().build();
111111
}
112112

113113
/** Default options for the ORC format. */

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExternalTableDefinitionTest.java

+15
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class ExternalTableDefinitionTest {
5252
private static final Boolean AUTODETECT = true;
5353
private static final AvroOptions AVRO_OPTIONS = AvroOptions.newBuilder().build();
5454
private static final CsvOptions CSV_OPTIONS = CsvOptions.newBuilder().build();
55+
private static final ParquetOptions PARQUET_OPTIONS = ParquetOptions.newBuilder().build();
5556
private static final HivePartitioningOptions HIVE_PARTITIONING_OPTIONS =
5657
HivePartitioningOptions.newBuilder()
5758
.setMode("AUTO")
@@ -71,6 +72,9 @@ public class ExternalTableDefinitionTest {
7172
private static final ExternalTableDefinition EXTERNAL_TABLE_DEFINITION_AVRO =
7273
ExternalTableDefinition.newBuilder(SOURCE_URIS, TABLE_SCHEMA, AVRO_OPTIONS).build();
7374

75+
private static final ExternalTableDefinition EXTERNAL_TABLE_DEFINITION_PARQUET =
76+
ExternalTableDefinition.newBuilder(SOURCE_URIS, TABLE_SCHEMA, PARQUET_OPTIONS).build();
77+
7478
@Test
7579
public void testToBuilder() {
7680
compareExternalTableDefinition(
@@ -136,6 +140,17 @@ public void testToAndFromPb() {
136140
externalTableDefinition, ExternalTableDefinition.fromPb(externalTableDefinition.toPb()));
137141
}
138142

143+
@Test
144+
public void testToAndFromPbParquet() {
145+
compareExternalTableDefinition(
146+
EXTERNAL_TABLE_DEFINITION_PARQUET,
147+
ExternalTableDefinition.fromPb(EXTERNAL_TABLE_DEFINITION_PARQUET.toPb()));
148+
ExternalTableDefinition externalTableDefinition =
149+
ExternalTableDefinition.newBuilder(SOURCE_URIS, TABLE_SCHEMA, PARQUET_OPTIONS).build();
150+
compareExternalTableDefinition(
151+
externalTableDefinition, ExternalTableDefinition.fromPb(externalTableDefinition.toPb()));
152+
}
153+
139154
private void compareExternalTableDefinition(
140155
ExternalTableDefinition expected, ExternalTableDefinition value) {
141156
assertEquals(expected, value);

0 commit comments

Comments
 (0)
Failed to load comments.