HPCC-397 Tidy up hthor/roxie input interfaces

HThor now uses stop() in place of done()

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

ecl/eclagent/eclagent.cpp

@@ -3681,10 +3681,10 @@ public:
         in->ready(); 
     }
 
-    virtual void done() 
+    virtual void stop() 
     { 
         hasStopped = true;
-        in->done(); 
+        in->stop(); 
     }
 };
 

ecl/eclagent/eclagent.ipp

@@ -699,7 +699,7 @@ public:
 
     void ready() { if (!alreadyUpdated) activity->ready(); }
     void execute() { if (!alreadyUpdated) activity->execute(); }
-    void done() { if (!alreadyUpdated) activity->done(); }
+    void stop() { if (!alreadyUpdated) activity->stop(); }
 
     IHThorException * makeWrappedException(IException * e);
 
@@ -871,12 +871,7 @@ private:
             in->ready();
         }
         
-        void done() 
-        {
-            in->done();
-        }
-
-        void stop()
+        void stop() 
         {
             in->stop();
         }

ecl/eclagent/eclgraph.cpp

@@ -920,7 +920,7 @@ void EclSubGraph::doExecute(const byte * parentExtract, bool checkDependencies)
     ForEachItemIn(ie, sinks)
         sinks.item(ie).execute();
     ForEachItemIn(id, sinks)
-        sinks.item(id).done();
+        sinks.item(id).stop();
 
     elapsedGraphCycles += (get_cycles_now() - startGraphCycles);
     executed = true;
@@ -1226,7 +1226,7 @@ void EclGraph::abort()
             {
                 EclGraphElement & sink = graph.sinks.item(idx2);
                 if (sink.activity)
-                    sink.activity->done();
+                    sink.activity->stop();
             }
         }
     }

ecl/hthor/hthor.cpp

@@ -207,15 +207,10 @@ void CHThorActivityBase::extractResult(unsigned & len, void * & ret)
     agent.fail(255, "internal logic error: CHThorActivityBase::extractResult");
 }
 
-void CHThorActivityBase::done()
-{
-    if (input)
-        input->done();
-    // Should I call stop() ? should I rename to stop() ?
-}
-
 void CHThorActivityBase::stop()
 {
+    if (input)
+        input->stop();
 }
 
 void CHThorActivityBase::updateProgress(IStatisticGatherer &progress) const
@@ -387,7 +382,7 @@ void CHThorDiskWriteActivity::execute()
     finishOutput();
 }
 
-void CHThorDiskWriteActivity::done()
+void CHThorDiskWriteActivity::stop()
 {
     outSeq->flush();
     if(blockcompressed)
@@ -399,7 +394,7 @@ void CHThorDiskWriteActivity::done()
     incomplete = false;
     if(clusterHandler)
         clusterHandler->finish(file);
-    CHThorActivityBase::done();
+    CHThorActivityBase::stop();
 }
 
 void CHThorDiskWriteActivity::resolve()
@@ -790,7 +785,7 @@ const void *CHThorSpillActivity::nextRow()
     return nextrec;
 }
 
-void CHThorSpillActivity::done()
+void CHThorSpillActivity::stop()
 {
     loop 
     {
@@ -803,7 +798,7 @@ void CHThorSpillActivity::done()
         }   
     }
     finishOutput();
-    CHThorDiskWriteActivity::done();
+    CHThorDiskWriteActivity::stop();
 }
 
 //=====================================================================================================
@@ -1316,7 +1311,7 @@ public:
         openPipe(pipeProgram);
     }
 
-    virtual void done()
+    virtual void stop()
     {
         //Need to close the output (or read it in its entirety), otherwise we might wait forever for the
         //program to finish
@@ -1324,7 +1319,7 @@ public:
             pipe->closeOutput();
         pipe.clear();
         readTransformer->setStream(NULL);
-        CHThorSimpleActivityBase::done();
+        CHThorSimpleActivityBase::stop();
     }
 
     virtual const void *nextRow()
@@ -1506,7 +1501,7 @@ public:
         puller.start();
     }
 
-    void done()
+    void stop()
     {
         //Need to close the output (or read it in its entirety), otherwise we might wait forever for the
         //program to finish
@@ -1515,7 +1510,7 @@ public:
         pipeVerified.interrupt(NULL);
         pipeOpened.interrupt(NULL);
         puller.join();
-        CHThorSimpleActivityBase::done();
+        CHThorSimpleActivityBase::stop();
         pipe.clear();
         readTransformer->setStream(NULL);
     }
@@ -1740,9 +1735,9 @@ CHThorIterateActivity::CHThorIterateActivity(IAgentContext &_agent, unsigned _ac
 {
 }
 
-void CHThorIterateActivity::done()
+void CHThorIterateActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     right.clear();
     left.clear();
 }
@@ -1943,10 +1938,10 @@ bool CHThorNormalizeChildActivity::advanceInput()
     }
 }
 
-void CHThorNormalizeChildActivity::done()
+void CHThorNormalizeChildActivity::stop()
 {
     inbuff.clear();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 void CHThorNormalizeChildActivity::ready()
@@ -2022,11 +2017,11 @@ void CHThorNormalizeLinkedChildActivity::ready()
     CHThorSimpleActivityBase::ready();
 }
 
-void CHThorNormalizeLinkedChildActivity::done()
+void CHThorNormalizeLinkedChildActivity::stop()
 {
     curParent.clear();
     curChild.clear();
-    CHThorSimpleActivityBase::done(); 
+    CHThorSimpleActivityBase::stop(); 
 }
 
 const void * CHThorNormalizeLinkedChildActivity::nextRow()
