Fix tests

apache · Oct 16, 2023 · 65b59fa · 65b59fa
1 parent b06217d
commit 65b59fa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...java/org/apache/druid/indexing/common/task/concurrent/ConcurrentReplaceAndAppendTest.java b/...java/org/apache/druid/indexing/common/task/concurrent/ConcurrentReplaceAndAppendTest.java
@@ -869,9 +869,24 @@ public void testSegmentsToReplace()
     final DataSegment segment2 = asSegment(pendingSegmentV02);
     appendTask.commitAppendSegments(segment2);
 
+    // Despite segment2 existing, it is not chosen to be replaced because it was created after the tasklock was acquired
     verifyInputSegments(replaceTask, JAN_23, segment1);
 
     replaceTask.releaseLock(JAN_23);
+    replaceTask.acquireReplaceLockOn(FIRST_OF_JAN_23);
+
+    final SegmentIdWithShardSpec pendingSegmentV03
+        = appendTask.allocateSegmentForTimestamp(JAN_23.getStart(), Granularities.MONTH);
+    Assert.assertNotEquals(pendingSegmentV01.asSegmentId(), pendingSegmentV03.asSegmentId());
+    Assert.assertNotEquals(pendingSegmentV02.asSegmentId(), pendingSegmentV03.asSegmentId());
+    Assert.assertEquals(SEGMENT_V0, pendingSegmentV03.getVersion());
+    Assert.assertEquals(JAN_23, pendingSegmentV03.getInterval());
+    final DataSegment segment3 = asSegment(pendingSegmentV03);
+    appendTask.commitAppendSegments(segment3);
+
+    // The new lock was acquired before segment3 was created but it doesn't contain the month's interval
+    // So, all three segments are chosen
+    verifyInputSegments(replaceTask, JAN_23, segment1, segment2, segment3);
   }
 
   @Nullable

diff --git a/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
@@ -2586,11 +2586,11 @@ public void testRetrieveUsedSegmentsAndCreatedDates()
 
     List<Pair<DataSegment, String>> resultForFirstHalfOfEternity =
         coordinator.retrieveUsedSegmentsAndCreatedDates(defaultSegment.getDataSource(), firstHalfEternityRangeSegment.getInterval());
-    Assert.assertEquals(resultForExactInterval, resultForEternity);
+    Assert.assertEquals(resultForExactInterval, resultForFirstHalfOfEternity);
 
     List<Pair<DataSegment, String>> resultForSecondHalfOfEternity =
         coordinator.retrieveUsedSegmentsAndCreatedDates(defaultSegment.getDataSource(), secondHalfEternityRangeSegment.getInterval());
-    Assert.assertEquals(resultForExactInterval, resultForEternity);
+    Assert.assertEquals(resultForExactInterval, resultForSecondHalfOfEternity);
   }
 
   @Test