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 2013/11/07 02:19:52 UTC
[44/53] [abbrv] [HELIX-209] Shuffling around rebalancer code to allow
for compatibility
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java
index fb113b9..9d1dd04 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java
@@ -78,13 +78,13 @@ public class TestCompatibilityCheckStage extends BaseStageTest {
.put("minimum_supported_version.participant", minSupportedParticipantVersion);
}
event.addAttribute("helixmanager", manager);
- runStage(event, new NewReadClusterDataStage());
+ runStage(event, new ReadClusterDataStage());
}
@Test
public void testCompatible() {
prepare("0.4.0", "0.4.0");
- NewCompatibilityCheckStage stage = new NewCompatibilityCheckStage();
+ CompatibilityCheckStage stage = new CompatibilityCheckStage();
StageContext context = new StageContext();
stage.init(context);
stage.preProcess();
@@ -99,7 +99,7 @@ public class TestCompatibilityCheckStage extends BaseStageTest {
@Test
public void testNullParticipantVersion() {
prepare("0.4.0", null);
- NewCompatibilityCheckStage stage = new NewCompatibilityCheckStage();
+ CompatibilityCheckStage stage = new CompatibilityCheckStage();
StageContext context = new StageContext();
stage.init(context);
stage.preProcess();
@@ -115,7 +115,7 @@ public class TestCompatibilityCheckStage extends BaseStageTest {
@Test
public void testNullControllerVersion() {
prepare(null, "0.4.0");
- NewCompatibilityCheckStage stage = new NewCompatibilityCheckStage();
+ CompatibilityCheckStage stage = new CompatibilityCheckStage();
StageContext context = new StageContext();
stage.init(context);
stage.preProcess();
@@ -131,7 +131,7 @@ public class TestCompatibilityCheckStage extends BaseStageTest {
@Test
public void testIncompatible() {
prepare("0.6.1-incubating-SNAPSHOT", "0.3.4", "0.4");
- NewCompatibilityCheckStage stage = new NewCompatibilityCheckStage();
+ CompatibilityCheckStage stage = new CompatibilityCheckStage();
StageContext context = new StageContext();
stage.init(context);
stage.preProcess();
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java
index 3412e0a..65d551d 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java
@@ -48,8 +48,8 @@ public class TestCurrentStateComputationStage extends BaseStageTest {
List<IdealState> idealStates = setupIdealState(5, resources, 10, 1, RebalanceMode.SEMI_AUTO);
Map<ResourceId, ResourceConfig> resourceMap = getResourceMap(idealStates);
event.addAttribute(AttributeName.RESOURCES.toString(), resourceMap);
- NewCurrentStateComputationStage stage = new NewCurrentStateComputationStage();
- runStage(event, new NewReadClusterDataStage());
+ CurrentStateComputationStage stage = new CurrentStateComputationStage();
+ runStage(event, new ReadClusterDataStage());
runStage(event, stage);
ResourceCurrentState output = event.getAttribute(AttributeName.CURRENT_STATE.toString());
AssertJUnit.assertEquals(
@@ -69,8 +69,8 @@ public class TestCurrentStateComputationStage extends BaseStageTest {
setupLiveInstances(5);
event.addAttribute(AttributeName.RESOURCES.toString(), resourceMap);
- NewCurrentStateComputationStage stage = new NewCurrentStateComputationStage();
- runStage(event, new NewReadClusterDataStage());
+ CurrentStateComputationStage stage = new CurrentStateComputationStage();
+ runStage(event, new ReadClusterDataStage());
runStage(event, stage);
ResourceCurrentState output1 = event.getAttribute(AttributeName.CURRENT_STATE.toString());
AssertJUnit.assertEquals(
@@ -89,7 +89,7 @@ public class TestCurrentStateComputationStage extends BaseStageTest {
Builder keyBuilder = accessor.keyBuilder();
accessor.setProperty(keyBuilder.message("localhost_" + 3, message.getId()), message);
- runStage(event, new NewReadClusterDataStage());
+ runStage(event, new ReadClusterDataStage());
runStage(event, stage);
ResourceCurrentState output2 = event.getAttribute(AttributeName.CURRENT_STATE.toString());
State pendingState =
@@ -114,7 +114,7 @@ public class TestCurrentStateComputationStage extends BaseStageTest {
accessor.setProperty(
keyBuilder.currentState("localhost_3", "session_dead", "testResourceName"),
stateWithDeadSession);
- runStage(event, new NewReadClusterDataStage());
+ runStage(event, new ReadClusterDataStage());
runStage(event, stage);
ResourceCurrentState output3 = event.getAttribute(AttributeName.CURRENT_STATE.toString());
State currentState =
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java
index 0bd8795..ba61361 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java
@@ -78,7 +78,7 @@ public class TestMessageThrottleStage extends ZkUnitTestBase {
ClusterEvent event = new ClusterEvent("testEvent");
event.addAttribute("helixmanager", manager);
- NewMessageThrottleStage throttleStage = new NewMessageThrottleStage();
+ MessageThrottleStage throttleStage = new MessageThrottleStage();
try {
runStage(event, throttleStage);
Assert.fail("Should throw exception since DATA_CACHE is null");
@@ -87,7 +87,7 @@ public class TestMessageThrottleStage extends ZkUnitTestBase {
}
Pipeline dataRefresh = new Pipeline();
- dataRefresh.addStage(new NewReadClusterDataStage());
+ dataRefresh.addStage(new ReadClusterDataStage());
runPipeline(event, dataRefresh);
try {
@@ -96,7 +96,7 @@ public class TestMessageThrottleStage extends ZkUnitTestBase {
} catch (Exception e) {
// OK
}
- runStage(event, new NewResourceComputationStage());
+ runStage(event, new ResourceComputationStage());
try {
runStage(event, throttleStage);
@@ -104,7 +104,7 @@ public class TestMessageThrottleStage extends ZkUnitTestBase {
} catch (Exception e) {
// OK
}
- NewMessageOutput msgSelectOutput = new NewMessageOutput();
+ MessageOutput msgSelectOutput = new MessageOutput();
List<Message> selectMessages = new ArrayList<Message>();
Message msg =
createMessage(MessageType.STATE_TRANSITION, MessageId.from("msgId-001"), "OFFLINE",
@@ -117,7 +117,7 @@ public class TestMessageThrottleStage extends ZkUnitTestBase {
runStage(event, throttleStage);
- NewMessageOutput msgThrottleOutput =
+ MessageOutput msgThrottleOutput =
event.getAttribute(AttributeName.MESSAGES_THROTTLE.toString());
Assert.assertEquals(
msgThrottleOutput.getMessages(ResourceId.from("TestDB"), PartitionId.from("TestDB_0"))
@@ -221,7 +221,7 @@ public class TestMessageThrottleStage extends ZkUnitTestBase {
ClusterConstraints constraint =
accessor.getProperty(keyBuilder.constraint(ConstraintType.MESSAGE_CONSTRAINT.toString()));
- NewMessageThrottleStage throttleStage = new NewMessageThrottleStage();
+ MessageThrottleStage throttleStage = new MessageThrottleStage();
// test constraintSelection
// message1: hit contraintSelection rule1 and rule2
@@ -271,10 +271,10 @@ public class TestMessageThrottleStage extends ZkUnitTestBase {
event.addAttribute("helixmanager", manager);
Pipeline dataRefresh = new Pipeline();
- dataRefresh.addStage(new NewReadClusterDataStage());
+ dataRefresh.addStage(new ReadClusterDataStage());
runPipeline(event, dataRefresh);
- runStage(event, new NewResourceComputationStage());
- NewMessageOutput msgSelectOutput = new NewMessageOutput();
+ runStage(event, new ResourceComputationStage());
+ MessageOutput msgSelectOutput = new MessageOutput();
Message msg3 =
createMessage(MessageType.STATE_TRANSITION, MessageId.from("msgId-003"), "OFFLINE",
@@ -306,7 +306,7 @@ public class TestMessageThrottleStage extends ZkUnitTestBase {
runStage(event, throttleStage);
- NewMessageOutput msgThrottleOutput =
+ MessageOutput msgThrottleOutput =
event.getAttribute(AttributeName.MESSAGES_THROTTLE.toString());
List<Message> throttleMessages =
msgThrottleOutput.getMessages(ResourceId.from("TestDB"), PartitionId.from("TestDB_0"));
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java
index 33eff27..4b33d8c 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java
@@ -40,7 +40,7 @@ import org.apache.helix.api.id.PartitionId;
import org.apache.helix.api.id.ProcId;
import org.apache.helix.api.id.ResourceId;
import org.apache.helix.api.id.SessionId;
-import org.apache.helix.controller.stages.NewMessageSelectionStage.Bounds;
+import org.apache.helix.controller.stages.MessageSelectionStage.Bounds;
import org.apache.helix.model.CurrentState;
import org.apache.helix.model.Message;
import org.testng.Assert;
@@ -92,7 +92,7 @@ public class TestMsgSelectionStage {
stateTransitionPriorities.put("SLAVE-MASTER", 1);
List<Message> selectedMsg =
- new NewMessageSelectionStage().selectMessages(liveInstances, currentStates, pendingStates,
+ new MessageSelectionStage().selectMessages(liveInstances, currentStates, pendingStates,
messages, stateConstraints, stateTransitionPriorities, State.from("OFFLINE"));
Assert.assertEquals(selectedMsg.size(), 1);
@@ -145,7 +145,7 @@ public class TestMsgSelectionStage {
stateTransitionPriorities.put("SLAVE-MASTER", 1);
List<Message> selectedMsg =
- new NewMessageSelectionStage().selectMessages(liveInstances, currentStates, pendingStates,
+ new MessageSelectionStage().selectMessages(liveInstances, currentStates, pendingStates,
messages, stateConstraints, stateTransitionPriorities, State.from("OFFLINE"));
Assert.assertEquals(selectedMsg.size(), 0);
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java
index 892bfa7..4129f66 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java
@@ -84,17 +84,17 @@ public class TestRebalancePipeline extends ZkUnitTestBase {
// cluster data cache refresh pipeline
Pipeline dataRefresh = new Pipeline();
- dataRefresh.addStage(new NewReadClusterDataStage());
+ dataRefresh.addStage(new ReadClusterDataStage());
// rebalance pipeline
Pipeline rebalancePipeline = new Pipeline();
- rebalancePipeline.addStage(new NewResourceComputationStage());
- rebalancePipeline.addStage(new NewCurrentStateComputationStage());
- rebalancePipeline.addStage(new NewBestPossibleStateCalcStage());
- rebalancePipeline.addStage(new NewMessageGenerationStage());
- rebalancePipeline.addStage(new NewMessageSelectionStage());
- rebalancePipeline.addStage(new NewMessageThrottleStage());
- rebalancePipeline.addStage(new NewTaskAssignmentStage());
+ rebalancePipeline.addStage(new ResourceComputationStage());
+ rebalancePipeline.addStage(new CurrentStateComputationStage());
+ rebalancePipeline.addStage(new BestPossibleStateCalcStage());
+ rebalancePipeline.addStage(new MessageGenerationStage());
+ rebalancePipeline.addStage(new MessageSelectionStage());
+ rebalancePipeline.addStage(new MessageThrottleStage());
+ rebalancePipeline.addStage(new TaskAssignmentStage());
// round1: set node0 currentState to OFFLINE and node1 currentState to OFFLINE
setCurrentState(clusterName, "localhost_0", resourceName, resourceName + "_0", "session_0",
@@ -104,7 +104,7 @@ public class TestRebalancePipeline extends ZkUnitTestBase {
runPipeline(event, dataRefresh);
runPipeline(event, rebalancePipeline);
- NewMessageOutput msgSelOutput = event.getAttribute(AttributeName.MESSAGES_SELECTED.toString());
+ MessageOutput msgSelOutput = event.getAttribute(AttributeName.MESSAGES_SELECTED.toString());
List<Message> messages =
msgSelOutput.getMessages(ResourceId.from(resourceName),
PartitionId.from(resourceName + "_0"));
@@ -239,17 +239,17 @@ public class TestRebalancePipeline extends ZkUnitTestBase {
// cluster data cache refresh pipeline
Pipeline dataRefresh = new Pipeline();
- dataRefresh.addStage(new NewReadClusterDataStage());
+ dataRefresh.addStage(new ReadClusterDataStage());
// rebalance pipeline
Pipeline rebalancePipeline = new Pipeline();
- rebalancePipeline.addStage(new NewResourceComputationStage());
- rebalancePipeline.addStage(new NewCurrentStateComputationStage());
- rebalancePipeline.addStage(new NewBestPossibleStateCalcStage());
- rebalancePipeline.addStage(new NewMessageGenerationStage());
- rebalancePipeline.addStage(new NewMessageSelectionStage());
- rebalancePipeline.addStage(new NewMessageThrottleStage());
- rebalancePipeline.addStage(new NewTaskAssignmentStage());
+ rebalancePipeline.addStage(new ResourceComputationStage());
+ rebalancePipeline.addStage(new CurrentStateComputationStage());
+ rebalancePipeline.addStage(new BestPossibleStateCalcStage());
+ rebalancePipeline.addStage(new MessageGenerationStage());
+ rebalancePipeline.addStage(new MessageSelectionStage());
+ rebalancePipeline.addStage(new MessageThrottleStage());
+ rebalancePipeline.addStage(new TaskAssignmentStage());
// round1: set node0 currentState to OFFLINE and node1 currentState to SLAVE
setCurrentState(clusterName, "localhost_0", resourceName, resourceName + "_0", "session_0",
@@ -259,7 +259,7 @@ public class TestRebalancePipeline extends ZkUnitTestBase {
runPipeline(event, dataRefresh);
runPipeline(event, rebalancePipeline);
- NewMessageOutput msgSelOutput = event.getAttribute(AttributeName.MESSAGES_SELECTED.toString());
+ MessageOutput msgSelOutput = event.getAttribute(AttributeName.MESSAGES_SELECTED.toString());
List<Message> messages =
msgSelOutput.getMessages(ResourceId.from(resourceName),
PartitionId.from(resourceName + "_0"));
@@ -344,17 +344,17 @@ public class TestRebalancePipeline extends ZkUnitTestBase {
// cluster data cache refresh pipeline
Pipeline dataRefresh = new Pipeline();
- dataRefresh.addStage(new NewReadClusterDataStage());
+ dataRefresh.addStage(new ReadClusterDataStage());
// rebalance pipeline
Pipeline rebalancePipeline = new Pipeline();
- rebalancePipeline.addStage(new NewResourceComputationStage());
- rebalancePipeline.addStage(new NewCurrentStateComputationStage());
- rebalancePipeline.addStage(new NewBestPossibleStateCalcStage());
- rebalancePipeline.addStage(new NewMessageGenerationStage());
- rebalancePipeline.addStage(new NewMessageSelectionStage());
- rebalancePipeline.addStage(new NewMessageThrottleStage());
- rebalancePipeline.addStage(new NewTaskAssignmentStage());
+ rebalancePipeline.addStage(new ResourceComputationStage());
+ rebalancePipeline.addStage(new CurrentStateComputationStage());
+ rebalancePipeline.addStage(new BestPossibleStateCalcStage());
+ rebalancePipeline.addStage(new MessageGenerationStage());
+ rebalancePipeline.addStage(new MessageSelectionStage());
+ rebalancePipeline.addStage(new MessageThrottleStage());
+ rebalancePipeline.addStage(new TaskAssignmentStage());
// round1: set node1 currentState to SLAVE
setCurrentState(clusterName, "localhost_1", resourceName, resourceName + "_0", "session_1",
@@ -362,7 +362,7 @@ public class TestRebalancePipeline extends ZkUnitTestBase {
runPipeline(event, dataRefresh);
runPipeline(event, rebalancePipeline);
- NewMessageOutput msgSelOutput = event.getAttribute(AttributeName.MESSAGES_SELECTED.toString());
+ MessageOutput msgSelOutput = event.getAttribute(AttributeName.MESSAGES_SELECTED.toString());
List<Message> messages =
msgSelOutput.getMessages(ResourceId.from(resourceName),
PartitionId.from(resourceName + "_0"));
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java
index ab0e4a6..45b0dac 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java
@@ -67,8 +67,8 @@ public class TestResourceComputationStage extends BaseStageTest {
HelixDataAccessor accessor = manager.getHelixDataAccessor();
Builder keyBuilder = accessor.keyBuilder();
accessor.setProperty(keyBuilder.idealState(resourceName), idealState);
- NewResourceComputationStage stage = new NewResourceComputationStage();
- runStage(event, new NewReadClusterDataStage());
+ ResourceComputationStage stage = new ResourceComputationStage();
+ runStage(event, new ReadClusterDataStage());
runStage(event, stage);
Map<ResourceId, ResourceConfig> resource =
@@ -92,8 +92,8 @@ public class TestResourceComputationStage extends BaseStageTest {
"testResource1", "testResource2"
};
List<IdealState> idealStates = setupIdealState(5, resources, 10, 1, RebalanceMode.SEMI_AUTO);
- NewResourceComputationStage stage = new NewResourceComputationStage();
- runStage(event, new NewReadClusterDataStage());
+ ResourceComputationStage stage = new ResourceComputationStage();
+ runStage(event, new ReadClusterDataStage());
runStage(event, stage);
Map<ResourceId, ResourceConfig> resourceMap =
@@ -166,8 +166,8 @@ public class TestResourceComputationStage extends BaseStageTest {
accessor.setProperty(keyBuilder.currentState(instanceName, sessionId, oldResource),
currentState);
- NewResourceComputationStage stage = new NewResourceComputationStage();
- runStage(event, new NewReadClusterDataStage());
+ ResourceComputationStage stage = new ResourceComputationStage();
+ runStage(event, new ReadClusterDataStage());
runStage(event, stage);
Map<ResourceId, ResourceConfig> resourceMap =
@@ -208,7 +208,7 @@ public class TestResourceComputationStage extends BaseStageTest {
@Test
public void testNull() {
ClusterEvent event = new ClusterEvent("sampleEvent");
- NewResourceComputationStage stage = new NewResourceComputationStage();
+ ResourceComputationStage stage = new ResourceComputationStage();
StageContext context = new StageContext();
stage.init(context);
stage.preProcess();
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/controller/strategy/TestAutoRebalanceStrategy.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/controller/strategy/TestAutoRebalanceStrategy.java b/helix-core/src/test/java/org/apache/helix/controller/strategy/TestAutoRebalanceStrategy.java
index 8de39ab..f8fa4a2 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/strategy/TestAutoRebalanceStrategy.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/strategy/TestAutoRebalanceStrategy.java
@@ -41,7 +41,7 @@ import org.apache.helix.api.id.ClusterId;
import org.apache.helix.api.id.ParticipantId;
import org.apache.helix.api.id.ResourceId;
import org.apache.helix.api.id.StateModelDefId;
-import org.apache.helix.controller.rebalancer.util.NewConstraintBasedAssignment;
+import org.apache.helix.controller.rebalancer.util.ConstraintBasedAssignment;
import org.apache.helix.controller.strategy.AutoRebalanceStrategy.ReplicaPlacementScheme;
import org.apache.helix.model.IdealState;
import org.apache.helix.model.StateModelDefinition;
@@ -228,10 +228,10 @@ public class TestAutoRebalanceStrategy {
Map<ParticipantId, State> currentStateMap =
IdealState.participantStateMapFromStringMap(rawCurStateMap);
Map<State, String> upperBounds =
- NewConstraintBasedAssignment.stateConstraints(_stateModelDef,
+ ConstraintBasedAssignment.stateConstraints(_stateModelDef,
ResourceId.from(RESOURCE_NAME), cluster);
Map<ParticipantId, State> assignment =
- NewConstraintBasedAssignment.computeAutoBestStateForPartition(upperBounds,
+ ConstraintBasedAssignment.computeAutoBestStateForPartition(upperBounds,
liveParticipantSet, _stateModelDef, preferenceList, currentStateMap,
disabledParticipantsForPartition);
mapResult.put(partition, IdealState.stringMapFromParticipantStateMap(assignment));
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/controller/strategy/TestNewAutoRebalanceStrategy.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/controller/strategy/TestNewAutoRebalanceStrategy.java b/helix-core/src/test/java/org/apache/helix/controller/strategy/TestNewAutoRebalanceStrategy.java
index 813cd71..9f52866 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/strategy/TestNewAutoRebalanceStrategy.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/strategy/TestNewAutoRebalanceStrategy.java
@@ -46,7 +46,7 @@ import org.apache.helix.api.id.ParticipantId;
import org.apache.helix.api.id.PartitionId;
import org.apache.helix.api.id.ResourceId;
import org.apache.helix.api.id.StateModelDefId;
-import org.apache.helix.controller.rebalancer.util.NewConstraintBasedAssignment;
+import org.apache.helix.controller.rebalancer.util.ConstraintBasedAssignment;
import org.apache.helix.controller.strategy.AutoRebalanceStrategy.ReplicaPlacementScheme;
import org.apache.helix.model.CurrentState;
import org.apache.helix.model.Message;
@@ -260,10 +260,10 @@ public class TestNewAutoRebalanceStrategy {
Map<ParticipantId, State> replicaMap =
ResourceAssignment.replicaMapFromStringMap(_currentMapping.get(partition));
Map<State, String> upperBounds =
- NewConstraintBasedAssignment.stateConstraints(_stateModelDef,
+ ConstraintBasedAssignment.stateConstraints(_stateModelDef,
ResourceId.from(RESOURCE_NAME), clusterConfig);
Map<ParticipantId, State> assignment =
- NewConstraintBasedAssignment.computeAutoBestStateForPartition(upperBounds,
+ ConstraintBasedAssignment.computeAutoBestStateForPartition(upperBounds,
liveParticipantMap.keySet(), _stateModelDef, participantPreferenceList, replicaMap,
disabledParticipantsForPartition);
mapResult.put(partitionId, assignment);
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5405df1e/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
index 1b7c30c..6b79b61 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
@@ -32,8 +32,8 @@ import org.apache.helix.api.Cluster;
import org.apache.helix.api.State;
import org.apache.helix.api.id.ParticipantId;
import org.apache.helix.api.id.PartitionId;
+import org.apache.helix.controller.rebalancer.HelixRebalancer;
import org.apache.helix.controller.rebalancer.context.PartitionedRebalancerContext;
-import org.apache.helix.controller.rebalancer.context.Rebalancer;
import org.apache.helix.controller.rebalancer.context.RebalancerConfig;
import org.apache.helix.controller.stages.ResourceCurrentState;
import org.apache.helix.manager.zk.ZKHelixDataAccessor;
@@ -58,7 +58,7 @@ public class TestCustomizedIdealStateRebalancer extends
static boolean testRebalancerCreated = false;
static boolean testRebalancerInvoked = false;
- public static class TestRebalancer implements Rebalancer {
+ public static class TestRebalancer implements HelixRebalancer {
/**
* Very basic mapping that evenly assigns one replica of each partition to live nodes, each of