瀏覽代碼

HPCC-14554 Roxie control:queries messages need to return errors

Other roxie control messages are fine, just control:queries.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 年之前
父節點
當前提交
563a4103e4
共有 1 個文件被更改,包括 5 次插入0 次删除
  1. 5 0
      roxie/ccd/ccdstate.cpp

+ 5 - 0
roxie/ccd/ccdstate.cpp

@@ -3028,6 +3028,11 @@ void mergeStats(IPropertyTree *s1, IPropertyTree *s2)
 
 void mergeQueries(IPropertyTree *dest, IPropertyTree *src)
 {
+    Owned<IPropertyTreeIterator> elems = src->getElements("Exception");
+    ForEach(*elems)
+    {
+        dest->addPropTree("Exception", LINK(&elems->query()));
+    }
     IPropertyTree *destQueries = ensurePTree(dest, "Queries");
     IPropertyTree *srcQueries = src->queryPropTree("Queries");
     if (!srcQueries)