You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2017/06/15 17:15:38 UTC

[1/2] carbondata git commit: solved bug for class cast exception in intermediate file merger

Repository: carbondata
Updated Branches:
  refs/heads/master c7cd0bca8 -> c3cde5af1


solved bug for class cast exception in intermediate file merger


Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/700665ba
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/700665ba
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/700665ba

Branch: refs/heads/master
Commit: 700665ba8546c587901592499fa0ffbfac13df1c
Parents: c7cd0bc
Author: anubhav100 <an...@knoldus.in>
Authored: Tue Jun 13 11:16:57 2017 +0530
Committer: jackylk <ja...@huawei.com>
Committed: Fri Jun 16 00:40:47 2017 +0800

----------------------------------------------------------------------
 .../sortandgroupby/sortdata/IntermediateFileMerger.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/700665ba/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/IntermediateFileMerger.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/IntermediateFileMerger.java b/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/IntermediateFileMerger.java
index d20292c..6528d44 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/IntermediateFileMerger.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/IntermediateFileMerger.java
@@ -342,10 +342,13 @@ public class IntermediateFileMerger implements Callable<Void> {
           stream.write((byte) 1);
           switch (aggType[counter]) {
             case SHORT:
+              stream.writeShort((short)NonDictionaryUtil.getMeasure(fieldIndex, row));
+              break;
             case INT:
+              stream.writeInt((int)NonDictionaryUtil.getMeasure(fieldIndex, row));
+              break;
             case LONG:
-              Long val = (Long) NonDictionaryUtil.getMeasure(fieldIndex, row);
-              stream.writeLong(val);
+              stream.writeLong((long)NonDictionaryUtil.getMeasure(fieldIndex, row));
               break;
             case DOUBLE:
               stream.writeDouble((Double) NonDictionaryUtil.getMeasure(fieldIndex, row));


[2/2] carbondata git commit: [CARBONDATA-1165] solved bug for class cast exception in intermediate file merger This closes #1025

Posted by ja...@apache.org.
[CARBONDATA-1165] solved bug for class cast exception in intermediate file merger This closes #1025


Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/c3cde5af
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/c3cde5af
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/c3cde5af

Branch: refs/heads/master
Commit: c3cde5af19875c311445b52639d64b2262794ddb
Parents: c7cd0bc 700665b
Author: jackylk <ja...@huawei.com>
Authored: Fri Jun 16 00:41:15 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Fri Jun 16 00:41:15 2017 +0800

----------------------------------------------------------------------
 .../sortandgroupby/sortdata/IntermediateFileMerger.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------