Browse Source

HPCC-397 Tidy up hthor/roxie input interfaces

Second step towards commoning up with thor and implementing parallel
activities. Take boolean(aborting) parameter out of roxie input's abort()
method.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 years ago
parent
commit
058dac3507
3 changed files with 217 additions and 181 deletions
  1. 4 4
      roxie/ccd/ccddebug.cpp
  2. 210 175
      roxie/ccd/ccdserver.cpp
  3. 3 2
      roxie/ccd/ccdserver.hpp

+ 4 - 4
roxie/ccd/ccddebug.cpp

@@ -115,10 +115,10 @@ public:
         inMeta = in->queryOutputMeta();
         inMeta = in->queryOutputMeta();
         assertex(inMeta);
         assertex(inMeta);
     }
     }
-    virtual void stop(bool aborting)
+    virtual void stop()
     {
     {
         hasStopped = true;
         hasStopped = true;
-        in->stop(aborting);
+        in->stop();
     }
     }
     virtual void reset()
     virtual void reset()
     {
     {
@@ -851,9 +851,9 @@ public:
         targetAct->updateTimes(debugContext->querySequence());
         targetAct->updateTimes(debugContext->querySequence());
     }
     }
 
 
-    virtual void stop(bool aborting)
+    virtual void stop()
     {
     {
-        InputProbe::stop(aborting);
+        InputProbe::stop();
         sourceAct->updateTimes(debugContext->querySequence());
         sourceAct->updateTimes(debugContext->querySequence());
         targetAct->updateTimes(debugContext->querySequence());
         targetAct->updateTimes(debugContext->querySequence());
     }
     }

File diff suppressed because it is too large
+ 210 - 175
roxie/ccd/ccdserver.cpp


+ 3 - 2
roxie/ccd/ccdserver.hpp

@@ -93,7 +93,7 @@ class ClusterWriteHandler;
 interface IRoxieInput : extends IInputBase
 interface IRoxieInput : extends IInputBase
 {
 {
     virtual void start(unsigned parentExtractSize, const byte *parentExtract, bool paused) = 0;
     virtual void start(unsigned parentExtractSize, const byte *parentExtract, bool paused) = 0;
-    virtual void stop(bool aborting) = 0;
+    virtual void stop() = 0;
     virtual void reset() = 0;
     virtual void reset() = 0;
     virtual void checkAbort() = 0;
     virtual void checkAbort() = 0;
     virtual unsigned queryId() const = 0;
     virtual unsigned queryId() const = 0;
@@ -148,7 +148,8 @@ interface IRoxieServerActivity : extends IActivityBase
     virtual void execute(unsigned parentExtractSize, const byte *parentExtract) = 0;
     virtual void execute(unsigned parentExtractSize, const byte *parentExtract) = 0;
     virtual void onCreate(IRoxieSlaveContext *ctx, IHThorArg *colocalArg) = 0;
     virtual void onCreate(IRoxieSlaveContext *ctx, IHThorArg *colocalArg) = 0;
     virtual void start(unsigned parentExtractSize, const byte *parentExtract, bool paused) = 0;
     virtual void start(unsigned parentExtractSize, const byte *parentExtract, bool paused) = 0;
-    virtual void stop(bool aborting) = 0;
+    virtual void stop() = 0;
+    virtual void abort() = 0;
     virtual void reset() = 0;
     virtual void reset() = 0;
     virtual void addDependency(IRoxieServerActivity &source, unsigned sourceIdx, int controlId) = 0;
     virtual void addDependency(IRoxieServerActivity &source, unsigned sourceIdx, int controlId) = 0;
     virtual unsigned queryId() const = 0;
     virtual unsigned queryId() const = 0;