@@ -2287,12 +2282,12 @@ void CHThorRollupActivity::ready()
     prev.set(left);
 }
 
-void CHThorRollupActivity::done()
+void CHThorRollupActivity::stop()
 {
     left.clear();
     prev.clear();
     right.clear();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 const void *CHThorRollupActivity::nextRow()
@@ -2356,10 +2351,10 @@ void CHThorGroupDedupKeepLeftActivity::ready()
     prev.clear();
 }
 
-void CHThorGroupDedupKeepLeftActivity::done()
+void CHThorGroupDedupKeepLeftActivity::stop()
 {
     prev.clear();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 const void *CHThorGroupDedupKeepLeftActivity::nextRow()
@@ -2450,10 +2445,10 @@ void CHThorGroupDedupKeepRightActivity::ready()
     firstDone = false;
 }
 
-void CHThorGroupDedupKeepRightActivity::done()
+void CHThorGroupDedupKeepRightActivity::stop()
 {
     kept.clear();
-    CHThorGroupDedupActivity::done();
+    CHThorGroupDedupActivity::stop();
 }
 
 const void *CHThorGroupDedupKeepRightActivity::nextRow()
@@ -2506,10 +2501,10 @@ void CHThorGroupDedupAllActivity::ready()
     survivorIndex = 0;
 }
 
-void CHThorGroupDedupAllActivity::done()
+void CHThorGroupDedupAllActivity::stop()
 {
     survivors.clear();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 bool CHThorGroupDedupAllActivity::calcNextDedupAll()
@@ -2637,10 +2632,10 @@ void CHThorHashDedupActivity::ready()
     table.setRowAllocator(agent.queryCodeContext()->getRowAllocator(helper.queryKeySize(), activityId));
 }
 
-void CHThorHashDedupActivity::done()
+void CHThorHashDedupActivity::stop()
 {
     table.kill();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 const void * CHThorHashDedupActivity::nextRow()
@@ -2773,9 +2768,9 @@ void CHThorFilterGroupActivity::ready()
     nextIndex = 0;
 }
 
-void CHThorFilterGroupActivity::done()
+void CHThorFilterGroupActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     pending.clear();
 }
 
@@ -2917,9 +2912,9 @@ void CHThorSkipLimitActivity::ready()
     rowLimit = helper.getRowLimit();
 }
 
-void CHThorSkipLimitActivity::done()
+void CHThorSkipLimitActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     buffer.clear();
 }
 
@@ -2995,9 +2990,9 @@ CHThorSkipCatchActivity::CHThorSkipCatchActivity(IAgentContext &_agent, unsigned
 {
 }
 
-void CHThorSkipCatchActivity::done()
+void CHThorSkipCatchActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     buffer.clear();
 }
 
@@ -3068,11 +3063,11 @@ CHThorIfActivity::CHThorIfActivity(IAgentContext &_agent, unsigned _activityId,
 }
 
 
-void CHThorIfActivity::done()
+void CHThorIfActivity::stop()
 {
     if (selectedInput)
-        selectedInput->done();
-    CHThorSimpleActivityBase::done();
+        selectedInput->stop();
+    CHThorSimpleActivityBase::stop();
 }
 
 
@@ -3124,10 +3119,10 @@ void CHThorCaseActivity::ready()
     selectedInput->ready();
 }
 
-void CHThorCaseActivity::done()
+void CHThorCaseActivity::stop()
 {
     if (selectedInput)
-        selectedInput->done();
+        selectedInput->stop();
 }
 
 const void *CHThorCaseActivity::nextRow()
@@ -3259,10 +3254,10 @@ void CHThorHashAggregateActivity::ready()
     gathered = false;
 }
 
-void CHThorHashAggregateActivity::done()
+void CHThorHashAggregateActivity::stop()
 {
     aggregated.reset();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 
@@ -3510,10 +3505,10 @@ void CHThorChooseSetsExActivity::ready()
     memset(setCounts, 0, sizeof(unsigned)*numSets);
 }
 
-void CHThorChooseSetsExActivity::done()
+void CHThorChooseSetsExActivity::stop()
 {
     gathered.clear();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 const void * CHThorChooseSetsExActivity::nextRow()
@@ -3686,9 +3681,9 @@ void CHThorGroupActivity::ready()
     firstDone = false;
 }
 
-void CHThorGroupActivity::done()
+void CHThorGroupActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     next.clear();
 }
 
@@ -3751,7 +3746,7 @@ void CHThorGroupSortActivity::ready()
         createSorter();
 }
 
-void CHThorGroupSortActivity::done()
+void CHThorGroupSortActivity::stop()
 {
     if(sorter)
     {
@@ -3762,7 +3757,7 @@ void CHThorGroupSortActivity::done()
     }
     gotSorted = false;
     diskReader.clear();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 const void *CHThorGroupSortActivity::nextRow()
@@ -4175,9 +4170,9 @@ void CHThorGroupedActivity::ready()
     nextRowIndex = 0;
 }
 
-void CHThorGroupedActivity::done()
+void CHThorGroupedActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     next[0].clear();
     next[1].clear();
     next[2].clear();
@@ -4229,9 +4224,9 @@ void CHThorSortedActivity::ready()
     firstDone = false;
 }
 
-void CHThorSortedActivity::done()
+void CHThorSortedActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     next.clear();
 }
 
@@ -4296,9 +4291,9 @@ void CHThorTraceActivity::ready()
         keepLimit = 0;
 }
 
-void CHThorTraceActivity::done()
+void CHThorTraceActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     name.clear();
 }
 
@@ -4429,7 +4424,7 @@ void CHThorJoinActivity::ready()
     }
 }
 
