Reset thing ID lower bound in background sync if force-update is true

Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Jun 23, 2022 · 95d21e3 · 95d21e3
1 parent e8e01de
commit 95d21e3
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/...c/main/java/org/eclipse/ditto/thingsearch/service/updater/actors/BackgroundSyncActor.java b/...c/main/java/org/eclipse/ditto/thingsearch/service/updater/actors/BackgroundSyncActor.java
@@ -251,15 +251,19 @@ private Procedure<Metadata> handleInconsistency(final boolean forceUpdateAllThin
     }
 
     private Source<ThingId, NotUsed> getLowerBoundSource() {
-        return backgroundSyncPersistence.getTaggedTimestamp()
-                .map(optional -> {
-                    if (optional.isPresent()) {
-                        final String bookmarkedThingId = optional.get().second();
-                        if (bookmarkedThingId != null && !bookmarkedThingId.isEmpty())
-                            return ThingId.of(bookmarkedThingId);
-                    }
-                    return EMPTY_THING_ID;
-                });
+        if (forceUpdateAllThings) {
+            return Source.single(EMPTY_THING_ID);
+        } else {
+            return backgroundSyncPersistence.getTaggedTimestamp()
+                    .map(optional -> {
+                        if (optional.isPresent()) {
+                            final String bookmarkedThingId = optional.get().second();
+                            if (bookmarkedThingId != null && !bookmarkedThingId.isEmpty())
+                                return ThingId.of(bookmarkedThingId);
+                        }
+                        return EMPTY_THING_ID;
+                    });
+        }
     }
 
     private Source<Metadata, NotUsed> getPersistedMetadataSourceWithProgressReporting(final ThingId lowerBound) {