You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2017/03/30 14:30:43 UTC
[1/2] incubator-carbondata git commit: Fixed NullPointerException for
Null values in carbon table when querying from Presto
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 436bc957a -> a4307dffb
Fixed NullPointerException for Null values in carbon table when querying from Presto
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/a07d7714
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/a07d7714
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/a07d7714
Branch: refs/heads/master
Commit: a07d7714fbdc852bc19e0129b5780cc0890f3298
Parents: 436bc95
Author: Bhavya <bh...@knoldus.com>
Authored: Thu Mar 30 13:22:55 2017 +0530
Committer: chenliang613 <ch...@huawei.com>
Committed: Thu Mar 30 19:59:06 2017 +0530
----------------------------------------------------------------------
.../presto/CarbondataRecordCursor.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/a07d7714/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordCursor.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordCursor.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordCursor.java
index 3314ac4..8eef1c9 100755
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordCursor.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataRecordCursor.java
@@ -26,6 +26,7 @@ import io.airlift.slice.Slices;
import org.apache.carbondata.common.CarbonIterator;
import org.apache.carbondata.hadoop.readsupport.CarbonReadSupport;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -84,10 +85,20 @@ public class CarbondataRecordCursor implements RecordCursor {
}
if (rowCursor.hasNext()) {
- fields = Stream.of(readSupport.readRow(rowCursor.next())).map(a -> a.toString())
- .collect(Collectors.toList());
-
- totalBytes += fields.size();
+ Object[] columns = readSupport.readRow(rowCursor.next());
+ fields = new ArrayList<String>();
+ if(columns != null && columns.length > 0)
+ {
+ for(Object value : columns){
+ if(value != null )
+ {
+ fields.add(value.toString());
+ } else {
+ fields.add(null);
+ }
+ }
+ }
+ totalBytes += columns.length;
return true;
}
return false;
[2/2] incubator-carbondata git commit: [CARBONDATA-835] Fixed
NullPointerException for Presto This closes #712
Posted by ch...@apache.org.
[CARBONDATA-835] Fixed NullPointerException for Presto This closes #712
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/a4307dff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/a4307dff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/a4307dff
Branch: refs/heads/master
Commit: a4307dffb8d3ac887ed2c1efb959349627751c76
Parents: 436bc95 a07d771
Author: chenliang613 <ch...@huawei.com>
Authored: Thu Mar 30 20:00:24 2017 +0530
Committer: chenliang613 <ch...@huawei.com>
Committed: Thu Mar 30 20:00:24 2017 +0530
----------------------------------------------------------------------
.../presto/CarbondataRecordCursor.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------