Details

      Description

      Develop a set of tests and expectations concerning the behavior of the HA replication cluster for abnormal failure modes including:


      - wire pulling (pulling the ethernet cable. this can not be readily simulated in CI. It could be scripted with a programmable switch.)
      - sudden kill (kill -9 of the HAJournalServer JVM
      - this can be done in CI tests with a kill of the child process)
      - failover testing of zookeeper services (run an ensemble of 3 zk servers, then see how the HA replication cluster handles failover among the zk servers in the ensemble).
      - failover testing of river service registrars (run river on each node where we are running an HAJournalSercer, then see how the HA replication cluster handles failover among the river service registrars by killing and restarting those registrars. Also inspect using HAClient.main()).

      The following thread is relevant:

      I am doing some experiments with wire pulls and sure kills (kill -9) on services.  I am seeing RMIs that hang rather than failing fast.  I would like to understand why I am seeing this behavior. 
      
      Peter (of Apache River) commented:
      
      If I recall correctly it's something about the way Sockets work, ie timeouts etc. But that could be a red herring. 
      
      JERI is a different beast to RMI and somewhat confusingly can also utilise RMI based JRMP Endpoints. You can configure JERI to utilise different Endpoint protocols. It also looks like it was originally designed to allow pluggable Socket implementations, but cannot without some minor changes. 
      
      I'd perform a thread dump and see if it's waiting on a socket. 
      

        Activity

        Hide
        bryanthompson bryanthompson added a comment -

        The resetPipeline() code now takes the outer lock and then tears down the send/receive service and restarts them. This does not clear up the problem, especially when the HASendService is sending 50k packets.

        I tried replacing the sendLock with a semaphore to get more confidence that were not yielding the lock and allowing more than one send at a time. This does not change anything.

        We need to drill down further on the behavior when the send/receive services are torn down and the setup again and how this is interacting with the timing of the forceRemoveService() and the re-replication of the message and payload from the leader. I have not yet drilled down on the logs in any depth for this version of the code. I expect that there is an interaction between the timing of those different activities such that we get a repeated series of resetPipeline() requests rather than actually recovering a pipeline in a known good order and clean slate condition.

        Commit to CI and Sync to Martyn.

        Show
        bryanthompson bryanthompson added a comment - The resetPipeline() code now takes the outer lock and then tears down the send/receive service and restarts them. This does not clear up the problem, especially when the HASendService is sending 50k packets. I tried replacing the sendLock with a semaphore to get more confidence that were not yielding the lock and allowing more than one send at a time. This does not change anything. We need to drill down further on the behavior when the send/receive services are torn down and the setup again and how this is interacting with the timing of the forceRemoveService() and the re-replication of the message and payload from the leader. I have not yet drilled down on the logs in any depth for this version of the code. I expect that there is an interaction between the timing of those different activities such that we get a repeated series of resetPipeline() requests rather than actually recovering a pipeline in a known good order and clean slate condition. Commit to CI and Sync to Martyn.
        Hide
        bryanthompson bryanthompson added a comment -

        Martyn has analyzed the remaining problems with the "kill C" tests in the MGC CI branch.

        The CI failure logs indicate a specific pattern in the KillC failures as follows:
        
        1) C is killed
        
        2) On the next write:
        B fails to replicate to C, throwing an ImmediateDownstreamReplicationException that is Laundered, generating a PipelineException.
        
        A does NOT see this exception, this is the cause of the failure!
        
        Instead A is blocked on sendService.send()
        
        3) Test timesout and B is shutdown, at which point
        
        A, sendService.send() throws exception.
        
        This sequence is demonstrated in this annotated snippet from HALog-A:
        
        INFO : 08:31:02,604 5245      com.bigdata.journal.jini.ha.HAJournalTest.executorService10 com.bigdata.journal.Name2Addr$DirtyListener.dirtyEvent(Name2Addr.java:314): name=kb.spo.OCSP, commitListSize=9, file=/var/lib/jenkins/workspace/BIGDATA_RELEASE_1_3_0_MGC/benchmark/CI-HAJournal-1/TestHA3JustKills.testABC_LiveLoadRemainsMet_kill_C/A/./bigdata-ha.jnl
        
        C last seen at 08:31:02,281
        
        A then writes on the pipeline:
        INFO : 08:31:05,872 8513      com.bigdata.journal.jini.ha.HAJournalTest.executorService9 com.bigdata.io.writecache.WriteCache.resetWith(WriteCache.java:2307): clean WriteCache: hashCode=2034442961
        INFO : 08:31:05,945 8586      com.bigdata.journal.jini.ha.HAJournalTest.executorService7 com.bigdata.ha.QuorumPipelineImpl$RobustReplicateTask.innerReplicate(QuorumPipelineImpl.java:1728): Leader will send: 432617 bytes, retryCount=0, req=null, msg=com.bigdata.ha.msg.HAWriteMessage{size=432617,chksum=1486553618,uuid=60e55d4e-8c36-4c1e-b4b5-041a82678192,commitCounter=1,commitTime=1388997060686,sequence=0,storeType=RW,compressorKey=DBS,quorumToken=0,replicationFactor=3,fileExtent=10485760,firstOffset=1774080}
        
        B sees a downstream problem:
        ERROR: 08:31:05,949 6944      pool-17-thread-1 com.bigdata.ha.pipeline.HASendService$IncSendTask.call(HASendService.java:609): socketChannel=java.nio.channels.SocketChannel[connected local=/127.0.0.1:60604 remote=localhost/127.0.0.1:9092], sc.isOpen()=true, sc.isConnected()=true, marker=com.bigdata.ha.msg.HASendState@d8892e0f{messageId=3,originalSenderId=5f033d2f-1467-4bde-b17e-740622932cfb,senderId=5f033d2f-1467-4bde-b17e-740622932cfb,token=0,replicationFactor=3}, cause=java.io.IOException: Broken pipe
        java.io.IOException: Broken pipe
        ...
        WARN : 08:31:05,950 6945      com.bigdata.journal.jini.ha.HAJournalTest.executorService1 com.bigdata.ha.QuorumPipelineImpl.launderPipelineException(QuorumPipelineImpl.java:2013): isLeader=false, t=com.bigdata.ha.pipeline.ImmediateDownstreamReplicationException: java.rmi.ConnectException: connection refused or timed out to BasicObjectEndpoint[cbeb17dd-634d-4c37-8661-33f000be87e8,TcpEndpoint[10.145.209.120:60349]]; nested exception is: 
           java.net.ConnectException: Connection refused
        com.bigdata.ha.pipeline.ImmediateDownstreamReplicationException: java.rmi.ConnectException: connection refused or timed out to BasicObjectEndpoint[cbeb17dd-634d-4c37-8661-33f000be87e8,TcpEndpoint[10.145.209.120:60349]]; nested exception is:
        
        But this is NOT propagated to A for it to remove the C service and reset the pipeline.  Why?
        
        INFO : 08:31:07,717 10358      com.bigdata.journal.jini.ha.HAJournalTest.executorService10 com.bigdata.io.writecache.WriteCache.resetWith(WriteCache.java:2307): clean WriteCache: hashCode=59819456
        
        
        After B is shutdown, we see this on A:
        
        INFO : 08:35:24,353 266994      task com.bigdata.journal.jini.ha.HAClient.serviceLeave(HAClient.java:455): serviceUUID=4a0930a2-cc71-4a92-9970-2c471a80323a
        
        It appears that A is stuck in doInnerCall with the socketChannel.write(data) and the full buffer.  This was expected to propagate the exception, but appears instead to suspend.  In tests
        we did observe that the first write (after a socket failure) did succeed and only subsequent writes fail.  But here we seem to be observing a block rather than a fail.  Of course, the folower has not
        torn down the receive service, so we should expect it to block!  But equally we should expect the rmi, receiveAndReplicate to propagate the error and cancel this task, instead we get a connection refused
        on receiveAndReplicate only as a result of the follower shutdown.  The call should have failed long ago
        
        ERROR: 08:35:24,928 267569      pool-16-thread-1 com.bigdata.ha.pipeline.HASendService$IncSendTask.call(HASendService.java:609): socketChannel=java.nio.channels.SocketChannel[connected local=/127.0.0.1:56713 remote=localhost/127.0.0.1:9091], sc.isOpen()=true, sc.isConnected()=true, marker=com.bigdata.ha.msg.HASendState@d8892e0f{messageId=3,originalSenderId=5f033d2f-1467-4bde-b17e-740622932cfb,senderId=5f033d2f-1467-4bde-b17e-740622932cfb,token=0,replicationFactor=3}, cause=java.io.IOException: Connection reset by peer
        java.io.IOException: Connection reset by peer
            at sun.nio.ch.FileDispatcher.write0(Native Method)
            at sun.nio.ch.SocketDispatcher.write(SocketDispatcher.java:29)
            at sun.nio.ch.IOUtil.writeFromNativeBuffer(IOUtil.java:69)
            at sun.nio.ch.IOUtil.write(IOUtil.java:40)
            at sun.nio.ch.SocketChannelImpl.write(SocketChannelImpl.java:336)
            at com.bigdata.ha.pipeline.HASendService$IncSendTask.doInnerCall(HASendService.java:717)
            at com.bigdata.ha.pipeline.HASendService$IncSendTask.call(HASendService.java:594)
            at com.bigdata.ha.pipeline.HASendService$IncSendTask.call(HASendService.java:575)
            at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
            at java.util.concurrent.FutureTask.run(FutureTask.java:138)
            at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:895)
            at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:918)
            at java.lang.Thread.run(Thread.java:662)
        

        He then proposed and committed the following solution.

        I committed a simple mode to QuorumPipelineImpl that changes the inner loop condition from
        
        while (!futRec.isDone() || !futSnd.isDone())
        
        to
        
        while (!(futRec.isDone() || futSnd.isDone())
        
        This appears to be running green in CI - currently on second run.
        
        This ends up preventing the SendBufferTask from looping infinitely as a result of blocking on the sendSocket.write() in the IncSendTask.
        
        Alternatively, the SendBufferTask could ignore the futSnd entirely in the loop - or even really drop the loop completely - and just wait on
        the futRec.get().
        

        Based on discussions this AM, we have agreed:

        • futRec is a ThickFuture and so it is always done as soon as the RMI for receiveAndReplicate returns. Thus the entire loop can be removed.
        • The loop exists because futRec was historically an asynchronous Future. This was changed to do DGC issues.

        We discussed a modification to the loop that would be compatible if we restored the asynchronous behavior for this Future. Basically, if there is an ExecutionException, then test the other future with a timeout to see if we can get an outcome from it and then cancel the other future. This would be done to give the other code path an opportunity to report a root cause. The actual exception handling outside of the loop would remain unchanged.

        Martyn is going to apply that change, test it locally, and then comment out the loop entirely with a note that it should be preserved in case we restore asynchronous futures using DGC. He will then commit that modified code.

        In the meanwhile, I am going to catch up the MGC branch with the 1.3.x development and maintenance branch in preparation for a code review to bring in the MGC branch back into the development and maintenance branch. We will then close out the MGC branch to avoid problems with repeated merges of feature branches back to the main branch.

        Show
        bryanthompson bryanthompson added a comment - Martyn has analyzed the remaining problems with the "kill C" tests in the MGC CI branch. The CI failure logs indicate a specific pattern in the KillC failures as follows: 1) C is killed 2) On the next write: B fails to replicate to C, throwing an ImmediateDownstreamReplicationException that is Laundered, generating a PipelineException. A does NOT see this exception, this is the cause of the failure! Instead A is blocked on sendService.send() 3) Test timesout and B is shutdown, at which point A, sendService.send() throws exception. This sequence is demonstrated in this annotated snippet from HALog-A: INFO : 08:31:02,604 5245 com.bigdata.journal.jini.ha.HAJournalTest.executorService10 com.bigdata.journal.Name2Addr$DirtyListener.dirtyEvent(Name2Addr.java:314): name=kb.spo.OCSP, commitListSize=9, file=/var/lib/jenkins/workspace/BIGDATA_RELEASE_1_3_0_MGC/benchmark/CI-HAJournal-1/TestHA3JustKills.testABC_LiveLoadRemainsMet_kill_C/A/./bigdata-ha.jnl C last seen at 08:31:02,281 A then writes on the pipeline: INFO : 08:31:05,872 8513 com.bigdata.journal.jini.ha.HAJournalTest.executorService9 com.bigdata.io.writecache.WriteCache.resetWith(WriteCache.java:2307): clean WriteCache: hashCode=2034442961 INFO : 08:31:05,945 8586 com.bigdata.journal.jini.ha.HAJournalTest.executorService7 com.bigdata.ha.QuorumPipelineImpl$RobustReplicateTask.innerReplicate(QuorumPipelineImpl.java:1728): Leader will send: 432617 bytes, retryCount=0, req=null, msg=com.bigdata.ha.msg.HAWriteMessage{size=432617,chksum=1486553618,uuid=60e55d4e-8c36-4c1e-b4b5-041a82678192,commitCounter=1,commitTime=1388997060686,sequence=0,storeType=RW,compressorKey=DBS,quorumToken=0,replicationFactor=3,fileExtent=10485760,firstOffset=1774080} B sees a downstream problem: ERROR: 08:31:05,949 6944 pool-17-thread-1 com.bigdata.ha.pipeline.HASendService$IncSendTask.call(HASendService.java:609): socketChannel=java.nio.channels.SocketChannel[connected local=/127.0.0.1:60604 remote=localhost/127.0.0.1:9092], sc.isOpen()=true, sc.isConnected()=true, marker=com.bigdata.ha.msg.HASendState@d8892e0f{messageId=3,originalSenderId=5f033d2f-1467-4bde-b17e-740622932cfb,senderId=5f033d2f-1467-4bde-b17e-740622932cfb,token=0,replicationFactor=3}, cause=java.io.IOException: Broken pipe java.io.IOException: Broken pipe ... WARN : 08:31:05,950 6945 com.bigdata.journal.jini.ha.HAJournalTest.executorService1 com.bigdata.ha.QuorumPipelineImpl.launderPipelineException(QuorumPipelineImpl.java:2013): isLeader=false, t=com.bigdata.ha.pipeline.ImmediateDownstreamReplicationException: java.rmi.ConnectException: connection refused or timed out to BasicObjectEndpoint[cbeb17dd-634d-4c37-8661-33f000be87e8,TcpEndpoint[10.145.209.120:60349]]; nested exception is: java.net.ConnectException: Connection refused com.bigdata.ha.pipeline.ImmediateDownstreamReplicationException: java.rmi.ConnectException: connection refused or timed out to BasicObjectEndpoint[cbeb17dd-634d-4c37-8661-33f000be87e8,TcpEndpoint[10.145.209.120:60349]]; nested exception is: But this is NOT propagated to A for it to remove the C service and reset the pipeline. Why? INFO : 08:31:07,717 10358 com.bigdata.journal.jini.ha.HAJournalTest.executorService10 com.bigdata.io.writecache.WriteCache.resetWith(WriteCache.java:2307): clean WriteCache: hashCode=59819456 After B is shutdown, we see this on A: INFO : 08:35:24,353 266994 task com.bigdata.journal.jini.ha.HAClient.serviceLeave(HAClient.java:455): serviceUUID=4a0930a2-cc71-4a92-9970-2c471a80323a It appears that A is stuck in doInnerCall with the socketChannel.write(data) and the full buffer. This was expected to propagate the exception, but appears instead to suspend. In tests we did observe that the first write (after a socket failure) did succeed and only subsequent writes fail. But here we seem to be observing a block rather than a fail. Of course, the folower has not torn down the receive service, so we should expect it to block! But equally we should expect the rmi, receiveAndReplicate to propagate the error and cancel this task, instead we get a connection refused on receiveAndReplicate only as a result of the follower shutdown. The call should have failed long ago ERROR: 08:35:24,928 267569 pool-16-thread-1 com.bigdata.ha.pipeline.HASendService$IncSendTask.call(HASendService.java:609): socketChannel=java.nio.channels.SocketChannel[connected local=/127.0.0.1:56713 remote=localhost/127.0.0.1:9091], sc.isOpen()=true, sc.isConnected()=true, marker=com.bigdata.ha.msg.HASendState@d8892e0f{messageId=3,originalSenderId=5f033d2f-1467-4bde-b17e-740622932cfb,senderId=5f033d2f-1467-4bde-b17e-740622932cfb,token=0,replicationFactor=3}, cause=java.io.IOException: Connection reset by peer java.io.IOException: Connection reset by peer at sun.nio.ch.FileDispatcher.write0(Native Method) at sun.nio.ch.SocketDispatcher.write(SocketDispatcher.java:29) at sun.nio.ch.IOUtil.writeFromNativeBuffer(IOUtil.java:69) at sun.nio.ch.IOUtil.write(IOUtil.java:40) at sun.nio.ch.SocketChannelImpl.write(SocketChannelImpl.java:336) at com.bigdata.ha.pipeline.HASendService$IncSendTask.doInnerCall(HASendService.java:717) at com.bigdata.ha.pipeline.HASendService$IncSendTask.call(HASendService.java:594) at com.bigdata.ha.pipeline.HASendService$IncSendTask.call(HASendService.java:575) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:895) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:918) at java.lang.Thread.run(Thread.java:662) He then proposed and committed the following solution. I committed a simple mode to QuorumPipelineImpl that changes the inner loop condition from while (!futRec.isDone() || !futSnd.isDone()) to while (!(futRec.isDone() || futSnd.isDone()) This appears to be running green in CI - currently on second run. This ends up preventing the SendBufferTask from looping infinitely as a result of blocking on the sendSocket.write() in the IncSendTask. Alternatively, the SendBufferTask could ignore the futSnd entirely in the loop - or even really drop the loop completely - and just wait on the futRec.get(). Based on discussions this AM, we have agreed: futRec is a ThickFuture and so it is always done as soon as the RMI for receiveAndReplicate returns. Thus the entire loop can be removed. The loop exists because futRec was historically an asynchronous Future. This was changed to do DGC issues. We discussed a modification to the loop that would be compatible if we restored the asynchronous behavior for this Future. Basically, if there is an ExecutionException, then test the other future with a timeout to see if we can get an outcome from it and then cancel the other future. This would be done to give the other code path an opportunity to report a root cause. The actual exception handling outside of the loop would remain unchanged. Martyn is going to apply that change, test it locally, and then comment out the loop entirely with a note that it should be preserved in case we restore asynchronous futures using DGC. He will then commit that modified code. In the meanwhile, I am going to catch up the MGC branch with the 1.3.x development and maintenance branch in preparation for a code review to bring in the MGC branch back into the development and maintenance branch. We will then close out the MGC branch to avoid problems with repeated merges of feature branches back to the main branch.
        Hide
        bryanthompson bryanthompson added a comment -

        Merge from 1.3.0 development and maintenance branch to the MGC feature branch.

            At revision 7746.
        merge https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0 /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
        
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-war/src/html/index.html
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/joinGraph
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestAll.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJGraph.java
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/TestAll.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/fed/TestNIOChunkMessage.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/striterator/TestAll.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/striterator/TestCloseableChunkedIteratorWrapperConverter.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/IChunkedIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/CloseableIteratorWrapper.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/MergeFilter.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/AbstractChunkedResolverator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedWrappedIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/Striterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedResolvingIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/IChunkedStriterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/Resolver.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/PushbackIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedArraysIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/GenericChunkedStriterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/Chunkerator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/DelegateChunkedIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedOrderedStriterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedArrayIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedConvertingIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/Dechunkerator.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/CloseableChunkedIteratorWrapperConverter.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/paths/ZeroLengthPathOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/DropOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/ProjectionOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/PipelinedAggregationOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/GroupByOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/SliceOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/BOpStats.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/RunState.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/QueryLog.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/LocalChunkMessage.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/PartitionedJoinGroup.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JoinGraph.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JGraph.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Path.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/SampleBase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Vertex.java
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/controller/JVMNamedSubqueryOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/controller/HTreeNamedSubqueryOp.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/BOpBase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/IHashJoinUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/HTreeHashIndexOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/HashJoinOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/PipelineJoinStats.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/JVMHashJoinUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/BaseJoinStats.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/HashIndexOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/SolutionSetHashJoinOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/NamedSolutionSetStats.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/HTreeHashJoinUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/JVMHashIndexOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/JVMHashIndex.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/JoinVariableNotBoundException.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/IdFactory.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/BOpContext.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/BOpUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/ap/SampleIndex.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/btree/data/DefaultNodeCoder.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/btree/data/DefaultLeafCoder.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/journal/Options.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/journal/Name2Addr.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/relation/accesspath/IBindingSetAccessPath.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/util/NT.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/files
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/default_test.rb
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/Berksfile
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/CHANGELOG.md
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/Gemfile
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/chefignore
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/default.rb
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/Thorfile
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractProtocolTest.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BSBM.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestAll.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_LUBM.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/AbstractRTOTestCase.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BAR.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.srx
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/query-hints-06.rq
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/query-hints-01.rq
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/AbstractDataDrivenSPARQLTestCase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/AbstractDataAndSPARQLTestCase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTMassagedServiceNodeOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParserStats.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryBase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/IQueryHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/BufferChunkCapacityHint.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTONEdgesQueryHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/BufferChunkOfChunksCapacityHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractChunkSizeHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineQueueCapacityHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractQueryHint.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOLimitQueryHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/OptimizerQueryHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AtOnceHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineMaxParallelHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AnalyticQueryHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineMaxMessagesPerTaskHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintRegistry.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOSampleTypeQueryHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/ChunkSizeHint.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/OrderByNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GraphPatternGroup.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/NamedSubqueryInclude.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpFilters.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCall.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ZeroLengthPathNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryRoot.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AssignmentNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/JoinGroupNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTBase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBindingAssigner.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTSparql11SubqueryOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeCountOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticJoinOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBottomUpOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTQueryHintOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ValueExpressionListBaseNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GroupNodeBase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SliceNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryOptimizerEnum.java
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/internal
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IPassesMaterialization.java
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SPARQLConstraint.java
            --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
            U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java
            A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/resources/data/lehigh/LUBM-U1.rdf.gz
             G  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
            Merge complete.
            ===== File Statistics: =====
            Added: 60
            Updated: 147
            ==== Property Statistics: =====
            Merged: 1
        
        

        No conflicts.

        Committed revision r7747.

        Show
        bryanthompson bryanthompson added a comment - Merge from 1.3.0 development and maintenance branch to the MGC feature branch. At revision 7746. merge https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0 /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-war/src/html/index.html --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/joinGraph U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestAll.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJGraph.java --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/TestAll.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/fed/TestNIOChunkMessage.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/striterator/TestAll.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/striterator/TestCloseableChunkedIteratorWrapperConverter.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/IChunkedIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/CloseableIteratorWrapper.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/MergeFilter.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/AbstractChunkedResolverator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedWrappedIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/Striterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedResolvingIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/IChunkedStriterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/Resolver.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/PushbackIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedArraysIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/GenericChunkedStriterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/Chunkerator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/DelegateChunkedIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedOrderedStriterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedArrayIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/ChunkedConvertingIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/Dechunkerator.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/striterator/CloseableChunkedIteratorWrapperConverter.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/paths/ZeroLengthPathOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/DropOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/ProjectionOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/PipelinedAggregationOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/GroupByOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/solutions/SliceOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/BOpStats.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/RunState.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/QueryLog.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/LocalChunkMessage.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/PartitionedJoinGroup.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JoinGraph.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JGraph.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Path.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/SampleBase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Vertex.java --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/controller/JVMNamedSubqueryOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/controller/HTreeNamedSubqueryOp.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/BOpBase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/IHashJoinUtility.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/HTreeHashIndexOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/HashJoinOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/PipelineJoinStats.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/JVMHashJoinUtility.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/BaseJoinStats.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/HashIndexOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/SolutionSetHashJoinOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/NamedSolutionSetStats.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/HTreeHashJoinUtility.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/JVMHashIndexOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/JVMHashIndex.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/join/JoinVariableNotBoundException.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/IdFactory.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/BOpContext.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/BOpUtility.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/ap/SampleIndex.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/BOpIdFactory.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/btree/data/DefaultNodeCoder.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/btree/data/DefaultLeafCoder.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/journal/Options.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/journal/Name2Addr.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/relation/accesspath/IBindingSetAccessPath.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/util/NT.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/files A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/default/test/default_test.rb A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/Berksfile A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/CHANGELOG.md A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/Gemfile A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/chefignore A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/default.rb A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/resources/deployment/vagrant/systap-bigdata/Thorfile --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractProtocolTest.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q3.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q4.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BSBM.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q5.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestAll.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q7.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q8.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q2.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q10.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_LUBM.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BAR-Q1.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/AbstractRTOTestCase.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q8.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/LUBM-Q9.rq A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/TestRTO_BAR.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q1.srx A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto/BSBM-Q2.srx U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/query-hints-06.rq U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/query-hints-01.rq U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/AbstractDataDrivenSPARQLTestCase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/AbstractDataAndSPARQLTestCase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTMassagedServiceNodeOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParserStats.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryBase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/IQueryHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/BufferChunkCapacityHint.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTONEdgesQueryHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/BufferChunkOfChunksCapacityHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractChunkSizeHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineQueueCapacityHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractQueryHint.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOLimitQueryHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/OptimizerQueryHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AtOnceHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineMaxParallelHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AnalyticQueryHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/PipelineMaxMessagesPerTaskHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintRegistry.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOSampleTypeQueryHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/ChunkSizeHint.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/OrderByNode.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GraphPatternGroup.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/NamedSubqueryInclude.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpFilters.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCall.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ZeroLengthPathNode.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryRoot.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AssignmentNode.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/JoinGroupNode.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTBase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBindingAssigner.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTSparql11SubqueryOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeCountOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticJoinOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBottomUpOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTQueryHintOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ValueExpressionListBaseNode.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GroupNodeBase.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SliceNode.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryOptimizerEnum.java --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/internal U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IPassesMaterialization.java U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SPARQLConstraint.java --- Merging r7684 through r7746 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/inf/BackchainTypeResourceIterator.java A /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/resources/data/lehigh/LUBM-U1.rdf.gz G /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC Merge complete. ===== File Statistics: ===== Added: 60 Updated: 147 ==== Property Statistics: ===== Merged: 1 No conflicts. Committed revision r7747.
        Hide
        bryanthompson bryanthompson added a comment -

        All known problems with sure kills have been resolved. The MGC_1_3_0 branch has been brought back into the main development branch.

        We have not done extensive wire pull testing. Sure kills simulate many aspects of wire pulls and can be reliably automated in CI.

        Committed revision r7753.

        Show
        bryanthompson bryanthompson added a comment - All known problems with sure kills have been resolved. The MGC_1_3_0 branch has been brought back into the main development branch. We have not done extensive wire pull testing. Sure kills simulate many aspects of wire pulls and can be reliably automated in CI. Committed revision r7753.
        Hide
        bryanthompson bryanthompson added a comment -

        This ticket is closed as all known issues are resolved. Additional tests could still be developed. Future effort could also automate wire pulls (using a programmable switch) and machine halts (using X10).

        Show
        bryanthompson bryanthompson added a comment - This ticket is closed as all known issues are resolved. Additional tests could still be developed. Future effort could also automate wire pulls (using a programmable switch) and machine halts (using X10).

          People

          • Assignee:
            bryanthompson bryanthompson
            Reporter:
            bryanthompson bryanthompson
          • Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved: