HiveOps createDatabase always fails on existence test

51zero · Mar 30, 2018 · 18ebcbb · 18ebcbb
1 parent 2b1a9e9
commit 18ebcbb
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/eel-hive/src/main/scala/io/eels/component/hive/HiveOps.scala b/eel-hive/src/main/scala/io/eels/component/hive/HiveOps.scala
@@ -1,5 +1,7 @@
 package io.eels.component.hive
 
+import java.rmi.NoSuchObjectException
+
 import com.sksamuel.exts.Logging
 import io.eels.Constants
 import io.eels.component.hive.dialect.ParquetHiveDialect
@@ -267,7 +269,7 @@ class HiveOps(val client: IMetaStoreClient) extends Logging {
   }
 
   def createDatabase(name: String, description: String = null, overwrite: Boolean = false): Unit = client.synchronized {
-    val exists = client.getDatabase(name) != null
+    val exists = databaseExists(name)
     if (exists && overwrite) {
       logger.info(s"Database exists, overwrite=true; dropping database $name")
       client.dropDatabase(name)
@@ -278,4 +280,12 @@ class HiveOps(val client: IMetaStoreClient) extends Logging {
       client.createDatabase(database)
     }
   }
+
+  def databaseExists(name: String): Boolean = {
+    try {
+      client.getDatabase(name) != null
+    } catch {
+      case _: NoSuchObjectException => false
+    }
+  }
 }