Added tests (both runtime and static optimizer) for trac 794 to do with SERVICE and BIND
Also modified comment in ASTJoinOrderByTypeOptimizer which is doing the wrong thing.
Tests currently disabled since the fix is not yet in. (Note the fix is non-trivial, but not conceptually hard either)

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7746 8f7bc0f5-282e-0410-95e3-8d296e9bb460
whitespace for clarity

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7749 8f7bc0f5-282e-0410-95e3-8d296e9bb460
@Override, final annotations.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7750 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Added a hidden option to enable the RTO.

Changed the way in which the analytic option recognition works.  Verified correctly works in sample queries.

See #64 (RTO.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7751 8f7bc0f5-282e-0410-95e3-8d296e9bb460
This issue is closed.  

Branch MGC_1_3_0 was created from r7608 of branches/BIGDATA_RELEASE_1_3_0.  

This branch was used to make HA robust in the face of sudden process kills.

Merging MGC_1_3_0 back to the main development branch (branches/BIGDATA_RELEASE_1_3_0).  Work on MGC_1_3_0 is closed out.
{{{
merge -r7608:HEAD https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/MGC_1_3_0 /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/quorum/zk/MockQuorumMember.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournalTest.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServer.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JustKills.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/disco
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/disco
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/attr
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/attr
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/util/config
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/util/config
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/lubm
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/lubm
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/uniprot/src
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/uniprot/src
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/uniprot
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/uniprot
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/btc/src/resources
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/btc/src/resources
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/btc
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/btc
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/src/resources/bin/config
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/src/resources/bin/config
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/build.properties
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/build.xml
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-compatibility
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-compatibility
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/LEGAL
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/LEGAL
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/lib
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/lib
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test/it/unimi/dsi
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test/it/unimi/dsi
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test/it/unimi
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test/it/unimi
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java/it/unimi
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java/it/unimi
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java/it
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java/it
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-war/src/html/index.html
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/lib/jetty
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/lib/jetty
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestAll.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJGraph.java
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/TestAll.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/util
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/util
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/striterator/TestCloseableChunkedIteratorWrapperConverter.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/quorum/MockQuorumFixture.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/TestAll.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive3Nodes.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/pipeline/TestSocketsDirect.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/pipeline/AbstractHASendAndReceiveTestCase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/msg/TestHASendState.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/msg/TestAll.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/jsr166
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/jsr166
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/HABranch.txt
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/TestHAWORMStrategy.java
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/AbstractHAJournalTestCase.java
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/TestJournalHA.java
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/TestAll.java
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/TestHAWritePipeline.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/TestWORMStrategyNoCache.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/util/httpd
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/util/httpd
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/IChunkedIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/CloseableIteratorWrapper.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/MergeFilter.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/AbstractChunkedResolverator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedWrappedIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/Striterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedResolvingIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/IChunkedStriterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/Resolver.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/PushbackIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/GenericChunkedStriterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/Chunkerator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/DelegateChunkedIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedOrderedStriterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedArrayIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedConvertingIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/Dechunkerator.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/CloseableChunkedIteratorWrapperConverter.java
    C   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
    C   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/QuorumClient.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/ServiceLookup.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/QuorumPipelineImpl.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/HAPipelineResetResponse.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/IHAPipelineResetRequest.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/IHAPipelineResetResponse.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/QuorumPipeline.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/PipelineDownstreamChange.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/PipelineImmediateDownstreamReplicationException.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/HASendService.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/NestedPipelineException.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/AbstractPipelineException.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/ImmediateDownstreamReplicationException.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/HAReceiveService.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/PipelineUpstreamChange.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/AbstractPipelineChangeException.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/HAPipelineResetRequest.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/HAPipelineGlue.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/QuorumServiceBase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/HAWriteMessageBase.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/IHASendState.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/HAWriteMessage.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/HASendState.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/IHAMessageWrapper.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/HAMessageWrapper.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/QuorumCommitImpl.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/AbstractMessageTask.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/DropOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/ProjectionOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/SliceOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/aggregate
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/aggregate
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/BOpStats.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/RunState.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/util
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/util
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JoinGraph.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph/rto/SampleBase.java
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/BOpBase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/IHashJoinUtility.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/HashJoinOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/JVMHashJoinUtility.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/BaseJoinStats.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/NamedSolutionSetStats.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/JoinVariableNotBoundException.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/BOpUtility.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/jsr166
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/jsr166
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/btree/data/DefaultNodeCoder.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/btree/data/DefaultLeafCoder.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/htree/raba
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/htree/raba
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/journal/Options.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/journal/Name2Addr.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/relation/accesspath/IBindingSetAccessPath.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/util/NT.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/resources/deployment
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/osgi
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/osgi
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTMassagedServiceNodeOptimizer.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/internal
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/internal
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/relation
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/relation
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParserStats.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/changesets
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/changesets
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/error
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/error
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/IQueryHint.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTONEdgesQueryHint.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractChunkSizeHint.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOLimitQueryHint.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintRegistry.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOSampleTypeQueryHint.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GraphPatternGroup.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/NamedSubqueryInclude.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpFilters.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTBase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBindingAssigner.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ValueExpressionListBaseNode.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SliceNode.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryOptimizerEnum.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/internal
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/internal
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/relation
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/relation
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/util
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/util
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/samples
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/samples
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/resources/data/lehigh/LUBM-U1.rdf.gz
     C  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    Merge complete.
    ===== File Statistics: =====
    Deleted: 5
    Added: 19
    Updated: 108
    ==== Property Statistics: =====
    Updated: 49
    ==== Conflict Statistics: =====
    File conflicts: 2
    Property conflicts: 1
    Tree conflicts: 13
}}}

