You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2026/04/24 07:49:35 UTC

(causeway) 25/28: CAUSEWAY-3989: [v2] fixes (?) query for CommandLogEntry

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch CAUSEWAY-3989
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 6ff5ce061d3fa083cbe404f110e7b4711b649121
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Apr 22 18:52:44 2026 +0100

    CAUSEWAY-3989: [v2] fixes (?) query for CommandLogEntry
---
 .../commandlog/applib/dom/CommandLogEntry.java     |  5 ++-
 .../applib/dom/CommandLogEntryRepository.java      |  6 +--
 .../dom/CommandLogEntryRepositoryAbstract.java     | 43 ++++++++++++----------
 .../commandlog/applib/dom/ReplayState.java         |  2 +-
 .../applib/dom/replay/CommandExportManager.java    |  5 +--
 .../applib/dom/replay/CommandReplayManager.java    |  2 +-
 .../integtest/CommandLog_IntegTestAbstract.java    |  5 +--
 .../commandlog/jdo/dom/CommandLogEntry.java        | 14 ++++++-
 .../commandlog/jpa/dom/CommandLogEntry.java        | 14 ++++++-
 9 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
index e3ca1d877b7..0636fa19e0a 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
@@ -149,7 +149,10 @@ public static class Nq {
          * primary before the production database was restored to the secondary.
          */
         public static final String FIND_MOST_RECENT_COMPLETED           = LOGICAL_TYPE_NAME + ".findMostRecentCompleted";
-        public static final String FIND_BY_REPLAY_STATE                 = LOGICAL_TYPE_NAME + ".findNotYetReplayed";
+        public static final String FIND_FOREGROUND_BY_TIMESTAMP_AFTER_AND_REPLAY_STATE
+                                                                        = LOGICAL_TYPE_NAME + ".findForegroundByTimestampAfterAndReplayState";
+        public static final String FIND_FOREGROUND_BY_TIMESTAMP_AFTER_AND_REPLAY_STATES
+                                                                        = LOGICAL_TYPE_NAME + ".findForegroundByTimestampAfterAndReplayStates";
         public static final String FIND_BACKGROUND_AND_NOT_YET_STARTED  = LOGICAL_TYPE_NAME + ".findBackgroundAndNotYetStarted";
         public static final String FIND_RECENT_BACKGROUND_BY_TARGET     = LOGICAL_TYPE_NAME + ".findRecentBackgroundByTarget";
     }
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepository.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepository.java
index 3b7dfe55e0b..cf964950e37 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepository.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepository.java
@@ -122,14 +122,14 @@ List<CommandLogEntry> findByTargetAndFromAndTo(
      */
     List<CommandLogEntry> findSince(final UUID interactionId, final Integer batchSize);
 
-    List<CommandLogEntry> findSinceAndCanBeExported(final Timestamp since);
+    List<CommandLogEntry> findForegroundSinceTimestampAndCanBeExported(final Timestamp since);
 
-    List<CommandLogEntry> findSinceAndHasBeenExported(final Timestamp since);
+    List<CommandLogEntry> findForegroundSinceTimestampAndHasBeenExported(final Timestamp since);
 
     /**
      * Command Replay feature: Can replay or retry.
      */
-    List<CommandLogEntry> findSinceAndWithReplayPendingOrFailed(Timestamp since);
+    List<CommandLogEntry> findForegroundSinceTimestampAndWithReplayPendingOrFailed(Timestamp since);
 
     /**
      * Command Replay feature: Cannot replay or retry.
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepositoryAbstract.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepositoryAbstract.java
index 9de561a3bd7..ba06ec2dff3 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepositoryAbstract.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepositoryAbstract.java
@@ -408,28 +408,18 @@ private List<CommandLogEntry> findSince(
     }
 
     @Override
-    public List<CommandLogEntry> findSinceAndCanBeExported(final Timestamp since) {
-
-        return findSince(since, Integer.MAX_VALUE).stream()
-                .filter(x -> x.getExecuteIn() == ExecuteIn.FOREGROUND)
-                .filter(x -> ReplayState.isExportable(x.getReplayState()))
-                .collect(Collectors.toList());
+    public List<CommandLogEntry> findForegroundSinceTimestampAndCanBeExported(final Timestamp since) {
+        return findForegroundSinceTimestampWithState(since, ReplayState.UNDEFINED);
     }
 
     @Override
-    public List<CommandLogEntry> findSinceAndHasBeenExported(final Timestamp since) {
-
-        return findSince(since, Integer.MAX_VALUE).stream()
-                .filter(x -> ReplayState.isExported(x.getReplayState()))
-                .collect(Collectors.toList());
+    public List<CommandLogEntry> findForegroundSinceTimestampAndHasBeenExported(final Timestamp since) {
+        return findForegroundSinceTimestampWithState(since, ReplayState.EXPORTED);
     }
 
     @Override
-    public List<CommandLogEntry> findSinceAndWithReplayPendingOrFailed(final Timestamp since) {
-
-        return findSince(since, Integer.MAX_VALUE).stream()
-                .filter(x -> ReplayState.isPendingOrFailed(x.getReplayState()))
-                .collect(Collectors.toList());
+    public List<CommandLogEntry> findForegroundSinceTimestampAndWithReplayPendingOrFailed(final Timestamp since) {
+        return findForegroundSinceTimestampWithStates(since, ReplayState.PENDING, ReplayState.FAILED);
     }
 
     /**
@@ -437,9 +427,24 @@ public List<CommandLogEntry> findSinceAndWithReplayPendingOrFailed(final Timesta
      */
     @Override
     public List<CommandLogEntry> findSinceAndWithReplayOkOrExcluded(final Timestamp since) {
-        return findSince(since, Integer.MAX_VALUE).stream()
-                .filter(x -> ReplayState.isOkOrExcluded(x.getReplayState()))
-                .collect(Collectors.toList());
+        return findForegroundSinceTimestampWithStates(since, ReplayState.OK, ReplayState.EXCLUDED);
+    }
+
+    private List<CommandLogEntry> findForegroundSinceTimestampWithState(Timestamp since, ReplayState replayState) {
+        return _Casts.uncheckedCast(
+                repositoryService().allMatches(
+                        Query.named(commandLogEntryClass, CommandLogEntry.Nq.FIND_FOREGROUND_BY_TIMESTAMP_AFTER_AND_REPLAY_STATE)
+                                .withParameter("timestamp", since)
+                                .withParameter("replayState", replayState)));
+    }
+
+    private List<CommandLogEntry> findForegroundSinceTimestampWithStates(Timestamp since, ReplayState replayState1, ReplayState replayState2) {
+        return _Casts.uncheckedCast(
+                repositoryService().allMatches(
+                        Query.named(commandLogEntryClass, CommandLogEntry.Nq.FIND_FOREGROUND_BY_TIMESTAMP_AFTER_AND_REPLAY_STATES)
+                                .withParameter("timestamp", since)
+                                .withParameter("replayState1", replayState1)
+                                .withParameter("replayState2", replayState2)));
     }
 
     private RepositoryService repositoryService() {
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/ReplayState.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/ReplayState.java
index c00c25c0464..93ed4f68660 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/ReplayState.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/ReplayState.java
@@ -74,7 +74,7 @@ public static boolean isPendingOrFailed(final @Nullable ReplayState replayState)
     }
 
     public static boolean isOkOrExcluded(ReplayState replayState) {
-        return replayState == ReplayState.OK || replayState == ReplayState.FAILED;
+        return replayState == ReplayState.OK || replayState == ReplayState.EXCLUDED;
     }
 
     public static boolean isExported(final ReplayState replayState) {
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandExportManager.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandExportManager.java
index 168b0473e2b..336d94b6de8 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandExportManager.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandExportManager.java
@@ -19,7 +19,6 @@
 package org.apache.causeway.extensions.commandlog.applib.dom.replay;
 
 import lombok.Getter;
-import lombok.experimental.UtilityClass;
 
 import java.sql.Timestamp;
 import java.time.Instant;
@@ -166,7 +165,7 @@ private static Timestamp addSeconds(Timestamp since, int secondsToAdd) {
             describedAs = "Commands that can be exported"
     )
     public List<ReplayableCommand> getNotYetExported() {
-        return commandLogEntryRepository().findSinceAndCanBeExported(since).stream()
+        return commandLogEntryRepository().findForegroundSinceTimestampAndCanBeExported(since).stream()
             .map(entry->new ReplayableCommand(
                     entry.getInteractionId(),
                     replayContext))
@@ -253,7 +252,7 @@ public class DomainEvent extends ActionDomainEvent<exportSelected> { }
     @Collection
     @CollectionLayout(describedAs = "Commands that have been exported")
     public List<ReplayableCommand> getExported() {
-        return commandLogEntryRepository().findSinceAndHasBeenExported(since).stream()
+        return commandLogEntryRepository().findForegroundSinceTimestampAndHasBeenExported(since).stream()
             .map(entry->new ReplayableCommand(
                     entry.getInteractionId(),
                     replayContext))
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandReplayManager.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandReplayManager.java
index dfc74e02735..3205215a223 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandReplayManager.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/replay/CommandReplayManager.java
@@ -189,7 +189,7 @@ public CommandReplayManager act(
             describedAs = "Imported Commands that can be either replayed (replayState=PENDING) or retried (when replayState=FAILED)"
     )
     public List<ReplayableCommand> getPendingOrFailed() {
-        return commandLogEntryRepository().findSinceAndWithReplayPendingOrFailed(since).stream()
+        return commandLogEntryRepository().findForegroundSinceTimestampAndWithReplayPendingOrFailed(since).stream()
             .map(entry->new ReplayableCommand(
                     entry.getInteractionId(),
                     replayContext))
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
index 1e2630b6706..56245b692d0 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
@@ -18,7 +18,6 @@
  */
 package org.apache.causeway.extensions.commandlog.applib.integtest;
 
-import java.sql.Timestamp;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -373,7 +372,7 @@ void test_all_the_repository_methods() {
         val to = from.plusDays(1);
 
         // when
-        List<? extends CommandLogEntry> notYetReplayed = commandLogEntryRepository.findSinceAndWithReplayPendingOrFailed(baseline);
+        List<? extends CommandLogEntry> notYetReplayed = commandLogEntryRepository.findForegroundSinceTimestampAndWithReplayPendingOrFailed(baseline);
 
         // then
         Assertions.assertThat(notYetReplayed).isEmpty();
@@ -386,7 +385,7 @@ void test_all_the_repository_methods() {
             commandTarget1User1.setReplayState(ReplayState.PENDING);
 
             // when
-            List<? extends CommandLogEntry> notYetReplayed2 = commandLogEntryRepository.findSinceAndWithReplayPendingOrFailed(baseline);
+            List<? extends CommandLogEntry> notYetReplayed2 = commandLogEntryRepository.findForegroundSinceTimestampAndWithReplayPendingOrFailed(baseline);
 
             // then
             Assertions.assertThat(notYetReplayed2).hasSize(1);
diff --git a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
index 520b5cb37d9..49513f3859d 100644
--- a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
@@ -206,10 +206,20 @@
                   + " RANGE 0,2"), // this should be RANGE 0,1 but results in DataNucleus submitting "FETCH NEXT ROW ONLY"
                                    // which SQL Server doesn't understand.  However, as workaround, SQL Server *does* understand FETCH NEXT 2 ROWS ONLY
     @Query(
-            name  = Nq.FIND_BY_REPLAY_STATE,
+            name  = Nq.FIND_FOREGROUND_BY_TIMESTAMP_AFTER_AND_REPLAY_STATE,
             value = "SELECT "
                   + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE replayState == :replayState1 || replayState == :replayState2 "
+                  + " WHERE executeIn == 'FOREGROUND' "
+                  + "    && timestamp >= :from "
+                  + "    && replayState == :replayState "
+                  + " ORDER BY timestamp ASC"),
+    @Query(
+            name  = Nq.FIND_FOREGROUND_BY_TIMESTAMP_AFTER_AND_REPLAY_STATES,
+            value = "SELECT "
+                  + "  FROM " + CommandLogEntry.FQCN + " "
+                  + " WHERE executeIn == 'FOREGROUND' "
+                  + "    && timestamp >= :from "
+                  + "    && (replayState == :replayState1 || replayState == :replayState2) "
                   + " ORDER BY timestamp ASC"),
 })
 @Named(CommandLogEntry.LOGICAL_TYPE_NAME)
diff --git a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
index ffc6b5ade4a..8cc67652432 100644
--- a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
@@ -209,10 +209,20 @@
                   + "   AND cl.completedAt is not null "
                   + " ORDER BY cl.timestamp DESC"), // programmatic LIMIT 1
     @NamedQuery(
-            name  = Nq.FIND_BY_REPLAY_STATE,
+            name  = Nq.FIND_FOREGROUND_BY_TIMESTAMP_AFTER_AND_REPLAY_STATE,
             query = "SELECT cl "
                   + " FROM CommandLogEntry cl "
-                  + " WHERE (cl.replayState = :replayState1 OR cl.replayState = :replayState2) "
+                  + " WHERE cl.executeIn = org.apache.causeway.extensions.commandlog.applib.dom.ExecuteIn.FOREGROUND "
+                  + "   AND cl.timestamp >= :from "
+                  + "   AND cl.replayState = :replayState "
+                  + " ORDER BY cl.timestamp ASC"),
+    @NamedQuery(
+            name  = Nq.FIND_FOREGROUND_BY_TIMESTAMP_AFTER_AND_REPLAY_STATES,
+            query = "SELECT cl "
+                  + " FROM CommandLogEntry cl "
+                  + " WHERE cl.executeIn = org.apache.causeway.extensions.commandlog.applib.dom.ExecuteIn.FOREGROUND "
+                  + "   AND cl.timestamp >= :from "
+                  + "   AND (cl.replayState = :replayState1 OR cl.replayState = :replayState2) "
                   + " ORDER BY cl.timestamp ASC"),
 })
 @Named(CommandLogEntry.LOGICAL_TYPE_NAME)