github-advanced-security[bot] commented on code in PR #16799:
URL: https://github.com/apache/druid/pull/16799#discussion_r1695146203
##########
indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java:
##########
@@ -1369,6 +1279,171 @@
}
+ @Test
+ public void testGetActiveLocks()
+ {
+ final Set<TaskLock> expectedLocks = new HashSet<>();
+ final TaskLock overlappingReplaceLock =
+ validator.expectLockCreated(TaskLockType.REPLACE,
Intervals.of("2024/2025"), 50);
+ expectedLocks.add(overlappingReplaceLock);
+
+ //Lower priority
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024/2025"), 25);
+
+ final TaskLock overlappingAppendLock =
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024-01-01/2024-02-01"), 75);
+ expectedLocks.add(overlappingAppendLock);
+
+ // Non-overlapping interval
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024-12-01/2025-01-01"), 75);
+
+ final TaskLock overlappingExclusiveLock =
+ validator.expectLockCreated(TaskLockType.EXCLUSIVE,
Intervals.of("2020/2021"), 50);
+ expectedLocks.add(overlappingExclusiveLock);
+
+ LockFilterPolicy policy = new LockFilterPolicy(
+ "none",
+ 50,
+ ImmutableList.of(Intervals.of("2020/2021"),
Intervals.of("2024-01-01/2024-07-01")),
+ null
+ );
+
+ LockFilterPolicy policyForNonExistentDatasource = new LockFilterPolicy(
+ "nonExistent",
+ 0,
+ null,
+ null
+ );
+
+ Map<String, List<TaskLock>> activeLocks =
+ lockbox.getActiveLocks(ImmutableList.of(policy,
policyForNonExistentDatasource));
+ Assert.assertEquals(1, activeLocks.size());
+ Assert.assertEquals(expectedLocks, new HashSet<>(activeLocks.get("none")));
+ }
+
+ @Test
+ public void testGetActiveLocksWithAppendLockIgnoresAppendLocks()
+ {
+ final Set<TaskLock> expectedLocks = new HashSet<>();
+ final TaskLock overlappingReplaceLock =
+ validator.expectLockCreated(TaskLockType.REPLACE,
Intervals.of("2024/2025"), 50);
+ expectedLocks.add(overlappingReplaceLock);
+
+ //Lower priority
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024/2025"), 25);
+
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024-01-01/2024-02-01"), 75);
+
+ // Non-overlapping interval
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024-12-01/2025-01-01"), 75);
+
+ final TaskLock overlappingExclusiveLock =
+ validator.expectLockCreated(TaskLockType.EXCLUSIVE,
Intervals.of("2020/2021"), 50);
+ expectedLocks.add(overlappingExclusiveLock);
+
+ LockFilterPolicy policy = new LockFilterPolicy(
+ "none",
+ 50,
+ ImmutableList.of(Intervals.of("2020/2021"),
Intervals.of("2024-01-01/2024-07-01")),
+ ImmutableMap.of(Tasks.TASK_LOCK_TYPE, TaskLockType.APPEND.name())
+ );
+
+ LockFilterPolicy policyForNonExistentDatasource = new LockFilterPolicy(
+ "nonExistent",
+ 0,
+ null,
+ null
+ );
+
+ Map<String, List<TaskLock>> activeLocks =
+ lockbox.getActiveLocks(ImmutableList.of(policy,
policyForNonExistentDatasource));
+ Assert.assertEquals(1, activeLocks.size());
+ Assert.assertEquals(expectedLocks, new HashSet<>(activeLocks.get("none")));
+ }
+
+ @Test
+ public void testGetActiveLocksWithConcurrentLocksIgnoresAppendLocks()
+ {
+ final Set<TaskLock> expectedLocks = new HashSet<>();
+ final TaskLock overlappingReplaceLock =
+ validator.expectLockCreated(TaskLockType.REPLACE,
Intervals.of("2024/2025"), 50);
+ expectedLocks.add(overlappingReplaceLock);
+
+ //Lower priority
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024/2025"), 25);
+
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024-01-01/2024-02-01"), 75);
+
+ // Non-overlapping interval
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024-12-01/2025-01-01"), 75);
+
+ final TaskLock overlappingExclusiveLock =
+ validator.expectLockCreated(TaskLockType.EXCLUSIVE,
Intervals.of("2020/2021"), 50);
+ expectedLocks.add(overlappingExclusiveLock);
+
+ LockFilterPolicy policy = new LockFilterPolicy(
+ "none",
+ 50,
+ ImmutableList.of(Intervals.of("2020/2021"),
Intervals.of("2024-01-01/2024-07-01")),
+ ImmutableMap.of(Tasks.USE_CONCURRENT_LOCKS, true,
Tasks.TASK_LOCK_TYPE, TaskLockType.EXCLUSIVE.name())
+ );
+
+ LockFilterPolicy policyForNonExistentDatasource = new LockFilterPolicy(
+ "nonExistent",
+ 0,
+ null,
+ null
+ );
+
+ Map<String, List<TaskLock>> activeLocks =
+ lockbox.getActiveLocks(ImmutableList.of(policy,
policyForNonExistentDatasource));
+ Assert.assertEquals(1, activeLocks.size());
+ Assert.assertEquals(expectedLocks, new HashSet<>(activeLocks.get("none")));
+ }
+
+ @Test
+ public void testGetActiveLocksWithoutConcurrentLocksConsidersAppendLocks()
+ {
+ final Set<TaskLock> expectedLocks = new HashSet<>();
+ final TaskLock overlappingReplaceLock =
+ validator.expectLockCreated(TaskLockType.REPLACE,
Intervals.of("2024/2025"), 50);
+
+ expectedLocks.add(overlappingReplaceLock);
+
+ //Lower priority
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024/2025"), 25);
+
+ final TaskLock overlappingAppendLock =
+ validator.expectLockCreated(TaskLockType.APPEND,
Intervals.of("2024-01-01/2024-02-01"), 75);
Review Comment:
## Unread local variable
Variable 'TaskLock overlappingAppendLock' is never read.
[Show more
details](https://github.com/apache/druid/security/code-scanning/7626)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
