helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Date Thu, 21 Mar 2013 23:19:17 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Conflicts:
	helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/72559b15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/72559b15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/72559b15

Branch: refs/heads/master
Commit: 72559b152d38509bd1b40fd0e52c888b59a7ef22
Parents: 9655133 4d7703f
Author: slu2011 <lushi04@gmail.com>
Authored: Thu Mar 21 16:18:47 2013 -0700
Committer: slu2011 <lushi04@gmail.com>
Committed: Thu Mar 21 16:18:47 2013 -0700

----------------------------------------------------------------------
 .../helix/webapp/resources/ConfigResource.java     |    6 +-
 .../main/java/org/apache/helix/ConfigAccessor.java |   14 +-
 .../main/java/org/apache/helix/ConfigScope.java    |  149 -----------
 .../java/org/apache/helix/ConfigScopeBuilder.java  |  137 ----------
 .../src/main/java/org/apache/helix/HelixAdmin.java |    7 +-
 .../java/org/apache/helix/HelixDataAccessor.java   |   17 +-
 .../main/java/org/apache/helix/HelixManager.java   |    2 +-
 .../main/java/org/apache/helix/PropertyKey.java    |    6 +-
 .../helix/controller/GenericHelixController.java   |    6 -
 .../stages/ExternalViewComputeStage.java           |   25 ++-
 .../healthcheck/HealthStatsAggregationTask.java    |    4 +-
 .../helix/josql/ClusterJosqlQueryProcessor.java    |    2 +-
 .../org/apache/helix/manager/zk/ZKHelixAdmin.java  |    4 +-
 .../apache/helix/manager/zk/ZKHelixManager.java    |   35 +---
 .../java/org/apache/helix/manager/zk/ZKUtil.java   |   42 +++-
 .../helix/messaging/DefaultMessagingService.java   |    4 +-
 .../messaging/handling/HelixTaskExecutor.java      |    9 +-
 .../java/org/apache/helix/model/ConfigScope.java   |  155 +++++++++++
 .../java/org/apache/helix/model/IdealState.java    |   30 --
 .../apache/helix/model/StateModelDefinition.java   |    2 +-
 .../helix/model/builder/AutoModeISBuilder.java     |   50 ++++
 .../model/builder/AutoRebalanceModeISBuilder.java  |   49 ++++
 .../helix/model/builder/ConfigScopeBuilder.java    |  138 ++++++++++
 .../helix/model/builder/CustomModeISBuilder.java   |   66 +++++
 .../helix/model/builder/IdealStateBuilder.java     |  167 ++++++++++++
 .../model/builder/StateTransitionTableBuilder.java |  205 +++++++++++++++
 .../statemachine/StateTransitionTableBuilder.java  |  204 --------------
 .../java/org/apache/helix/tools/ClusterSetup.java  |   11 +-
 .../helix/tools/StateModelConfigGenerator.java     |    2 +-
 .../src/test/java/org/apache/helix/Mocks.java      |   24 +--
 .../java/org/apache/helix/TestConfigAccessor.java  |  131 +++++++---
 .../src/test/java/org/apache/helix/TestHelper.java |    6 +-
 .../org/apache/helix/TestListenerCallback.java     |    2 +-
 .../java/org/apache/helix/TestRoutingTable.java    |    9 +-
 .../test/java/org/apache/helix/ZkTestHelper.java   |   42 +++-
 .../test/java/org/apache/helix/ZkUnitTestBase.java |    7 +-
 .../controller/stages/DummyClusterManager.java     |    2 +-
 .../healthcheck/TestAlertActionTriggering.java     |    5 +-
 .../helix/healthcheck/TestAlertFireHistory.java    |    6 +-
 .../apache/helix/integration/TestBatchMessage.java |    2 +-
 .../helix/integration/TestBatchMessageWrapper.java |   19 ++
 .../helix/integration/TestCleanupExternalView.java |  124 +++++++++
 .../helix/integration/ZkIntegrationTestBase.java   |    4 +-
 .../org/apache/helix/manager/zk/TestZKUtil.java    |    5 +-
 .../helix/manager/zk/TestZkClusterManager.java     |    5 +-
 .../apache/helix/manager/zk/TestZkHelixAdmin.java  |    4 +-
 .../handling/TestConfigThreadpoolSize.java         |   13 +-
 .../handling/TestResourceThreadpoolSize.java       |    5 +-
 .../helix/model/builder/TestIdealStateBuilder.java |   90 +++++++
 .../helix/participant/MockZKHelixManager.java      |    3 +-
 .../apache/helix/filestore/IntegrationTest.java    |    4 +-
 51 files changed, 1321 insertions(+), 739 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/72559b15/helix-core/src/main/java/org/apache/helix/HelixManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/72559b15/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/72559b15/helix-core/src/test/java/org/apache/helix/Mocks.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/72559b15/helix-core/src/test/java/org/apache/helix/controller/stages/DummyClusterManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/72559b15/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
----------------------------------------------------------------------
diff --cc helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
index 04a7bdb,511f975..645849a
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
@@@ -26,24 -24,17 +26,23 @@@ import java.util.List
  import java.util.Map;
  
  import org.apache.helix.AccessOption;
- import org.apache.helix.ConfigScope;
- import org.apache.helix.ConfigScopeBuilder;
+ import org.apache.helix.model.ConfigScope;
+ import org.apache.helix.model.builder.ConfigScopeBuilder;
  import org.apache.helix.HelixAdmin;
 +import org.apache.helix.HelixDataAccessor;
  import org.apache.helix.HelixException;
  import org.apache.helix.InstanceType;
 +import org.apache.helix.LiveInstanceInfoProvider;
  import org.apache.helix.PropertyKey.Builder;
  import org.apache.helix.TestHelper;
  import org.apache.helix.ZNRecord;
 +import org.apache.helix.ZkHelixTestManager;
 +import org.apache.helix.ZkTestHelper;
  import org.apache.helix.ZkUnitTestBase;
  import org.apache.helix.manager.MockListener;
 +import org.apache.helix.manager.zk.ZKHelixManager;
 +import org.apache.helix.model.LiveInstance;
  import org.apache.helix.store.zk.ZkHelixPropertyStore;
- import org.apache.helix.tools.ClusterSetup;
  import org.apache.zookeeper.data.Stat;
  import org.testng.Assert;
  import org.testng.AssertJUnit;

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/72559b15/helix-core/src/test/java/org/apache/helix/participant/MockZKHelixManager.java
----------------------------------------------------------------------


Mime
View raw message