Merge pull request #1961 from ma-xiao-guang-64/1.6

修复聚合函数的问题
MyCATApache · Aug 16, 2018 · de2a8ee · de2a8ee
2 parents a12fc6b + b76b36b
commit de2a8ee
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/java/io/mycat/sqlengine/mpp/UnsafeRowGrouper.java b/src/main/java/io/mycat/sqlengine/mpp/UnsafeRowGrouper.java
@@ -655,8 +655,12 @@ private void aggregateRow(UnsafeRow key,UnsafeRow toRow, UnsafeRow newRow) throw
 					 case ColMeta.COL_TYPE_INT:
 					 case ColMeta.COL_TYPE_LONG:
 					 case ColMeta.COL_TYPE_INT24:
-						 left = BytesTools.int2Bytes(toRow.getInt(index));
-						 right = BytesTools.int2Bytes(newRow.getInt(index));
+						 if (!toRow.isNullAt(index)) {
+						 	left = BytesTools.int2Bytes(toRow.getInt(index));
+						 }
+						 if (!newRow.isNullAt(index)) {
+						 	right = BytesTools.int2Bytes(newRow.getInt(index));
+						 }
 						 break;
 					 case ColMeta.COL_TYPE_SHORT:
 						 left = BytesTools.short2Bytes(toRow.getShort(index));
@@ -764,16 +768,17 @@ private void aggregateRow(UnsafeRow key,UnsafeRow toRow, UnsafeRow newRow) throw
 							 bufferHolder.reset();
 							 for (int i = 0; i < toRow.numFields(); i++) {
 
-								 if (!toRow.isNullAt(i) && i != index) {
-									 unsafeRowWriter.write(i, toRow.getBinary(i));
-								 } else if (!toRow.isNullAt(i) && i == index) {
+								 if (i == index) {
 									 unsafeRowWriter.write(i,result);
+								 } else if (!toRow.isNullAt(i)) {
+									 unsafeRowWriter.write(i, toRow.getBinary(i));
 								 } else if (toRow.isNullAt(i)){
 									 unsafeRow.setNullAt(i);
 								 }
 							 }
 							 unsafeRow.setTotalSize(bufferHolder.totalSize());
 							 aggregationMap.put(key, unsafeRow);
+							 toRow = unsafeRow;
 							 break;
 						 default:
 							 break;