Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[7837] branches/RDR
|
From: <tho...@us...> - 2014-01-31 17:45:06
|
Revision: 7837
http://bigdata.svn.sourceforge.net/bigdata/?rev=7837&view=rev
Author: thompsonbry
Date: 2014-01-31 17:44:48 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
Merge from main development branch to RDR branch prior to bringing code back to the main branch.
{{{
Merge complete.
===== File Statistics: =====
Deleted: 13
Added: 105
Updated: 273
==== Property Statistics: =====
Updated: 50
==== Conflict Statistics: =====
File conflicts: 2
}}}
The conflicts are:
{{{
C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java
C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_RDR/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestStatementBuffer.java
}}}
In both cases, we accepted the RDR branch version of the file.
Note: With this merge, the SIDS mode is no longer available! Instead, we support efficient per-statement metadata in both the triples and quads mode of the database. This also has an impact on query. Instead of the SIDs mode query pattern (where the graph variable is bound to the statement), you need to use the RDR syntax for either explicit or implicit binding of the statement on a variable.
This commit also provides support for the terse RDR syntax when parsing ntriples. Reified statement models are also automatically turned into efficient inline representations, but the use of the RDF reification syntax does impose an overhead since the blank nodes associated with the statement model will persist throughput the parse of the document. This is not efficient for large documents.
See #526 (Reification done right)
Modified Paths:
--------------
branches/RDR/.classpath
branches/RDR/README
branches/RDR/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/BOpBase.java
branches/RDR/bigdata/src/java/com/bigdata/bop/BOpContext.java
branches/RDR/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java
branches/RDR/bigdata/src/java/com/bigdata/bop/BOpUtility.java
branches/RDR/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/IdFactory.java
branches/RDR/bigdata/src/java/com/bigdata/bop/PipelineOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/ap/SampleIndex.java
branches/RDR/bigdata/src/java/com/bigdata/bop/bset/ConditionalRoutingOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java
branches/RDR/bigdata/src/java/com/bigdata/bop/controller/HTreeNamedSubqueryOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/controller/JVMNamedSubqueryOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java
branches/RDR/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
branches/RDR/bigdata/src/java/com/bigdata/bop/engine/BOpStats.java
branches/RDR/bigdata/src/java/com/bigdata/bop/engine/BSBundle.java
branches/RDR/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
branches/RDR/bigdata/src/java/com/bigdata/bop/engine/LocalChunkMessage.java
branches/RDR/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
branches/RDR/bigdata/src/java/com/bigdata/bop/engine/QueryLog.java
branches/RDR/bigdata/src/java/com/bigdata/bop/engine/RunState.java
branches/RDR/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java
branches/RDR/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java
branches/RDR/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/BaseJoinStats.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/HTreeHashIndexOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/HTreeHashJoinUtility.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/HashIndexOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/HashJoinOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/IHashJoinUtility.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/JVMHashIndex.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/JVMHashIndexOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/JVMHashJoinUtility.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/JoinVariableNotBoundException.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/NamedSolutionSetStats.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/PipelineJoinStats.java
branches/RDR/bigdata/src/java/com/bigdata/bop/join/SolutionSetHashJoinOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/NoSolutionsException.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/PartitionedJoinGroup.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/rto/EdgeSample.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JGraph.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JoinGraph.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Path.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/rto/SampleBase.java
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Vertex.java
branches/RDR/bigdata/src/java/com/bigdata/bop/paths/ZeroLengthPathOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/DropOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/GroupByOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/MemorySortOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/PipelinedAggregationOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/ProjectionOp.java
branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/SliceOp.java
branches/RDR/bigdata/src/java/com/bigdata/btree/IndexMetadata.java
branches/RDR/bigdata/src/java/com/bigdata/btree/data/DefaultLeafCoder.java
branches/RDR/bigdata/src/java/com/bigdata/btree/data/DefaultNodeCoder.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/AbstractKeyBuffer.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/AbstractRaba.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/ConditionalRabaCoder.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/EmptyRaba.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/IRaba.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/MutableKeysRaba.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/MutableValueBuffer.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/codec/AbstractCodedRaba.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/codec/CanonicalHuffmanRabaCoder.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/codec/EmptyRabaValueCoder.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/codec/FixedLengthValueRabaCoder.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/codec/FrontCodedRabaCoder.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/codec/IRabaCoder.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/codec/SimpleRabaCoder.java
branches/RDR/bigdata/src/java/com/bigdata/concurrent/FutureTaskInvariantMon.java
branches/RDR/bigdata/src/java/com/bigdata/ha/HAPipelineGlue.java
branches/RDR/bigdata/src/java/com/bigdata/ha/QuorumCommitImpl.java
branches/RDR/bigdata/src/java/com/bigdata/ha/QuorumPipeline.java
branches/RDR/bigdata/src/java/com/bigdata/ha/QuorumPipelineImpl.java
branches/RDR/bigdata/src/java/com/bigdata/ha/QuorumServiceBase.java
branches/RDR/bigdata/src/java/com/bigdata/ha/msg/HAWriteMessage.java
branches/RDR/bigdata/src/java/com/bigdata/ha/msg/HAWriteMessageBase.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/HAReceiveService.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/HASendService.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/PipelineDownstreamChange.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/PipelineUpstreamChange.java
branches/RDR/bigdata/src/java/com/bigdata/htree/DirectoryPage.java
branches/RDR/bigdata/src/java/com/bigdata/htree/NodeSerializer.java
branches/RDR/bigdata/src/java/com/bigdata/htree/raba/MutableKeyBuffer.java
branches/RDR/bigdata/src/java/com/bigdata/htree/raba/MutableValueBuffer.java
branches/RDR/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
branches/RDR/bigdata/src/java/com/bigdata/journal/Name2Addr.java
branches/RDR/bigdata/src/java/com/bigdata/journal/Options.java
branches/RDR/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
branches/RDR/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
branches/RDR/bigdata/src/java/com/bigdata/quorum/QuorumClient.java
branches/RDR/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java
branches/RDR/bigdata/src/java/com/bigdata/relation/accesspath/ElementFilter.java
branches/RDR/bigdata/src/java/com/bigdata/relation/accesspath/IBindingSetAccessPath.java
branches/RDR/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/AbstractChunkedResolverator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/ChunkedArrayIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/ChunkedArraysIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/ChunkedConvertingIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/ChunkedOrderedStriterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/ChunkedResolvingIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/ChunkedWrappedIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/Chunkerator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/CloseableIteratorWrapper.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/Dechunkerator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/DelegateChunkedIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/GenericChunkedStriterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/IChunkedIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/IChunkedStriterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/MergeFilter.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/PushbackIterator.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/Resolver.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/Striterator.java
branches/RDR/bigdata/src/java/com/bigdata/util/NT.java
branches/RDR/bigdata/src/releases/RELEASE_1_3_0.txt
branches/RDR/bigdata/src/test/com/bigdata/TestAll.java
branches/RDR/bigdata/src/test/com/bigdata/bop/TestAll.java
branches/RDR/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java
branches/RDR/bigdata/src/test/com/bigdata/bop/controller/TestUnion.java
branches/RDR/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java
branches/RDR/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine_Slice.java
branches/RDR/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine_SortOp.java
branches/RDR/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java
branches/RDR/bigdata/src/test/com/bigdata/bop/fed/TestNIOChunkMessage.java
branches/RDR/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java
branches/RDR/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java
branches/RDR/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestAll.java
branches/RDR/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJGraph.java
branches/RDR/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java
branches/RDR/bigdata/src/test/com/bigdata/bop/solutions/TestMemorySortOp.java
branches/RDR/bigdata/src/test/com/bigdata/bop/solutions/TestSliceOp.java
branches/RDR/bigdata/src/test/com/bigdata/btree/raba/codec/MutableRabaCoder.java
branches/RDR/bigdata/src/test/com/bigdata/ha/msg/TestAll.java
branches/RDR/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive.java
branches/RDR/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive3Nodes.java
branches/RDR/bigdata/src/test/com/bigdata/htree/AbstractHTreeTestCase.java
branches/RDR/bigdata/src/test/com/bigdata/htree/TestAll_HTree.java
branches/RDR/bigdata/src/test/com/bigdata/htree/TestHTreeWithMemStore.java
branches/RDR/bigdata/src/test/com/bigdata/htree/TestIncrementalWrite.java
branches/RDR/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
branches/RDR/bigdata/src/test/com/bigdata/journal/TestWORMStrategyNoCache.java
branches/RDR/bigdata/src/test/com/bigdata/journal/ha/HABranch.txt
branches/RDR/bigdata/src/test/com/bigdata/quorum/MockQuorumFixture.java
branches/RDR/bigdata/src/test/com/bigdata/striterator/TestAll.java
branches/RDR/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java
branches/RDR/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
branches/RDR/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
branches/RDR/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HALogNexus.java
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournalTest.java
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3ChangeLeader.java
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JournalServer.java
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3RestorePolicy.java
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServer.java
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java
branches/RDR/bigdata-jini/src/test/com/bigdata/quorum/zk/MockQuorumMember.java
branches/RDR/bigdata-perf/CI/govtrack/build.properties
branches/RDR/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/DataSetJoin.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParserStats.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EBVBOp.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IPassesMaterialization.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SPARQLConstraint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/TryBeforeMaterializationConstraint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DateTimeExtension.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTBase.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AssignmentNode.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ComputedMaterializationRequirement.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ConstructNode.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GraphPatternGroup.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GroupMemberValueExpressionNodeBase.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GroupNodeBase.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/JoinGroupNode.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/NamedSubqueryInclude.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/NamedSubqueryRoot.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/OrderByNode.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryBase.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryOptimizerEnum.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryRoot.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SliceNode.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryRoot.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ValueExpressionListBaseNode.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ZeroLengthPathNode.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpFilters.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTConstructIterator.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchInSearchOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DataSetSummary.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractChunkSizeHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractQueryHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AnalyticQueryHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AtOnceHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/BufferChunkCapacityHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/BufferChunkOfChunksCapacityHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/ChunkSizeHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/IQueryHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/OptimizerQueryHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineMaxMessagesPerTaskHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineMaxParallelHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineQueueCapacityHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintRegistry.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RunFirstHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RunLastHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RunOnceHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBindingAssigner.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBottomUpOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTConstructOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTOptimizerList.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTQueryHintOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeCountOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTSparql11SubqueryOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticJoinOptimizer.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCall.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/spo/FastRDFValueCoder2.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphHashSetFilter.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOFilter.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/GenerateBarData.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/AbstractDataAndSPARQLTestCase.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/AbstractDataDrivenSPARQLTestCase.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestAll.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestSubQuery.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestTickets.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/query-hints-01.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/query-hints-06.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/search-prefix-match.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/service/TestSearch.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTSparql11SubqueryOptimizer.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/NanoSparqlServer.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractProtocolTest.java
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager.java
branches/RDR/bigdata-war/src/html/index.html
branches/RDR/build.properties
branches/RDR/build.xml
branches/RDR/ctc-striterators/src/java/cutthecrap/utils/striterators/FilterBase.java
branches/RDR/lgpl-utils/build.properties
branches/RDR/lgpl-utils/build.xml
branches/RDR/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/CustomByteArrayFrontCodedList.java
branches/RDR/pom.xml
Added Paths:
-----------
branches/RDR/bigdata/lib/lgpl-utils-1.0.7-270114.jar
branches/RDR/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java
branches/RDR/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java
branches/RDR/bigdata/src/java/com/bigdata/btree/raba/codec/FrontCodedRabaCoderDupKeys.java
branches/RDR/bigdata/src/java/com/bigdata/ha/AbstractMessageTask.java
branches/RDR/bigdata/src/java/com/bigdata/ha/HAPipelineResetRequest.java
branches/RDR/bigdata/src/java/com/bigdata/ha/HAPipelineResetResponse.java
branches/RDR/bigdata/src/java/com/bigdata/ha/IHAPipelineResetRequest.java
branches/RDR/bigdata/src/java/com/bigdata/ha/IHAPipelineResetResponse.java
branches/RDR/bigdata/src/java/com/bigdata/ha/msg/HAMessageWrapper.java
branches/RDR/bigdata/src/java/com/bigdata/ha/msg/HASendState.java
branches/RDR/bigdata/src/java/com/bigdata/ha/msg/IHAMessageWrapper.java
branches/RDR/bigdata/src/java/com/bigdata/ha/msg/IHASendState.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/AbstractPipelineChangeException.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/AbstractPipelineException.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/ImmediateDownstreamReplicationException.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/NestedPipelineException.java
branches/RDR/bigdata/src/java/com/bigdata/ha/pipeline/PipelineImmediateDownstreamReplicationException.java
branches/RDR/bigdata/src/java/com/bigdata/quorum/ServiceLookup.java
branches/RDR/bigdata/src/java/com/bigdata/striterator/CloseableChunkedIteratorWrapperConverter.java
branches/RDR/bigdata/src/resources/deployment/
branches/RDR/bigdata/src/resources/deployment/vagrant/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/Berksfile
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/CHANGELOG.md
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/Gemfile
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/Thorfile
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/chefignore
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/default_test.rb
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/default.rb
branches/RDR/bigdata/src/test/com/bigdata/ha/msg/TestHASendState.java
branches/RDR/bigdata/src/test/com/bigdata/ha/pipeline/AbstractHASendAndReceiveTestCase.java
branches/RDR/bigdata/src/test/com/bigdata/ha/pipeline/TestSocketsDirect.java
branches/RDR/bigdata/src/test/com/bigdata/htree/TestDuplicates.java
branches/RDR/bigdata/src/test/com/bigdata/striterator/TestCloseableChunkedIteratorWrapperConverter.java
branches/RDR/bigdata-jini/src/resources/README-JINI
branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JustKills.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataQuadWrapper.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/OutOfOrderEvaluationException.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOLimitQueryHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTONEdgesQueryHint.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOSampleTypeQueryHint.java
branches/RDR/bigdata-rdf/src/resources/data/lehigh/LUBM-U1.rdf.gz
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/AbstractRTOTestCase.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1-noSolutions.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7b.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7b.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestAll.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BAR.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BSBM.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_FOAF.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_LUBM.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/search-prefix-match2.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/sparql11-subselect-filter-01.nt
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/sparql11-subselect-filter-01.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/sparql11-subselect-filter-01.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/sparql11-subselect-filter-01b.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/test_ticket_801_complex_optionals.nt
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/test_ticket_801_complex_optionals.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/test_ticket_801a_complex_optionals.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/test_ticket_801b_complex_optionals.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket-806.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket-806.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket-806.trig
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTMassagedServiceNodeOptimizer.java
branches/RDR/bigdata-sails/src/samples/com/bigdata/samples/NSSEmbeddedExample.java
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractNamedGraphUpdateTest.java
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/HashDistinctNamedGraphUpdateTest.java
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/NativeDistinctNamedGraphUpdateTest.java
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java
Removed Paths:
-------------
branches/RDR/bigdata/lib/lgpl-utils-1.0.6-020610.jar
branches/RDR/bigdata/src/resources/deployment/vagrant/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/Berksfile
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/CHANGELOG.md
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/Gemfile
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/Thorfile
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/chefignore
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/default_test.rb
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/
branches/RDR/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/default.rb
branches/RDR/bigdata/src/test/com/bigdata/journal/ha/AbstractHAJournalTestCase.java
branches/RDR/bigdata/src/test/com/bigdata/journal/ha/TestAll.java
branches/RDR/bigdata/src/test/com/bigdata/journal/ha/TestHAWORMStrategy.java
branches/RDR/bigdata/src/test/com/bigdata/journal/ha/TestHAWritePipeline.java
branches/RDR/bigdata/src/test/com/bigdata/journal/ha/TestJournalHA.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/AbstractJoinGraphTestCase.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/TestAll.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/TestJoinGraphOnBSBMData.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/TestJoinGraphOnBarData.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/TestJoinGraphOnLubm.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/AbstractRTOTestCase.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1-noSolutions.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7b.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7b.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.rq
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.srx
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestAll.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BAR.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BSBM.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_FOAF.java
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_LUBM.java
branches/RDR/overview.html
Property Changed:
----------------
branches/RDR/
branches/RDR/bigdata/lib/jetty/
branches/RDR/bigdata/src/java/com/bigdata/bop/aggregate/
branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/
branches/RDR/bigdata/src/java/com/bigdata/bop/util/
branches/RDR/bigdata/src/java/com/bigdata/htree/raba/
branches/RDR/bigdata/src/java/com/bigdata/jsr166/
branches/RDR/bigdata/src/test/com/bigdata/bop/joinGraph/
branches/RDR/bigdata/src/test/com/bigdata/bop/util/
branches/RDR/bigdata/src/test/com/bigdata/jsr166/
branches/RDR/bigdata/src/test/com/bigdata/util/httpd/
branches/RDR/bigdata-compatibility/
branches/RDR/bigdata-jini/src/java/com/bigdata/attr/
branches/RDR/bigdata-jini/src/java/com/bigdata/disco/
branches/RDR/bigdata-jini/src/java/com/bigdata/util/config/
branches/RDR/bigdata-perf/
branches/RDR/bigdata-perf/btc/
branches/RDR/bigdata-perf/btc/src/resources/
branches/RDR/bigdata-perf/lubm/
branches/RDR/bigdata-perf/uniprot/
branches/RDR/bigdata-perf/uniprot/src/
branches/RDR/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/changesets/
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/error/
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/relation/
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/util/
branches/RDR/bigdata-rdf/src/samples/
branches/RDR/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate/
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/internal/
branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/relation/
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets/
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/bench/
branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/
branches/RDR/dsi-utils/
branches/RDR/dsi-utils/LEGAL/
branches/RDR/dsi-utils/lib/
branches/RDR/dsi-utils/src/
branches/RDR/dsi-utils/src/java/
branches/RDR/dsi-utils/src/java/it/
branches/RDR/dsi-utils/src/java/it/unimi/
branches/RDR/dsi-utils/src/test/
branches/RDR/dsi-utils/src/test/it/unimi/
branches/RDR/dsi-utils/src/test/it/unimi/dsi/
branches/RDR/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/RDR/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/RDR/osgi/
branches/RDR/src/resources/bin/config/
Property changes on: branches/RDR
___________________________________________________________________
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/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:7665-7836
/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/MGC_1_3_0:7609-7752
/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
Modified: branches/RDR/.classpath
===================================================================
--- branches/RDR/.classpath 2014-01-31 15:18:44 UTC (rev 7836)
+++ branches/RDR/.classpath 2014-01-31 17:44:48 UTC (rev 7837)
@@ -32,7 +32,7 @@
<classpathentry kind="src" path="bigdata-gas/src/java"/>
<classpathentry kind="src" path="bigdata-gas/src/test"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/dsi-utils-1.0.6-020610.jar"/>
- <classpathentry exported="true" kind="lib" path="bigdata/lib/lgpl-utils-1.0.6-020610.jar"/>
+ <classpathentry kind="lib" path="bigdata/lib/lgpl-utils-1.0.7-270114.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/apache/zookeeper-3.3.3.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-continuation-7.2.2.v20101205.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-http-7.2.2.v20101205.jar"/>
Modified: branches/RDR/README
===================================================================
--- branches/RDR/README 2014-01-31 15:18:44 UTC (rev 7836)
+++ branches/RDR/README 2014-01-31 17:44:48 UTC (rev 7837)
@@ -0,0 +1,4 @@
+Please see the release notes in bigdata/src/releases for getting started
+links. This will point you to the installation instructions for the
+different deployment modes, the online documentation, the wiki, etc. It
+will also point you to resources for support, subscriptions, and licensing.
Property changes on: branches/RDR/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/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:7665-7836
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/MGC_1_3_0/bigdata/lib/jetty:7609-7752
/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
Deleted: branches/RDR/bigdata/lib/lgpl-utils-1.0.6-020610.jar
===================================================================
(Binary files differ)
Copied: branches/RDR/bigdata/lib/lgpl-utils-1.0.7-270114.jar (from rev 7836, branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/lgpl-utils-1.0.7-270114.jar)
===================================================================
(Binary files differ)
Modified: branches/RDR/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java 2014-01-31 15:18:44 UTC (rev 7836)
+++ branches/RDR/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java 2014-01-31 17:44:48 UTC (rev 7837)
@@ -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/RDR/bigdata/src/java/com/bigdata/bop/BOpBase.java
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/BOpBase.java 2014-01-31 15:18:44 UTC (rev 7836)
+++ branches/RDR/bigdata/src/java/com/bigdata/bop/BOpBase.java 2014-01-31 17:44:48 UTC (rev 7837)
@@ -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/RDR/bigdata/src/java/com/bigdata/bop/BOpContext.java
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/BOpContext.java 2014-01-31 15:18:44 UTC (rev 7836)
+++ branches/RDR/bigdata/src/java/com/bigdata/bop/BOpContext.java 2014-01-31 17:44:48 UTC (rev 7837)
@@ -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/RDR/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java 2014-01-31 15:18:44 UTC (rev 7836)
+++ branches/RDR/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java 2014-01-31 17:44:48 UTC (rev 7837)
@@ -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,105 @@
*/
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 in some join graph.
+ *
+ * @param preds
+ * The vertices of the join graph.
+ */
+ public void reserveIds(final IPredicate<?>[] preds) {
+
+ if (preds == null)
+ throw new IllegalArgumentException();
+
+ for (IPredicate<?> p : preds) {
+
+ reserve(p.getId());
+
+ }
+
+ }
+
+ /**
+ * Reserve ids used by the constraints for some predicate or join graph.
+ *
+ * @param constraints
+ * The constraints that attach to some predicate (optional).
+ */
+ public void reserveIds(final IConstraint[] constraints) {
+
+ if (constraints == null)
+ return;
+
+ 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)
+ reserve(anId.intValue());
+
+ }
+
+ }
+
+ }
+
}
\ No newline at end of file
Modified: branches/RDR/bigdata/src/java/com/bigdata/bop/BOpUtility.java
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/BOpUtility.java 2014-01-31 15:18:44 UTC (rev 7836)
+++ branches/RDR/bigdata/src/java/com/bigdata/bop/BOpUtility.java 2014-01-31 17:44:48 UTC (rev 7837)
@@ -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 NoSuchE...
[truncated message content] |
