Copilot commented on code in PR #10992:
URL: https://github.com/apache/gravitino/pull/10992#discussion_r3224320667
##########
catalogs/catalog-lakehouse-iceberg/src/test/java/org/apache/gravitino/catalog/lakehouse/iceberg/TestIcebergView.java:
##########
@@ -107,4 +116,105 @@ public void testBuilderWithNullProperties() {
Assertions.assertNotNull(view.properties());
Assertions.assertTrue(view.properties().isEmpty());
}
+
+ @Test
+ public void testFromLoadViewResponseExtractsComment() {
+ Map<String, String> properties = ImmutableMap.of("comment", "my view
comment", "key", "val");
+ ViewMetadata mockMetadata = mock(ViewMetadata.class);
+ when(mockMetadata.properties()).thenReturn(properties);
+
+ LoadViewResponse mockResponse = mock(LoadViewResponse.class);
+ when(mockResponse.metadata()).thenReturn(mockMetadata);
+
+ IcebergView view = IcebergView.fromLoadViewResponse(mockResponse,
"comment_view");
+
+ Assertions.assertEquals("my view comment", view.comment());
+ Assertions.assertEquals(properties, view.properties());
+ }
+
+ @Test
+ public void testFromLoadViewResponseExtractsRepresentations() {
+ Map<String, String> properties = ImmutableMap.of("key", "val");
+
+ SQLViewRepresentation sqlRep = mock(SQLViewRepresentation.class);
+ when(sqlRep.dialect()).thenReturn("spark");
+ when(sqlRep.sql()).thenReturn("SELECT id FROM t1");
+
+ ViewVersion mockVersion = mock(ViewVersion.class);
+
when(mockVersion.representations()).thenReturn(Collections.singletonList(sqlRep));
+
+ ViewMetadata mockMetadata = mock(ViewMetadata.class);
+ when(mockMetadata.properties()).thenReturn(properties);
+ when(mockMetadata.currentVersion()).thenReturn(mockVersion);
+
+ LoadViewResponse mockResponse = mock(LoadViewResponse.class);
+ when(mockResponse.metadata()).thenReturn(mockMetadata);
+
+ IcebergView view = IcebergView.fromLoadViewResponse(mockResponse,
"rep_view");
+
+ Assertions.assertEquals(1, view.representations().length);
+ Representation rep = view.representations()[0];
+ Assertions.assertInstanceOf(SQLRepresentation.class, rep);
+ SQLRepresentation sqlRepResult = (SQLRepresentation) rep;
+ Assertions.assertEquals("spark", sqlRepResult.dialect());
+ Assertions.assertEquals("SELECT id FROM t1", sqlRepResult.sql());
+ }
+
+ @Test
+ public void testFromLoadViewResponseExtractsColumns() {
+ Map<String, String> properties = ImmutableMap.of("key", "val");
+
+ org.apache.iceberg.types.Types.NestedField field1 =
+ org.apache.iceberg.types.Types.NestedField.optional(
+ 1, "id", org.apache.iceberg.types.Types.LongType.get(), "id
column");
+ org.apache.iceberg.types.Types.NestedField field2 =
+ org.apache.iceberg.types.Types.NestedField.required(
+ 2, "name", org.apache.iceberg.types.Types.StringType.get());
Review Comment:
Avoid using fully-qualified `org.apache.iceberg.types.Types.NestedField`
here; it’s not needed for collision resolution (you can import
`org.apache.iceberg.types.Types.NestedField` and reference
`NestedField.optional/required`). This matches the existing codebase style and
improves readability.
##########
catalogs/catalog-lakehouse-iceberg/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergViewCatalogOperations.java:
##########
@@ -0,0 +1,444 @@
+/*
+ * 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.gravitino.catalog.lakehouse.iceberg;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.gravitino.NameIdentifier;
+import org.apache.gravitino.Namespace;
+import org.apache.gravitino.catalog.lakehouse.iceberg.converter.ConvertUtil;
+import
org.apache.gravitino.catalog.lakehouse.iceberg.ops.IcebergCatalogWrapperHelper;
+import org.apache.gravitino.exceptions.NoSuchSchemaException;
+import org.apache.gravitino.exceptions.NoSuchViewException;
+import org.apache.gravitino.exceptions.ViewAlreadyExistsException;
+import org.apache.gravitino.iceberg.common.ops.IcebergCatalogWrapper;
+import org.apache.gravitino.meta.AuditInfo;
+import org.apache.gravitino.rel.Column;
+import org.apache.gravitino.rel.Representation;
+import org.apache.gravitino.rel.SQLRepresentation;
+import org.apache.gravitino.rel.View;
+import org.apache.gravitino.rel.ViewChange;
+import org.apache.gravitino.utils.PrincipalUtils;
+import org.apache.iceberg.MetadataUpdate;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.AlreadyExistsException;
+import org.apache.iceberg.exceptions.NoSuchNamespaceException;
+import org.apache.iceberg.rest.requests.ImmutableCreateViewRequest;
+import org.apache.iceberg.rest.requests.RenameTableRequest;
+import org.apache.iceberg.rest.requests.UpdateTableRequest;
+import org.apache.iceberg.rest.responses.ListTablesResponse;
+import org.apache.iceberg.rest.responses.LoadViewResponse;
+import org.apache.iceberg.view.ImmutableSQLViewRepresentation;
+import org.apache.iceberg.view.ImmutableViewVersion;
+import org.apache.iceberg.view.SQLViewRepresentation;
+import org.apache.iceberg.view.ViewMetadata;
+import org.apache.iceberg.view.ViewRepresentation;
+import org.apache.iceberg.view.ViewVersion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** View catalog operations for Iceberg. */
+class IcebergViewCatalogOperations {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(IcebergViewCatalogOperations.class);
+
+ private static final int INITIAL_VIEW_VERSION_ID = 1;
+
+ /** Iceberg sentinel value for {@code SetCurrentViewVersion}: "use the last
added version". */
+ private static final int ICEBERG_LAST_ADDED_VIEW_VERSION = -1;
+
+ private final IcebergCatalogWrapper icebergCatalogWrapper;
+
+ IcebergViewCatalogOperations(IcebergCatalogWrapper icebergCatalogWrapper) {
+ Preconditions.checkArgument(
+ icebergCatalogWrapper != null, "icebergCatalogWrapper must not be
null");
+ this.icebergCatalogWrapper = icebergCatalogWrapper;
+ }
+
+ public View loadView(NameIdentifier ident) throws NoSuchViewException {
+ try {
+ LoadViewResponse response =
+ icebergCatalogWrapper.loadView(
+ IcebergCatalogWrapperHelper.buildIcebergTableIdentifier(ident));
+ return IcebergView.fromLoadViewResponse(response, ident.name());
+ } catch (org.apache.iceberg.exceptions.NoSuchViewException e) {
+ throw new NoSuchViewException(e, "Iceberg view %s does not exist",
ident);
+ }
+ }
+
+ public boolean viewExists(NameIdentifier ident) {
+ return icebergCatalogWrapper.viewExists(
+ IcebergCatalogWrapperHelper.buildIcebergTableIdentifier(ident));
+ }
+
+ public NameIdentifier[] listViews(Namespace namespace) throws
NoSuchSchemaException {
+ org.apache.iceberg.catalog.Namespace icebergNamespace =
+ IcebergCatalogWrapperHelper.getIcebergNamespace(namespace);
+ if (!icebergCatalogWrapper.namespaceExists(icebergNamespace)) {
+ throw new NoSuchSchemaException("Schema %s does not exist", namespace);
+ }
+ try {
+ ListTablesResponse response =
icebergCatalogWrapper.listView(icebergNamespace);
+ return response.identifiers().stream()
+ .map(id -> NameIdentifier.of(ArrayUtils.add(namespace.levels(),
id.name())))
+ .toArray(NameIdentifier[]::new);
+ } catch (NoSuchNamespaceException e) {
+ throw new NoSuchSchemaException("Schema does not exist %s in Iceberg",
namespace);
+ }
+ }
+
+ public View createView(
+ NameIdentifier ident,
+ String comment,
+ Column[] columns,
+ Representation[] representations,
+ String defaultCatalog,
+ String defaultSchema,
+ Map<String, String> properties)
+ throws NoSuchSchemaException, ViewAlreadyExistsException {
+ org.apache.iceberg.catalog.Namespace icebergNamespace =
+ IcebergCatalogWrapperHelper.getIcebergNamespace(ident.namespace());
+
+ Schema schema = ConvertUtil.toIcebergSchema(columns);
+ List<ViewRepresentation> viewRepresentations = new ArrayList<>();
+ for (Representation representation : representations) {
+ viewRepresentations.add(toSqlViewRepresentation(representation));
+ }
+ Representation[] sqlRepresentations =
+ viewRepresentations.stream()
+ .map(IcebergViewCatalogOperations::toSqlRepresentation)
+ .toArray(SQLRepresentation[]::new);
+
+ org.apache.iceberg.catalog.Namespace defaultNamespace =
+ defaultSchema != null
+ ? IcebergCatalogWrapperHelper.getIcebergNamespace(defaultSchema)
+ : icebergNamespace;
+
+ ViewVersion viewVersion =
+ ImmutableViewVersion.builder()
+ .versionId(INITIAL_VIEW_VERSION_ID)
+ .timestampMillis(System.currentTimeMillis())
+ .schemaId(schema.schemaId())
+ .defaultNamespace(defaultNamespace)
+ .representations(viewRepresentations)
+ .putSummary("operation", "create")
+ .build();
+
+ Map<String, String> allProperties =
+ properties != null ? Maps.newHashMap(properties) : Maps.newHashMap();
+ if (comment != null) {
+ allProperties.put("comment", comment);
+ }
+ if (defaultCatalog != null) {
+ allProperties.put("default-catalog", defaultCatalog);
+ }
+
+ ImmutableCreateViewRequest request =
+ ImmutableCreateViewRequest.builder()
+ .name(ident.name())
+ .schema(schema)
+ .viewVersion(viewVersion)
+ .properties(allProperties)
+ .build();
+
+ try {
+ icebergCatalogWrapper.createView(icebergNamespace, request);
+ LOG.info("Created Iceberg view {}", ident);
+ return IcebergView.builder()
+ .withName(ident.name())
+ .withComment(comment)
+ .withColumns(columns)
+ .withRepresentations(sqlRepresentations)
+ .withProperties(allProperties)
+ .withAuditInfo(
+
AuditInfo.builder().withCreator(currentUser()).withCreateTime(Instant.now()).build())
+ .build();
+ } catch (AlreadyExistsException e) {
+ throw new ViewAlreadyExistsException(e, "View %s already exists in
Iceberg catalog", ident);
+ } catch (NoSuchNamespaceException e) {
+ throw new NoSuchSchemaException(
+ e, "Schema does not exist for view %s in Iceberg catalog", ident);
+ }
+ }
+
+ public View alterView(NameIdentifier ident, ViewChange... changes)
+ throws NoSuchViewException, IllegalArgumentException {
+ Optional<ViewChange> renameOptional =
+ Arrays.stream(changes).filter(c -> c instanceof
ViewChange.RenameView).reduce((a, b) -> b);
+ if (renameOptional.isPresent()) {
+ String otherChange =
+ Arrays.stream(changes)
+ .filter(c -> !(c instanceof ViewChange.RenameView))
+ .map(String::valueOf)
+ .collect(Collectors.joining("\n"));
+ Preconditions.checkArgument(
+ StringUtils.isEmpty(otherChange),
+ "Rename cannot be combined with other view changes: " + otherChange);
+ return renameView(ident, (ViewChange.RenameView) renameOptional.get());
+ }
+ return internalUpdateView(ident, changes);
+ }
+
+ public boolean dropView(NameIdentifier ident) {
+ try {
+ icebergCatalogWrapper.dropView(
+ IcebergCatalogWrapperHelper.buildIcebergTableIdentifier(ident));
+ LOG.info("Dropped Iceberg view {}", ident);
+ return true;
+ } catch (org.apache.iceberg.exceptions.NoSuchViewException e) {
+ LOG.warn("Iceberg view {} does not exist, skip dropping", ident);
+ return false;
+ }
+ }
+
+ private View renameView(NameIdentifier ident, ViewChange.RenameView rename)
+ throws NoSuchViewException {
+ try {
+ RenameTableRequest request =
+ RenameTableRequest.builder()
+
.withSource(IcebergCatalogWrapperHelper.buildIcebergTableIdentifier(ident))
+ .withDestination(
+ IcebergCatalogWrapperHelper.buildIcebergTableIdentifier(
+ ident.namespace(), rename.getNewName()))
+ .build();
+ icebergCatalogWrapper.renameView(request);
+ return loadView(
+ NameIdentifier.of(ArrayUtils.add(ident.namespace().levels(),
rename.getNewName())));
+ } catch (org.apache.iceberg.exceptions.NoSuchViewException e) {
+ throw new NoSuchViewException(e, "Iceberg view %s does not exist",
ident);
+ }
+ }
+
+ private View internalUpdateView(NameIdentifier ident, ViewChange... changes)
+ throws NoSuchViewException, IllegalArgumentException {
+ TableIdentifier viewId =
IcebergCatalogWrapperHelper.buildIcebergTableIdentifier(ident);
+ try {
+ LoadViewResponse current = icebergCatalogWrapper.loadView(viewId);
+ ViewMetadata metadata = current.metadata();
+
+ Map<String, String> setProps = new HashMap<>();
+ Set<String> removeProps = new HashSet<>();
+ Optional<ViewChange.ReplaceView> replaceOpt =
+ collectPropertyChanges(changes, setProps, removeProps);
+
+ replaceOpt.ifPresent(replace -> applyReplaceViewProperties(replace,
setProps, removeProps));
+
+ List<MetadataUpdate> updates =
+ new ArrayList<>(buildPropertyMetadataUpdates(setProps, removeProps));
+ replaceOpt.ifPresent(
+ replaceView -> updates.addAll(buildNewViewVersionUpdates(ident,
replaceView, metadata)));
+
+ if (updates.isEmpty()) {
+ return loadView(ident);
+ }
+
+ UpdateTableRequest request =
+ UpdateTableRequest.create(viewId, Collections.emptyList(), updates);
+ LoadViewResponse response = icebergCatalogWrapper.updateView(viewId,
request);
Review Comment:
`UpdateTableRequest` is constructed with an empty `requirements` list, which
bypasses Iceberg’s optimistic-concurrency checks and can lead to lost updates
if multiple writers alter the same view concurrently. Consider populating
`requirements` based on the loaded `ViewMetadata` and the planned
`MetadataUpdate`s (e.g., using Iceberg `UpdateRequirements` helpers for view
updates) instead of always sending `Collections.emptyList()`.
--
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]
