getTaskInfo(String entryId);
+ TaskInfo getTaskInfo(String entryId);
/**
* Returns a list of {@link TaskInfo} from metadata store that matches to the given filters.
- *
+ *
* If {@code taskLookups} includes {@link TaskLookupType#ACTIVE}, it returns all active tasks in the metadata store.
* If {@code taskLookups} includes {@link TaskLookupType#COMPLETE}, it returns all complete tasks in the metadata
* store. For complete tasks, additional filters in {@code CompleteTaskLookup} can be applied.
@@ -100,14 +105,14 @@ void insert(
* @param taskLookups task lookup type and filters.
* @param datasource datasource filter
*/
- List> getTaskInfos(
+ List getTaskInfos(
Map taskLookups,
@Nullable String datasource
);
/**
* Returns the statuses of the specified tasks.
- *
+ *
* If {@code taskLookups} includes {@link TaskLookupType#ACTIVE}, it returns all active tasks in the metadata store.
* If {@code taskLookups} includes {@link TaskLookupType#COMPLETE}, it returns all complete tasks in the metadata
* store. For complete tasks, additional filters in {@code CompleteTaskLookup} can be applied.
@@ -116,12 +121,12 @@ List> getTaskInfos(
* @param taskLookups task lookup type and filters.
* @param datasource datasource filter
*/
- List> getTaskStatusList(
+ List getTaskStatusList(
Map taskLookups,
@Nullable String datasource
);
- default List> getTaskInfos(
+ default List getTaskInfos(
TaskLookup taskLookup,
@Nullable String datasource
)
@@ -136,7 +141,7 @@ default List> getTaskInfos(
* @param lock lock to add
* @return true if the lock was added
*/
- boolean addLock(String entryId, LockType lock);
+ boolean addLock(String entryId, TaskLock lock);
/**
* Replace an existing lock with a new lock.
@@ -147,7 +152,7 @@ default List> getTaskInfos(
*
* @return true if the lock is replaced
*/
- boolean replaceLock(String entryId, long oldLockId, LockType newLock);
+ boolean replaceLock(String entryId, long oldLockId, TaskLock newLock);
/**
* Remove the lock with the given lock id.
@@ -163,43 +168,13 @@ default List> getTaskInfos(
*/
void removeTasksOlderThan(long timestamp);
- /**
- * Task logs are not used anymore and this method is never called by Druid code.
- * It has been retained only for backwards compatibility with older extensions.
- * New extensions must not implement this method.
- *
- * @throws DruidException of category UNSUPPORTED whenever called.
- */
- @Deprecated
- default boolean addLog(String entryId, LogType log)
- {
- throw DruidException.defensive()
- .ofCategory(DruidException.Category.UNSUPPORTED)
- .build("Task actions are not logged anymore.");
- }
-
- /**
- * Task logs are not used anymore and this method is never called by Druid code.
- * It has been retained only for backwards compatibility with older extensions.
- * New extensions must not implement this method.
- *
- * @throws DruidException of category UNSUPPORTED whenever called.
- */
- @Deprecated
- default List getLogs(String entryId)
- {
- throw DruidException.defensive()
- .ofCategory(DruidException.Category.UNSUPPORTED)
- .build("Task actions are not logged anymore.");
- }
-
/**
* Returns the locks for the given entry
*
* @param entryId entry id
* @return map of lockId to lock
*/
- Map getLocks(String entryId);
+ Map getLocks(String entryId);
/**
* Returns the lock id for the given entry and the lock.
@@ -207,7 +182,7 @@ default List getLogs(String entryId)
* @return lock id if found, otherwise null.
*/
@Nullable
- Long getLockId(String entryId, LockType lock);
+ Long getLockId(String entryId, TaskLock lock);
/**
* Utility to migrate existing tasks to the new schema by populating type and groupId asynchronously
diff --git a/processing/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java b/indexing-service/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java
similarity index 78%
rename from processing/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java
rename to indexing-service/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java
index a81ecfdbf1c4..2a4ea305696b 100644
--- a/processing/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java
+++ b/indexing-service/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerFactory.java
@@ -21,8 +21,5 @@
public interface MetadataStorageActionHandlerFactory
{
- MetadataStorageActionHandler create(
- String entryType,
- MetadataStorageActionHandlerTypes payloadTypes
- );
+ MetadataStorageActionHandler create();
}
diff --git a/processing/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java b/indexing-service/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java
similarity index 100%
rename from processing/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java
rename to indexing-service/src/main/java/org/apache/druid/metadata/MetadataStorageActionHandlerTypes.java
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java b/indexing-service/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
similarity index 81%
rename from server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
rename to indexing-service/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
index f8c506d71da9..b7190edf6518 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
+++ b/indexing-service/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
@@ -20,7 +20,6 @@
package org.apache.druid.metadata;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -30,8 +29,12 @@
import com.google.common.collect.Maps;
import org.apache.druid.error.DruidException;
import org.apache.druid.error.InvalidInput;
+import org.apache.druid.indexer.TaskIdStatus;
import org.apache.druid.indexer.TaskIdentifier;
import org.apache.druid.indexer.TaskInfo;
+import org.apache.druid.indexer.TaskStatus;
+import org.apache.druid.indexing.common.TaskLock;
+import org.apache.druid.indexing.common.task.Task;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.IAE;
import org.apache.druid.java.util.common.Pair;
@@ -41,18 +44,16 @@
import org.apache.druid.metadata.TaskLookup.TaskLookupType;
import org.joda.time.DateTime;
import org.skife.jdbi.v2.Batch;
-import org.skife.jdbi.v2.FoldController;
-import org.skife.jdbi.v2.Folder3;
import org.skife.jdbi.v2.Handle;
import org.skife.jdbi.v2.Query;
import org.skife.jdbi.v2.StatementContext;
import org.skife.jdbi.v2.exceptions.CallbackFailedException;
-import org.skife.jdbi.v2.exceptions.StatementException;
import org.skife.jdbi.v2.tweak.HandleCallback;
import org.skife.jdbi.v2.tweak.ResultSetMapper;
import org.skife.jdbi.v2.util.ByteArrayMapper;
import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -60,73 +61,45 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.stream.Collectors;
import java.util.stream.IntStream;
-public abstract class SQLMetadataStorageActionHandler
- implements MetadataStorageActionHandler
+public abstract class SQLMetadataStorageActionHandler
+ implements MetadataStorageActionHandler
{
private static final EmittingLogger log = new EmittingLogger(SQLMetadataStorageActionHandler.class);
private static final String CONTEXT_KEY_IS_TRANSIENT = "isTransient";
private final SQLMetadataConnector connector;
private final ObjectMapper jsonMapper;
- private final TypeReference entryType;
- private final TypeReference statusType;
- private final TypeReference lockType;
- private final String entryTypeName;
private final String entryTable;
private final String lockTable;
- private final TaskInfoMapper taskInfoMapper;
+ private final TaskInfoMapper taskInfoMapper;
private final TaskStatusMapper taskStatusMapper;
private final TaskStatusMapperFromPayload taskStatusMapperFromPayload;
private final TaskIdentifierMapper taskIdentifierMapper;
private Future taskMigrationCompleteFuture;
- /**
- * @deprecated Use the other constructor without {@code logTable} argument
- * since this argument is now unused.
- */
- @Deprecated
- public SQLMetadataStorageActionHandler(
- final SQLMetadataConnector connector,
- final ObjectMapper jsonMapper,
- final MetadataStorageActionHandlerTypes types,
- final String entryTypeName,
- final String entryTable,
- final String logTable,
- final String lockTable
- )
- {
- this(connector, jsonMapper, types, entryTypeName, entryTable, lockTable);
- }
-
@SuppressWarnings("PMD.UnnecessaryFullyQualifiedName")
public SQLMetadataStorageActionHandler(
final SQLMetadataConnector connector,
final ObjectMapper jsonMapper,
- final MetadataStorageActionHandlerTypes types,
- final String entryTypeName,
final String entryTable,
final String lockTable
)
{
this.connector = connector;
- //fully qualified references required below due to identical package names across project modules.
- //noinspection UnnecessaryFullyQualifiedName
this.jsonMapper = jsonMapper.copy().addMixIn(PasswordProvider.class, PasswordProviderRedactionMixIn.class);
- this.entryType = types.getEntryType();
- this.statusType = types.getStatusType();
- this.lockType = types.getLockType();
- this.entryTypeName = entryTypeName;
this.entryTable = entryTable;
this.lockTable = lockTable;
- this.taskInfoMapper = new TaskInfoMapper<>(jsonMapper, entryType, statusType);
+ this.taskInfoMapper = new TaskInfoMapper(jsonMapper);
this.taskStatusMapper = new TaskStatusMapper(jsonMapper);
this.taskStatusMapperFromPayload = new TaskStatusMapperFromPayload(jsonMapper);
this.taskIdentifierMapper = new TaskIdentifierMapper(jsonMapper);
@@ -142,39 +115,19 @@ protected ObjectMapper getJsonMapper()
return jsonMapper;
}
- protected TypeReference getStatusType()
- {
- return statusType;
- }
-
protected String getEntryTable()
{
return entryTable;
}
- protected String getLogTable()
- {
- throw new UnsupportedOperationException("'tasklogs' table is not used anymore");
- }
-
- protected String getEntryTypeName()
- {
- return entryTypeName;
- }
-
- public TypeReference getEntryType()
- {
- return entryType;
- }
-
@Override
public void insert(
final String id,
final DateTime timestamp,
final String dataSource,
- final EntryType entry,
+ final @NotNull Task entry,
final boolean active,
- final StatusType status,
+ final TaskStatus status,
final String type,
final String groupId
)
@@ -209,9 +162,9 @@ private Void insertEntryWithHandle(
String entryId,
DateTime timestamp,
String dataSource,
- EntryType entry,
+ Object entry,
boolean active,
- StatusType status,
+ Object status,
String type,
String groupId
)
@@ -239,12 +192,6 @@ private Void insertEntryWithHandle(
}
}
- public static boolean isStatementException(Throwable e)
- {
- return e instanceof StatementException ||
- (e instanceof CallbackFailedException && e.getCause() instanceof StatementException);
- }
-
private boolean isTransientDruidException(Throwable t)
{
if (t instanceof CallbackFailedException) {
@@ -257,7 +204,7 @@ private boolean isTransientDruidException(Throwable t)
}
@Override
- public boolean setStatus(final String entryId, final boolean active, final StatusType status)
+ public boolean setStatus(final String entryId, final boolean active, final TaskStatus status)
{
return connector.retryWithHandle(
new HandleCallback<>()
@@ -281,13 +228,13 @@ public Boolean withHandle(Handle handle) throws Exception
}
@Override
- public Optional getEntry(final String entryId)
+ public Optional getEntry(final String entryId)
{
return connector.retryWithHandle(
new HandleCallback<>()
{
@Override
- public Optional withHandle(Handle handle) throws Exception
+ public Optional withHandle(Handle handle) throws Exception
{
byte[] res = handle.createQuery(
StringUtils.format("SELECT payload FROM %s WHERE id = :id", entryTable)
@@ -297,7 +244,7 @@ public Optional withHandle(Handle handle) throws Exception
.first();
return Optional.fromNullable(
- res == null ? null : jsonMapper.readValue(res, entryType)
+ res == null ? null : jsonMapper.readValue(res, Task.class)
);
}
}
@@ -306,13 +253,13 @@ public Optional withHandle(Handle handle) throws Exception
}
@Override
- public Optional getStatus(final String entryId)
+ public Optional getStatus(final String entryId)
{
return connector.retryWithHandle(
new HandleCallback<>()
{
@Override
- public Optional withHandle(Handle handle) throws Exception
+ public Optional withHandle(Handle handle) throws Exception
{
byte[] res = handle.createQuery(
StringUtils.format("SELECT status_payload FROM %s WHERE id = :id", entryTable)
@@ -322,7 +269,7 @@ public Optional withHandle(Handle handle) throws Exception
.first();
return Optional.fromNullable(
- res == null ? null : jsonMapper.readValue(res, statusType)
+ res == null ? null : jsonMapper.readValue(res, TaskStatus.class)
);
}
}
@@ -331,7 +278,7 @@ public Optional withHandle(Handle handle) throws Exception
@Override
@Nullable
- public TaskInfo getTaskInfo(String entryId)
+ public TaskInfo getTaskInfo(String entryId)
{
return connector.retryWithHandle(handle -> {
final String query = StringUtils.format(
@@ -346,14 +293,14 @@ public TaskInfo getTaskInfo(String entryId)
}
@Override
- public List> getTaskInfos(
+ public List getTaskInfos(
Map taskLookups,
@Nullable String dataSource
)
{
return getConnector().retryTransaction(
(handle, status) -> {
- final List> tasks = new ArrayList<>();
+ final List tasks = new ArrayList<>();
for (Entry entry : taskLookups.entrySet()) {
final Query> query;
switch (entry.getKey()) {
@@ -375,7 +322,7 @@ public List> getTaskInfos(
throw new IAE("Unknown TaskLookupType: [%s]", entry.getKey());
}
}
- return tasks;
+ return tasks.stream().filter(Objects::nonNull).collect(Collectors.toList());
},
SQLMetadataConnector.QUIET_RETRIES,
SQLMetadataConnector.DEFAULT_MAX_TRIES
@@ -383,7 +330,7 @@ public List> getTaskInfos(
}
@Override
- public List> getTaskStatusList(
+ public List getTaskStatusList(
Map taskLookups,
@Nullable String dataSource
)
@@ -401,17 +348,17 @@ public List> getTaskStatusList(
}
@VisibleForTesting
- List> getTaskStatusList(
+ List getTaskStatusList(
Map taskLookups,
@Nullable String dataSource,
boolean fetchPayload
)
{
- ResultSetMapper> resultSetMapper =
+ ResultSetMapper resultSetMapper =
fetchPayload ? taskStatusMapperFromPayload : taskStatusMapper;
return getConnector().retryTransaction(
(handle, status) -> {
- final List> taskMetadataInfos = new ArrayList<>();
+ final List taskMetadataInfos = new ArrayList<>();
for (Entry entry : taskLookups.entrySet()) {
final Query> query;
switch (entry.getKey()) {
@@ -446,7 +393,7 @@ List> getTaskStatusList(
*/
private DruidException wrapInDruidException(String taskId, Throwable t)
{
- if (isStatementException(t) && getEntry(taskId).isPresent()) {
+ if (SQLMetadataConnector.isStatementException(t) && getEntry(taskId).isPresent()) {
return InvalidInput.exception("Task [%s] already exists", taskId);
} else if (connector.isRootCausePacketTooBigException(t)) {
return InvalidInput.exception(
@@ -648,7 +595,7 @@ private String getWhereClauseForActiveStatusesQuery(String dataSource)
return sql;
}
- private class TaskStatusMapperFromPayload implements ResultSetMapper>
+ private class TaskStatusMapperFromPayload implements ResultSetMapper
{
private final ObjectMapper objectMapper;
@@ -658,14 +605,14 @@ private class TaskStatusMapperFromPayload implements ResultSetMapper map(int index, ResultSet resultSet, StatementContext context)
+ public TaskIdStatus map(int index, ResultSet resultSet, StatementContext context)
throws SQLException
{
return toTaskIdentifierInfo(objectMapper, resultSet, true);
}
}
- private class TaskStatusMapper implements ResultSetMapper>
+ private class TaskStatusMapper implements ResultSetMapper
{
private final ObjectMapper objectMapper;
@@ -675,16 +622,16 @@ private class TaskStatusMapper implements ResultSetMapper map(int index, ResultSet resultSet, StatementContext context)
+ public TaskIdStatus map(int index, ResultSet resultSet, StatementContext context)
throws SQLException
{
return toTaskIdentifierInfo(objectMapper, resultSet, false);
}
}
- private TaskInfo toTaskIdentifierInfo(ObjectMapper objectMapper,
- ResultSet resultSet,
- boolean usePayload
+ private TaskIdStatus toTaskIdentifierInfo(ObjectMapper objectMapper,
+ ResultSet resultSet,
+ boolean usePayload
) throws SQLException
{
String type;
@@ -706,9 +653,9 @@ private TaskInfo toTaskIdentifierInfo(ObjectMapper o
String id = resultSet.getString("id");
DateTime createdTime = DateTimes.of(resultSet.getString("created_date"));
- StatusType status;
+ TaskStatus status;
try {
- status = objectMapper.readValue(resultSet.getBytes("status_payload"), statusType);
+ status = objectMapper.readValue(resultSet.getBytes("status_payload"), TaskStatus.class);
}
catch (IOException e) {
log.error(e, "Encountered exception while deserializing task status_payload");
@@ -717,7 +664,7 @@ private TaskInfo toTaskIdentifierInfo(ObjectMapper o
String datasource = resultSet.getString("datasource");
TaskIdentifier taskIdentifier = new TaskIdentifier(id, groupId, type);
- return new TaskInfo<>(id, createdTime, status, datasource, taskIdentifier);
+ return new TaskIdStatus(taskIdentifier, status, datasource, createdTime);
}
static class TaskIdentifierMapper implements ResultSetMapper
@@ -751,71 +698,56 @@ public TaskIdentifier map(int index, ResultSet resultSet, StatementContext conte
}
}
- static class TaskInfoMapper implements ResultSetMapper>
+ private static class TaskInfoMapper implements ResultSetMapper
{
private final ObjectMapper objectMapper;
- private final TypeReference entryType;
- private final TypeReference statusType;
- TaskInfoMapper(ObjectMapper objectMapper, TypeReference entryType, TypeReference statusType)
+ TaskInfoMapper(ObjectMapper objectMapper)
{
this.objectMapper = objectMapper;
- this.entryType = entryType;
- this.statusType = statusType;
}
+ @Nullable
@Override
- public TaskInfo map(int index, ResultSet resultSet, StatementContext context)
+ public TaskInfo map(int index, ResultSet resultSet, StatementContext context)
throws SQLException
{
- final TaskInfo taskInfo;
- EntryType task;
- StatusType status;
+ Task task;
try {
- task = objectMapper.readValue(resultSet.getBytes("payload"), entryType);
+ task = objectMapper.readValue(resultSet.getBytes("payload"), Task.class);
}
catch (IOException e) {
log.warn("Encountered exception[%s] while deserializing task payload, setting payload to null", e.getMessage());
- task = null;
+ return null;
}
try {
- status = objectMapper.readValue(resultSet.getBytes("status_payload"), statusType);
+ TaskStatus status = objectMapper.readValue(resultSet.getBytes("status_payload"), TaskStatus.class);
+ return new TaskInfo(
+ DateTimes.of(resultSet.getString("created_date")),
+ status,
+ task
+ );
}
catch (IOException e) {
log.error(e, "Encountered exception while deserializing task status_payload");
throw new SQLException(e);
}
- taskInfo = new TaskInfo<>(
- resultSet.getString("id"),
- DateTimes.of(resultSet.getString("created_date")),
- status,
- resultSet.getString("datasource"),
- task
- );
- return taskInfo;
}
}
@Override
- public boolean addLock(final String entryId, final LockType lock)
+ public boolean addLock(final String entryId, final TaskLock lock)
{
return connector.retryWithHandle(
- new HandleCallback<>()
- {
- @Override
- public Boolean withHandle(Handle handle) throws Exception
- {
- return addLock(handle, entryId, lock);
- }
- }
+ handle -> addLock(handle, entryId, lock)
);
}
- private boolean addLock(Handle handle, String entryId, LockType lock) throws JsonProcessingException
+ private boolean addLock(Handle handle, String entryId, Object lock) throws JsonProcessingException
{
final String statement = StringUtils.format(
- "INSERT INTO %1$s (%2$s_id, lock_payload) VALUES (:entryId, :payload)",
- lockTable, entryTypeName
+ "INSERT INTO %1$s (task_id, lock_payload) VALUES (:entryId, :payload)",
+ lockTable
);
return handle.createStatement(statement)
.bind("entryId", entryId)
@@ -824,7 +756,7 @@ private boolean addLock(Handle handle, String entryId, LockType lock) throws Jso
}
@Override
- public boolean replaceLock(final String entryId, final long oldLockId, final LockType newLock)
+ public boolean replaceLock(final String entryId, final long oldLockId, final TaskLock newLock)
{
return connector.retryTransaction(
(handle, transactionStatus) -> {
@@ -876,26 +808,26 @@ private int removeLock(Handle handle, long lockId)
}
@Override
- public Map getLocks(final String entryId)
+ public Map getLocks(final String entryId)
{
return connector.retryWithHandle(
new HandleCallback<>()
{
@Override
- public Map withHandle(Handle handle)
+ public Map withHandle(Handle handle)
{
return handle.createQuery(
StringUtils.format(
- "SELECT id, lock_payload FROM %1$s WHERE %2$s_id = :entryId",
- lockTable, entryTypeName
+ "SELECT id, lock_payload FROM %1$s WHERE task_id = :entryId",
+ lockTable
)
)
.bind("entryId", entryId)
.map(
- new ResultSetMapper>()
+ new ResultSetMapper>()
{
@Override
- public Pair map(int index, ResultSet r, StatementContext ctx)
+ public Pair map(int index, ResultSet r, StatementContext ctx)
throws SQLException
{
try {
@@ -903,12 +835,12 @@ public Pair map(int index, ResultSet r, StatementContext ctx)
r.getLong("id"),
jsonMapper.readValue(
r.getBytes("lock_payload"),
- lockType
+ TaskLock.class
)
);
}
catch (IOException e) {
- log.makeAlert(e, "Failed to deserialize " + lockType.getType())
+ log.makeAlert(e, "Failed to deserialize lock")
.addData("id", r.getLong("id"))
.addData(
"lockPayload", StringUtils.fromUtf8(r.getBytes("lock_payload"))
@@ -921,19 +853,9 @@ public Pair map(int index, ResultSet r, StatementContext ctx)
)
.fold(
Maps.newLinkedHashMap(),
- new Folder3, Pair>()
- {
- @Override
- public Map fold(
- Map accumulator,
- Pair lock,
- FoldController control,
- StatementContext ctx
- )
- {
- accumulator.put(lock.lhs, lock.rhs);
- return accumulator;
- }
+ (accumulator, lock, control, ctx) -> {
+ accumulator.put(lock.lhs, lock.rhs);
+ return accumulator;
}
);
}
@@ -943,7 +865,7 @@ public Map fold(
@Override
@Nullable
- public Long getLockId(String entryId, LockType lock)
+ public Long getLockId(String entryId, TaskLock lock)
{
return getLocks(entryId).entrySet().stream()
.filter(entry -> entry.getValue().equals(lock))
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerFactory.java b/indexing-service/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerFactory.java
similarity index 100%
rename from server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerFactory.java
rename to indexing-service/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerFactory.java
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/HeapMemoryTaskStorageTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/HeapMemoryTaskStorageTest.java
index d300ceefb137..7021d23fb50a 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/HeapMemoryTaskStorageTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/HeapMemoryTaskStorageTest.java
@@ -24,7 +24,6 @@
import org.apache.druid.indexer.TaskStatus;
import org.apache.druid.indexing.common.config.TaskStorageConfig;
import org.apache.druid.indexing.common.task.NoopTask;
-import org.apache.druid.indexing.common.task.Task;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.metadata.TaskLookup;
import org.joda.time.Period;
@@ -70,7 +69,7 @@ public void testGetTaskInfos()
storage.insert(task2, TaskStatus.running(task2.getId()));
// Active statuses
- final List> taskInfosActive = storage.getTaskInfos(
+ final List