Fixed issue where renaming a table to a name that already existed fails when updating the user metadata since in Metacat(based on app configuration) we do not drop the metadata. (Netflix#299)

Author: ajoymajumdar

metacat-common/src/main/java/com/netflix/metacat/common/dto/notifications/sns/SNSMessage.java

@@ -38,7 +38,7 @@
 @ToString
 @EqualsAndHashCode(callSuper = false)
 public class SNSMessage<P> extends BaseDto {
-
+    private final String source = "metacat";
     private final String id;
     private final long timestamp;
     private final String requestId;

metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/MetacatSmokeSpec.groovy

@@ -548,6 +548,12 @@ class MetacatSmokeSpec extends Specification {
         then:
         noExceptionThrown()
         when:
+        createTable(catalogName, databaseName, tableName1, 'TRUE')
+        api.deleteTable(catalogName, databaseName, tableName)
+        api.renameTable(catalogName, databaseName, tableName1, tableName)
+        then:
+        noExceptionThrown()
+        when:
         api.renameTable(catalogName, databaseName, tableName, tableName1)
         then:
         noExceptionThrown()

metacat-metadata-mysql/src/main/java/com/netflix/metacat/metadata/mysql/MySqlTagService.java

@@ -217,9 +217,9 @@ public void renameTableTags(final QualifiedName name, final String newTableName)
         try {
             final QualifiedName newName = QualifiedName.ofTable(name.getCatalogName(), name.getDatabaseName(),
                 newTableName);
-            jdbcTemplate.update(SQL_UPDATE_TAG_ITEM,
-                new String[]{MysqlUserMetadataService.DELETE_MARKER + newName.toString(), newName.toString()},
-                new int[]{Types.VARCHAR, Types.VARCHAR});
+            if (get(newName) != null) {
+                delete(newName, true);
+            }
             jdbcTemplate.update(SQL_UPDATE_TAG_ITEM, new String[]{newName.toString(), name.toString()},
                 new int[]{Types.VARCHAR, Types.VARCHAR});
         } catch (Exception e) {

metacat-metadata-mysql/src/main/java/com/netflix/metacat/metadata/mysql/MysqlUserMetadataService.java

@@ -64,11 +64,6 @@
 @SuppressFBWarnings
 @Transactional("metadataTxManager")
 public class MysqlUserMetadataService extends BaseUserMetadataService {
-    /**
-     *  Marker for the items that are marked deleted.
-     *  TODO: Need to better handle soft delete.
-     */
-    public static final String DELETE_MARKER = "_";
     private final MetacatJson metacatJson;
     private final Config config;
     private JdbcTemplate jdbcTemplate;
@@ -594,7 +589,7 @@ public int renameDataMetadataKey(
     public int renameDefinitionMetadataKey(
         @Nonnull final QualifiedName oldName,
         @Nonnull final QualifiedName newName) {
-        executeUpdateForKey(SQL.RENAME_DEFINITION_METADATA, DELETE_MARKER + newName.toString(), newName.toString());
+        _deleteDefinitionMetadata(Lists.newArrayList(newName));
         return executeUpdateForKey(SQL.RENAME_DEFINITION_METADATA, newName.toString(), oldName.toString());
     }
 

metacat-testdata-provider/src/main/groovy/com/netflix/metacat/testdata/provider/PigDataDtoProvider.groovy

@@ -242,6 +242,6 @@ class PigDataDtoProvider {
     }
 
     def static getDefinitionMetadata(String owner){
-        return metacatJson.parseJsonObject('{"hive": {"cleanup": true},"owner": {"team": "Cloud Platform Engineering","userId":"' + owner + '","name":"' + owner + '"}}')
+        return metacatJson.parseJsonObject('{"hive": {"cleanup": true},"tags":["unused"],"owner": {"team": "Cloud Platform Engineering","userId":"' + owner + '","name":"' + owner + '"}}')
     }
 }