drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/7] drill git commit: DRILL-2143: Part 1 - just remove RecordBatch from UDF setup method.
Date Tue, 17 Mar 2015 22:09:07 GMT
http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java
index d555fad..ae67606 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java
@@ -31,7 +31,6 @@ import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.annotations.Workspace;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.NullableBitHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @SuppressWarnings("unused")
 public class BooleanAggrFunctions {
@@ -45,7 +44,7 @@ public static class BitBooleanOr implements DrillAggFunc{
   @Workspace BitHolder inter;
   @Output BitHolder out;
 
-  public void setup(RecordBatch b) {
+  public void setup() {
   inter = new BitHolder();
 
     // Initialize the workspace variables
@@ -77,7 +76,7 @@ public static class NullableBitBooleanOr implements DrillAggFunc{
   @Workspace BitHolder inter;
   @Output BitHolder out;
 
-  public void setup(RecordBatch b) {
+  public void setup() {
   inter = new BitHolder();
 
     // Initialize the workspace variables
@@ -116,7 +115,7 @@ public static class BitBooleanAnd implements DrillAggFunc{
   @Workspace BitHolder inter;
   @Output BitHolder out;
 
-  public void setup(RecordBatch b) {
+  public void setup() {
   inter = new BitHolder();
 
     // Initialize the workspace variables
@@ -149,7 +148,7 @@ public static class NullableBitBooleanAnd implements DrillAggFunc{
   @Workspace BitHolder inter;
   @Output BitHolder out;
 
-  public void setup(RecordBatch b) {
+  public void setup() {
   inter = new BitHolder();
 
     // Initialize the workspace variables

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java
index 8831d98..381f46c 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java
@@ -23,7 +23,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 // TODO: implement optional length parameter
 
@@ -52,7 +51,7 @@ public class ByteSubstring implements DrillSimpleFunc {
   @Output VarBinaryHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java
index 9c0703e..b510678 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.DateHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @SuppressWarnings("unused")
 @FunctionTemplate(names = {"castDATE", "to_date"}, scope = FunctionTemplate.FunctionScope.SIMPLE, nulls= NullHandling.NULL_IF_NULL)
@@ -36,7 +35,7 @@ public class CastBigIntDate implements DrillSimpleFunc {
   DateHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java
index ea92f3c..dbd814b 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.TimeStampHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @SuppressWarnings("unused")
 @FunctionTemplate(name = "castTIMESTAMP", scope = FunctionTemplate.FunctionScope.SIMPLE, nulls= NullHandling.NULL_IF_NULL)
@@ -36,7 +35,7 @@ public class CastBigIntTimeStamp implements DrillSimpleFunc {
   TimeStampHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStampTZ.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStampTZ.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStampTZ.java
index 014a4d4..d8ba5f4 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStampTZ.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStampTZ.java
@@ -25,7 +25,6 @@ import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.annotations.Workspace;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.TimeStampTZHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @SuppressWarnings("unused")
 @FunctionTemplate(names = {"castTIMESTAMPTZ", "to_timestamptz"}, scope = FunctionTemplate.FunctionScope.SIMPLE, nulls= NullHandling.NULL_IF_NULL)
@@ -39,7 +38,7 @@ public class CastBigIntTimeStampTZ implements DrillSimpleFunc {
     TimeStampTZHolder out;
 
     @Override
-    public void setup(RecordBatch incoming) {
+    public void setup() {
         org.joda.time.DateTime temp = new org.joda.time.DateTime();
 
         // Store the local time zone index

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java
index f4a4ed0..8962af8 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.IntHolder;
 import org.apache.drill.exec.expr.holders.TimeHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @SuppressWarnings("unused")
 @FunctionTemplate(names = {"castTIME", "to_time"}, scope = FunctionTemplate.FunctionScope.SIMPLE, nulls= NullHandling.NULL_IF_NULL)
@@ -36,7 +35,7 @@ public class CastIntTime implements DrillSimpleFunc {
     TimeHolder out;
 
     @Override
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java
index 5280717..99976a7 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java
@@ -32,7 +32,6 @@ import org.apache.drill.exec.expr.annotations.Workspace;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.Var16CharHolder;
 import org.apache.drill.exec.expr.holders.VarCharHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @SuppressWarnings("unused")
 @FunctionTemplate(names = {"castVAR16CHAR", "to_var16char", "to_string"}, scope = FunctionTemplate.FunctionScope.SIMPLE, nulls= NullHandling.NULL_IF_NULL)
@@ -44,7 +43,7 @@ public class CastVarCharVar16Char implements DrillSimpleFunc {
   @Inject DrillBuf buffer;
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     charset = java.nio.charset.Charset.forName("UTF-16");
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java
index 62e9d70..38342c6 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java
@@ -23,7 +23,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.VarCharHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 /**
  * Evaluate a substring expression for a given UTF-8 value; specifying the start
@@ -56,7 +55,7 @@ public class CharSubstring implements DrillSimpleFunc {
   @Output VarCharHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java
index cc4be89..d43ba2a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java
@@ -37,7 +37,6 @@ import org.apache.drill.exec.expr.holders.TimeHolder;
 import org.apache.drill.exec.expr.holders.TimeStampHolder;
 import org.apache.drill.exec.expr.holders.TimeStampTZHolder;
 import org.apache.drill.exec.expr.holders.VarCharHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class DateTypeFunctions {
 
@@ -53,7 +52,7 @@ public class DateTypeFunctions {
         @Param  BigIntHolder inputMilliSeconds;
         @Output IntervalHolder out;
 
-        public void setup(RecordBatch b) {
+        public void setup() {
         }
 
         public void eval() {
@@ -75,7 +74,7 @@ public class DateTypeFunctions {
         @Param  BigIntHolder inputMonths;
         @Output IntervalYearHolder out;
 
-        public void setup(RecordBatch b) {
+        public void setup() {
         }
 
         public void eval() {
@@ -95,7 +94,7 @@ public class DateTypeFunctions {
         @Param  BigIntHolder inputMillis;
         @Output IntervalDayHolder out;
 
-        public void setup(RecordBatch b) {
+        public void setup() {
         }
 
         public void eval() {
@@ -116,7 +115,7 @@ public class DateTypeFunctions {
         @Param  BigIntHolder inputDays;
         @Output DateHolder   out;
 
-        public void setup(RecordBatch b) {
+        public void setup() {
         }
 
         public void eval() {
@@ -143,7 +142,7 @@ public class DateTypeFunctions {
         @Param  BigIntHolder inputMilliSeconds;
         @Output TimeStampHolder out;
 
-        public void setup(RecordBatch b) {
+        public void setup() {
         }
 
         public void eval() {
@@ -171,7 +170,7 @@ public class DateTypeFunctions {
         @Param  VarCharHolder inputTimeZone;
         @Output TimeStampTZHolder out;
 
-        public void setup(RecordBatch b) {
+        public void setup() {
         }
 
         public void eval() {
@@ -199,7 +198,7 @@ public class DateTypeFunctions {
         @Param  BigIntHolder inputMilliSeconds;
         @Output TimeHolder   out;
 
-        public void setup(RecordBatch b) {
+        public void setup() {
         }
 
         public void eval() {
@@ -215,13 +214,13 @@ public class DateTypeFunctions {
         @Workspace long queryStartDate;
         @Output DateHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
 
-            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
-            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
-            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
-            queryStartDate = (new org.joda.time.DateMidnight(now.getYear(), now.getMonthOfYear(), now.getDayOfMonth(), timeZone)).
-                withZoneRetainFields(org.joda.time.DateTimeZone.UTC).getMillis();
+//            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
+//            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
+//            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
+//            queryStartDate = (new org.joda.time.DateMidnight(now.getYear(), now.getMonthOfYear(), now.getDayOfMonth(), timeZone)).
+//                withZoneRetainFields(org.joda.time.DateTimeZone.UTC).getMillis();
         }
 
         public void eval() {
@@ -236,13 +235,13 @@ public class DateTypeFunctions {
         @Workspace int timezoneIndex;
         @Output TimeStampTZHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
 
-            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
-            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
-            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
-            queryStartDate = now.getMillis();
-            timezoneIndex = org.apache.drill.exec.expr.fn.impl.DateUtility.getIndex(now.getZone().toString());
+//            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
+//            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
+//            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
+//            queryStartDate = now.getMillis();
+//            timezoneIndex = org.apache.drill.exec.expr.fn.impl.DateUtility.getIndex(now.getZone().toString());
         }
 
         public void eval() {
@@ -257,7 +256,7 @@ public class DateTypeFunctions {
         @Workspace int timezoneIndex;
         @Output TimeStampTZHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
             org.joda.time.DateTime now = new org.joda.time.DateTime();
             timezoneIndex = org.apache.drill.exec.expr.fn.impl.DateUtility.getIndex(now.getZone().toString());
         }
@@ -274,7 +273,7 @@ public class DateTypeFunctions {
         @Inject DrillBuf buffer;
         @Output VarCharHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
         }
 
         public void eval() {
@@ -292,10 +291,10 @@ public class DateTypeFunctions {
         @Workspace long queryStartDate;
         @Output TimeStampHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
 
-            org.joda.time.DateTime now = (new org.joda.time.DateTime(incoming.getContext().getQueryStartTime())).withZoneRetainFields(org.joda.time.DateTimeZone.UTC);
-            queryStartDate = now.getMillis();
+//            org.joda.time.DateTime now = (new org.joda.time.DateTime(incoming.getContext().getQueryStartTime())).withZoneRetainFields(org.joda.time.DateTimeZone.UTC);
+//            queryStartDate = now.getMillis();
         }
 
         public void eval() {
@@ -308,15 +307,15 @@ public class DateTypeFunctions {
         @Workspace int queryStartTime;
         @Output TimeHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
 
-            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
-            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
-            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
-            queryStartTime= (int) ((now.getHourOfDay() * org.apache.drill.exec.expr.fn.impl.DateUtility.hoursToMillis) +
-                                   (now.getMinuteOfHour() * org.apache.drill.exec.expr.fn.impl.DateUtility.minutesToMillis) +
-                                   (now.getSecondOfMinute() * org.apache.drill.exec.expr.fn.impl.DateUtility.secondsToMillis) +
-                                   (now.getMillisOfSecond()));
+//            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
+//            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
+//            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
+//            queryStartTime= (int) ((now.getHourOfDay() * org.apache.drill.exec.expr.fn.impl.DateUtility.hoursToMillis) +
+//                                   (now.getMinuteOfHour() * org.apache.drill.exec.expr.fn.impl.DateUtility.minutesToMillis) +
+//                                   (now.getSecondOfMinute() * org.apache.drill.exec.expr.fn.impl.DateUtility.secondsToMillis) +
+//                                   (now.getMillisOfSecond()));
         }
 
         public void eval() {
@@ -331,7 +330,7 @@ public class DateTypeFunctions {
     @Param TimeHolder right;
     @Output TimeStampHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
         }
 
         public void eval() {
@@ -346,7 +345,7 @@ public class DateTypeFunctions {
         @Param DateHolder left;
         @Output TimeStampHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
         }
 
         public void eval() {
@@ -365,7 +364,7 @@ public class DateTypeFunctions {
         @Param DateHolder right;
         @Output BigIntHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
         }
 
         public void eval() {
@@ -382,7 +381,7 @@ public class DateTypeFunctions {
         @Param TimeStampHolder right;
         @Output IntervalHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
         }
 
         public void eval() {
@@ -401,11 +400,11 @@ public class DateTypeFunctions {
         @Workspace long queryStartDate;
         @Output IntervalHolder out;
 
-        public void setup(RecordBatch incoming) {
-            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
-            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
-            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
-            queryStartDate = (new org.joda.time.DateMidnight(now.getYear(), now.getMonthOfYear(), now.getDayOfMonth(), timeZone)).getMillis();
+        public void setup() {
+//            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
+//            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
+//            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
+//            queryStartDate = (new org.joda.time.DateMidnight(now.getYear(), now.getMonthOfYear(), now.getDayOfMonth(), timeZone)).getMillis();
         }
 
         public void eval() {
@@ -424,7 +423,7 @@ public class DateTypeFunctions {
         @Param DateHolder right;
         @Output IntervalHolder out;
 
-        public void setup(RecordBatch incoming) {
+        public void setup() {
         }
 
         public void eval() {
@@ -443,11 +442,11 @@ public class DateTypeFunctions {
         @Workspace long queryStartDate;
         @Output IntervalHolder out;
 
-        public void setup(RecordBatch incoming) {
-            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
-            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
-            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
-            queryStartDate = (new org.joda.time.DateMidnight(now.getYear(), now.getMonthOfYear(), now.getDayOfMonth(), timeZone)).getMillis();
+        public void setup() {
+//            int timeZoneIndex = incoming.getContext().getRootFragmentTimeZone();
+//            org.joda.time.DateTimeZone timeZone = org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
+//            org.joda.time.DateTime now = new org.joda.time.DateTime(incoming.getContext().getQueryStartTime(), timeZone);
+//            queryStartDate = (new org.joda.time.DateMidnight(now.getYear(), now.getMonthOfYear(), now.getDayOfMonth(), timeZone)).getMillis();
         }
 
         public void eval() {
@@ -465,7 +464,7 @@ public class DateTypeFunctions {
         @Output TimeHolder out;
 
         @Override
-        public void setup(RecordBatch incoming) {
+        public void setup() {
         }
 
         @Override
@@ -480,8 +479,8 @@ public class DateTypeFunctions {
       @Workspace long queryStartDate;
 
       @Override
-      public void setup(RecordBatch incoming) {
-         queryStartDate = incoming.getContext().getQueryStartTime();
+      public void setup() {
+//         queryStartDate = incoming.getContext().getQueryStartTime();
       }
 
       @Override
@@ -498,7 +497,7 @@ public class DateTypeFunctions {
       @Workspace org.joda.time.format.DateTimeFormatter formatter;
 
       @Override
-      public void setup(RecordBatch incoming) {
+      public void setup() {
          formatter = org.joda.time.format.DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
       }
 
@@ -519,7 +518,7 @@ public class DateTypeFunctions {
       @Workspace org.joda.time.format.DateTimeFormatter formatter;
 
       @Override
-      public void setup(RecordBatch incoming) {
+      public void setup() {
          String pattern = org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(inputPattern.start, inputPattern.end, inputPattern.buffer);
          formatter = org.joda.time.format.DateTimeFormat.forPattern(pattern);
       }

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashFunctions.java
index 9658fdb..46fed6f 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashFunctions.java
@@ -54,7 +54,6 @@ import org.apache.drill.exec.expr.holders.TimeStampTZHolder;
 import org.apache.drill.exec.expr.holders.Var16CharHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
 import org.apache.drill.exec.expr.holders.VarCharHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class HashFunctions {
 
@@ -64,7 +63,7 @@ public class HashFunctions {
     @Param NullableFloat4Holder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -82,7 +81,7 @@ public class HashFunctions {
     @Param Float4Holder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -96,7 +95,7 @@ public class HashFunctions {
     @Param NullableFloat8Holder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -114,7 +113,7 @@ public class HashFunctions {
     @Param Float8Holder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -128,7 +127,7 @@ public class HashFunctions {
     @Param NullableVarBinaryHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -146,7 +145,7 @@ public class HashFunctions {
     @Param NullableVarCharHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -164,7 +163,7 @@ public class HashFunctions {
     @Param NullableVar16CharHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -182,7 +181,7 @@ public class HashFunctions {
     @Param NullableBigIntHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -200,7 +199,7 @@ public class HashFunctions {
     @Param NullableIntHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -219,7 +218,7 @@ public class HashFunctions {
     @Param VarBinaryHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -233,7 +232,7 @@ public class HashFunctions {
     @Param VarCharHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -247,7 +246,7 @@ public class HashFunctions {
     @Param Var16CharHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -261,7 +260,7 @@ public class HashFunctions {
     @Param BigIntHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -274,7 +273,7 @@ public class HashFunctions {
     @Param IntHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -287,7 +286,7 @@ public class HashFunctions {
     @Param  DateHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -300,7 +299,7 @@ public class HashFunctions {
     @Param  NullableDateHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -317,7 +316,7 @@ public class HashFunctions {
     @Param  TimeStampHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -330,7 +329,7 @@ public class HashFunctions {
     @Param  NullableTimeStampHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -347,7 +346,7 @@ public class HashFunctions {
     @Param  TimeHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -360,7 +359,7 @@ public class HashFunctions {
     @Param  NullableTimeHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -377,7 +376,7 @@ public class HashFunctions {
     @Param  TimeStampTZHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -390,7 +389,7 @@ public class HashFunctions {
     @Param  NullableTimeStampTZHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -407,7 +406,7 @@ public class HashFunctions {
     @Param  Decimal9Holder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -420,7 +419,7 @@ public class HashFunctions {
     @Param  NullableDecimal9Holder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -437,7 +436,7 @@ public class HashFunctions {
     @Param  Decimal18Holder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -450,7 +449,7 @@ public class HashFunctions {
     @Param  NullableDecimal18Holder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -467,7 +466,7 @@ public class HashFunctions {
     @Param  Decimal28SparseHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -485,7 +484,7 @@ public class HashFunctions {
     @Param  NullableDecimal28SparseHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -506,7 +505,7 @@ public class HashFunctions {
     @Param  Decimal38SparseHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -524,7 +523,7 @@ public class HashFunctions {
     @Param  NullableDecimal38SparseHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -546,7 +545,7 @@ public class HashFunctions {
     @Param NullableBitHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -564,7 +563,7 @@ public class HashFunctions {
     @Param BitHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java
index 12a2205..15c3c01 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.NullableBitHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class IsFalse {
 
@@ -34,7 +33,7 @@ public class IsFalse {
     @Param NullableBitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       if (in.isSet == 0) {
@@ -51,7 +50,7 @@ public class IsFalse {
     @Param BitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       out.value = in.value == 0 ? 1 : 0;

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java
index 5b8a9bd..32c91e0 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.NullableBitHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class IsNotFalse {
 
@@ -34,7 +33,7 @@ public class IsNotFalse {
     @Param NullableBitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       if (in.isSet == 0) {
@@ -51,7 +50,7 @@ public class IsNotFalse {
     @Param BitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       out.value = in.value;

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java
index 1485e8c..2d5e7ef 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.NullableBitHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class IsNotTrue {
 
@@ -34,7 +33,7 @@ public class IsNotTrue {
     @Param NullableBitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       if (in.isSet == 0) {
@@ -51,7 +50,7 @@ public class IsNotTrue {
     @Param BitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       out.value = in.value == 0 ? 1 : 0;

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java
index 2fd65e3..9a1f6e8 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.NullableBitHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class IsTrue {
 
@@ -34,7 +33,7 @@ public class IsTrue {
     @Param NullableBitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       if (in.isSet == 0) {
@@ -51,7 +50,7 @@ public class IsTrue {
     @Param BitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       out.value = in.value;

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java
index da9009c..bbd9e37 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java
@@ -22,7 +22,6 @@ import org.apache.drill.exec.expr.DrillSimpleFunc;
 import org.apache.drill.exec.expr.annotations.FunctionTemplate;
 import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
-import org.apache.drill.exec.record.RecordBatch;
 import org.apache.drill.exec.vector.complex.reader.FieldReader;
 import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter;
 
@@ -57,7 +56,7 @@ public class Mappify {
     @Inject DrillBuf buffer;
     @Output ComplexWriter writer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java
index 39288b4..0d5cd92 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java
@@ -29,7 +29,6 @@ import org.apache.drill.exec.expr.annotations.Workspace;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.Float8Holder;
 import org.apache.drill.exec.expr.holders.VarCharHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class MathFunctions{
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MathFunctions.class);
@@ -42,7 +41,7 @@ public class MathFunctions{
     @Param BigIntHolder input;
     @Output BigIntHolder out;
 
-    public void setup(RecordBatch b){}
+    public void setup(){}
 
     public void eval(){
       out.value = -input.value;
@@ -58,7 +57,7 @@ public class MathFunctions{
     @Param Float8Holder b;
     @Output  Float8Holder out;
 
-    public void setup(RecordBatch b){}
+    public void setup(){}
 
     public void eval(){
       out.value = java.lang.Math.pow(a.value, b.value);
@@ -71,7 +70,7 @@ public class MathFunctions{
   public static class Random implements DrillSimpleFunc{
     @Output  Float8Holder out;
 
-    public void setup(RecordBatch b){}
+    public void setup(){}
 
     public void eval(){
       out.value = java.lang.Math.random();
@@ -87,7 +86,7 @@ public class MathFunctions{
     @Workspace int decimalDigits;
     @Output Float8Holder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
       byte[] buf = new byte[right.end - right.start];
       right.buffer.getBytes(right.start, buf, 0, right.end - right.start);
       inputFormat = new DecimalFormat(new String(buf));
@@ -115,7 +114,7 @@ public class MathFunctions{
 
     @Output Float8Holder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java
index db33247..a45f9dd 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java
@@ -25,7 +25,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.NullableBitHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class Not {
 
@@ -35,7 +34,7 @@ public class Not {
     @Param NullableBitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       out.value = (in.value == 0 ? 1 : 0);
@@ -48,7 +47,7 @@ public class Not {
     @Param BitHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       out.value = in.value == 0 ? 1 : 0;

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleCastFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleCastFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleCastFunctions.java
index 8a09cff..2c04afc 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleCastFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleCastFunctions.java
@@ -29,7 +29,6 @@ import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.VarCharHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class SimpleCastFunctions {
   public static final byte[] TRUE = {'t','r','u','e'};
@@ -42,7 +41,7 @@ public class SimpleCastFunctions {
     @Param VarCharHolder in;
     @Output BitHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
 
     }
 
@@ -68,7 +67,7 @@ public class SimpleCastFunctions {
     @Output VarCharHolder out;
     @Inject DrillBuf buffer;
 
-    public void setup(RecordBatch b) {}
+    public void setup() {}
 
     public void eval() {
       byte[] outB = in.value == 1 ? org.apache.drill.exec.expr.fn.impl.SimpleCastFunctions.TRUE : org.apache.drill.exec.expr.fn.impl.SimpleCastFunctions.FALSE;

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java
index f7f0e91..1bfcb45 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java
@@ -32,13 +32,10 @@ import org.apache.drill.exec.expr.holders.RepeatedBitHolder;
 import org.apache.drill.exec.expr.holders.RepeatedFloat4Holder;
 import org.apache.drill.exec.expr.holders.RepeatedFloat8Holder;
 import org.apache.drill.exec.expr.holders.RepeatedIntHolder;
-import org.apache.drill.exec.expr.holders.RepeatedListHolder;
-import org.apache.drill.exec.expr.holders.RepeatedMapHolder;
 import org.apache.drill.exec.expr.holders.RepeatedTinyIntHolder;
 import org.apache.drill.exec.expr.holders.RepeatedVarCharHolder;
 import org.apache.drill.exec.expr.holders.TinyIntHolder;
 import org.apache.drill.exec.expr.holders.VarCharHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class SimpleRepeatedFunctions {
 
@@ -57,7 +54,7 @@ public class SimpleRepeatedFunctions {
     @Output
     IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -72,7 +69,7 @@ public class SimpleRepeatedFunctions {
     @Output
     IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -90,7 +87,7 @@ public class SimpleRepeatedFunctions {
     @Output
     IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -107,7 +104,7 @@ public class SimpleRepeatedFunctions {
     @Output
     IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -124,7 +121,7 @@ public class SimpleRepeatedFunctions {
     @Output
     IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -140,7 +137,7 @@ public class SimpleRepeatedFunctions {
     @Output
     IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -156,7 +153,7 @@ public class SimpleRepeatedFunctions {
     @Output
     IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -170,7 +167,7 @@ public class SimpleRepeatedFunctions {
     @Param RepeatedIntHolder input;
     @Output IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -184,7 +181,7 @@ public class SimpleRepeatedFunctions {
     @Param RepeatedVarCharHolder input;
     @Output IntHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -199,7 +196,7 @@ public class SimpleRepeatedFunctions {
     @Param BigIntHolder targetValue;
     @Output BitHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -221,7 +218,7 @@ public class SimpleRepeatedFunctions {
     @Param IntHolder targetValue;
     @Output BitHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -243,7 +240,7 @@ public class SimpleRepeatedFunctions {
     @Param TinyIntHolder targetValue;
     @Output BitHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -264,7 +261,7 @@ public class SimpleRepeatedFunctions {
     @Param BitHolder targetValue;
     @Output BitHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -286,7 +283,7 @@ public class SimpleRepeatedFunctions {
     @Param Float4Holder targetValue;
     @Output BitHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -308,7 +305,7 @@ public class SimpleRepeatedFunctions {
     @Param Float8Holder targetValue;
     @Output BitHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
     }
 
     public void eval() {
@@ -332,7 +329,7 @@ public class SimpleRepeatedFunctions {
 
     @Output BitHolder out;
 
-    public void setup(RecordBatch b) {
+    public void setup() {
       currVal = new VarCharHolder();
     }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java
index a3bc1de..a84a776 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java
@@ -38,7 +38,6 @@ import org.apache.drill.exec.expr.holders.IntHolder;
 import org.apache.drill.exec.expr.holders.NullableVarCharHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
 import org.apache.drill.exec.expr.holders.VarCharHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 public class StringFunctions{
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(StringFunctions.class);
@@ -57,7 +56,7 @@ public class StringFunctions{
     @Output BitHolder out;
     @Workspace java.util.regex.Matcher matcher;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
       matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.RegexpUtil.sqlToRegexLike( //
           org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(pattern.start,  pattern.end,  pattern.buffer))).matcher("");
     }
@@ -78,7 +77,7 @@ public class StringFunctions{
     @Output BitHolder out;
     @Workspace java.util.regex.Matcher matcher;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
       matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.RegexpUtil.sqlToRegexLike( //
           org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(pattern.start,  pattern.end,  pattern.buffer),
           org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(escape.start,  escape.end,  escape.buffer))).matcher("");
@@ -98,7 +97,7 @@ public class StringFunctions{
     @Output BitHolder out;
     @Workspace java.util.regex.Matcher matcher;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
 
       matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.RegexpUtil.sqlToRegexSimilar(org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(pattern.start,  pattern.end,  pattern.buffer))).matcher("");
     }
@@ -118,7 +117,7 @@ public class StringFunctions{
     @Output BitHolder out;
     @Workspace java.util.regex.Matcher matcher;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
 
       matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.RegexpUtil.sqlToRegexSimilar(
           org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(pattern.start,  pattern.end,  pattern.buffer),
@@ -145,7 +144,7 @@ public class StringFunctions{
     @Workspace java.util.regex.Matcher matcher;
     @Output VarCharHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
       matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(pattern.start,  pattern.end,  pattern.buffer)).matcher("");
     }
 
@@ -167,7 +166,7 @@ public class StringFunctions{
     @Param  VarCharHolder input;
     @Output BigIntHolder out;
 
-    public void setup(RecordBatch incoming) {}
+    public void setup() {}
 
     public void eval() {
       out.value = org.apache.drill.exec.expr.fn.impl.StringFunctionUtil.getUTF8CharLength(input.buffer, input.start, input.end);
@@ -180,7 +179,7 @@ public class StringFunctions{
     @Param  VarBinaryHolder input;
     @Output BigIntHolder out;
 
-    public void setup(RecordBatch incoming) {}
+    public void setup() {}
 
     public void eval() {
       out.value = org.apache.drill.exec.expr.fn.impl.StringFunctionUtil.getUTF8CharLength(input.buffer, input.start, input.end);
@@ -193,7 +192,7 @@ public class StringFunctions{
     @Param  VarCharHolder input;
     @Output BigIntHolder out;
 
-    public void setup(RecordBatch incoming) {}
+    public void setup() {}
 
     public void eval() {
       out.value = input.end - input.start;
@@ -206,7 +205,7 @@ public class StringFunctions{
     @Param  VarCharHolder input;
     @Output BigIntHolder out;
 
-    public void setup(RecordBatch incoming) {}
+    public void setup() {}
 
     public void eval() {
       out.value = (input.end - input.start) * 8;
@@ -229,7 +228,7 @@ public class StringFunctions{
 
     @Output BigIntHolder out;
 
-    public void setup(RecordBatch incoming) {}
+    public void setup() {}
 
     public void eval() {
       //Do string match.
@@ -254,7 +253,7 @@ public class StringFunctions{
 
     @Output BigIntHolder out;
 
-    public void setup(RecordBatch incoming) {}
+    public void setup() {}
 
     public void eval() {
       //Do string match.
@@ -280,7 +279,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Inject DrillBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -311,7 +310,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Inject DrillBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -346,7 +345,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Workspace ByteBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
 
     }
 
@@ -385,7 +384,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Workspace ByteBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -423,7 +422,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Workspace ByteBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -458,7 +457,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Workspace ByteBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -500,7 +499,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Inject DrillBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -522,7 +521,7 @@ public class StringFunctions{
     @Inject DrillBuf buffer;
     @Output VarCharHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
       buffer = buffer.reallocIfNeeded(8000);
     }
 
@@ -588,7 +587,7 @@ public class StringFunctions{
 
     @Output VarCharHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -661,7 +660,7 @@ public class StringFunctions{
 
     @Output VarCharHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -734,7 +733,7 @@ public class StringFunctions{
 
     @Output VarCharHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -767,7 +766,7 @@ public class StringFunctions{
 
     @Output VarCharHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -802,7 +801,7 @@ public class StringFunctions{
 
     @Output VarCharHolder out;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -873,7 +872,7 @@ public class StringFunctions{
     @Inject DrillBuf buffer;
 
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -900,7 +899,7 @@ public class StringFunctions{
     @Inject DrillBuf buffer;
 
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -929,7 +928,7 @@ public class StringFunctions{
     @Inject DrillBuf buffer;
 
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -958,7 +957,7 @@ public class StringFunctions{
     @Inject DrillBuf buffer;
 
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -988,7 +987,7 @@ public class StringFunctions{
     @Param  VarCharHolder in;
     @Output VarBinaryHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       out.buffer = in.buffer;
@@ -1008,7 +1007,7 @@ public class StringFunctions{
     @Workspace Charset charset;
     @Inject DrillBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
       charset = java.nio.charset.Charset.forName("UTF-8");
     }
 
@@ -1032,7 +1031,7 @@ public class StringFunctions{
     @Param  VarCharHolder in;
     @Output IntHolder out;
 
-    public void setup(RecordBatch incoming) { }
+    public void setup() { }
 
     public void eval() {
       out.value = in.buffer.getByte(in.start);
@@ -1049,7 +1048,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Inject DrillBuf buf;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
       buf = buf.reallocIfNeeded(1);
     }
 
@@ -1072,7 +1071,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Inject DrillBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {
@@ -1099,7 +1098,7 @@ public class StringFunctions{
     @Workspace Charset inCharset;
     @Inject DrillBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
       inCharset = java.nio.charset.Charset.forName(org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(enc.start, enc.end, enc.buffer));
     }
 
@@ -1127,7 +1126,7 @@ public class StringFunctions{
     @Output VarCharHolder out;
     @Inject DrillBuf buffer;
 
-    public void setup(RecordBatch incoming) {
+    public void setup() {
     }
 
     public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java
index dc0f6b7..765270d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java
@@ -25,7 +25,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromBIGINT_BE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class BigIntBEConvertFrom implements DrillSimpleFunc {
@@ -34,7 +33,7 @@ public class BigIntBEConvertFrom implements DrillSimpleFunc {
   @Output BigIntHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java
index e645f4b..07ab89a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java
@@ -29,7 +29,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_toBIGINT_BE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class BigIntBEConvertTo implements DrillSimpleFunc {
@@ -39,7 +38,7 @@ public class BigIntBEConvertTo implements DrillSimpleFunc {
   @Inject DrillBuf buffer;
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     buffer = buffer.reallocIfNeeded(8);
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java
index 2f303c4..2726dd9 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java
@@ -26,7 +26,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromBIGINT", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class BigIntConvertFrom implements DrillSimpleFunc {
@@ -35,7 +34,7 @@ public class BigIntConvertFrom implements DrillSimpleFunc {
   @Output BigIntHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java
index 57dd2d5..67442c9 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java
@@ -30,7 +30,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_toBIGINT", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class BigIntConvertTo implements DrillSimpleFunc {
@@ -41,7 +40,7 @@ public class BigIntConvertTo implements DrillSimpleFunc {
 
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     buffer = buffer.reallocIfNeeded(8);
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java
index f398071..ab7d46c 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java
@@ -25,7 +25,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromBIGINT_HADOOPV", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class BigIntVLongConvertFrom implements DrillSimpleFunc {
@@ -34,7 +33,7 @@ public class BigIntVLongConvertFrom implements DrillSimpleFunc {
   @Output BigIntHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java
index c647d3a..fbc5b66 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java
@@ -29,7 +29,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BigIntHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_toBIGINT_HADOOPV", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class BigIntVLongConvertTo implements DrillSimpleFunc {
@@ -40,7 +39,7 @@ public class BigIntVLongConvertTo implements DrillSimpleFunc {
 
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     /* Hadoop Variable length integer (represented in the same way as a long)
      * occupies between 1-9 bytes.
      */

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java
index d03c951..23636d5 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java
@@ -26,7 +26,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromBOOLEAN_BYTE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class BooleanByteConvertFrom implements DrillSimpleFunc {
@@ -35,7 +34,7 @@ public class BooleanByteConvertFrom implements DrillSimpleFunc {
   @Output BitHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java
index 43db659..f33be93 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java
@@ -30,7 +30,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.BitHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_toBOOLEAN_BYTE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class BooleanByteConvertTo implements DrillSimpleFunc {
@@ -41,7 +40,7 @@ public class BooleanByteConvertTo implements DrillSimpleFunc {
 
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     buffer = buffer.reallocIfNeeded(1);
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java
index c511935..8b88670 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java
@@ -25,7 +25,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.DateHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromDATE_EPOCH_BE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class DateEpochBEConvertFrom implements DrillSimpleFunc {
@@ -34,7 +33,7 @@ public class DateEpochBEConvertFrom implements DrillSimpleFunc {
   @Output DateHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java
index 12136f3..8a9e101 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java
@@ -29,7 +29,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.DateHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_toDATE_EPOCH_BE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class DateEpochBEConvertTo implements DrillSimpleFunc {
@@ -40,7 +39,7 @@ public class DateEpochBEConvertTo implements DrillSimpleFunc {
 
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     buffer = buffer.reallocIfNeeded(8);
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java
index fa1c063..eb7ec28 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java
@@ -26,7 +26,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.DateHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromDATE_EPOCH", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class DateEpochConvertFrom implements DrillSimpleFunc {
@@ -35,7 +34,7 @@ public class DateEpochConvertFrom implements DrillSimpleFunc {
   @Output DateHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java
index bddb621..cbaf732 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java
@@ -30,7 +30,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.DateHolder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_toDATE_EPOCH", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class DateEpochConvertTo implements DrillSimpleFunc {
@@ -41,7 +40,7 @@ public class DateEpochConvertTo implements DrillSimpleFunc {
 
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     buffer = buffer.reallocIfNeeded(8);
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java
index 011c7a6..91bde9d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java
@@ -26,7 +26,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.Float8Holder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromDOUBLE_BE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class DoubleBEConvertFrom implements DrillSimpleFunc {
@@ -35,7 +34,7 @@ public class DoubleBEConvertFrom implements DrillSimpleFunc {
   @Output Float8Holder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java
index 948f8b0..1e856d1 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java
@@ -27,7 +27,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.Float8Holder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 import javax.inject.Inject;
 
@@ -40,7 +39,7 @@ public class DoubleBEConvertTo implements DrillSimpleFunc {
 
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     buffer = buffer.reallocIfNeeded(8);
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java
index 1fa9166..727ccbc 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java
@@ -26,7 +26,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.Float8Holder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromDOUBLE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class DoubleConvertFrom implements DrillSimpleFunc {
@@ -35,7 +34,7 @@ public class DoubleConvertFrom implements DrillSimpleFunc {
   @Output Float8Holder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java
index 29f625e..92a1ee2 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java
@@ -30,7 +30,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.Float8Holder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_toDOUBLE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class DoubleConvertTo implements DrillSimpleFunc {
@@ -41,7 +40,7 @@ public class DoubleConvertTo implements DrillSimpleFunc {
 
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     buffer = buffer.reallocIfNeeded(8);
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java
index 50e0cbb..57a5506 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.FunctionTemplate.FunctionScope;
 import org.apache.drill.exec.expr.annotations.FunctionTemplate.NullHandling;
 import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 /**
  * This and {@link DummyConvertTo} class merely act as a placeholder so that Optiq
@@ -36,7 +35,7 @@ public class DummyConvertFrom implements DrillSimpleFunc {
   @Output VarBinaryHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() { }

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java
index c2ac3ef..efee025 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java
@@ -24,7 +24,6 @@ import org.apache.drill.exec.expr.annotations.FunctionTemplate.FunctionScope;
 import org.apache.drill.exec.expr.annotations.FunctionTemplate.NullHandling;
 import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 /**
  * This and {@link DummyConvertFrom} class merely act as a placeholder so that Optiq
@@ -36,7 +35,7 @@ public class DummyConvertTo implements DrillSimpleFunc {
   @Output VarBinaryHolder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() { }

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java
index d4e3115..7b0dfd4 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java
@@ -23,8 +23,6 @@ import org.apache.drill.exec.expr.annotations.FunctionTemplate;
 import org.apache.drill.exec.expr.annotations.FunctionTemplate.FunctionScope;
 import org.apache.drill.exec.expr.annotations.FunctionTemplate.NullHandling;
 import org.apache.drill.exec.expr.annotations.Output;
-import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 import org.apache.drill.exec.vector.complex.writer.BaseWriter;
 
 /**
@@ -37,7 +35,7 @@ public class DummyFlatten implements DrillSimpleFunc {
   @Output BaseWriter.ComplexWriter out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() { }

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java
index 095588c..a4cb627 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java
@@ -26,7 +26,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.Float4Holder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromFLOAT_BE", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class FloatBEConvertFrom implements DrillSimpleFunc {
@@ -35,7 +34,7 @@ public class FloatBEConvertFrom implements DrillSimpleFunc {
   @Output Float4Holder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java
index 4b6d51d..e978e3f 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java
@@ -27,7 +27,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.Float4Holder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 import javax.inject.Inject;
 
@@ -40,7 +39,7 @@ public class FloatBEConvertTo implements DrillSimpleFunc {
 
 
   @Override
-  public void setup(RecordBatch incoming) {
+  public void setup() {
     buffer = buffer.reallocIfNeeded(4);
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bff7b9ef/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java
index 4ed553b..04ffa86 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java
@@ -26,7 +26,6 @@ import org.apache.drill.exec.expr.annotations.Output;
 import org.apache.drill.exec.expr.annotations.Param;
 import org.apache.drill.exec.expr.holders.Float4Holder;
 import org.apache.drill.exec.expr.holders.VarBinaryHolder;
-import org.apache.drill.exec.record.RecordBatch;
 
 @FunctionTemplate(name = "convert_fromFLOAT", scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
 public class FloatConvertFrom implements DrillSimpleFunc {
@@ -35,7 +34,7 @@ public class FloatConvertFrom implements DrillSimpleFunc {
   @Output Float4Holder out;
 
   @Override
-  public void setup(RecordBatch incoming) { }
+  public void setup() { }
 
   @Override
   public void eval() {


Mime
View raw message