fix merge conflicts

benhardy · Jun 27, 2012 · 3fbef94 · 3fbef94
2 parents ba4127c + 366cd06
commit 3fbef94
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 4 deletions.
diff --git a/src/java/voldemort/client/ClientInfo.java b/src/java/voldemort/client/ClientInfo.java
@@ -164,5 +164,4 @@ public String toString() {
         builder.append("releaseVersion[").append(releaseVersion).append("]");
         return builder.toString();
     }
-
 }
diff --git a/src/java/voldemort/client/DefaultStoreClient.java b/src/java/voldemort/client/DefaultStoreClient.java
@@ -73,7 +73,6 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> {
 
     private final Map<String, SystemStore> sysStoreMap;
     private AsyncMetadataVersionManager asyncCheckMetadata;
-
     private ClientInfo clientInfo;
 
     public DefaultStoreClient(String storeName,

diff --git a/src/java/voldemort/client/StoreClientFactory.java b/src/java/voldemort/client/StoreClientFactory.java
@@ -89,8 +89,11 @@ <K, V, T> Store<K, V, T> getRawStore(String storeName,
     /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Adding System store functionality
+=======
+>>>>>>> leigao/client-registry
      * Get the underlying store, not the public StoreClient interface
      * 
      * @param storeName The name of the store
@@ -106,10 +109,13 @@ <K, V, T> Store<K, V, T> getRawStore(String storeName,
 
     /**
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> add clientId for voldemort client
 =======
 >>>>>>> Adding System store functionality
+=======
+>>>>>>> leigao/client-registry
      * Close the store client
      */
     public void close();

diff --git a/src/java/voldemort/server/SystemStoreConstants.java b/src/java/voldemort/server/SystemStoreConstants.java
@@ -0,0 +1,77 @@
+package voldemort.server;
+
+/**
+ * The various system stores
+ */
+public class SystemStoreConstants {
+
+    public static final String NAME_PREFIX = "voldsys$_";
+
+    public static enum SystemStoreName {
+        voldsys$_client_registry,
+        voldsys$_client_store_definition;
+    }
+
+    public static final String SYSTEM_STORE_SCHEMA = "<stores>"
+                                                     + "  <store>"
+                                                     + "    <name>voldsys$_client_registry</name>"
+                                                     + "    <routing-strategy>zone-routing</routing-strategy>"
+                                                     + "    <hinted-handoff-strategy>proximity-handoff</hinted-handoff-strategy>"
+                                                     + "    <persistence>memory</persistence>"
+                                                     + "    <routing>client</routing>"
+                                                     + "    <replication-factor>4</replication-factor>"
+                                                     + "    <zone-replication-factor>"
+                                                     + "      <replication-factor zone-id=\"0\">2</replication-factor>"
+                                                     + "      <replication-factor zone-id=\"1\">2</replication-factor>"
+                                                     + "    </zone-replication-factor>"
+                                                     + "    <required-reads>1</required-reads>"
+                                                     + "    <required-writes>1</required-writes>"
+                                                     + "    <key-serializer>"
+                                                     + "      <type>string</type>"
+                                                     + "    </key-serializer>"
+                                                     + "    <value-serializer>"
+                                                     + "      <type>string</type>"
+                                                     + "    </value-serializer>"
+                                                     + "    <retention-days>7</retention-days>"
+                                                     + "  </store>"
+
+                                                     + "  <store>"
+                                                     + "    <name>voldsys$_client_store_definition</name>"
+                                                     + "    <routing-strategy>zone-routing</routing-strategy>"
+                                                     + "    <hinted-handoff-strategy>proximity-handoff</hinted-handoff-strategy>"
+                                                     + "    <persistence>memory</persistence>"
+                                                     + "    <routing>client</routing>"
+                                                     + "    <replication-factor>1</replication-factor>"
+                                                     + "    <required-reads>1</required-reads>"
+                                                     + "    <required-writes>1</required-writes>"
+                                                     + "    <key-serializer>"
+                                                     + "      <type>string</type>"
+                                                     + "    </key-serializer>"
+                                                     + "    <value-serializer>"
+                                                     + "      <type>string</type>"
+                                                     + "    </value-serializer>"
+                                                     + "    <retention-days>7</retention-days>"
+                                                     + "  </store>"
+
+                                                     + "  <store>"
+                                                     + "    <name>voldsys$_metadata_version</name>"
+                                                     + "    <routing-strategy>local-pref-all-routing</routing-strategy>"
+                                                     + "    <hinted-handoff-strategy>proximity-handoff</hinted-handoff-strategy>"
+                                                     + "    <persistence>memory</persistence>"
+                                                     + "    <routing>client</routing>"
+                                                     + "    <replication-factor>1</replication-factor>"
+                                                     + "    <required-reads>1</required-reads>"
+                                                     + "    <required-writes>1</required-writes>"
+                                                     + "    <key-serializer>"
+                                                     + "      <type>string</type>"
+                                                     + "    </key-serializer>"
+                                                     + "    <value-serializer>"
+                                                     + "      <type>java-serialization</type>"
+                                                     + "    </value-serializer>" + "  </store>"
+
+                                                     + "</stores>";
+
+    public static boolean isSystemStore(String storeName) {
+        return (null == storeName ? false : storeName.startsWith(NAME_PREFIX));
+    }
+}
diff --git a/test/unit/voldemort/client/DefaultSocketStoreClientTest.java b/test/unit/voldemort/client/DefaultSocketStoreClientTest.java
@@ -53,7 +53,7 @@ public void setUp() throws Exception {
         storeDefs = new StoreDefinitionsMapper().readStoreList(new File(storesXmlfile));
 
         servers[0] = ServerTestUtils.startVoldemortServer(socketStoreFactory,
-                                                          ServerTestUtils.createServerConfig(useNio,
+                                                          ServerTestUtils.createServerConfig(true,
                                                                                              0,
                                                                                              TestUtils.createTempDir()
                                                                                                       .getAbsolutePath(),
@@ -62,7 +62,7 @@ public void setUp() throws Exception {
                                                                                              new Properties()),
                                                           cluster);
         servers[1] = ServerTestUtils.startVoldemortServer(socketStoreFactory,
-                                                          ServerTestUtils.createServerConfig(useNio,
+                                                          ServerTestUtils.createServerConfig(true,
                                                                                              1,
                                                                                              TestUtils.createTempDir()
                                                                                                       .getAbsolutePath(),