.

Netflix · Apr 8, 2024 · 6f2ead6 · 6f2ead6
1 parent 9fdecae
commit 6f2ead6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/metacat-client/src/main/java/com/netflix/metacat/client/api/MetacatV1.java b/metacat-client/src/main/java/com/netflix/metacat/client/api/MetacatV1.java
@@ -557,10 +557,11 @@ TableDto updateMView(
     /**
      * Update table.
      *
-     * @param catalogName  catalog name
-     * @param databaseName database name
-     * @param tableName    table name
-     * @param table        table
+     * @param catalogName           catalog name
+     * @param databaseName          database name
+     * @param tableName             table name
+     * @param includeSecureMetadata consider updates to secure metadata if true
+     * @param table                 table
      * @return table
      */
     @PUT
@@ -574,6 +575,9 @@ TableDto updateTable(
             String databaseName,
         @PathParam("table-name")
             String tableName,
+        @DefaultValue("false")
+        @QueryParam("includeSecureMetadata")
+        Boolean includeSecureMetadata,
         TableDto table
     );
 }
diff --git a/metacat-common-server/src/main/java/com/netflix/metacat/common/server/api/v1/MetacatV1.java b/metacat-common-server/src/main/java/com/netflix/metacat/common/server/api/v1/MetacatV1.java
@@ -168,16 +168,18 @@ void renameTable(
     /**
      * Update table.
      *
-     * @param catalogName  catalog name
-     * @param databaseName database name
-     * @param tableName    table name
-     * @param table        table
+     * @param catalogName           catalog name
+     * @param databaseName          database name
+     * @param tableName             table name
+     * @param includeSecureMetadata consider updates to secure metadata if true
+     * @param table                 table
      * @return table
      */
     TableDto updateTable(
         final String catalogName,
         final String databaseName,
         final String tableName,
+        final boolean includeSecureMetadata,
         final TableDto table
     );
 

diff --git a/metacat-main/src/main/java/com/netflix/metacat/main/api/v1/MetacatController.java b/metacat-main/src/main/java/com/netflix/metacat/main/api/v1/MetacatController.java
@@ -1234,7 +1234,7 @@ public TableDto updateTable(
         @PathVariable("database-name") final String databaseName,
         @ApiParam(value = "The name of the table", required = true)
         @PathVariable("table-name") final String tableName,
-        @ApiParam(value = "To consider any updates to secure metadata in the request", required = false)
+        @ApiParam(value = "To consider updates to secure metadata if true", required = false)
         @RequestParam(name = "includeSecureMetadata", defaultValue = "false") final boolean includeSecureMetadata,
         @ApiParam(value = "The table information", required = true)
         @RequestBody final TableDto table

diff --git a/metacat-main/src/main/java/com/netflix/metacat/main/api/v1/PartitionController.java b/metacat-main/src/main/java/com/netflix/metacat/main/api/v1/PartitionController.java
@@ -1087,7 +1087,7 @@ public PartitionsSaveResponseDto savePartitions(
                         dto.setName(name);
                         dto.setDefinitionMetadata(partitionsSaveRequestDto.getDefinitionMetadata());
                         dto.setDataMetadata(partitionsSaveRequestDto.getDataMetadata());
-                        this.v1.updateTable(catalogName, databaseName, tableName, dto);
+                        this.v1.updateTable(catalogName, databaseName, tableName, false, dto);
                     }
                 }
                 return result;

diff --git a/metacat-thrift/src/main/java/com/netflix/metacat/thrift/CatalogThriftHiveMetastore.java b/metacat-thrift/src/main/java/com/netflix/metacat/thrift/CatalogThriftHiveMetastore.java
@@ -441,7 +441,7 @@ public void alter_table_with_environment_context(
                     v1.renameTable(catalogName, oldName.getDatabaseName(), oldName.getTableName(),
                         newName.getTableName());
                 }
-                v1.updateTable(catalogName, dbname, newName.getTableName(), dto);
+                v1.updateTable(catalogName, dbname, newName.getTableName(), false, dto);
                 return null;
             });
     }

diff --git a/...t-thrift/src/test/groovy/com/netflix/metacat/thrift/CatalogThriftHiveMetastoreSpec.groovy b/...t-thrift/src/test/groovy/com/netflix/metacat/thrift/CatalogThriftHiveMetastoreSpec.groovy
@@ -626,7 +626,7 @@ class CatalogThriftHiveMetastoreSpec extends Specification {
         } else {
             0 * metacatV1.renameTable(_, _, _, _)
         }
-        1 * metacatV1.updateTable(_, _, _, _)
+        1 * metacatV1.updateTable(_, _, _, _, _)
         registry.clock() >> clock
         registry.timer(_) >> timer
         timer.record(_, _) >> {}
@@ -659,7 +659,7 @@ class CatalogThriftHiveMetastoreSpec extends Specification {
         } else {
             0 * metacatV1.renameTable(_, _, _, _)
         }
-        1 * metacatV1.updateTable(_, _, _, _)
+        1 * metacatV1.updateTable(_, _, _, _, _)
         registry.clock() >> clock
         registry.timer(_) >> timer
         timer.record(_, _) >> {}
@@ -692,7 +692,7 @@ class CatalogThriftHiveMetastoreSpec extends Specification {
         } else {
             0 * metacatV1.renameTable(_, _, _, _)
         }
-        1 * metacatV1.updateTable(_, _, _, _)
+        1 * metacatV1.updateTable(_, _, _, _, _)
         registry.clock() >> clock
         registry.timer(_) >> timer
         timer.record(_, _) >> {}