merge with fullstack_hybridhashgby to r3015
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3016 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/group/hybridhash/HybridHashGroupOperatorDescriptor.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/group/hybridhash/HybridHashGroupOperatorDescriptor.java
index 0cc718d..118ca75 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/group/hybridhash/HybridHashGroupOperatorDescriptor.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/group/hybridhash/HybridHashGroupOperatorDescriptor.java
@@ -195,7 +195,7 @@
* @param factor
* @return
*/
- private int getNumberOfPartitions(int tableSize, int framesLimit, int inputKeySize, double factor) {
+ private int getNumberOfPartitions(int tableSize, int framesLimit, long inputKeySize, double factor) {
int hashtableHeaderPages = HybridHashGroupHashTable.getHeaderPages(tableSize, frameSize);
@@ -268,7 +268,7 @@
boolean checkFallback = true;
- int numOfPartitions = getNumberOfPartitions(tableSize, framesLimit, inputCardinality
+ int numOfPartitions = getNumberOfPartitions(tableSize, framesLimit, (long)inputCardinality
* userProvidedRecordSizeInBytes / frameSize, fudgeFactor);
HybridHashGroupHashTable processor = new HybridHashGroupHashTable(ctx, framesLimit, tableSize,