[cweb-CVS] bigdata/src/java/com/bigdata/journal TemporaryStore.java, 1.9, 1.10 CommitRecordIndex.java, 1.5, 1.6 ResourceManager.java, 1.3, 1.4 Tx.java, 1.37, 1.38 ReadCommittedTx.java, 1.4, 1.5 ITx.java, 1.7, 1.8 IIndexManager.java, 1.3, 1.4 AbstractBufferStrategy.java, 1.16, 1.17 ITransactionManager.java, 1.5, 1.6 Name2Addr.java, 1.9, 1.10 IJournal.java, 1.11, 1.12 Options.java, 1.12, 1.13 IIndexStore.java, 1.1, 1.2 AbstractJournal.java, 1.11, 1.12 RootBlockView.java, 1.16, 1.17

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

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

Modified Files:
	TemporaryStore.java CommitRecordIndex.java 
	ResourceManager.java Tx.java ReadCommittedTx.java ITx.java 
	IIndexManager.java AbstractBufferStrategy.java 
	ITransactionManager.java Name2Addr.java IJournal.java 
	Options.java IIndexStore.java AbstractJournal.java 
	RootBlockView.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: ReadCommittedTx.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/ReadCommittedTx.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReadCommittedTx.java	27 Mar 2007 14:34:23 -0000	1.4
--- ReadCommittedTx.java	13 Apr 2007 15:04:23 -0000	1.5
***************
*** 50,61 ****
  import java.util.UUID;
  
  import com.bigdata.isolation.IIsolatableIndex;
  import com.bigdata.isolation.IIsolatedIndex;
