From 8289914f76ceaddb5fc79a86f11e62e98f982518 Mon Sep 17 00:00:00 2001 From: Charles Allen Date: Tue, 2 Jun 2015 11:12:39 -0700 Subject: [PATCH] Make AbstractTask.makeId use AbstractTask.joinId * Also remove TaskUtil --- .../indexing/common/task/AbstractTask.java | 13 +++++++ .../indexing/common/task/ArchiveTask.java | 3 +- .../druid/indexing/common/task/KillTask.java | 2 +- .../druid/indexing/common/task/MoveTask.java | 2 +- .../indexing/common/task/RestoreTask.java | 2 +- .../druid/indexing/common/task/TaskUtils.java | 38 ------------------- 6 files changed, 17 insertions(+), 43 deletions(-) delete mode 100644 indexing-service/src/main/java/io/druid/indexing/common/task/TaskUtils.java diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/AbstractTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/AbstractTask.java index 349605d609d..ada1265c88f 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/AbstractTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/AbstractTask.java @@ -28,6 +28,8 @@ import io.druid.indexing.common.TaskToolbox; import io.druid.indexing.common.actions.LockListAction; import io.druid.query.Query; import io.druid.query.QueryRunner; +import org.joda.time.DateTime; +import org.joda.time.Interval; import java.io.IOException; @@ -65,6 +67,17 @@ public abstract class AbstractTask implements Task this.dataSource = Preconditions.checkNotNull(dataSource, "dataSource"); } + public static String makeId(String id, final String typeName, String dataSource, Interval interval) + { + return id != null ? id : joinId( + typeName, + dataSource, + interval.getStart(), + interval.getEnd(), + new DateTime().toString() + ); + } + @JsonProperty @Override public String getId() diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java index d7c1960e4a6..9c42a87a4b0 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java @@ -20,7 +20,6 @@ package io.druid.indexing.common.task; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.metamx.common.ISE; import com.metamx.common.logger.Logger; import io.druid.indexing.common.TaskLock; @@ -44,7 +43,7 @@ public class ArchiveTask extends AbstractFixedIntervalTask ) { super( - TaskUtils.makeId(id, "archive", dataSource, interval), + makeId(id, "archive", dataSource, interval), dataSource, interval ); diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/KillTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/KillTask.java index ed3bdbaa413..224648649d4 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/KillTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/KillTask.java @@ -47,7 +47,7 @@ public class KillTask extends AbstractFixedIntervalTask ) { super( - TaskUtils.makeId(id, "kill", dataSource, interval), + makeId(id, "kill", dataSource, interval), dataSource, interval ); diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/MoveTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/MoveTask.java index db527c7712f..dc1cb2e9654 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/MoveTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/MoveTask.java @@ -49,7 +49,7 @@ public class MoveTask extends AbstractFixedIntervalTask ) { super( - TaskUtils.makeId(id, "move", dataSource, interval), + makeId(id, "move", dataSource, interval), dataSource, interval ); diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/RestoreTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/RestoreTask.java index 7258c3bbc73..1d1ba7d4487 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/RestoreTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/RestoreTask.java @@ -44,7 +44,7 @@ public class RestoreTask extends AbstractFixedIntervalTask ) { super( - TaskUtils.makeId(id, "restore", dataSource, interval), + makeId(id, "restore", dataSource, interval), dataSource, interval ); diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/TaskUtils.java b/indexing-service/src/main/java/io/druid/indexing/common/task/TaskUtils.java deleted file mode 100644 index 9a1f776e093..00000000000 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/TaskUtils.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Druid - a distributed column store. - * Copyright 2012 - 2015 Metamarkets Group Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.druid.indexing.common.task; - -import org.joda.time.DateTime; -import org.joda.time.Interval; - -/** - */ -public class TaskUtils -{ - public static String makeId(String id, final String typeName, String dataSource, Interval interval) - { - return id != null ? id : String.format( - "%s_%s_%s_%s_%s", - typeName, - dataSource, - interval.getStart(), - interval.getEnd(), - new DateTime().toString() - ); - } -}