[hive] 33/38: HIVE-24396: Cleanup and one test failure (Naveen Gangam)

[ngangam]

This is an automated email from the ASF dual-hosted git repository.

ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git

commit 14283d3260898a1f901e603ccc8985231fc3fd16
Author: Naveen Gangam <ngan...@cloudera.com>
AuthorDate: Fri Mar 19 17:33:23 2021 -0400

    HIVE-24396: Cleanup and one test failure (Naveen Gangam)
---
 .../hadoop/hive/ql/ddl/database/create/CreateDatabaseDesc.java     | 7 -------
 .../java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java  | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseDesc.java
 
b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseDesc.java
index 1590133..f458cdc 100644
--- 
a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseDesc.java
+++ 
b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseDesc.java
@@ -103,13 +103,6 @@ public class CreateDatabaseDesc implements DDLDesc, 
Serializable {
   @Explain(displayName="database type")
   public DatabaseType getDatabaseType() {
     return dbType;
-    /*
-    if (dbType == DatabaseType.NATIVE)
-      return "NATIVE";
-    else
-      return "REMOTE";
-
-     */
   }
 
   @Explain(displayName="connector name")
diff --git 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
index 05ae218..f8b337d 100644
--- 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
+++ 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
@@ -434,7 +434,7 @@ class MetaStoreDirectSql {
       }
       
db.setManagedLocationUri(MetastoreDirectSqlUtils.extractSqlString(dbline[8]));
       String dbType = MetastoreDirectSqlUtils.extractSqlString(dbline[9]);
-      if (dbType != null && dbType.equalsIgnoreCase("REMOTE")) {
+      if (dbType != null && 
dbType.equalsIgnoreCase(DatabaseType.REMOTE.name())) {
         db.setType(DatabaseType.REMOTE);
         
db.setConnector_name(MetastoreDirectSqlUtils.extractSqlString(dbline[10]));
         
db.setRemote_dbname(MetastoreDirectSqlUtils.extractSqlString(dbline[11]));