[Perf Fix] Use Where clause on change event listing (#15430)

* - Use Where clause on change event listing * - Poll in a minute * - Fix Entity Url - Ignore Query Entity for Change Event Update
open-metadata · Mar 4, 2024 · 7e66756 · 7e66756
1 parent 110e7a4
commit 7e66756
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/...e/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/EventAlertProducer.java b/...e/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/EventAlertProducer.java
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java
@@ -63,6 +63,9 @@ public Void process(
           getChangeEventFromResponseContext(responseContext, loggedInUserName, method);
       if (optionalChangeEvent.isPresent()) {
         ChangeEvent changeEvent = optionalChangeEvent.get();
+        if (changeEvent.getEntityType().equals(Entity.QUERY)) {
+          return null;
+        }
         // Always set the Change Event Username as context Principal, the one creating the CE
         changeEvent.setUserName(loggedInUserName);
         LOG.info(

diff --git a/...e/src/main/java/org/openmetadata/service/events/scheduled/EventSubscriptionScheduler.java b/...e/src/main/java/org/openmetadata/service/events/scheduled/EventSubscriptionScheduler.java
@@ -132,7 +132,7 @@ private JobDetail jobBuilder(
   private Trigger trigger(EventSubscription eventSubscription) {
     return TriggerBuilder.newTrigger()
         .withIdentity(eventSubscription.getId().toString(), ALERT_TRIGGER_GROUP)
-        .withSchedule(SimpleScheduleBuilder.repeatSecondlyForever(3))
+        .withSchedule(SimpleScheduleBuilder.repeatMinutelyForever(1))
         .startNow()
         .build();
   }

diff --git a/...service/src/main/java/org/openmetadata/service/formatter/decorators/MessageDecorator.java b/...service/src/main/java/org/openmetadata/service/formatter/decorators/MessageDecorator.java
@@ -319,6 +319,10 @@ default OutgoingMessage createThreadMessage(ChangeEvent event) {
     }
     message.setHeader(headerMessage);
     message.setMessages(attachmentList);
+
+    MessageParser.EntityLink entityLink = MessageParser.EntityLink.parse(thread.getAbout());
+    EntityInterface entityInterface = Entity.getEntity(entityLink, "", Include.ALL);
+    message.setEntityUrl(buildEntityUrl(entityLink.getEntityFQN(), entityInterface));
     return message;
   }
 

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java
@@ -3222,7 +3222,8 @@ List<String> listWithEntityFilter(
     List<String> listWithoutEntityFilter(
         @Bind("eventType") String eventType, @Bind("timestamp") long timestamp);
 
-    @SqlQuery("SELECT json FROM change_event ORDER BY eventTime ASC LIMIT :limit OFFSET :offset")
+    @SqlQuery(
+        "SELECT json FROM change_event where offset > :offset ORDER BY eventTime ASC LIMIT :limit")
     List<String> list(@Bind("limit") long limit, @Bind("offset") long offset);
 
     @SqlQuery("SELECT count(*) FROM change_event")