Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3629] branches/bbb_cleanup
|
From: <res...@us...> - 2010-09-24 19:38:00
|
Revision: 3629
http://bigdata.svn.sourceforge.net/bigdata/?rev=3629&view=rev
Author: resendes
Date: 2010-09-24 19:37:50 +0000 (Fri, 24 Sep 2010)
Log Message:
-----------
Merge from maven_scaleout branch
Modified Paths:
--------------
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.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/IndexSegment.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/view/FusedView.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/AbstractBufferStrategy.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IJournal.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IResourceManager.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/Journal.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/RWStrategy.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.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/IndexManager.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.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/jini/util/LookupStarter.java
branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/test.xml
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestAll_IndexSegment.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestBTree.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestTransientBTree.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/journal/ReplicatedStore.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/rawstore/SimpleFileRawStore.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/TestReleaseResources.java
branches/bbb_cleanup/bigdata-integ/pom.xml
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/AbstractFedZooTestCase.java
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestJiniCoreServicesProcessHelper.java
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestServiceConfigurationMonitoring.java
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestServiceConfigurationZNodeEnum.java
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestServiceStarter.java
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/service/jini/AbstractServerTestCase.java
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/service/jini/TestBigdataClient.java
branches/bbb_cleanup/pom.xml
Added Paths:
-----------
branches/bbb_cleanup/bigdata-core/build/
branches/bbb_cleanup/bigdata-core/build/classes/
branches/bbb_cleanup/bigdata-core/src/META-INF/
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java
branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IStoreFile.java
branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegment.java
branches/bbb_cleanup/bigdata-integ/src/test/resources/services.xml
Removed Paths:
-------------
branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/test/util/Assert.java
Property Changed:
----------------
branches/bbb_cleanup/
branches/bbb_cleanup/bigdata-core/
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/bin/
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot/
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/bbb_cleanup/bigdata-core/src/main/java/
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
branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/bbb_cleanup/bigdata-core/src/test/java/
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,3588-3607
/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,3588-3628
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/bbb_cleanup/bigdata-core
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/maven_scaleout/bigdata-core:3588-3607
/trunk:3499
+ /branches/maven_scaleout/bigdata-core:3588-3628
/trunk:3499
Property changes on: branches/bbb_cleanup/bigdata-core/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/maven_scaleout/bigdata-core/bigdata-perf:3588-3607
/trunk/bigdata-perf:3379-3541
+ /branches/maven_scaleout/bigdata-core/bigdata-perf:3588-3628
/trunk/bigdata-perf:3379-3541
Property changes on: branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources:3588-3607
/trunk/bigdata-perf/lubm/src/resources:3379-3541
+ /branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources:3588-3628
/trunk/bigdata-perf/lubm/src/resources:3379-3541
Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL:3588-3607
/trunk/dsi-utils/LEGAL:3379-3430,3499
+ /branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL:3588-3628
/trunk/dsi-utils/LEGAL:3379-3430,3499
Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/maven_scaleout/bigdata-core/dsi-utils/lib:3588-3607
/trunk/dsi-utils/lib:3379-3430,3499
+ /branches/maven_scaleout/bigdata-core/dsi-utils/lib:3588-3628
/trunk/dsi-utils/lib:3379-3430,3499
Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/maven_scaleout/bigdata-core/dsi-utils/src:3588-3607
/trunk/dsi-utils/src:3379-3430,3499
+ /branches/maven_scaleout/bigdata-core/dsi-utils/src:3588-3628
/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/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3607
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
+ /branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3628
/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/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3607
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
+ /branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3628
/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/maven_scaleout/bigdata-core/osgi:3588-3607
/trunk/osgi:3379-3430,3499
+ /branches/maven_scaleout/bigdata-core/osgi:3588-3628
/trunk/osgi:3379-3430,3499
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/bin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/bin:3588-3607
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/bin:3588-3628
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini:3588-3607
/trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
+ /branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini:3588-3628
/trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3588-3607
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3588-3628
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528
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/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,3588-3607
/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/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,3588-3628
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3588-3607
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3588-3628
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging:3588-3607
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging:3588-3628
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3588-3607
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3588-3628
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3588-3607
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3588-3628
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/java:3588-3607
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/java:3588-3628
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr:3588-3607
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
+ /branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr:3588-3628
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
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-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -52,7 +52,6 @@
import com.bigdata.btree.IndexMetadata.Options;
import com.bigdata.btree.IndexSegment.IndexSegmentTupleCursor;
import com.bigdata.btree.data.IAbstractNodeData;
-import com.bigdata.btree.data.ILeafData;
import com.bigdata.btree.data.INodeData;
import com.bigdata.btree.filter.IFilterConstructor;
import com.bigdata.btree.filter.Reverserator;
@@ -68,7 +67,6 @@
import com.bigdata.cache.HardReferenceQueueWithBatchingUpdates;
import com.bigdata.cache.IHardReferenceQueue;
import com.bigdata.cache.RingBuffer;
-import com.bigdata.cache.IGlobalLRU.ILRUCache;
import com.bigdata.counters.CounterSet;
import com.bigdata.counters.ICounterSet;
import com.bigdata.counters.Instrument;
@@ -1337,7 +1335,7 @@
*/
abstract public IRawStore getStore();
- final public IResourceMetadata[] getResourceMetadata() {
+ public IResourceMetadata[] getResourceMetadata() {
if (store == null) {
@@ -1353,14 +1351,12 @@
};
+ } else {
+ //This is a default metadata, appropriate for rawstores.
+ return new IResourceMetadata[] {
+ new SimpleResourceMetadata(store.getUUID())
+ };
}
-
- return new IResourceMetadata[] {
-
- store.getResourceMetadata()
-
- };
-
}
/**
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-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/BTree.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -190,6 +190,11 @@
}
+ public final IResourceMetadata[] getResourceMetadata() {
+ //override to make final so sub-classes cannot modify behavior.
+ return super.getResourceMetadata();
+ }
+
/**
* Returns an {@link ICounter}. The {@link ICounter} is mutable iff the
* {@link BTree} is mutable. All {@link ICounter}s returned by this method
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegment.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegment.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegment.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -34,6 +34,7 @@
import com.bigdata.btree.raba.ReadOnlyValuesRaba;
import com.bigdata.io.AbstractFixedByteArrayBuffer;
import com.bigdata.io.FixedByteArrayBuffer;
+import com.bigdata.mdi.IResourceMetadata;
import com.bigdata.service.Event;
import com.bigdata.service.EventResource;
import com.bigdata.service.EventType;
@@ -676,6 +677,13 @@
}
+ public final IResourceMetadata[] getResourceMetadata() {
+ //Overrides the default returned metadata, providing IndexSegmentStore specific metadata.
+ return new IResourceMetadata[] {
+ fileStore.getResourceMetadata()
+ };
+ }
+
/*
* INodeFactory
*/
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -37,10 +37,10 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
+import com.bigdata.journal.IStoreFile;
import org.apache.log4j.Logger;
import com.bigdata.cache.IGlobalLRU;
-import com.bigdata.cache.IGlobalLRU.ILRUCache;
import com.bigdata.counters.CounterSet;
import com.bigdata.counters.Instrument;
import com.bigdata.counters.OneShotInstrument;
@@ -67,7 +67,7 @@
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
*/
-public class IndexSegmentStore extends AbstractRawStore {
+public class IndexSegmentStore extends AbstractRawStore implements IStoreFile {
/**
* Logger.
Copied: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java (from rev 3628, branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java)
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java (rev 0)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/SimpleResourceMetadata.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -0,0 +1,104 @@
+/*
+ * Created by IntelliJ IDEA.
+ * User: gossard
+ * Date: Sep 22, 2010
+ * Time: 2:40:37 PM
+ */
+package com.bigdata.btree;
+
+import com.bigdata.mdi.IResourceMetadata;
+import com.bigdata.rawstore.SimpleMemoryRawStore;
+
+import java.util.UUID;
+
+/**
+ * Dumb metadata object, used by a btree to return metadata about rawstores.
+ * This class was previously an inner-class in {@link com.bigdata.rawstore.SimpleMemoryRawStore SimpleMemoryRawStore},
+ * but was moved into the btree package to remove a rawstore dependency on the mdi package.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ */
+public class SimpleResourceMetadata implements IResourceMetadata {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8333003625527191826L;
+
+ private final UUID uuid;
+
+ public SimpleResourceMetadata(UUID uuid) {
+ if (uuid == null)
+ throw new NullPointerException("uuid cannot be null");
+ this.uuid = uuid;
+ }
+
+ @Override
+ public int hashCode() {
+ return uuid.hashCode();
+ }
+
+ //from java.lang.Object
+ public boolean equals(Object obj){
+ if (obj instanceof SimpleResourceMetadata){
+ SimpleResourceMetadata other = (SimpleResourceMetadata)obj;
+ return uuid.equals(other.uuid);
+ } else
+ return false;
+ }
+
+ //from com.bigdata.mdi.IResourceMetadata, *NOT* java.lang.Object
+ public boolean equals(IResourceMetadata o) {
+
+ return this.equals((Object)o);
+ }
+
+ public long getCreateTime() {
+
+ // does not support commit
+ return 0L;
+
+ }
+
+ public long getCommitTime() {
+
+ // does not support commit
+ return 0L;
+
+ }
+
+ public String getFile() {
+
+ // no backing file.
+ return null;
+
+ }
+
+ public UUID getUUID() {
+
+ return uuid;
+
+ }
+
+ public boolean isIndexSegment() {
+
+ // not index segment.
+ return false;
+
+ }
+
+ public boolean isJournal() {
+
+ // not journal.
+ return false;
+
+ }
+
+// public long size() {
+//
+// // #of bytes not available.
+// return 0L;
+//
+// }
+
+}
\ No newline at end of file
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -399,7 +399,11 @@
for(AbstractBTree t : sources) {
// for (int i = 0; i < srcs.length; i++) {
- resources[i++] = t.getStore().getResourceMetadata();
+ IResourceMetadata[] metaAboutBTree = t.getResourceMetadata();
+ if (metaAboutBTree.length == 1)
+ resources[i++] = metaAboutBTree[0];
+ else
+ throw new RuntimeException("BTree had wrong number of metadata items, should have been caught in unit tests.");
}
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco:3588-3607
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
+ /branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco:3588-3628
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/AbstractBufferStrategy.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/AbstractBufferStrategy.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/AbstractBufferStrategy.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -585,18 +585,6 @@
}
/**
- * Not supported - this is available on the {@link AbstractJournal}.
- *
- * @throws UnsupportedOperationException
- * always
- */
- public IResourceMetadata getResourceMetadata() {
-
- throw new UnsupportedOperationException();
-
- }
-
- /**
* Sets the <code>readOnly</code> flag.
* <p>
* Note: This method SHOULD be extended to release write caches, etc.
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IJournal.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IJournal.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IJournal.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -25,7 +25,6 @@
import java.util.Properties;
-import com.bigdata.btree.keys.IKeyBuilderFactory;
import com.bigdata.rawstore.IMRMW;
/**
@@ -38,7 +37,7 @@
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
*/
-public interface IJournal extends IMRMW, IAtomicStore, IBTreeManager {
+public interface IJournal extends IMRMW, IAtomicStore, IBTreeManager, IStoreFile {
/**
* A copy of the properties used to initialize this journal.
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IResourceManager.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IResourceManager.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IResourceManager.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -40,7 +40,6 @@
import com.bigdata.btree.IndexSegmentStore;
import com.bigdata.btree.view.FusedView;
import com.bigdata.counters.CounterSet;
-import com.bigdata.rawstore.IRawStore;
import com.bigdata.resources.ResourceManager;
import com.bigdata.resources.StaleLocatorException;
import com.bigdata.resources.StaleLocatorReason;
@@ -99,17 +98,17 @@
public AbstractJournal getJournal(long timestamp);
/**
- * Opens an {@link IRawStore}.
+ * Opens an {@link IStoreFile}.
*
* @param uuid
* The UUID identifying that store file.
*
- * @return The open {@link IRawStore}.
+ * @return The open {@link IStoreFile}.
*
* @throws RuntimeException
* if something goes wrong.
*/
- public IRawStore openStore(UUID uuid);
+ public IStoreFile openStore(UUID uuid);
/**
* Return the ordered {@link AbstractBTree} sources for an index or a view
Copied: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IStoreFile.java (from rev 3628, branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/IStoreFile.java)
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IStoreFile.java (rev 0)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/IStoreFile.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -0,0 +1,53 @@
+/*
+
+Copyright (C) SYSTAP, LLC 2006-2010. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+
+package com.bigdata.journal;
+
+import com.bigdata.mdi.IResourceMetadata;
+import com.bigdata.rawstore.IRawStore;
+
+import com.bigdata.btree.IndexSegmentStore;
+import com.bigdata.journal.IJournal;
+
+/**
+ * An {@link IRawStore} that exposes additional serializable metadata allowing it to be managed by an
+ * {@link IResourceManager}. Currently this is common interface between the two main store
+ * file types that are used to store btree indices.
+ * <b />
+ * The methods on this interface have been moved from <code>IRawStore</code> in order to reduce the burden on
+ * rawstore implementations which we often needed to stub methods out even though they were never used.
+ * It also improves encapsulation by removing direct knowledge of resource management related classes in the rawstore
+ * package.
+ *
+ * {@see IndexSegmentStore}
+ * {@see IJournal}
+ */
+public interface IStoreFile extends IRawStore {
+
+ /**
+ * A description of this store in support of the scale-out architecture.
+ */
+ public IResourceMetadata getResourceMetadata();
+}
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/Journal.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/Journal.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/Journal.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -49,7 +49,6 @@
import com.bigdata.config.IntegerValidator;
import com.bigdata.config.LongValidator;
import com.bigdata.counters.CounterSet;
-import com.bigdata.rawstore.IRawStore;
import com.bigdata.relation.locator.DefaultResourceLocator;
import com.bigdata.relation.locator.ILocatableResource;
import com.bigdata.relation.locator.IResourceLocator;
@@ -292,7 +291,7 @@
* Note: This will only succeed if the <i>uuid</i> identifies <i>this</i>
* journal.
*/
- public IRawStore openStore(final UUID uuid) {
+ public IStoreFile openStore(final UUID uuid) {
if(uuid == getRootBlockView().getUUID()) {
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/RWStrategy.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/RWStrategy.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/RWStrategy.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -479,10 +479,6 @@
return m_fileMetadata.raf;
}
- public IResourceMetadata getResourceMetadata() {
- // TODO Auto-generated method stub
- return null;
- }
public UUID getUUID() {
return m_fileMetadata.rootBlock.getUUID();
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -400,61 +400,6 @@
}
- /**
- * Note: Temporary stores do not have persistent resource descriptions.
- */
- final public IResourceMetadata getResourceMetadata() {
-
- final File file = buf.getFile();
-
- final String fileStr = file == null ? "" : file.toString();
-
- return new ResourceMetadata(this, fileStr);
-
- }
-
- /**
- * Static class since must be {@link Serializable}.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
- static final class ResourceMetadata extends AbstractResourceMetadata {
-
- /**
- * De-serializator ctor.
- */
- public ResourceMetadata() {
-
- }
-
- public ResourceMetadata(final TemporaryRawStore store,
- final String fileStr) {
-
- super(fileStr, // store.buf.getExtent()
- store.uuid,//
- store.createTime, //
- 0L// commitTime
- );
-
- }
-
- private static final long serialVersionUID = 1L;
-
- public boolean isJournal() {
-
- return false;
-
- }
-
- public boolean isIndexSegment() {
-
- return false;
-
- }
-
- }
-
final public DiskOnlyStrategy getBufferStrategy() {
return buf;
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -36,7 +36,6 @@
import com.bigdata.counters.CounterSet;
import com.bigdata.io.IByteArrayBuffer;
import com.bigdata.journal.AbstractJournal;
-import com.bigdata.mdi.IResourceMetadata;
/**
* <p>
@@ -242,12 +241,7 @@
* Return the {@link UUID} which identifies this {@link IRawStore}. This
* supports {@link #getResourceMetadata()}
*/
- public UUID getUUID();
-
- /**
- * A description of this store in support of the scale-out architecture.
- */
- public IResourceMetadata getResourceMetadata();
+ public UUID getUUID();
/**
* True iff backed by stable storage.
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -28,7 +28,6 @@
package com.bigdata.rawstore;
import java.io.File;
-import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
@@ -37,8 +36,6 @@
import java.util.concurrent.ExecutorService;
import com.bigdata.counters.CounterSet;
-import com.bigdata.journal.TemporaryRawStore;
-import com.bigdata.mdi.IResourceMetadata;
/**
* A purely transient append-only implementation useful when data need to be
@@ -48,7 +45,7 @@
* implementation does not contain things like {@link ExecutorService}s that
* would hang around unless explicitly shutdown.
*
- * @see {@link TemporaryRawStore}, which provides a more scalable solution for
+ * @see {@link com.bigdata.journal.TemporaryRawStore TemporaryRawStore}, which provides a more scalable solution for
* temporary data.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
@@ -147,91 +144,8 @@
return uuid;
}
-
- public IResourceMetadata getResourceMetadata() {
- return new ResourceMetadata(uuid);
-
- }
-
/**
- * Static class since must be {@link Serializable}.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
- private static class ResourceMetadata implements IResourceMetadata {
-
- /**
- *
- */
- private static final long serialVersionUID = -8333003625527191826L;
-
- private final UUID uuid;
-
- public ResourceMetadata(UUID uuid) {
-
- this.uuid = uuid;
-
- }
-
- public boolean equals(IResourceMetadata o) {
-
- return this == o;
-
- }
-
- public long getCreateTime() {
-
- // does not support commit
- return 0L;
-
- }
-
- public long getCommitTime() {
-
- // does not support commit
- return 0L;
-
- }
-
- public String getFile() {
-
- // no backing file.
- return null;
-
- }
-
- public UUID getUUID() {
-
- return uuid;
-
- }
-
- public boolean isIndexSegment() {
-
- // not index segment.
- return false;
-
- }
-
- public boolean isJournal() {
-
- // not journal.
- return false;
-
- }
-
-// public long size() {
-//
-// // #of bytes not available.
-// return 0L;
-//
-// }
-
- }
-
- /**
* This always returns <code>null</code>.
*/
public File getFile() {
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3463
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench:3588-3607
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3430
+ /branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3463
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench:3588-3628
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3430
Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util:3588-3607
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542
+ /branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util:3588-3628
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -126,9 +126,11 @@
this.sources = new IResourceMetadata[sourceCount];
for (int i = 0; i < sourceCount; i++) {
-
- this.sources[i] = sources[i].getStore().getResourceMetadata();
-
+ IResourceMetadata[] metaAboutBTree = sources[i].getResourceMetadata();
+ if (metaAboutBTree.length == 1)
+ this.sources[i] = metaAboutBTree[0];
+ else
+ throw new RuntimeException("BTree had wrong number of metadata items, should have been caught in unit tests.");
}
this.segmentMetadata = segmentMetadata;
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/IndexManager.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/IndexManager.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/IndexManager.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -42,6 +42,7 @@
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
+import com.bigdata.journal.*;
import org.apache.log4j.Logger;
import com.bigdata.btree.AbstractBTree;
@@ -66,24 +67,12 @@
import com.bigdata.counters.CounterSet;
import com.bigdata.counters.ICounterSet;
import com.bigdata.io.DataInputBuffer;
-import com.bigdata.journal.AbstractJournal;
-import com.bigdata.journal.AbstractTask;
-import com.bigdata.journal.ConcurrencyManager;
-import com.bigdata.journal.ICommitRecord;
-import com.bigdata.journal.IJournal;
-import com.bigdata.journal.ITx;
-import com.bigdata.journal.Journal;
-import com.bigdata.journal.Name2Addr;
-import com.bigdata.journal.NoSuchIndexException;
-import com.bigdata.journal.TimestampUtility;
-import com.bigdata.journal.Tx;
import com.bigdata.journal.Name2Addr.Entry;
import com.bigdata.journal.Name2Addr.EntrySerializer;
import com.bigdata.mdi.IResourceMetadata;
import com.bigdata.mdi.LocalPartitionMetadata;
import com.bigdata.mdi.SegmentMetadata;
import com.bigdata.rawstore.Bytes;
-import com.bigdata.rawstore.IRawStore;
import com.bigdata.service.Event;
import com.bigdata.service.EventType;
import com.bigdata.service.IBigdataClient;
@@ -134,11 +123,11 @@
* Note: The {@link IIndex}s managed by this class are a
* {@link FusedView} of {@link AbstractBTree}s. Each
* {@link AbstractBTree} has a hard reference to the backing
- * {@link IRawStore} and will keep the {@link IRawStore} from being
+ * {@link com.bigdata.journal.IStoreFile} and will keep the {@link IStoreFile} from being
* finalized as long as a hard reference exists to the
- * {@link AbstractBTree} (the reverse is not true - an {@link IRawStore}
+ * {@link AbstractBTree} (the reverse is not true - an {@link IStoreFile}
* reference does NOT hold a hard reference to {@link AbstractBTree}s
- * on that {@link IRawStore}).
+ * on that {@link IStoreFile}).
* <p>
* Note: The retention of the {@link BTree}s on the live
* {@link ManagedJournal}s is governed by
@@ -923,7 +912,7 @@
* {@link StoreManager#openStores}.
*/
public AbstractBTree getIndexOnStore(final String name,
- final long timestamp, final IRawStore store) {
+ final long timestamp, final IStoreFile store) {
if (name == null)
throw new IllegalArgumentException();
@@ -1232,7 +1221,7 @@
final IResourceMetadata resource = a[i];
- final IRawStore store;
+ final IStoreFile store;
try {
store = openStore(resource.getUUID());
@@ -2021,7 +2010,7 @@
/**
* Canonical per-index partition {@link BTreeCounters}. These counters are
* set on each {@link AbstractBTree} that is materialized by
- * {@link #getIndexOnStore(String, long, IRawStore)}. The same
+ * {@link #getIndexOnStore(String, long, IStoreFile)}. The same
* {@link BTreeCounters} object is used for the unisolated, read-committed,
* read-historical and isolated views of the index partition and for each
* source in the view regardless of whether the source is a mutable
Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.java 2010-09-24 18:26:07 UTC (rev 3628)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.java 2010-09-24 19:37:50 UTC (rev 3629)
@@ -44,13 +44,13 @@
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import com.bigdata.journal.*;
import org.apache.log4j.Logger;
import com.bigdata.bfs.BigdataFileSystem;
@@ -67,25 +67,7 @@
import com.bigdata.cache.IGlobalLRU.ILRUCache;
import com.bigdata.concurrent.NamedLock;
import com.bigdata.io.SerializerUtil;
-import com.bigdata.journal.AbstractJournal;
-import com.bigdata.journal.AbstractLocalTransactionManager;
-import com.bigdata.journal.BufferMode;
-import com.bigdata.journal.CommitRecordIndex;
-import com.bigdata.journal.ConcurrencyManager;
-import com.bigdata.journal.DiskOnlyStrategy;
-import com.bigdata.journal.IBufferStrategy;
-import com.bigdata.journal.ICommitRecord;
-import com.bigdata.journal.IConcurrencyManager;
-import com.bigdata.journal.ILocalTransactionManager;
-import com.bigdata.journal.IResourceLockService;
-import com.bigdata.journal.IResourceManager;
-import com.bigdata.journal.IRootBlockView;
//BTM import com.bigdata.journal.ITransactionService;
-import com.bigdata.journal.ITx;
-import com.bigdata.journal.Name2Addr;
-import com.bigdata.journal.TemporaryStore;
-import com.bigdata.journal.WORMStrategy;
-import com.bigdata.journal.WriteExecutorService;
import com.bigdata.journal.WORMStrategy.StoreCounters;
import com.bigdata.mdi.IPartitionMetadata;
import com.bigdata.mdi.IResourceMetadata;
@@ -94,7 +76,6 @@
import com.bigdata.mdi.LocalPartitionMetadata;
import com.bigdata.mdi.SegmentMetadata;
import com.bigdata.rawstore.Bytes;
-import com.bigdata.rawstore.IRawStore;
import com.bigdata.relation.locator.DefaultResourceLocator;
import com.bigdata.service.DataService;
import com.bigdata.service.Event;
@@ -108,8 +89,8 @@
import static java.util.concurrent.TimeUnit.*;
//BTM
-import com.bigdata.journal.TransactionService;
+
/**
* Class encapsulates logic for managing the store files (journals and index
* segments), including the logic to compute the effective release time for the
@@ -178,7 +159,7 @@
String DATA_DIR = StoreManager.class.getName()+".dataDir";
/**
- * The capacity of the LRU cache of open {@link IRawStore}s. The
+ * The capacity of the LRU cache of open {@link IStoreFile}s. The
* capacity of this cache indirectly controls how many stores will be
* held open. The main reason for keeping an store open is to reuse its
* buffers if another request arrives "soon" which would read on that
@@ -213,7 +194,7 @@
* The time in milliseconds before an entry in the store cache will be
* cleared from the backing {@link HardReferenceQueue} (default
* {@value #DEFAULT_STORE_CACHE_TIMEOUT}). This property controls how
- * long the store cache will retain an {@link IRawStore} which has not
+ * long the store cache will retain an {@link IStoreFile} which has not
* been recently used. This is in contrast to the cache capacity.
*/
String STORE_CACHE_TIMEOUT = StoreManager.class....
[truncated message content] |
