You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by pe...@apache.org on 2023/10/04 17:12:02 UTC
[asterixdb] branch master updated: [NO ISSUE][OTH] Create getters getRunningJobCount and getEventListenersAsList
This is an automated email from the ASF dual-hosted git repository.
peeyush pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new fec99db662 [NO ISSUE][OTH] Create getters getRunningJobCount and getEventListenersAsList
fec99db662 is described below
commit fec99db662618074c248a09f4abb0deb989b5494
Author: Peeyush Gupta <pe...@couchbase.com>
AuthorDate: Tue Oct 3 16:34:30 2023 -0700
[NO ISSUE][OTH] Create getters getRunningJobCount and getEventListenersAsList
- user model changes: no
- storage format changes: no
- interface changes: yes
Details:
ActiveNotificationHandler.getEventListeners creates an array on every call.
This patch adds getEventListenersAsList that returns an unmodifiableList
of active listners without creating a new array.
Change-Id: I2b67d7bdfe6bca5f39a438f4110eecea5a3c98bf
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17835
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Tested-by: Murtadha Hubail <mh...@apache.org>
---
.../java/org/apache/asterix/active/IActiveNotificationHandler.java | 7 +++++++
.../org/apache/asterix/app/active/ActiveNotificationHandler.java | 6 ++++++
.../main/java/org/apache/hyracks/control/cc/job/IJobManager.java | 5 +++++
.../main/java/org/apache/hyracks/control/cc/job/JobManager.java | 5 +++++
4 files changed, 23 insertions(+)
diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
index 60bfa69801..1efd58e9bd 100644
--- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
+++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
@@ -19,6 +19,8 @@
*/
package org.apache.asterix.active;
+import java.util.Collection;
+
import org.apache.asterix.active.message.ActivePartitionMessage;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -57,6 +59,11 @@ public interface IActiveNotificationHandler {
*/
IActiveEntityEventsListener[] getEventListeners();
+ /**
+ * @return List of all the registered event listeners
+ */
+ Collection<IActiveEntityEventsListener> getEventListenersAsList();
+
/**
* Lookup an event listener using the entity id
*
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
index 6b3581e66c..3c277d5aa6 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
@@ -19,6 +19,7 @@
package org.apache.asterix.app.active;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -186,6 +187,11 @@ public class ActiveNotificationHandler extends SingleThreadEventProcessor<Active
return entityEventListeners.values().toArray(IActiveEntityEventsListener[]::new);
}
+ @Override
+ public synchronized Collection<IActiveEntityEventsListener> getEventListenersAsList() {
+ return Collections.unmodifiableCollection(entityEventListeners.values());
+ }
+
@Override
public synchronized void registerListener(IActiveEntityEventsListener listener) throws HyracksDataException {
if (suspended) {
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
index a9ddee3b59..b2795d4d5d 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
@@ -111,6 +111,11 @@ public interface IJobManager {
*/
Collection<JobRun> getRunningJobs();
+ /**
+ * @return number of jobs that are currently running.
+ */
+ int getRunningJobsCount();
+
/**
* @return all jobs that are currently waiting in the job queue.
*/
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
index 9850ee285e..4882f4ac49 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
@@ -263,6 +263,11 @@ public class JobManager implements IJobManager {
return activeRunMap.values();
}
+ @Override
+ public int getRunningJobsCount() {
+ return activeRunMap.size();
+ }
+
@Override
public Collection<JobRun> getPendingJobs() {
return jobQueue.jobs();