Change in asterixdb[master]: [NO ISSUE][RT] Minor interface refactoring for IActiveEventL...

[Xikui Wang (Code Review)]

Xikui Wang has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/2003

Change subject: [NO ISSUE][RT] Minor interface refactoring for 
IActiveEventListener
......................................................................

[NO ISSUE][RT] Minor interface refactoring for IActiveEventListener

- user model changes: no
- storage format changes: no
- interface changes: yes

Details:
Add getStatsName() method for IActiveEventListener to enable different
activeEventListeners to provide customized label for their stats.

Change-Id: Ife21078aa06bb14c2c733b48f3eaa8e02b9be905
---
M 
asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveEntityEventsListener.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ActiveStatsApiServlet.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
4 files changed, 14 insertions(+), 3 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/03/2003/1

diff --git 
a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveEntityEventsListener.java
 
b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveEntityEventsListener.java
index 03b0cfc..23534d8 100644
--- 
a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveEntityEventsListener.java
+++ 
b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveEntityEventsListener.java
@@ -96,4 +96,10 @@
      * Get the job failure for the last failed run
      */
     Exception getJobFailure();
+
+    /**
+     * Get the stats name that's used to form the stats JSON for the active 
entity
+     * @return the customized stats name for current active entity
+     */
+    String getStatsName();
 }
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ActiveStatsApiServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ActiveStatsApiServlet.java
index 15f0ace..403a18a 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ActiveStatsApiServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ActiveStatsApiServlet.java
@@ -44,7 +44,7 @@
     private static final int DEFAULT_EXPIRE_TIME = 2000;
     private final ActiveNotificationHandler activeNotificationHandler;
 
-    public ActiveStatsApiServlet(ConcurrentMap<String, Object> ctx, String[] 
paths, ICcApplicationContext appCtx) {
+    public ActiveStatsApiServlet(ConcurrentMap<String, Object> 
ctx,ICcApplicationContext appCtx, String... paths) {
         super(ctx, paths);
         this.activeNotificationHandler = (ActiveNotificationHandler) 
appCtx.getActiveNotificationHandler();
     }
@@ -80,7 +80,7 @@
             }
             long currentTime = System.currentTimeMillis();
             for (int iter1 = 0; iter1 < listeners.length; iter1++) {
-                resNode.putPOJO(listeners[iter1].getEntityId().toString(),
+                resNode.putPOJO(listeners[iter1].getStatsName(),
                         constructNode(om, listeners[iter1], currentTime, 
expireTime));
             }
             // Construct Response
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
index 368c2da..5aa6119 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
@@ -553,4 +553,9 @@
             getDatasets().add(dataset);
         }
     }
+
+    @Override
+    public String getStatsName() {
+        return this.getEntityId().toString();
+    }
 }
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
index 37e0c58..ff7abf3 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
@@ -314,7 +314,7 @@
             case Servlets.DIAGNOSTICS:
                 return new DiagnosticsApiServlet(appCtx, ctx, paths);
             case Servlets.ACTIVE_STATS:
-                return new ActiveStatsApiServlet(ctx, paths, appCtx);
+                return new ActiveStatsApiServlet(ctx, appCtx, paths);
             default:
                 throw new IllegalStateException(String.valueOf(key));
         }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2003
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife21078aa06bb14c2c733b48f3eaa8e02b9be905
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang <xkk...@gmail.com>