cweb-cvs

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

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

Modified Files:
	ResourceState.java PartitionedIndexView.java 
	PartitionMetadata.java Name2MetadataAddr.java 
	MetadataIndex.java SlaveJournal.java MasterJournal.java 
	IPartitionTask.java IsolatablePartitionedIndexView.java 
	AbstractPartitionTask.java SegmentMetadata.java 
	IResourceMetadata.java 
Log Message:
Package rename from com.bigdata.objndx to com.bigdata.btree.  Since we are using CVS, this is going to break the access to prior versions in the source file history.

Index: IPartitionTask.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/IPartitionTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IPartitionTask.java	8 Mar 2007 18:14:06 -0000	1.1
--- IPartitionTask.java	13 Apr 2007 15:04:24 -0000	1.2
***************
*** 44,48 ****
  package com.bigdata.scaleup;
  
! import com.bigdata.objndx.IndexSegment;
  
  /**
--- 44,48 ----
  package com.bigdata.scaleup;
  
! import com.bigdata.btree.IndexSegment;
  
  /**

Index: MetadataIndex.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/MetadataIndex.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MetadataIndex.java	27 Mar 2007 14:34:22 -0000	1.7
--- MetadataIndex.java	13 Apr 2007 15:04:24 -0000	1.8
***************
*** 52,62 ****
  import org.CognitiveWeb.extser.LongPacker;
  
  import com.bigdata.isolation.IsolatedBTree;
  import com.bigdata.journal.Journal;
  import com.bigdata.journal.Tx;
- import com.bigdata.objndx.BTree;
- import com.bigdata.objndx.BTreeMetadata;
- import com.bigdata.objndx.IIndex;
- import com.bigdata.objndx.IndexSegment;
  import com.bigdata.rawstore.IRawStore;
  
--- 52,62 ----
  import org.CognitiveWeb.extser.LongPacker;
  
+ import com.bigdata.btree.BTree;
+ import com.bigdata.btree.BTreeMetadata;
+ import com.bigdata.btree.IIndex;
+ import com.bigdata.btree.IndexSegment;
  import com.bigdata.isolation.IsolatedBTree;
  import com.bigdata.journal.Journal;
  import com.bigdata.journal.Tx;
  import com.bigdata.rawstore.IRawStore;
  

Index: IResourceMetadata.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/IResourceMetadata.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IResourceMetadata.java	29 Mar 2007 17:01:33 -0000	1.3
--- IResourceMetadata.java	13 Apr 2007 15:04:24 -0000	1.4
***************
*** 47,53 ****
  import java.util.UUID;
  
  import com.bigdata.journal.Journal;
- import com.bigdata.objndx.IndexSegment;
- import com.bigdata.objndx.IndexSegmentMetadata;
  
  /**
--- 47,53 ----
  import java.util.UUID;
  
+ import com.bigdata.btree.IndexSegment;
+ import com.bigdata.btree.IndexSegmentMetadata;
  import com.bigdata.journal.Journal;
  
  /**

Index: IsolatablePartitionedIndexView.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/IsolatablePartitionedIndexView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IsolatablePartitionedIndexView.java	29 Mar 2007 17:01:33 -0000	1.3
--- IsolatablePartitionedIndexView.java	13 Apr 2007 15:04:24 -0000	1.4
***************
*** 48,57 ****
  package com.bigdata.scaleup;
  
  import com.bigdata.isolation.IIsolatableIndex;
  import com.bigdata.isolation.IsolatableFusedView;
  import com.bigdata.isolation.UnisolatedBTree;
- import com.bigdata.objndx.IBatchBTree;
- import com.bigdata.objndx.IEntryIterator;
- import com.bigdata.objndx.ReadOnlyFusedView;
  
  /**
--- 48,57 ----
  package com.bigdata.scaleup;
  
+ import com.bigdata.btree.IBatchBTree;
+ import com.bigdata.btree.IEntryIterator;
+ import com.bigdata.btree.ReadOnlyFusedView;
  import com.bigdata.isolation.IIsolatableIndex;
  import com.bigdata.isolation.IsolatableFusedView;
  import com.bigdata.isolation.UnisolatedBTree;
  
  /**

Index: MasterJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/MasterJournal.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MasterJournal.java	29 Mar 2007 17:01:33 -0000	1.6
--- MasterJournal.java	13 Apr 2007 15:04:24 -0000	1.7
***************
*** 54,57 ****
--- 54,67 ----
  import java.util.Properties;
  
+ import com.bigdata.btree.AbstractBTree;
+ import com.bigdata.btree.BTree;
+ import com.bigdata.btree.IFusedView;
+ import com.bigdata.btree.IIndex;
+ import com.bigdata.btree.IndexSegment;
+ import com.bigdata.btree.IndexSegmentBuilder;
+ import com.bigdata.btree.IndexSegmentFileStore;
+ import com.bigdata.btree.IndexSegmentMerger;
+ import com.bigdata.btree.IndexSegmentMerger.MergedEntryIterator;
+ import com.bigdata.btree.IndexSegmentMerger.MergedLeafIterator;
  import com.bigdata.cache.LRUCache;
  import com.bigdata.cache.WeakValueCache;
***************
*** 67,80 ****
  import com.bigdata.journal.Journal;
  import com.bigdata.journal.Name2Addr.Entry;
- import com.bigdata.objndx.AbstractBTree;
- import com.bigdata.objndx.BTree;
- import com.bigdata.objndx.IFusedView;
- import com.bigdata.objndx.IIndex;
- import com.bigdata.objndx.IndexSegment;
- import com.bigdata.objndx.IndexSegmentBuilder;
- import com.bigdata.objndx.IndexSegmentFileStore;
- import com.bigdata.objndx.IndexSegmentMerger;
- import com.bigdata.objndx.IndexSegmentMerger.MergedEntryIterator;
- import com.bigdata.objndx.IndexSegmentMerger.MergedLeafIterator;
  import com.bigdata.rawstore.Bytes;
  
--- 77,80 ----

Index: AbstractPartitionTask.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/AbstractPartitionTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractPartitionTask.java	29 Mar 2007 17:01:33 -0000	1.5
--- AbstractPartitionTask.java	13 Apr 2007 15:04:24 -0000	1.6
***************
*** 48,61 ****
  import java.util.concurrent.Executors;
  
  import com.bigdata.isolation.UnisolatedBTree;
  import com.bigdata.isolation.Value;
- import com.bigdata.objndx.AbstractBTree;
- import com.bigdata.objndx.IValueSerializer;
- import com.bigdata.objndx.IndexSegment;
- import com.bigdata.objndx.IndexSegmentBuilder;
- import com.bigdata.objndx.IndexSegmentMerger;
- import com.bigdata.objndx.RecordCompressor;
- import com.bigdata.objndx.IndexSegmentMerger.MergedEntryIterator;
- import com.bigdata.objndx.IndexSegmentMerger.MergedLeafIterator;
  import com.bigdata.rawstore.Bytes;
  
--- 48,61 ----
  import java.util.concurrent.Executors;
  
+ import com.bigdata.btree.AbstractBTree;
+ import com.bigdata.btree.IValueSerializer;
+ import com.bigdata.btree.IndexSegment;
+ import com.bigdata.btree.IndexSegmentBuilder;
+ import com.bigdata.btree.IndexSegmentMerger;
+ import com.bigdata.btree.RecordCompressor;
+ import com.bigdata.btree.IndexSegmentMerger.MergedEntryIterator;
+ import com.bigdata.btree.IndexSegmentMerger.MergedLeafIterator;
  import com.bigdata.isolation.UnisolatedBTree;
  import com.bigdata.isolation.Value;
  import com.bigdata.rawstore.Bytes;
  

Index: SlaveJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/SlaveJournal.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SlaveJournal.java	29 Mar 2007 17:01:33 -0000	1.7
--- SlaveJournal.java	13 Apr 2007 15:04:24 -0000	1.8
***************
*** 48,59 ****
  import java.util.UUID;
  
  import com.bigdata.isolation.IIsolatableIndex;
  import com.bigdata.isolation.UnisolatedBTree;
  import com.bigdata.journal.Journal;
  import com.bigdata.journal.Name2Addr;
- import com.bigdata.objndx.BTree;
- import com.bigdata.objndx.IEntryIterator;
- import com.bigdata.objndx.IIndex;
- import com.bigdata.objndx.IndexSegment;
  import com.bigdata.rawstore.Addr;
  
--- 48,59 ----
  import java.util.UUID;
  
+ import com.bigdata.btree.BTree;
+ import com.bigdata.btree.IEntryIterator;
+ import com.bigdata.btree.IIndex;
+ import com.bigdata.btree.IndexSegment;
  import com.bigdata.isolation.IIsolatableIndex;
  import com.bigdata.isolation.UnisolatedBTree;
  import com.bigdata.journal.Journal;
  import com.bigdata.journal.Name2Addr;
  import com.bigdata.rawstore.Addr;
  

Index: SegmentMetadata.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/SegmentMetadata.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SegmentMetadata.java	29 Mar 2007 17:01:33 -0000	1.5
--- SegmentMetadata.java	13 Apr 2007 15:04:24 -0000	1.6
***************
*** 46,50 ****
  import java.util.UUID;
  
! import com.bigdata.objndx.IndexSegment;
  
  /**
--- 46,50 ----
  import java.util.UUID;
  
! import com.bigdata.btree.IndexSegment;
  
  /**

Index: PartitionedIndexView.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/PartitionedIndexView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PartitionedIndexView.java	29 Mar 2007 17:01:33 -0000	1.3
--- PartitionedIndexView.java	13 Apr 2007 15:04:24 -0000	1.4
***************
*** 54,71 ****
  import java.util.UUID;
  
  import com.bigdata.journal.ICommitter;
  import com.bigdata.journal.Journal;
- import com.bigdata.objndx.AbstractBTree;
- import com.bigdata.objndx.BTree;
- import com.bigdata.objndx.BatchContains;
- import com.bigdata.objndx.BatchInsert;
- import com.bigdata.objndx.BatchLookup;
- import com.bigdata.objndx.BatchRemove;
- import com.bigdata.objndx.EmptyEntryIterator;
- import com.bigdata.objndx.IEntryIterator;
- import com.bigdata.objndx.IFusedView;
- import com.bigdata.objndx.IIndex;
- import com.bigdata.objndx.IndexSegment;
- import com.bigdata.objndx.ReadOnlyFusedView;
  
  /**
--- 54,71 ----
  import java.util.UUID;
  
+ import com.bigdata.btree.AbstractBTree;
+ import com.bigdata.btree.BTree;
+ import com.bigdata.btree.BatchContains;
+ import com.bigdata.btree.BatchInsert;
+ import com.bigdata.btree.BatchLookup;
+ import com.bigdata.btree.BatchRemove;
+ import com.bigdata.btree.EmptyEntryIterator;
+ import com.bigdata.btree.IEntryIterator;
+ import com.bigdata.btree.IFusedView;
+ import com.bigdata.btree.IIndex;
+ import com.bigdata.btree.IndexSegment;
+ import com.bigdata.btree.ReadOnlyFusedView;
  import com.bigdata.journal.ICommitter;
  import com.bigdata.journal.Journal;
  
  /**

Index: PartitionMetadata.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/PartitionMetadata.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PartitionMetadata.java	12 Apr 2007 23:59:35 -0000	1.6
--- PartitionMetadata.java	13 Apr 2007 15:04:24 -0000	1.7
***************
*** 50,58 ****
  import java.util.UUID;
  
  import com.bigdata.isolation.UnisolatedBTree;
  import com.bigdata.journal.Journal;
- import com.bigdata.objndx.DataOutputBuffer;
- import com.bigdata.objndx.IValueSerializer;
- import com.bigdata.objndx.IndexSegment;
  
  /**
--- 50,58 ----
  import java.util.UUID;
  
+ import com.bigdata.btree.DataOutputBuffer;
+ import com.bigdata.btree.IValueSerializer;
+ import com.bigdata.btree.IndexSegment;
  import com.bigdata.isolation.UnisolatedBTree;
  import com.bigdata.journal.Journal;
  
  /**

Index: Name2MetadataAddr.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/Name2MetadataAddr.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Name2MetadataAddr.java	12 Mar 2007 18:06:12 -0000	1.5
--- Name2MetadataAddr.java	13 Apr 2007 15:04:24 -0000	1.6
***************
*** 48,53 ****
  package com.bigdata.scaleup;
  
  import com.bigdata.journal.Name2Addr;
- import com.bigdata.objndx.BTreeMetadata;
  import com.bigdata.rawstore.IRawStore;
  
--- 48,53 ----
  package com.bigdata.scaleup;
  
+ import com.bigdata.btree.BTreeMetadata;
  import com.bigdata.journal.Name2Addr;
  import com.bigdata.rawstore.IRawStore;
  

Index: ResourceState.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/ResourceState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceState.java	8 Mar 2007 18:14:06 -0000	1.1
--- ResourceState.java	13 Apr 2007 15:04:24 -0000	1.2
***************
*** 44,48 ****
  package com.bigdata.scaleup;
  
! import com.bigdata.objndx.IndexSegment;
  
  /**
--- 44,48 ----
  package com.bigdata.scaleup;
  
! import com.bigdata.btree.IndexSegment;
  
  /**