There were TWO files with conflicts. In both cases, the incoming
version was accepted. Those files are:
{{{
    C   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
    C   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
}}}

There was also an SVN property conflict on svn:ignore.  This was resolved by using the version from the main branch.

I also needed to go into the tree conflict view and "mark resolved" a number of files. Each of this was reported as "local add" and "incoming and upon merge". In all cases these were simply recently added files from the main branch. 

See #779 (pipeline resynchronization protocol)
See #724 (HA wire pulls and sure kill tests)



git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7753 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Updated test_interruptRMI() to capture feedback from the river developers mailing list.  It seems that the expected behavior is that the remote task is not interrupted.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7754 8f7bc0f5-282e-0410-95e3-8d296e9bb460
The RTO now supports FILTERs on required joins when those filters have materialization requirements.  This is the subject of #257, which is now closed.  Over time we will probably refactor the RTO to operate directly on the AST nodes (e.g., StatementPatternNode versus SPOPredicate), but it currently handles conditional materialization pipelines just fine.

There are currently two different ways in which a cutoff join can be evaluated.  One uses a single pipeline join and carefully controls the execution of that join to obtain an estimated cardinality.  This is the historical method.

The other can handle a sequence of operators.  A pipeline join is generated followed by whatever operators are required to materialize variable bindings and evaluate filters. Finally, a SLICE is appended to the query plan to limit the output.  When the query is executed, a rowid column is injected into the source solutions. This is used to correctly correlate the #of input solutions required to produce a given #of output solutions and hence obtain the estimated cardinality of the join through cutoff evaluation.

Some slight differences in the resulting plans and runtime behavior have been observed when all queries 

See #257 (Support BOP fragments in the RTO)
See #64 (Runtime Query Optimizer)

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7755 8f7bc0f5-282e-0410-95e3-8d296e9bb460
removed java 7 throwable ctor call that broke the build...

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7756 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Updated javadoc on the receive and replicate and robust send tasks in QuorumPipelineImpl.

Renamed the local and remote futures as futLoc and futRmt.  The local future is either the HASendService or the HAReceiveService (with an inner HASendService).  The remote future is the RMI to the HAPipeline interface for receiveAndReplicate() or receive().

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7757 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Modified AbstractRunningQuery.getChildren() to be recursive since we were missing any sub-queries that were executed from within a named subquery. This showed up in the explain view of govtrack/queries/query0011.rq.

See #64 (RTO).

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7758 8f7bc0f5-282e-0410-95e3-8d296e9bb460
@Override, final.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7759 8f7bc0f5-282e-0410-95e3-8d296e9bb460
javadoc edit.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7760 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Checkpoint on the RTO development. 

See #64.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7761 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Modified the committed code to allow out of order evaluation. This gets BSBM Q5 to pass.  The root cause is a conditional routing operation that is not maintaining the ordering.  I think that the fix is to do the materialization non-conditionally and NOT attach the FILTER to the JOIN.  I have allowed out of order evaluation until I can talk this through with MikeP.

See #64 (RTO)

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7762 8f7bc0f5-282e-0410-95e3-8d296e9bb460
javadoc

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7763 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Added a unit test that demonstrates a failure (N"

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7764 8f7bc0f5-282e-0410-95e3-8d296e9bb460
inline comment.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7765 8f7bc0f5-282e-0410-95e3-8d296e9bb460
More TODOs about test cases.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7766 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Two test case queries were flipped.

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7767 8f7bc0f5-282e-0410-95e3-8d296e9bb460
Bug fix for complex OPTIONAL groups and the RTO.  The root cause was a failure to visit the children of the JoinGraph node when assigning BOpStats objects to the top-level query.  The fix was to AbstractRunningQuery#populateStatsMap().

git-svn-id: https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0@7768 8f7bc0f5-282e-0410-95e3-8d296e9bb460