- fix merge ranges for case when there is no records

folio-org · Sep 5, 2024 · 0a3981a · 0a3981a
1 parent 6c94919
commit 0a3981a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/src/main/java/org/folio/search/service/reindex/RangeGenerator.java b/src/main/java/org/folio/search/service/reindex/RangeGenerator.java
@@ -13,11 +13,11 @@ public static List<Range> createRanges(int count) {
     }
 
     List<Range> ranges = new ArrayList<>();
-    var max = new BigInteger("ffffffffffffffffffffffffffffffff", 16);
+    var max = upperBound();
     var partitionCount = new BigInteger(String.valueOf(count));
     var step = max.divide(partitionCount);
 
-    var cur = BigInteger.valueOf(0);
+    var cur = lowerBound();
     var prev = cur;
     for (int i = 0; i < partitionCount.intValue(); i++) {
       cur = cur.add(step);
@@ -32,6 +32,18 @@ public static List<Range> createRanges(int count) {
     return ranges;
   }
 
+  private static BigInteger lowerBound() {
+    return BigInteger.valueOf(0);
+  }
+
+  private static BigInteger upperBound() {
+    return new BigInteger("ffffffffffffffffffffffffffffffff", 16);
+  }
+
+  public static Range emptyRange() {
+    return new Range(fromBigint(lowerBound()), fromBigint(upperBound()));
+  }
+
   private static UUID fromBigint(BigInteger bigint) {
     var str = String.format("%032X", bigint);
     var uuidStr = str.substring(0, 8) + "-"

diff --git a/src/main/java/org/folio/search/service/reindex/ReindexMergeRangeIndexService.java b/src/main/java/org/folio/search/service/reindex/ReindexMergeRangeIndexService.java
@@ -49,11 +49,19 @@ public List<MergeRangeEntity> createMergeRanges(String tenantId) {
     var rangeSize = reindexConfig.getMergeRangeSize();
     for (var recordType : InventoryRecordType.values()) {
       var recordsCount = inventoryService.fetchInventoryRecordsCount(recordType);
-      var ranges = constructMergeRangeRecords(recordsCount, rangeSize, recordType, tenantId);
-      if (CollectionUtils.isNotEmpty(ranges)) {
-        log.info("createMergeRanges:: constructed [tenantId: {}, entityType: {}, count: {}]",
-          tenantId, recordType, ranges.size());
-        mergeRangeEntities.addAll(ranges);
+      if (recordsCount == 0) {
+        log.info("createMergeRanges:: constructed empty range [tenantId: {}, entityType: {}]",
+          tenantId, recordType);
+        var range = RangeGenerator.emptyRange();
+        var mergeRangeEntity = mergeEntity(recordType, tenantId, range.lowerBound(), range.upperBound());
+        mergeRangeEntities.add(mergeRangeEntity);
+      } else {
+        var ranges = constructMergeRangeRecords(recordsCount, rangeSize, recordType, tenantId);
+        if (CollectionUtils.isNotEmpty(ranges)) {
+          log.info("createMergeRanges:: constructed [tenantId: {}, entityType: {}, count: {}]",
+            tenantId, recordType, ranges.size());
+          mergeRangeEntities.addAll(ranges);
+        }
       }
     }
     return mergeRangeEntities;
@@ -86,11 +94,15 @@ private List<MergeRangeEntity> constructMergeRangeRecords(int recordsCount,
 
     var rangesCount = (int) Math.ceil((double) recordsCount / rangeSize);
     return RangeGenerator.createRanges(rangesCount).stream()
-      .map(range -> mergeEntity(UUID.randomUUID(), recordType, tenantId, range.lowerBound(), range.upperBound(),
-        Timestamp.from(Instant.now())))
+      .map(range -> mergeEntity(recordType, tenantId, range.lowerBound(), range.upperBound()))
       .toList();
   }
 
+  private MergeRangeEntity mergeEntity(InventoryRecordType recordType, String tenantId, UUID lowerId,
+                                       UUID upperId) {
+    return mergeEntity(UUID.randomUUID(), recordType, tenantId, lowerId, upperId, Timestamp.from(Instant.now()));
+  }
+
   private MergeRangeEntity mergeEntity(UUID id, InventoryRecordType recordType, String tenantId, UUID lowerId,
                                        UUID upperId, Timestamp createdAt) {
     return new MergeRangeEntity(id, asEntityType(recordType), tenantId, lowerId, upperId, createdAt);