Browse Source

HPCC-14854 Add Roxie implementation of parallel PROJECT and PARSE

Regression suite detected an issue when NOT running stranded, related to IF
stopping branches that had not been started.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 years ago
parent
commit
7502f24648
2 changed files with 3 additions and 3 deletions
  1. 1 1
      plugins/cassandra/cpp-driver
  2. 2 2
      roxie/ccd/ccdserver.cpp

+ 1 - 1
plugins/cassandra/cpp-driver

@@ -1 +1 @@
-Subproject commit b4bb435129bab533612fa2caf194555fa943f925
+Subproject commit d7bbad34db39a51f209c6fadd07c9ec3a0bb86b7

+ 2 - 2
roxie/ccd/ccdserver.cpp

@@ -1655,8 +1655,8 @@ public:
     virtual void stop()
     {
         // Called from the strands... which should ensure that stop is not called more than once per strand
-        assertex(active);
-        active--;
+        if (active);
+            active--;
         if (!active)
             CRoxieServerActivity::stop();
     }