-void CHThorJoinActivity::done()
+void CHThorJoinActivity::stop()
 {
     outBuilder.clear();
     right.clear();
@@ -4437,8 +4432,8 @@ void CHThorJoinActivity::done()
     pendingRight.clear();
     sortedLeftInput.clear();
     groupedSortedRightInput.clear();
-    CHThorActivityBase::done();
-    input1->done();
+    CHThorActivityBase::stop();
+    input1->stop();
 }
 
 void CHThorJoinActivity::setInput(unsigned index, IHThorInput *_input)
@@ -5059,12 +5054,12 @@ void CHThorSelfJoinActivity::ready()
     joinCounter = 0;
 }
 
-void CHThorSelfJoinActivity::done()
+void CHThorSelfJoinActivity::stop()
 {
     outBuilder.clear();
     group.clear();
     groupedInput.clear();
-    CHThorActivityBase::done();
+    CHThorActivityBase::stop();
 }
 
 bool CHThorSelfJoinActivity::fillGroup()
@@ -5424,13 +5419,13 @@ void CHThorLookupJoinActivity::ready()
     joinCounter = 0;
 }
 
-void CHThorLookupJoinActivity::done()
+void CHThorLookupJoinActivity::stop()
 {
     outBuilder.clear();
     left.clear();
     table.clear();
-    CHThorActivityBase::done();
-    input1->done();
+    CHThorActivityBase::stop();
+    input1->stop();
 }
 
 void CHThorLookupJoinActivity::createDefaultRight()
@@ -5810,14 +5805,14 @@ void CHThorAllJoinActivity::ready()
     eos = false;
 }
 
-void CHThorAllJoinActivity::done()
+void CHThorAllJoinActivity::stop()
 {
     outBuilder.clear();
     left.clear();
     rightset.clear();
     matchedRight.kill();
-    CHThorActivityBase::done();
-    input1->done();
+    CHThorActivityBase::stop();
+    input1->stop();
 }
 
 void CHThorAllJoinActivity::createDefaultRight()
@@ -6394,10 +6389,10 @@ const void * CHThorWhenActionActivity::nextRow()
     return input->nextRow();
 }
 
-void CHThorWhenActionActivity::done()
+void CHThorWhenActionActivity::stop()
 {
     graphElement->executeDependentActions(agent, NULL, WhenSuccessId);
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 //=====================================================================================================
@@ -6413,11 +6408,11 @@ void CHThorMultiInputActivity::ready()
         inputs.item(idx)->ready();
 }
 
-void CHThorMultiInputActivity::done()
+void CHThorMultiInputActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     ForEachItemIn(idx, inputs)
-        inputs.item(idx)->done();
+        inputs.item(idx)->stop();
 }
 
 void CHThorMultiInputActivity::setInput(unsigned index, IHThorInput *_input)
@@ -6727,10 +6722,10 @@ void CHThorCombineGroupActivity::ready()
     input1->ready();
 }
 
-void CHThorCombineGroupActivity::done()
+void CHThorCombineGroupActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
-    input1->done();
+    CHThorSimpleActivityBase::stop();
+    input1->stop();
 }
 
 void CHThorCombineGroupActivity::setInput(unsigned index, IHThorInput *_input)
@@ -6921,12 +6916,12 @@ void CHThorWorkunitReadActivity::checkForDiskRead()
     }
 }
 
-void CHThorWorkunitReadActivity::done()
+void CHThorWorkunitReadActivity::stop()
 {
     if(diskread)
-        diskread->done();
+        diskread->stop();
     resultBuffer.resetBuffer();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 
@@ -6985,9 +6980,9 @@ void CHThorParseActivity::ready()
     parser->reset();
 }
 
-void CHThorParseActivity::done()
+void CHThorParseActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     if (curSearchText && helper.searchTextNeedsFree())
         rtlFree(curSearchText);
     curSearchText = NULL;
@@ -7066,7 +7061,7 @@ void CHThorEnthActivity::ready()
     started = false;
 }
 
-void CHThorEnthActivity::done()
+void CHThorEnthActivity::stop()
 {
     outBuilder.clear();
 }
@@ -7131,9 +7126,9 @@ void CHThorTopNActivity::ready()
     eoi = false;
 }
 
-void CHThorTopNActivity::done()
+void CHThorTopNActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     roxiemem::ReleaseRoxieRowRange(sorted, curIndex, sortedCount);
     free(sorted);
     sorted = NULL;
@@ -7243,9 +7238,9 @@ void CHThorXmlParseActivity::ready()
     numProcessedLastGroup = processed;
 }
 
-void CHThorXmlParseActivity::done()
+void CHThorXmlParseActivity::stop()
 {
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
     if(srchStrNeedsFree) rtlFree(srchStr);
     srchStr = NULL;
     in.clear();
@@ -7342,10 +7337,10 @@ public:
         merger.initInputs(inputs.length(), inputs.getArray());
     }
 
-    virtual void done() 
+    virtual void stop() 
     {
         merger.done();
-        CHThorMultiInputActivity::done(); 
+        CHThorMultiInputActivity::stop(); 
     }
 
     virtual const void * nextRow()
@@ -7371,10 +7366,10 @@ CHThorWSCBaseActivity::CHThorWSCBaseActivity(IAgentContext &_agent, unsigned _ac
     init();
 }
 
-void CHThorWSCBaseActivity::done()
+void CHThorWSCBaseActivity::stop()
 {
     WSChelper.clear();//doesn't return until helper threads terminate
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 void CHThorWSCBaseActivity::init()
@@ -7798,10 +7793,10 @@ void CHThorChildGroupAggregateActivity::ready()
     aggregated.start(rowAllocator);
 }
 
