Skip to content
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

Jump to bottom

fix: null field mode inconsistency #2863

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: null field mode inconsistency #2863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07b7bdc
fix: null field mode inconsistency
obada-ab Sep 5, 2023
df84bc5
chore: update null field mode test name
obada-ab Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Field.java
View file
Open in desktop
Expand Up @@ -198,7 +198,7 @@ public Builder setType(StandardSQLTypeName type, FieldList subFields) {

/** Sets the mode of the field. When not specified {@link Mode#NULLABLE} is used. */
public Builder setMode(Mode mode) {
this.mode = mode != null ? mode.name() : Data.<String>nullOf(String.class);
this.mode = mode != null ? mode.name() : null;
return this;
}

Expand Down
12 changes: 12 additions & 0 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldTest.java
View file
Open in desktop
Expand Up @@ -30,6 +30,8 @@ public class FieldTest {
private static final String FIELD_NAME1 = "StringField";
private static final String FIELD_NAME2 = "IntegerField";
private static final String FIELD_NAME3 = "RecordField";
private static final String FIELD_NAME4 = "NullModeField";
private static final String FIELD_NAME5 = "NullModeField2";
private static final LegacySQLTypeName FIELD_TYPE1 = LegacySQLTypeName.STRING;
private static final LegacySQLTypeName FIELD_TYPE2 = LegacySQLTypeName.INTEGER;
private static final StandardSQLTypeName FIELD_TYPE1_STANDARD = StandardSQLTypeName.STRING;
Expand Down Expand Up @@ -79,6 +81,10 @@ public class FieldTest {
.setMode(FIELD_MODE3)
.setDescription(FIELD_DESCRIPTION3)
.build();
private static final Field STANDARD_FIELD_SCHEMA4 =
Field.newBuilder(FIELD_NAME4, StandardSQLTypeName.INT64).setMode(null).build();
private static final Field STANDARD_FIELD_SCHEMA5 =
Field.newBuilder(FIELD_NAME5, StandardSQLTypeName.STRING).build();

@Test
public void testToBuilder() {
Expand All @@ -96,6 +102,8 @@ public void testToBuilderWithStandardSQLTypeName() {
compareFieldSchemas(STANDARD_FIELD_SCHEMA1, STANDARD_FIELD_SCHEMA1.toBuilder().build());
compareFieldSchemas(STANDARD_FIELD_SCHEMA2, STANDARD_FIELD_SCHEMA2.toBuilder().build());
compareFieldSchemas(STANDARD_FIELD_SCHEMA3, STANDARD_FIELD_SCHEMA3.toBuilder().build());
compareFieldSchemas(STANDARD_FIELD_SCHEMA4, STANDARD_FIELD_SCHEMA4.toBuilder().build());
compareFieldSchemas(STANDARD_FIELD_SCHEMA5, STANDARD_FIELD_SCHEMA5.toBuilder().build());
Field field = STANDARD_FIELD_SCHEMA1.toBuilder().setDescription("New Description").build();
assertEquals("New Description", field.getDescription());
field = field.toBuilder().setDescription(FIELD_DESCRIPTION1).build();
Expand Down Expand Up @@ -162,6 +170,8 @@ public void testBuilderWithStandardSQLTypeName() {
assertEquals(FIELD_TYPE3, STANDARD_FIELD_SCHEMA3.getType());
assertEquals(FIELD_MODE3, STANDARD_FIELD_SCHEMA3.getMode());
assertEquals(FIELD_DESCRIPTION3, STANDARD_FIELD_SCHEMA3.getDescription());
assertEquals(null, STANDARD_FIELD_SCHEMA4.getMode());
assertEquals(null, STANDARD_FIELD_SCHEMA5.getMode());
assertEquals(
FieldList.of(STANDARD_FIELD_SCHEMA1, STANDARD_FIELD_SCHEMA2),
STANDARD_FIELD_SCHEMA3.getSubFields());
Expand All @@ -181,6 +191,8 @@ public void testToAndFromPbWithStandardSQLTypeName() {
compareFieldSchemas(STANDARD_FIELD_SCHEMA1, Field.fromPb(STANDARD_FIELD_SCHEMA1.toPb()));
compareFieldSchemas(STANDARD_FIELD_SCHEMA2, Field.fromPb(STANDARD_FIELD_SCHEMA2.toPb()));
compareFieldSchemas(STANDARD_FIELD_SCHEMA3, Field.fromPb(STANDARD_FIELD_SCHEMA3.toPb()));
compareFieldSchemas(STANDARD_FIELD_SCHEMA4, Field.fromPb(STANDARD_FIELD_SCHEMA4.toPb()));
compareFieldSchemas(STANDARD_FIELD_SCHEMA5, Field.fromPb(STANDARD_FIELD_SCHEMA5.toPb()));
Field field = Field.newBuilder(FIELD_NAME1, FIELD_TYPE1).build();
compareFieldSchemas(field, Field.fromPb(field.toPb()));
}
Expand Down
24 changes: 24 additions & 0 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
View file
Open in desktop
Expand Up @@ -571,6 +571,8 @@ public class ITBigQueryTest {
Field.newBuilder("BooleanField", LegacySQLTypeName.BOOLEAN)
.setMode(Field.Mode.NULLABLE)
.build());
private static final Schema NULL_FIELD_MODE_SCHEMA =
Schema.of(Field.newBuilder("Field1", LegacySQLTypeName.INTEGER).build());
private static final RangePartitioning.Range RANGE =
RangePartitioning.Range.newBuilder().setStart(1L).setInterval(2L).setEnd(20L).build();
private static final RangePartitioning RANGE_PARTITIONING =
Expand Down Expand Up @@ -6133,4 +6135,26 @@ public void testAlreadyExistJobExceptionHandling() throws InterruptedException {
}
}
}

@Test
public void testNullFieldMode() {
String tableName = "test_create_table_null_field_mode";
TableId tableId = TableId.of(DATASET, tableName);
try {
StandardTableDefinition tableDefinition =
StandardTableDefinition.newBuilder().setSchema(NULL_FIELD_MODE_SCHEMA).build();
Table createdTable = bigquery.create(TableInfo.of(tableId, tableDefinition));
assertNotNull(createdTable);
Table remoteTable = bigquery.getTable(DATASET, tableName);
assertNull(
remoteTable
.<StandardTableDefinition>getDefinition()
.getSchema()
.getFields()
.get(0)
.getMode());
} finally {
bigquery.delete(tableId);
}
}
}