address style

Author: Yingjian Wu

metacat-common-server/src/main/java/com/netflix/metacat/common/server/usermetadata/MetadataSQLInterceptor.java

@@ -0,0 +1,33 @@
+package com.netflix.metacat.common.server.usermetadata;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.netflix.metacat.common.QualifiedName;
+
+/**
+ * MetadataSQLInterceptor.
+ *
+ * @author yingjianw
+ * @since 1.2.0
+ */
+
+public interface MetadataSqlInterceptor {
+    /**
+     * Intercept the definition metadata sql update statement into the db.
+     * @param sql base sql statement
+     * @return the modified sql string
+     */
+    String interceptSQL(String sql);
+
+    /**
+     * Intercept the newMetadata during write.
+     * @param name qualifiedName
+     * @param existing existing definition metadata in the db
+     * @param newMetadata new definition metadata
+     * @param userMetadataService userMetadataService
+     */
+    void onWrite(QualifiedName name,
+                        ObjectNode existing,
+                        ObjectNode newMetadata,
+                        final UserMetadataService userMetadataService
+    );
+}

metacat-common-server/src/main/java/com/netflix/metacat/common/server/usermetadata/MetadataSQLInterceptorImpl.java

@@ -0,0 +1,26 @@
+package com.netflix.metacat.common.server.usermetadata;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.netflix.metacat.common.QualifiedName;
+
+/**
+ * MetadataSQLInterceptorImpl.
+ *
+ * @author yingjianw
+ * @since 1.2.0
+ */
+public class MetadataSqlInterceptorImpl implements MetadataSqlInterceptor {
+    @Override
+    public String interceptSQL(final String sql) {
+        return "";
+    }
+
+    @Override
+    public void onWrite(final QualifiedName name,
+                        final ObjectNode existing,
+                        final ObjectNode newMetadata,
+                        final UserMetadataService userMetadataService
+    ) {
+
+    }
+}

metacat-common-server/src/main/java/com/netflix/metacat/common/server/usermetadata/MetadataSqlInterceptor.java

@@ -17,18 +17,15 @@
 package com.netflix.metacat.connector.hive.client.thrift;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.netflix.metacat.common.server.connectors.exception.InvalidMetaException;
 import com.netflix.metacat.connector.hive.IMetacatHiveClient;
 import com.netflix.metacat.connector.hive.monitoring.HiveMetrics;
 import com.netflix.spectator.api.Counter;
 import com.netflix.spectator.api.Id;
 import com.netflix.spectator.api.Registry;
-import org.apache.hadoop.hive.common.StatsSetupConst;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.DropPartitionsRequest;
-import org.apache.hadoop.hive.metastore.api.EnvironmentContext;
 import org.apache.hadoop.hive.metastore.api.InvalidObjectException;
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.api.Partition;
@@ -193,10 +190,6 @@ public void rename(final String databaseName,
                 table.setDbName(newdatabadeName);
                 table.setTableName(newName);
                 client.alter_table(databaseName, oldName, table);
-                EnvironmentContext envContext = new EnvironmentContext(
-                    ImmutableMap.of(StatsSetupConst.DO_NOT_UPDATE_STATS, StatsSetupConst.TRUE)
-                );
-                client.alter_table_with_environment_context(databaseName, oldName, table,envContext);
             }
             return null;
         });

metacat-common-server/src/main/java/com/netflix/metacat/common/server/usermetadata/MetadataSqlInterceptorImpl.java

@@ -17,8 +17,8 @@
 import com.netflix.metacat.common.server.converter.ConverterUtil;
 import com.netflix.metacat.common.server.properties.Config;
 import com.netflix.metacat.common.server.properties.MetacatProperties;
-import com.netflix.metacat.common.server.usermetadata.MetadataSQLInterceptor;
-import com.netflix.metacat.common.server.usermetadata.MetadataSQLInterceptorImpl;
+import com.netflix.metacat.common.server.usermetadata.MetadataSqlInterceptor;
+import com.netflix.metacat.common.server.usermetadata.MetadataSqlInterceptorImpl;
 import com.netflix.metacat.common.server.usermetadata.UserMetadataService;
 import com.netflix.metacat.common.server.usermetadata.LookupService;
 import com.netflix.metacat.common.server.usermetadata.TagService;
