Skip to content

Added support for filtering by unused parameter for HeapMemoryTaskStorage #6510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jihoonson merged 6 commits into from
Nov 20, 2018
Merged

Added support for filtering by unused parameter for HeapMemoryTaskStorage #6510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
506c6e8
1. added support for unused DateTime start parameter in getRecentlyFi…
Guadrado Nov 2, 2018
9ce6386
Fixed OverlordResourceTest to Support changed methods names
Guadrado Nov 2, 2018
ec01580
Changed methods and parameters names to make them more obvious to und…
Guadrado Nov 14, 2018
5f2ffb9
1. added support for unused DateTime start parameter in getRecentlyFi…
Guadrado Nov 2, 2018
53e0c11
Changed String.replace() for the StringUtils.replace()(#6607)
Guadrado Nov 20, 2018
b97e703
Fixed checkstyle error
Guadrado Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions indexing-service/src/main/java/org/apache/druid/indexing/overlord/HeapMemoryTaskStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ public List<TaskInfo<Task, TaskStatus>> getActiveTaskInfo(@Nullable String dataS
}

@Override
public List<TaskInfo<Task, TaskStatus>> getRecentlyFinishedTaskInfo(
public List<TaskInfo<Task, TaskStatus>> getRecentlyCreatedAlreadyFinishedTaskInfo(
@Nullable Integer maxTaskStatuses,
@Nullable Duration duration,
@Nullable Duration durationBeforeNow,
@Nullable String datasource
)
{
Expand All @@ -240,18 +240,18 @@ public int compare(TaskStuff a, TaskStuff b)
}.reverse();

return maxTaskStatuses == null ?
getRecentlyFinishedTaskInfoSince(
DateTimes.nowUtc().minus(duration == null ? config.getRecentlyFinishedThreshold() : duration),
getRecentlyCreatedAlreadyFinishedTaskInfoSince(
DateTimes.nowUtc().minus(durationBeforeNow == null ? config.getRecentlyFinishedThreshold() : durationBeforeNow),
createdDateDesc
) :
getNRecentlyFinishedTaskInfo(maxTaskStatuses, createdDateDesc);
getNRecentlyCreatedAlreadyFinishedTaskInfo(maxTaskStatuses, createdDateDesc);
}
finally {
giant.unlock();
}
}

private List<TaskInfo<Task, TaskStatus>> getRecentlyFinishedTaskInfoSince(
private List<TaskInfo<Task, TaskStatus>> getRecentlyCreatedAlreadyFinishedTaskInfoSince(
DateTime start,
Ordering<TaskStuff> createdDateDesc
)
Expand All @@ -262,7 +262,7 @@ private List<TaskInfo<Task, TaskStatus>> getRecentlyFinishedTaskInfoSince(
List<TaskStuff> list = createdDateDesc
.sortedCopy(tasks.values())
.stream()
.filter(taskStuff -> taskStuff.getStatus().isComplete())
.filter(taskStuff -> taskStuff.getStatus().isComplete() && taskStuff.createdDate.isAfter(start))
.collect(Collectors.toList());
final ImmutableList.Builder<TaskInfo<Task, TaskStatus>> listBuilder = ImmutableList.builder();
for (final TaskStuff taskStuff : list) {
Expand All @@ -283,14 +283,15 @@ private List<TaskInfo<Task, TaskStatus>> getRecentlyFinishedTaskInfoSince(
}
}

private List<TaskInfo<Task, TaskStatus>> getNRecentlyFinishedTaskInfo(int n, Ordering<TaskStuff> createdDateDesc)
private List<TaskInfo<Task, TaskStatus>> getNRecentlyCreatedAlreadyFinishedTaskInfo(int n, Ordering<TaskStuff> createdDateDesc)
{
giant.lock();

try {
List<TaskStuff> list = createdDateDesc
.sortedCopy(tasks.values())
.stream()
.filter(taskStuff -> taskStuff.getStatus().isComplete())
.limit(n)
.collect(Collectors.toList());
final ImmutableList.Builder<TaskInfo<Task, TaskStatus>> listBuilder = ImmutableList.builder();
Expand Down
6 changes: 3 additions & 3 deletions indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,15 @@ public List<TaskInfo<Task, TaskStatus>> getActiveTaskInfo(@Nullable String dataS
}

@Override
public List<TaskInfo<Task, TaskStatus>> getRecentlyFinishedTaskInfo(
public List<TaskInfo<Task, TaskStatus>> getRecentlyCreatedAlreadyFinishedTaskInfo(
@Nullable Integer maxTaskStatuses,
@Nullable Duration duration,
@Nullable Duration durationBeforeNow,
@Nullable String datasource
)
{
return ImmutableList.copyOf(
handler.getCompletedTaskInfo(
DateTimes.nowUtc().minus(duration == null ? config.getRecentlyFinishedThreshold() : duration),
DateTimes.nowUtc().minus(durationBeforeNow == null ? config.getRecentlyFinishedThreshold() : durationBeforeNow),
maxTaskStatuses,
datasource
)
Expand Down
6 changes: 3 additions & 3 deletions indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,14 @@ public interface TaskStorage
* return nothing.
*
* @param maxTaskStatuses maxTaskStatuses
* @param duration duration
* @param durationBeforeNow duration
* @param datasource datasource
*
* @return list of {@link TaskInfo}
*/
List<TaskInfo<Task, TaskStatus>> getRecentlyFinishedTaskInfo(
List<TaskInfo<Task, TaskStatus>> getRecentlyCreatedAlreadyFinishedTaskInfo(
@Nullable Integer maxTaskStatuses,
@Nullable Duration duration,
@Nullable Duration durationBeforeNow,
@Nullable String datasource
);

Expand Down
4 changes: 2 additions & 2 deletions ...ing-service/src/main/java/org/apache/druid/indexing/overlord/TaskStorageQueryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ public List<TaskInfo<Task, TaskStatus>> getActiveTaskInfo(@Nullable String dataS
return storage.getActiveTaskInfo(dataSource);
}

public List<TaskInfo<Task, TaskStatus>> getRecentlyCompletedTaskInfo(
public List<TaskInfo<Task, TaskStatus>> getCompletedTaskInfoByCreatedTimeDuration(
@Nullable Integer maxTaskStatuses,
@Nullable Duration duration,
@Nullable String dataSource
)
{
return storage.getRecentlyFinishedTaskInfo(maxTaskStatuses, duration, dataSource);
return storage.getRecentlyCreatedAlreadyFinishedTaskInfo(maxTaskStatuses, duration, dataSource);
}

public Optional<Task> getTask(final String taskid)
Expand Down
12 changes: 6 additions & 6 deletions indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ public Response getCompleteTasks(
public Response getTasks(
@QueryParam("state") final String state,
@QueryParam("datasource") final String dataSource,
@QueryParam("interval") final String interval,
@PathParam("createdTimeInterval") final String createdTimeInterval,
@QueryParam("max") final Integer maxCompletedTasks,
@QueryParam("type") final String type,
@Context final HttpServletRequest req
Expand Down Expand Up @@ -692,13 +692,13 @@ public Response getTasks(

//checking for complete tasks first to avoid querying active tasks if user only wants complete tasks
if (state == null || "complete".equals(StringUtils.toLowerCase(state))) {
Duration duration = null;
if (interval != null) {
final Interval theInterval = Intervals.of(interval.replace('_', '/'));
duration = theInterval.toDuration();
Duration createdTimeDuration = null;
if (createdTimeInterval != null) {
final Interval theInterval = Intervals.of(StringUtils.replace(createdTimeInterval, "_", "/"));
createdTimeDuration = theInterval.toDuration();
}
final List<TaskInfo<Task, TaskStatus>> taskInfoList =
taskStorageQueryAdapter.getRecentlyCompletedTaskInfo(maxCompletedTasks, duration, dataSource);
taskStorageQueryAdapter.getCompletedTaskInfoByCreatedTimeDuration(maxCompletedTasks, createdTimeDuration, dataSource);
final List<TaskStatusPlus> completedTasks = taskInfoList.stream()
.map(completeTaskTransformFunc::apply)
.collect(Collectors.toList());
Expand Down
14 changes: 7 additions & 7 deletions ...g-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public void testSecuredGetCompleteTasks()
new MockTaskRunnerWorkItem(tasksIds.get(1), null),
new MockTaskRunnerWorkItem(tasksIds.get(2), null)));

EasyMock.expect(taskStorageQueryAdapter.getRecentlyCompletedTaskInfo(null, null, null)).andStubReturn(
EasyMock.expect(taskStorageQueryAdapter.getCompletedTaskInfoByCreatedTimeDuration(null, null, null)).andStubReturn(
ImmutableList.of(
new TaskInfo(
"id_1",
Expand All @@ -259,7 +259,7 @@ public void testSecuredGetCompleteTasks()
)
);
EasyMock.replay(taskRunner, taskMaster, taskStorageQueryAdapter, indexerMetadataStorageAdapter, req);
Assert.assertTrue(taskStorageQueryAdapter.getRecentlyCompletedTaskInfo(null, null, null).size() == 3);
Assert.assertTrue(taskStorageQueryAdapter.getCompletedTaskInfoByCreatedTimeDuration(null, null, null).size() == 3);
Assert.assertTrue(taskRunner.getRunningTasks().size() == 3);
List<TaskStatusPlus> responseObjects = (List) overlordResource
.getCompleteTasks(null, req).getEntity();
Expand Down Expand Up @@ -313,7 +313,7 @@ public void testGetTasks()
{
expectAuthorizationTokenCheck();
//completed tasks
EasyMock.expect(taskStorageQueryAdapter.getRecentlyCompletedTaskInfo(null, null, null)).andStubReturn(
EasyMock.expect(taskStorageQueryAdapter.getCompletedTaskInfoByCreatedTimeDuration(null, null, null)).andStubReturn(
ImmutableList.of(
new TaskInfo(
"id_5",
Expand Down Expand Up @@ -403,7 +403,7 @@ public void testGetTasksFilterDataSource()
{
expectAuthorizationTokenCheck();
//completed tasks
EasyMock.expect(taskStorageQueryAdapter.getRecentlyCompletedTaskInfo(null, null, "allow")).andStubReturn(
EasyMock.expect(taskStorageQueryAdapter.getCompletedTaskInfoByCreatedTimeDuration(null, null, "allow")).andStubReturn(
ImmutableList.of(
new TaskInfo(
"id_5",
Expand Down Expand Up @@ -667,7 +667,7 @@ public void testGetTasksFilterPendingState()
public void testGetTasksFilterCompleteState()
{
expectAuthorizationTokenCheck();
EasyMock.expect(taskStorageQueryAdapter.getRecentlyCompletedTaskInfo(null, null, null)).andStubReturn(
EasyMock.expect(taskStorageQueryAdapter.getCompletedTaskInfoByCreatedTimeDuration(null, null, null)).andStubReturn(
ImmutableList.of(
new TaskInfo(
"id_1",
Expand Down Expand Up @@ -707,7 +707,7 @@ public void testGetTasksFilterCompleteStateWithInterval()
expectAuthorizationTokenCheck();
List<String> tasksIds = ImmutableList.of("id_1", "id_2", "id_3");
Duration duration = new Period("PT86400S").toStandardDuration();
EasyMock.expect(taskStorageQueryAdapter.getRecentlyCompletedTaskInfo(null, duration, null)).andStubReturn(
EasyMock.expect(taskStorageQueryAdapter.getCompletedTaskInfoByCreatedTimeDuration(null, duration, null)).andStubReturn(
ImmutableList.of(
new TaskInfo(
"id_1",
Expand Down Expand Up @@ -747,7 +747,7 @@ public void testGetTasksFilterCompleteStateWithInterval()
public void testGetNullCompleteTask()
{
expectAuthorizationTokenCheck();
EasyMock.expect(taskStorageQueryAdapter.getRecentlyCompletedTaskInfo(null, null, null)).andStubReturn(
EasyMock.expect(taskStorageQueryAdapter.getCompletedTaskInfoByCreatedTimeDuration(null, null, null)).andStubReturn(
ImmutableList.of(
new TaskInfo(
"id_1",
Expand Down