Abacn commented on code in PR #29923:
URL: https://github.com/apache/beam/pull/29923#discussion_r1445323162
##########
sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java:
##########
@@ -3725,28 +3734,27 @@ private <DestinationT> WriteResult continueExpandTyped(
}
}
- private void validateNoJsonTypeInSchema(JsonElement schema) {
+ private boolean hasJsonTypeInSchema(JsonElement schema) {
JsonElement fields = schema.getAsJsonObject().get("fields");
if (!fields.isJsonArray() || fields.getAsJsonArray().isEmpty()) {
- return;
+ return false;
}
JsonArray fieldArray = fields.getAsJsonArray();
for (int i = 0; i < fieldArray.size(); i++) {
JsonObject field = fieldArray.get(i).getAsJsonObject();
- checkArgument(
- !field.get("type").getAsString().equals("JSON"),
- "Found JSON type in TableSchema. JSON data insertion is currently "
- + "not supported with 'FILE_LOADS' write method. This is
supported with the "
- + "other write methods, however. For more information, visit: "
- +
"https://cloud.google.com/bigquery/docs/reference/standard-sql/";
- + "json-data#ingest_json_data");
+ if (field.get("type").getAsString().equals("JSON")) {
+ return true;
+ }
if (field.get("type").getAsString().equals("STRUCT")) {
- validateNoJsonTypeInSchema(field);
+ if (hasJsonTypeInSchema(field)) {
+ return true;
+ }
Review Comment:
These two are not the same. ture can short card while false does not
##########
sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java:
##########
@@ -3725,28 +3734,27 @@ private <DestinationT> WriteResult continueExpandTyped(
}
}
- private void validateNoJsonTypeInSchema(JsonElement schema) {
+ private boolean hasJsonTypeInSchema(JsonElement schema) {
JsonElement fields = schema.getAsJsonObject().get("fields");
if (!fields.isJsonArray() || fields.getAsJsonArray().isEmpty()) {
- return;
+ return false;
}
JsonArray fieldArray = fields.getAsJsonArray();
for (int i = 0; i < fieldArray.size(); i++) {
JsonObject field = fieldArray.get(i).getAsJsonObject();
- checkArgument(
- !field.get("type").getAsString().equals("JSON"),
- "Found JSON type in TableSchema. JSON data insertion is currently "
- + "not supported with 'FILE_LOADS' write method. This is
supported with the "
- + "other write methods, however. For more information, visit: "
- +
"https://cloud.google.com/bigquery/docs/reference/standard-sql/";
- + "json-data#ingest_json_data");
+ if (field.get("type").getAsString().equals("JSON")) {
+ return true;
+ }
if (field.get("type").getAsString().equals("STRUCT")) {
- validateNoJsonTypeInSchema(field);
+ if (hasJsonTypeInSchema(field)) {
+ return true;
+ }
Review Comment:
These two are not the same. true can short card while false does not
##########
sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java:
##########
@@ -3725,28 +3734,27 @@ private <DestinationT> WriteResult continueExpandTyped(
}
}
- private void validateNoJsonTypeInSchema(JsonElement schema) {
+ private boolean hasJsonTypeInSchema(JsonElement schema) {
JsonElement fields = schema.getAsJsonObject().get("fields");
if (!fields.isJsonArray() || fields.getAsJsonArray().isEmpty()) {
- return;
+ return false;
}
JsonArray fieldArray = fields.getAsJsonArray();
for (int i = 0; i < fieldArray.size(); i++) {
JsonObject field = fieldArray.get(i).getAsJsonObject();
- checkArgument(
- !field.get("type").getAsString().equals("JSON"),
- "Found JSON type in TableSchema. JSON data insertion is currently "
- + "not supported with 'FILE_LOADS' write method. This is
supported with the "
- + "other write methods, however. For more information, visit: "
- +
"https://cloud.google.com/bigquery/docs/reference/standard-sql/";
- + "json-data#ingest_json_data");
+ if (field.get("type").getAsString().equals("JSON")) {
+ return true;
+ }
if (field.get("type").getAsString().equals("STRUCT")) {
- validateNoJsonTypeInSchema(field);
+ if (hasJsonTypeInSchema(field)) {
+ return true;
+ }
Review Comment:
These two are not the same. true can short cut while false does not
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
