Browse Source

Merge pull request #629 from jakesmith/hashaggfix

Ordered Hash Aggregate broken in 64bit

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 13 years ago
parent
commit
2ca35feadb
1 changed files with 2 additions and 2 deletions
  1. 2 2
      thorlcr/activities/hashdistrib/thhashdistribslave.cpp

+ 2 - 2
thorlcr/activities/hashdistrib/thhashdistribslave.cpp

@@ -2458,7 +2458,7 @@ CThorRowAggregator *mergeLocalAggs(CActivityBase &activity, IHThorRowAggregator
             virtual unsigned hash(const void *rowMeta)
             {
                 const void *row;
-                memcpy(&row, ((const byte *)rowMeta)+sizeof(size32_t), sizeof(size32_t));
+                memcpy(&row, ((const byte *)rowMeta)+sizeof(size32_t), sizeof(const void *));
                 return baseHash->hash(row);
             }
         } nodeCompare(helperExtra.queryHashElement());
@@ -2471,7 +2471,7 @@ CThorRowAggregator *mergeLocalAggs(CActivityBase &activity, IHThorRowAggregator
                 break;
             readCount++;
             const void *row;
-            memcpy(&row, ((const byte *)rowMeta.get())+sizeof(size32_t), sizeof(size32_t));
+            memcpy(&row, ((const byte *)rowMeta.get())+sizeof(size32_t), sizeof(const void *));
             globalAggTable->mergeElement(row);
         }
     }