-void CHThorChildGroupAggregateActivity::done()
+void CHThorChildGroupAggregateActivity::stop()
 {
     aggregated.reset();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 
@@ -7839,11 +7834,11 @@ CHThorChildThroughNormalizeActivity::CHThorChildThroughNormalizeActivity(IAgentC
 {
 }
 
-void CHThorChildThroughNormalizeActivity::done()
+void CHThorChildThroughNormalizeActivity::stop()
 {
     outBuilder.clear();
     lastInput.clear();
-    CHThorSimpleActivityBase::done();
+    CHThorSimpleActivityBase::stop();
 }
 
 void CHThorChildThroughNormalizeActivity::ready()
@@ -7933,10 +7928,10 @@ void CHThorDiskReadBaseActivity::ready()
     resolve();
 }
 
-void CHThorDiskReadBaseActivity::done()
+void CHThorDiskReadBaseActivity::stop()
 {
     close();
-    CHThorActivityBase::done();
+    CHThorActivityBase::stop();
 }
 
 void CHThorDiskReadBaseActivity::resolve()
@@ -8401,10 +8396,10 @@ void CHThorDiskReadActivity::ready()
 }
 
 
-void CHThorDiskReadActivity::done()
+void CHThorDiskReadActivity::stop()
 { 
     outBuilder.clear();
-    PARENT::done(); 
+    PARENT::stop(); 
 }
 
 
@@ -8509,10 +8504,10 @@ CHThorDiskNormalizeActivity::CHThorDiskNormalizeActivity(IAgentContext &_agent,
 {
 }
 
-void CHThorDiskNormalizeActivity::done()        
+void CHThorDiskNormalizeActivity::stop()        
 { 
     outBuilder.clear();
-    PARENT::done(); 
+    PARENT::stop(); 
 }
 
 void CHThorDiskNormalizeActivity::ready()       
@@ -8627,10 +8622,10 @@ CHThorDiskAggregateActivity::CHThorDiskAggregateActivity(IAgentContext &_agent,
 {
 }
 
-void CHThorDiskAggregateActivity::done()        
+void CHThorDiskAggregateActivity::stop()        
 { 
     outBuilder.clear();
-    PARENT::done(); 
+    PARENT::stop(); 
 }
 
 void CHThorDiskAggregateActivity::ready()       
@@ -8867,10 +8862,10 @@ void CHThorCsvReadActivity::ready()
     PARENT::ready();
 }
 
-void CHThorCsvReadActivity::done()
+void CHThorCsvReadActivity::stop()
 {
     csvSplitter.reset();
-    PARENT::done();
+    PARENT::stop();
 }
 
 void CHThorCsvReadActivity::gatherInfo(IFileDescriptor * fd)
@@ -9027,10 +9022,10 @@ void CHThorXmlReadActivity::ready()
     stopAfter = helper.getChooseNLimit();
 }
 
-void CHThorXmlReadActivity::done()
+void CHThorXmlReadActivity::stop()
 {
     xmlParser.clear();
-    CHThorDiskReadBaseActivity::done();
+    CHThorDiskReadBaseActivity::stop();
 }
 
 void CHThorXmlReadActivity::gatherInfo(IFileDescriptor * fd)
@@ -9252,7 +9247,7 @@ const void * CHThorLocalResultSpillActivity::nextRow()
     return ret;
 }
 
-void CHThorLocalResultSpillActivity::done()
+void CHThorLocalResultSpillActivity::stop()
 {
     loop
     {
@@ -9273,7 +9268,7 @@ void CHThorLocalResultSpillActivity::done()
             result->addRowOwn(ret);
         }
     }
-    CHThorSimpleActivityBase::done(); 
+    CHThorSimpleActivityBase::stop(); 
 }
 
 
@@ -9414,12 +9409,12 @@ const void * CHThorLoopActivity::nextRow()
 }
 
 
-void CHThorLoopActivity::done()
+void CHThorLoopActivity::stop()
 {
     ForEachItemIn(idx, loopPending)
         ReleaseRoxieRow(loopPending.item(idx));
     loopPending.kill();
-    CHThorSimpleActivityBase::done(); 
+    CHThorSimpleActivityBase::stop(); 
 }
 
 //---------------------------------------------------------------------------
@@ -9586,12 +9581,12 @@ const void * CHThorGraphLoopActivity::nextRow()
 }
 
 
-void CHThorGraphLoopActivity::done()
+void CHThorGraphLoopActivity::stop()
 {
     rowAllocator.clear();
     finalResult = NULL;
     loopResults.clear();
-    CHThorSimpleActivityBase::done(); 
+    CHThorSimpleActivityBase::stop(); 
 }
 
 //=====================================================================================================
@@ -9651,12 +9646,12 @@ const void * CHThorParallelGraphLoopActivity::nextRow()
 }
 
 
-void CHThorParallelGraphLoopActivity::done()
+void CHThorParallelGraphLoopActivity::stop()
 {
     rowAllocator.clear();
     finalResult = NULL;
     loopResults.clear();
-    CHThorSimpleActivityBase::done(); 
+    CHThorSimpleActivityBase::stop(); 
 }
 
 //=====================================================================================================
@@ -9698,15 +9693,10 @@ void LibraryCallOutput::ready()
     curRow = 0;
 }
 
-void LibraryCallOutput::done()
-{
-    owner->done();
-    result.clear();
-}
-
 void LibraryCallOutput::stop()
 {
-
+    owner->stop();
+    result.clear();
 }
 
 void LibraryCallOutput::updateProgress(IStatisticGatherer &progress) const
@@ -9786,13 +9776,13 @@ const void * CHThorLibraryCallActivity::nextRow()
 }
 
 
