nastra commented on code in PR #6598: URL: https://github.com/apache/iceberg/pull/6598#discussion_r1082170758
########## core/src/main/java/org/apache/iceberg/view/SQLViewRepresentationParser.java: ########## @@ -0,0 +1,119 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iceberg.view; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import org.apache.iceberg.catalog.Namespace; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.util.JsonUtil; + +class SQLViewRepresentationParser { + private static final String SQL = "sql"; + private static final String DIALECT = "dialect"; + private static final String SCHEMA_ID = "schema-id"; + private static final String DEFAULT_CATALOG = "default-catalog"; + private static final String DEFAULT_NAMESPACE = "default-namespace"; + private static final String FIELD_ALIASES = "field-aliases"; + private static final String FIELD_COMMENTS = "field-comments"; + + private SQLViewRepresentationParser() {} + + static String toJson(SQLViewRepresentation sqlViewRepresentation) { + return JsonUtil.generate(gen -> toJson(sqlViewRepresentation, gen), false); + } + + static void toJson(SQLViewRepresentation view, JsonGenerator generator) throws IOException { + Preconditions.checkArgument(view != null, "Invalid SQL view representation: null"); + generator.writeStartObject(); + generator.writeStringField(ViewRepresentationParser.TYPE, view.type()); + generator.writeStringField(SQL, view.sql()); + generator.writeStringField(DIALECT, view.dialect()); + + if (view.schemaId() != null) { + generator.writeNumberField(SCHEMA_ID, view.schemaId()); + } + + if (view.defaultCatalog() != null) { + generator.writeStringField(DEFAULT_CATALOG, view.defaultCatalog()); + } + + if (view.defaultNamespace() != null) { + JsonUtil.writeStringArray( + DEFAULT_NAMESPACE, Arrays.asList(view.defaultNamespace().levels()), generator); + } + + if (view.fieldAliases() != null && !view.fieldAliases().isEmpty()) { + JsonUtil.writeStringArray( + SQLViewRepresentationParser.FIELD_ALIASES, view.fieldAliases(), generator); + } + + if (view.fieldComments() != null && !view.fieldComments().isEmpty()) { + JsonUtil.writeStringArray( + SQLViewRepresentationParser.FIELD_COMMENTS, view.fieldComments(), generator); + } + + generator.writeEndObject(); + } + + static SQLViewRepresentation fromJson(String json) { + Preconditions.checkArgument( + json != null, "Cannot parse SQL view representation from null JSON"); + return JsonUtil.parse(json, SQLViewRepresentationParser::fromJson); + } + + static SQLViewRepresentation fromJson(JsonNode node) { + Preconditions.checkArgument( Review Comment: nit: it would probably be good to also add Preconditions.checkArgument(node.isObject(), "Cannot parse SQL view representation from non-object: %s", node);`, similary to how you have it in the other parser ########## core/src/main/java/org/apache/iceberg/view/ViewRepresentationParser.java: ########## @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iceberg.view; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; +import java.util.Locale; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.util.JsonUtil; + +class ViewRepresentationParser { + static final String TYPE = "type"; + + private ViewRepresentationParser() {} + + static void toJson(ViewRepresentation representation, JsonGenerator generator) + throws IOException { + Preconditions.checkArgument(representation != null, "Invalid view representation: null"); + switch (representation.type()) { + case ViewRepresentation.Type.SQL: + SQLViewRepresentationParser.toJson((SQLViewRepresentation) representation, generator); + break; + + default: + throw new IllegalArgumentException( + String.format( + "Cannot serialize unknown view representation type %s", representation.type())); + } + } + + static String toJson(ViewRepresentation entry) { + return JsonUtil.generate(gen -> toJson(entry, gen), false); + } + + static ViewRepresentation fromJson(String json) { + Preconditions.checkArgument(json != null, "Cannot parse view representation from null object"); Review Comment: I think this check here isn't necessary (same in the other parser) because via `JsonUtil.parse(..)` you'll end up in `fromJson(JsonNode node)` anyway and those checks will be performed, so no need to perform the check at two different places -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
