Menu
▾
▴
[cweb-CVS] bigdata/src/test/com/bigdata/journal AbstractMROWTestCase.java, 1.2, 1.3 AbstractBufferStrategyTestCase.java, 1.4, 1.5 TestRootBlockView.java, 1.10, 1.11 AbstractBTreeWithJournalTestCase.java, 1.2, 1.3 ComparisonTestDriver.java, 1.3, 1.4 AbstractTestCase.java, 1.19, 1.20 BenchmarkJournalWriteRate.java, 1.13, 1.14 StressTestConcurrent.java, 1.9, 1.10
|
From: Bryan T. <tho...@us...> - 2007-03-22 21:11:29
|
Update of /cvsroot/cweb/bigdata/src/test/com/bigdata/journal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3112/src/test/com/bigdata/journal Modified Files: AbstractMROWTestCase.java AbstractBufferStrategyTestCase.java TestRootBlockView.java AbstractBTreeWithJournalTestCase.java ComparisonTestDriver.java AbstractTestCase.java BenchmarkJournalWriteRate.java StressTestConcurrent.java Log Message: Working on service startup and signal handling. Index: AbstractBTreeWithJournalTestCase.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/AbstractBTreeWithJournalTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbstractBTreeWithJournalTestCase.java 22 Feb 2007 16:59:34 -0000 1.2 --- AbstractBTreeWithJournalTestCase.java 22 Mar 2007 21:11:24 -0000 1.3 *************** *** 91,96 **** properties.setProperty(Options.DELETE_ON_EXIT,"true"); - properties.setProperty(Options.SEGMENT, "0"); - // // Note: also deletes the file before it is used. // properties.setProperty(Options.FILE, AbstractTestCase --- 91,94 ---- Index: AbstractMROWTestCase.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/AbstractMROWTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbstractMROWTestCase.java 22 Feb 2007 16:59:34 -0000 1.2 --- AbstractMROWTestCase.java 22 Mar 2007 21:11:24 -0000 1.3 *************** *** 532,537 **** // properties.setProperty(Options.BUFFER_MODE, BufferMode.Disk.toString()); - properties.setProperty(Options.SEGMENT, "0"); - properties.setProperty(Options.CREATE_TEMP_FILE,"true"); --- 532,535 ---- Index: AbstractBufferStrategyTestCase.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/AbstractBufferStrategyTestCase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AbstractBufferStrategyTestCase.java 22 Feb 2007 16:59:34 -0000 1.4 --- AbstractBufferStrategyTestCase.java 22 Mar 2007 21:11:24 -0000 1.5 *************** *** 97,102 **** properties.setProperty(Options.DELETE_ON_EXIT,"true"); - properties.setProperty(Options.SEGMENT, "0"); - // // Note: also deletes the file before it is used. // properties.setProperty(Options.FILE, AbstractTestCase --- 97,100 ---- Index: ComparisonTestDriver.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/ComparisonTestDriver.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ComparisonTestDriver.java 28 Feb 2007 13:59:09 -0000 1.3 --- ComparisonTestDriver.java 22 Mar 2007 21:11:24 -0000 1.4 *************** *** 248,252 **** properties.setProperty(Options.CREATE_TEMP_FILE,"true"); // properties.setProperty(Options.DELETE_ON_CLOSE,"true"); - properties.setProperty(Options.SEGMENT, "0"); // avoids journal overflow when running out to 60 seconds. --- 248,251 ---- Index: StressTestConcurrent.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/StressTestConcurrent.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** StressTestConcurrent.java 15 Mar 2007 16:11:09 -0000 1.9 --- StressTestConcurrent.java 22 Mar 2007 21:11:24 -0000 1.10 *************** *** 390,395 **** // properties.setProperty(Options.BUFFER_MODE, BufferMode.Disk.toString()); - properties.setProperty(Options.SEGMENT, "0"); - properties.setProperty(Options.CREATE_TEMP_FILE, "true"); --- 390,393 ---- Index: AbstractTestCase.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/AbstractTestCase.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AbstractTestCase.java 22 Feb 2007 16:59:34 -0000 1.19 --- AbstractTestCase.java 22 Mar 2007 21:11:24 -0000 1.20 *************** *** 208,213 **** m_properties.setProperty(Options.DELETE_ON_EXIT,"true"); - m_properties.setProperty(Options.SEGMENT, "0"); - } --- 208,211 ---- Index: BenchmarkJournalWriteRate.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/BenchmarkJournalWriteRate.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** BenchmarkJournalWriteRate.java 22 Feb 2007 16:59:34 -0000 1.13 --- BenchmarkJournalWriteRate.java 22 Mar 2007 21:11:24 -0000 1.14 *************** *** 164,169 **** properties.setProperty(Options.BUFFER_MODE, getBufferMode().toString()); - properties.setProperty(Options.SEGMENT, "0"); - properties.setProperty(Options.CREATE_TEMP_FILE, "true"); --- 164,167 ---- Index: TestRootBlockView.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/journal/TestRootBlockView.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TestRootBlockView.java 28 Feb 2007 13:59:09 -0000 1.10 --- TestRootBlockView.java 22 Mar 2007 21:11:24 -0000 1.11 *************** *** 49,57 **** import java.util.Random; ! ! import com.bigdata.util.TimestampFactory; import junit.framework.TestCase2; /** * Test suite for {@link RootBlockView}. --- 49,58 ---- import java.util.Random; ! import java.util.UUID; import junit.framework.TestCase2; + import com.bigdata.util.TimestampFactory; + /** * Test suite for {@link RootBlockView}. *************** *** 87,91 **** final boolean rootBlock0 = r.nextBoolean(); ! final int segmentId = r.nextInt(); final boolean anyTransactions = r.nextInt(100)>90; final long firstTxId = anyTransactions?TimestampFactory.nextNanoTime():0L; --- 88,92 ---- final boolean rootBlock0 = r.nextBoolean(); ! // final int segmentId = r.nextInt(); final boolean anyTransactions = r.nextInt(100)>90; final long firstTxId = anyTransactions?TimestampFactory.nextNanoTime():0L; *************** *** 97,104 **** final long commitRecordAddr = r.nextInt(Integer.MAX_VALUE); // may be zero. final long commitRecordIndexAddr = r.nextInt(Integer.MAX_VALUE); // may be zero. ! RootBlockView rootBlock = new RootBlockView(rootBlock0, segmentId, nextOffset, firstTxId, lastTxId, commitTimestamp, ! commitCounter, commitRecordAddr, commitRecordIndexAddr); System.err.println("pass=" + i + " of " + limit + " : timestamp=" --- 98,107 ---- final long commitRecordAddr = r.nextInt(Integer.MAX_VALUE); // may be zero. final long commitRecordIndexAddr = r.nextInt(Integer.MAX_VALUE); // may be zero. + final UUID uuid = UUID.randomUUID(); ! RootBlockView rootBlock = new RootBlockView(rootBlock0, //segmentId, nextOffset, firstTxId, lastTxId, commitTimestamp, ! commitCounter, commitRecordAddr, commitRecordIndexAddr, ! uuid); System.err.println("pass=" + i + " of " + limit + " : timestamp=" *************** *** 108,112 **** rootBlock.valid(); assertEquals("rootBlock0", rootBlock0, rootBlock.isRootBlock0()); ! assertEquals("segmentId", segmentId, rootBlock.getSegmentId()); assertEquals("nextOffset", nextOffset, rootBlock.getNextOffset()); assertEquals("firstTxId", firstTxId, rootBlock.getFirstCommitTime()); --- 111,115 ---- rootBlock.valid(); assertEquals("rootBlock0", rootBlock0, rootBlock.isRootBlock0()); ! // assertEquals("segmentId", segmentId, rootBlock.getSegmentId()); assertEquals("nextOffset", nextOffset, rootBlock.getNextOffset()); assertEquals("firstTxId", firstTxId, rootBlock.getFirstCommitTime()); *************** *** 123,127 **** rootBlock.valid(); assertEquals("rootBlock0", rootBlock0, rootBlock.isRootBlock0()); ! assertEquals("segmentId", segmentId, rootBlock.getSegmentId()); assertEquals("nextOffset", nextOffset, rootBlock.getNextOffset()); assertEquals("firstTxId", firstTxId, rootBlock.getFirstCommitTime()); --- 126,130 ---- rootBlock.valid(); assertEquals("rootBlock0", rootBlock0, rootBlock.isRootBlock0()); ! // assertEquals("segmentId", segmentId, rootBlock.getSegmentId()); assertEquals("nextOffset", nextOffset, rootBlock.getNextOffset()); assertEquals("firstTxId", firstTxId, rootBlock.getFirstCommitTime()); *************** *** 145,149 **** final boolean rootBlock0 = true; // all values are legal. // ! final int segmentId = 0; // no constraint // final int nextOffsetOk = 100; --- 148,152 ---- final boolean rootBlock0 = true; // all values are legal. // ! // final int segmentId = 0; // no constraint // final int nextOffsetOk = 100; *************** *** 187,207 **** final long commitRecordIndexOk2 = 23L; final long commitRecordIndexBad = -1L; // legit. ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdOk, ! lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrOk, commitRecordIndexOk); // legit (firstTxIdOk2,lastTxIdOk2,commitTimeOK2). ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdOk2, ! lastTxIdOk2, commitTimeOk2, commitCounterOk, rootsAddrOk, commitRecordIndexOk); // legit (rootsAddr2, commitRecordIndex2) ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdOk, ! lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrOk2, commitRecordIndexOk2); // bad next offset try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetBad, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterOk, ! rootsAddrOk, commitRecordIndexOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 190,216 ---- final long commitRecordIndexOk2 = 23L; final long commitRecordIndexBad = -1L; + // + final UUID uuidOk = UUID.randomUUID(); + final UUID uuidBad = null; // legit. ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk, ! lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrOk, commitRecordIndexOk, ! uuidOk); // legit (firstTxIdOk2,lastTxIdOk2,commitTimeOK2). ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk2, ! lastTxIdOk2, commitTimeOk2, commitCounterOk, rootsAddrOk, commitRecordIndexOk, ! uuidOk); // legit (rootsAddr2, commitRecordIndex2) ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk, ! lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrOk2, commitRecordIndexOk2, ! uuidOk); // bad next offset try { ! new RootBlockView(rootBlock0, nextOffsetBad, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterOk, ! rootsAddrOk, commitRecordIndexOk,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 211,217 **** // bad first,last transaction start timestamps and commit timestamp. try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdBad1, lastTxIdBad1, commitTimeBad1, ! commitCounterOk, rootsAddrOk, commitRecordIndexOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 220,226 ---- // bad first,last transaction start timestamps and commit timestamp. try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdBad1, lastTxIdBad1, commitTimeBad1, ! commitCounterOk, rootsAddrOk, commitRecordIndexOk,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 219,225 **** } try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdBad2, lastTxIdBad2, commitTimeBad2, ! commitCounterOk, rootsAddrOk, commitRecordIndexOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 228,234 ---- } try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdBad2, lastTxIdBad2, commitTimeBad2, ! commitCounterOk, rootsAddrOk, commitRecordIndexOk,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 227,233 **** } try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdBad3, lastTxIdBad3, commitTimeBad3, ! commitCounterOk, rootsAddrOk, commitRecordIndexOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 236,242 ---- } try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdBad3, lastTxIdBad3, commitTimeBad3, ! commitCounterOk, rootsAddrOk, commitRecordIndexOk,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 235,241 **** } try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdBad4, lastTxIdBad4, commitTimeBad4, ! commitCounterOk, rootsAddrOk, commitRecordIndexOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 244,250 ---- } try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdBad4, lastTxIdBad4, commitTimeBad4, ! commitCounterOk, rootsAddrOk, commitRecordIndexOk,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 245,251 **** // bad commit counter try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterBad, rootsAddrOk ! , commitRecordIndexOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 254,260 ---- // bad commit counter try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterBad, rootsAddrOk ! , commitRecordIndexOk,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 253,258 **** } try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdOk, ! lastTxIdOk, commitTimeOk, commitCounterBad2, rootsAddrOk, commitRecordIndexOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 262,267 ---- } try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk, ! lastTxIdOk, commitTimeOk, commitCounterBad2, rootsAddrOk, commitRecordIndexOk,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 262,268 **** // bad {commit record, commit record index} combinations. try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrBad, ! commitRecordIndexOk2); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 271,277 ---- // bad {commit record, commit record index} combinations. try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrBad, ! commitRecordIndexOk2,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 270,276 **** } try { ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrOk2, ! commitRecordIndexBad); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 279,285 ---- } try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrOk2, ! commitRecordIndexBad,uuidOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { *************** *** 282,288 **** * address is 0L while the commit record addr is defined. */ ! new RootBlockView(rootBlock0, segmentId, nextOffsetOk, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrOk2, ! commitRecordIndexOk); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { --- 291,307 ---- * address is 0L while the commit record addr is defined. */ ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk, lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrOk2, ! commitRecordIndexOk,uuidOk); ! fail("Expecting: " + IllegalArgumentException.class); ! } catch (IllegalArgumentException ex) { ! System.err.println("Ignoring expected exception: " + ex); ! } ! ! // bad UUID. ! try { ! new RootBlockView(rootBlock0, nextOffsetOk, firstTxIdOk, ! lastTxIdOk, commitTimeOk, commitCounterOk, rootsAddrBad, ! commitRecordIndexOk2,uuidBad); fail("Expecting: " + IllegalArgumentException.class); } catch (IllegalArgumentException ex) { |
