Selaa lähdekoodia

gh-1476 - Fix regression in hashagg,local

A change in gh-1104, caused hashagg,local to fail with a serialization error

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Jake Smith 13 vuotta sitten
vanhempi
commit
fe4dfcbb49
1 muutettua tiedostoa jossa 4 lisäystä ja 1 poistoa
  1. 4 1
      thorlcr/activities/hashdistrib/thhashdistrib.cpp

+ 4 - 1
thorlcr/activities/hashdistrib/thhashdistrib.cpp

@@ -288,7 +288,10 @@ CActivityBase *createHashJoinActivityMaster(CMasterGraphElement *container)
 
 CActivityBase *createHashAggregateActivityMaster(CMasterGraphElement *container)
 {
-    return new HashDistributeActivityMaster(DM_groupaggregate, container);      
+    if (container->queryLocalOrGrouped())
+        return new CMasterActivity(container);
+    else
+        return new HashDistributeActivityMaster(DM_groupaggregate, container);      
 }
 
 CActivityBase *createKeyedDistributeActivityMaster(CMasterGraphElement *container)