diff options
| author | akumarb2010 <akumarb2010@gmail.com> | 2014-08-01 18:28:20 +0530 |
|---|---|---|
| committer | Jacques Nadeau <jacques@apache.org> | 2014-08-06 16:44:22 -0700 |
| commit | e71a5059f87aefc23a8e6811cbb5f078281c9549 (patch) | |
| tree | cbf1d31633c81bf1e3b4f7c9c273b261ac8fb3db /exec/java-exec/src/main | |
| parent | 2d10e8b8feaf48429d7fa7324b15ba9949f41378 (diff) | |
DRILL-1235: Fix null handling in REST interface
Diffstat (limited to 'exec/java-exec/src/main')
| -rw-r--r-- | exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java | 8 | ||||
| -rw-r--r-- | exec/java-exec/src/main/resources/rest/query/result.ftl | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java index 83c82db6e..8f299bbff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java @@ -135,10 +135,14 @@ public class QueryWrapper { for (VectorWrapper<?> vw : loader) { ValueVector.Accessor accessor = vw.getValueVector().getAccessor(); Object object = accessor.getObject(i); - if (! object.getClass().getName().startsWith("java.lang")) { + if (object != null && (! object.getClass().getName().startsWith("java.lang"))) { object = object.toString(); } - record.put(columnNames.get(j), object); + if (object != null) { + record.put(columnNames.get(j), object); + } else { + record.put(columnNames.get(j), null); + } ++j; } output.add(record); diff --git a/exec/java-exec/src/main/resources/rest/query/result.ftl b/exec/java-exec/src/main/resources/rest/query/result.ftl index 0d60da897..d4e35087b 100644 --- a/exec/java-exec/src/main/resources/rest/query/result.ftl +++ b/exec/java-exec/src/main/resources/rest/query/result.ftl @@ -38,7 +38,7 @@ <#list model.getRecords() as record> <tr> <#list record as value> - <td>${value}</td> + <td><#if value??>${value}<#else>null</#if></td> </#list> </tr> </#list> |