fix-1

Author: dengzhhu653

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java

@@ -2754,7 +2754,7 @@ public TruncateTableResponse truncate_table_req(TruncateTableRequest req)
           .defaultMetaException();
     } finally {
       endFunction("truncate_table_req", success, ex,
-          TableName.getQualified(parsedDbName[CAT_NAME],parsedDbName[DB_NAME], req.getTableName()));
+          TableName.getQualified(parsedDbName[CAT_NAME], parsedDbName[DB_NAME], req.getTableName()));
     }
   }
 

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/handler/AbstractRequestHandler.java

@@ -60,7 +60,7 @@
 public abstract class AbstractRequestHandler<T extends TBase, A extends AbstractRequestHandler.Result> {
   private static final Logger LOG = LoggerFactory.getLogger(AbstractRequestHandler.class);
   private static final Map<String, AbstractRequestHandler> ID_TO_HANDLER = new ConcurrentHashMap<>();
-  private static final AtomicLong ID = new AtomicLong(0);
+  private static final AtomicLong ID_GEN = new AtomicLong(0);
   private static final ScheduledExecutorService REQUEST_CLEANER = Executors.newScheduledThreadPool(1, r -> {
     Thread thread = new Thread(r);
     thread.setDaemon(true);
@@ -113,7 +113,7 @@ private AbstractRequestHandler(String id) {
   }
 
   AbstractRequestHandler(IHMSHandler handler, boolean async, T request) {
-    this.id = UUID.randomUUID() + "-" + ID.incrementAndGet();
+    this.id = UUID.randomUUID() + "-" + ID_GEN.incrementAndGet();
     this.handler = handler;
     this.request = request;
     this.async = async;
@@ -337,8 +337,8 @@ public boolean success() throws TException {
    * @return the alias, null or empty if no need to measure the operation.
    */
   private String getMetricAlias() {
-    RequestHandler handler = getClass().getAnnotation(RequestHandler.class);
-    return handler != null ? handler.metricAlias() : null;
+    RequestHandler rh = getClass().getAnnotation(RequestHandler.class);
+    return rh != null ? rh.metricAlias() : null;
   }
 
   public void checkInterrupted() throws MetaException {

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/handler/DropDatabaseHandler.java

@@ -81,6 +81,7 @@ public class DropDatabaseHandler
   private List<String> packages;
   private AtomicReference<String> progress;
   private DropDatabaseResult result;
+  private RawStore rs;
 
   DropDatabaseHandler(IHMSHandler handler, DropDatabaseRequest request) {
     super(handler, request.isAsyncDrop(), request);
@@ -89,7 +90,6 @@ public class DropDatabaseHandler
   public DropDatabaseResult execute() throws TException, IOException {
     boolean success = false;
     Map<String, String> transactionalListenerResponses = Collections.emptyMap();
-    RawStore rs = handler.getMS();
     rs.openTransaction();
     try {
       if (MetaStoreUtils.isDatabaseRemote(db)) {
@@ -154,6 +154,7 @@ public DropDatabaseResult execute() throws TException, IOException {
         }
       }
 
+      progress.set("Dropping the database");
       if (rs.dropDatabase(catalogName, name)) {
         if (!handler.getTransactionalListeners().isEmpty()) {
           checkInterrupted();
@@ -196,7 +197,7 @@ protected void beforeExecute() throws TException, IOException {
     this.catalogName = normalizeIdentifier(
         request.isSetCatalogName() ? request.getCatalogName() : MetaStoreUtils.getDefaultCatalog(handler.getConf()));
 
-    RawStore rs = handler.getMS();
+    this.rs = handler.getMS();
     db = rs.getDatabase(catalogName, name);
     if (!MetastoreConf.getBoolVar(handler.getConf(), HIVE_IN_TEST) && ReplChangeManager.isSourceOfReplication(db)) {
       throw new InvalidOperationException("can not drop a database which is a source of replication");
@@ -414,6 +415,9 @@ protected void afterExecute(DropDatabaseResult result) throws MetaException, IOE
           wh.addToChangeManagement(funcCmPath);
         }
         if (request.isDeleteData()) {
+          progress.set(String.format("Deleting %d partition paths and %d table paths from the database",
+              result.getPartitionPaths() != null ? result.getPartitionPaths().size() : 0,
+              result.getTablePaths().size()));
           Database db = result.getDatabase();
           // Delete the data in the partitions which have other locations
           List<Path> pathsToDelete = new ArrayList<>();
@@ -453,12 +457,16 @@ protected void afterExecute(DropDatabaseResult result) throws MetaException, IOE
         }
       }
     } finally {
+      super.afterExecute(result);
+      if (async) {
+        rs.shutdown();
+      }
+      rs = null;
       tables = null;
       functions = null;
       procedures = null;
       packages = null;
       db = null;
-      super.afterExecute(result);
     }
   }
 }

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/handler/DropTableHandler.java

@@ -65,6 +65,7 @@ public class DropTableHandler
   private TableName tableName;
   private boolean tableDataShouldBeDeleted;
   private AtomicReference<String> progress;
+  private RawStore ms;
 
   DropTableHandler(IHMSHandler handler, DropTableRequest request) {
     super(handler, request.isAsyncDrop(), request);
@@ -74,9 +75,8 @@ public DropTableResult execute() throws TException {
     boolean success = false;
     List<Path> partPaths = null;
     Map<String, String> transactionalListenerResponses = Collections.emptyMap();
-    Database db = null;
+    Database db;
     boolean isReplicated = false;
-    RawStore ms = handler.getMS();
     try {
       ms.openTransaction();
       String catName = tableName.getCat();
@@ -145,6 +145,7 @@ public void beforeExecute() throws TException, IOException {
         request.isSetCatalogName() ? request.getCatalogName() : getDefaultCatalog(handler.getConf()));
     String name = normalizeIdentifier(request.getTableName());
     String dbname = normalizeIdentifier(request.getDbName());
+    this.ms = handler.getMS();
     tableName = new TableName(catName, dbname, name);
     progress = new AtomicReference<>("Starting to drop the table: " + tableName);
     GetTableRequest req = new GetTableRequest(tableName.getDb(), tableName.getTable());
@@ -197,6 +198,8 @@ protected void afterExecute(DropTableResult result) throws MetaException, IOExce
         // Data needs deletion. Check if trash may be skipped.
         // Delete the data in the partitions which have other locations
         List<Path> pathsToDelete = new ArrayList<>();
+        progress.set(String.format("Deleting %d partition paths from the table",
+            result.partPaths != null ? result.partPaths.size() : 0));
         if (result.partPaths != null) {
           pathsToDelete.addAll(result.partPaths);
         }
@@ -207,6 +210,10 @@ protected void afterExecute(DropTableResult result) throws MetaException, IOExce
       }
     } finally {
       super.afterExecute(result);
+      if (async) {
+        ms.shutdown();
+      }
+      ms = null;
       tbl = null;
     }
   }

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/handler/TruncateTableHandler.java

@@ -180,11 +180,13 @@ private void alterPartitionsForTruncate() throws TException {
       boolean shouldSendSingleEvent = MetastoreConf.getBoolVar(handler.getConf(),
           MetastoreConf.ConfVars.NOTIFICATION_ALTER_PARTITIONS_V2_ENABLED);
       if (shouldSendSingleEvent) {
-        MetaStoreListenerNotifier.notifyEvent(handler.getTransactionalListeners(), EventMessage.EventType.ALTER_PARTITIONS,
+        MetaStoreListenerNotifier.notifyEvent(handler.getTransactionalListeners(),
+            EventMessage.EventType.ALTER_PARTITIONS,
             new AlterPartitionsEvent(partitions, partitions, table, true, true, handler), environmentContext);
       } else {
         for (Partition partition : partitions) {
-          MetaStoreListenerNotifier.notifyEvent(handler.getTransactionalListeners(), EventMessage.EventType.ALTER_PARTITION,
+          MetaStoreListenerNotifier.notifyEvent(handler.getTransactionalListeners(),
+              EventMessage.EventType.ALTER_PARTITION,
               new AlterPartitionEvent(partition, partition, table, true, true, partition.getWriteId(), handler),
               environmentContext);
         }
@@ -260,15 +262,16 @@ private void truncateDataFiles(Path location, boolean isSkipTrash, boolean needC
   }
 
   /**
-   * Add an empty baseDir with a truncate metadatafile
+   * Add an empty baseDir with a truncate metadatafile.
    * @param location partition or table directory
    * @param writeId allocated writeId
    * @throws MetaException
    */
   public static void addTruncateBaseFile(Path location, long writeId, Configuration conf,
       AcidMetaDataFile.DataFormat dataFormat) throws MetaException {
-    if (location == null)
+    if (location == null) {
       return;
+    }
 
     Path basePath = new Path(location, AcidConstants.baseDir(writeId));
     try {