This is an automated email from the ASF dual-hosted git repository. hulee pushed a commit to branch zooscalability in repository https://gitbox.apache.org/repos/asf/helix.git
commit bc67f8bfaa8338d522e8ec8221d9de1cfd8a9b8a Author: Hunter Lee <[email protected]> AuthorDate: Tue Feb 11 18:48:46 2020 -0800 Rebase ZooScalability from upstream master --- .../metadatastore/accessor/ZkRoutingDataReader.java | 18 +++++++++--------- .../metadatastore/accessor/ZkRoutingDataWriter.java | 15 +++++++-------- .../concurrency/ZkDistributedLeaderElection.java | 12 ++++++------ .../metadatastore/TestZkMetadataStoreDirectory.java | 4 ++-- .../accessor/TestZkRoutingDataReader.java | 2 +- .../accessor/TestZkRoutingDataWriter.java | 2 +- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/ZkRoutingDataReader.java b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/ZkRoutingDataReader.java index ea8c290..9decf23 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/ZkRoutingDataReader.java +++ b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/ZkRoutingDataReader.java @@ -23,17 +23,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.I0Itec.zkclient.IZkChildListener; -import org.I0Itec.zkclient.IZkDataListener; -import org.I0Itec.zkclient.exception.ZkNoNodeException; -import org.apache.helix.ZNRecord; -import org.apache.helix.manager.zk.ZNRecordSerializer; -import org.apache.helix.manager.zk.client.DedicatedZkClientFactory; -import org.apache.helix.manager.zk.client.HelixZkClient; -import org.apache.helix.manager.zk.zookeeper.IZkStateListener; import org.apache.helix.rest.metadatastore.RoutingDataListener; import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; +import org.apache.helix.zookeeper.api.client.HelixZkClient; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; +import org.apache.helix.zookeeper.impl.factory.DedicatedZkClientFactory; +import org.apache.helix.zookeeper.zkclient.IZkChildListener; +import org.apache.helix.zookeeper.zkclient.IZkDataListener; +import org.apache.helix.zookeeper.zkclient.IZkStateListener; +import org.apache.helix.zookeeper.zkclient.exception.ZkNoNodeException; import org.apache.zookeeper.Watcher; @@ -71,7 +71,7 @@ public class ZkRoutingDataReader implements MetadataStoreRoutingDataReader, IZkD /** * Returns (realm, list of ZK path sharding keys) mappings. - * @return + * @return Map <realm, list of ZK path sharding keys> * @throws InvalidRoutingDataException */ public Map<String, List<String>> getRoutingData() diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/ZkRoutingDataWriter.java b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/ZkRoutingDataWriter.java index 3e43202..c8da80e 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/ZkRoutingDataWriter.java +++ b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/ZkRoutingDataWriter.java @@ -23,20 +23,19 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.I0Itec.zkclient.exception.ZkNodeExistsException; -import org.apache.helix.ZNRecord; -import org.apache.helix.manager.zk.ZNRecordSerializer; -import org.apache.helix.manager.zk.ZkBaseDataAccessor; -import org.apache.helix.manager.zk.client.DedicatedZkClientFactory; -import org.apache.helix.manager.zk.client.HelixZkClient; import org.apache.helix.rest.metadatastore.concurrency.ZkDistributedLeaderElection; import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; +import org.apache.helix.zookeeper.api.client.HelixZkClient; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; +import org.apache.helix.zookeeper.impl.factory.DedicatedZkClientFactory; +import org.apache.helix.zookeeper.zkclient.exception.ZkNodeExistsException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ZkRoutingDataWriter implements MetadataStoreRoutingDataWriter { - private static final Logger LOG = LoggerFactory.getLogger(ZkBaseDataAccessor.class); + private static final Logger LOG = LoggerFactory.getLogger(ZkRoutingDataWriter.class); private final String _namespace; private final HelixZkClient _zkClient; @@ -244,7 +243,7 @@ public class ZkRoutingDataWriter implements MetadataStoreRoutingDataWriter { _zkClient.writeData(MetadataStoreRoutingConstants.ROUTING_DATA_PATH + "/" + realm, new ZNRecord(realm)); } catch (Exception e) { - LOG.error("Failed to create ZkRealm: {}, Namespace: ", realm, _namespace); + LOG.error("Failed to create ZkRealm: {}, Namespace: {}", realm, _namespace, e); return false; } diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/concurrency/ZkDistributedLeaderElection.java b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/concurrency/ZkDistributedLeaderElection.java index c9b6bb2..330611f 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/concurrency/ZkDistributedLeaderElection.java +++ b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/concurrency/ZkDistributedLeaderElection.java @@ -22,12 +22,12 @@ package org.apache.helix.rest.metadatastore.concurrency; import java.util.Collections; import java.util.List; -import org.I0Itec.zkclient.IZkDataListener; -import org.I0Itec.zkclient.exception.ZkNodeExistsException; -import org.apache.helix.ZNRecord; -import org.apache.helix.manager.zk.ZNRecordSerializer; -import org.apache.helix.manager.zk.client.HelixZkClient; -import org.apache.helix.manager.zk.zookeeper.IZkStateListener; +import org.apache.helix.zookeeper.api.client.HelixZkClient; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; +import org.apache.helix.zookeeper.zkclient.IZkDataListener; +import org.apache.helix.zookeeper.zkclient.IZkStateListener; +import org.apache.helix.zookeeper.zkclient.exception.ZkNodeExistsException; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.Watcher; import org.slf4j.Logger; diff --git a/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/TestZkMetadataStoreDirectory.java b/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/TestZkMetadataStoreDirectory.java index 7b0a4f0..c0741ee 100644 --- a/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/TestZkMetadataStoreDirectory.java +++ b/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/TestZkMetadataStoreDirectory.java @@ -29,11 +29,11 @@ import java.util.NoSuchElementException; import java.util.Set; import org.apache.helix.TestHelper; -import org.apache.helix.ZNRecord; -import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; import org.apache.helix.rest.server.AbstractTestClass; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataReader.java b/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataReader.java index 77eb5eb..aa46429 100644 --- a/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataReader.java +++ b/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataReader.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Map; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; import org.apache.helix.rest.server.AbstractTestClass; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; diff --git a/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataWriter.java b/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataWriter.java index 441bf65..29b7e36 100644 --- a/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataWriter.java +++ b/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/accessor/TestZkRoutingDataWriter.java @@ -25,9 +25,9 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; import org.apache.helix.AccessOption; -import org.apache.helix.ZNRecord; import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; import org.apache.helix.rest.server.AbstractTestClass; +import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.junit.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass;