- import com.bigdata.objndx.BatchContains;
- import com.bigdata.objndx.BatchInsert;
- import com.bigdata.objndx.BatchLookup;
- import com.bigdata.objndx.BatchRemove;
- import com.bigdata.objndx.IEntryIterator;
- import com.bigdata.objndx.IIndex;
  
  /**
--- 50,61 ----
  import java.util.UUID;
  
+ import com.bigdata.btree.BatchContains;
+ import com.bigdata.btree.BatchInsert;
+ import com.bigdata.btree.BatchLookup;
+ import com.bigdata.btree.BatchRemove;
+ import com.bigdata.btree.IEntryIterator;
+ import com.bigdata.btree.IIndex;
  import com.bigdata.isolation.IIsolatableIndex;
  import com.bigdata.isolation.IIsolatedIndex;
  
  /**

Index: IJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/IJournal.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IJournal.java	29 Mar 2007 17:01:32 -0000	1.11
--- IJournal.java	13 Apr 2007 15:04:23 -0000	1.12
***************
*** 50,54 ****
  import java.util.Properties;
  
! import com.bigdata.objndx.IIndex;
  
  /**
--- 50,54 ----
  import java.util.Properties;
  
! import com.bigdata.btree.IIndex;
  
  /**

Index: Name2Addr.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/Name2Addr.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Name2Addr.java	12 Apr 2007 23:59:34 -0000	1.9
--- Name2Addr.java	13 Apr 2007 15:04:23 -0000	1.10
***************
*** 13,22 ****
  import org.CognitiveWeb.extser.ShortPacker;
  
! import com.bigdata.objndx.BTree;
! import com.bigdata.objndx.BTreeMetadata;
! import com.bigdata.objndx.DataOutputBuffer;
! import com.bigdata.objndx.IIndex;
! import com.bigdata.objndx.IValueSerializer;
! import com.bigdata.objndx.KeyBuilder;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.IRawStore;
--- 13,22 ----
  import org.CognitiveWeb.extser.ShortPacker;
  
! import com.bigdata.btree.BTree;
! import com.bigdata.btree.BTreeMetadata;
! import com.bigdata.btree.DataOutputBuffer;
! import com.bigdata.btree.IIndex;
! import com.bigdata.btree.IValueSerializer;
! import com.bigdata.btree.KeyBuilder;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.IRawStore;

Index: ITx.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/ITx.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ITx.java	15 Mar 2007 16:11:12 -0000	1.7
--- ITx.java	13 Apr 2007 15:04:23 -0000	1.8
***************
*** 48,53 ****
  package com.bigdata.journal;
  
  import com.bigdata.isolation.IsolatedBTree;
- import com.bigdata.objndx.IIndex;
  
  /**
--- 48,53 ----
  package com.bigdata.journal;
  
+ import com.bigdata.btree.IIndex;
  import com.bigdata.isolation.IsolatedBTree;
  
  /**

Index: CommitRecordIndex.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/CommitRecordIndex.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CommitRecordIndex.java	12 Apr 2007 23:59:34 -0000	1.5
--- CommitRecordIndex.java	13 Apr 2007 15:04:23 -0000	1.6
***************
*** 8,18 ****
  import org.CognitiveWeb.extser.ShortPacker;
  
  import com.bigdata.cache.LRUCache;
  import com.bigdata.cache.WeakValueCache;
- import com.bigdata.objndx.BTree;
- import com.bigdata.objndx.BTreeMetadata;
- import com.bigdata.objndx.DataOutputBuffer;
- import com.bigdata.objndx.IValueSerializer;
- import com.bigdata.objndx.KeyBuilder;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.IRawStore;
--- 8,18 ----
  import org.CognitiveWeb.extser.ShortPacker;
  
+ import com.bigdata.btree.BTree;
+ import com.bigdata.btree.BTreeMetadata;
+ import com.bigdata.btree.DataOutputBuffer;
+ import com.bigdata.btree.IValueSerializer;
+ import com.bigdata.btree.KeyBuilder;
  import com.bigdata.cache.LRUCache;
  import com.bigdata.cache.WeakValueCache;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.IRawStore;

Index: IIndexManager.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/IIndexManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IIndexManager.java	11 Mar 2007 11:42:46 -0000	1.3
--- IIndexManager.java	13 Apr 2007 15:04:23 -0000	1.4
***************
*** 48,53 ****
  package com.bigdata.journal;
  
! import com.bigdata.objndx.BTree;
! import com.bigdata.objndx.IIndex;
  
  /**
--- 48,53 ----
  package com.bigdata.journal;
  
! import com.bigdata.btree.BTree;
! import com.bigdata.btree.IIndex;
  
  /**

Index: ITransactionManager.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/ITransactionManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ITransactionManager.java	15 Mar 2007 16:11:12 -0000	1.5
--- ITransactionManager.java	13 Apr 2007 15:04:23 -0000	1.6
***************
*** 48,54 ****
  package com.bigdata.journal;
  
  import com.bigdata.isolation.IConflictResolver;
  import com.bigdata.isolation.UnisolatedBTree;
- import com.bigdata.objndx.IndexSegment;
  
  /**
--- 48,54 ----
  package com.bigdata.journal;
  
+ import com.bigdata.btree.IndexSegment;
  import com.bigdata.isolation.IConflictResolver;
  import com.bigdata.isolation.UnisolatedBTree;
  
  /**

Index: AbstractJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/AbstractJournal.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AbstractJournal.java	10 Apr 2007 18:33:31 -0000	1.11
--- AbstractJournal.java	13 Apr 2007 15:04:23 -0000	1.12
***************
*** 64,67 ****
--- 64,72 ----
  import org.apache.log4j.Logger;
  
+ import com.bigdata.btree.AbstractBTree;
+ import com.bigdata.btree.BTree;
+ import com.bigdata.btree.IIndex;
+ import com.bigdata.btree.IndexSegment;
+ import com.bigdata.btree.ReadOnlyIndex;
  import com.bigdata.cache.LRUCache;
  import com.bigdata.cache.WeakValueCache;
***************
*** 69,77 ****
  import com.bigdata.isolation.UnisolatedBTree;
  import com.bigdata.journal.ReadCommittedTx.ReadCommittedIndex;
- import com.bigdata.objndx.AbstractBTree;
- import com.bigdata.objndx.BTree;
- import com.bigdata.objndx.IIndex;
- import com.bigdata.objndx.IndexSegment;
- import com.bigdata.objndx.ReadOnlyIndex;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.Bytes;
--- 74,77 ----

Index: Options.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/Options.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Options.java	4 Apr 2007 16:52:16 -0000	1.12
--- Options.java	13 Apr 2007 15:04:23 -0000	1.13
***************
*** 48,52 ****
  import java.util.Properties;
  
! import com.bigdata.objndx.IndexSegment;
  import com.bigdata.rawstore.Bytes;
  
--- 48,52 ----
  import java.util.Properties;
  
! import com.bigdata.btree.IndexSegment;
  import com.bigdata.rawstore.Bytes;
  

Index: Tx.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/Tx.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Tx.java	15 Mar 2007 16:11:12 -0000	1.37
--- Tx.java	13 Apr 2007 15:04:23 -0000	1.38
***************
*** 52,61 ****
  import java.util.Map;
  
  import com.bigdata.isolation.IIsolatedIndex;
  import com.bigdata.isolation.IsolatedBTree;
  import com.bigdata.isolation.ReadOnlyIsolatedIndex;
  import com.bigdata.isolation.UnisolatedBTree;
- import com.bigdata.objndx.BTree;
- import com.bigdata.objndx.IIndex;
  import com.bigdata.rawstore.Bytes;
  import com.bigdata.scaleup.PartitionedIndexView;
--- 52,61 ----
  import java.util.Map;
  
+ import com.bigdata.btree.BTree;
+ import com.bigdata.btree.IIndex;
  import com.bigdata.isolation.IIsolatedIndex;
  import com.bigdata.isolation.IsolatedBTree;
  import com.bigdata.isolation.ReadOnlyIsolatedIndex;
  import com.bigdata.isolation.UnisolatedBTree;
  import com.bigdata.rawstore.Bytes;
  import com.bigdata.scaleup.PartitionedIndexView;

Index: TemporaryStore.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/TemporaryStore.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TemporaryStore.java	27 Mar 2007 14:34:23 -0000	1.9
--- TemporaryStore.java	13 Apr 2007 15:04:23 -0000	1.10
***************
*** 50,56 ****
  import java.util.UUID;
  
! import com.bigdata.objndx.BTree;
! import com.bigdata.objndx.ByteArrayValueSerializer;
! import com.bigdata.objndx.IIndex;
  import com.bigdata.rawstore.Addr;
  
--- 50,56 ----
  import java.util.UUID;
  
! import com.bigdata.btree.BTree;
! import com.bigdata.btree.ByteArrayValueSerializer;
! import com.bigdata.btree.IIndex;
  import com.bigdata.rawstore.Addr;
  

Index: RootBlockView.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/RootBlockView.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** RootBlockView.java	29 Mar 2007 17:01:33 -0000	1.16
--- RootBlockView.java	13 Apr 2007 15:04:23 -0000	1.17
***************
*** 51,55 ****
  import java.util.UUID;
  
! import com.bigdata.objndx.BTreeMetadata;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.Bytes;
--- 51,55 ----
  import java.util.UUID;
  
! import com.bigdata.btree.BTreeMetadata;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.Bytes;

Index: ResourceManager.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/ResourceManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ResourceManager.java	10 Apr 2007 18:33:31 -0000	1.3
--- ResourceManager.java	13 Apr 2007 15:04:23 -0000	1.4
***************
*** 53,59 ****
  import org.apache.log4j.Logger;
  
! import com.bigdata.objndx.AbstractBTree;
! import com.bigdata.objndx.IndexSegment;
! import com.bigdata.objndx.IndexSegmentBuilder;
  import com.bigdata.rawstore.Bytes;
  import com.bigdata.scaleup.MasterJournal;
--- 53,59 ----
  import org.apache.log4j.Logger;
  
! import com.bigdata.btree.AbstractBTree;
! import com.bigdata.btree.IndexSegment;
! import com.bigdata.btree.IndexSegmentBuilder;
  import com.bigdata.rawstore.Bytes;
  import com.bigdata.scaleup.MasterJournal;

Index: AbstractBufferStrategy.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/AbstractBufferStrategy.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AbstractBufferStrategy.java	4 Apr 2007 16:52:16 -0000	1.16
--- AbstractBufferStrategy.java	13 Apr 2007 15:04:23 -0000	1.17
***************
*** 9,13 ****
  import org.apache.log4j.Logger;
  
! import com.bigdata.objndx.AbstractBTree;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.Bytes;
--- 9,13 ----
  import org.apache.log4j.Logger;
  
! import com.bigdata.btree.AbstractBTree;
  import com.bigdata.rawstore.Addr;
  import com.bigdata.rawstore.Bytes;

Index: IIndexStore.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/IIndexStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IIndexStore.java	11 Mar 2007 11:42:46 -0000	1.1
--- IIndexStore.java	13 Apr 2007 15:04:23 -0000	1.2
***************
*** 48,52 ****
  package com.bigdata.journal;
  
! import com.bigdata.objndx.IIndex;
  
  /**
--- 48,52 ----
  package com.bigdata.journal;
  
! import com.bigdata.btree.IIndex;
  
  /**