Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3781] branches/bbb_cleanup
|
From: <res...@us...> - 2010-10-13 13:27:59
|
Revision: 3781
http://bigdata.svn.sourceforge.net/bigdata/?rev=3781&view=rev
Author: resendes
Date: 2010-10-13 13:27:48 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
Merge "up" from maven_scaleout branch
Modified Paths:
--------------
branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/src/resources/logging/log4j.properties
branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/src/resources/logging/log4j.properties
branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources/logging/log4j.properties
branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/src/resources/logging/log4j.properties
branches/bbb_cleanup/bigdata-core/pom.xml
branches/bbb_cleanup/bigdata-core/src/main/deploy/legacy/bigdata-resources/logging/log4j-perf-tests.properties
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/log4j.properties
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/bfs/BigdataFileSystem.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTreeTupleCursor.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/BTree.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegment.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentBuilder.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/KeyAfterPartitionException.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/KeyBeforePartitionException.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/Node.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/ReadOnlyIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/ViewStatistics.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/proc/RangeCountProcedure.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/HardReferenceGlobalLRU.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/HardReferenceGlobalLRURecycler.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/HardReferenceGlobalLRURecyclerExplicitDeleteRequired.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/LRUNexus.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/concurrent/NonBlockingLockManagerWithNewDesign.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/httpd/DummyEventReportingService.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/AbstractJournal.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/AbstractTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/CommitRecordIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/ConcurrencyManager.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/DumpJournal.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/Name2Addr.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/RegisterIndexTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/WriteExecutorService.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/loadbalancer/EmbeddedLoadBalancer.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/AbstractResourceMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/IPartitionMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/IndexPartitionCause.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/PartitionLocator.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/SegmentMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedIndexStore.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedShardLocator.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/rules/BackchainAccessPath.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/relation/accesspath/AbstractAccessPath.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/relation/rule/eval/IJoinNexus.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/AsynchronousOverflowTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/BTreeMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/CompactingMergeTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/IncrementalBuildTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/IndexManager.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/IndexSegmentIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/JoinIndexPartitionTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/JournalIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/MoveTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/OverflowManager.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/PurgeResult.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/ResourceEvents.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/ResourceManager.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/ScatterSplitTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/SplitIndexPartitionTask.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/SplitResult.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/SplitUtility.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/ViewMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/AbstractScaleOutClient.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/AbstractScaleOutFederation.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/AbstractTransactionService.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/CacheOnceMetadataIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/CachingMetadataIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/CommitTimeIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/DistributedTransactionService.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/EventReceiver.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/EventResource.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/IBigdataFederation.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/IDataService.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/IMetadataService.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/IndexCache.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/LoadBalancerService.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/MetadataIndexCache.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/MetadataService.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/NoCacheMetadataIndexView.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ShardLocator.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ShardManagement.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/jini/util/DumpFederation.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView2.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ndx/AbstractSplitter.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ndx/ClientIndexView.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ndx/ClientIndexViewRefactor.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ndx/IScaleOutClientIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/ndx/ISplitter.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/transaction/EmbeddedTransactionService.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/boot/BootComponentTest.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestIndexPartitionFencePosts.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestRemoveAll.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/cache/TestHardReferenceQueue.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/concurrent/AbstractStressTestNonBlockingLockManager.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/concurrent/TestAll.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/counters/TestAll.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/journal/TestCommitRecordIndex.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractServerTestCase.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/resources/TestBuildTask.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/resources/TestBuildTask2.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/resources/TestMergeTask.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/resources/TestOverflow.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/resources/TestResourceManagerBootstrap.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/resources/TestSegSplitter.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/AbstractEmbeddedFederationTestCase.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/StressTestConcurrent.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestDistributedTransactionServiceRestart.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestEmbeddedClient.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestEventReceiver.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestMetadataIndex.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestMove.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestOverflow.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestScatterSplit.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestSnapshotHelper.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestSplitJoin.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/ndx/TestSplitter.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/AbstractKeyRangeMasterTestCase.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/util/TestEntryUtil.java
branches/bbb_cleanup/bigdata-integ/pom.xml
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/service/jini/AbstractServerTestCase.java
branches/bbb_cleanup/pom.xml
Added Paths:
-----------
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IMetadataIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/JournalMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/LocalPartitionMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/MetadataIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/MetadataIndexView.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/event/
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/event/IEventParams.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/EventBTree.java
branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/conf/log4j.properties
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/ConditionalParameterized.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/ConditionalRunner.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/FalseCondition.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/IgnoreIf.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/LongTestsExcluded.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/TestIgnoreIf.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/TestIgnoreIfOnIgnoredClass.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/TestIgnoreIfOnNotIgnoredClass.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/TrueCondition.java
Removed Paths:
-------------
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/DelegateIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/concurrent/NonBlockingLockManager.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/query/CounterSetBTreeSelector.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/query/CounterSetLoader.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/store/CounterSetBTree.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/event/IEventParams.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/IMetadataIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/JournalMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/LocalPartitionMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/MetadataIndex.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/mdi/MetadataIndexView.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/Params.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/concurrent/TestNonBlockingLockManager.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/counters/store/TestAll.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/counters/store/TestCounterSetBTree.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/ConditionalParameterized.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/ConditionalRunner.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/FalseCondition.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/IgnoreIf.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/LongTestsExcluded.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/TestIgnoreIf.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/TestIgnoreIfOnIgnoredClass.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/TestIgnoreIfOnNotIgnoredClass.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/test/conditional/TrueCondition.java
Property Changed:
----------------
branches/bbb_cleanup/
branches/bbb_cleanup/bigdata-core/bigdata-perf/
branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources/
branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL/
branches/bbb_cleanup/bigdata-core/dsi-utils/lib/
branches/bbb_cleanup/bigdata-core/dsi-utils/src/
branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/bbb_cleanup/bigdata-core/osgi/
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot/
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr/
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/disco/
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/util/
branches/bbb_cleanup/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
Property changes on: branches/bbb_cleanup
___________________________________________________________________
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-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /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-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438,3709-3780
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/bbb_cleanup/bigdata-core/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/bigdata-perf:3588-3690
/trunk/bigdata-perf:3379-3541
+ /branches/bbb_cleanup/bigdata-core/bigdata-perf:3588-3690
/branches/maven_scaleout/bigdata-core/bigdata-perf:3709-3780
/trunk/bigdata-perf:3379-3541
Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/src/resources/logging/log4j.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/src/resources/logging/log4j.properties 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/src/resources/logging/log4j.properties 2010-10-13 13:27:48 UTC (rev 3781)
@@ -68,7 +68,6 @@
#log4j.logger.com.bigdata.service.AbstractTransactionService=INFO
#log4j.logger.com.bigdata.journal.AbstractLocalTransactionManager=INFO
#log4j.logger.com.bigdata.concurrent.TxDag=WARN
-#log4j.logger.com.bigdata.concurrent.NonBlockingLockManager=WARN
#log4j.logger.com.bigdata.concurrent.TestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.AbstractStressTestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.LockManager=INFO
Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/src/resources/logging/log4j.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/src/resources/logging/log4j.properties 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/src/resources/logging/log4j.properties 2010-10-13 13:27:48 UTC (rev 3781)
@@ -67,7 +67,6 @@
#log4j.logger.com.bigdata.service.AbstractTransactionService=INFO
#log4j.logger.com.bigdata.journal.AbstractLocalTransactionManager=INFO
#log4j.logger.com.bigdata.concurrent.TxDag=WARN
-#log4j.logger.com.bigdata.concurrent.NonBlockingLockManager=WARN
#log4j.logger.com.bigdata.concurrent.TestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.AbstractStressTestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.LockManager=INFO
Property changes on: branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources:3588-3690
/branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/trunk/bigdata-perf/lubm/src/resources:3379-3541
+ /branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources:3588-3690
/branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources:3709-3780
/trunk/bigdata-perf/lubm/src/resources:3379-3541
Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources/logging/log4j.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources/logging/log4j.properties 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources/logging/log4j.properties 2010-10-13 13:27:48 UTC (rev 3781)
@@ -57,7 +57,6 @@
#log4j.logger.com.bigdata.service.AbstractTransactionService=INFO
#log4j.logger.com.bigdata.journal.AbstractLocalTransactionManager=INFO
log4j.logger.com.bigdata.concurrent.TxDag=WARN
-log4j.logger.com.bigdata.concurrent.NonBlockingLockManager=WARN
log4j.logger.com.bigdata.concurrent.TestNonBlockingLockManager=INFO
log4j.logger.com.bigdata.concurrent.AbstractStressTestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.LockManager=INFO
Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/src/resources/logging/log4j.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/src/resources/logging/log4j.properties 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/src/resources/logging/log4j.properties 2010-10-13 13:27:48 UTC (rev 3781)
@@ -67,7 +67,6 @@
#log4j.logger.com.bigdata.service.AbstractTransactionService=INFO
#log4j.logger.com.bigdata.journal.AbstractLocalTransactionManager=INFO
#log4j.logger.com.bigdata.concurrent.TxDag=WARN
-#log4j.logger.com.bigdata.concurrent.NonBlockingLockManager=WARN
#log4j.logger.com.bigdata.concurrent.TestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.AbstractStressTestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.LockManager=INFO
Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL:3588-3690
/trunk/dsi-utils/LEGAL:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL:3588-3690
/branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL:3709-3780
/trunk/dsi-utils/LEGAL:3379-3430,3499
Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/dsi-utils/lib:3588-3690
/trunk/dsi-utils/lib:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/lib:3588-3690
/branches/maven_scaleout/bigdata-core/dsi-utils/lib:3709-3780
/trunk/dsi-utils/lib:3379-3430,3499
Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/dsi-utils/src:3588-3690
/trunk/dsi-utils/src:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/src:3588-3690
/branches/maven_scaleout/bigdata-core/dsi-utils/src:3709-3780
/trunk/dsi-utils/src:3379-3430,3499
Property changes on: branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3690
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3690
/branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3709-3780
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
Property changes on: branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3690
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3690
/branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3709-3780
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
Property changes on: branches/bbb_cleanup/bigdata-core/osgi
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/osgi:3588-3690
/trunk/osgi:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/osgi:3588-3690
/branches/maven_scaleout/bigdata-core/osgi:3709-3780
/trunk/osgi:3379-3430,3499
Modified: branches/bbb_cleanup/bigdata-core/pom.xml
===================================================================
--- branches/bbb_cleanup/bigdata-core/pom.xml 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/pom.xml 2010-10-13 13:27:48 UTC (rev 3781)
@@ -14,12 +14,41 @@
<name>Bigdata Core</name>
<url>http://www.bigdata.com</url>
+ <description>The Bigdata Core</description>
<properties>
- <thirdParty.groupId>com.bigdata.thirdparty</thirdParty.groupId><!-- group ID for non-public bigdata dependencies. -->
+ <!-- group ID for non-public bigdata dependencies. -->
+ <thirdParty.groupId>com.bigdata.thirdparty</thirdParty.groupId>
+
+ <!--
+ These properties are used to set system properties that are required by the unit tests. See the surefire plugin configuration below. Any of these can be overridden on the command-line by
+ adding -D<property-name>=<propert-value>.
+ -->
+
+ <!--
+ This directory is created when the deployment tarball is created during the 'package' phase by the maven assembly plugin. If the naming convention as defined in
+ src/main/assembly/deploy.xml changes, this property needs to change as well.
+
+ TODO: May want to see if these can be promoted to the parent POM and shared with the bigdata-integ module
+ -->
+ <deploy.root.dir>${project.build.directory}/${project.artifactId}-${project.version}-deploy</deploy.root.dir>
+
+ <deploy.dir>${deploy.root.dir}/${project.artifactId}-${project.version}</deploy.dir>
+ <app.home>${deploy.dir}</app.home>
+ <test.dir>${deploy.dir}/testing</test.dir>
+ <test.conf.dir>${test.dir}/conf</test.conf.dir>
+ <deploy.lib>${deploy.dir}/lib</deploy.lib>
+ <test.codebase.dir>${deploy.lib.dl}</test.codebase.dir>
+ <test.codebase.port>23333</test.codebase.port>
+ <java.security.policy>${test.conf.dir}/policy.all</java.security.policy>
+ <log4j.configuration>${test.conf.dir}/log4j.properties</log4j.configuration>
+ <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
+ <default.nic>eth0</default.nic>
+
+ <!-- Set to empty string to indicate "unset." Application code will set a reasonable default -->
+ <federation.name></federation.name>
</properties>
-
<build>
<plugins>
<plugin>
@@ -31,6 +60,8 @@
java files were getting recompiled and put into the bigdata jar. This setting forces javac to only look for source in the current maven source directory.
-->
<sourcepath>${project.build.sourceDirectory}</sourcepath>
+ <!-- <Xlint></Xlint> -->
+ <!-- <Xlint:unchecked></Xlint:unchecked> -->
</compilerArguments>
</configuration>
</plugin>
@@ -82,48 +113,71 @@
</executions>
</plugin>
+ <!--
+ Configure the surefire plugin to run in the 'integration-test' phase rather than the 'test' phase. This allows us to run the unit tests after packaging has been done, but before the
+ build artifacts are installed during the 'install' phase
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!--
- TODO: BLECH! All the tests are excluded from the regular unit test phase. TODO: Need to split out the unit tests and the heavier integration tests, plus TODO: get all the unit
- tests passing so regressions can properly fail the build.
- -->
- <testFailureIgnore>true</testFailureIgnore>
- <includes />
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
+ <skip>true</skip>
</configuration>
- </plugin>
-
- <plugin>
- <!--
- These are where the heavier tests can be run. Right now failsafe looks for tests starting or ending with IT, aka FooIT.java or ITFoo.java, which don't exist yet, so nothing runs.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
- <id>integration-test</id>
+ <id>unit-tests</id>
+ <phase>integration-test</phase>
<goals>
- <goal>integration-test</goal>
+ <goal>test</goal>
</goals>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <skip>false</skip>
+ <!-- Run only the top-level suite which in turn runs the other suites and tests -->
+ <includes>
+ <include>com/bigdata/TestAll.java</include>
+ </includes>
+
+ <forkMode>pertest</forkMode>
+
+ <!-- These system properties are required by the unit tests. -->
+ <systemPropertyVariables>
+ <java.security.policy>${java.security.policy}</java.security.policy>
+ <java.net.preferIPv4Stack>${java.net.preferIPv4Stack}</java.net.preferIPv4Stack>
+ <log4j.configuration>${log4j.configuration}</log4j.configuration>
+
+ <app.home>${app.home}</app.home> <!-- This is the deployment directory, easily accessed by the DataFinder class. -->
+ <log4j.path>${log4j.configuration}</log4j.path>
+ <default.nic>${default.nic}</default.nic>
+ <federation.name>${federation.name}</federation.name>
+
+ <classserver.jar>${deploy.lib}/classserver.jar</classserver.jar>
+ <colt.jar>${deploy.lib}/colt.jar</colt.jar>
+ <ctc_utils.jar>${deploy.lib}/ctc_utils.jar</ctc_utils.jar>
+ <cweb-commons.jar>${deploy.lib}/cweb-commons.jar</cweb-commons.jar>
+ <cweb-extser.jar>${deploy.lib}/cweb-extser.jar</cweb-extser.jar>
+ <highscalelib.jar>${deploy.lib}/highscalelib.jar</highscalelib.jar>
+ <dsiutils.jar>${deploy.lib}/dsiutils.jar</dsiutils.jar>
+ <lgplutils.jar>${deploy.lib}/lgplutils.jar</lgplutils.jar>
+ <fastutil.jar>${deploy.lib}/fastutil.jar</fastutil.jar>
+ <icu4j.jar>${deploy.lib}/icu4j.jar</icu4j.jar>
+ <jsk-lib.jar>${deploy.lib}/jsk-lib.jar</jsk-lib.jar>
+ <jsk-platform.jar>${deploy.lib}/jsk-platform.jar</jsk-platform.jar>
+ <log4j.jar>${deploy.lib}/log4j.jar</log4j.jar>
+ <iris.jar>${deploy.lib}/iris.jar</iris.jar>
+ <jgrapht.jar>${deploy.lib}/jgrapht.jar</jgrapht.jar>
+ <openrdf-sesame.jar>${deploy.lib}/openrdf-sesame.jar</openrdf-sesame.jar>
+ <slf4j.jar>${deploy.lib}/slf4j.jar</slf4j.jar>
+ <nxparser.jar>${deploy.lib}/nxparser.jar</nxparser.jar>
+ <zookeeper.jar>${deploy.lib}/zookeeper.jar</zookeeper.jar>
+ </systemPropertyVariables>
+ </configuration>
</execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
- <!-- Workaround assembly issue for nicely organized libs in the deployment tarball. For more info
- see src/main/assemblies/deploy.xml
- -->
+ <!-- Workaround assembly issue for nicely organized libs in the deployment tarball. For more info see src/main/assemblies/deploy.xml -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -189,13 +243,9 @@
</execution>
</executions>
</plugin>
-
-
</plugins>
-
</build>
-
<dependencies>
@@ -204,7 +254,7 @@
<!-- ************************ Start of non-public dependencies ************************ -->
<!-- ************************ Start of non-public dependencies ************************ -->
- <!-- TODO: look at maven-bundle-plugin from felix to provide osgi support. bndlib version 0.0.357 in central. -->
+ <!-- TODO: look at maven-bundle-plugin from felix to provide osgi support. bndlib version 0.0.357 in central. -->
<dependency>
<groupId>${thirdParty.groupId}</groupId>
@@ -259,7 +309,7 @@
<version>[3.2.1,3.3)</version> <!-- TODO: This artifact is older, but the new 3.3.1 artifact in central is incompatible -->
</dependency>
- <!-- Apache River -->
+ <!-- Apache River -->
<dependency>
<groupId>org.apache.river</groupId>
<artifactId>tools</artifactId>
@@ -551,7 +601,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
@@ -584,9 +640,7 @@
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<configuration>
- <!--
- Details on configuring clover are in the parent pom.
- -->
+ <!-- Details on configuring clover are in the parent pom. -->
<excludes><!-- These are stuffed into the lookup starter jar, which uses a stripped classpath without clover. -->
<exclude>**/LookupStarter*.java</exclude>
<exclude>**/LogUtil.java</exclude>
Modified: branches/bbb_cleanup/bigdata-core/src/main/deploy/legacy/bigdata-resources/logging/log4j-perf-tests.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/deploy/legacy/bigdata-resources/logging/log4j-perf-tests.properties 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/src/main/deploy/legacy/bigdata-resources/logging/log4j-perf-tests.properties 2010-10-13 13:27:48 UTC (rev 3781)
@@ -52,7 +52,6 @@
#log4j.logger.com.bigdata.service.AbstractTransactionService=INFO
#log4j.logger.com.bigdata.journal.AbstractLocalTransactionManager=INFO
log4j.logger.com.bigdata.concurrent.TxDag=WARN
-log4j.logger.com.bigdata.concurrent.NonBlockingLockManager=WARN
log4j.logger.com.bigdata.concurrent.TestNonBlockingLockManager=INFO
log4j.logger.com.bigdata.concurrent.AbstractStressTestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.LockManager=INFO
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438,3709-3780
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Modified: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/log4j.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/log4j.properties 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/log4j.properties 2010-10-13 13:27:48 UTC (rev 3781)
@@ -56,7 +56,6 @@
#log4j.logger.com.bigdata.service.AbstractTransactionService=INFO
#log4j.logger.com.bigdata.journal.AbstractLocalTransactionManager=INFO
log4j.logger.com.bigdata.concurrent.TxDag=WARN
-log4j.logger.com.bigdata.concurrent.NonBlockingLockManager=WARN
log4j.logger.com.bigdata.concurrent.TestNonBlockingLockManager=INFO
log4j.logger.com.bigdata.concurrent.AbstractStressTestNonBlockingLockManager=INFO
#log4j.logger.com.bigdata.concurrent.LockManager=INFO
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr:3588-3690
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr:3588-3690
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr:3709-3780
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/bfs/BigdataFileSystem.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/bfs/BigdataFileSystem.java 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/bfs/BigdataFileSystem.java 2010-10-13 13:27:48 UTC (rev 3781)
@@ -34,7 +34,7 @@
import com.bigdata.journal.IResourceLock;
import com.bigdata.journal.ITx;
import com.bigdata.journal.Journal;
-import com.bigdata.mdi.MetadataIndex;
+import com.bigdata.btree.MetadataIndex;
import com.bigdata.rawstore.Bytes;
import com.bigdata.rawstore.IBlock;
import com.bigdata.rawstore.WormAddressManager;
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java 2010-10-13 13:27:48 UTC (rev 3781)
@@ -81,7 +81,6 @@
import com.bigdata.journal.IIndexManager;
import com.bigdata.journal.Journal;
import com.bigdata.mdi.IResourceMetadata;
-import com.bigdata.mdi.LocalPartitionMetadata;
import com.bigdata.rawstore.IRawStore;
import com.bigdata.resources.IndexManager;
import com.bigdata.resources.OverflowManager;
@@ -129,7 +128,6 @@
* </p>
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*
* @see KeyBuilder
*/
@@ -165,7 +163,7 @@
/**
* Log for btree opeations.
*/
- protected static final Logger log = Logger.getLogger(AbstractBTree.class);
+ private static final Logger log = Logger.getLogger(AbstractBTree.class);
/**
* True iff the {@link #log} level is INFO or less.
@@ -339,7 +337,6 @@
*
* @author <a href="mailto:tho...@us...">Bryan
* Thompson</a>
- * @version $Id$
*/
static class ChildMemoizer extends
Memoizer<LoadChildRequest/* request */, AbstractNode<?>/* child */> {
@@ -1363,7 +1360,6 @@
* Static class since must be {@link Serializable}.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
static final class TransientResourceMetadata implements IResourceMetadata {
@@ -2589,6 +2585,7 @@
}
+ //fko ===== needs generic type =====
final public ITupleIterator rangeIterator() {
return rangeIterator(null, null);
@@ -2603,6 +2600,7 @@
* @param toKey
* @return
*/
+ //fko ===== needs generic type =====
final public ITupleIterator rangeIterator(Object fromKey, Object toKey) {
fromKey = fromKey == null ? null : metadata.getTupleSerializer()
@@ -2615,6 +2613,7 @@
}
+ //fko ===== needs generic type =====
final public ITupleIterator rangeIterator(byte[] fromKey, byte[] toKey) {
return rangeIterator(fromKey, toKey, 0/* capacity */,
@@ -2666,6 +2665,7 @@
* @param toKey
* @return
*/
+ //fko ===== needs generic type =====
final public ITupleIterator rangeIterator(Object fromKey, Object toKey,
final int capacity,//
final int flags,//
@@ -2706,208 +2706,13 @@
* @todo add support to the iterator construct for filtering by a tuple
* revision timestamp range.
*/
- public ITupleIterator rangeIterator(//
- final byte[] fromKey,//
- final byte[] toKey,//
- final int capacityIsIgnored,//
- final int flags,//
- final IFilterConstructor filter//
- ) {
+ //fko ===== needs generic type =====
+ abstract public ITupleIterator rangeIterator(final byte[] fromKey,
+ final byte[] toKey,
+ final int capacityIsIgnored,
+ final int flags,
+ final IFilterConstructor filter);
-// btreeCounters.nrangeIterator.incrementAndGet();
-
- /*
- * Does the iterator declare that it will not write back on the index?
- */
- final boolean readOnly = ((flags & IRangeQuery.READONLY) != 0);
-
- if (readOnly && ((flags & IRangeQuery.REMOVEALL) != 0)) {
-
- throw new IllegalArgumentException();
-
- }
-
- /*
- * Note: this does not work out since it is not so easy to determine when
- * the iterator is a point test as toKey is the exclusive upper bound.
- */
-// * Note: this method will automatically apply the optional bloom filter to
-// * reject range iterator requests that correspond to a point test. However
-// * this can only be done when the fromKey and toKey are both non-null and
-// * equals and further when the iterator was not requested with any options
-// * that would permit concurrent modification of the index.
-// if (isBloomFilter()
-// && fromKey != null
-// && toKey != null
-// && (readOnly || (((flags & REMOVEALL) == 0) && ((flags & CURSOR) == 0)))
-// && BytesUtil.bytesEqual(fromKey, toKey)) {
-//
-// /*
-// * Do a fast rejection test using the bloom filter.
-// */
-// if(!getBloomFilter().contains(fromKey)) {
-//
-// /*
-// * The key is known to not be in the index so return an empty
-// * iterator.
-// */
-// return EmptyTupleIterator.INSTANCE;
-//
-// }
-//
-// /*
-// * Since the bloom filter accepts the key we fall through into the
-// * normal iterator logic. Using this code path is still possible
-// * that the filter gave us a false positive and that the key is not
-// * (in fact) in the index. Either way, the logic below will sort
-// * things out.
-// */
-//
-// }
-
- /*
- * Figure out what base iterator implementation to use. We will layer
- * on the optional filter(s) below.
- */
- ITupleIterator src;
-
- if ((this instanceof BTree) && ((flags & REVERSE) == 0)
- && ((flags & REMOVEALL) == 0) && ((flags & CURSOR) == 0)) {
-
- /*
- * Use the recursion-based striterator since it is faster for a
- * BTree (but not for an IndexSegment).
- *
- * Note: The recursion-based striterator does not support remove()!
- *
- * @todo we could pass in the Tuple here to make the APIs a bit more
- * consistent across the recursion-based and the cursor based
- * iterators.
- *
- * @todo when the capacity is one and REVERSE is specified then we
- * can optimize this using a reverse traversal striterator - this
- * will have lower overhead than the cursor for the BTree (but not
- * for an IndexSegment).
- */
-
-// src = fastForwardIterator(fromKey, toKey, capacity, flags);
-
- src = getRoot().rangeIterator(fromKey, toKey, flags);
-
- } else {
-
- final Tuple tuple = new Tuple(this, flags);
-
- if (this instanceof IndexSegment) {
-
- final IndexSegment seg = (IndexSegment) this;
-
- /*
- * @todo we could scan the list of pools and chose the best fit
- * pool and then allocate a buffer from that pool. Best fit
- * would mean either the byte range fits without "too much" slop
- * or the #of reads will have to perform is not too large. We
- * might also want to limit the maximum size of the reads.
- */
-
-// final DirectBufferPool pool = DirectBufferPool.INSTANCE_10M;
- final DirectBufferPool pool = DirectBufferPool.INSTANCE;
-
- if (true
- && ((flags & REVERSE) == 0)
- && ((flags & CURSOR) == 0)
- && (seg.getStore().getCheckpoint().maxNodeOrLeafLength <= pool
- .getBufferCapacity())
- && ((rangeCount(fromKey, toKey) / branchingFactor) > 2)) {
-
- src = new IndexSegmentMultiBlockIterator(seg, pool,
- fromKey, toKey, flags);
-
- } else {
-
- src = new IndexSegmentTupleCursor(seg, tuple, fromKey,
- toKey);
-
- }
-
- } else if (this instanceof BTree) {
-
- if (isReadOnly()) {
-
- // Note: this iterator does not allow removal.
- src = new ReadOnlyBTreeTupleCursor(((BTree) this), tuple,
- fromKey, toKey);
-
- } else {
-
- // Note: this iterator supports traversal with concurrent
- // modification.
- src = new MutableBTreeTupleCursor(((BTree) this),
- new Tuple(this, flags), fromKey, toKey);
-
- }
-
- } else {
-
- throw new UnsupportedOperationException(
- "Unknown B+Tree implementation: "
- + this.getClass().getName());
-
- }
-
- if ((flags & REVERSE) != 0) {
-
- /*
- * Reverse scan iterator.
- *
- * Note: The reverse scan MUST be layered directly over the
- * ITupleCursor. Most critically, REMOVEALL combined with a
- * REVERSE scan needs to process the tuples in reverse index
- * order and then delete them as it goes.
- */
-
- src = new Reverserator((ITupleCursor) src);
-
- }
-
- }
-
- if (filter != null) {
-
- /*
- * Apply the optional filter.
- *
- * Note: This needs to be after the reverse scan and before
- * REMOVEALL (those are the assumptions for the flags).
- */
-
- src = filter.newInstance(src);
-
- }
-
- if ((flags & REMOVEALL) != 0) {
-
- assertNotReadOnly();
-
- /*
- * Note: This iterator removes each tuple that it visits from the
- * source iterator.
- */
-
- src = new TupleRemover() {
- @Override
- protected boolean remove(ITuple e) {
- // remove all visited tuples.
- return true;
- }
- }.filter(src);
-
- }
-
- return src;
-
- }
-
/**
* Copy all data, including deleted index entry markers and timestamps iff
* supported by the source and target. The goal is an exact copy of the data
@@ -3894,7 +3699,6 @@
* {@link Reference} (a runtime security manager exception will result).
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*
* @param <T>
*/
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTreeTupleCursor.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTreeTupleCursor.java 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTreeTupleCursor.java 2010-10-13 13:27:48 UTC (rev 3781)
@@ -37,7 +37,6 @@
import com.bigdata.btree.isolation.IsolatedFusedView;
import com.bigdata.btree.view.FusedView;
import com.bigdata.io.DataOutputBuffer;
-import com.bigdata.mdi.LocalPartitionMetadata;
/**
* Class supporting random access to tuples and sequential tuple-based cursor
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/BTree.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/BTree.java 2010-10-13 12:37:58 UTC (rev 3780)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/BTree.java 2010-10-13 13:27:48 UTC (rev 3781)
@@ -32,18 +32,21 @@
import com.bigdata.BigdataStatics;
import com.bigdata.btree.AbstractBTreeTupleCursor.MutableBTreeTupleCursor;
+import com.bigdata.btree.AbstractBTreeTupleCursor.ReadOnlyBTreeTupleCursor;
import com.bigdata.btree.Leaf.ILeafListener;
import com.bigdata.btree.data.ILeafData;
import com.bigdata.btree.data.INodeData;
+import com.bigdata.btree.filter.IFilterConstructor;
+import com.bigdata.btree.filter.Reverserator;
+import com.bigdata.btree.filter.TupleRemover;
import com.bigdata.journal.AbstractJournal;
import com.bigdata.journal.ICommitter;
import com.bigdata.journal.IIndexManager;
import com.bigdata.journal.Name2Addr;
import com.bigdata.journal.Name2Addr.Entry;
import com.bigdata.mdi.IResourceMetadata;
-import com.bigdata.mdi.JournalMetadata;
-import com.bigdata.mdi.LocalPartitionMetadata;
import com.bigdata.rawstore.IRawStore;
+import org.apache.log4j.Logger;
/**
* <p>
@@ -153,10 +156,14 @@
* several published papers.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
public class BTree extends AbstractBTree implements ICommitter, ILocalBTreeView {
+ /**
+ * Log for btree operations.
+ */
+ private static final Logger log = Logger.getLogger(BTree.class);
+
final public int getHeight() {
return height;
@@ -190,6 +197,7 @@
}
+ @Override
public final IResourceMetadata[] getResourceMetadata() {
//override to make final so sub-classes cannot modify behavior.
return super.getResourceMetadata();
@@ -206,23 +214,23 @@
*/
public ICounter getCounter() {
- ICounter counter = new Counter(this);
+ ICounter tmpCounter = new Counter(this);
final LocalPartitionMetadata pmd = metadata.getPartitionMetadata();
if (pmd != null) {
- counter = new PartitionedCounter(pmd.getPartitionId(), counter);
+ tmpCounter = new PartitionedCounter(pmd.getPartitionId(), tmpCounter);
}
if (isReadOnly()) {
- return new ReadOnlyCounter(counter);
+ return new ReadOnlyCounter(tmpCounter);
}
- return counter;
+ return tmpCounter;
}
@@ -395,7 +403,7 @@
* <p>
* Note: The {@link #getCounter()} is NOT changed by this method.
*/
- final private void newRootLeaf() {
+ private void newRootLeaf() {
height = 0;
@@ -1341,14 +1349,8 @@
// view of this BTree.
newResources[1] = new JournalMetadata((AbstractJournal) getStore(),
priorCommitTime);
+ System.arraycopy(oldResources, 1, newResources, 2, oldResources.length - 1);
- // any other stores in the view are copied.
- for (int i = 1; i < oldResources.length; i++) {
-
- newResources[i + 1] = oldResources[i];
-
- }
-
final LocalPartitionMetadata newPmd = new LocalPartitionMetadata(
oldPmd.getPartitionId(), // partitionId
-1, // sourcePartitionId
@@ -1569,7 +1571,6 @@
* @throws IllegalArgumentException
* if store is <code>null</code>.
*/
- @SuppressWarnings("unchecked")
public static BTree load(final IRawStore store, final long addrCheckpoint,
final boolean readOnly) {
@@ -1655,6 +1656,147 @@
}
/**
+ * Core implementation.
+ * <p>
+ * Note: If {@link IRangeQuery#CURSOR} is specified the returned iterator
+ * supports traversal with concurrent modification by a single-threaded
+ * process (the {@link BTree} is NOT thread-safe for writers). Write are
+ * permitted iff {@link AbstractBTree} allows writes.
+ * <p>
+ * Note: {@link IRangeQuery#REVERSE} is handled here by wrapping the
+ * underlying {@link ITupleCursor}.
+ * <p>
+ * Note: {@link IRangeQuery#REMOVEALL} is handled here by wrapping the
+ * iterator.
+ * <p>
+ * Note:
+ * {@link FusedView#rangeIterator(byte[], byte[], int, int, IFilterConstructor)}
+ * is also responsible for constructing an {@link ITupleIterator} in a
+ * manner similar to this method. If you are updating the logic here, then
+ * check the logic in that method as well!
+ *
+ * @todo add support to the iterator construct for filtering by a tuple
+ * revision timestamp range.
+ */
+ public ITupleIterator rangeIterator(//
+ final byte[] fromKey,//
+ final byte[] toKey,//
+ final int capacityIsIgnored,//
+ final int flags,//
+ final IFilterConstructor filter//
+ ) {
+
+ /*
+ * Does the iterator declare that it will not write back on the index?
+ */
+ final boolean ro = ((flags & IRangeQuery.READONLY) != 0);
+
+ if (ro && ((flags & IRangeQuery.REMOVEALL) != 0)) {
+
+ throw new IllegalArgumentException();
+
+ }
+
+ /*
+ * Figure out what base iterator implementation to use. We will layer
+ * on the optional filter(s) below.
+ ...
[truncated message content] |
