[cweb-CVS] bigdata/src/java/com/bigdata/isolation UnisolatedIndexSegment.java, 1.1, 1.2 IsolatedBTree.java, 1.8, 1.9 UnisolatedBTree.java, 1.8, 1.9

[Bryan T. <tho...@us...>]

Update of /cvsroot/cweb/bigdata/src/java/com/bigdata/isolation
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10595/src/java/com/bigdata/isolation

Modified Files:
	UnisolatedIndexSegment.java IsolatedBTree.java 
	UnisolatedBTree.java 
Log Message:
Refactoring to define service apis (data service, transaction manager service) and some approximate implementations of those services (not supporting service discovery, network protocol, or service robustness).

Copied in the UML model so that it will actually get committed to CVS....

Index: UnisolatedIndexSegment.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/isolation/UnisolatedIndexSegment.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UnisolatedIndexSegment.java	8 Mar 2007 18:14:06 -0000	1.1
--- UnisolatedIndexSegment.java	15 Mar 2007 16:11:13 -0000	1.2
***************
*** 198,202 ****
      public IEntryIterator rangeIterator(byte[] fromKey, byte[] toKey) {
  
!         return root.rangeIterator(fromKey, toKey, DeletedEntryFilter.INSTANCE);
  
      }
--- 198,202 ----
      public IEntryIterator rangeIterator(byte[] fromKey, byte[] toKey) {
  
!         return getRoot().rangeIterator(fromKey, toKey, DeletedEntryFilter.INSTANCE);
  
      }
***************
*** 204,208 ****
      public IEntryIterator entryIterator() {
  
!         return root.rangeIterator(null, null, DeletedEntryFilter.INSTANCE);
  
      }
--- 204,208 ----
      public IEntryIterator entryIterator() {
  
!         return rangeIterator(null, null);
  
      }

Index: UnisolatedBTree.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/isolation/UnisolatedBTree.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** UnisolatedBTree.java	8 Mar 2007 18:14:06 -0000	1.8
--- UnisolatedBTree.java	15 Mar 2007 16:11:13 -0000	1.9
***************
*** 434,438 ****
      public IEntryIterator rangeIterator(byte[] fromKey, byte[] toKey) {
  
!         return root.rangeIterator(fromKey, toKey, DeletedEntryFilter.INSTANCE);
          
      }
--- 434,438 ----
      public IEntryIterator rangeIterator(byte[] fromKey, byte[] toKey) {
  
!         return getRoot().rangeIterator(fromKey, toKey, DeletedEntryFilter.INSTANCE);
          
      }
***************
*** 440,444 ****
      public IEntryIterator entryIterator() {
  
!         return root.rangeIterator(null, null, DeletedEntryFilter.INSTANCE);
          
      }
--- 440,444 ----
      public IEntryIterator entryIterator() {
  
!         return rangeIterator(null, null);
          
      }

Index: IsolatedBTree.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/isolation/IsolatedBTree.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** IsolatedBTree.java	11 Mar 2007 11:42:44 -0000	1.8
--- IsolatedBTree.java	15 Mar 2007 16:11:13 -0000	1.9
***************
*** 179,182 ****
--- 179,191 ----
  
      /**
+      * True iff there are no writes on this isolated index.
+      */
+     public boolean isEmptyWriteSet() {
+         
+         return super.nentries == 0;
+         
+     }
+     
+     /**
       * If the key is not in the write set, then delegate to
       * {@link UnisolatedBTree#contains(byte[])} on the isolated index. If the
***************
*** 440,444 ****
           * objects and see both deleted and undeleted entries.
           */
!         final IEntryIterator itr = root.rangeIterator(null, null, null);
  
          while (itr.hasNext()) {
--- 449,453 ----
           * objects and see both deleted and undeleted entries.
           */
!         final IEntryIterator itr = getRoot().rangeIterator(null, null, null);
  
          while (itr.hasNext()) {
***************
*** 560,564 ****
           * objects and see both deleted and undeleted entries.
           */
!         final IEntryIterator itr = root.rangeIterator(null, null, null);
  
          while (itr.hasNext()) {
--- 569,573 ----
           * objects and see both deleted and undeleted entries.
           */
!         final IEntryIterator itr = getRoot().rangeIterator(null, null, null);
  
          while (itr.hasNext()) {