Rearrange setMaterializedViewColumnComment method order

trinodb · Aug 24, 2023 · b73f1ad · b73f1ad
1 parent 7f76efc
commit b73f1ad
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 49 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/metadata/Metadata.java b/core/trino-main/src/main/java/io/trino/metadata/Metadata.java
@@ -237,11 +237,6 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
      */
     void setViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment);
 
-    /**
-     * Comments to the specified materialized view column.
-     */
-    void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment);
-
     /**
      * Comments to the specified column.
      */
@@ -725,6 +720,11 @@ default boolean isMaterializedView(Session session, QualifiedObjectName viewName
      */
     void setMaterializedViewProperties(Session session, QualifiedObjectName viewName, Map<String, Optional<Object>> properties);
 
+    /**
+     * Comments to the specified materialized view column.
+     */
+    void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment);
+
     /**
      * Returns the result of redirecting the table scan on a given table to a different table.
      * This method is used by the engine during the plan optimization phase to allow a connector to offload table scans to any other connector.

diff --git a/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java b/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java
@@ -825,15 +825,6 @@ public void setViewColumnComment(Session session, QualifiedObjectName viewName,
         metadata.setViewColumnComment(session.toConnectorSession(catalogHandle), viewName.asSchemaTableName(), columnName, comment);
     }
 
-    @Override
-    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
-    {
-        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, viewName.getCatalogName());
-        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
-        ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
-        metadata.setMaterializedViewColumnComment(session.toConnectorSession(catalogHandle), viewName.asSchemaTableName(), columnName, comment);
-    }
-
     @Override
     public void setColumnComment(Session session, TableHandle tableHandle, ColumnHandle column, Optional<String> comment)
     {
@@ -1610,6 +1601,15 @@ public void setMaterializedViewProperties(Session session, QualifiedObjectName v
         metadata.setMaterializedViewProperties(session.toConnectorSession(catalogHandle), viewName.asSchemaTableName(), properties);
     }
 
+    @Override
+    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+    {
+        CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, viewName.getCatalogName());
+        CatalogHandle catalogHandle = catalogMetadata.getCatalogHandle();
+        ConnectorMetadata metadata = catalogMetadata.getMetadata(session);
+        metadata.setMaterializedViewColumnComment(session.toConnectorSession(catalogHandle), viewName.asSchemaTableName(), columnName, comment);
+    }
+
     private static boolean isExternalInformationSchema(CatalogHandle catalogHandle, Optional<String> schemaName)
     {
         return schemaName.isPresent() && isExternalInformationSchema(catalogHandle, schemaName.get());

diff --git a/core/trino-main/src/main/java/io/trino/tracing/TracingMetadata.java b/core/trino-main/src/main/java/io/trino/tracing/TracingMetadata.java
@@ -435,15 +435,6 @@ public void setViewColumnComment(Session session, QualifiedObjectName viewName,
         }
     }
 
-    @Override
-    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
-    {
-        Span span = startSpan("setMaterializedViewColumnComment", viewName);
-        try (var ignored = scopedSpan(span)) {
-            delegate.setMaterializedViewColumnComment(session, viewName, columnName, comment);
-        }
-    }
-
     @Override
     public void setColumnComment(Session session, TableHandle tableHandle, ColumnHandle column, Optional<String> comment)
     {
@@ -1314,6 +1305,15 @@ public void setMaterializedViewProperties(Session session, QualifiedObjectName v
         }
     }
 
+    @Override
+    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+    {
+        Span span = startSpan("setMaterializedViewColumnComment", viewName);
+        try (var ignored = scopedSpan(span)) {
+            delegate.setMaterializedViewColumnComment(session, viewName, columnName, comment);
+        }
+    }
+
     @Override
     public Optional<TableScanRedirectApplicationResult> applyTableScanRedirect(Session session, TableHandle tableHandle)
     {

diff --git a/core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java b/core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java
@@ -484,6 +484,26 @@ public synchronized void setMaterializedViewProperties(
                             newProperties));
         }
 
+        @Override
+        public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+        {
+            MaterializedViewDefinition view = materializedViews.get(viewName.asSchemaTableName());
+            materializedViews.put(
+                    viewName.asSchemaTableName(),
+                    new MaterializedViewDefinition(
+                            view.getOriginalSql(),
+                            view.getCatalog(),
+                            view.getSchema(),
+                            view.getColumns().stream()
+                                    .map(currentViewColumn -> columnName.equals(currentViewColumn.getName()) ? new ViewColumn(currentViewColumn.getName(), currentViewColumn.getType(), comment) : currentViewColumn)
+                                    .collect(toImmutableList()),
+                            view.getGracePeriod(),
+                            view.getComment(),
+                            view.getRunAsIdentity().get(),
+                            view.getStorageTable(),
+                            view.getProperties()));
+        }
+
         @Override
         public void dropMaterializedView(Session session, QualifiedObjectName viewName)
         {
@@ -576,26 +596,6 @@ public void setViewColumnComment(Session session, QualifiedObjectName viewName,
                             view.getRunAsIdentity()));
         }
 
-        @Override
-        public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
-        {
-            MaterializedViewDefinition view = materializedViews.get(viewName.asSchemaTableName());
-            materializedViews.put(
-                    viewName.asSchemaTableName(),
-                    new MaterializedViewDefinition(
-                            view.getOriginalSql(),
-                            view.getCatalog(),
-                            view.getSchema(),
-                            view.getColumns().stream()
-                                    .map(currentViewColumn -> columnName.equals(currentViewColumn.getName()) ? new ViewColumn(currentViewColumn.getName(), currentViewColumn.getType(), comment) : currentViewColumn)
-                                    .collect(toImmutableList()),
-                            view.getGracePeriod(),
-                            view.getComment(),
-                            view.getRunAsIdentity().get(),
-                            view.getStorageTable(),
-                            view.getProperties()));
-        }
-
         @Override
         public void renameMaterializedView(Session session, QualifiedObjectName source, QualifiedObjectName target)
         {

diff --git a/core/trino-main/src/test/java/io/trino/metadata/AbstractMockMetadata.java b/core/trino-main/src/test/java/io/trino/metadata/AbstractMockMetadata.java
@@ -304,12 +304,6 @@ public void setViewColumnComment(Session session, QualifiedObjectName viewName,
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public void setColumnComment(Session session, TableHandle tableHandle, ColumnHandle column, Optional<String> comment)
     {
@@ -906,6 +900,12 @@ public void setMaterializedViewProperties(Session session, QualifiedObjectName v
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void setMaterializedViewColumnComment(Session session, QualifiedObjectName viewName, String columnName, Optional<String> comment)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Optional<TableScanRedirectApplicationResult> applyTableScanRedirect(Session session, TableHandle tableHandle)
     {