Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4069] branches/QUADS_QUERY_BRANCH
|
From: <tho...@us...> - 2011-01-09 20:58:16
|
Revision: 4069
http://bigdata.svn.sourceforge.net/bigdata/?rev=4069&view=rev
Author: thompsonbry
Date: 2011-01-09 20:58:02 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Merge JOURNAL_HA_BRANCH to QUADS_QUERY_BRANCH [2601:4061].
A summary of known test failures follows. I have not yet tested quads query against the bigdata federation (that will require a checkout on a machine with more resources). My focus in creating this summary was to verify the branch-to-branch merge. For the most part, it appears that test failures in the per-merge version of the branch were pre-existing failures in either the JOURNAL_HA_BRANCH or the QUADS_QUERY_BRANCH.
Notes appear beneath the test suite to which they apply. When there are no comments, the test suite ran without any failures or errors.
suite.addTest( com.bigdata.cache.TestAll.suite() );
TestHardReferenceGlobalLRURecycler#test_concurrentOperations()
TestHardReferenceGlobalLRURecyclerWithExplicitDeleteRequired#test_concurrentOperations()
suite.addTest( com.bigdata.io.TestAll.suite() );
TestFileChannel#test_transferAllFrom() - hangs under OSX.
suite.addTest( com.bigdata.net.TestAll.suite() );
suite.addTest( com.bigdata.config.TestAll.suite() );
suite.addTest( com.bigdata.util.TestAll.suite() );
suite.addTest( com.bigdata.util.concurrent.TestAll.suite() );
1 failure (before merge under OS X). Ok under Windows after merge.
suite.addTest( com.bigdata.striterator.TestAll.suite() );
suite.addTest( com.bigdata.counters.TestAll.suite() );
suite.addTest( com.bigdata.rawstore.TestAll.suite() );
suite.addTest( com.bigdata.btree.TestAll.suite() );
suite.addTest( com.bigdata.concurrent.TestAll.suite() );
suite.addTest( com.bigdata.quorum.TestAll.suite() );
suite.addTest( com.bigdata.ha.TestAll.suite() );
// Note: this has a dependency on the quorum package.
suite.addTest(com.bigdata.io.writecache.TestAll.suite());
suite.addTest( com.bigdata.journal.TestAll.suite() );
This failure was also present in the JOURNAL_HA_BRANCH:
java.lang.IllegalArgumentException: The commit counter must be greter than zero if there is a commit record: commitRecordAddr=50331651, but commitCounter=0
at com.bigdata.journal.RootBlockView.<init>(RootBlockView.java:471)
at com.bigdata.journal.TestRootBlockView.test_ctor_correctRejection(TestRootBlockView.java:404)
suite.addTest( com.bigdata.journal.ha.TestAll.suite() );
This gets a lot of test errors in the quads branch (post-merge of course). Those errors are also present in the JOURNAL_HA_BRANCH.
suite.addTest( com.bigdata.resources.TestAll.suite() );
suite.addTest( com.bigdata.relation.TestAll.suite() );
suite.addTest( com.bigdata.bop.TestAll.suite() );
suite.addTest( com.bigdata.relation.rule.eval.TestAll.suite() );
suite.addTest( com.bigdata.mdi.TestAll.suite() );
Note: This test suite is now empty - the tests are now invoked from the service test suite (for the HA branch as well).
suite.addTest( com.bigdata.service.TestAll.suite() );
- Pre-merge: Takes a long time to run under OSX (2000s, 2 errors; but
280s and 2 failures 1 error on the next CI run (#4)). When run from
eclipse, only
TestMasterTimeoutIdleTask#test_idleTimeout_LT_chunkTimeout() fails.
However, it fails repeatably under OSX (before merge) with assertion
error at line #473. However, running under ant it might be running
additional tests which interact with zk or jini (verify this).
- Post-merge: TestMasterTask#test_writeStartStop2() fails once (passes
on retry so this is one of the stochastic problems with that test
suite). No other errors.
suite.addTest( com.bigdata.bop.fed.TestAll.suite() );
- The only failures are "test_something()" methods.
suite.addTest( com.bigdata.sparse.TestAll.suite() );
suite.addTest( com.bigdata.search.TestAll.suite() );
suite.addTest( com.bigdata.bfs.TestAll.suite() );
TestFileMetadataIndex#test_create_update() - fail.
TestFileMetadataIndex#test_delete01() - fail
TestRangeScan#test_rangeScan() - write test
TestRangeDelete#test_rangeDelete() - write test
// suite.addTest( com.bigdata.service.mapReduce.TestAll.suite() );
// Jini integration
suite.addTest(com.bigdata.jini.TestAll.suite());
- Not tested under eclipse.
// RDF
suite.addTest(com.bigdata.rdf.TestAll.suite());
- 8 failures before merge under OSX CI build.
suite.addTest(com.bigdata.rdf.sail.TestAll.suite());
There are some failures here which are related to the inlining work which Mike is currently performing and to the lack of a port from the JOURNAL_HA_BRANCH of the magic search integration into the SAIL. The failures are summarized below.
TestNamedGraphs - leaks journal files (maybe testSearchQuery?).
TestSearchQuery#testWithMetadata() - leaks journal files.
TestTempTripleStore::
TestSPOStarJoin#testStarJoin1() fails.
TestSPOStarJoin#testStarJoin2() fails.
TestLocalTripleStore::
TestSPOStarJoin#testStarJoin1() fails.
TestSPOStarJoin#testStarJoin2() fails.
TestLocalTripleStoreWithoutStatementIdentifiers::
TestSPOStarJoin#testStarJoin1() fails.
TestSPOStarJoin#testStarJoin2() fails.
TestBigdataSailWithQuads::
TestNamedGraphs#testSearchQuery() fails.
TestSearchQuery#testWithMetadata() fails.
TestBigdataEvaluationStrategyImpl#test_free_text_search() fails.
BigdataConnectionTest#testPreparedTupleQuery2() fails.
BigdataSparqlTest#open-cmp-01 fails.
BigdataSparqlTest#open-cmp-02 fails.
TestBigdataSailWithoutSids::
TestSearchQuery#testWithMetadata() fails.
TestBigdataEvaluationStrategyImpl#test_free_text_search() fails.
TestBigdataSailWithSids::
TestSearchQuery#testWithMetadata() fails.
TestBigdataEvaluationStrategyImpl#test_free_text_search() fails.
TestBigdataSailWithSidsWithoutInlining::
TestSearchQuery#testWithMetadata() fails.
TestBigdataEvaluationStrategyImpl#test_free_text_search() fails.
Next steps are to clean up CI against the post-merge version of the branch and to bring forward some remaining features from the JOURNAL_HA_BRANCH which are related to the SAIL.
- MikeP hand reconcile: BigdataEvaluationStrategy2 => BigdataEvaluationStrategy (magic search feature port).
- MikeP update IsInline and IsLiteral to the BOp model.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/.project
branches/QUADS_QUERY_BRANCH/bigdata/src/architecture/mergePriority.xls
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/AbstractBTree.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/BTree.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/BytesUtil.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexMetadata.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexSegmentCheckpoint.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/Node.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/keys/IKeyBuilder.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/keys/KeyBuilder.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractBufferStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractLocalTransactionManager.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractTask.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/BufferMode.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/CommitRecord.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/CommitRecordIndex.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ConcurrencyManager.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/DirectBufferStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/DiskBackedBufferStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/DumpJournal.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/FileMetadata.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/IAtomicStore.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/IBufferStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/IRootBlockView.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ITransactionService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/Journal.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/JournalTransactionService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/Options.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/RootBlockView.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/TemporaryStore.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/TransientBufferStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/WORMStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rawstore/AbstractRawStore.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rawstore/IAddressManager.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rawstore/IRawStore.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rawstore/WormAddressManager.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/AbstractResource.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/accesspath/BlockingBuffer.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/eval/ProgramTask.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/eval/pipeline/JoinTaskFactoryTask.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/AllocBlock.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/Allocator.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/FixedAllocator.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/FixedOutputStream.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/IStore.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/PSOutputStream.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWWriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/StorageTerminalError.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/Hiterator.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/TermFrequencyData.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/TermMetadata.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/TokenBuffer.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/service/AbstractTransactionService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/util/ChecksumError.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/util/ChecksumUtility.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/btree/TestIndexSegmentAddressManager.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/btree/TestIndexSegmentCheckpoint.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/counters/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractBufferStrategyTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractIndexManagerTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractInterruptsTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractJournalTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractMRMWTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractMROWTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractRestartSafeTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/StressTestConcurrentTx.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/StressTestConcurrentUnisolatedIndices.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestAbort.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestCommitHistory.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestConcurrentJournal.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestJournalBasics.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestJournalShutdown.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestRootBlockView.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestWORMStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/rawstore/AbstractRawStoreTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/relation/rule/AbstractRuleTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/relation/rule/TestRule.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestKeyBuilder.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/util/TestChecksumUtility.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/BigdataZooDefs.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/ManageLogicalServiceTask.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperClientConfig.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/zookeeper/AbstractZNodeConditionWatcher.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/zookeeper/DumpZookeeper.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/zookeeper/HierarchicalZNodeWatcher.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/zookeeper/UnknownChildrenWatcher.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/zookeeper/ZLockImpl.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/zookeeper/ZooKeeperAccessor.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/zookeeper/AbstractZooTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/zookeeper/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/zookeeper/TestZLockImpl.java
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/RWStore.properties
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/build.properties
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/build.xml
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/RWStore.properties
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/build.properties
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/build.xml
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/inf/ClosureStats.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/inf/Justification.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/inf/TruthMaintenance.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/DefaultExtensionFactory.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtensionFactory.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSD.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/CompareBOp.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/InlineEQ.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathBOp.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/load/SingleResourceReaderTask.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/magic/IRISUtils.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rio/LoadStats.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleDistinctTermScan.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/DefaultGraphSolutionExpander.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPORelation.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractLocalTripleStore.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/store/BD.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/vocab/Vocabulary.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal/SampleExtensionFactory.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TaskATest.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestJustifications.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestSlice.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPORelation.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/FreeTextSearchExpander.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNamedGraphs.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestSearchQuery.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/stress/testSimpleLubm.xml
branches/QUADS_QUERY_BRANCH/build.properties
branches/QUADS_QUERY_BRANCH/build.xml
Added Paths:
-----------
branches/QUADS_QUERY_BRANCH/bigdata/src/architecture/RWStore.xls
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/counters/striped/
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/counters/striped/StripedCounters.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HACommitGlue.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HAGlue.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HAGlueBase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HAPipelineGlue.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HAReadGlue.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumCommit.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumCommitImpl.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumPipeline.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumPipelineImpl.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumRead.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumReadImpl.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumServiceBase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/HAReceiveService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/HASendService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/HAWriteMessageBase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/AllocationData.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/ObjectSocketChannelStream.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/messages/
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/BufferedWrite.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/IWriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/DeleteBlockCommitter.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/IHABufferStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/JournalDelegate.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/RWAddressManager.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/RootBlockCommitter.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/RootBlockUtility.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ha/
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ha/HAWriteMessage.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ha/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/AbstractQuorumClient.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/AbstractQuorumMember.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/AsynchronousQuorumCloseException.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/Quorum.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumClient.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumEvent.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumEventEnum.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumException.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumListener.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumMember.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumStateChangeListener.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumStateChangeListenerBase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumWatcher.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/Binding.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/IBinding.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/DirectFixedAllocator.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/IAllocationContext.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/PhysicalAddressResolutionException.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/StorageStats.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/DefaultAnalyzerFactory.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/IAnalyzerFactory.java
branches/QUADS_QUERY_BRANCH/bigdata/src/samples/com/bigdata/samples/btree/JournalReadOnlyTxExample.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/counters/striped/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/counters/striped/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/counters/striped/TestStripedCounters.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/pipeline/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/pipeline/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive3Nodes.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/TestCase3.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/messages/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/TestWriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestWORMStrategyNoCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestWORMStrategyOneCacheBuffer.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/AbstractHAJournalTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/HABranch.txt
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/TestHAWORMStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/TestHAWritePipeline.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/TestJournalHA.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/force-vs-sync.txt
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/AbstractQuorumTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/MockQuorumFixture.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestHA3QuorumSemantics.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestMockQuorumFixture.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestSingletonQuorumSemantics.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/ha/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/journal/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/journal/ha/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/journal/ha/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/OrderedSetDifference.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/QuorumPipelineState.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/QuorumServiceState.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/QuorumTokenState.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/UnorderedSetDifference.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorum.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/journal/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/journal/ha/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/journal/ha/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/journal/ha/zk/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/AbstractZkQuorumTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/MockQuorumMember.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/MockServiceRegistrar.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestSetDifference.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestZkHA3QuorumSemantics.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestZkQuorum.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestZkSingletonQuorumSemantics.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/zookeeper/TestEphemeralSemantics.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/DateTimeExtension.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IsInline.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IsLiteral.java
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/store/DumpStore.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/Q14Test.java
Removed Paths:
-------------
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/counters/striped/StripedCounters.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HACommitGlue.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HAGlue.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HAGlueBase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HAPipelineGlue.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/HAReadGlue.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumCommit.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumCommitImpl.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumPipeline.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumPipelineImpl.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumRead.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumReadImpl.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/QuorumServiceBase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/HAReceiveService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/HASendService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/HAWriteMessageBase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/ha/pipeline/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/IWriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/WriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/WriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/BufferedWrite.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/IWriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/writecache/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ha/HAWriteMessage.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/ha/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/AbstractQuorumClient.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/AbstractQuorumMember.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/AsynchronousQuorumCloseException.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/Quorum.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumClient.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumEvent.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumEventEnum.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumException.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumListener.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumMember.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumStateChangeListener.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumStateChangeListenerBase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/QuorumWatcher.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/quorum/package.html
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/BlobAllocator.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/Config.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/DirectOutputStream.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/ICommitCallback.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/LockFile.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/PSInputStream.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/rwstore/WriteBlock.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/service/IWritePipeline.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/counters/striped/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/counters/striped/TestStripedCounters.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/pipeline/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/pipeline/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive3Nodes.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/TestWriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/TestWriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/io/writecache/TestWriteCache.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ReplicatedStore.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ReplicatedStoreService.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/AbstractHAJournalTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/HABranch.txt
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/TestHAWORMStrategy.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/TestHAWritePipeline.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/TestJournalHA.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/ha/force-vs-sync.txt
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/AbstractQuorumTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/MockQuorumFixture.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestHA3QuorumSemantics.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestMockQuorumFixture.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestSingletonQuorumSemantics.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/ha/
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/journal/ha/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/journal/ha/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/OrderedSetDifference.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/QuorumPipelineState.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/QuorumServiceState.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/QuorumTokenState.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/UnorderedSetDifference.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorum.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/zookeeper/ZNodeLockWatcher.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/journal/ha/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/journal/ha/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/journal/ha/zk/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/AbstractZkQuorumTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/MockQuorumMember.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/MockServiceRegistrar.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestAll.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestSetDifference.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestZkHA3QuorumSemantics.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestZkQuorum.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/quorum/zk/TestZkSingletonQuorumSemantics.java
Property Changed:
----------------
branches/QUADS_QUERY_BRANCH/
branches/QUADS_QUERY_BRANCH/bigdata-compatibility/
branches/QUADS_QUERY_BRANCH/bigdata-compatibility/src/
branches/QUADS_QUERY_BRANCH/bigdata-compatibility/src/test/
branches/QUADS_QUERY_BRANCH/bigdata-compatibility/src/test/com/
branches/QUADS_QUERY_BRANCH/bigdata-compatibility/src/test/com/bigdata/
branches/QUADS_QUERY_BRANCH/bigdata-compatibility/src/test/com/bigdata/journal/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/attr/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/disco/
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/util/config/
branches/QUADS_QUERY_BRANCH/bigdata-perf/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/lib/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/benchmark/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/benchmark/generator/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/benchmark/model/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/benchmark/qualification/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/benchmark/serializer/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/benchmark/testdriver/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/benchmark/tools/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/java/benchmark/vocabulary/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/resources/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/resources/bsbm-data/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/resources/bsbm-data/queries/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/resources/logging/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/test/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/test/benchmark/
branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm/src/test/benchmark/bigdata/
branches/QUADS_QUERY_BRANCH/bigdata-perf/btc/
branches/QUADS_QUERY_BRANCH/bigdata-perf/btc/src/resources/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/LEGAL/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/lib/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/edu/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/edu/lehigh/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/edu/lehigh/swat/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/uba/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/api/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/resources/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/resources/answers (U1)/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/resources/config/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/resources/logging/
branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/src/resources/scripts/
branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot/
branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot/src/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation/rule/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/samples/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/samples/com/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/samples/com/bigdata/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/samples/com/bigdata/rdf/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/samples/com/bigdata/rdf/internal/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/relation/
branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/relation/rule/
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets/
branches/QUADS_QUERY_BRANCH/dsi-utils/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/java/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/java/it/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/java/it/unimi/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/java/it/unimi/dsi/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/java/it/unimi/dsi/compression/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/java/it/unimi/dsi/io/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/java/it/unimi/dsi/util/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/test/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/test/it/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/test/it/unimi/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/test/it/unimi/dsi/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/test/it/unimi/dsi/io/
branches/QUADS_QUERY_BRANCH/dsi-utils/src/test/it/unimi/dsi/util/
branches/QUADS_QUERY_BRANCH/osgi/
branches/QUADS_QUERY_BRANCH/src/resources/bin/config/
branches/QUADS_QUERY_BRANCH/src/resources/config/
Property changes on: branches/QUADS_QUERY_BRANCH
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3659-4061
+ /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
Modified: branches/QUADS_QUERY_BRANCH/.project
===================================================================
--- branches/QUADS_QUERY_BRANCH/.project 2011-01-09 15:38:34 UTC (rev 4068)
+++ branches/QUADS_QUERY_BRANCH/.project 2011-01-09 20:58:02 UTC (rev 4069)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bigdata</name>
+ <name>bigdata-quads-clean-for-merge</name>
<comment></comment>
<projects>
</projects>
Copied: branches/QUADS_QUERY_BRANCH/bigdata/src/architecture/RWStore.xls (from rev 4066, branches/JOURNAL_HA_BRANCH/bigdata/src/architecture/RWStore.xls)
===================================================================
(Binary files differ)
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/architecture/mergePriority.xls
===================================================================
(Binary files differ)
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/AbstractBTree.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/AbstractBTree.java 2011-01-09 15:38:34 UTC (rev 4068)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/AbstractBTree.java 2011-01-09 20:58:02 UTC (rev 4069)
@@ -3350,6 +3350,8 @@
* @todo Actually, I think that this is just a fence post in ringbuffer
* beforeOffer() method and the code might work without the synchronized
* block if the fence post was fixed.
+ *
+ * @see https://sourceforge.net/apps/trac/bigdata/ticket/201
*/
synchronized (this) {
@@ -3682,6 +3684,7 @@
// write the serialized node or leaf onto the store.
final long addr;
+ final long oldAddr;
{
final long begin = System.nanoTime();
@@ -3691,7 +3694,9 @@
// now we have a new address, delete previous identity if any
if (node.isPersistent()) {
- store.delete(node.getIdentity());
+ oldAddr = node.getIdentity();
+ } else {
+ oldAddr = 0;
}
btreeCounters.writeNanos += System.nanoTime() - begin;
@@ -3708,6 +3713,13 @@
*/
node.setIdentity(addr);
+ if (oldAddr != 0L) {
+ if (storeCache!=null) {
+ // remove from cache.
+ storeCache.remove(oldAddr);
+ }
+ store.delete(oldAddr);
+ }
node.setDirty(false);
@@ -3821,9 +3833,10 @@
assert tmp.position() == 0;
- assert tmp.limit() == store.getByteCount(addr) : "limit="
- + tmp.limit() + ", byteCount(addr)="
- + store.getByteCount(addr)+", addr="+store.toString(addr);
+ // Note: This assertion is invalidated when checksums are inlined in the store records.
+// assert tmp.limit() == store.getByteCount(addr) : "limit="
+// + tmp.limit() + ", byteCount(addr)="
+// + store.getByteCount(addr)+", addr="+store.toString(addr);
btreeCounters.readNanos.addAndGet( System.nanoTime() - begin );
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/BTree.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/BTree.java 2011-01-09 15:38:34 UTC (rev 4068)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/BTree.java 2011-01-09 20:58:02 UTC (rev 4069)
@@ -39,6 +39,7 @@
import com.bigdata.journal.ICommitter;
import com.bigdata.journal.IIndexManager;
import com.bigdata.journal.Name2Addr;
+import com.bigdata.journal.RWStrategy;
import com.bigdata.journal.Name2Addr.Entry;
import com.bigdata.mdi.IResourceMetadata;
import com.bigdata.mdi.JournalMetadata;
@@ -1173,8 +1174,21 @@
assertNotReadOnly();
- if (getIndexMetadata().getDeleteMarkers()) {
-
+ /*
+ * FIXME Per https://sourceforge.net/apps/trac/bigdata/ticket/221, we
+ * should special case this for the RWStore when delete markers are not
+ * enabled and just issue deletes against each node and leave in the
+ * BTree. This could be done using a post-order traversal of the nodes
+ * and leaves such that the parent is not removed from the store until
+ * its children have been removed. The deletes should be low-level
+ * IRawStore#delete(addr) invocations without maintenance to the B+Tree
+ * data structures. Afterwards replaceRootWithEmptyLeaf() should be
+ * invoked to discard the hard reference ring buffer and associate a new
+ * root leaf with the B+Tree.
+ */
+ if (getIndexMetadata().getDeleteMarkers()
+ || getStore() instanceof RWStrategy) {
+
/*
* Write deletion markers for each non-deleted entry. When the
* transaction commits, those delete markers will have to validate
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/BytesUtil.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/BytesUtil.java 2011-01-09 15:38:34 UTC (rev 4068)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/BytesUtil.java 2011-01-09 20:58:02 UTC (rev 4069)
@@ -27,6 +27,7 @@
import it.unimi.dsi.io.InputBitStream;
import it.unimi.dsi.io.OutputBitStream;
+import java.nio.ByteBuffer;
import java.util.Comparator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -1019,4 +1020,81 @@
static final private Pattern PATTERN_BYTE_COUNT = Pattern.compile(
"([0-9]+)(k|kb|m|mb|g|gb)?", Pattern.CASE_INSENSITIVE);
+ /**
+ * Return a byte[] having the data in the {@link ByteBuffer} from the
+ * {@link ByteBuffer#position()} to the {@link ByteBuffer#limit()}. The
+ * position, limit, and mark are not affected by this operation. When the
+ * {@link ByteBuffer} has a backing array, the array offset is ZERO (0), and
+ * the {@link ByteBuffer#limit()} is equal to the
+ * {@link ByteBuffer#capacity()} then the backing array is returned.
+ * Otherwise, a new byte[] is allocated and the data are copied into that
+ * byte[], which is then returned.
+ *
+ * @param b
+ * The {@link ByteBuffer}.
+ *
+ * @return The byte[].
+ */
+ static public byte[] toArray(final ByteBuffer b) {
+
+ return toArray(b, false/* forceCopy */);
+
+ }
+
+ /**
+ * Return a byte[] having the data in the {@link ByteBuffer} from the
+ * {@link ByteBuffer#position()} to the {@link ByteBuffer#limit()}. The
+ * position, limit, and mark are not affected by this operation.
+ * <p>
+ * Under certain circumstances it is possible and may be desirable to return
+ * the backing {@link ByteBuffer#array}. This behavior is enabled by
+ * <code>forceCopy := false</code>.
+ * <p>
+ * It is possible to return the backing byte[] when the {@link ByteBuffer}
+ * has a backing array, the array offset is ZERO (0), and the
+ * {@link ByteBuffer#limit()} is equal to the {@link ByteBuffer#capacity()}
+ * then the backing array is returned. Otherwise, a new byte[] must be
+ * allocated, and the data are copied into that byte[], which may then be
+ * returned.
+ *
+ * @param b
+ * The {@link ByteBuffer}.
+ * @param forceCopy
+ * When <code>false</code>, the backing array will be returned if
+ * possible.
+ *
+ * @return The byte[].
+ */
+ static public byte[] toArray(final ByteBuffer b, final boolean forceCopy) {
+
+ if (b.hasArray() && b.arrayOffset() == 0 && b.position() == 0) {
+
+// && b.limit() == b.capacity()
+
+ final byte[] a = b.array();
+
+ if (a.length == b.limit()) {
+
+ return a;
+
+ }
+
+ }
+
+ /*
+ * Copy the data into a byte[] using a read-only view on the buffer so
+ * that we do not mess with its position, mark, or limit.
+ */
+ final ByteBuffer tmp = b.asReadOnlyBuffer();
+
+ final int len = tmp.remaining();
+
+ final byte[] a = new byte[len];
+
+ tmp.get(a);
+
+ return a;
+
+ }
+
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexMetadata.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexMetadata.java 2011-01-09 15:38:34 UTC (rev 4068)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexMetadata.java 2011-01-09 20:58:02 UTC (rev 4069)
@@ -271,7 +271,7 @@
/**
* A reasonable maximum branching factor for a {@link BTree}.
*/
- int MAX_BTREE_BRANCHING_FACTOR = 1024;
+ int MAX_BTREE_BRANCHING_FACTOR = 4196;
/**
* A reasonable maximum branching factor for an {@link IndexSegment}.
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java 2011-01-09 15:38:34 UTC (rev 4068)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/IndexSegmentBuilder.java 2011-01-09 20:58:02 UTC (rev 4069)
@@ -59,7 +59,7 @@
import com.bigdata.io.FileChannelUtility;
import com.bigdata.io.NOPReopener;
import com.bigdata.io.SerializerUtil;
-import com.bigdata.io.WriteCache;
+import com.bigdata.io.writecache.WriteCache;
import com.bigdata.journal.Journal;
import com.bigdata.journal.Name2Addr;
import com.bigdata.journal.TemporaryRawStore;
@@ -71,6 +71,7 @@
import com.bigdata.rawstore.IBlock;
import com.bigdata.rawstore.IRawStore;
import com.bigdata.rawstore.WormAddressManager;
+import com.bigdata.util.ChecksumUtility;
/**
* Builds an {@link IndexSegment} given a source btree and a target branching
@@ -374,6 +375,32 @@
* The bloom filter iff we build one (errorRate != 0.0).
*/
final IBloomFilter bloomFilter;
+
+ /**
+ * When <code>true</code> record level checksums will be used in the
+ * generated file.
+ *
+ * FIXME This can not be enabled until we factor out the direct use of the
+ * {@link WriteCache} since special handling is otherwise required to ensure
+ * that the checksum makes it into the output record when we write directly
+ * on the disk.
+ *
+ * FIXME When enabling this, make sure that the bloom filter,
+ * {@link IndexMetadata}, and the blobs are all checksummed and make sure
+ * that the {@link IndexSegmentStore} verifies the checksums when it reads
+ * through to the disk and only returns the raw record w/o the trailing
+ * checksum.
+ *
+ * FIXME The right time to reconcile these things may be when this branch
+ * (HAJournal) is merged with the dynamic shard refactor branch.
+ */
+ final private boolean useChecksums = false;
+
+ /**
+ * Used to compute record level checksums when {@link #useChecksums} is
+ * <code>true</code>.
+ */
+ final private ChecksumUtility checker = new ChecksumUtility();
/**
* The file on which the {@link IndexSegment} is written. The file is closed
@@ -1183,7 +1210,10 @@
throw new IllegalArgumentException();
final long begin_setup = System....
[truncated message content] |
