Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[7747] branches/MGC_1_3_0
|
From: <tho...@us...> - 2014-01-08 15:14:27
|
Revision: 7747
http://bigdata.svn.sourceforge.net/bigdata/?rev=7747&view=rev
Author: thompsonbry
Date: 2014-01-08 15:14:09 +0000 (Wed, 08 Jan 2014)
Log Message:
-----------
Merged in change set from the 1.3.0 maintenance and development branch in preparation for bringing this feature branch back to the main branch.
At revision 7746.
merge https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0 /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
--- Merging r7684 through r7746 into /Users/bryan/Documents/workspace
No conflicts.
See #724 (HA wire pulling and sudden kills)
Revision Links:
--------------
http://bigdata.svn.sourceforge.net/bigdata/?rev=7746&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=7684&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=7746&view=rev
Modified Paths:
--------------
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpBase.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpContext.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpUtility.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/IdFactory.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/ap/SampleIndex.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/HTreeNamedSubqueryOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/JVMNamedSubqueryOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/engine/BOpStats.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/engine/LocalChunkMessage.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/engine/QueryLog.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/engine/RunState.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/BaseJoinStats.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/HTreeHashIndexOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/HTreeHashJoinUtility.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/HashIndexOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/HashJoinOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/IHashJoinUtility.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/JVMHashIndex.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/JVMHashIndexOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/JVMHashJoinUtility.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/JoinVariableNotBoundException.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/NamedSolutionSetStats.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/PipelineJoinStats.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/join/SolutionSetHashJoinOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/PartitionedJoinGroup.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JGraph.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JoinGraph.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Path.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/SampleBase.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Vertex.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/paths/ZeroLengthPathOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/DropOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/PipelinedAggregationOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/ProjectionOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/SliceOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/btree/data/DefaultLeafCoder.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/btree/data/DefaultNodeCoder.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/journal/Options.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/relation/accesspath/IBindingSetAccessPath.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/AbstractChunkedResolverator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/ChunkedArrayIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/ChunkedArraysIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/ChunkedConvertingIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/ChunkedOrderedStriterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/ChunkedResolvingIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/ChunkedWrappedIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/Chunkerator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/CloseableIteratorWrapper.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/Dechunkerator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/DelegateChunkedIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/GenericChunkedStriterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/IChunkedIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/IChunkedStriterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/MergeFilter.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/PushbackIterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/Resolver.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/Striterator.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/util/NT.java
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/TestAll.java
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestNIOChunkMessage.java
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestAll.java
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJGraph.java
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/striterator/TestAll.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParserStats.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IPassesMaterialization.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SPARQLConstraint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTBase.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AssignmentNode.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GraphPatternGroup.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GroupNodeBase.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/JoinGroupNode.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/NamedSubqueryInclude.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/OrderByNode.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryBase.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryOptimizerEnum.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryRoot.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SliceNode.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ValueExpressionListBaseNode.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ZeroLengthPathNode.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpFilters.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractChunkSizeHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractQueryHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AnalyticQueryHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AtOnceHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/BufferChunkCapacityHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/BufferChunkOfChunksCapacityHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/ChunkSizeHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/IQueryHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/OptimizerQueryHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineMaxMessagesPerTaskHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineMaxParallelHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineQueueCapacityHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintRegistry.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBindingAssigner.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBottomUpOptimizer.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTQueryHintOptimizer.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeCountOptimizer.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTSparql11SubqueryOptimizer.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticJoinOptimizer.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCall.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/AbstractDataAndSPARQLTestCase.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/AbstractDataDrivenSPARQLTestCase.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/query-hints-01.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/query-hints-06.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractProtocolTest.java
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager.java
branches/MGC_1_3_0/bigdata-war/src/html/index.html
Added Paths:
-----------
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/striterator/CloseableChunkedIteratorWrapperConverter.java
branches/MGC_1_3_0/bigdata/src/resources/deployment/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/Berksfile
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/CHANGELOG.md
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/Gemfile
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/Thorfile
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/chefignore
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/default_test.rb
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/default.rb
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/striterator/TestCloseableChunkedIteratorWrapperConverter.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOLimitQueryHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTONEdgesQueryHint.java
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOSampleTypeQueryHint.java
branches/MGC_1_3_0/bigdata-rdf/src/resources/data/lehigh/LUBM-U1.rdf.gz
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/AbstractRTOTestCase.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestAll.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BAR.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BSBM.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_LUBM.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTMassagedServiceNodeOptimizer.java
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java
Removed Paths:
-------------
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/Berksfile
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/CHANGELOG.md
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/Gemfile
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/Thorfile
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/chefignore
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/default_test.rb
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/
branches/MGC_1_3_0/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/default.rb
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/AbstractRTOTestCase.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.srx
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestAll.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BAR.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BSBM.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_LUBM.java
Property Changed:
----------------
branches/MGC_1_3_0/
branches/MGC_1_3_0/bigdata/lib/jetty/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/util/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/htree/raba/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/jsr166/
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/joinGraph/
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/util/
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/jsr166/
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/util/httpd/
branches/MGC_1_3_0/bigdata-compatibility/
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/attr/
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/disco/
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/util/config/
branches/MGC_1_3_0/bigdata-perf/
branches/MGC_1_3_0/bigdata-perf/btc/
branches/MGC_1_3_0/bigdata-perf/btc/src/resources/
branches/MGC_1_3_0/bigdata-perf/lubm/
branches/MGC_1_3_0/bigdata-perf/uniprot/
branches/MGC_1_3_0/bigdata-perf/uniprot/src/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/changesets/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/error/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/relation/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/util/
branches/MGC_1_3_0/bigdata-rdf/src/samples/
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate/
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/internal/
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/relation/
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets/
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/bench/
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/
branches/MGC_1_3_0/dsi-utils/
branches/MGC_1_3_0/dsi-utils/LEGAL/
branches/MGC_1_3_0/dsi-utils/lib/
branches/MGC_1_3_0/dsi-utils/src/
branches/MGC_1_3_0/dsi-utils/src/java/
branches/MGC_1_3_0/dsi-utils/src/java/it/
branches/MGC_1_3_0/dsi-utils/src/java/it/unimi/
branches/MGC_1_3_0/dsi-utils/src/test/
branches/MGC_1_3_0/dsi-utils/src/test/it/unimi/
branches/MGC_1_3_0/dsi-utils/src/test/it/unimi/dsi/
branches/MGC_1_3_0/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/MGC_1_3_0/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/MGC_1_3_0/osgi/
branches/MGC_1_3_0/src/resources/bin/config/
Property changes on: branches/MGC_1_3_0
___________________________________________________________________
Modified: svn:ignore
- ant-build
src
bin
bigdata*.jar
ant-release
standalone
test*
countersfinal.xml
events.jnl
.settings
*.jnl
TestInsertRate.out
SYSTAP-BBT-result.txt
U10load+query
*.hprof
com.bigdata.cache.TestHardReferenceQueueWithBatchingUpdates.exp.csv
commit-log.txt
eventLog
dist
bigdata-test
com.bigdata.rdf.stress.LoadClosureAndQueryTest.*.csv
DIST.bigdata-*.tgz
REL.bigdata-*.tgz
queryLog*
queryRunState*
sparql.txt
benchmark
CI
+ ant-build
src
bin
bigdata*.jar
ant-release
standalone
test*
countersfinal.xml
events.jnl
.settings
*.jnl
TestInsertRate.out
SYSTAP-BBT-result.txt
U10load+query
*.hprof
com.bigdata.cache.TestHardReferenceQueueWithBatchingUpdates.exp.csv
commit-log.txt
eventLog
dist
bigdata-test
com.bigdata.rdf.stress.LoadClosureAndQueryTest.*.csv
DIST.bigdata-*.tgz
REL.bigdata-*.tgz
queryLog*
queryRunState*
sparql.txt
benchmark
CI
bsbm10-dataset.nt.gz
bsbm10-dataset.nt.zip
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE:6769-6785
/branches/BIGDATA_RELEASE_1_2_0:6766-7380
/branches/BIGDATA_RELEASE_1_3_0:7608-7684
/branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE:7215-7271
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/ZK_DISCONNECT_HANDLING:7465-7484
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE:6769-6785
/branches/BIGDATA_RELEASE_1_2_0:6766-7380
/branches/BIGDATA_RELEASE_1_3_0:7608-7746
/branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE:7215-7271
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/ZK_DISCONNECT_HANDLING:7465-7484
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
Property changes on: branches/MGC_1_3_0/bigdata/lib/jetty
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty:7608-7684
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/lib/jetty:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/lib/jetty:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty:7608-7746
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/lib/jetty:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/lib/jetty:7465-7484
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -76,26 +76,26 @@
super(op);
}
- /**
- * @see BufferAnnotations#CHUNK_CAPACITY
- */
- protected int getChunkCapacity() {
-
- return getProperty(Annotations.CHUNK_CAPACITY,
- Annotations.DEFAULT_CHUNK_CAPACITY);
+// /**
+// * @see BufferAnnotations#CHUNK_CAPACITY
+// */
+// protected int getChunkCapacity() {
+//
+// return getProperty(Annotations.CHUNK_CAPACITY,
+// Annotations.DEFAULT_CHUNK_CAPACITY);
+//
+// }
+//
+// /**
+// * @see BufferAnnotations#CHUNK_OF_CHUNKS_CAPACITY
+// */
+// protected int getChunkOfChunksCapacity() {
+//
+// return getProperty(Annotations.CHUNK_OF_CHUNKS_CAPACITY,
+// Annotations.DEFAULT_CHUNK_OF_CHUNKS_CAPACITY);
+//
+// }
- }
-
- /**
- * @see BufferAnnotations#CHUNK_OF_CHUNKS_CAPACITY
- */
- protected int getChunkOfChunksCapacity() {
-
- return getProperty(Annotations.CHUNK_OF_CHUNKS_CAPACITY,
- Annotations.DEFAULT_CHUNK_OF_CHUNKS_CAPACITY);
-
- }
-
// protected int getFullyBufferedReadThreshold() {
//
// return getProperty(Annotations.FULLY_BUFFERED_READ_THRESHOLD,
@@ -103,14 +103,14 @@
//
// }
- /**
- * @see BufferAnnotations#CHUNK_TIMEOUT
- */
- protected long getChunkTimeout() {
-
- return getProperty(Annotations.CHUNK_TIMEOUT,
- Annotations.DEFAULT_CHUNK_TIMEOUT);
-
- }
+// /**
+// * @see BufferAnnotations#CHUNK_TIMEOUT
+// */
+// protected long getChunkTimeout() {
+//
+// return getProperty(Annotations.CHUNK_TIMEOUT,
+// Annotations.DEFAULT_CHUNK_TIMEOUT);
+//
+// }
}
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpBase.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpBase.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpBase.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -175,6 +175,7 @@
}
+ @Override
final public Map<String, Object> annotations() {
return Collections.unmodifiableMap(annotations);
@@ -234,6 +235,7 @@
}
+ @Override
public BOp get(final int index) {
return args[index];
@@ -286,6 +288,7 @@
}
+ @Override
public int arity() {
return args.length;
@@ -297,6 +300,7 @@
* <p>
* Note: This is much less efficient than {@link #argIterator()}.
*/
+ @Override
final public List<BOp> args() {
return Collections.unmodifiableList(Arrays.asList(args));
@@ -309,6 +313,7 @@
* The iterator does not support removal. (This is more efficient than
* #args()).
*/
+ @Override
final public Iterator<BOp> argIterator() {
return new ArgIterator();
@@ -339,6 +344,7 @@
}
// shallow copy
+ @Override
public BOp[] toArray() {
final BOp[] a = new BOp[args.length];
@@ -475,6 +481,7 @@
//
// }
+ @Override
public Object getProperty(final String name) {
return annotations.get(name);
@@ -543,6 +550,7 @@
}
+ @Override
public BOpBase setProperty(final String name, final Object value) {
final BOpBase tmp = (BOpBase) this.clone();
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpContext.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpContext.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpContext.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -59,8 +59,9 @@
import com.bigdata.rwstore.sector.IMemoryManager;
import com.bigdata.striterator.ChunkedFilter;
import com.bigdata.striterator.Chunkerator;
-import com.bigdata.striterator.CloseableIteratorWrapper;
+import com.bigdata.striterator.CloseableChunkedIteratorWrapperConverter;
import com.bigdata.striterator.IChunkedIterator;
+import com.bigdata.striterator.IChunkedStriterator;
import cutthecrap.utils.striterators.ICloseableIterator;
@@ -1078,8 +1079,8 @@
}
/**
- * Convert an {@link IAccessPath#iterator()} into a stream of
- * {@link IBindingSet}s.
+ * Convert an {@link IAccessPath#iterator()} into a stream of chunks of
+ * {@link IBindingSet}.
*
* @param src
* The iterator draining the {@link IAccessPath}. This will visit
@@ -1090,7 +1091,7 @@
* Statistics to be updated as elements and chunks are consumed
* (optional).
*
- * @return The dechunked iterator visiting the solutions. The order of the
+ * @return An iterator visiting chunks of solutions. The order of the
* original {@link IElement}s is preserved.
*
* @see https://sourceforge.net/apps/trac/bigdata/ticket/209 (AccessPath
@@ -1105,14 +1106,15 @@
// * The array of distinct variables (no duplicates) to be
// * extracted from the visited {@link IElement}s.
@SuppressWarnings({ "rawtypes", "unchecked" })
- static public ICloseableIterator<IBindingSet> solutions(
+ static public ICloseableIterator<IBindingSet[]> solutions(
final IChunkedIterator<?> src, //
final IPredicate<?> pred,//
// final IVariable<?>[] varsx,
final BaseJoinStats stats//
) {
- return new CloseableIteratorWrapper(
+ //return new CloseableIteratorWrapper(
+ final IChunkedStriterator itr1 =
new com.bigdata.striterator.ChunkedStriterator(src).addFilter(
// new ChunkedFilter() {
new ChunkedFilter<IChunkedIterator<Object>, Object, Object>() {
@@ -1160,18 +1162,28 @@
}
- })) {
+ });
+ //) {
+//
+// /**
+// * Close the real source if the caller closes the returned iterator.
+// */
+// @Override
+// public void close() {
+// super.close();
+// src.close();
+// }
+// };
- /**
- * Close the real source if the caller closes the returned iterator.
- */
- @Override
- public void close() {
- super.close();
- src.close();
- }
- };
+ /*
+ * Convert from IChunkedIterator<IBindingSet> to
+ * ICloseableIterator<IBindingSet[]>. This is a fly weight conversion.
+ */
+ final ICloseableIterator<IBindingSet[]> itr2 = new CloseableChunkedIteratorWrapperConverter<IBindingSet>(
+ itr1);
+ return itr2;
+
}
/*
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -1,5 +1,29 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2011. 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.bop;
+import java.util.Iterator;
import java.util.LinkedHashSet;
/**
@@ -7,23 +31,102 @@
*/
public class BOpIdFactory implements IdFactory {
- private final LinkedHashSet<Integer> ids = new LinkedHashSet<Integer>();
-
- private int nextId = 0;
-
- public void reserve(int id) {
- ids.add(id);
- }
+ /** The set of reserved bop identifiers. */
+ private LinkedHashSet<Integer> ids;
- public int nextId() {
+ private int nextId = 0;
- while (ids.contains(nextId)) {
+ /**
+ * Reserve a bop id by adding it to a set of known identifiers that will not
+ * be issued by {@link #nextId()}.
+ *
+ * @param id
+ * The identifier.
+ */
+ public void reserve(final int id) {
+
+ synchronized (this) {
+
+ if (ids == null) {
- nextId++;
-
- }
+ // Lazily allocated.
+ ids = new LinkedHashSet<Integer>();
- return nextId++;
- }
-
+ ids.add(id);
+
+ }
+
+ }
+
+ }
+
+ @Override
+ public int nextId() {
+
+ synchronized (this) {
+
+ if (ids != null) {
+
+ while (ids.contains(nextId)) {
+
+ nextId++;
+
+ }
+
+ }
+
+ return nextId++;
+
+ }
+
+ }
+
+ /**
+ * Reserve ids used by the predicates or constraints associated with some
+ * join graph.
+ *
+ * @param preds
+ * The vertices of the join graph.
+ * @param constraints
+ * The constraints of the join graph (optional).
+ */
+ public void reserveIds(final IPredicate<?>[] preds,
+ final IConstraint[] constraints) {
+
+ if (preds == null)
+ throw new IllegalArgumentException();
+
+ final BOpIdFactory idFactory = this;
+
+ for (IPredicate<?> p : preds) {
+
+ idFactory.reserve(p.getId());
+
+ }
+
+ if (constraints != null) {
+
+ for (IConstraint c : constraints) {
+
+ final Iterator<BOp> itr = BOpUtility
+ .preOrderIteratorWithAnnotations(c);
+
+ while (itr.hasNext()) {
+
+ final BOp y = itr.next();
+
+ final Integer anId = (Integer) y
+ .getProperty(BOp.Annotations.BOP_ID);
+
+ if (anId != null)
+ idFactory.reserve(anId.intValue());
+
+ }
+
+ }
+
+ }
+
+ }
+
}
\ No newline at end of file
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpUtility.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpUtility.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/BOpUtility.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -35,6 +35,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Set;
import org.apache.log4j.Logger;
@@ -53,6 +54,7 @@
import cutthecrap.utils.striterators.EmptyIterator;
import cutthecrap.utils.striterators.Expander;
import cutthecrap.utils.striterators.Filter;
+import cutthecrap.utils.striterators.ICloseable;
import cutthecrap.utils.striterators.ICloseableIterator;
import cutthecrap.utils.striterators.SingleValueIterator;
import cutthecrap.utils.striterators.Striterator;
@@ -72,7 +74,7 @@
* Pre-order recursive visitation of the operator tree (arguments only, no
* annotations).
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static Iterator<BOp> preOrderIterator(final BOp op) {
return new Striterator(new SingleValueIterator(op))
@@ -466,6 +468,8 @@
* The type of the node to be extracted.
*
* @return A list containing those references.
+ *
+ * @see #visitAll(BOp, Class)
*/
public static <C> List<C> toList(final BOp op, final Class<C> clas) {
@@ -483,6 +487,44 @@
}
+ /**
+ * Return the sole instance of the specified class.
+ *
+ * @param op
+ * The root of the traversal.
+ * @param class1
+ * The class to look for.
+ * @return The sole instance of that class.
+ * @throws NoSuchElementException
+ * if there is no such instance.
+ * @throws RuntimeException
+ * if there is more than one such instance.
+ */
+ public static <C> C getOnly(final BOp op, final Class<C> class1) {
+ final Iterator<C> it = visitAll(op, class1);
+ if (!it.hasNext())
+ throw new NoSuchElementException("No instance found: class="
+ + class1);
+ final C ret = it.next();
+ if (it.hasNext())
+ throw new RuntimeException("More than one instance exists: class="
+ + class1);
+ return ret;
+ }
+
+ /**
+ * Return an iterator visiting references to all nodes of the given type
+ * (recursive, including annotations).
+ *
+ * @param op
+ * The root of the operator tree.
+ * @param clas
+ * The type of the node to be extracted.
+ *
+ * @return A iterator visiting those references.
+ *
+ * @see #toList(BOp, Class)
+ */
@SuppressWarnings("unchecked")
public static <C> Iterator<C> visitAll(final BOp op, final Class<C> clas) {
@@ -947,9 +989,9 @@
} finally {
- if (itr instanceof ICloseableIterator<?>) {
+ if (itr instanceof ICloseable) {
- ((ICloseableIterator<?>) itr).close();
+ ((ICloseable) itr).close();
}
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -75,6 +75,7 @@
* <p>
* {@inheritDoc}
*/
+ @Override
public CoreBaseBOp clone() {
final Class<? extends CoreBaseBOp> cls = getClass();
final Constructor<? extends CoreBaseBOp> ctor;
@@ -98,14 +99,15 @@
* General contract is a short (non-recursive) representation of the
* {@link BOp}.
*/
+ @Override
public String toShortString() {
final BOp t = this;
if (t instanceof IValueExpression<?>
|| t instanceof IValueExpressionNode) {
/*
- * Note: toString() is intercepted for a few bops, mainly those with
- * a pretty simple structure. This delegates to toString() in those
- * cases.
+ * Note: toShortString() is intercepted for a few bops, mainly those
+ * with a pretty simple structure. This delegates to toString() in
+ * those cases.
*/
return t.toString();
} else {
@@ -125,6 +127,7 @@
* Return a non-recursive representation of the arguments and annotations
* for this {@link BOp}.
*/
+ @Override
public String toString() {
final StringBuilder sb = new StringBuilder();
@@ -181,6 +184,7 @@
}
}
+ @Override
final public Object getRequiredProperty(final String name) {
final Object tmp = getProperty(name);
@@ -193,6 +197,7 @@
}
+ @Override
@SuppressWarnings("unchecked")
final public <T> T getProperty(final String name, final T defaultValue) {
@@ -229,18 +234,22 @@
}
+ @Override
final public int getId() {
return (Integer) getRequiredProperty(Annotations.BOP_ID);
}
-
+
+ @Override
final public boolean isController() {
-
- return getProperty(Annotations.CONTROLLER, false);
-
+
+ return getProperty(Annotations.CONTROLLER,
+ Annotations.DEFAULT_CONTROLLER);
+
}
+ @Override
final public BOpEvaluationContext getEvaluationContext() {
return getProperty(Annotations.EVALUATION_CONTEXT,
@@ -251,6 +260,7 @@
/**
* <code>true</code> if all arguments and annotations are the same.
*/
+ @Override
public boolean equals(final Object other) {
if (this == other)
@@ -378,6 +388,7 @@
/**
* The hash code is based on the hash of the operands (cached).
*/
+ @Override
public int hashCode() {
int h = hash;
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/IdFactory.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/IdFactory.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/IdFactory.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -1,3 +1,26 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2011. 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.bop;
/**
@@ -5,6 +28,9 @@
*/
public interface IdFactory {
+ /**
+ * Issue the next bop identifier.
+ */
public int nextId();
}
Copied: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java (from rev 7746, branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java)
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java (rev 0)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -0,0 +1,47 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2011. 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.bop;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class SimpleIdFactory implements IdFactory {
+
+ /**
+ * Note: The ids are assigned using {@link AtomicInteger#incrementAndGet()}
+ * so ONE (1) is the first id that will be assigned when we pass in ZERO (0)
+ * as the initial state of the {@link AtomicInteger}.
+ */
+ private final AtomicInteger nextId = new AtomicInteger(0);
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int nextId() {
+
+ return nextId.incrementAndGet();
+
+ }
+
+}
Property changes on: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate:7608-7684
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/aggregate:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate:7608-7746
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/aggregate:7465-7484
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/ap/SampleIndex.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/ap/SampleIndex.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/ap/SampleIndex.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -106,7 +106,13 @@
/**
* Sample offsets are computed randomly.
*/
- RANDOM;
+ RANDOM,
+ /**
+ * The samples will be dense and may bave a front bias. This mode
+ * emphasizes the locality of the samples on the index pages and
+ * minimizes the IO associated with sampling.
+ */
+ DENSE;
}
/**
@@ -323,6 +329,9 @@
seed(), limit, accessPath.getFromKey(), accessPath
.getToKey());
break;
+ case DENSE:
+ advancer = new DenseSampleAdvancer<E>();
+ break;
default:
throw new UnsupportedOperationException("SampleType="
+ sampleType);
@@ -339,6 +348,23 @@
}
/**
+ * Dense samples in key order (simple index scan).
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @param <E>
+ */
+ private static class DenseSampleAdvancer<E> extends Advancer<E> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void advance(final ITuple<E> tuple) {
+ // NOP
+ }
+
+ }
+
+ /**
* An advancer pattern which is designed to take evenly distributed samples
* from an index. The caller specifies the #of tuples to be sampled. This
* class estimates the range count of the access path and then computes the
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -34,7 +34,7 @@
import com.bigdata.bop.IValueExpressionConstraint;
/**
- * BOpConstraint that wraps a {@link BooleanValueExpression}.
+ * {@link Constraint} wraps a {@link BooleanValueExpression}.
*/
public class Constraint<X> extends BOpBase implements
IValueExpressionConstraint<X> {
@@ -66,9 +66,8 @@
/**
* Required shallow copy constructor.
*/
- public Constraint(final BOp[] args,
- final Map<String, Object> anns) {
-
+ public Constraint(final BOp[] args, final Map<String, Object> anns) {
+
super(args, anns);
if (args.length != 1 || args[0] == null)
@@ -83,6 +82,7 @@
super(op);
}
+ @Override
@SuppressWarnings("unchecked")
public IValueExpression<X> getValueExpression() {
@@ -90,6 +90,7 @@
}
+ @Override
public boolean accept(final IBindingSet bs) {
// try {
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/HTreeNamedSubqueryOp.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/HTreeNamedSubqueryOp.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/HTreeNamedSubqueryOp.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -73,7 +73,7 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
*/
-public class HTreeNamedSubqueryOp extends PipelineOp {
+public class HTreeNamedSubqueryOp extends PipelineOp implements INamedSubqueryOp {
static private final transient Logger log = Logger
.getLogger(HTreeNamedSubqueryOp.class);
@@ -151,7 +151,7 @@
}
- public HTreeNamedSubqueryOp(final BOp[] args, NV... annotations) {
+ public HTreeNamedSubqueryOp(final BOp[] args, final NV... annotations) {
this(args, NV.asMap(annotations));
@@ -164,6 +164,7 @@
}
+ @Override
public FutureTask<Void> eval(final BOpContext<IBindingSet> context) {
return new FutureTask<Void>(new ControllerTask(this, context));
@@ -266,6 +267,7 @@
/**
* Evaluate.
*/
+ @Override
public Void call() throws Exception {
try {
@@ -356,6 +358,7 @@
}
+ @Override
public Void call() throws Exception {
// The subquery
Copied: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java (from rev 7746, branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java)
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java (rev 0)
+++ branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java 2014-01-08 15:14:09 UTC (rev 7747)
@@ -0,0 +1,42 @@
+/**
+
+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.bop.controller;
+
+import com.bigdata.bop.join.SolutionSetHashJoinOp;
+
+/**
+ * Marker interface for named subquery evaluation. Solutions from the pipeline
+ * flow through this operator without modification. The subquery is evaluated
+ * exactly once, the first time this operator is invoked, and the solutions for
+ * the subquery are written onto a hash index. Those solutions are then joined
+ * back within the query at latter points in the query plan using a solution set
+ * hash join.
+ *
+ * @see SolutionSetHashJoinOp
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ */
+public interface INamedSubqueryOp {
+
+}
Modified: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/JVMNamedSubqueryOp.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/controller/JVMNamedSubqueryOp.java 2014-01-07 22:10:34 UTC (rev 7746)
+++ branches/MGC_1_3_0/...
[truncated message content] |
