svn commit: r1655793 - in /hive/trunk: hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/ itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/ itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/

[kh...@apache.org]

Author: khorgath
Date: Thu Jan 29 18:45:28 2015
New Revision: 1655793

URL: http://svn.apache.org/r1655793
Log:
HIVE-9501 : DbNotificationListener doesn't include dbname in create database notification and does not include tablename in create table notification (Alan Gates via Sushanth Sowmyan)

Modified:
    hive/trunk/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java
    hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java
    hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java

Modified: hive/trunk/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java?rev=1655793&r1=1655792&r2=1655793&view=diff
==============================================================================
--- hive/trunk/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java (original)
+++ hive/trunk/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java Thu Jan 29 18:45:28 2015
@@ -119,8 +119,7 @@ public class DbNotificationListener exte
     NotificationEvent event = new NotificationEvent(0, now(),
         HCatConstants.HCAT_CREATE_TABLE_EVENT, msgFactory.buildCreateTableMessage(t).toString());
     event.setDbName(t.getDbName());
-    // Table name is not set in create table because this goes on the queue for the database the
-    // table is created in, not the (new) queue for the table itself.
+    event.setTableName(t.getTableName());
     enqueue(event);
   }
 
@@ -209,9 +208,7 @@ public class DbNotificationListener exte
     NotificationEvent event = new NotificationEvent(0, now(),
         HCatConstants.HCAT_CREATE_DATABASE_EVENT,
         msgFactory.buildCreateDatabaseMessage(db).toString());
-    // Database name is null for create database, because this doesn't belong to messages for
-    // that database.  Rather it belongs to system wide messages.  The db name is in the message,
-    // so listeners can determine it.
+    event.setDbName(db.getName());
     enqueue(event);
   }
 

Modified: hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java?rev=1655793&r1=1655792&r2=1655793&view=diff
==============================================================================
--- hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java (original)
+++ hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/api/TestHCatClientNotification.java Thu Jan 29 18:45:28 2015
@@ -83,7 +83,7 @@ public class TestHCatClientNotification
     assertEquals(firstEventId + 1, event.getEventId());
     assertTrue(event.getEventTime() >= startTime);
     assertEquals(HCatConstants.HCAT_CREATE_DATABASE_EVENT, event.getEventType());
-    assertNull(event.getDbName());
+    assertEquals("myhcatdb", event.getDbName());
     assertNull(event.getTableName());
     assertTrue(event.getMessage().matches("\\{\"eventType\":\"CREATE_DATABASE\",\"server\":\"\"," +
         "\"servicePrincipal\":\"\",\"db\":\"myhcatdb\",\"timestamp\":[0-9]+}"));
@@ -124,7 +124,7 @@ public class TestHCatClientNotification
     assertTrue(event.getEventTime() >= startTime);
     assertEquals(HCatConstants.HCAT_CREATE_TABLE_EVENT, event.getEventType());
     assertEquals(dbName, event.getDbName());
-    assertNull(event.getTableName());
+    assertEquals("hcatcreatetable", event.getTableName());
     assertTrue(event.getMessage().matches("\\{\"eventType\":\"CREATE_TABLE\",\"server\":\"\"," +
         "\"servicePrincipal\":\"\",\"db\":\"default\",\"table\":\"hcatcreatetable\",\"timestamp\":[0-9]+}"));
   }

Modified: hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java?rev=1655793&r1=1655792&r2=1655793&view=diff
==============================================================================
--- hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java (original)
+++ hive/trunk/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java Thu Jan 29 18:45:28 2015
@@ -91,7 +91,7 @@ public class TestDbNotificationListener
     assertEquals(firstEventId + 1, event.getEventId());
     assertTrue(event.getEventTime() >= startTime);
     assertEquals(HCatConstants.HCAT_CREATE_DATABASE_EVENT, event.getEventType());
-    assertNull(event.getDbName());
+    assertEquals("mydb", event.getDbName());
     assertNull(event.getTableName());
     assertTrue(event.getMessage().matches("\\{\"eventType\":\"CREATE_DATABASE\",\"server\":\"\"," +
         "\"servicePrincipal\":\"\",\"db\":\"mydb\",\"timestamp\":[0-9]+}"));
@@ -135,7 +135,7 @@ public class TestDbNotificationListener
     assertTrue(event.getEventTime() >= startTime);
     assertEquals(HCatConstants.HCAT_CREATE_TABLE_EVENT, event.getEventType());
     assertEquals("default", event.getDbName());
-    assertNull(event.getTableName());
+    assertEquals("mytable", event.getTableName());
     assertTrue(event.getMessage().matches("\\{\"eventType\":\"CREATE_TABLE\",\"server\":\"\"," +
         "\"servicePrincipal\":\"\",\"db\":\"default\",\"table\":\"mytable\",\"timestamp\":[0-9]+}"));
   }