Update of /cvsroot/cweb/bigdata/src/test/com/bigdata/scaleup
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23960/src/test/com/bigdata/scaleup
Modified Files:
TestMetadataIndex.java
Log Message:
Refactoring to introduce asynchronous handling of overflow events in support of a scale-up/scale-out design.
Index: TestMetadataIndex.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/scaleup/TestMetadataIndex.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestMetadataIndex.java 22 Feb 2007 16:59:35 -0000 1.7
--- TestMetadataIndex.java 6 Mar 2007 20:38:06 -0000 1.8
***************
*** 123,127 ****
}
!
/**
* Test the ability to create and update the metadata for a partition.
--- 123,127 ----
}
!
/**
* Test the ability to create and update the metadata for a partition.
***************
*** 592,608 ****
*/
- File outFile02_tmp = new File(getName() + "-part0.02.tmp");
-
- outFile02_tmp.deleteOnExit();
-
File outFile02 = new File(getName() + "-part0.02.seg");
outFile02.deleteOnExit();
- assertTrue(!outFile02_tmp.exists() || outFile02_tmp.delete());
assertTrue(!outFile02.exists() || outFile02.delete());
! MergedLeafIterator mergeItr = new IndexSegmentMerger(outFile02_tmp,
! 100, btree, seg01).merge();
new IndexSegmentBuilder(outFile02, null, mergeItr.nentries,
--- 592,603 ----
*/
File outFile02 = new File(getName() + "-part0.02.seg");
outFile02.deleteOnExit();
assertTrue(!outFile02.exists() || outFile02.delete());
! MergedLeafIterator mergeItr = new IndexSegmentMerger(100, btree, seg01)
! .merge();
new IndexSegmentBuilder(outFile02, null, mergeItr.nentries,
***************
*** 855,865 ****
// The #of entries that we expected in the segment after the merge.
final int expectedEntryCount = groundTruth.getEntryCount();
-
- // tmp file for the merge process.
- File outFile02_tmp = new File(getName() + "-part0."+trial+".tmp");
-
- outFile02_tmp.deleteOnExit();
-
- assertTrue(!outFile02_tmp.exists() || outFile02_tmp.delete());
// output file for the merged segment.
--- 850,853 ----
***************
*** 870,876 ****
assertTrue(!outFile02.exists() || outFile02.delete());
! // merge the data from the btree on the journal and the index segment.
! MergedLeafIterator mergeItr = new IndexSegmentMerger(
! outFile02_tmp, mseg2, testData, seg).merge();
// verify #of entries that are passed on by the merge.
--- 858,865 ----
assertTrue(!outFile02.exists() || outFile02.delete());
! // merge the data from the btree on the journal and the index
! // segment.
! MergedLeafIterator mergeItr = new IndexSegmentMerger(mseg2,
! testData, seg).merge();
// verify #of entries that are passed on by the merge.
|
