You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2012/12/03 14:54:21 UTC
svn commit: r1416519 - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/
bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/
bookkeeper-server/src/test/java/org/apache/bookkeeper/metas...
Author: ivank
Date: Mon Dec 3 13:54:19 2012
New Revision: 1416519
URL: http://svn.apache.org/viewvc?rev=1416519&view=rev
Log:
BOOKKEEPER-459: Rename metastore mock implementation to InMemory implementation (jiannan via ivank)
Added:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetaStore.java
- copied, changed from r1416408, zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetaStore.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreCursor.java
- copied, changed from r1416408, zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreCursor.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreTable.java
- copied, changed from r1416408, zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreTable.java
Removed:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetaStore.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreCursor.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreTable.java
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1416519&r1=1416518&r2=1416519&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Dec 3 13:54:19 2012
@@ -116,6 +116,8 @@ Trunk (unreleased changes)
BOOKKEEPER-291: BKMBeanRegistry uses log4j directly (fpj via ivank)
+ BOOKKEEPER-459: Rename metastore mock implementation to InMemory implementation (jiannan via ivank)
+
hedwig-protocol:
BOOKKEEPER-394: CompositeException message is not useful (Stu Hood via sijie)
Copied: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetaStore.java (from r1416408, zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetaStore.java)
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetaStore.java?p2=zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetaStore.java&p1=zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetaStore.java&r1=1416408&r2=1416519&rev=1416519&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetaStore.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetaStore.java Mon Dec 3 13:54:19 2012
@@ -15,23 +15,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.bookkeeper.metastore.mock;
+package org.apache.bookkeeper.metastore;
import java.util.HashMap;
import java.util.Map;
-import org.apache.bookkeeper.metastore.MetaStore;
-import org.apache.bookkeeper.metastore.MetastoreException;
-import org.apache.bookkeeper.metastore.MetastoreTable;
-import org.apache.bookkeeper.metastore.MetastoreScannableTable;
import org.apache.commons.configuration.Configuration;
-public class MockMetaStore implements MetaStore {
+public class InMemoryMetaStore implements MetaStore {
static final int CUR_VERSION = 1;
- static Map<String, MockMetastoreTable> tables =
- new HashMap<String, MockMetastoreTable>();
+ static Map<String, InMemoryMetastoreTable> tables =
+ new HashMap<String, InMemoryMetastoreTable>();
// for test
public static void reset() {
@@ -61,18 +57,18 @@ public class MockMetaStore implements Me
@Override
public MetastoreTable createTable(String name) {
- return createMockTable(name);
+ return createInMemoryTable(name);
}
@Override
public MetastoreScannableTable createScannableTable(String name) {
- return createMockTable(name);
+ return createInMemoryTable(name);
}
- private MockMetastoreTable createMockTable(String name) {
- MockMetastoreTable t = tables.get(name);
+ private InMemoryMetastoreTable createInMemoryTable(String name) {
+ InMemoryMetastoreTable t = tables.get(name);
if (t == null) {
- t = new MockMetastoreTable(this, name);
+ t = new InMemoryMetastoreTable(this, name);
tables.put(name, t);
}
return t;
Copied: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreCursor.java (from r1416408, zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreCursor.java)
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreCursor.java?p2=zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreCursor.java&p1=zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreCursor.java&r1=1416408&r2=1416519&rev=1416519&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreCursor.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreCursor.java Mon Dec 3 13:54:19 2012
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.bookkeeper.metastore.mock;
+package org.apache.bookkeeper.metastore;
-import static org.apache.bookkeeper.metastore.mock.MockMetastoreTable.cloneValue;
+import static org.apache.bookkeeper.metastore.InMemoryMetastoreTable.cloneValue;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,20 +28,16 @@ import java.util.NavigableMap;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
-import org.apache.bookkeeper.metastore.MSException;
import org.apache.bookkeeper.metastore.MSException.Code;
-import org.apache.bookkeeper.metastore.MetastoreCursor;
-import org.apache.bookkeeper.metastore.MetastoreTableItem;
-import org.apache.bookkeeper.metastore.Value;
import org.apache.bookkeeper.versioning.Versioned;
-class MockMetastoreCursor implements MetastoreCursor {
+class InMemoryMetastoreCursor implements MetastoreCursor {
private final ScheduledExecutorService scheduler;
private final Iterator<Map.Entry<String, Versioned<Value>>> iter;
private final Set<String> fields;
- public MockMetastoreCursor(NavigableMap<String, Versioned<Value>> map, Set<String> fields,
+ public InMemoryMetastoreCursor(NavigableMap<String, Versioned<Value>> map, Set<String> fields,
ScheduledExecutorService scheduler) {
this.iter = map.entrySet().iterator();
this.fields = fields;
Copied: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreTable.java (from r1416408, zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreTable.java)
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreTable.java?p2=zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreTable.java&p1=zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreTable.java&r1=1416408&r2=1416519&rev=1416519&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/mock/MockMetastoreTable.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/InMemoryMetastoreTable.java Mon Dec 3 13:54:19 2012
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.bookkeeper.metastore.mock;
+package org.apache.bookkeeper.metastore;
import java.util.NavigableMap;
import java.util.Set;
@@ -24,27 +24,23 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import org.apache.bookkeeper.metastore.MSException.Code;
-import org.apache.bookkeeper.metastore.MetastoreCallback;
-import org.apache.bookkeeper.metastore.MetastoreCursor;
-import org.apache.bookkeeper.metastore.MetastoreScannableTable;
-import org.apache.bookkeeper.metastore.Value;
import org.apache.bookkeeper.versioning.Version;
import org.apache.bookkeeper.versioning.Versioned;
-public class MockMetastoreTable implements MetastoreScannableTable {
+public class InMemoryMetastoreTable implements MetastoreScannableTable {
- public static class MockVersion implements Version {
+ public static class MetadataVersion implements Version {
int version;
- public MockVersion(int v) {
+ public MetadataVersion(int v) {
this.version = v;
}
- public MockVersion(MockVersion v) {
+ public MetadataVersion(MetadataVersion v) {
this.version = v.version;
}
- public synchronized MockVersion incrementVersion() {
+ public synchronized MetadataVersion incrementVersion() {
++version;
return this;
}
@@ -58,10 +54,10 @@ public class MockMetastoreTable implemen
return Occurred.AFTER;
} else if (v == Version.ANY) {
return Occurred.CONCURRENTLY;
- } else if (!(v instanceof MockVersion)) {
+ } else if (!(v instanceof MetadataVersion)) {
throw new IllegalArgumentException("Invalid version type");
}
- MockVersion mv = (MockVersion)v;
+ MetadataVersion mv = (MetadataVersion)v;
int res = version - mv.version;
if (res == 0) {
return Occurred.CONCURRENTLY;
@@ -75,10 +71,10 @@ public class MockMetastoreTable implemen
@Override
public boolean equals(Object obj) {
if (null == obj ||
- !(obj instanceof MockVersion)) {
+ !(obj instanceof MetadataVersion)) {
return false;
}
- MockVersion v = (MockVersion)obj;
+ MetadataVersion v = (MetadataVersion)obj;
return 0 == (version - v.version);
}
@@ -97,7 +93,7 @@ public class MockMetastoreTable implemen
private TreeMap<String, Versioned<Value>> map = null;
private ScheduledExecutorService scheduler;
- public MockMetastoreTable(MockMetaStore metastore, String name) {
+ public InMemoryMetastoreTable(InMemoryMetaStore metastore, String name) {
this.map = new TreeMap<String, Versioned<Value>>();
this.name = name;
this.scheduler = Executors.newSingleThreadScheduledExecutor();
@@ -124,8 +120,8 @@ public class MockMetastoreTable implemen
throw new NullPointerException("Version isn't allowed to be null.");
}
if (Version.ANY != version && Version.NEW != version) {
- if (version instanceof MockVersion) {
- version = new MockVersion(((MockVersion)version).version);
+ if (version instanceof MetadataVersion) {
+ version = new MetadataVersion(((MetadataVersion)version).version);
} else {
throw new IllegalStateException("Wrong version type.");
}
@@ -160,7 +156,7 @@ public class MockMetastoreTable implemen
cb.complete(Code.IllegalOp.getCode(), null, ctx);
return;
}
- Versioned<Value> vv = mockGet(key);
+ Versioned<Value> vv = get(key);
int rc = null == vv ? Code.NoKey.getCode() : Code.OK.getCode();
if (vv != null) {
vv = cloneValue(vv.getValue(), vv.getVersion(), fields);
@@ -178,7 +174,7 @@ public class MockMetastoreTable implemen
cb.complete(Code.IllegalOp.getCode(), null, ctx);
return;
}
- Result<Version> result = mockPut(key, value, version);
+ Result<Version> result = put(key, value, version);
cb.complete(result.code.getCode(), result.value, ctx);
}
});
@@ -193,7 +189,7 @@ public class MockMetastoreTable implemen
cb.complete(Code.IllegalOp.getCode(), null, ctx);
return;
}
- Code code = mockRemove(key, version);
+ Code code = remove(key, version);
cb.complete(code.getCode(), null, ctx);
}
});
@@ -229,18 +225,18 @@ public class MockMetastoreTable implemen
scheduler.submit(new Runnable() {
@Override
public void run() {
- Result<MetastoreCursor> result = mockOpenCursor(firstKey, firstInclusive, lastKey, lastInclusive,
+ Result<MetastoreCursor> result = openCursor(firstKey, firstInclusive, lastKey, lastInclusive,
order, fields);
cb.complete(result.code.getCode(), result.value, ctx);
}
});
}
- private synchronized Versioned<Value> mockGet(String key) {
+ private synchronized Versioned<Value> get(String key) {
return map.get(key);
}
- private synchronized Code mockRemove(String key, Version version) {
+ private synchronized Code remove(String key, Version version) {
Versioned<Value> vv = map.get(key);
if (null == vv) {
return Code.NoKey;
@@ -262,16 +258,16 @@ public class MockMetastoreTable implemen
}
}
- private synchronized Result<Version> mockPut(String key, Value value, Version version) {
+ private synchronized Result<Version> put(String key, Value value, Version version) {
Versioned<Value> vv = map.get(key);
if (vv == null) {
if (Version.NEW != version) {
return new Result<Version>(Code.NoKey, null);
}
vv = cloneValue(value, version, ALL_FIELDS);
- vv.setVersion(new MockVersion(0));
+ vv.setVersion(new MetadataVersion(0));
map.put(key, vv);
- return new Result<Version>(Code.OK, new MockVersion(0));
+ return new Result<Version>(Code.OK, new MetadataVersion(0));
}
if (Version.NEW == version) {
return new Result<Version>(Code.KeyExists, null);
@@ -279,12 +275,12 @@ public class MockMetastoreTable implemen
if (Version.Occurred.CONCURRENTLY != vv.getVersion().compare(version)) {
return new Result<Version>(Code.BadVersion, null);
}
- vv.setVersion(((MockVersion)vv.getVersion()).incrementVersion());
+ vv.setVersion(((MetadataVersion)vv.getVersion()).incrementVersion());
vv.setValue(vv.getValue().merge(value));
- return new Result<Version>(Code.OK, new MockVersion((MockVersion)vv.getVersion()));
+ return new Result<Version>(Code.OK, new MetadataVersion((MetadataVersion)vv.getVersion()));
}
- private synchronized Result<MetastoreCursor> mockOpenCursor(
+ private synchronized Result<MetastoreCursor> openCursor(
String firstKey, boolean firstInclusive,
String lastKey, boolean lastInclusive,
Order order, Set<String> fields) {
@@ -329,7 +325,7 @@ public class MockMetastoreTable implemen
if (!isLegalCursor || null == myMap) {
return new Result<MetastoreCursor>(Code.IllegalOp, null);
}
- MetastoreCursor cursor = new MockMetastoreCursor(
+ MetastoreCursor cursor = new InMemoryMetastoreCursor(
myMap.subMap(firstKey, firstInclusive, lastKey, lastInclusive), fields, scheduler);
return new Result<MetastoreCursor>(Code.OK, cursor);
}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java?rev=1416519&r1=1416518&r2=1416519&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java Mon Dec 3 13:54:19 2012
@@ -31,10 +31,9 @@ import java.util.TreeMap;
import junit.framework.TestCase;
+import org.apache.bookkeeper.metastore.InMemoryMetastoreTable.MetadataVersion;
import org.apache.bookkeeper.metastore.MSException.Code;
import org.apache.bookkeeper.metastore.MetastoreScannableTable.Order;
-import org.apache.bookkeeper.metastore.mock.MockMetaStore;
-import org.apache.bookkeeper.metastore.mock.MockMetastoreTable.MockVersion;
import org.apache.bookkeeper.versioning.Version;
import org.apache.bookkeeper.versioning.Versioned;
import org.apache.commons.configuration.CompositeConfiguration;
@@ -156,7 +155,7 @@ public class TestMetaStore extends TestC
protected MetastoreScannableTableAsyncToSyncConverter myTable;
protected String getMetaStoreName() {
- return MockMetaStore.class.getName();
+ return InMemoryMetaStore.class.getName();
}
protected Configuration getConfiguration() {
@@ -164,24 +163,24 @@ public class TestMetaStore extends TestC
}
protected Version newBadVersion() {
- return new MockVersion(-1);
+ return new MetadataVersion(-1);
}
protected Version nextVersion(Version version) {
if (Version.NEW == version) {
- return new MockVersion(0);
+ return new MetadataVersion(0);
}
if (Version.ANY == version) {
return Version.ANY;
}
- assertTrue(version instanceof MockVersion);
- return new MockVersion(((MockVersion) version).incrementVersion());
+ assertTrue(version instanceof MetadataVersion);
+ return new MetadataVersion(((MetadataVersion) version).incrementVersion());
}
private void checkVersion(Version v) {
assertNotNull(v);
if (v != Version.NEW && v != Version.ANY) {
- assertTrue(v instanceof MockVersion);
+ assertTrue(v instanceof MetadataVersion);
}
}