Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3612] branches/maven_scaleout/bigdata-core/src
|
From: <sgo...@us...> - 2010-09-22 21:39:58
|
Revision: 3612
http://bigdata.svn.sourceforge.net/bigdata/?rev=3612&view=rev
Author: sgossard
Date: 2010-09-22 21:39:51 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
[maven_scaleout] : Breaking cyclical dependencies with 'com.bigdata.rawstore'. Moved the call IResourceMetadata getResourceMetadata() on IRawStore to IJournal. All rawstore implementers stubbed out functionality or threw exceptions, and info returned by IResourceMetadata calls made sense for a journals or segments, but really didn't at all for rawstores. This convieniently broke all remaining transitive cycles for 'com.bigdata.cache', 'com.bigdata.io.compression', and 'com.bigdata.btree.data'
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractBufferStrategy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/IJournal.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/RWStrategy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBTree.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestTransientBTree.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/ReplicatedStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/SimpleFileRawStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestReleaseResources.java
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -52,7 +52,6 @@
import com.bigdata.btree.IndexMetadata.Options;
import com.bigdata.btree.IndexSegment.IndexSegmentTupleCursor;
import com.bigdata.btree.data.IAbstractNodeData;
-import com.bigdata.btree.data.ILeafData;
import com.bigdata.btree.data.INodeData;
import com.bigdata.btree.filter.IFilterConstructor;
import com.bigdata.btree.filter.Reverserator;
@@ -68,7 +67,6 @@
import com.bigdata.cache.HardReferenceQueueWithBatchingUpdates;
import com.bigdata.cache.IHardReferenceQueue;
import com.bigdata.cache.RingBuffer;
-import com.bigdata.cache.IGlobalLRU.ILRUCache;
import com.bigdata.counters.CounterSet;
import com.bigdata.counters.ICounterSet;
import com.bigdata.counters.Instrument;
@@ -1357,7 +1355,7 @@
return new IResourceMetadata[] {
- store.getResourceMetadata()
+ new SimpleResourceMetadata(store.getUUID())
};
Added: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java (rev 0)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -0,0 +1,104 @@
+/*
+ * Created by IntelliJ IDEA.
+ * User: gossard
+ * Date: Sep 22, 2010
+ * Time: 2:40:37 PM
+ */
+package com.bigdata.btree;
+
+import com.bigdata.mdi.IResourceMetadata;
+import com.bigdata.rawstore.SimpleMemoryRawStore;
+
+import java.util.UUID;
+
+/**
+ * Dumb metadata object, used by a btree to return metadata about rawstores.
+ * This class was previously an inner-class in {@link com.bigdata.rawstore.SimpleMemoryRawStore SimpleMemoryRawStore},
+ * but was moved into the btree package to remove a rawstore dependency on the mdi package.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ */
+public class SimpleResourceMetadata implements IResourceMetadata {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8333003625527191826L;
+
+ private final UUID uuid;
+
+ public SimpleResourceMetadata(UUID uuid) {
+ if (uuid == null)
+ throw new NullPointerException("uuid cannot be null");
+ this.uuid = uuid;
+ }
+
+ @Override
+ public int hashCode() {
+ return uuid.hashCode();
+ }
+
+ //from java.lang.Object
+ public boolean equals(Object obj){
+ if (obj instanceof SimpleResourceMetadata){
+ SimpleResourceMetadata other = (SimpleResourceMetadata)obj;
+ return uuid.equals(other.uuid);
+ } else
+ return false;
+ }
+
+ //from com.bigdata.mdi.IResourceMetadata, *NOT* java.lang.Object
+ public boolean equals(IResourceMetadata o) {
+
+ return this.equals((Object)o);
+ }
+
+ public long getCreateTime() {
+
+ // does not support commit
+ return 0L;
+
+ }
+
+ public long getCommitTime() {
+
+ // does not support commit
+ return 0L;
+
+ }
+
+ public String getFile() {
+
+ // no backing file.
+ return null;
+
+ }
+
+ public UUID getUUID() {
+
+ return uuid;
+
+ }
+
+ public boolean isIndexSegment() {
+
+ // not index segment.
+ return false;
+
+ }
+
+ public boolean isJournal() {
+
+ // not journal.
+ return false;
+
+ }
+
+// public long size() {
+//
+// // #of bytes not available.
+// return 0L;
+//
+// }
+
+}
\ No newline at end of file
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -399,7 +399,11 @@
for(AbstractBTree t : sources) {
// for (int i = 0; i < srcs.length; i++) {
- resources[i++] = t.getStore().getResourceMetadata();
+ IResourceMetadata[] metaAboutBTree = t.getResourceMetadata();
+ if (metaAboutBTree.length == 1)
+ resources[i++] = metaAboutBTree[0];
+ else
+ throw new RuntimeException("BTree had wrong number of metadata items, should have been caught in unit tests.");
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractBufferStrategy.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractBufferStrategy.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractBufferStrategy.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -585,18 +585,6 @@
}
/**
- * Not supported - this is available on the {@link AbstractJournal}.
- *
- * @throws UnsupportedOperationException
- * always
- */
- public IResourceMetadata getResourceMetadata() {
-
- throw new UnsupportedOperationException();
-
- }
-
- /**
* Sets the <code>readOnly</code> flag.
* <p>
* Note: This method SHOULD be extended to release write caches, etc.
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/IJournal.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/IJournal.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/IJournal.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -26,6 +26,7 @@
import java.util.Properties;
import com.bigdata.btree.keys.IKeyBuilderFactory;
+import com.bigdata.mdi.IResourceMetadata;
import com.bigdata.rawstore.IMRMW;
/**
@@ -55,5 +56,9 @@
* Immediate shutdown.
*/
public void shutdownNow();
-
+
+ /**
+ * A description of this store in support of the scale-out architecture.
+ */
+ public IResourceMetadata getResourceMetadata();
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/RWStrategy.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/RWStrategy.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/RWStrategy.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -479,10 +479,6 @@
return m_fileMetadata.raf;
}
- public IResourceMetadata getResourceMetadata() {
- // TODO Auto-generated method stub
- return null;
- }
public UUID getUUID() {
return m_fileMetadata.rootBlock.getUUID();
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -400,61 +400,6 @@
}
- /**
- * Note: Temporary stores do not have persistent resource descriptions.
- */
- final public IResourceMetadata getResourceMetadata() {
-
- final File file = buf.getFile();
-
- final String fileStr = file == null ? "" : file.toString();
-
- return new ResourceMetadata(this, fileStr);
-
- }
-
- /**
- * Static class since must be {@link Serializable}.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
- static final class ResourceMetadata extends AbstractResourceMetadata {
-
- /**
- * De-serializator ctor.
- */
- public ResourceMetadata() {
-
- }
-
- public ResourceMetadata(final TemporaryRawStore store,
- final String fileStr) {
-
- super(fileStr, // store.buf.getExtent()
- store.uuid,//
- store.createTime, //
- 0L// commitTime
- );
-
- }
-
- private static final long serialVersionUID = 1L;
-
- public boolean isJournal() {
-
- return false;
-
- }
-
- public boolean isIndexSegment() {
-
- return false;
-
- }
-
- }
-
final public DiskOnlyStrategy getBufferStrategy() {
return buf;
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -36,7 +36,6 @@
import com.bigdata.counters.CounterSet;
import com.bigdata.io.IByteArrayBuffer;
import com.bigdata.journal.AbstractJournal;
-import com.bigdata.mdi.IResourceMetadata;
/**
* <p>
@@ -242,12 +241,7 @@
* Return the {@link UUID} which identifies this {@link IRawStore}. This
* supports {@link #getResourceMetadata()}
*/
- public UUID getUUID();
-
- /**
- * A description of this store in support of the scale-out architecture.
- */
- public IResourceMetadata getResourceMetadata();
+ public UUID getUUID();
/**
* True iff backed by stable storage.
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -28,7 +28,6 @@
package com.bigdata.rawstore;
import java.io.File;
-import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
@@ -37,8 +36,6 @@
import java.util.concurrent.ExecutorService;
import com.bigdata.counters.CounterSet;
-import com.bigdata.journal.TemporaryRawStore;
-import com.bigdata.mdi.IResourceMetadata;
/**
* A purely transient append-only implementation useful when data need to be
@@ -48,7 +45,7 @@
* implementation does not contain things like {@link ExecutorService}s that
* would hang around unless explicitly shutdown.
*
- * @see {@link TemporaryRawStore}, which provides a more scalable solution for
+ * @see {@link com.bigdata.journal.TemporaryRawStore TemporaryRawStore}, which provides a more scalable solution for
* temporary data.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
@@ -147,91 +144,8 @@
return uuid;
}
-
- public IResourceMetadata getResourceMetadata() {
- return new ResourceMetadata(uuid);
-
- }
-
/**
- * Static class since must be {@link Serializable}.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
- private static class ResourceMetadata implements IResourceMetadata {
-
- /**
- *
- */
- private static final long serialVersionUID = -8333003625527191826L;
-
- private final UUID uuid;
-
- public ResourceMetadata(UUID uuid) {
-
- this.uuid = uuid;
-
- }
-
- public boolean equals(IResourceMetadata o) {
-
- return this == o;
-
- }
-
- public long getCreateTime() {
-
- // does not support commit
- return 0L;
-
- }
-
- public long getCommitTime() {
-
- // does not support commit
- return 0L;
-
- }
-
- public String getFile() {
-
- // no backing file.
- return null;
-
- }
-
- public UUID getUUID() {
-
- return uuid;
-
- }
-
- public boolean isIndexSegment() {
-
- // not index segment.
- return false;
-
- }
-
- public boolean isJournal() {
-
- // not journal.
- return false;
-
- }
-
-// public long size() {
-//
-// // #of bytes not available.
-// return 0L;
-//
-// }
-
- }
-
- /**
* This always returns <code>null</code>.
*/
public File getFile() {
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -126,9 +126,11 @@
this.sources = new IResourceMetadata[sourceCount];
for (int i = 0; i < sourceCount; i++) {
-
- this.sources[i] = sources[i].getStore().getResourceMetadata();
-
+ IResourceMetadata[] metaAboutBTree = sources[i].getResourceMetadata();
+ if (metaAboutBTree.length == 1)
+ this.sources[i] = metaAboutBTree[0];
+ else
+ throw new RuntimeException("BTree had wrong number of metadata items, should have been caught in unit tests.");
}
this.segmentMetadata = segmentMetadata;
Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBTree.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBTree.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBTree.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -23,6 +23,8 @@
*/
package com.bigdata.btree;
+import com.bigdata.mdi.IResourceMetadata;
+
/**
* Stress tests for basic tree operations (insert, lookup, and remove) without
* causing node or leaf evictions (IO is disabled).
@@ -198,6 +200,20 @@
}
+ public void test_verify_getResourceMetadata(){
+ //transient requirements on getResourceMetadata() are verified in TestTrasientBTree.
+
+ BTree tree = getBTree(3);//branching doesn't matter.
+ assertNotNull("didn't expect btree.store to be null in this test, transient tests are in TestTransientBTree",tree.store);
+
+ IResourceMetadata[] metaList = tree.getResourceMetadata();
+
+ assertNotNull("cannot return null",metaList);
+ assertEquals("must return only one item", 1, metaList.length);
+ assertNotNull("item cannot be null",metaList[0]);
+ assertEquals("item uuid should match store uuid ",tree.getStore().getUUID(),metaList[0].getUUID());
+ }
+
// /**
// * The branching factors that will be used in the stress tests. The larger
// * the branching factor, the longer the run for these tests. The very small
Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestTransientBTree.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestTransientBTree.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestTransientBTree.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -36,6 +36,7 @@
import com.bigdata.btree.AbstractBTree.HardReference;
import com.bigdata.btree.keys.TestKeyBuilder;
+import com.bigdata.mdi.IResourceMetadata;
import com.bigdata.rawstore.IRawStore;
import com.bigdata.rawstore.SimpleMemoryRawStore;
@@ -443,7 +444,7 @@
* Loop until GC activity has caused references to be cleared.
*/
final int limit = 100;
- for (int x = 0; x < limit; x++) {
+ for (int x = 0; x < limit; x++) {
System.gc();
@@ -473,4 +474,15 @@
}
+ public void test_verify_getResourceMetadata(){
+ //non-transient requirements on getResourceMetadata() are verified in TestBTree.
+ BTree tree = BTree.createTransient(new IndexMetadata(UUID.randomUUID()));
+
+ IResourceMetadata[] metaList = tree.getResourceMetadata();
+
+ assertNotNull("cannot return null",metaList);
+ assertEquals("must return only one item", 1, metaList.length);
+ assertNotNull("item cannot be null",metaList[0]);
+ }
+
}
Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/ReplicatedStore.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/ReplicatedStore.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/ReplicatedStore.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -576,11 +576,7 @@
public UUID getUUID() {
return localStore.getUUID();
- }
-
- public IResourceMetadata getResourceMetadata() {
- return localStore.getResourceMetadata();
- }
+ }
// public void packAddr(DataOutput out, long addr) throws IOException {
// localStore.packAddr(out, addr);
Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/SimpleFileRawStore.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/SimpleFileRawStore.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/SimpleFileRawStore.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -138,97 +138,9 @@
return uuid;
- }
-
- public IResourceMetadata getResourceMetadata() {
+ }
- return new ResourceMetadata(uuid, file);
-
- }
-
/**
- * Static class since must be {@link Serializable}.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
- private static final class ResourceMetadata implements IResourceMetadata {
-
- /**
- *
- */
- private static final long serialVersionUID = -419665851049132640L;
-
- private final UUID uuid;
- private final String fileStr;
-
-// private final long length;
-
- public ResourceMetadata(final UUID uuid, final File file) {
-
- this.uuid = uuid;
-
- this.fileStr = file.toString();
-
-// this.length = file.length();
-
- }
-
- public boolean equals(IResourceMetadata o) {
-
- return this == o;
-
- }
-
- public long getCreateTime() {
-
- // does not support commit
- return 0L;
-
- }
-
- public long getCommitTime() {
-
- // does not support commit
- return 0L;
-
- }
-
- public String getFile() {
-
- return fileStr;
-
- }
-
- public UUID getUUID() {
-
- return uuid;
-
- }
-
- public boolean isIndexSegment() {
-
- // not index segment.
- return false;
-
- }
-
- public boolean isJournal() {
-
- // not journal.
- return false;
-
- }
-
-// public long size() {
-//
-// return length;
-//
-// }
-
- }
-
- /**
* This also releases the lock if any obtained by the constructor.
*/
public void close() {
Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -48,13 +48,8 @@
import com.bigdata.btree.keys.IKeyBuilder;
import com.bigdata.btree.proc.IIndexProcedure;
import com.bigdata.counters.CounterSet;
-import com.bigdata.journal.AbstractLocalTransactionManager;
-import com.bigdata.journal.BufferMode;
-import com.bigdata.journal.ConcurrencyManager;
-import com.bigdata.journal.IResourceLockService;
+import com.bigdata.journal.*;
//BTM import com.bigdata.journal.ITransactionService;
-import com.bigdata.journal.RegisterIndexTask;
-import com.bigdata.journal.TemporaryStore;
import com.bigdata.mdi.IMetadataIndex;
import com.bigdata.mdi.IResourceMetadata;
import com.bigdata.mdi.IndexPartitionCause;
@@ -79,7 +74,6 @@
import com.bigdata.util.httpd.AbstractHTTPD;
//BTM
-import com.bigdata.journal.TransactionService;
import com.bigdata.service.IServiceShutdown;
import com.bigdata.service.LoadBalancer;
import com.bigdata.service.Service;
@@ -692,7 +686,7 @@
* @param expected
* @param actual
*/
- protected void assertSameResources(IRawStore[] expected, Set<UUID> actual) {
+ protected void assertSameResources(IJournal[] expected, Set<UUID> actual) {
if(log.isInfoEnabled()) {
Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestReleaseResources.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestReleaseResources.java 2010-09-22 20:21:19 UTC (rev 3611)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestReleaseResources.java 2010-09-22 21:39:51 UTC (rev 3612)
@@ -35,6 +35,7 @@
import java.util.concurrent.ExecutionException;
import com.bigdata.journal.AbstractJournal;
+import com.bigdata.journal.IJournal;
import com.bigdata.rawstore.IRawStore;
import com.bigdata.service.AbstractTransactionService;
@@ -262,7 +263,7 @@
final Set<UUID> actual = resourceManager.getResourcesForTimestamp(commitTime);
- assertSameResources(new IRawStore[] { j0, j1 }, actual);
+ assertSameResources(new IJournal[] { j0, j1 }, actual);
}
@@ -278,7 +279,7 @@
final Set<UUID> actual = resourceManager
.getResourcesForTimestamp(commitTime);
- assertSameResources(new IRawStore[] { j1 }, actual);
+ assertSameResources(new IJournal[] { j1 }, actual);
}
@@ -434,7 +435,7 @@
System.err.println("resources="+actualResourceUUIDs);
- assertSameResources(new IRawStore[] { j1 }, //
+ assertSameResources(new IJournal[] { j1 }, //
actualResourceUUIDs);
}
@@ -554,7 +555,7 @@
* Verify that the resources required for [A] after overflow are
* exactly [j1].
*/
- assertSameResources(new IRawStore[] { j1 }, //
+ assertSameResources(new IJournal[] { j1 }, //
resourceManager.getResourcesForTimestamp(j1.getRootBlockView()
.getFirstCommitTime()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
