You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by el...@apache.org on 2013/04/03 13:16:26 UTC
svn commit: r1463920 - in
/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src:
main/java/org/apache/mavibot/btree/ main/java/org/apache/mavibot/btree/store/
test/java/org/apache/mavibot/btree/
test/java/org/apache/mavibot/btree/comparator/ te...
Author: elecharny
Date: Wed Apr 3 11:16:26 2013
New Revision: 1463920
URL: http://svn.apache.org/r1463920
Log:
Moved the content of the store package down one level, to have some of the internal method package protected, instead of public.
Added:
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeHeader.java
- copied, changed from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/BTreeHeader.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/PageIO.java
- copied, changed from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/PageIO.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RecordManager.java
- copied, changed from r1463882, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RecordManager.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionName.java
- copied, changed from r1463635, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionName.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameComparator.java
- copied, changed from r1463603, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameComparator.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameSerializer.java
- copied, changed from r1463635, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameSerializer.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/ReadTest.java
- copied, changed from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/ReadTest.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerPrivateMethodTest.java
- copied, changed from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerPrivateMethodTest.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerTest.java
- copied, changed from r1463904, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerTest.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/StoreTest.java
- copied, changed from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/StoreTest.java
Removed:
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/BTreeHeader.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/PageIO.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RecordManager.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionName.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameComparator.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameSerializer.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/ReadTest.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerPrivateMethodTest.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerTest.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/StoreTest.java
Modified:
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeFactory.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/RevisionNameComparatorTest.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/serializer/RevisionNameSerializerTest.java
Modified: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java?rev=1463920&r1=1463919&r2=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java Wed Apr 3 11:16:26 2013
@@ -40,8 +40,6 @@ import org.apache.mavibot.btree.exceptio
import org.apache.mavibot.btree.serializer.BufferHandler;
import org.apache.mavibot.btree.serializer.ElementSerializer;
import org.apache.mavibot.btree.serializer.LongSerializer;
-import org.apache.mavibot.btree.store.BTreeHeader;
-import org.apache.mavibot.btree.store.RecordManager;
/**
@@ -595,7 +593,7 @@ public class BTree<K, V>
/**
* @return the btreeOffset
*/
- public long getBtreeOffset()
+ /* No qualifier*/long getBtreeOffset()
{
return btreeHeader.getBTreeOffset();
}
@@ -604,7 +602,7 @@ public class BTree<K, V>
/**
* @param btreeOffset the btreeOffset to set
*/
- public void setBtreeOffset( long btreeOffset )
+ /* No qualifier*/void setBtreeOffset( long btreeOffset )
{
btreeHeader.setBTreeOffset( btreeOffset );
}
@@ -613,7 +611,7 @@ public class BTree<K, V>
/**
* @return the rootPageOffset
*/
- public long getRootPageOffset()
+ /* No qualifier*/long getRootPageOffset()
{
return btreeHeader.getRootPageOffset();
}
@@ -622,7 +620,7 @@ public class BTree<K, V>
/**
* @param rootPageOffset the rootPageOffset to set
*/
- public void setRootPageOffset( long rootPageOffset )
+ /* No qualifier*/void setRootPageOffset( long rootPageOffset )
{
btreeHeader.setRootPageOffset( rootPageOffset );
}
@@ -631,7 +629,7 @@ public class BTree<K, V>
/**
* @return the nextBTreeOffset
*/
- public long getNextBTreeOffset()
+ /* No qualifier*/long getNextBTreeOffset()
{
return btreeHeader.getNextBTreeOffset();
}
@@ -640,7 +638,7 @@ public class BTree<K, V>
/**
* @param nextBTreeOffset the nextBTreeOffset to set
*/
- public void setNextBTreeOffset( long nextBTreeOffset )
+ /* No qualifier*/void setNextBTreeOffset( long nextBTreeOffset )
{
btreeHeader.setNextBTreeOffset( nextBTreeOffset );
}
@@ -1019,7 +1017,7 @@ public class BTree<K, V>
* @param revision The revision to use
* @return Existing value, if any.
*/
- protected V insert( K key, V value, long revision ) throws IOException
+ /* No qualifier*/V insert( K key, V value, long revision ) throws IOException
{
if ( key == null )
{
@@ -1150,7 +1148,7 @@ public class BTree<K, V>
/**
* @return the type for the keys
*/
- public Class<?> getKeyType()
+ /* No qualifier*/Class<?> getKeyType()
{
return keyType;
}
Modified: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeFactory.java
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeFactory.java?rev=1463920&r1=1463919&r2=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeFactory.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeFactory.java Wed Apr 3 11:16:26 2013
@@ -21,7 +21,6 @@ package org.apache.mavibot.btree;
import org.apache.mavibot.btree.serializer.ElementSerializer;
-import org.apache.mavibot.btree.store.RecordManager;
/**
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeHeader.java (from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/BTreeHeader.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeHeader.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeHeader.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/BTreeHeader.java&r1=1463299&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/BTreeHeader.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/BTreeHeader.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import java.util.concurrent.atomic.AtomicLong;
@@ -48,7 +48,7 @@ import java.util.concurrent.atomic.Atomi
* Each BtreeHeader will be written starting on a new page.
* @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
*/
-public class BTreeHeader
+/* No qualifier*/class BTreeHeader
{
/** The current revision */
private AtomicLong revision = new AtomicLong( 0L );
@@ -120,7 +120,7 @@ public class BTreeHeader
/**
* @param versions the versions to set
*/
- public void setVersions( long[] versions )
+ /* No qualifier*/void setVersions( long[] versions )
{
this.versions = versions;
}
@@ -129,7 +129,7 @@ public class BTreeHeader
/**
* @return the btreeOffset
*/
- public long getBTreeOffset()
+ /* No qualifier*/long getBTreeOffset()
{
return btreeOffset;
}
@@ -138,7 +138,7 @@ public class BTreeHeader
/**
* @param btreeOffset the btreeOffset to set
*/
- public void setBTreeOffset( long btreeOffset )
+ /* No qualifier*/void setBTreeOffset( long btreeOffset )
{
this.btreeOffset = btreeOffset;
}
@@ -147,7 +147,7 @@ public class BTreeHeader
/**
* @return the rootPageOffset
*/
- public long getRootPageOffset()
+ /* No qualifier*/long getRootPageOffset()
{
return rootPageOffset;
}
@@ -156,7 +156,7 @@ public class BTreeHeader
/**
* @param rootPageOffset the rootPageOffset to set
*/
- public void setRootPageOffset( long rootPageOffset )
+ /* No qualifier*/void setRootPageOffset( long rootPageOffset )
{
this.rootPageOffset = rootPageOffset;
}
@@ -174,7 +174,7 @@ public class BTreeHeader
/**
* @param revision the revision to set
*/
- public void setRevision( long revision )
+ /* No qualifier*/void setRevision( long revision )
{
this.revision.set( revision );
}
@@ -185,7 +185,7 @@ public class BTreeHeader
*
* @return the new revision
*/
- public long incrementRevision()
+ /* No qualifier*/long incrementRevision()
{
return revision.incrementAndGet();
}
@@ -203,7 +203,7 @@ public class BTreeHeader
/**
* Increment the number of elements
*/
- public void incrementNbElems()
+ /* No qualifier*/void incrementNbElems()
{
nbElems.incrementAndGet();
}
@@ -212,7 +212,7 @@ public class BTreeHeader
/**
* Decrement the number of elements
*/
- public void decrementNbElems()
+ /* No qualifier*/void decrementNbElems()
{
nbElems.decrementAndGet();
}
@@ -230,7 +230,7 @@ public class BTreeHeader
/**
* @return the nextBTreeOffset
*/
- public long getNextBTreeOffset()
+ /* No qualifier*/long getNextBTreeOffset()
{
return nextBTreeOffset;
}
@@ -239,7 +239,7 @@ public class BTreeHeader
/**
* @param nextBtreeOffset the nextBtreeOffset to set
*/
- public void setNextBTreeOffset( long nextBTreeOffset )
+ /* No qualifier*/void setNextBTreeOffset( long nextBTreeOffset )
{
this.nextBTreeOffset = nextBTreeOffset;
}
@@ -266,7 +266,7 @@ public class BTreeHeader
/**
* @return the keySerializerFQCN
*/
- public String getKeySerializerFQCN()
+ /* No qualifier*/String getKeySerializerFQCN()
{
return keySerializerFQCN;
}
@@ -275,7 +275,7 @@ public class BTreeHeader
/**
* @param keySerializerFQCN the keySerializerFQCN to set
*/
- public void setKeySerializerFQCN( String keySerializerFQCN )
+ /* No qualifier*/void setKeySerializerFQCN( String keySerializerFQCN )
{
this.keySerializerFQCN = keySerializerFQCN;
}
@@ -284,7 +284,7 @@ public class BTreeHeader
/**
* @return the valueSerializerFQCN
*/
- public String getValueSerializerFQCN()
+ /* No qualifier*/String getValueSerializerFQCN()
{
return valueSerializerFQCN;
}
@@ -293,7 +293,7 @@ public class BTreeHeader
/**
* @param valueSerializerFQCN the valueSerializerFQCN to set
*/
- public void setValueSerializerFQCN( String valueSerializerFQCN )
+ /* No qualifier*/void setValueSerializerFQCN( String valueSerializerFQCN )
{
this.valueSerializerFQCN = valueSerializerFQCN;
}
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/PageIO.java (from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/PageIO.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/PageIO.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/PageIO.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/PageIO.java&r1=1463299&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/PageIO.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/PageIO.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import java.nio.ByteBuffer;
@@ -55,7 +55,7 @@ import org.apache.mavibot.btree.util.Str
*
* @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
*/
-public class PageIO
+/* No qualifier*/class PageIO
{
/** The contain data */
private ByteBuffer data;
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RecordManager.java (from r1463882, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RecordManager.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RecordManager.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RecordManager.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RecordManager.java&r1=1463882&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RecordManager.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RecordManager.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import java.io.File;
@@ -32,15 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.mavibot.btree.AbstractPage;
-import org.apache.mavibot.btree.BTree;
-import org.apache.mavibot.btree.BTreeFactory;
-import org.apache.mavibot.btree.ElementHolder;
-import org.apache.mavibot.btree.Leaf;
-import org.apache.mavibot.btree.MemoryHolder;
-import org.apache.mavibot.btree.Node;
-import org.apache.mavibot.btree.Page;
-import org.apache.mavibot.btree.ReferenceHolder;
import org.apache.mavibot.btree.exception.BTreeAlreadyManagedException;
import org.apache.mavibot.btree.exception.EndOfFileExceededException;
import org.apache.mavibot.btree.serializer.IntSerializer;
@@ -1127,7 +1118,8 @@ public class RecordManager
* @throws IOException
* @throws EndOfFileExceededException
*/
- public void updateBtreeHeader( BTree btree, long rootPageOffset ) throws EndOfFileExceededException, IOException
+ /* No qualifier*/void updateBtreeHeader( BTree btree, long rootPageOffset ) throws EndOfFileExceededException,
+ IOException
{
// Read the pageIOs associated with this BTree
long offset = btree.getBtreeOffset();
@@ -1539,7 +1531,7 @@ public class RecordManager
* @return The offset of the new page
* @throws IOException
*/
- public ElementHolder writePage( BTree btree, Page oldPage, Page newPage, long newRevision )
+ /* No qualifier*/ElementHolder writePage( BTree btree, Page oldPage, Page newPage, long newRevision )
throws IOException
{
// We first need to save the new page on disk
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionName.java (from r1463635, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionName.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionName.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionName.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionName.java&r1=1463635&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionName.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionName.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
/**
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameComparator.java (from r1463603, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameComparator.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameComparator.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameComparator.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameComparator.java&r1=1463603&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameComparator.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameComparator.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import java.util.Comparator;
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameSerializer.java (from r1463635, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameSerializer.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameSerializer.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameSerializer.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameSerializer.java&r1=1463635&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/store/RevisionNameSerializer.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/RevisionNameSerializer.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import java.io.IOException;
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/ReadTest.java (from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/ReadTest.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/ReadTest.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/ReadTest.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/ReadTest.java&r1=1463299&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/ReadTest.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/ReadTest.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import static org.junit.Assert.assertEquals;
@@ -27,6 +27,8 @@ import java.io.File;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
+import org.apache.mavibot.btree.PageIO;
+import org.apache.mavibot.btree.RecordManager;
import org.junit.Test;
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerPrivateMethodTest.java (from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerPrivateMethodTest.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerPrivateMethodTest.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerPrivateMethodTest.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerPrivateMethodTest.java&r1=1463299&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerPrivateMethodTest.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerPrivateMethodTest.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import static org.junit.Assert.assertEquals;
@@ -27,6 +27,8 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import org.apache.mavibot.btree.PageIO;
+import org.apache.mavibot.btree.RecordManager;
import org.junit.Test;
@@ -51,25 +53,25 @@ public class RecordManagerPrivateMethodT
Method getFreePageIOsMethod = RecordManager.class.getDeclaredMethod( "getFreePageIOs", int.class );
getFreePageIOsMethod.setAccessible( true );
- PageIO[] pages = ( PageIO[] ) getFreePageIOsMethod.invoke( recordManager, 0 );
+ PageIO[] pages = (org.apache.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, 0 );
assertEquals( 0, pages.length );
for ( int i = 1; i < 20; i++ )
{
- pages = ( PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+ pages = (org.apache.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
assertEquals( 1, pages.length );
}
for ( int i = 21; i < 44; i++ )
{
- pages = ( PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+ pages = (org.apache.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
assertEquals( 2, pages.length );
}
for ( int i = 45; i < 68; i++ )
{
- pages = ( PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+ pages = (org.apache.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
assertEquals( 3, pages.length );
}
}
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerTest.java (from r1463904, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerTest.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerTest.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerTest.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerTest.java&r1=1463904&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/RecordManagerTest.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/RecordManagerTest.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import static org.junit.Assert.assertEquals;
@@ -29,6 +29,7 @@ import java.io.IOException;
import java.util.Set;
import org.apache.mavibot.btree.BTree;
+import org.apache.mavibot.btree.RecordManager;
import org.apache.mavibot.btree.exception.BTreeAlreadyManagedException;
import org.apache.mavibot.btree.exception.KeyNotFoundException;
import org.apache.mavibot.btree.serializer.LongSerializer;
Copied: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/StoreTest.java (from r1463299, labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/StoreTest.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/StoreTest.java?p2=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/StoreTest.java&p1=labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/StoreTest.java&r1=1463299&r2=1463920&rev=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/store/StoreTest.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/StoreTest.java Wed Apr 3 11:16:26 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree.store;
+package org.apache.mavibot.btree;
import static org.junit.Assert.assertEquals;
@@ -26,6 +26,8 @@ import java.io.File;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
+import org.apache.mavibot.btree.PageIO;
+import org.apache.mavibot.btree.RecordManager;
import org.junit.Test;
Modified: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/RevisionNameComparatorTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/RevisionNameComparatorTest.java?rev=1463920&r1=1463919&r2=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/RevisionNameComparatorTest.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/RevisionNameComparatorTest.java Wed Apr 3 11:16:26 2013
@@ -22,8 +22,8 @@ package org.apache.mavibot.btree.compara
import static org.junit.Assert.assertEquals;
-import org.apache.mavibot.btree.store.RevisionName;
-import org.apache.mavibot.btree.store.RevisionNameComparator;
+import org.apache.mavibot.btree.RevisionName;
+import org.apache.mavibot.btree.RevisionNameComparator;
import org.junit.Test;
Modified: labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/serializer/RevisionNameSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/serializer/RevisionNameSerializerTest.java?rev=1463920&r1=1463919&r2=1463920&view=diff
==============================================================================
--- labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/serializer/RevisionNameSerializerTest.java (original)
+++ labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/serializer/RevisionNameSerializerTest.java Wed Apr 3 11:16:26 2013
@@ -26,8 +26,8 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.apache.mavibot.btree.store.RevisionName;
-import org.apache.mavibot.btree.store.RevisionNameSerializer;
+import org.apache.mavibot.btree.RevisionName;
+import org.apache.mavibot.btree.RevisionNameSerializer;
import org.junit.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org