-void CHThorLibraryCallActivity::done()
+void CHThorLibraryCallActivity::stop()
 {
     CriticalBlock procedure(cs);
     if (state != StateDone)
     {
         results.clear();
-        CHThorSimpleActivityBase::done(); 
+        CHThorSimpleActivityBase::stop(); 
     }
 }
 
@@ -9917,7 +9907,7 @@ public:
         }
     }
 
-    virtual void done()
+    virtual void stop()
     {
         inputs.kill();
     }
@@ -9952,10 +9942,10 @@ CHThorNWaySelectActivity::CHThorNWaySelectActivity(IAgentContext &_agent, unsign
     selectedInput = NULL;
 }
 
-void CHThorNWaySelectActivity::done()
+void CHThorNWaySelectActivity::stop()
 {
     selectedInput = NULL;
-    CHThorMultiInputActivity::done();
+    CHThorMultiInputActivity::stop();
 }
 
 void CHThorNWaySelectActivity::ready()
@@ -10032,7 +10022,7 @@ const void *CHThorStreamedIteratorActivity::nextRow()
     return next;
 }
 
-void CHThorStreamedIteratorActivity::done()
+void CHThorStreamedIteratorActivity::stop()
 {
     if (rows)
     {
@@ -10087,7 +10077,7 @@ void CHThorExternalActivity::reset()
     processor.clear();
 }
 
-void CHThorExternalActivity::done()
+void CHThorExternalActivity::stop()
 {
     if (rows)
     {

ecl/hthor/hthor.hpp

@@ -55,7 +55,6 @@ struct IHThorInput : public IInputBase
     virtual IOutputMetaData * queryOutputMeta() const = 0;
 
     virtual void ready() = 0;
-    virtual void done() = 0;
     virtual void updateProgress(IStatisticGatherer &progress) const = 0;
     virtual const void * nextGE(const void * seek, unsigned numFields) { throwUnexpected(); }   // can only be called on stepping fields.
     virtual IInputSteppingMeta * querySteppingMeta() { return NULL; }
@@ -76,7 +75,7 @@ struct IHThorActivity : implements IActivityBase
     virtual IHThorInput *queryOutput(unsigned) = 0;
     virtual void ready() = 0;
     virtual void execute() = 0;
-    virtual void done() = 0;
+    virtual void stop() = 0;
     virtual __int64 getCount() = 0;
     virtual unsigned queryOutputs() = 0;
     virtual void updateProgress(IStatisticGatherer &progress) const = 0;

ecl/hthor/hthor.ipp

@@ -216,7 +216,6 @@ public:
     virtual void ready();
     virtual void execute();
     virtual void extractResult(unsigned & len, void * & ret);
-    virtual void done();
     virtual void stop();
     virtual void setBoundGraph(IHThorBoundLoopGraph * graph) { UNIMPLEMENTED; }
     virtual __int64 getCount();
@@ -313,7 +312,7 @@ public:
     ~CHThorDiskWriteActivity();
     virtual void execute();
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 };
 
 class CHThorSpillActivity : public CHThorDiskWriteActivity
@@ -322,7 +321,7 @@ public:
     CHThorSpillActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorSpillArg &_arg, ThorActivityKind _kind);
 
     virtual void setInput(unsigned, IHThorInput *);
-    virtual void done();
+    virtual void stop();
     virtual void execute();
     virtual void ready();
 
@@ -402,7 +401,7 @@ public:
     CHThorIterateActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorIterateArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
 
     //interface IHThorInput
@@ -438,7 +437,7 @@ public:
     CHThorRollupActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorRollupArg &_arg, ThorActivityKind _kind);
     ~CHThorRollupActivity();
 
-    virtual void done();
+    virtual void stop();
     virtual void ready();
     virtual bool needsAllocator() const { return true; }    
 
@@ -465,7 +464,7 @@ public:
     CHThorGroupDedupKeepLeftActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorDedupArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -487,7 +486,7 @@ public:
     CHThorGroupDedupKeepRightActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorDedupArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -503,7 +502,7 @@ public:
     CHThorGroupDedupAllActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorDedupArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -587,7 +586,7 @@ class CHThorHashDedupActivity : public CHThorSimpleActivityBase
 public:
     CHThorHashDedupActivity(IAgentContext & _agent, unsigned _activityId, unsigned _subgraphId, IHThorHashDedupArg & _arg, ThorActivityKind _kind);
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual const void *nextRow();
     virtual bool needsAllocator() const { return true; }    
 
@@ -628,7 +627,7 @@ public:
     CHThorNormalizeChildActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorNormalizeChildArg &_arg, ThorActivityKind _kind);
     ~CHThorNormalizeChildActivity();
 
-    virtual void done();
+    virtual void stop();
     virtual void ready();
     virtual bool needsAllocator() const { return true; }    
     
@@ -652,7 +651,7 @@ public:
     CHThorNormalizeLinkedChildActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorNormalizeLinkedChildArg &_arg, ThorActivityKind _kind);
     ~CHThorNormalizeLinkedChildActivity();
 
-    virtual void done();
+    virtual void stop();
     virtual void ready();
 
     //interface IHThorInput
@@ -757,7 +756,7 @@ public:
     CHThorFilterGroupActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorFilterGroupArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -784,7 +783,7 @@ class CHThorSkipLimitActivity : public CHThorSimpleActivityBase
 public:
     CHThorSkipLimitActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorLimitArg &_arg, ThorActivityKind _kind);
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual const void * nextRow();
 
     virtual void onLimitExceeded() { buffer->clear(); }
