Przeglądaj źródła

HPCC-10549 Fix regression in roxie

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 11 lat temu
rodzic
commit
f6daef7e98
2 zmienionych plików z 1 dodań i 2 usunięć
  1. 1 1
      ecl/hqlcpp/hqlresource.cpp
  2. 0 1
      roxie/ccd/ccdserver.cpp

+ 1 - 1
ecl/hqlcpp/hqlresource.cpp

@@ -1910,7 +1910,7 @@ EclResourcer::EclResourcer(IErrorReceiver * _errors, IConstWorkUnit * _wu, Clust
     options.optimizeSharedInputs = _translatorOptions.optimizeSharedGraphInputs && options.combineSiblings;
     options.optimizeSharedInputs = _translatorOptions.optimizeSharedGraphInputs && options.combineSiblings;
     options.actionLinkInNewGraph = _translatorOptions.actionLinkInNewGraph || (targetClusterType == HThorCluster);
     options.actionLinkInNewGraph = _translatorOptions.actionLinkInNewGraph || (targetClusterType == HThorCluster);
     options.convertCompoundToExecuteWhen = false;
     options.convertCompoundToExecuteWhen = false;
-    options.useResultsForChildSpills = _translatorOptions.useResultsForChildSpills;// && (targetClusterType != HThorCluster);
+    options.useResultsForChildSpills = _translatorOptions.useResultsForChildSpills;
 }
 }
 
 
 EclResourcer::~EclResourcer()               
 EclResourcer::~EclResourcer()               

+ 0 - 1
roxie/ccd/ccdserver.cpp

@@ -25504,7 +25504,6 @@ public:
 
 
     virtual void reset()
     virtual void reset()
     {
     {
-        results.clear();
         ForEachItemIn(idx, sinks)
         ForEachItemIn(idx, sinks)
         {
         {
             IRoxieServerActivity &sink = sinks.item(idx);
             IRoxieServerActivity &sink = sinks.item(idx);