DRILL-1400: JsonConvertFrom should use the correct work buffer from JsonReader
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/7ae257c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/7ae257c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/7ae257c4 Branch: refs/heads/master Commit: 7ae257c42b2eb4e1db778dca9ba64e2516078b38 Parents: fab6815 Author: Aditya Kishore <adi...@maprtech.com> Authored: Wed Sep 10 14:27:57 2014 -0700 Committer: Aditya Kishore <adi...@maprtech.com> Committed: Thu Sep 11 19:25:27 2014 -0700 ---------------------------------------------------------------------- .../apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java | 2 ++ .../org/apache/drill/exec/vector/complex/fn/JsonReader.java | 5 +++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/7ae257c4/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java index 46b5390..7d07f6e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java @@ -61,6 +61,7 @@ public class JsonConvertFrom { org.apache.drill.exec.vector.complex.fn.JsonReader jsonReader = new org.apache.drill.exec.vector.complex.fn.JsonReader(buffer, false); jsonReader.write(new java.io.StringReader(input), writer); + buffer = jsonReader.getWorkBuf(); } catch (Exception e) { // System.out.println("Error while converting from JSON. "); @@ -90,6 +91,7 @@ public class JsonConvertFrom { org.apache.drill.exec.vector.complex.fn.JsonReader jsonReader = new org.apache.drill.exec.vector.complex.fn.JsonReader(buffer, false); jsonReader.write(new java.io.StringReader(input), writer); + buffer = jsonReader.getWorkBuf(); } catch (Exception e) { // System.out.println("Error while converting from JSON. "); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/7ae257c4/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java index 84c4902..eab39b5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java @@ -366,4 +366,9 @@ public class JsonReader { } + + public DrillBuf getWorkBuf() { + return workBuf; + } + }
