This is an automated email from the ASF dual-hosted git repository.
jiajunwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new 7f05db2 Remove unused field in ZKHelixDataAccessor - code clean with
no logic change (#1764)
7f05db2 is described below
commit 7f05db2c1c2be03379d58f86723bc549863deb0a
Author: xyuanlu <[email protected]>
AuthorDate: Tue Jun 1 14:34:51 2021 -0700
Remove unused field in ZKHelixDataAccessor - code clean with no logic
change (#1764)
Remove unused field in ZKHelixDataAccessor.
---
.../org/apache/helix/manager/zk/ZKHelixDataAccessor.java | 13 ++++++-------
.../java/org/apache/helix/manager/zk/ZKHelixManager.java | 2 +-
.../CrushRebalancers/TestCrushAutoRebalanceNonRack.java | 3 +--
.../java/org/apache/helix/mock/MockZkHelixDataAccessor.java | 2 +-
.../java/org/apache/helix/rest/server/ServerContext.java | 3 +--
.../helix/rest/server/service/TestInstanceService.java | 5 ++---
6 files changed, 12 insertions(+), 16 deletions(-)
diff --git
a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixDataAccessor.java
b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixDataAccessor.java
index 203c6c7..3424871 100644
---
a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixDataAccessor.java
+++
b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixDataAccessor.java
@@ -55,27 +55,26 @@ import org.slf4j.LoggerFactory;
public class ZKHelixDataAccessor implements HelixDataAccessor {
private static Logger LOG =
LoggerFactory.getLogger(ZKHelixDataAccessor.class);
private final BaseDataAccessor<ZNRecord> _baseDataAccessor;
- final InstanceType _instanceType;
private final String _clusterName;
private final Builder _propertyKeyBuilder;
private final GroupCommit _groupCommit = new GroupCommit();
public ZKHelixDataAccessor(String clusterName, BaseDataAccessor<ZNRecord>
baseDataAccessor) {
- this(clusterName, null, baseDataAccessor);
+ _clusterName = clusterName;
+ _baseDataAccessor = baseDataAccessor;
+ _propertyKeyBuilder = new PropertyKey.Builder(_clusterName);
}
+ @Deprecated
public ZKHelixDataAccessor(String clusterName, InstanceType instanceType,
BaseDataAccessor<ZNRecord> baseDataAccessor) {
- _clusterName = clusterName;
- _instanceType = instanceType;
- _baseDataAccessor = baseDataAccessor;
- _propertyKeyBuilder = new PropertyKey.Builder(_clusterName);
+ this(clusterName, baseDataAccessor);
+
}
/* Copy constructor */
public ZKHelixDataAccessor(ZKHelixDataAccessor dataAccessor) {
_clusterName = dataAccessor._clusterName;
- _instanceType = dataAccessor._instanceType;
_baseDataAccessor = dataAccessor._baseDataAccessor;
_propertyKeyBuilder = new PropertyKey.Builder(_clusterName);
}
diff --git
a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
index 890547b..ef8e733 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
@@ -743,7 +743,7 @@ public class ZKHelixManager implements HelixManager,
IZkStateListener {
_baseDataAccessor = createBaseDataAccessor();
- _dataAccessor = new ZKHelixDataAccessor(_clusterName, _instanceType,
_baseDataAccessor);
+ _dataAccessor = new ZKHelixDataAccessor(_clusterName, _baseDataAccessor);
_configAccessor = new ConfigAccessor(_zkclient);
if (_instanceType == InstanceType.CONTROLLER
diff --git
a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
index 2b3c91b..3812ec0 100644
---
a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
+++
b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.apache.helix.ConfigAccessor;
import org.apache.helix.HelixDataAccessor;
-import org.apache.helix.InstanceType;
import org.apache.helix.TestHelper;
import
org.apache.helix.controller.rebalancer.strategy.CrushEdRebalanceStrategy;
import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
@@ -272,7 +271,7 @@ public class TestCrushAutoRebalanceNonRack extends
ZkStandAloneCMTestBase {
// shutdown participants, keep only two left
HelixDataAccessor helixDataAccessor =
- new ZKHelixDataAccessor(CLUSTER_NAME, InstanceType.PARTICIPANT,
_baseAccessor);
+ new ZKHelixDataAccessor(CLUSTER_NAME, _baseAccessor);
for (int i = 2; i < _participants.size(); i++) {
MockParticipantManager p = _participants.get(i);
p.syncStop();
diff --git
a/helix-core/src/test/java/org/apache/helix/mock/MockZkHelixDataAccessor.java
b/helix-core/src/test/java/org/apache/helix/mock/MockZkHelixDataAccessor.java
index e1b39f7..638a4f4 100644
---
a/helix-core/src/test/java/org/apache/helix/mock/MockZkHelixDataAccessor.java
+++
b/helix-core/src/test/java/org/apache/helix/mock/MockZkHelixDataAccessor.java
@@ -34,7 +34,7 @@ public class MockZkHelixDataAccessor extends
ZKHelixDataAccessor {
Map<PropertyType, Integer> _readPathCounters = new HashMap<>();
public MockZkHelixDataAccessor(String clusterName,
BaseDataAccessor<ZNRecord> baseDataAccessor) {
- super(clusterName, null, baseDataAccessor);
+ super(clusterName, baseDataAccessor);
}
@Deprecated
diff --git
a/helix-rest/src/main/java/org/apache/helix/rest/server/ServerContext.java
b/helix-rest/src/main/java/org/apache/helix/rest/server/ServerContext.java
index 5babb19..2549fb7 100644
--- a/helix-rest/src/main/java/org/apache/helix/rest/server/ServerContext.java
+++ b/helix-rest/src/main/java/org/apache/helix/rest/server/ServerContext.java
@@ -29,7 +29,6 @@ import org.apache.helix.ConfigAccessor;
import org.apache.helix.HelixAdmin;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.HelixException;
-import org.apache.helix.InstanceType;
import org.apache.helix.SystemPropertyKeys;
import org.apache.helix.manager.zk.ZKHelixAdmin;
import org.apache.helix.manager.zk.ZKHelixDataAccessor;
@@ -255,7 +254,7 @@ public class ServerContext implements IZkDataListener,
IZkChildListener, IZkStat
ZkBaseDataAccessor<ZNRecord> baseDataAccessor =
new ZkBaseDataAccessor<>(getRealmAwareZkClient());
_helixDataAccessorPool.put(clusterName,
- new ZKHelixDataAccessor(clusterName, InstanceType.ADMINISTRATOR,
baseDataAccessor));
+ new ZKHelixDataAccessor(clusterName, baseDataAccessor));
}
dataAccessor = _helixDataAccessorPool.get(clusterName);
}
diff --git
a/helix-rest/src/test/java/org/apache/helix/rest/server/service/TestInstanceService.java
b/helix-rest/src/test/java/org/apache/helix/rest/server/service/TestInstanceService.java
index bb62b13..a03a92f 100644
---
a/helix-rest/src/test/java/org/apache/helix/rest/server/service/TestInstanceService.java
+++
b/helix-rest/src/test/java/org/apache/helix/rest/server/service/TestInstanceService.java
@@ -31,7 +31,6 @@ import com.google.common.collect.ImmutableMap;
import org.apache.helix.AccessOption;
import org.apache.helix.BaseDataAccessor;
import org.apache.helix.ConfigAccessor;
-import org.apache.helix.InstanceType;
import org.apache.helix.manager.zk.ZKHelixDataAccessor;
import org.apache.helix.manager.zk.ZkBaseDataAccessor;
import org.apache.helix.model.ExternalView;
@@ -171,7 +170,7 @@ public class TestInstanceService {
"}";
BaseDataAccessor<ZNRecord> mockAccessor = mock(ZkBaseDataAccessor.class);
ZKHelixDataAccessor zkHelixDataAccessor =
- new ZKHelixDataAccessor(TEST_CLUSTER, InstanceType.ADMINISTRATOR,
mockAccessor);
+ new ZKHelixDataAccessor(TEST_CLUSTER, mockAccessor);
ZNRecord successPartitionReport = new
ZNRecord(HelixDataAccessorWrapper.PARTITION_HEALTH_KEY);
// Instance level check passed
@@ -234,7 +233,7 @@ public class TestInstanceService {
String siblingInstance = "instance0.linkedin.com_1236";
BaseDataAccessor<ZNRecord> mockAccessor = mock(ZkBaseDataAccessor.class);
ZKHelixDataAccessor zkHelixDataAccessor =
- new ZKHelixDataAccessor(TEST_CLUSTER, InstanceType.ADMINISTRATOR,
mockAccessor);
+ new ZKHelixDataAccessor(TEST_CLUSTER, mockAccessor);
when(mockAccessor.getChildNames(zkHelixDataAccessor.keyBuilder().liveInstances().getPath(),
2))
.thenReturn(Arrays.asList(TEST_INSTANCE, siblingInstance));
