You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2014/07/10 19:05:10 UTC
[27/50] [abbrv] git commit: Use non-deprecated version of state model
factory for tasks
Use non-deprecated version of state model factory for tasks
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/1bc9354d
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/1bc9354d
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/1bc9354d
Branch: refs/heads/master
Commit: 1bc9354d5da7be0e2b495914351c23ce47b5eb07
Parents: b97cfb4
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Mon Mar 3 14:20:04 2014 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Mon Mar 3 14:20:04 2014 -0800
----------------------------------------------------------------------
.../apache/helix/task/TaskStateModelFactory.java | 8 +++++---
.../integration/task/TestTaskRebalancer.java | 5 +++--
.../task/TestTaskRebalancerStopResume.java | 18 +++++++++++-------
3 files changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/1bc9354d/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java b/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java
index 369ac22..2537747 100644
--- a/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java
+++ b/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java
@@ -20,13 +20,15 @@ package org.apache.helix.task;
*/
import java.util.Map;
+
import org.apache.helix.HelixManager;
-import org.apache.helix.participant.statemachine.StateModelFactory;
+import org.apache.helix.api.id.PartitionId;
+import org.apache.helix.participant.statemachine.HelixStateModelFactory;
/**
* Factory class for {@link TaskStateModel}.
*/
-public class TaskStateModelFactory extends StateModelFactory<TaskStateModel> {
+public class TaskStateModelFactory extends HelixStateModelFactory<TaskStateModel> {
private final HelixManager _manager;
private final Map<String, TaskFactory> _taskFactoryRegistry;
@@ -36,7 +38,7 @@ public class TaskStateModelFactory extends StateModelFactory<TaskStateModel> {
}
@Override
- public TaskStateModel createNewStateModel(String partitionName) {
+ public TaskStateModel createNewStateModel(PartitionId partitionId) {
return new TaskStateModel(_manager, _taskFactoryRegistry);
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/1bc9354d/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
index c221d96..1c83291 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
@@ -29,6 +29,7 @@ import org.apache.helix.HelixManager;
import org.apache.helix.HelixManagerFactory;
import org.apache.helix.InstanceType;
import org.apache.helix.PropertyKey;
+import org.apache.helix.api.id.StateModelDefId;
import org.apache.helix.integration.ZkIntegrationTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
@@ -103,8 +104,8 @@ public class TestTaskRebalancer extends ZkIntegrationTestBase {
// Register a Task state model factory.
StateMachineEngine stateMachine = _participants[i].getStateMachineEngine();
- stateMachine.registerStateModelFactory("Task", new TaskStateModelFactory(_participants[i],
- taskFactoryReg));
+ stateMachine.registerStateModelFactory(StateModelDefId.from("Task"),
+ new TaskStateModelFactory(_participants[i], taskFactoryReg));
_participants[i].syncStart();
}
http://git-wip-us.apache.org/repos/asf/helix/blob/1bc9354d/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
index 01d64f3..bb490ea 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
@@ -20,20 +20,24 @@ package org.apache.helix.integration.task;
*/
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.helix.HelixManager;
import org.apache.helix.HelixManagerFactory;
import org.apache.helix.InstanceType;
-import org.apache.helix.TestHelper;
-import org.apache.helix.controller.HelixControllerMain;
+import org.apache.helix.api.id.StateModelDefId;
import org.apache.helix.integration.ZkIntegrationTestBase;
-import org.apache.helix.integration.ZkStandAloneCMTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
import org.apache.helix.participant.StateMachineEngine;
-import org.apache.helix.task.*;
+import org.apache.helix.task.Task;
+import org.apache.helix.task.TaskConfig;
+import org.apache.helix.task.TaskDriver;
+import org.apache.helix.task.TaskFactory;
+import org.apache.helix.task.TaskResult;
+import org.apache.helix.task.TaskState;
+import org.apache.helix.task.TaskStateModelFactory;
+import org.apache.helix.task.Workflow;
import org.apache.helix.tools.ClusterSetup;
import org.apache.helix.tools.ClusterStateVerifier;
import org.apache.log4j.Logger;
@@ -91,8 +95,8 @@ public class TestTaskRebalancerStopResume extends ZkIntegrationTestBase {
// Register a Task state model factory.
StateMachineEngine stateMachine = _participants[i].getStateMachineEngine();
- stateMachine.registerStateModelFactory("Task", new TaskStateModelFactory(_participants[i],
- taskFactoryReg));
+ stateMachine.registerStateModelFactory(StateModelDefId.from("Task"),
+ new TaskStateModelFactory(_participants[i], taskFactoryReg));
_participants[i].syncStart();
}