@@ -57,14 +57,14 @@ public MetadataInterceptor businessMetadataManager(
     }
 
     /**
-     * business Metadata Manager on mysql layer
-     * @return business Metadata Manager
+     * MetadataSQLInterceptor layer.
+     * @return MetadataSQLInterceptor
      */
     @Bean
-    @ConditionalOnMissingBean(MetadataSQLInterceptor.class)
-    public MetadataSQLInterceptor MetadataSQLInterceptor(
+    @ConditionalOnMissingBean(MetadataSqlInterceptor.class)
+    public MetadataSqlInterceptor metadataSqlInterceptor(
     ) {
-        return new MetadataSQLInterceptorImpl();
+        return new MetadataSqlInterceptorImpl();
     }
 
     /**
@@ -74,6 +74,7 @@ public MetadataSQLInterceptor MetadataSQLInterceptor(
      * @param config       System config to use
      * @param metacatJson  Json Utilities to use
      * @param metadataInterceptor  business metadata manager
+     * @param metadataSQLInterceptor metadataSQLInterceptor
      * @return User metadata service based on MySql
      */
     @Bean
@@ -82,9 +83,15 @@ public UserMetadataService userMetadataService(
         final Config config,
         final MetacatJson metacatJson,
         final MetadataInterceptor metadataInterceptor,
-        final MetadataSQLInterceptor metadataSQLInterceptor
+        final MetadataSqlInterceptor metadataSQLInterceptor
         ) {
-        return new MysqlUserMetadataService(jdbcTemplate, metacatJson, config, metadataInterceptor, metadataSQLInterceptor);
+        return new MysqlUserMetadataService(
+            jdbcTemplate,
+            metacatJson,
+            config,
+            metadataInterceptor,
+            metadataSQLInterceptor
+        );
     }
 
 

metacat-connector-hive/src/main/java/com/netflix/metacat/connector/hive/client/thrift/MetacatHiveClient.java

@@ -32,7 +32,7 @@
 import com.netflix.metacat.common.server.usermetadata.BaseUserMetadataService;
 import com.netflix.metacat.common.server.usermetadata.GetMetadataInterceptorParameters;
 import com.netflix.metacat.common.server.usermetadata.MetadataInterceptor;
-import com.netflix.metacat.common.server.usermetadata.MetadataSQLInterceptor;
+import com.netflix.metacat.common.server.usermetadata.MetadataSqlInterceptor;
 import com.netflix.metacat.common.server.usermetadata.UserMetadataServiceException;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import lombok.Data;
@@ -78,7 +78,7 @@ public class MysqlUserMetadataService extends BaseUserMetadataService {
     private final Config config;
     private JdbcTemplate jdbcTemplate;
     private final MetadataInterceptor metadataInterceptor;
-    private final MetadataSQLInterceptor metadataSQLInterceptor;
+    private final MetadataSqlInterceptor metadataSQLInterceptor;
 
     /**
      * Constructor.
@@ -87,13 +87,14 @@ public class MysqlUserMetadataService extends BaseUserMetadataService {
      * @param metacatJson         json utility
      * @param config              config
      * @param metadataInterceptor metadata interceptor
+     * @param metadataSQLInterceptor metadataSQLInterceptor
      */
     public MysqlUserMetadataService(
         final JdbcTemplate jdbcTemplate,
         final MetacatJson metacatJson,
         final Config config,
         final MetadataInterceptor metadataInterceptor,
-        final MetadataSQLInterceptor metadataSQLInterceptor
+        final MetadataSqlInterceptor metadataSQLInterceptor
     ) {
         this.metacatJson = metacatJson;
         this.config = config;
@@ -609,9 +610,9 @@ public void saveDefinitionMetadata(
                     merged.toString(),
                     userId,
                     name.toString());
-                retryCount --;
+                retryCount--;
             }
-
+            // if retryCount is exhausted, then this mean the value is still conflicting
         } else {
             // apply interceptor to change the object node
             if (metadata.isPresent()) {