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

BigQuery Destination : Fix GCS processing of Facebook data #9415

Merged
merged 8 commits into from
Jan 13, 2022
Merged

BigQuery Destination : Fix GCS processing of Facebook data #9415

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b343c6
Fix GCS Avro file processing with invalid "-" character
DoNotPanicUA Jan 11, 2022
21641ba
Extend test data to cover the case
DoNotPanicUA Jan 11, 2022
d3ea38e
incr ver
DoNotPanicUA Jan 12, 2022
18655ef
Merge remote-tracking branch 'origin/master' into aleonets/oncall-86
DoNotPanicUA Jan 12, 2022
1245daf
s3 ver upd
DoNotPanicUA Jan 12, 2022
c6e6b88
Merge remote-tracking branch 'origin/master' into aleonets/oncall-86
DoNotPanicUA Jan 13, 2022
ee5c236
add dependency
DoNotPanicUA Jan 13, 2022
121e6a7
add dependency
DoNotPanicUA Jan 13, 2022
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
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-bigquery-denormalized/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ ENV APPLICATION destination-bigquery-denormalized

COPY --from=build /airbyte /airbyte

LABEL io.airbyte.version=0.2.2
LABEL io.airbyte.version=0.2.3
LABEL io.airbyte.name=airbyte/destination-bigquery-denormalized
8 changes: 4 additions & 4 deletions .../io/airbyte/integrations/destination/bigquery/util/BigQueryDenormalizedTestDataUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static JsonNode getSchema() {
+ " \"string\"\n"
+ " ]\n"
+ " },\n"
+ " \"permissions\": {\n"
+ " \"permission-list\": {\n"
+ " \"type\": [\n"
+ " \"array\"\n"
+ " ],\n"
Expand Down Expand Up @@ -135,7 +135,7 @@ public static JsonNode getSchemaWithInvalidArrayType() {
+ " \"string\"\n"
+ " ]\n"
+ " },\n"
+ " \"permissions\": {\n"
+ " \"permission-list\": {\n"
+ " \"type\": [\n"
+ " \"array\"\n"
+ " ],\n"
Expand Down Expand Up @@ -167,7 +167,7 @@ public static JsonNode getData() {
"{\n"
+ " \"name\": \"Andrii\",\n"
+ " \"accepts_marketing_updated_at\": \"2021-10-11T06:36:53-07:00\",\n"
+ " \"permissions\": [\n"
+ " \"permission-list\": [\n"
+ " {\n"
+ " \"domain\": \"abs\",\n"
+ " \"grants\": [\n"
Expand Down Expand Up @@ -266,7 +266,7 @@ public static JsonNode getDataWithEmptyObjectAndArray() {
return Jsons.deserialize(
"{\n"
+ " \"name\": \"Andrii\",\n"
+ " \"permissions\": [\n"
+ " \"permission-list\": [\n"
+ " {\n"
+ " \"domain\": \"abs\",\n"
+ " \"items\": {},\n" // empty object
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-bigquery/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ ENV APPLICATION destination-bigquery

COPY --from=build /airbyte /airbyte

LABEL io.airbyte.version=0.6.2
LABEL io.airbyte.version=0.6.3
LABEL io.airbyte.name=airbyte/destination-bigquery
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-s3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ ENV APPLICATION destination-s3

COPY --from=build /airbyte /airbyte

LABEL io.airbyte.version=0.2.2
LABEL io.airbyte.version=0.2.3
LABEL io.airbyte.name=airbyte/destination-s3
6 changes: 5 additions & 1 deletion ...ion-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/AvroNameTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected String applyDefaultCase(final String input) {

@Override
public String getIdentifier(final String name) {
return checkFirsCharInStreamName(convertStreamName(name));
return replaceForbiddenCharacters(checkFirsCharInStreamName(convertStreamName(name)));
}

private String checkFirsCharInStreamName(final String name) {
Expand All @@ -26,4 +26,8 @@ private String checkFirsCharInStreamName(final String name) {
}
}

private String replaceForbiddenCharacters(final String name) {
return name.replace("-", "_");
}

}
2 changes: 1 addition & 1 deletion .../src/main/java/io/airbyte/integrations/destination/s3/avro/JsonToAvroSchemaConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public Schema getAvroSchema(final JsonNode jsonSchema,
// Omit the namespace for root level fields, because it is directly assigned in the builder above.
// This may not be the correct choice.
? null
: (fieldNamespace == null ? fieldName : (fieldNamespace + "." + fieldName));
: (fieldNamespace == null ? stdName : (fieldNamespace + "." + stdName));
fieldBuilder.type(parseJsonField(subfieldName, subfieldNamespace, subfieldDefinition, appendExtraProps, addStringToLogicalTypes))
.withDefault(null);
}
Expand Down