global task entry type

This commit is contained in:
Xavier Léauté 2014-11-06 17:08:20 -08:00
parent ac753ed0f0
commit 5bda4ee1dd
2 changed files with 7 additions and 5 deletions

View File

@ -34,8 +34,9 @@ public class MetadataStorageTablesConfig
return new MetadataStorageTablesConfig(base, null, null, null, null, null, null);
}
private static String defaultBase = "druid";
private static final String TASK_ENTRY_TYPE = "task";
public static final String TASK_ENTRY_TYPE = "task";
private static final String DEFAULT_BASE = "druid";
private final Map<String, String> entryTables = Maps.newHashMap();
private final Map<String, String> logTables = Maps.newHashMap();
@ -73,7 +74,7 @@ public class MetadataStorageTablesConfig
@JsonProperty("taskLock") String taskLockTable
)
{
this.base = (base == null) ? defaultBase : base;
this.base = (base == null) ? DEFAULT_BASE : base;
this.segmentsTable = makeTableName(segmentsTable, "segments");
this.rulesTable = makeTableName(rulesTable, "rules");
this.configTable = makeTableName(configTable, "config");

View File

@ -42,6 +42,7 @@ import io.druid.indexing.common.TaskLock;
import io.druid.indexing.common.actions.TaskAction;
import io.druid.indexing.common.config.TaskStorageConfig;
import io.druid.indexing.common.task.Task;
import io.druid.metadata.MetadataStorageTablesConfig;
import org.joda.time.DateTime;
import javax.annotation.Nullable;
@ -84,7 +85,7 @@ public class MetadataTaskStorage implements TaskStorage
};
}
};
public static final String TASK_ENTRY_TYPE = "task";
private final MetadataStorageConnector metadataStorageConnector;
private final TaskStorageConfig config;
private final MetadataStorageActionHandler<Task, TaskStatus, TaskAction, TaskLock> handler;
@ -100,7 +101,7 @@ public class MetadataTaskStorage implements TaskStorage
{
this.metadataStorageConnector = metadataStorageConnector;
this.config = config;
this.handler = factory.create(TASK_ENTRY_TYPE, TASK_TYPES);
this.handler = factory.create(MetadataStorageTablesConfig.TASK_ENTRY_TYPE, TASK_TYPES);
}
@LifecycleStart