@@ -822,7 +821,7 @@ class CHThorSkipCatchActivity : public CHThorSimpleActivityBase
 {
 public:
     CHThorSkipCatchActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorCatchArg &_arg, ThorActivityKind _kind);
-    virtual void done();
+    virtual void stop();
     virtual const void * nextRow();
 
 protected:
@@ -844,7 +843,7 @@ public:
     virtual const void *nextRow();
     virtual void setInput(unsigned, IHThorInput *);
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual void updateProgress(IStatisticGatherer &progress) const
     {
         CHThorSimpleActivityBase::updateProgress(progress);
@@ -897,7 +896,7 @@ public:
     CHThorHashAggregateActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorHashAggregateArg &_arg, ThorActivityKind _kind, bool _isGroupedAggregate);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
 
     //interface IHThorInput
@@ -969,7 +968,7 @@ public:
     ~CHThorChooseSetsExActivity();
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -1011,7 +1010,7 @@ public:
     CHThorGroupActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorGroupArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -1061,7 +1060,7 @@ public:
     virtual void ready();
     virtual bool needsAllocator() const { return true; }    
 
-    virtual void done();
+    virtual void stop();
     virtual const void *nextRow();
 
     virtual IOutputMetaData * queryOutputMeta() const { return outputMeta; }
@@ -1222,7 +1221,7 @@ public:
     CHThorGroupedActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorGroupedArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -1238,7 +1237,7 @@ public:
     CHThorSortedActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorSortedArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -1257,7 +1256,7 @@ public:
     CHThorTraceActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorTraceArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -1324,7 +1323,7 @@ public:
     CHThorJoinActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorJoinArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
     virtual void setInput(unsigned, IHThorInput *);
     IHThorInput *queryOutput(unsigned index) { return this; }
@@ -1389,7 +1388,7 @@ public:
     IHThorInput *queryOutput(unsigned index) { return this; }
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
 
     //interface IHThorInput
@@ -1476,7 +1475,7 @@ public:
     CHThorLookupJoinActivity(IAgentContext & _agent, unsigned _activityId, unsigned _subgraphId, IHThorHashJoinArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
     virtual void setInput(unsigned index, IHThorInput * _input);
     IHThorInput * queryOutput(unsigned index) { return this; }
@@ -1530,7 +1529,7 @@ public:
     CHThorAllJoinActivity(IAgentContext & _agent, unsigned _activityId, unsigned _subgraphId, IHThorAllJoinArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual void setInput(unsigned index, IHThorInput * _input);
     IHThorInput * queryOutput(unsigned index) { return this; }
     virtual bool needsAllocator() const { return true; }    
@@ -1677,7 +1676,7 @@ public:
     virtual void execute();
     virtual const void *nextRow();
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 };
 
 class CHThorDummyActivity : public CHThorSimpleActivityBase
@@ -1728,7 +1727,7 @@ public:
     CHThorMultiInputActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual void setInput(unsigned, IHThorInput *);
 
     //interface IHThorInput
@@ -1744,7 +1743,7 @@ public:
     CHThorCaseActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorCaseArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -1833,7 +1832,7 @@ public:
     CHThorCombineGroupActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorCombineGroupArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual void setInput(unsigned, IHThorInput *);
     virtual bool needsAllocator() const { return true; }    
 
@@ -1906,7 +1905,7 @@ public:
     void checkForDiskRead();
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool isGrouped() { return grouped; }
     virtual bool needsAllocator() const { return true; }    
 
@@ -1921,7 +1920,7 @@ public:
     ~CHThorParseActivity();
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
 //interface IMatchedAction
     unsigned onMatch(ARowBuilder & self, const void * curRecord, IMatchedResults * results, IMatchWalker * walker);
@@ -1951,7 +1950,7 @@ public:
 
     //interface IHThorInput
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual const void * nextRow();
     virtual bool isGrouped() { return false; }
 
@@ -1985,7 +1984,7 @@ public:
     ~CHThorTopNActivity();
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     //interface IHThorInput
     virtual const void *nextRow();
@@ -2017,7 +2016,7 @@ public:
     ~CHThorXmlParseActivity();
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
 
     //interface IHThorInput
@@ -2046,7 +2045,7 @@ public:
     CHThorWSCBaseActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorWebServiceCallActionArg &_arg, ThorActivityKind _kind);
     IMPLEMENT_IINTERFACE;
 
-    virtual void done();
+    virtual void stop();
 
     // IWSCRowProvider
     virtual IHThorWebServiceCallActionArg * queryActionHelper() { return &helper; };
@@ -2172,7 +2171,7 @@ public:
     IMPLEMENT_IINTERFACE
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
 
     //interface IHThorInput
@@ -2198,7 +2197,7 @@ public:
     //interface IHThorInput
     virtual const void *nextRow();
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 };
 
 
@@ -2255,7 +2254,7 @@ public:
     IMPLEMENT_IINTERFACE
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 
     IHThorInput *queryOutput(unsigned index)                { return this; }
 
@@ -2331,7 +2330,7 @@ public:
     CHThorDiskReadActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorDiskReadArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
 
     //interface IHThorInput
@@ -2348,7 +2347,7 @@ public:
     virtual const void *nextRow();
     virtual void ready();
     virtual bool needsAllocator() const { return true; }    
-    virtual void done();
+    virtual void stop();
 
 protected:
     void checkOpenNext();
@@ -2376,7 +2375,7 @@ public:
     CHThorXmlReadActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorXmlReadArg &_arg, ThorActivityKind _kind);
     
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
     virtual const void *nextRow();
 
