diff --git metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java index 9130e4a..7e2c27d 100644 --- metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java @@ -60,7 +60,7 @@ private Table table = new Table(); private final Partition partition = new Partition(); - private static final String dbName = "tmpdb"; + private static final String dbName = "hive3252"; private static final String tblName = "tmptbl"; private static final String renamed = "tmptbl2"; diff --git metastore/src/test/org/apache/hadoop/hive/metastore/TestMarkPartition.java metastore/src/test/org/apache/hadoop/hive/metastore/TestMarkPartition.java index dca3a8a..57a5e6b 100644 --- metastore/src/test/org/apache/hadoop/hive/metastore/TestMarkPartition.java +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestMarkPartition.java @@ -62,36 +62,36 @@ public void testMarkingPartitionSet() throws CommandNeedRetryException, MetaExce InvalidPartitionException, UnknownPartitionException, InterruptedException { HiveMetaStoreClient msc = new HiveMetaStoreClient(hiveConf, null); driver = new Driver(hiveConf); - driver.run("drop database if exists tmpdb cascade"); - driver.run("create database tmpdb"); - driver.run("use tmpdb"); + driver.run("drop database if exists hive2215 cascade"); + driver.run("create database hive2215"); + driver.run("use hive2215"); driver.run("drop table if exists tmptbl"); driver.run("create table tmptbl (a string) partitioned by (b string)"); driver.run("alter table tmptbl add partition (b='2011')"); Map kvs = new HashMap(); kvs.put("b", "'2011'"); - msc.markPartitionForEvent("tmpdb", "tmptbl", kvs, PartitionEventType.LOAD_DONE); - assert msc.isPartitionMarkedForEvent("tmpdb", "tmptbl", kvs, PartitionEventType.LOAD_DONE); + msc.markPartitionForEvent("hive2215", "tmptbl", kvs, PartitionEventType.LOAD_DONE); + assert msc.isPartitionMarkedForEvent("hive2215", "tmptbl", kvs, PartitionEventType.LOAD_DONE); Thread.sleep(10000); - assert !msc.isPartitionMarkedForEvent("tmpdb", "tmptbl", kvs, PartitionEventType.LOAD_DONE); + assert !msc.isPartitionMarkedForEvent("hive2215", "tmptbl", kvs, PartitionEventType.LOAD_DONE); kvs.put("b", "'2012'"); - assert !msc.isPartitionMarkedForEvent("tmpdb", "tmptbl", kvs, PartitionEventType.LOAD_DONE); + assert !msc.isPartitionMarkedForEvent("hive2215", "tmptbl", kvs, PartitionEventType.LOAD_DONE); try{ - msc.markPartitionForEvent("tmpdb", "tmptbl2", kvs, PartitionEventType.LOAD_DONE); + msc.markPartitionForEvent("hive2215", "tmptbl2", kvs, PartitionEventType.LOAD_DONE); assert false; } catch(Exception e){ assert e instanceof UnknownTableException; } try{ - msc.isPartitionMarkedForEvent("tmpdb", "tmptbl2", kvs, PartitionEventType.LOAD_DONE); + msc.isPartitionMarkedForEvent("hive2215", "tmptbl2", kvs, PartitionEventType.LOAD_DONE); assert false; } catch(Exception e){ assert e instanceof UnknownTableException; } kvs.put("a", "'2012'"); try{ - msc.isPartitionMarkedForEvent("tmpdb", "tmptbl", kvs, PartitionEventType.LOAD_DONE); + msc.isPartitionMarkedForEvent("hive2215", "tmptbl", kvs, PartitionEventType.LOAD_DONE); assert false; } catch(Exception e){ assert e instanceof InvalidPartitionException; @@ -100,7 +100,7 @@ public void testMarkingPartitionSet() throws CommandNeedRetryException, MetaExce @Override protected void tearDown() throws Exception { - driver.run("drop database if exists tmpdb cascade"); + driver.run("drop database if exists hive2215 cascade"); super.tearDown(); } diff --git metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java index 89aef51..e2c860c 100644 --- metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java @@ -69,7 +69,7 @@ public void testEndFunctionListener() throws Exception { /* Objective here is to ensure that when exceptions are thrown in HiveMetaStore in API methods * they bubble up and are stored in the MetaStoreEndFunctionContext objects */ - String dbName = "tmpdb"; + String dbName = "hive3524"; String tblName = "tmptbl"; int listSize = 0; @@ -109,7 +109,7 @@ public void testEndFunctionListener() throws Exception { assertEquals(context.getInputTableName(), tableName); try { - msc.getPartition("tmpdb", tblName, "b=2012"); + msc.getPartition("hive3524", tblName, "b=2012"); } catch (Exception e2) { } diff --git metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java index ee02d32..4951c94 100644 --- metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java @@ -65,7 +65,7 @@ private HiveMetaStoreClient msc; private Driver driver; - private static final String dbName = "tmpdb"; + private static final String dbName = "hive2038"; private static final String tblName = "tmptbl"; private static final String renamed = "tmptbl2"; @@ -217,7 +217,7 @@ public void testListener() throws Exception { driver.run("alter table tmptbl add partition (b='2011')"); listSize++; - Partition part = msc.getPartition("tmpdb", "tmptbl", "b=2011"); + Partition part = msc.getPartition("hive2038", "tmptbl", "b=2011"); assertEquals(notifyList.size(), listSize); assertEquals(preNotifyList.size(), listSize); @@ -304,7 +304,7 @@ public void testListener() throws Exception { Map kvs = new HashMap(1); kvs.put("b", "2011"); - msc.markPartitionForEvent("tmpdb", "tmptbl", kvs, PartitionEventType.LOAD_DONE); + msc.markPartitionForEvent("hive2038", "tmptbl", kvs, PartitionEventType.LOAD_DONE); listSize++; assertEquals(notifyList.size(), listSize); assertEquals(preNotifyList.size(), listSize); diff --git metastore/src/test/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java metastore/src/test/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java index 9d1b441..e059255 100644 --- metastore/src/test/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java @@ -68,7 +68,7 @@ protected void tearDown() throws Exception { // Create a database and a table in that database. Because the AlternateFailurePreListener is // being used each attempt to create something should require two calls by the RetryingHMSHandler public void testRetryingHMSHandler() throws Exception { - String dbName = "tmpdb"; + String dbName = "hive4159"; String tblName = "tmptbl"; Database db = new Database(); diff --git ql/src/test/org/apache/hadoop/hive/ql/security/TestAuthorizationPreEventListener.java ql/src/test/org/apache/hadoop/hive/ql/security/TestAuthorizationPreEventListener.java index f74e8c5..d2595dd 100644 --- ql/src/test/org/apache/hadoop/hive/ql/security/TestAuthorizationPreEventListener.java +++ ql/src/test/org/apache/hadoop/hive/ql/security/TestAuthorizationPreEventListener.java @@ -169,7 +169,7 @@ private void validateDropDb(Database expectedDb, Database actualDb) { } public void testListener() throws Exception { - String dbName = "tmpdb"; + String dbName = "hive3705"; String tblName = "tmptbl"; String renamed = "tmptbl2"; int listSize = 0; @@ -199,7 +199,7 @@ public void testListener() throws Exception { driver.run("alter table tmptbl add partition (b='2011')"); listSize++; - Partition part = msc.getPartition("tmpdb", "tmptbl", "b=2011"); + Partition part = msc.getPartition("hive3705", "tmptbl", "b=2011"); Partition ptnFromEvent = ( (org.apache.hadoop.hive.ql.metadata.Partition)