浏览代码

HPCC-16849 N-Way input activity reports RESET without STOP

Stop once started - there is no further processing by the activity itself.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 8 年之前
父节点
当前提交
a920687197
共有 1 个文件被更改,包括 4 次插入13 次删除
  1. 4 13
      roxie/ccd/ccdserver.cpp

+ 4 - 13
roxie/ccd/ccdserver.cpp

@@ -16164,14 +16164,6 @@ public:
     {
     }
 
-    virtual void stop()
-    {
-        ForEachItemIn(i2, selectedStreams)
-            selectedStreams.item(i2)->stop();
-
-        CRoxieServerMultiInputBaseActivity::stop();
-    }
-
     virtual unsigned __int64 queryLocalCycles() const
     {
         __int64 localCycles = totalCycles.totalCycles;
@@ -16285,14 +16277,11 @@ public:
                 selectedJunctions.append(junctionArray[nextIndex-1]);
             }
         }
-
         // NB: Whatever pulls this nwayinput activity, starts and stops the selectedInputs and selectedJunctions
+        // But the N-Way input itself is now done with processing, and can stop itself/dependencies.
+        stop();
     }
 
-    virtual void stop()
-    {
-        // NB: Whatever pulls this nwayinput activity, starts and stops the selectedInputs
-    }
 };
 
 class CRoxieServerNWayInputActivityFactory : public CRoxieServerMultiInputFactory
@@ -16364,6 +16353,8 @@ public:
                 selectedJunctions.append(resultJunctions[i]);
             }
         }
+        // I have done with my processing - note that this won't stop my inputs
+        stop();
     }
 
     virtual void reset()