@@ -2424,7 +2423,7 @@ protected:
 public:
     CHThorDiskNormalizeActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorDiskNormalizeArg &_arg, ThorActivityKind _kind);
 
-    virtual void done();
+    virtual void stop();
     virtual void ready();
     virtual bool needsAllocator() const { return true; }    
 
@@ -2446,7 +2445,7 @@ protected:
 public:
     CHThorDiskAggregateActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorDiskAggregateArg &_arg, ThorActivityKind _kind);
 
-    virtual void done();
+    virtual void stop();
     virtual void ready();
     virtual bool needsAllocator() const { return true; }    
 
@@ -2561,7 +2560,7 @@ public:
 
 protected:
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual bool needsAllocator() const { return true; }    
 };
 
@@ -2641,7 +2640,7 @@ public:
 
 protected:
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 };
 
 
@@ -2704,7 +2703,7 @@ public:
 
 protected:
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 };
 
 
@@ -2728,7 +2727,7 @@ public:
 
 protected:
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 };
 
 
@@ -2743,7 +2742,6 @@ public:
     virtual IOutputMetaData * queryOutputMeta() const;
 
     virtual void ready();
-    virtual void done();
     virtual void stop();
     virtual void updateProgress(IStatisticGatherer &progress) const;
 
@@ -2786,7 +2784,7 @@ protected:
 
 protected:
     virtual void ready();
-    virtual void done();
+    virtual void stop();
 };
 
 
@@ -2800,7 +2798,7 @@ public:
     CHThorNWaySelectActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorNWaySelectArg &_arg, ThorActivityKind _kind);
 
     //interface IHThorInput
-    virtual void done();
+    virtual void stop();
     virtual void ready();
     virtual const void * nextRow();
     virtual const void * nextGE(const void * seek, unsigned numFields);
@@ -2816,7 +2814,7 @@ public:
     CHThorStreamedIteratorActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorStreamedIteratorArg &_arg, ThorActivityKind _kind);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual const void *nextRow();
 };
 
@@ -2845,7 +2843,7 @@ public:
     CHThorExternalActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorExternalArg &_arg, ThorActivityKind _kind, IPropertyTree * _graphNode);
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual void reset();
 
     virtual void execute();

ecl/hthor/hthorkey.cpp

@@ -271,7 +271,7 @@ public:
     ~CHThorIndexReadActivityBase();
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     IHThorInput *queryOutput(unsigned index) { return this; }
     virtual bool needsAllocator() const { return true; }
 
@@ -425,10 +425,10 @@ void CHThorIndexReadActivityBase::ready()
     firstPart();
 }
 
-void CHThorIndexReadActivityBase::done()
+void CHThorIndexReadActivityBase::stop()
 { 
     killPart(); 
-    CHThorActivityBase::done(); 
+    CHThorActivityBase::stop(); 
 }
 
 bool CHThorIndexReadActivityBase::doPreopenLimit(unsigned __int64 limit)
@@ -1099,7 +1099,7 @@ public:
     ~CHThorIndexNormalizeActivity();
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual const void *nextRow();
     virtual bool needsAllocator() const { return true; }
 
@@ -1146,10 +1146,10 @@ void CHThorIndexNormalizeActivity::ready()
     outBuilder.setAllocator(rowAllocator);
 }
 
-void CHThorIndexNormalizeActivity::done()
+void CHThorIndexNormalizeActivity::stop()
 {
     outBuilder.clear();
-    CHThorIndexReadActivityBase::done();
+    CHThorIndexReadActivityBase::stop();
 }
 
 const void *CHThorIndexNormalizeActivity::nextRow()
@@ -1281,7 +1281,7 @@ public:
     ~CHThorIndexAggregateActivity();
 
     //interface IHThorInput
-    virtual void done();
+    virtual void stop();
     virtual void ready();
     virtual const void *nextRow();
     virtual bool needsAllocator() const { return true; }
@@ -1313,10 +1313,10 @@ void CHThorIndexAggregateActivity::ready()
     finished = false;
 }
 
-void CHThorIndexAggregateActivity::done()
+void CHThorIndexAggregateActivity::stop()
 {
     outBuilder.clear();
-    CHThorIndexReadActivityBase::done();
+    CHThorIndexReadActivityBase::stop();
 }
 
 
@@ -1642,9 +1642,9 @@ public:
         }
     }
 
-    bool stop()
+    virtual bool stop()
     {
-        owner->stop();
+        owner->stopThread();
         return true;
     }
 
@@ -1692,7 +1692,7 @@ public:
         }
     }
 
-    void stop()
+    void stopThread()
     {
     }
 
@@ -2022,12 +2022,12 @@ public:
         part->addRow(new REQUEST(left, rp, seq));
     }
 
-    void stop()
+    void stopThread()
     {
         unsigned idx;
         for (idx = 0; idx < numParts; idx++)
         {
-            parts[idx]->stop();
+            parts[idx]->stopThread();
             parts[idx]->join();
         }
         if (exception)
@@ -2106,10 +2106,10 @@ public:
 
     virtual void initializeThreadPool() = 0;
 
-    virtual void done()
+    virtual void stop()
     {
         aborting = true;
-        stop();
+        stopThread();
         if (inputThread)
             inputThread->join();
 
@@ -2121,7 +2121,7 @@ public:
         clearQueue();
         waitForThreads();
         avail.reinit(0);
-        CHThorActivityBase::done(); 
+        CHThorActivityBase::stop(); 
     }
 
     virtual const void * getRow() = 0;
@@ -2159,7 +2159,7 @@ public:
         avail.signal();
     }
 
-    void stop()
+    void stopThread()
     {
         avail.signal();
     }
