Addressed review comments

apache · Jun 7, 2022 · fc1a320 · fc1a320
1 parent f5faeb3
commit fc1a320
Showing 1 changed file with 2 additions and 10 deletions.
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
@@ -54,7 +54,7 @@ public static class ConvertFromJsonNullableInput implements DrillSimpleFunc {
     @Inject
     ResultSetLoader loader;
 
-    @Output
+    @Output // TODO Remove in future work
     BaseWriter.ComplexWriter writer;
 
     @Override
@@ -68,9 +68,6 @@ public void setup() {
     public void eval() {
       if (in.end == 0) {
         // Return empty map
-        org.apache.drill.exec.vector.complex.writer.BaseWriter.MapWriter mapWriter = writer.rootAsMap();
-        mapWriter.start();
-        mapWriter.end();
         return;
       }
 
@@ -79,7 +76,6 @@ public void eval() {
         org.apache.drill.exec.store.easy.json.loader.JsonLoader jsonLoader = jsonLoaderBuilder.build();
         loader.startBatch();
         jsonLoader.readBatch();
-        loader.close();
       } catch (Exception e) {
         throw new org.apache.drill.common.exceptions.DrillRuntimeException("Error while converting from JSON. ", e);
       }
@@ -93,7 +89,7 @@ public static class ConvertFromJsonVarcharInput implements DrillSimpleFunc {
     @Param
     VarCharHolder in;
 
-    @Output
+    @Output // TODO Remove in future work
     ComplexWriter writer;
 
     @Workspace
@@ -118,9 +114,6 @@ public void eval() {
 
       // If the input is null or empty, return an empty map
       if (jsonString.length() == 0) {
-        org.apache.drill.exec.vector.complex.writer.BaseWriter.MapWriter mapWriter = writer.rootAsMap();
-        mapWriter.start();
-        mapWriter.end();
         return;
       }
 
@@ -129,7 +122,6 @@ public void eval() {
         org.apache.drill.exec.store.easy.json.loader.JsonLoader jsonLoader = jsonLoaderBuilder.build();
         loader.startBatch();
         jsonLoader.readBatch();
-        loader.close();
       } catch (Exception e) {
         throw new org.apache.drill.common.exceptions.DrillRuntimeException("Error while converting from JSON. ", e);
       }