Skip to content

Commit

Permalink
fixed addtional bugs during merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Lei Gao committed Jun 28, 2012
1 parent 3fbef94 commit d4e28a8
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions src/java/voldemort/client/SystemStore.java
View file
Expand Up @@ -26,14 +26,14 @@ public SystemStore(String storeName, String[] bootstrapUrls, int clientZoneID) {

ClientConfig config = new ClientConfig();
config.setSelectors(1)
.setBootstrapUrls(config.getBootstrapUrls())
.setBootstrapUrls(bootstrapUrls)
.setMaxConnectionsPerNode(2)
.setConnectionTimeout(1500, TimeUnit.MILLISECONDS)
.setSocketTimeout(5000, TimeUnit.MILLISECONDS)
.setRoutingTimeout(5000, TimeUnit.MILLISECONDS)
.setEnableJmx(false)
.setEnablePipelineRoutedStore(true)
.setClientZoneId(config.getClientZoneId());
.setClientZoneId(clientZoneID);
this.systemStoreFactory = new SocketStoreClientFactory(config);
this.storeName = storeName;
this.sysStore = this.systemStoreFactory.getSystemStore(this.storeName);
Expand Down
40 changes: 20 additions & 20 deletions test/unit/voldemort/client/ClientRegistryTest.java
View file
@@ -1,15 +1,14 @@
package voldemort.client;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;

import junit.framework.Assert;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -112,7 +111,8 @@ public void testHappyPath() {
assertEquals(0, infoList.get(0).getClientSequence());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(0).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());

assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertEquals(1, infoList.size());

it = adminClient.fetchEntries(1,
Expand All @@ -126,7 +126,7 @@ public void testHappyPath() {
assertEquals(0, infoList.get(0).getClientSequence());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(0).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertEquals(1, infoList.size());

try {
Expand Down Expand Up @@ -173,15 +173,15 @@ public void testTwoClients() {
.getClientSequence());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(0).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());

assertEquals(TEST_STORE_NAME, infoList.get(1).getStoreName());
assertEquals(CLIENT_CONTEXT_NAME, infoList.get(1).getContext());
assertTrue("Client registry sequence number incorrect", 1 >= infoList.get(1)
.getClientSequence());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(1).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertEquals(infoList.size(), 2);

it = adminClient.fetchEntries(1,
Expand All @@ -196,15 +196,15 @@ public void testTwoClients() {
.getClientSequence());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(0).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());

assertEquals(TEST_STORE_NAME, infoList.get(1).getStoreName());
assertEquals(CLIENT_CONTEXT_NAME, infoList.get(1).getContext());
assertTrue("Client registry sequence number incorrect", 1 >= infoList.get(1)
.getClientSequence());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(1).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());

assertEquals(infoList.size(), 2);

Expand Down Expand Up @@ -252,12 +252,12 @@ public void testTwoStores() {
assertEquals(CLIENT_CONTEXT_NAME, infoList.get(0).getContext());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(0).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());

assertEquals(CLIENT_CONTEXT_NAME, infoList.get(1).getContext());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(1).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());

if(infoList.get(0).getStoreName().equals(TEST_STORE_NAME)) {
assertEquals(0, infoList.get(0).getClientSequence());
Expand All @@ -284,12 +284,12 @@ public void testTwoStores() {
assertEquals(CLIENT_CONTEXT_NAME, infoList.get(0).getContext());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(0).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());

assertEquals(CLIENT_CONTEXT_NAME, infoList.get(1).getContext());
assertTrue("Client registry bootstrap time incorrect",
startTime <= infoList.get(1).getBootstrapTime());
Assert.assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());

if(infoList.get(0).getStoreName().equals(TEST_STORE_NAME)) {
assertEquals(0, infoList.get(0).getClientSequence());
Expand Down Expand Up @@ -356,8 +356,8 @@ public void testTwoFactories() {
false);
ArrayList<ClientInfo> infoList = getClientRegistryContent(it);

Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
Assert.assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());

if(infoList.get(0).getStoreName().equals(TEST_STORE_NAME)) {
assertEquals(CLIENT_CONTEXT_NAME, infoList.get(0).getContext());
Expand Down Expand Up @@ -398,8 +398,8 @@ public void testTwoFactories() {
false);
infoList = getClientRegistryContent(it);

Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
Assert.assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());

if(infoList.get(0).getStoreName().equals(TEST_STORE_NAME)) {
assertEquals(CLIENT_CONTEXT_NAME, infoList.get(0).getContext());
Expand Down Expand Up @@ -486,8 +486,8 @@ public void testOneServerFailre() {
false);
ArrayList<ClientInfo> infoList = getClientRegistryContent(it);

Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
Assert.assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());

if(infoList.get(0).getStoreName().equals(TEST_STORE_NAME)) {
assertEquals(CLIENT_CONTEXT_NAME, infoList.get(0).getContext());
Expand Down Expand Up @@ -616,8 +616,8 @@ public void testRepeatRegistrationDifferentFactories() {

assertEquals("Incrrect # of entries created in client registry", 2, infoList.size());

Assert.assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
Assert.assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(0).getReleaseVersion());
assertNotNull("Client version is null", infoList.get(1).getReleaseVersion());

if(infoList.get(0).getStoreName().equals(TEST_STORE_NAME)) {
assertEquals(CLIENT_CONTEXT_NAME, infoList.get(0).getContext());
Expand Down

0 comments on commit d4e28a8

Please sign in to comment.