@@ -2262,7 +2262,7 @@ public:
     virtual void stopParts()
     {
         if(parts)
-            parts->stop();
+            parts->stopThread();
     }
 
     virtual void fetchAll()
@@ -2284,9 +2284,9 @@ public:
                 offset_t seq = addRowPlaceholder();
                 parts->addRow(row, rp, seq);
             }
-            parts->stop();
+            parts->stopThread();
         }
-        stop();
+        stopThread();
     }
 
     // to preserve order, we enqueue NULLs onto the queue and issue sequence numbers, and we only signal avail when rows in correct sequence are available
@@ -3025,7 +3025,7 @@ private:
 interface IKeyLookupHandler : extends IInterface
 {
     virtual void addRow(const void *row) = 0;
-    virtual void stop() = 0;
+    virtual void stopThread() = 0;
 };
 
 class DistributedKeyLookupHandler : public CInterface, implements IThreadedExceptionHandler, implements IKeyLookupHandler
@@ -3140,11 +3140,11 @@ public:
         opened = true;
     }
 
-    void stop()
+    void stopThread()
     {
         ForEachItemIn(idx, parts)
         {
-            parts.item(idx).stop();
+            parts.item(idx).stopThread();
             parts.item(idx).join();
         }
         if (exception)
@@ -3275,7 +3275,7 @@ public:
         opened = true;
     }
 
-    void stop()
+    void stopThread()
     {
     }
 };
@@ -3429,10 +3429,10 @@ public:
         }
     }
 
-    virtual void done()
+    virtual void stop()
     {
         ldFile.clear();
-        CHThorThreadedActivityBase::done();
+        CHThorThreadedActivityBase::stop();
     }
 
     virtual void initializeThreadPool()
@@ -3458,7 +3458,7 @@ public:
     virtual void stopParts()
     {
         if(parts)
-            parts->stop();
+            parts->stopThread();
     }
 
     virtual bool isGrouped() { return preserveGroups; } 
@@ -3537,10 +3537,10 @@ public:
             }
         }
         if(lookup)
-            lookup->stop();
+            lookup->stopThread();
         if (parts)
-            parts->stop();
-        stop();
+            parts->stopThread();
+        stopThread();
     }
 
     virtual KeyedJoinFetchPartHandler * createFetchPartHandler(IDistributedFilePart * part, offset_t base, offset_t size, IThreadedExceptionHandler * handler, bool blockcompressed, MemoryAttr &encryptionkey, IOutputRowDeserializer * rowDeserializer, IEngineRowAllocator *rowAllocator)

ecl/hthor/hthorstep.cpp

@@ -76,12 +76,12 @@ CHThorNaryActivity::CHThorNaryActivity(IAgentContext & _agent, unsigned _activit
 {
 }
 
-void CHThorNaryActivity::done()
+void CHThorNaryActivity::stop()
 {
     ForEachItemIn(i, expandedInputs)
-        expandedInputs.item(i)->done();
+        expandedInputs.item(i)->stop();
     expandedInputs.kill();
-    CHThorMultiInputActivity::done();
+    CHThorMultiInputActivity::stop();
 }
 
 void CHThorNaryActivity::ready()
@@ -126,10 +126,10 @@ CHThorNWayMergeActivity::~CHThorNWayMergeActivity()
     merger.cleanup();
 }
 
-void CHThorNWayMergeActivity::done()    
+void CHThorNWayMergeActivity::stop()    
 {
     merger.done();
-    CHThorNaryActivity::done();
+    CHThorNaryActivity::stop();
 }
 
 const void * CHThorNWayMergeActivity::nextRow()
@@ -180,10 +180,10 @@ CHThorMergeJoinBaseActivity::CHThorMergeJoinBaseActivity(IAgentContext & _agent,
 {
 }
 
-void CHThorMergeJoinBaseActivity::done()
+void CHThorMergeJoinBaseActivity::stop()
 {
     processor.afterProcessing();
-    CHThorNaryActivity::done();
+    CHThorNaryActivity::stop();
 }
 
 
@@ -271,10 +271,10 @@ CHThorNWayJoinActivity::CHThorNWayJoinActivity(IAgentContext & _agent, unsigned
 {
 }
 
-void CHThorNWayJoinActivity::done()
+void CHThorNWayJoinActivity::stop()
 {
     processor.afterProcessing();
-    CHThorNaryActivity::done();
+    CHThorNaryActivity::stop();
 }
 
 void CHThorNWayJoinActivity::ready()

ecl/hthor/hthorstep.ipp

@@ -49,7 +49,7 @@ public:
     CHThorNaryActivity(IAgentContext &agent, unsigned _activityId, unsigned _subgraphId, IHThorArg &_arg, ThorActivityKind _kind);
 
     //interface IHThorInput
-    virtual void done();
+    virtual void stop();
     virtual void ready();
     virtual void updateProgress(IStatisticGatherer &progress) const;
 };
@@ -65,7 +65,7 @@ public:
     ~CHThorNWayMergeActivity();
 
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual const void * nextRow();
     virtual const void * nextGE(const void * seek, unsigned numFields);
     virtual IInputSteppingMeta * querySteppingMeta();
@@ -85,7 +85,7 @@ public:
 
     //interface IHThorInput
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual const void * nextRow();
     virtual const void * nextGE(const void * seek, unsigned numFields);
     virtual IInputSteppingMeta * querySteppingMeta();
@@ -148,7 +148,7 @@ public:
 
     //interface IHThorInput
     virtual void ready();
-    virtual void done();
+    virtual void stop();
     virtual const void * nextRow();
     virtual const void * nextGE(const void * seek, unsigned numFields);
     virtual IInputSteppingMeta * querySteppingMeta();