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 889a9b8b06b6f732392f1f8dc80b7aff25f8e1e3 Author: Hunter Lee <[email protected]> AuthorDate: Thu Feb 20 10:09:22 2020 -0800 Create metadata-store-directory-common module (#771) metadata-store-directory-common module was created to avoid circular dependency because the RoutingData classes will be used in zookeeper-api. --- helix-rest/pom.xml | 5 + .../metadatastore/ZkMetadataStoreDirectory.java | 7 +- .../accessor/MetadataStoreRoutingDataReader.java | 7 +- .../accessor/ZkRoutingDataReader.java | 9 +- .../accessor/ZkRoutingDataWriter.java | 2 +- .../resources/helix/PropertyStoreAccessor.java | 5 +- .../MetadataStoreDirectoryAccessor.java | 4 +- .../resources/zookeeper/ZooKeeperAccessor.java | 2 +- .../TestZkMetadataStoreDirectory.java | 4 +- .../accessor/TestZkRoutingDataReader.java | 4 +- .../accessor/TestZkRoutingDataWriter.java | 2 +- .../TestMetadataStoreDirectoryAccessor.java | 23 +- metadata-store-directory-common/LICENSE | 273 +++++++++++++++++++++ metadata-store-directory-common/NOTICE | 37 +++ ...adata-store-directory-common-0.9.2-SNAPSHOT.ivy | 54 ++++ metadata-store-directory-common/pom.xml | 124 ++++++++++ .../src/assemble/assembly.xml | 60 +++++ .../src/main/config/log4j.properties | 32 +++ .../msdcommon/callback}/RoutingDataListener.java | 2 +- .../constant/MetadataStoreRoutingConstants.java | 2 +- .../datamodel}/MetadataStoreRoutingData.java | 4 +- .../msdcommon/datamodel}/TrieRoutingData.java | 14 +- .../exception}/InvalidRoutingDataException.java | 2 +- .../helix/msdcommon}/util/ZkValidationUtil.java | 2 +- .../src/test/conf/testng.xml | 27 ++ .../msdcommon/datamodel}/TestTrieRoutingData.java | 6 +- .../src/test/resources/log4j.properties | 41 ++++ pom.xml | 1 + 28 files changed, 711 insertions(+), 44 deletions(-) diff --git a/helix-rest/pom.xml b/helix-rest/pom.xml index e3421d5..018d1dd 100644 --- a/helix-rest/pom.xml +++ b/helix-rest/pom.xml @@ -45,6 +45,11 @@ under the License. <dependencies> <dependency> + <groupId>org.apache.helix</groupId> + <artifactId>metadata-store-directory-common</artifactId> + <version>0.9.2-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> <version>1.17</version> diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/ZkMetadataStoreDirectory.java b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/ZkMetadataStoreDirectory.java index a57e08c..7e972ab 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/ZkMetadataStoreDirectory.java +++ b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/ZkMetadataStoreDirectory.java @@ -29,11 +29,14 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.apache.helix.msdcommon.callback.RoutingDataListener; +import org.apache.helix.msdcommon.datamodel.MetadataStoreRoutingData; +import org.apache.helix.msdcommon.datamodel.TrieRoutingData; +import org.apache.helix.msdcommon.exception.InvalidRoutingDataException; import org.apache.helix.rest.metadatastore.accessor.MetadataStoreRoutingDataReader; import org.apache.helix.rest.metadatastore.accessor.MetadataStoreRoutingDataWriter; import org.apache.helix.rest.metadatastore.accessor.ZkRoutingDataReader; import org.apache.helix.rest.metadatastore.accessor.ZkRoutingDataWriter; -import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -226,4 +229,4 @@ public class ZkMetadataStoreDirectory implements MetadataStoreDirectory, Routing _routingDataReaderMap.values().forEach(MetadataStoreRoutingDataReader::close); _routingDataWriterMap.values().forEach(MetadataStoreRoutingDataWriter::close); } -} +} \ No newline at end of file diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/MetadataStoreRoutingDataReader.java b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/MetadataStoreRoutingDataReader.java index f19e8ff..b56716e 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/MetadataStoreRoutingDataReader.java +++ b/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/accessor/MetadataStoreRoutingDataReader.java @@ -21,7 +21,9 @@ package org.apache.helix.rest.metadatastore.accessor; import java.util.List; import java.util.Map; -import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; + +import org.apache.helix.msdcommon.exception.InvalidRoutingDataException; + /** * An interface for a DAO that fetches routing data from a source and return a key-value mapping @@ -38,7 +40,8 @@ public interface MetadataStoreRoutingDataReader { * @throws InvalidRoutingDataException - when the routing data is malformed in any way that * disallows a meaningful mapping to be returned */ - Map<String, List<String>> getRoutingData() throws InvalidRoutingDataException; + Map<String, List<String>> getRoutingData() + throws InvalidRoutingDataException; /** * Closes any stateful resources such as connections or threads. 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 44ce110..12de9e2 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,9 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -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.msdcommon.callback.RoutingDataListener; +import org.apache.helix.msdcommon.constant.MetadataStoreRoutingConstants; +import org.apache.helix.msdcommon.exception.InvalidRoutingDataException; import org.apache.helix.zookeeper.api.client.HelixZkClient; import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; @@ -75,7 +75,8 @@ public class ZkRoutingDataReader implements MetadataStoreRoutingDataReader, IZkD * @throws InvalidRoutingDataException - when the node on * MetadataStoreRoutingConstants.ROUTING_DATA_PATH is missing */ - public Map<String, List<String>> getRoutingData() throws InvalidRoutingDataException { + public Map<String, List<String>> getRoutingData() + throws InvalidRoutingDataException { Map<String, List<String>> routingData = new HashMap<>(); List<String> allRealmAddresses; try { 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 c8da80e..48aeb13 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,8 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.helix.msdcommon.constant.MetadataStoreRoutingConstants; 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; diff --git a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/PropertyStoreAccessor.java b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/PropertyStoreAccessor.java index e50d67e..11226e5 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/PropertyStoreAccessor.java +++ b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/PropertyStoreAccessor.java @@ -27,11 +27,10 @@ import javax.ws.rs.core.Response; import org.apache.helix.AccessOption; import org.apache.helix.PropertyPathBuilder; -import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.helix.manager.zk.ZNRecordSerializer; import org.apache.helix.manager.zk.ZkBaseDataAccessor; -import org.apache.helix.rest.server.resources.zookeeper.ZooKeeperAccessor; -import org.apache.helix.zookeeper.util.ZkValidationUtil; +import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.msdcommon.util.ZkValidationUtil; import org.codehaus.jackson.node.ObjectNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/metadatastore/MetadataStoreDirectoryAccessor.java b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/metadatastore/MetadataStoreDirectoryAccessor.java index e731b28..5d84d8a 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/metadatastore/MetadataStoreDirectoryAccessor.java +++ b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/metadatastore/MetadataStoreDirectoryAccessor.java @@ -34,13 +34,13 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; +import org.apache.helix.msdcommon.constant.MetadataStoreRoutingConstants; +import org.apache.helix.msdcommon.exception.InvalidRoutingDataException; import org.apache.helix.rest.common.ContextPropertyKeys; import org.apache.helix.rest.common.HelixRestNamespace; import org.apache.helix.rest.common.HelixRestUtils; import org.apache.helix.rest.metadatastore.MetadataStoreDirectory; import org.apache.helix.rest.metadatastore.ZkMetadataStoreDirectory; -import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; -import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; import org.apache.helix.rest.server.resources.AbstractResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/zookeeper/ZooKeeperAccessor.java b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/zookeeper/ZooKeeperAccessor.java index bc2da05..7b30482 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/zookeeper/ZooKeeperAccessor.java +++ b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/zookeeper/ZooKeeperAccessor.java @@ -35,7 +35,7 @@ import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.rest.common.ContextPropertyKeys; import org.apache.helix.rest.server.ServerContext; import org.apache.helix.rest.server.resources.AbstractResource; -import org.apache.helix.zookeeper.util.ZkValidationUtil; +import org.apache.helix.msdcommon.util.ZkValidationUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 68b93b3..604d331 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 @@ -30,8 +30,8 @@ import java.util.NoSuchElementException; import java.util.Set; import org.apache.helix.TestHelper; -import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; -import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; +import org.apache.helix.msdcommon.constant.MetadataStoreRoutingConstants; +import org.apache.helix.msdcommon.exception.InvalidRoutingDataException; import org.apache.helix.rest.server.AbstractTestClass; import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; 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 c188840..63a013b 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 @@ -26,8 +26,8 @@ import java.util.Map; import org.apache.helix.AccessOption; import org.apache.helix.TestHelper; -import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; -import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; +import org.apache.helix.msdcommon.constant.MetadataStoreRoutingConstants; +import org.apache.helix.msdcommon.exception.InvalidRoutingDataException; import org.apache.helix.rest.server.AbstractTestClass; import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.testng.Assert; 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 29b7e36..8b7224c 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,7 +25,7 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; import org.apache.helix.AccessOption; -import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; +import org.apache.helix.msdcommon.constant.MetadataStoreRoutingConstants; import org.apache.helix.rest.server.AbstractTestClass; import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.junit.Assert; diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/resources/zookeeper/TestMetadataStoreDirectoryAccessor.java b/helix-rest/src/test/java/org/apache/helix/rest/server/TestMetadataStoreDirectoryAccessor.java similarity index 96% rename from helix-rest/src/test/java/org/apache/helix/rest/server/resources/zookeeper/TestMetadataStoreDirectoryAccessor.java rename to helix-rest/src/test/java/org/apache/helix/rest/server/TestMetadataStoreDirectoryAccessor.java index c08d845..02b3915 100644 --- a/helix-rest/src/test/java/org/apache/helix/rest/server/resources/zookeeper/TestMetadataStoreDirectoryAccessor.java +++ b/helix-rest/src/test/java/org/apache/helix/rest/server/TestMetadataStoreDirectoryAccessor.java @@ -1,4 +1,4 @@ -package org.apache.helix.rest.server.resources.zookeeper; +package org.apache.helix.rest.server; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -34,11 +34,10 @@ import javax.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.apache.helix.TestHelper; +import org.apache.helix.msdcommon.constant.MetadataStoreRoutingConstants; import org.apache.helix.rest.common.HelixRestNamespace; import org.apache.helix.rest.metadatastore.MetadataStoreDirectory; import org.apache.helix.rest.metadatastore.ZkMetadataStoreDirectory; -import org.apache.helix.rest.metadatastore.constant.MetadataStoreRoutingConstants; -import org.apache.helix.rest.server.AbstractTestClass; import org.apache.helix.rest.server.util.JerseyUriRequestBuilder; import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer; @@ -69,7 +68,8 @@ public class TestMetadataStoreDirectoryAccessor extends AbstractTestClass { private MetadataStoreDirectory _metadataStoreDirectory; @BeforeClass - public void beforeClass() throws Exception { + public void beforeClass() + throws Exception { _zkList = new ArrayList<>(ZK_SERVER_MAP.keySet()); deleteRoutingDataPath(); @@ -111,7 +111,8 @@ public class TestMetadataStoreDirectoryAccessor extends AbstractTestClass { } @Test - public void testGetAllMetadataStoreRealms() throws IOException { + public void testGetAllMetadataStoreRealms() + throws IOException { get(NON_EXISTING_NAMESPACE_URI_PREFIX + "metadata-store-realms", null, Response.Status.NOT_FOUND.getStatusCode(), false); @@ -189,7 +190,8 @@ public class TestMetadataStoreDirectoryAccessor extends AbstractTestClass { * Tests REST endpoints: "/sharding-keys" */ @Test - public void testGetShardingKeysInNamespace() throws IOException { + public void testGetShardingKeysInNamespace() + throws IOException { get(NON_EXISTING_NAMESPACE_URI_PREFIX + "sharding-keys", null, Response.Status.NOT_FOUND.getStatusCode(), true); @@ -217,7 +219,8 @@ public class TestMetadataStoreDirectoryAccessor extends AbstractTestClass { * Tests REST endpoint: "/sharding-keys?realm={realmName}" */ @Test - public void testGetShardingKeysInRealm() throws IOException { + public void testGetShardingKeysInRealm() + throws IOException { // Test NOT_FOUND response for a non existed realm. new JerseyUriRequestBuilder(TEST_NAMESPACE_URI_PREFIX + "/sharding-keys?realm=nonExistedRealm") .expectedReturnStatusCode(Response.Status.NOT_FOUND.getStatusCode()).get(this); @@ -301,12 +304,14 @@ public class TestMetadataStoreDirectoryAccessor extends AbstractTestClass { } @AfterClass - public void afterClass() throws Exception { + public void afterClass() + throws Exception { _metadataStoreDirectory.close(); deleteRoutingDataPath(); } - private void deleteRoutingDataPath() throws Exception { + private void deleteRoutingDataPath() + throws Exception { Assert.assertTrue(TestHelper.verify(() -> { _zkList.forEach(zk -> ZK_SERVER_MAP.get(zk).getZkClient() .deleteRecursively(MetadataStoreRoutingConstants.ROUTING_DATA_PATH)); diff --git a/metadata-store-directory-common/LICENSE b/metadata-store-directory-common/LICENSE new file mode 100644 index 0000000..413913f --- /dev/null +++ b/metadata-store-directory-common/LICENSE @@ -0,0 +1,273 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +For xstream: + +Copyright (c) 2003-2006, Joe Walnes +Copyright (c) 2006-2009, 2011 XStream Committers +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of +conditions and the following disclaimer in the documentation and/or other materials provided +with the distribution. + +3. Neither the name of XStream nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +for jline: + +Copyright (c) 2002-2006, Marc Prud'hommeaux <[email protected]> +All rights reserved. + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met: + +Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with +the distribution. + +Neither the name of JLine nor the names of its contributors +may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + + + diff --git a/metadata-store-directory-common/NOTICE b/metadata-store-directory-common/NOTICE new file mode 100644 index 0000000..9dc340b --- /dev/null +++ b/metadata-store-directory-common/NOTICE @@ -0,0 +1,37 @@ +Apache Helix +Copyright 2014 The Apache Software Foundation + + +I. Included Software + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +Licensed under the Apache License 2.0. + +This product includes software developed at +Codehaus (http://www.codehaus.org/). +Licensed under the BSD License. + +This product includes software developed at +jline (http://jline.sourceforge.net/). +Licensed under the BSD License. + +This product includes software developed at +restlet (http://www.restlet.org/about/legal). +Licensed under the Apache License 2.0. + +This product includes software developed at +Google (http://www.google.com/). +Licensed under the Apache License 2.0. + +This product includes software developed at +snakeyaml (http://www.snakeyaml.org/). +Licensed under the Apache License 2.0. + +This product includes software developed at +zkclient (https://github.com/sgroschupf/zkclient). +Licensed under the Apache License 2.0. + +II. License Summary +- Apache License 2.0 +- BSD License diff --git a/metadata-store-directory-common/metadata-store-directory-common-0.9.2-SNAPSHOT.ivy b/metadata-store-directory-common/metadata-store-directory-common-0.9.2-SNAPSHOT.ivy new file mode 100644 index 0000000..a8fd16d --- /dev/null +++ b/metadata-store-directory-common/metadata-store-directory-common-0.9.2-SNAPSHOT.ivy @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<ivy-module version="1.0"> + <info organisation="org.apache.helix" + module="metadata-store-directory-common" + revision="0.9.2-SNAPSHOT" + status="integration" + publication="20170128141623" + /> + <configurations> + <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/> + <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/> + <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/> + <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/> + <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/> + <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/> + <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/> + </configurations> + <publications> + <artifact name="metadata-store-directory-common" type="jar" ext="jar" conf="master"/> + </publications> + <dependencies> + <dependency org="org.slf4j" name="slf4j-api" rev="1.7.25" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"> + <artifact name="slf4j-api" ext="jar"/> + </dependency> + <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"> + <artifact name="slf4j-log4j12" ext="jar"/> + </dependency> + <dependency org="org.yaml" name="snakeyaml" rev="1.17"> + <artifact name="snakeyaml" m:classifier="sources" ext="jar"/> + </dependency> + <dependency org="org.apache.helix" name="helix-core" rev="0.9.2-SNAPSHOT" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> + <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.10.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> + <dependency org="commons-cli" name="commons-cli" rev="1.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> + <dependency org="commons-io" name="commons-io" rev="1.4" conf="compile->compile(default);runtime->runtime(default);default->default"/> + </dependencies> +</ivy-module> diff --git a/metadata-store-directory-common/pom.xml b/metadata-store-directory-common/pom.xml new file mode 100644 index 0000000..cc81a33 --- /dev/null +++ b/metadata-store-directory-common/pom.xml @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <groupId>org.apache.helix</groupId> + <artifactId>helix</artifactId> + <version>0.9.2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>metadata-store-directory-common</artifactId> + <packaging>bundle</packaging> + <name>Apache Helix :: Metadata Store Directory Common</name> + + <properties> + <osgi.import> + org.apache.commons.cli*, + org.apache.commons.io*;version="[1.4,2)", + org.slf4j*;version="[1.6,2)", + * + </osgi.import> + <osgi.export>org.apache.helix.msdcommon*;version="${project.version};-noimport:=true + </osgi.export> + </properties> + + <dependencies> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.10.2</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.25</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.7.14</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>20.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.17</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>${basedir}</directory> + <includes> + <include>DISCLAIMER</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/assemble/assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/metadata-store-directory-common/src/assemble/assembly.xml b/metadata-store-directory-common/src/assemble/assembly.xml new file mode 100644 index 0000000..3e17941 --- /dev/null +++ b/metadata-store-directory-common/src/assemble/assembly.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<assembly> + <id>pkg</id> + <formats> + <format>tar</format> + </formats> + <fileSets> + <fileSet> + <directory>target/metadata-store-directory-common-pkg/bin</directory> + <outputDirectory>bin</outputDirectory> + <lineEnding>unix</lineEnding> + <fileMode>0755</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <directory>target/metadata-store-directory-common-pkg/repo/</directory> + <outputDirectory>repo</outputDirectory> + <fileMode>0755</fileMode> + <directoryMode>0755</directoryMode> + <excludes> + <exclude>**/*.xml</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>target/metadata-store-directory-common-pkg/conf</directory> + <outputDirectory>conf</outputDirectory> + <lineEnding>unix</lineEnding> + <fileMode>0755</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <directory>${project.basedir}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>LICENSE</include> + <include>NOTICE</include> + <include>DISCLAIMER</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + </fileSets> +</assembly> diff --git a/metadata-store-directory-common/src/main/config/log4j.properties b/metadata-store-directory-common/src/main/config/log4j.properties new file mode 100644 index 0000000..375c7ba --- /dev/null +++ b/metadata-store-directory-common/src/main/config/log4j.properties @@ -0,0 +1,32 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=WARN,A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n + +log4j.logger.org.I0Itec=ERROR +log4j.logger.org.apache.zookeeper=ERROR +log4j.logger.org.apache.helix=INFO diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/RoutingDataListener.java b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/callback/RoutingDataListener.java similarity index 95% rename from helix-rest/src/main/java/org/apache/helix/rest/metadatastore/RoutingDataListener.java rename to metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/callback/RoutingDataListener.java index a44fc17..dc87f7e 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/RoutingDataListener.java +++ b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/callback/RoutingDataListener.java @@ -1,4 +1,4 @@ -package org.apache.helix.rest.metadatastore; +package org.apache.helix.msdcommon.callback; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/constant/MetadataStoreRoutingConstants.java b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/constant/MetadataStoreRoutingConstants.java similarity index 96% rename from helix-rest/src/main/java/org/apache/helix/rest/metadatastore/constant/MetadataStoreRoutingConstants.java rename to metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/constant/MetadataStoreRoutingConstants.java index 846aa30..009e7f3 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/constant/MetadataStoreRoutingConstants.java +++ b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/constant/MetadataStoreRoutingConstants.java @@ -1,4 +1,4 @@ -package org.apache.helix.rest.metadatastore.constant; +package org.apache.helix.msdcommon.constant; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/MetadataStoreRoutingData.java b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/datamodel/MetadataStoreRoutingData.java similarity index 98% rename from helix-rest/src/main/java/org/apache/helix/rest/metadatastore/MetadataStoreRoutingData.java rename to metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/datamodel/MetadataStoreRoutingData.java index 3bd9baa..2bab8c7 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/MetadataStoreRoutingData.java +++ b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/datamodel/MetadataStoreRoutingData.java @@ -1,4 +1,4 @@ -package org.apache.helix.rest.metadatastore; +package org.apache.helix.msdcommon.datamodel; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -64,4 +64,4 @@ public interface MetadataStoreRoutingData { * @return true if the sharding key and realm address pair exist in the routing data */ boolean containsKeyRealmPair(String shardingKey, String realmAddress); -} +} \ No newline at end of file diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/TrieRoutingData.java b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/datamodel/TrieRoutingData.java similarity index 97% rename from helix-rest/src/main/java/org/apache/helix/rest/metadatastore/TrieRoutingData.java rename to metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/datamodel/TrieRoutingData.java index f82b718..7a05089 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/TrieRoutingData.java +++ b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/datamodel/TrieRoutingData.java @@ -1,4 +1,4 @@ -package org.apache.helix.rest.metadatastore; +package org.apache.helix.msdcommon.datamodel; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; -import org.apache.helix.zookeeper.util.ZkValidationUtil; +import org.apache.helix.msdcommon.exception.InvalidRoutingDataException; +import org.apache.helix.msdcommon.util.ZkValidationUtil; /** @@ -42,7 +42,8 @@ public class TrieRoutingData implements MetadataStoreRoutingData { private final TrieNode _rootNode; - public TrieRoutingData(Map<String, List<String>> routingData) throws InvalidRoutingDataException { + public TrieRoutingData(Map<String, List<String>> routingData) + throws InvalidRoutingDataException { if (routingData == null || routingData.isEmpty()) { throw new InvalidRoutingDataException("routingData cannot be null or empty"); } @@ -56,7 +57,8 @@ public class TrieRoutingData implements MetadataStoreRoutingData { } } - public Map<String, String> getAllMappingUnderPath(String path) throws IllegalArgumentException { + public Map<String, String> getAllMappingUnderPath(String path) + throws IllegalArgumentException { if (!ZkValidationUtil.isPathValid(path)) { throw new IllegalArgumentException("Provided path is not a valid Zookeeper path: " + path); } @@ -289,4 +291,4 @@ public class TrieRoutingData implements MetadataStoreRoutingData { _children.put(key, node); } } -} +} \ No newline at end of file diff --git a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/exceptions/InvalidRoutingDataException.java b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/exception/InvalidRoutingDataException.java similarity index 95% rename from helix-rest/src/main/java/org/apache/helix/rest/metadatastore/exceptions/InvalidRoutingDataException.java rename to metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/exception/InvalidRoutingDataException.java index 267aadc..9a361b9 100644 --- a/helix-rest/src/main/java/org/apache/helix/rest/metadatastore/exceptions/InvalidRoutingDataException.java +++ b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/exception/InvalidRoutingDataException.java @@ -1,4 +1,4 @@ -package org.apache.helix.rest.metadatastore.exceptions; +package org.apache.helix.msdcommon.exception; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/util/ZkValidationUtil.java b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/util/ZkValidationUtil.java similarity index 96% rename from zookeeper-api/src/main/java/org/apache/helix/zookeeper/util/ZkValidationUtil.java rename to metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/util/ZkValidationUtil.java index 59070ac..472b3d9 100644 --- a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/util/ZkValidationUtil.java +++ b/metadata-store-directory-common/src/main/java/org/apache/helix/msdcommon/util/ZkValidationUtil.java @@ -1,4 +1,4 @@ -package org.apache.helix.zookeeper.util; +package org.apache.helix.msdcommon.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/metadata-store-directory-common/src/test/conf/testng.xml b/metadata-store-directory-common/src/test/conf/testng.xml new file mode 100644 index 0000000..2ee64fa --- /dev/null +++ b/metadata-store-directory-common/src/test/conf/testng.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd";> +<suite name="Suite" parallel="false"> + <test name="Test" preserve-order="true"> + <packages> + <package name="org.apache.helix.msdcommon.*"/> + </packages> + </test> +</suite> diff --git a/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/TestTrieRoutingData.java b/metadata-store-directory-common/src/test/java/org/apache/helix/msdcommon/datamodel/TestTrieRoutingData.java similarity index 98% rename from helix-rest/src/test/java/org/apache/helix/rest/metadatastore/TestTrieRoutingData.java rename to metadata-store-directory-common/src/test/java/org/apache/helix/msdcommon/datamodel/TestTrieRoutingData.java index dedde19..bad10a4 100644 --- a/helix-rest/src/test/java/org/apache/helix/rest/metadatastore/TestTrieRoutingData.java +++ b/metadata-store-directory-common/src/test/java/org/apache/helix/msdcommon/datamodel/TestTrieRoutingData.java @@ -1,4 +1,4 @@ -package org.apache.helix.rest.metadatastore; +package org.apache.helix.msdcommon.datamodel; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.helix.rest.metadatastore.exceptions.InvalidRoutingDataException; +import org.apache.helix.msdcommon.exception.InvalidRoutingDataException; import org.testng.Assert; import org.testng.annotations.Test; @@ -304,4 +304,4 @@ public class TestTrieRoutingData { public void testContainsKeyRealmPairNoRealm() { Assert.assertFalse(_trie.containsKeyRealmPair("/h/i", "realmAddress0")); } -} +} \ No newline at end of file diff --git a/metadata-store-directory-common/src/test/resources/log4j.properties b/metadata-store-directory-common/src/test/resources/log4j.properties new file mode 100644 index 0000000..24b6d10 --- /dev/null +++ b/metadata-store-directory-common/src/test/resources/log4j.properties @@ -0,0 +1,41 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# Set root logger level to DEBUG and its only appender to R. +log4j.rootLogger=ERROR, C + +# A1 is set to be a ConsoleAppender. +log4j.appender.C=org.apache.log4j.ConsoleAppender +log4j.appender.C.layout=org.apache.log4j.PatternLayout +log4j.appender.C.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n + +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%5p [%C:%M] (%F:%L) - %m%n +log4j.appender.R.File=target/ClusterManagerLogs/log.txt + +log4j.appender.STATUSDUMP=org.apache.log4j.RollingFileAppender +log4j.appender.STATUSDUMP.layout=org.apache.log4j.SimpleLayout +log4j.appender.STATUSDUMP.File=target/ClusterManagerLogs/statusUpdates.log + +log4j.logger.org.I0Itec=ERROR +log4j.logger.org.apache=ERROR +log4j.logger.com.noelios=ERROR +log4j.logger.org.restlet=ERROR + +log4j.logger.org.apache.helix.monitoring.ZKPathDataDumpTask=ERROR,STATUSDUMP diff --git a/pom.xml b/pom.xml index 6a51c9c..1681850 100644 --- a/pom.xml +++ b/pom.xml @@ -247,6 +247,7 @@ under the License. </developers> <modules> <module>metrics-common</module> + <module>metadata-store-directory-common</module> <module>zookeeper-api</module> <module>helix-common</module> <module>helix-core</module>
