DRILL-7294: Regenerate protobufs
diff --git a/protocol/src/main/java/org/apache/drill/common/types/DataMode.java b/protocol/src/main/java/org/apache/drill/common/types/DataMode.java
deleted file mode 100644
index f1187d3..0000000
--- a/protocol/src/main/java/org/apache/drill/common/types/DataMode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.common.types;
-
-public enum DataMode implements com.dyuproject.protostuff.EnumLite<DataMode>
-{
-    OPTIONAL(0),
-    REQUIRED(1),
-    REPEATED(2);
-    
-    public final int number;
-    
-    private DataMode (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static DataMode valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return OPTIONAL;
-            case 1: return REQUIRED;
-            case 2: return REPEATED;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/common/types/MajorType.java b/protocol/src/main/java/org/apache/drill/common/types/MajorType.java
deleted file mode 100644
index 104af34..0000000
--- a/protocol/src/main/java/org/apache/drill/common/types/MajorType.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.common.types;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class MajorType implements Externalizable, Message<MajorType>, Schema<MajorType>
-{
-
-    public static Schema<MajorType> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static MajorType getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final MajorType DEFAULT_INSTANCE = new MajorType();
-
-    
-    private MinorType minorType;
-    private DataMode mode;
-    private int width;
-    private int precision;
-    private int scale;
-    private int timeZone;
-    private List<MinorType> subType;
-
-    public MajorType()
-    {
-        
-    }
-
-    // getters and setters
-
-    // minorType
-
-    public MinorType getMinorType()
-    {
-        return minorType == null ? MinorType.LATE : minorType;
-    }
-
-    public MajorType setMinorType(MinorType minorType)
-    {
-        this.minorType = minorType;
-        return this;
-    }
-
-    // mode
-
-    public DataMode getMode()
-    {
-        return mode == null ? DataMode.OPTIONAL : mode;
-    }
-
-    public MajorType setMode(DataMode mode)
-    {
-        this.mode = mode;
-        return this;
-    }
-
-    // width
-
-    public int getWidth()
-    {
-        return width;
-    }
-
-    public MajorType setWidth(int width)
-    {
-        this.width = width;
-        return this;
-    }
-
-    // precision
-
-    public int getPrecision()
-    {
-        return precision;
-    }
-
-    public MajorType setPrecision(int precision)
-    {
-        this.precision = precision;
-        return this;
-    }
-
-    // scale
-
-    public int getScale()
-    {
-        return scale;
-    }
-
-    public MajorType setScale(int scale)
-    {
-        this.scale = scale;
-        return this;
-    }
-
-    // timeZone
-
-    public int getTimeZone()
-    {
-        return timeZone;
-    }
-
-    public MajorType setTimeZone(int timeZone)
-    {
-        this.timeZone = timeZone;
-        return this;
-    }
-
-    // subType
-
-    public List<MinorType> getSubTypeList()
-    {
-        return subType;
-    }
-
-    public MajorType setSubTypeList(List<MinorType> subType)
-    {
-        this.subType = subType;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<MajorType> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public MajorType newMessage()
-    {
-        return new MajorType();
-    }
-
-    public Class<MajorType> typeClass()
-    {
-        return MajorType.class;
-    }
-
-    public String messageName()
-    {
-        return MajorType.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return MajorType.class.getName();
-    }
-
-    public boolean isInitialized(MajorType message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, MajorType message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.minorType = MinorType.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.mode = DataMode.valueOf(input.readEnum());
-                    break;
-                case 3:
-                    message.width = input.readInt32();
-                    break;
-                case 4:
-                    message.precision = input.readInt32();
-                    break;
-                case 5:
-                    message.scale = input.readInt32();
-                    break;
-                case 6:
-                    message.timeZone = input.readInt32();
-                    break;
-                case 7:
-                    if(message.subType == null)
-                        message.subType = new ArrayList<MinorType>();
-                    message.subType.add(MinorType.valueOf(input.readEnum()));
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, MajorType message) throws IOException
-    {
-        if(message.minorType != null)
-             output.writeEnum(1, message.minorType.number, false);
-
-        if(message.mode != null)
-             output.writeEnum(2, message.mode.number, false);
-
-        if(message.width != 0)
-            output.writeInt32(3, message.width, false);
-
-        if(message.precision != 0)
-            output.writeInt32(4, message.precision, false);
-
-        if(message.scale != 0)
-            output.writeInt32(5, message.scale, false);
-
-        if(message.timeZone != 0)
-            output.writeInt32(6, message.timeZone, false);
-
-        if(message.subType != null)
-        {
-            for(MinorType subType : message.subType)
-            {
-                if(subType != null)
-                    output.writeEnum(7, subType.number, true);
-            }
-        }
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "minorType";
-            case 2: return "mode";
-            case 3: return "width";
-            case 4: return "precision";
-            case 5: return "scale";
-            case 6: return "timeZone";
-            case 7: return "subType";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("minorType", 1);
-        __fieldMap.put("mode", 2);
-        __fieldMap.put("width", 3);
-        __fieldMap.put("precision", 4);
-        __fieldMap.put("scale", 5);
-        __fieldMap.put("timeZone", 6);
-        __fieldMap.put("subType", 7);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/common/types/MinorType.java b/protocol/src/main/java/org/apache/drill/common/types/MinorType.java
deleted file mode 100644
index b26cb08..0000000
--- a/protocol/src/main/java/org/apache/drill/common/types/MinorType.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.common.types;
-
-public enum MinorType implements com.dyuproject.protostuff.EnumLite<MinorType>
-{
-    LATE(0),
-    MAP(1),
-    TINYINT(3),
-    SMALLINT(4),
-    INT(5),
-    BIGINT(6),
-    DECIMAL9(7),
-    DECIMAL18(8),
-    DECIMAL28SPARSE(9),
-    DECIMAL38SPARSE(10),
-    MONEY(11),
-    DATE(12),
-    TIME(13),
-    TIMETZ(14),
-    TIMESTAMPTZ(15),
-    TIMESTAMP(16),
-    INTERVAL(17),
-    FLOAT4(18),
-    FLOAT8(19),
-    BIT(20),
-    FIXEDCHAR(21),
-    FIXED16CHAR(22),
-    FIXEDBINARY(23),
-    VARCHAR(24),
-    VAR16CHAR(25),
-    VARBINARY(26),
-    UINT1(29),
-    UINT2(30),
-    UINT4(31),
-    UINT8(32),
-    DECIMAL28DENSE(33),
-    DECIMAL38DENSE(34),
-    NULL(37),
-    INTERVALYEAR(38),
-    INTERVALDAY(39),
-    LIST(40),
-    GENERIC_OBJECT(41),
-    UNION(42),
-    VARDECIMAL(43);
-    
-    public final int number;
-    
-    private MinorType (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static MinorType valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return LATE;
-            case 1: return MAP;
-            case 3: return TINYINT;
-            case 4: return SMALLINT;
-            case 5: return INT;
-            case 6: return BIGINT;
-            case 7: return DECIMAL9;
-            case 8: return DECIMAL18;
-            case 9: return DECIMAL28SPARSE;
-            case 10: return DECIMAL38SPARSE;
-            case 11: return MONEY;
-            case 12: return DATE;
-            case 13: return TIME;
-            case 14: return TIMETZ;
-            case 15: return TIMESTAMPTZ;
-            case 16: return TIMESTAMP;
-            case 17: return INTERVAL;
-            case 18: return FLOAT4;
-            case 19: return FLOAT8;
-            case 20: return BIT;
-            case 21: return FIXEDCHAR;
-            case 22: return FIXED16CHAR;
-            case 23: return FIXEDBINARY;
-            case 24: return VARCHAR;
-            case 25: return VAR16CHAR;
-            case 26: return VARBINARY;
-            case 29: return UINT1;
-            case 30: return UINT2;
-            case 31: return UINT4;
-            case 32: return UINT8;
-            case 33: return DECIMAL28DENSE;
-            case 34: return DECIMAL38DENSE;
-            case 37: return NULL;
-            case 38: return INTERVALYEAR;
-            case 39: return INTERVALDAY;
-            case 40: return LIST;
-            case 41: return GENERIC_OBJECT;
-            case 42: return UNION;
-            case 43: return VARDECIMAL;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/common/types/SchemaTypeProtos.java b/protocol/src/main/java/org/apache/drill/common/types/SchemaTypeProtos.java
index ae30e40..71e6e51 100644
--- a/protocol/src/main/java/org/apache/drill/common/types/SchemaTypeProtos.java
+++ b/protocol/src/main/java/org/apache/drill/common/types/SchemaTypeProtos.java
@@ -31,9 +31,9 @@
         public static final org.apache.drill.common.types.SchemaTypeProtos.MajorType.BuilderSchema MERGE =
             new org.apache.drill.common.types.SchemaTypeProtos.MajorType.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.common.types.TypeProtos.MajorType>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.common.types.TypeProtos.MajorType>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.common.types.TypeProtos.MajorType message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.common.types.TypeProtos.MajorType message) throws java.io.IOException
             {
                 if(message.hasMinorType())
                     output.writeEnum(1, message.getMinorType().getNumber(), false);
@@ -75,12 +75,12 @@
                 return org.apache.drill.common.types.TypeProtos.MajorType.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.common.types.TypeProtos.MajorType message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.common.types.TypeProtos.MajorType message) throws java.io.IOException {}
             public org.apache.drill.common.types.TypeProtos.MajorType newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.common.types.TypeProtos.MajorType.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.common.types.TypeProtos.MajorType.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.common.types.TypeProtos.MajorType.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.common.types.TypeProtos.MajorType.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -143,7 +143,7 @@
                 return org.apache.drill.common.types.TypeProtos.MajorType.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.common.types.TypeProtos.MajorType.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.common.types.TypeProtos.MajorType.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitControl.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitControl.java
index 4754195..23b2638 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitControl.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitControl.java
@@ -31,9 +31,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.BitControlHandshake.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.BitControlHandshake.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.BitControlHandshake>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.BitControlHandshake>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.BitControlHandshake message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.BitControlHandshake message) throws java.io.IOException
             {
                 if(message.hasRpcVersion())
                     output.writeInt32(1, message.getRpcVersion(), false);
@@ -70,12 +70,12 @@
                 return org.apache.drill.exec.proto.BitControl.BitControlHandshake.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.BitControlHandshake message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.BitControlHandshake message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.BitControlHandshake newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.BitControlHandshake.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.BitControlHandshake.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.BitControlHandshake.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.BitControlHandshake.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -130,7 +130,7 @@
                 return org.apache.drill.exec.proto.BitControl.BitControlHandshake.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.BitControlHandshake.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.BitControlHandshake.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -165,9 +165,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.BitStatus.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.BitStatus.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.BitStatus>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.BitStatus>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.BitStatus message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.BitStatus message) throws java.io.IOException
             {
                 for(org.apache.drill.exec.proto.BitControl.FragmentStatus fragmentStatus : message.getFragmentStatusList())
                     output.writeObject(1, fragmentStatus, org.apache.drill.exec.proto.SchemaBitControl.FragmentStatus.WRITE, true);
@@ -198,12 +198,12 @@
                 return org.apache.drill.exec.proto.BitControl.BitStatus.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.BitStatus message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.BitStatus message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.BitStatus newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.BitStatus.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.BitStatus.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.BitStatus.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.BitStatus.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -249,7 +249,7 @@
                 return org.apache.drill.exec.proto.BitControl.BitStatus.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.BitStatus.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.BitStatus.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -278,9 +278,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.FragmentStatus.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.FragmentStatus.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.FragmentStatus>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.FragmentStatus>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.FragmentStatus message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.FragmentStatus message) throws java.io.IOException
             {
                 if(message.hasProfile())
                     output.writeObject(1, message.getProfile(), org.apache.drill.exec.proto.SchemaUserBitShared.MinorFragmentProfile.WRITE, false);
@@ -314,12 +314,12 @@
                 return org.apache.drill.exec.proto.BitControl.FragmentStatus.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.FragmentStatus message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.FragmentStatus message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.FragmentStatus newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.FragmentStatus.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.FragmentStatus.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.FragmentStatus.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.FragmentStatus.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -369,7 +369,7 @@
                 return org.apache.drill.exec.proto.BitControl.FragmentStatus.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.FragmentStatus.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.FragmentStatus.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -400,9 +400,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.InitializeFragments.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.InitializeFragments.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.InitializeFragments>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.InitializeFragments>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.InitializeFragments message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.InitializeFragments message) throws java.io.IOException
             {
                 for(org.apache.drill.exec.proto.BitControl.PlanFragment fragment : message.getFragmentList())
                     output.writeObject(1, fragment, org.apache.drill.exec.proto.SchemaBitControl.PlanFragment.WRITE, true);
@@ -433,12 +433,12 @@
                 return org.apache.drill.exec.proto.BitControl.InitializeFragments.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.InitializeFragments message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.InitializeFragments message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.InitializeFragments newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.InitializeFragments.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.InitializeFragments.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.InitializeFragments.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.InitializeFragments.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -484,7 +484,7 @@
                 return org.apache.drill.exec.proto.BitControl.InitializeFragments.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.InitializeFragments.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.InitializeFragments.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -513,9 +513,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.CustomMessage.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.CustomMessage.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.CustomMessage>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.CustomMessage>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.CustomMessage message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.CustomMessage message) throws java.io.IOException
             {
                 if(message.hasType())
                     output.writeInt32(1, message.getType(), false);
@@ -548,12 +548,12 @@
                 return org.apache.drill.exec.proto.BitControl.CustomMessage.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.CustomMessage message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.CustomMessage message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.CustomMessage newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.CustomMessage.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.CustomMessage.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.CustomMessage.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.CustomMessage.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -601,7 +601,7 @@
                 return org.apache.drill.exec.proto.BitControl.CustomMessage.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.CustomMessage.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.CustomMessage.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -632,9 +632,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.PlanFragment.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.PlanFragment.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.PlanFragment>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.PlanFragment>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.PlanFragment message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.PlanFragment message) throws java.io.IOException
             {
                 if(message.hasHandle())
                     output.writeObject(1, message.getHandle(), org.apache.drill.exec.proto.SchemaExecProtos.FragmentHandle.WRITE, false);
@@ -698,12 +698,12 @@
                 return org.apache.drill.exec.proto.BitControl.PlanFragment.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.PlanFragment message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.PlanFragment message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.PlanFragment newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.PlanFragment.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.PlanFragment.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.PlanFragment.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.PlanFragment.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -796,7 +796,7 @@
                 return org.apache.drill.exec.proto.BitControl.PlanFragment.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.PlanFragment.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.PlanFragment.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -853,9 +853,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.Collector.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.Collector.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.Collector>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.Collector>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.Collector message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.Collector message) throws java.io.IOException
             {
                 if(message.hasOppositeMajorFragmentId())
                     output.writeInt32(1, message.getOppositeMajorFragmentId(), false);
@@ -891,12 +891,12 @@
                 return org.apache.drill.exec.proto.BitControl.Collector.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.Collector message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.Collector message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.Collector newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.Collector.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.Collector.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.Collector.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.Collector.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -950,7 +950,7 @@
                 return org.apache.drill.exec.proto.BitControl.Collector.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.Collector.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.Collector.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -985,9 +985,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.QueryContextInformation.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.QueryContextInformation.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.QueryContextInformation>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.QueryContextInformation>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.QueryContextInformation message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.QueryContextInformation message) throws java.io.IOException
             {
                 if(message.hasQueryStartTime())
                     output.writeInt64(1, message.getQueryStartTime(), false);
@@ -1023,12 +1023,12 @@
                 return org.apache.drill.exec.proto.BitControl.QueryContextInformation.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.QueryContextInformation message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.QueryContextInformation message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.QueryContextInformation newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1082,7 +1082,7 @@
                 return org.apache.drill.exec.proto.BitControl.QueryContextInformation.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1117,9 +1117,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.WorkQueueStatus.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.WorkQueueStatus.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.WorkQueueStatus>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.WorkQueueStatus>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.WorkQueueStatus message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.WorkQueueStatus message) throws java.io.IOException
             {
                 if(message.hasEndpoint())
                     output.writeObject(1, message.getEndpoint(), org.apache.drill.exec.proto.SchemaCoordinationProtos.DrillbitEndpoint.WRITE, false);
@@ -1154,12 +1154,12 @@
                 return org.apache.drill.exec.proto.BitControl.WorkQueueStatus.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.WorkQueueStatus message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.WorkQueueStatus message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.WorkQueueStatus newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.WorkQueueStatus.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.WorkQueueStatus.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.WorkQueueStatus.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.WorkQueueStatus.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1211,7 +1211,7 @@
                 return org.apache.drill.exec.proto.BitControl.WorkQueueStatus.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.WorkQueueStatus.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.WorkQueueStatus.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1244,9 +1244,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitControl.FinishedReceiver.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitControl.FinishedReceiver.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.FinishedReceiver>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.FinishedReceiver>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.FinishedReceiver message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.FinishedReceiver message) throws java.io.IOException
             {
                 if(message.hasReceiver())
                     output.writeObject(1, message.getReceiver(), org.apache.drill.exec.proto.SchemaExecProtos.FragmentHandle.WRITE, false);
@@ -1280,12 +1280,12 @@
                 return org.apache.drill.exec.proto.BitControl.FinishedReceiver.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.FinishedReceiver message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.FinishedReceiver message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitControl.FinishedReceiver newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitControl.FinishedReceiver.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitControl.FinishedReceiver.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitControl.FinishedReceiver.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitControl.FinishedReceiver.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1335,7 +1335,7 @@
                 return org.apache.drill.exec.proto.BitControl.FinishedReceiver.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitControl.FinishedReceiver.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitControl.FinishedReceiver.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitData.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitData.java
index ecf0f18..091c690 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitData.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitData.java
@@ -31,9 +31,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitData.BitClientHandshake.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitData.BitClientHandshake.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitData.BitClientHandshake>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitData.BitClientHandshake>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitData.BitClientHandshake message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitData.BitClientHandshake message) throws java.io.IOException
             {
                 if(message.hasRpcVersion())
                     output.writeInt32(1, message.getRpcVersion(), false);
@@ -65,12 +65,12 @@
                 return org.apache.drill.exec.proto.BitData.BitClientHandshake.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitData.BitClientHandshake message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitData.BitClientHandshake message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitData.BitClientHandshake newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitData.BitClientHandshake.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitData.BitClientHandshake.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitData.BitClientHandshake.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitData.BitClientHandshake.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -118,7 +118,7 @@
                 return org.apache.drill.exec.proto.BitData.BitClientHandshake.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitData.BitClientHandshake.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitData.BitClientHandshake.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -149,9 +149,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitData.BitServerHandshake.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitData.BitServerHandshake.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitData.BitServerHandshake>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitData.BitServerHandshake>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitData.BitServerHandshake message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitData.BitServerHandshake message) throws java.io.IOException
             {
                 if(message.hasRpcVersion())
                     output.writeInt32(1, message.getRpcVersion(), false);
@@ -183,12 +183,12 @@
                 return org.apache.drill.exec.proto.BitData.BitServerHandshake.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitData.BitServerHandshake message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitData.BitServerHandshake message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitData.BitServerHandshake newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitData.BitServerHandshake.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitData.BitServerHandshake.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitData.BitServerHandshake.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitData.BitServerHandshake.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -236,7 +236,7 @@
                 return org.apache.drill.exec.proto.BitData.BitServerHandshake.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitData.BitServerHandshake.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitData.BitServerHandshake.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -267,9 +267,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitData.FragmentRecordBatch.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitData.FragmentRecordBatch.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitData.FragmentRecordBatch>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitData.FragmentRecordBatch>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitData.FragmentRecordBatch message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitData.FragmentRecordBatch message) throws java.io.IOException
             {
                 if(message.hasQueryId())
                     output.writeObject(1, message.getQueryId(), org.apache.drill.exec.proto.SchemaUserBitShared.QueryId.WRITE, false);
@@ -313,12 +313,12 @@
                 return org.apache.drill.exec.proto.BitData.FragmentRecordBatch.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitData.FragmentRecordBatch message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitData.FragmentRecordBatch message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitData.FragmentRecordBatch newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitData.FragmentRecordBatch.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitData.FragmentRecordBatch.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitData.FragmentRecordBatch.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitData.FragmentRecordBatch.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -383,7 +383,7 @@
                 return org.apache.drill.exec.proto.BitData.FragmentRecordBatch.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitData.FragmentRecordBatch.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitData.FragmentRecordBatch.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -424,9 +424,9 @@
         public static final org.apache.drill.exec.proto.SchemaBitData.RuntimeFilterBDef.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaBitData.RuntimeFilterBDef.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitData.RuntimeFilterBDef>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitData.RuntimeFilterBDef>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitData.RuntimeFilterBDef message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitData.RuntimeFilterBDef message) throws java.io.IOException
             {
                 if(message.hasQueryId())
                     output.writeObject(1, message.getQueryId(), org.apache.drill.exec.proto.SchemaUserBitShared.QueryId.WRITE, false);
@@ -471,12 +471,12 @@
                 return org.apache.drill.exec.proto.BitData.RuntimeFilterBDef.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitData.RuntimeFilterBDef message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitData.RuntimeFilterBDef message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.BitData.RuntimeFilterBDef newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.BitData.RuntimeFilterBDef.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.BitData.RuntimeFilterBDef.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.BitData.RuntimeFilterBDef.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.BitData.RuntimeFilterBDef.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -543,7 +543,7 @@
                 return org.apache.drill.exec.proto.BitData.RuntimeFilterBDef.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.BitData.RuntimeFilterBDef.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.BitData.RuntimeFilterBDef.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaCoordinationProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaCoordinationProtos.java
index eb29ecc..fbf1116 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaCoordinationProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaCoordinationProtos.java
@@ -31,9 +31,9 @@
         public static final org.apache.drill.exec.proto.SchemaCoordinationProtos.DrillbitEndpoint.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaCoordinationProtos.DrillbitEndpoint.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint message) throws java.io.IOException
             {
                 if(message.hasAddress())
                     output.writeString(1, message.getAddress(), false);
@@ -78,12 +78,12 @@
                 return org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -150,7 +150,7 @@
                 return org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -193,9 +193,9 @@
         public static final org.apache.drill.exec.proto.SchemaCoordinationProtos.DrillServiceInstance.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaCoordinationProtos.DrillServiceInstance.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance message) throws java.io.IOException
             {
                 if(message.hasId())
                     output.writeString(1, message.getId(), false);
@@ -230,12 +230,12 @@
                 return org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -287,7 +287,7 @@
                 return org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstance.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -320,9 +320,9 @@
         public static final org.apache.drill.exec.proto.SchemaCoordinationProtos.Roles.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaCoordinationProtos.Roles.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.Roles>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.Roles>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.Roles message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.Roles message) throws java.io.IOException
             {
                 if(message.hasSqlQuery())
                     output.writeBool(1, message.getSqlQuery(), false);
@@ -360,12 +360,12 @@
                 return org.apache.drill.exec.proto.CoordinationProtos.Roles.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.Roles message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.Roles message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.CoordinationProtos.Roles newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -422,7 +422,7 @@
                 return org.apache.drill.exec.proto.CoordinationProtos.Roles.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaExecProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaExecProtos.java
index 5b450b6..865e556 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaExecProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaExecProtos.java
@@ -31,9 +31,9 @@
         public static final org.apache.drill.exec.proto.SchemaExecProtos.FragmentHandle.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaExecProtos.FragmentHandle.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.ExecProtos.FragmentHandle>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.ExecProtos.FragmentHandle>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.ExecProtos.FragmentHandle message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.ExecProtos.FragmentHandle message) throws java.io.IOException
             {
                 if(message.hasQueryId())
                     output.writeObject(1, message.getQueryId(), org.apache.drill.exec.proto.SchemaUserBitShared.QueryId.WRITE, false);
@@ -71,12 +71,12 @@
                 return org.apache.drill.exec.proto.ExecProtos.FragmentHandle.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.ExecProtos.FragmentHandle message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.ExecProtos.FragmentHandle message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.ExecProtos.FragmentHandle newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -132,7 +132,7 @@
                 return org.apache.drill.exec.proto.ExecProtos.FragmentHandle.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -167,9 +167,9 @@
         public static final org.apache.drill.exec.proto.SchemaExecProtos.ServerPreparedStatementState.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaExecProtos.ServerPreparedStatementState.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState message) throws java.io.IOException
             {
                 if(message.hasSqlQuery())
                     output.writeString(1, message.getSqlQuery(), false);
@@ -199,12 +199,12 @@
                 return org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -249,7 +249,7 @@
                 return org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.ExecProtos.ServerPreparedStatementState.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaGeneralRPCProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaGeneralRPCProtos.java
index e6383c8..6892096 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaGeneralRPCProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaGeneralRPCProtos.java
@@ -31,9 +31,9 @@
         public static final org.apache.drill.exec.proto.SchemaGeneralRPCProtos.Ack.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaGeneralRPCProtos.Ack.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.Ack>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.Ack>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.Ack message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.Ack message) throws java.io.IOException
             {
                 if(message.hasOk())
                     output.writeBool(1, message.getOk(), false);
@@ -63,12 +63,12 @@
                 return org.apache.drill.exec.proto.GeneralRPCProtos.Ack.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.Ack message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.Ack message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.GeneralRPCProtos.Ack newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.Ack.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.Ack.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.Ack.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.Ack.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -113,7 +113,7 @@
                 return org.apache.drill.exec.proto.GeneralRPCProtos.Ack.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.Ack.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.Ack.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -142,9 +142,9 @@
         public static final org.apache.drill.exec.proto.SchemaGeneralRPCProtos.RpcHeader.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaGeneralRPCProtos.RpcHeader.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader message) throws java.io.IOException
             {
                 if(message.hasMode())
                     output.writeEnum(1, message.getMode().getNumber(), false);
@@ -178,12 +178,12 @@
                 return org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -234,7 +234,7 @@
                 return org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -267,9 +267,9 @@
         public static final org.apache.drill.exec.proto.SchemaGeneralRPCProtos.CompleteRpcMessage.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaGeneralRPCProtos.CompleteRpcMessage.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage message) throws java.io.IOException
             {
                 if(message.hasHeader())
                     output.writeObject(1, message.getHeader(), org.apache.drill.exec.proto.SchemaGeneralRPCProtos.RpcHeader.WRITE, false);
@@ -306,12 +306,12 @@
                 return org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -363,7 +363,7 @@
                 return org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessage.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java
index 932872c..5aeff0f 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java
@@ -31,9 +31,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.UserCredentials.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.UserCredentials.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.UserCredentials>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.UserCredentials>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.UserCredentials message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.UserCredentials message) throws java.io.IOException
             {
                 if(message.hasUserName())
                     output.writeString(1, message.getUserName(), false);
@@ -63,12 +63,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.UserCredentials.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.UserCredentials message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.UserCredentials message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.UserCredentials newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -113,7 +113,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.UserCredentials.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -142,9 +142,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.QueryId.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.QueryId.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryId>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryId>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryId message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryId message) throws java.io.IOException
             {
                 if(message.hasPart1())
                     output.writeSFixed64(1, message.getPart1(), false);
@@ -176,12 +176,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryId.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryId message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryId message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.QueryId newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryId.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryId.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryId.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryId.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -229,7 +229,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryId.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryId.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryId.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -260,9 +260,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.DrillPBError.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.DrillPBError.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.DrillPBError>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.DrillPBError>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.DrillPBError message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.DrillPBError message) throws java.io.IOException
             {
                 if(message.hasErrorId())
                     output.writeString(1, message.getErrorId(), false);
@@ -305,12 +305,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.DrillPBError.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.DrillPBError message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.DrillPBError message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.DrillPBError newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.DrillPBError.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.DrillPBError.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.DrillPBError.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.DrillPBError.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -373,7 +373,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.DrillPBError.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.DrillPBError.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.DrillPBError.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -412,9 +412,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.ExceptionWrapper.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.ExceptionWrapper.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper message) throws java.io.IOException
             {
                 if(message.hasExceptionClass())
                     output.writeString(1, message.getExceptionClass(), false);
@@ -452,12 +452,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -513,7 +513,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -548,9 +548,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.StackTraceElementWrapper.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.StackTraceElementWrapper.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper message) throws java.io.IOException
             {
                 if(message.hasClassName())
                     output.writeString(1, message.getClassName(), false);
@@ -588,12 +588,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -650,7 +650,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -687,9 +687,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.ParsingError.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.ParsingError.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.ParsingError>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.ParsingError>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.ParsingError message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.ParsingError message) throws java.io.IOException
             {
                 if(message.hasStartColumn())
                     output.writeInt32(2, message.getStartColumn(), false);
@@ -725,12 +725,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.ParsingError.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.ParsingError message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.ParsingError message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.ParsingError newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.ParsingError.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.ParsingError.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.ParsingError.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.ParsingError.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -784,7 +784,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.ParsingError.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.ParsingError.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.ParsingError.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -819,9 +819,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.RecordBatchDef.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.RecordBatchDef.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.RecordBatchDef>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.RecordBatchDef>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef message) throws java.io.IOException
             {
                 if(message.hasRecordCount())
                     output.writeInt32(1, message.getRecordCount(), false);
@@ -858,12 +858,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.RecordBatchDef newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -918,7 +918,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -953,9 +953,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.NamePart.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.NamePart.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.NamePart>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.NamePart>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.NamePart message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.NamePart message) throws java.io.IOException
             {
                 if(message.hasType())
                     output.writeEnum(1, message.getType().getNumber(), false);
@@ -990,12 +990,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.NamePart.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.NamePart message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.NamePart message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.NamePart newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.NamePart.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.NamePart.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1047,7 +1047,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.NamePart.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1080,9 +1080,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.SerializedField.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.SerializedField.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.SerializedField>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.SerializedField>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.SerializedField message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.SerializedField message) throws java.io.IOException
             {
                 if(message.hasMajorType())
                     output.writeObject(1, message.getMajorType(), org.apache.drill.common.types.SchemaTypeProtos.MajorType.WRITE, false);
@@ -1125,12 +1125,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.SerializedField.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.SerializedField message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.SerializedField message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.SerializedField newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.SerializedField.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.SerializedField.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.SerializedField.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.SerializedField.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1193,7 +1193,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.SerializedField.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.SerializedField.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.SerializedField.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1232,9 +1232,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.NodeStatus.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.NodeStatus.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.NodeStatus>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.NodeStatus>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.NodeStatus message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.NodeStatus message) throws java.io.IOException
             {
                 if(message.hasNodeId())
                     output.writeInt32(1, message.getNodeId(), false);
@@ -1266,12 +1266,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.NodeStatus.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.NodeStatus message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.NodeStatus message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.NodeStatus newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.NodeStatus.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.NodeStatus.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.NodeStatus.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.NodeStatus.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1319,7 +1319,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.NodeStatus.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.NodeStatus.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.NodeStatus.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1350,9 +1350,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.QueryResult.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.QueryResult.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryResult>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryResult>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryResult message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryResult message) throws java.io.IOException
             {
                 if(message.hasQueryState())
                     output.writeEnum(1, message.getQueryState().getNumber(), false);
@@ -1388,12 +1388,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryResult.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryResult message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryResult message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.QueryResult newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryResult.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryResult.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryResult.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryResult.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1446,7 +1446,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryResult.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryResult.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryResult.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1479,9 +1479,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.QueryData.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.QueryData.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryData>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryData>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryData message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryData message) throws java.io.IOException
             {
                 if(message.hasQueryId())
                     output.writeObject(1, message.getQueryId(), org.apache.drill.exec.proto.SchemaUserBitShared.QueryId.WRITE, false);
@@ -1519,12 +1519,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryData.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryData message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryData message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.QueryData newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryData.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryData.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryData.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryData.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1580,7 +1580,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryData.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryData.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryData.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1615,9 +1615,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.QueryInfo.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.QueryInfo.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryInfo>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryInfo>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryInfo message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryInfo message) throws java.io.IOException
             {
                 if(message.hasQuery())
                     output.writeString(1, message.getQuery(), false);
@@ -1662,12 +1662,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryInfo.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryInfo message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryInfo message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.QueryInfo newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryInfo.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryInfo.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryInfo.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryInfo.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1734,7 +1734,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryInfo.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryInfo.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryInfo.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1777,9 +1777,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.QueryProfile.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.QueryProfile.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryProfile>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryProfile>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryProfile message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryProfile message) throws java.io.IOException
             {
                 if(message.hasId())
                     output.writeObject(1, message.getId(), org.apache.drill.exec.proto.SchemaUserBitShared.QueryId.WRITE, false);
@@ -1856,12 +1856,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryProfile.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryProfile message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryProfile message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.QueryProfile newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryProfile.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.QueryProfile.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryProfile.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.QueryProfile.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1975,7 +1975,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.QueryProfile.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryProfile.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.QueryProfile.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2048,9 +2048,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.MajorFragmentProfile.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.MajorFragmentProfile.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile message) throws java.io.IOException
             {
                 if(message.hasMajorFragmentId())
                     output.writeInt32(1, message.getMajorFragmentId(), false);
@@ -2083,12 +2083,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2137,7 +2137,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2168,9 +2168,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.MinorFragmentProfile.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.MinorFragmentProfile.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile message) throws java.io.IOException
             {
                 if(message.hasState())
                     output.writeEnum(1, message.getState().getNumber(), false);
@@ -2223,12 +2223,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2306,7 +2306,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2355,9 +2355,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.OperatorProfile.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.OperatorProfile.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.OperatorProfile>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.OperatorProfile>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.OperatorProfile message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.OperatorProfile message) throws java.io.IOException
             {
                 for(org.apache.drill.exec.proto.UserBitShared.StreamProfile inputProfile : message.getInputProfileList())
                     output.writeObject(1, inputProfile, org.apache.drill.exec.proto.SchemaUserBitShared.StreamProfile.WRITE, true);
@@ -2403,12 +2403,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.OperatorProfile.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.OperatorProfile message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.OperatorProfile message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.OperatorProfile newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.OperatorProfile.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.OperatorProfile.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.OperatorProfile.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.OperatorProfile.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2476,7 +2476,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.OperatorProfile.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.OperatorProfile.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.OperatorProfile.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2519,9 +2519,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.StreamProfile.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.StreamProfile.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.StreamProfile>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.StreamProfile>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.StreamProfile message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.StreamProfile message) throws java.io.IOException
             {
                 if(message.hasRecords())
                     output.writeInt64(1, message.getRecords(), false);
@@ -2555,12 +2555,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.StreamProfile.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.StreamProfile message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.StreamProfile message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.StreamProfile newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.StreamProfile.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.StreamProfile.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.StreamProfile.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.StreamProfile.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2611,7 +2611,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.StreamProfile.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.StreamProfile.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.StreamProfile.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2644,9 +2644,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.MetricValue.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.MetricValue.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MetricValue>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MetricValue>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MetricValue message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MetricValue message) throws java.io.IOException
             {
                 if(message.hasMetricId())
                     output.writeInt32(1, message.getMetricId(), false);
@@ -2680,12 +2680,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.MetricValue.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MetricValue message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MetricValue message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.MetricValue newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MetricValue.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.MetricValue.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MetricValue.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.MetricValue.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2736,7 +2736,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.MetricValue.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MetricValue.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.MetricValue.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2769,9 +2769,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.Registry.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.Registry.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.Registry>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.Registry>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.Registry message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.Registry message) throws java.io.IOException
             {
                 for(org.apache.drill.exec.proto.UserBitShared.Jar jar : message.getJarList())
                     output.writeObject(1, jar, org.apache.drill.exec.proto.SchemaUserBitShared.Jar.WRITE, true);
@@ -2802,12 +2802,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.Registry.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.Registry message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.Registry message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.Registry newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.Registry.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.Registry.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.Registry.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.Registry.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2853,7 +2853,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.Registry.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.Registry.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.Registry.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2882,9 +2882,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.Jar.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.Jar.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.Jar>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.Jar>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.Jar message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.Jar message) throws java.io.IOException
             {
                 if(message.hasName())
                     output.writeString(1, message.getName(), false);
@@ -2916,12 +2916,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.Jar.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.Jar message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.Jar message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.Jar newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.Jar.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.Jar.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.Jar.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.Jar.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2969,7 +2969,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.Jar.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.Jar.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.Jar.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3000,9 +3000,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserBitShared.SaslMessage.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserBitShared.SaslMessage.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.SaslMessage>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.SaslMessage>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.SaslMessage message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.SaslMessage message) throws java.io.IOException
             {
                 if(message.hasMechanism())
                     output.writeString(1, message.getMechanism(), false);
@@ -3037,12 +3037,12 @@
                 return org.apache.drill.exec.proto.UserBitShared.SaslMessage.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.SaslMessage message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.SaslMessage message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserBitShared.SaslMessage newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.SaslMessage.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserBitShared.SaslMessage.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.SaslMessage.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserBitShared.SaslMessage.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -3093,7 +3093,7 @@
                 return org.apache.drill.exec.proto.UserBitShared.SaslMessage.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.SaslMessage.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserBitShared.SaslMessage.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserProtos.java
index 7711c8f..543765d 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserProtos.java
@@ -31,9 +31,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.Property.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.Property.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.Property>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.Property>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.Property message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.Property message) throws java.io.IOException
             {
                 if(message.hasKey())
                     output.writeString(1, message.getKey(), false);
@@ -65,12 +65,12 @@
                 return org.apache.drill.exec.proto.UserProtos.Property.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.Property message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.Property message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.Property newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.Property.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.Property.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.Property.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.Property.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -118,7 +118,7 @@
                 return org.apache.drill.exec.proto.UserProtos.Property.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.Property.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.Property.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -149,9 +149,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.UserProperties.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.UserProperties.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.UserProperties>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.UserProperties>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.UserProperties message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.UserProperties message) throws java.io.IOException
             {
                 for(org.apache.drill.exec.proto.UserProtos.Property properties : message.getPropertiesList())
                     output.writeObject(1, properties, org.apache.drill.exec.proto.SchemaUserProtos.Property.WRITE, true);
@@ -182,12 +182,12 @@
                 return org.apache.drill.exec.proto.UserProtos.UserProperties.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.UserProperties message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.UserProperties message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.UserProperties newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.UserProperties.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.UserProperties.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.UserProperties.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.UserProperties.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -233,7 +233,7 @@
                 return org.apache.drill.exec.proto.UserProtos.UserProperties.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.UserProperties.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.UserProperties.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -262,9 +262,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.RpcEndpointInfos.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.RpcEndpointInfos.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos message) throws java.io.IOException
             {
                 if(message.hasName())
                     output.writeString(1, message.getName(), false);
@@ -308,12 +308,12 @@
                 return org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -379,7 +379,7 @@
                 return org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -422,9 +422,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.UserToBitHandshake.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.UserToBitHandshake.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.UserToBitHandshake>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.UserToBitHandshake>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.UserToBitHandshake message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.UserToBitHandshake message) throws java.io.IOException
             {
                 if(message.hasChannel())
                     output.writeEnum(1, message.getChannel().getNumber(), false);
@@ -473,12 +473,12 @@
                 return org.apache.drill.exec.proto.UserProtos.UserToBitHandshake.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.UserToBitHandshake message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.UserToBitHandshake message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.UserToBitHandshake newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.UserToBitHandshake.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.UserToBitHandshake.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.UserToBitHandshake.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.UserToBitHandshake.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -550,7 +550,7 @@
                 return org.apache.drill.exec.proto.UserProtos.UserToBitHandshake.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.UserToBitHandshake.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.UserToBitHandshake.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -595,9 +595,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.RequestResults.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.RequestResults.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RequestResults>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RequestResults>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RequestResults message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RequestResults message) throws java.io.IOException
             {
                 if(message.hasQueryId())
                     output.writeObject(1, message.getQueryId(), org.apache.drill.exec.proto.SchemaUserBitShared.QueryId.WRITE, false);
@@ -630,12 +630,12 @@
                 return org.apache.drill.exec.proto.UserProtos.RequestResults.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RequestResults message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RequestResults message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.RequestResults newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RequestResults.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RequestResults.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RequestResults.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RequestResults.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -684,7 +684,7 @@
                 return org.apache.drill.exec.proto.UserProtos.RequestResults.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RequestResults.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RequestResults.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -715,9 +715,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetQueryPlanFragments.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetQueryPlanFragments.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments message) throws java.io.IOException
             {
                 if(message.hasQuery())
                     output.writeString(1, message.getQuery(), false);
@@ -751,12 +751,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -807,7 +807,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetQueryPlanFragments.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -840,9 +840,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.QueryPlanFragments.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.QueryPlanFragments.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.QueryPlanFragments>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.QueryPlanFragments>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.QueryPlanFragments message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.QueryPlanFragments message) throws java.io.IOException
             {
                 if(message.hasStatus())
                     output.writeEnum(1, message.getStatus().getNumber(), false);
@@ -881,12 +881,12 @@
                 return org.apache.drill.exec.proto.UserProtos.QueryPlanFragments.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.QueryPlanFragments message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.QueryPlanFragments message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.QueryPlanFragments newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.QueryPlanFragments.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.QueryPlanFragments.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.QueryPlanFragments.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.QueryPlanFragments.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -943,7 +943,7 @@
                 return org.apache.drill.exec.proto.UserProtos.QueryPlanFragments.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.QueryPlanFragments.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.QueryPlanFragments.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -978,9 +978,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.BitToUserHandshake.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.BitToUserHandshake.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.BitToUserHandshake>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.BitToUserHandshake>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.BitToUserHandshake message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.BitToUserHandshake message) throws java.io.IOException
             {
                 if(message.hasRpcVersion())
                     output.writeInt32(2, message.getRpcVersion(), false);
@@ -1027,12 +1027,12 @@
                 return org.apache.drill.exec.proto.UserProtos.BitToUserHandshake.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.BitToUserHandshake message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.BitToUserHandshake message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.BitToUserHandshake newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.BitToUserHandshake.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.BitToUserHandshake.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.BitToUserHandshake.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.BitToUserHandshake.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1102,7 +1102,7 @@
                 return org.apache.drill.exec.proto.UserProtos.BitToUserHandshake.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.BitToUserHandshake.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.BitToUserHandshake.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1147,9 +1147,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.LikeFilter.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.LikeFilter.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.LikeFilter>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.LikeFilter>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.LikeFilter message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.LikeFilter message) throws java.io.IOException
             {
                 if(message.hasPattern())
                     output.writeString(1, message.getPattern(), false);
@@ -1181,12 +1181,12 @@
                 return org.apache.drill.exec.proto.UserProtos.LikeFilter.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.LikeFilter message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.LikeFilter message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.LikeFilter newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.LikeFilter.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.LikeFilter.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.LikeFilter.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.LikeFilter.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1234,7 +1234,7 @@
                 return org.apache.drill.exec.proto.UserProtos.LikeFilter.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.LikeFilter.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.LikeFilter.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1265,9 +1265,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetCatalogsReq.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetCatalogsReq.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetCatalogsReq>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetCatalogsReq>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetCatalogsReq message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetCatalogsReq message) throws java.io.IOException
             {
                 if(message.hasCatalogNameFilter())
                     output.writeObject(1, message.getCatalogNameFilter(), org.apache.drill.exec.proto.SchemaUserProtos.LikeFilter.WRITE, false);
@@ -1298,12 +1298,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetCatalogsReq.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetCatalogsReq message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetCatalogsReq message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetCatalogsReq newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetCatalogsReq.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetCatalogsReq.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetCatalogsReq.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetCatalogsReq.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1349,7 +1349,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetCatalogsReq.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetCatalogsReq.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetCatalogsReq.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1378,9 +1378,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.CatalogMetadata.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.CatalogMetadata.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CatalogMetadata>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CatalogMetadata>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CatalogMetadata message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CatalogMetadata message) throws java.io.IOException
             {
                 if(message.hasCatalogName())
                     output.writeString(1, message.getCatalogName(), false);
@@ -1414,12 +1414,12 @@
                 return org.apache.drill.exec.proto.UserProtos.CatalogMetadata.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CatalogMetadata message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CatalogMetadata message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.CatalogMetadata newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CatalogMetadata.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CatalogMetadata.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CatalogMetadata.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CatalogMetadata.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1470,7 +1470,7 @@
                 return org.apache.drill.exec.proto.UserProtos.CatalogMetadata.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CatalogMetadata.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CatalogMetadata.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1503,9 +1503,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetCatalogsResp.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetCatalogsResp.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetCatalogsResp>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetCatalogsResp>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetCatalogsResp message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetCatalogsResp message) throws java.io.IOException
             {
                 if(message.hasStatus())
                     output.writeEnum(1, message.getStatus().getNumber(), false);
@@ -1541,12 +1541,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetCatalogsResp.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetCatalogsResp message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetCatalogsResp message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetCatalogsResp newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetCatalogsResp.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetCatalogsResp.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetCatalogsResp.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetCatalogsResp.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1599,7 +1599,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetCatalogsResp.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetCatalogsResp.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetCatalogsResp.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1632,9 +1632,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetSchemasReq.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetSchemasReq.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetSchemasReq>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetSchemasReq>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetSchemasReq message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetSchemasReq message) throws java.io.IOException
             {
                 if(message.hasCatalogNameFilter())
                     output.writeObject(1, message.getCatalogNameFilter(), org.apache.drill.exec.proto.SchemaUserProtos.LikeFilter.WRITE, false);
@@ -1668,12 +1668,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetSchemasReq.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetSchemasReq message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetSchemasReq message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetSchemasReq newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetSchemasReq.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetSchemasReq.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetSchemasReq.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetSchemasReq.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1723,7 +1723,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetSchemasReq.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetSchemasReq.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetSchemasReq.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1754,9 +1754,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.SchemaMetadata.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.SchemaMetadata.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.SchemaMetadata>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.SchemaMetadata>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.SchemaMetadata message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.SchemaMetadata message) throws java.io.IOException
             {
                 if(message.hasCatalogName())
                     output.writeString(1, message.getCatalogName(), false);
@@ -1794,12 +1794,12 @@
                 return org.apache.drill.exec.proto.UserProtos.SchemaMetadata.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.SchemaMetadata message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.SchemaMetadata message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.SchemaMetadata newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.SchemaMetadata.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.SchemaMetadata.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.SchemaMetadata.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.SchemaMetadata.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1856,7 +1856,7 @@
                 return org.apache.drill.exec.proto.UserProtos.SchemaMetadata.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.SchemaMetadata.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.SchemaMetadata.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -1893,9 +1893,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetSchemasResp.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetSchemasResp.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetSchemasResp>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetSchemasResp>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetSchemasResp message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetSchemasResp message) throws java.io.IOException
             {
                 if(message.hasStatus())
                     output.writeEnum(1, message.getStatus().getNumber(), false);
@@ -1931,12 +1931,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetSchemasResp.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetSchemasResp message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetSchemasResp message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetSchemasResp newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetSchemasResp.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetSchemasResp.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetSchemasResp.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetSchemasResp.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -1989,7 +1989,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetSchemasResp.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetSchemasResp.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetSchemasResp.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2022,9 +2022,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetTablesReq.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetTablesReq.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetTablesReq>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetTablesReq>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetTablesReq message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetTablesReq message) throws java.io.IOException
             {
                 if(message.hasCatalogNameFilter())
                     output.writeObject(1, message.getCatalogNameFilter(), org.apache.drill.exec.proto.SchemaUserProtos.LikeFilter.WRITE, false);
@@ -2063,12 +2063,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetTablesReq.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetTablesReq message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetTablesReq message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetTablesReq newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetTablesReq.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetTablesReq.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetTablesReq.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetTablesReq.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2125,7 +2125,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetTablesReq.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetTablesReq.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetTablesReq.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2160,9 +2160,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.TableMetadata.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.TableMetadata.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.TableMetadata>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.TableMetadata>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.TableMetadata message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.TableMetadata message) throws java.io.IOException
             {
                 if(message.hasCatalogName())
                     output.writeString(1, message.getCatalogName(), false);
@@ -2198,12 +2198,12 @@
                 return org.apache.drill.exec.proto.UserProtos.TableMetadata.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.TableMetadata message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.TableMetadata message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.TableMetadata newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.TableMetadata.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.TableMetadata.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.TableMetadata.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.TableMetadata.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2257,7 +2257,7 @@
                 return org.apache.drill.exec.proto.UserProtos.TableMetadata.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.TableMetadata.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.TableMetadata.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2292,9 +2292,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetTablesResp.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetTablesResp.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetTablesResp>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetTablesResp>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetTablesResp message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetTablesResp message) throws java.io.IOException
             {
                 if(message.hasStatus())
                     output.writeEnum(1, message.getStatus().getNumber(), false);
@@ -2330,12 +2330,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetTablesResp.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetTablesResp message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetTablesResp message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetTablesResp newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetTablesResp.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetTablesResp.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetTablesResp.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetTablesResp.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2388,7 +2388,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetTablesResp.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetTablesResp.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetTablesResp.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2421,9 +2421,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetColumnsReq.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetColumnsReq.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetColumnsReq>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetColumnsReq>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetColumnsReq message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetColumnsReq message) throws java.io.IOException
             {
                 if(message.hasCatalogNameFilter())
                     output.writeObject(1, message.getCatalogNameFilter(), org.apache.drill.exec.proto.SchemaUserProtos.LikeFilter.WRITE, false);
@@ -2463,12 +2463,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetColumnsReq.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetColumnsReq message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetColumnsReq message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetColumnsReq newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetColumnsReq.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetColumnsReq.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetColumnsReq.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetColumnsReq.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2526,7 +2526,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetColumnsReq.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetColumnsReq.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetColumnsReq.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2561,9 +2561,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.ColumnMetadata.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.ColumnMetadata.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ColumnMetadata>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ColumnMetadata>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ColumnMetadata message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ColumnMetadata message) throws java.io.IOException
             {
                 if(message.hasCatalogName())
                     output.writeString(1, message.getCatalogName(), false);
@@ -2625,12 +2625,12 @@
                 return org.apache.drill.exec.proto.UserProtos.ColumnMetadata.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ColumnMetadata message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ColumnMetadata message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.ColumnMetadata newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ColumnMetadata.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ColumnMetadata.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ColumnMetadata.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ColumnMetadata.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2723,7 +2723,7 @@
                 return org.apache.drill.exec.proto.UserProtos.ColumnMetadata.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ColumnMetadata.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ColumnMetadata.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2784,9 +2784,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetColumnsResp.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetColumnsResp.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetColumnsResp>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetColumnsResp>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetColumnsResp message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetColumnsResp message) throws java.io.IOException
             {
                 if(message.hasStatus())
                     output.writeEnum(1, message.getStatus().getNumber(), false);
@@ -2822,12 +2822,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetColumnsResp.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetColumnsResp message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetColumnsResp message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetColumnsResp newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetColumnsResp.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetColumnsResp.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetColumnsResp.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetColumnsResp.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2880,7 +2880,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetColumnsResp.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetColumnsResp.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetColumnsResp.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -2913,9 +2913,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.CreatePreparedStatementReq.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.CreatePreparedStatementReq.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq message) throws java.io.IOException
             {
                 if(message.hasSqlQuery())
                     output.writeString(1, message.getSqlQuery(), false);
@@ -2945,12 +2945,12 @@
                 return org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -2995,7 +2995,7 @@
                 return org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementReq.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3024,9 +3024,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.ResultColumnMetadata.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.ResultColumnMetadata.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata message) throws java.io.IOException
             {
                 if(message.hasCatalogName())
                     output.writeString(1, message.getCatalogName(), false);
@@ -3092,12 +3092,12 @@
                 return org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -3196,7 +3196,7 @@
                 return org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3261,9 +3261,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.PreparedStatementHandle.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.PreparedStatementHandle.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle message) throws java.io.IOException
             {
                 if(message.hasServerInfo())
                     output.writeByteArray(1, message.getServerInfo().toByteArray(), false);
@@ -3294,12 +3294,12 @@
                 return org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -3344,7 +3344,7 @@
                 return org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.PreparedStatementHandle.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3373,9 +3373,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.PreparedStatement.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.PreparedStatement.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.PreparedStatement>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.PreparedStatement>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.PreparedStatement message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.PreparedStatement message) throws java.io.IOException
             {
                 for(org.apache.drill.exec.proto.UserProtos.ResultColumnMetadata columns : message.getColumnsList())
                     output.writeObject(1, columns, org.apache.drill.exec.proto.SchemaUserProtos.ResultColumnMetadata.WRITE, true);
@@ -3409,12 +3409,12 @@
                 return org.apache.drill.exec.proto.UserProtos.PreparedStatement.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.PreparedStatement message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.PreparedStatement message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.PreparedStatement newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.PreparedStatement.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.PreparedStatement.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.PreparedStatement.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.PreparedStatement.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -3464,7 +3464,7 @@
                 return org.apache.drill.exec.proto.UserProtos.PreparedStatement.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.PreparedStatement.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.PreparedStatement.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3495,9 +3495,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.CreatePreparedStatementResp.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.CreatePreparedStatementResp.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp message) throws java.io.IOException
             {
                 if(message.hasStatus())
                     output.writeEnum(1, message.getStatus().getNumber(), false);
@@ -3533,12 +3533,12 @@
                 return org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -3591,7 +3591,7 @@
                 return org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.CreatePreparedStatementResp.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3624,9 +3624,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetServerMetaReq.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetServerMetaReq.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetServerMetaReq>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetServerMetaReq>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetServerMetaReq message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetServerMetaReq message) throws java.io.IOException
             {
             }
             public boolean isInitialized(org.apache.drill.exec.proto.UserProtos.GetServerMetaReq message)
@@ -3654,12 +3654,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetServerMetaReq.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetServerMetaReq message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetServerMetaReq message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetServerMetaReq newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetServerMetaReq.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetServerMetaReq.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetServerMetaReq.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetServerMetaReq.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -3701,7 +3701,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetServerMetaReq.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetServerMetaReq.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetServerMetaReq.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3728,9 +3728,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.ConvertSupport.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.ConvertSupport.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ConvertSupport>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ConvertSupport>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ConvertSupport message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ConvertSupport message) throws java.io.IOException
             {
                 if(message.hasFrom())
                     output.writeEnum(1, message.getFrom().getNumber(), false);
@@ -3762,12 +3762,12 @@
                 return org.apache.drill.exec.proto.UserProtos.ConvertSupport.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ConvertSupport message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ConvertSupport message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.ConvertSupport newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ConvertSupport.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ConvertSupport.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ConvertSupport.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ConvertSupport.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -3815,7 +3815,7 @@
                 return org.apache.drill.exec.proto.UserProtos.ConvertSupport.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ConvertSupport.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ConvertSupport.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3846,9 +3846,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.GetServerMetaResp.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.GetServerMetaResp.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetServerMetaResp>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetServerMetaResp>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetServerMetaResp message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetServerMetaResp message) throws java.io.IOException
             {
                 if(message.hasStatus())
                     output.writeEnum(1, message.getStatus().getNumber(), false);
@@ -3884,12 +3884,12 @@
                 return org.apache.drill.exec.proto.UserProtos.GetServerMetaResp.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetServerMetaResp message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetServerMetaResp message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.GetServerMetaResp newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetServerMetaResp.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.GetServerMetaResp.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetServerMetaResp.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.GetServerMetaResp.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -3942,7 +3942,7 @@
                 return org.apache.drill.exec.proto.UserProtos.GetServerMetaResp.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetServerMetaResp.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.GetServerMetaResp.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -3975,9 +3975,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.ServerMeta.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.ServerMeta.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ServerMeta>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ServerMeta>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ServerMeta message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ServerMeta message) throws java.io.IOException
             {
                 if(message.hasAllTablesSelectable())
                     output.writeBool(1, message.getAllTablesSelectable(), false);
@@ -4106,12 +4106,12 @@
                 return org.apache.drill.exec.proto.UserProtos.ServerMeta.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ServerMeta message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ServerMeta message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.ServerMeta newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ServerMeta.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.ServerMeta.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ServerMeta.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.ServerMeta.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -4304,7 +4304,7 @@
                 return org.apache.drill.exec.proto.UserProtos.ServerMeta.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ServerMeta.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.ServerMeta.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
@@ -4431,9 +4431,9 @@
         public static final org.apache.drill.exec.proto.SchemaUserProtos.RunQuery.BuilderSchema MERGE =
             new org.apache.drill.exec.proto.SchemaUserProtos.RunQuery.BuilderSchema();
         
-        public static class MessageSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RunQuery>
+        public static class MessageSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RunQuery>
         {
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RunQuery message) throws java.io.IOException
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RunQuery message) throws java.io.IOException
             {
                 if(message.hasResultsMode())
                     output.writeEnum(1, message.getResultsMode().getNumber(), false);
@@ -4475,12 +4475,12 @@
                 return org.apache.drill.exec.proto.UserProtos.RunQuery.class.getName();
             }
             //unused
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RunQuery message) throws java.io.IOException {}
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RunQuery message) throws java.io.IOException {}
             public org.apache.drill.exec.proto.UserProtos.RunQuery newMessage() { return null; }
         }
-        public static class BuilderSchema implements com.dyuproject.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RunQuery.Builder>
+        public static class BuilderSchema implements io.protostuff.Schema<org.apache.drill.exec.proto.UserProtos.RunQuery.Builder>
         {
-            public void mergeFrom(com.dyuproject.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RunQuery.Builder builder) throws java.io.IOException
+            public void mergeFrom(io.protostuff.Input input, org.apache.drill.exec.proto.UserProtos.RunQuery.Builder builder) throws java.io.IOException
             {
                 for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
                 {
@@ -4542,7 +4542,7 @@
                 return org.apache.drill.exec.proto.UserProtos.RunQuery.class.getName();
             }
             //unused
-            public void writeTo(com.dyuproject.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RunQuery.Builder builder) throws java.io.IOException {}
+            public void writeTo(io.protostuff.Output output, org.apache.drill.exec.proto.UserProtos.RunQuery.Builder builder) throws java.io.IOException {}
         }
         public static java.lang.String getFieldName(int number)
         {
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Ack.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Ack.java
deleted file mode 100644
index 245aba1..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Ack.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class Ack implements Externalizable, Message<Ack>, Schema<Ack>
-{
-
-    public static Schema<Ack> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static Ack getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final Ack DEFAULT_INSTANCE = new Ack();
-
-    
-    private Boolean ok;
-
-    public Ack()
-    {
-        
-    }
-
-    // getters and setters
-
-    // ok
-
-    public Boolean getOk()
-    {
-        return ok;
-    }
-
-    public Ack setOk(Boolean ok)
-    {
-        this.ok = ok;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<Ack> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public Ack newMessage()
-    {
-        return new Ack();
-    }
-
-    public Class<Ack> typeClass()
-    {
-        return Ack.class;
-    }
-
-    public String messageName()
-    {
-        return Ack.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return Ack.class.getName();
-    }
-
-    public boolean isInitialized(Ack message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, Ack message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.ok = input.readBool();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, Ack message) throws IOException
-    {
-        if(message.ok != null)
-            output.writeBool(1, message.ok, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "ok";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("ok", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitClientHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitClientHandshake.java
deleted file mode 100644
index 3a27f70..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitClientHandshake.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class BitClientHandshake implements Externalizable, Message<BitClientHandshake>, Schema<BitClientHandshake>
-{
-
-    public static Schema<BitClientHandshake> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static BitClientHandshake getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final BitClientHandshake DEFAULT_INSTANCE = new BitClientHandshake();
-
-    
-    private int rpcVersion;
-    private RpcChannel channel;
-
-    public BitClientHandshake()
-    {
-        
-    }
-
-    // getters and setters
-
-    // rpcVersion
-
-    public int getRpcVersion()
-    {
-        return rpcVersion;
-    }
-
-    public BitClientHandshake setRpcVersion(int rpcVersion)
-    {
-        this.rpcVersion = rpcVersion;
-        return this;
-    }
-
-    // channel
-
-    public RpcChannel getChannel()
-    {
-        return channel == null ? RpcChannel.BIT_DATA : channel;
-    }
-
-    public BitClientHandshake setChannel(RpcChannel channel)
-    {
-        this.channel = channel;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<BitClientHandshake> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public BitClientHandshake newMessage()
-    {
-        return new BitClientHandshake();
-    }
-
-    public Class<BitClientHandshake> typeClass()
-    {
-        return BitClientHandshake.class;
-    }
-
-    public String messageName()
-    {
-        return BitClientHandshake.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return BitClientHandshake.class.getName();
-    }
-
-    public boolean isInitialized(BitClientHandshake message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, BitClientHandshake message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.rpcVersion = input.readInt32();
-                    break;
-                case 2:
-                    message.channel = RpcChannel.valueOf(input.readEnum());
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, BitClientHandshake message) throws IOException
-    {
-        if(message.rpcVersion != 0)
-            output.writeInt32(1, message.rpcVersion, false);
-
-        if(message.channel != null)
-             output.writeEnum(2, message.channel.number, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "rpcVersion";
-            case 2: return "channel";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("rpcVersion", 1);
-        __fieldMap.put("channel", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitControlHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitControlHandshake.java
deleted file mode 100644
index fa6ef82..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitControlHandshake.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class BitControlHandshake implements Externalizable, Message<BitControlHandshake>, Schema<BitControlHandshake>
-{
-
-    public static Schema<BitControlHandshake> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static BitControlHandshake getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final BitControlHandshake DEFAULT_INSTANCE = new BitControlHandshake();
-
-    
-    private int rpcVersion;
-    private RpcChannel channel;
-    private DrillbitEndpoint endpoint;
-    private List<String> authenticationMechanisms;
-
-    public BitControlHandshake()
-    {
-        
-    }
-
-    // getters and setters
-
-    // rpcVersion
-
-    public int getRpcVersion()
-    {
-        return rpcVersion;
-    }
-
-    public BitControlHandshake setRpcVersion(int rpcVersion)
-    {
-        this.rpcVersion = rpcVersion;
-        return this;
-    }
-
-    // channel
-
-    public RpcChannel getChannel()
-    {
-        return channel == null ? RpcChannel.BIT_CONTROL : channel;
-    }
-
-    public BitControlHandshake setChannel(RpcChannel channel)
-    {
-        this.channel = channel;
-        return this;
-    }
-
-    // endpoint
-
-    public DrillbitEndpoint getEndpoint()
-    {
-        return endpoint;
-    }
-
-    public BitControlHandshake setEndpoint(DrillbitEndpoint endpoint)
-    {
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    // authenticationMechanisms
-
-    public List<String> getAuthenticationMechanismsList()
-    {
-        return authenticationMechanisms;
-    }
-
-    public BitControlHandshake setAuthenticationMechanismsList(List<String> authenticationMechanisms)
-    {
-        this.authenticationMechanisms = authenticationMechanisms;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<BitControlHandshake> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public BitControlHandshake newMessage()
-    {
-        return new BitControlHandshake();
-    }
-
-    public Class<BitControlHandshake> typeClass()
-    {
-        return BitControlHandshake.class;
-    }
-
-    public String messageName()
-    {
-        return BitControlHandshake.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return BitControlHandshake.class.getName();
-    }
-
-    public boolean isInitialized(BitControlHandshake message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, BitControlHandshake message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.rpcVersion = input.readInt32();
-                    break;
-                case 2:
-                    message.channel = RpcChannel.valueOf(input.readEnum());
-                    break;
-                case 3:
-                    message.endpoint = input.mergeObject(message.endpoint, DrillbitEndpoint.getSchema());
-                    break;
-
-                case 4:
-                    if(message.authenticationMechanisms == null)
-                        message.authenticationMechanisms = new ArrayList<String>();
-                    message.authenticationMechanisms.add(input.readString());
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, BitControlHandshake message) throws IOException
-    {
-        if(message.rpcVersion != 0)
-            output.writeInt32(1, message.rpcVersion, false);
-
-        if(message.channel != null)
-             output.writeEnum(2, message.channel.number, false);
-
-        if(message.endpoint != null)
-             output.writeObject(3, message.endpoint, DrillbitEndpoint.getSchema(), false);
-
-
-        if(message.authenticationMechanisms != null)
-        {
-            for(String authenticationMechanisms : message.authenticationMechanisms)
-            {
-                if(authenticationMechanisms != null)
-                    output.writeString(4, authenticationMechanisms, true);
-            }
-        }
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "rpcVersion";
-            case 2: return "channel";
-            case 3: return "endpoint";
-            case 4: return "authenticationMechanisms";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("rpcVersion", 1);
-        __fieldMap.put("channel", 2);
-        __fieldMap.put("endpoint", 3);
-        __fieldMap.put("authenticationMechanisms", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitServerHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitServerHandshake.java
deleted file mode 100644
index b6a18c4..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitServerHandshake.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class BitServerHandshake implements Externalizable, Message<BitServerHandshake>, Schema<BitServerHandshake>
-{
-
-    public static Schema<BitServerHandshake> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static BitServerHandshake getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final BitServerHandshake DEFAULT_INSTANCE = new BitServerHandshake();
-
-    
-    private int rpcVersion;
-    private List<String> authenticationMechanisms;
-
-    public BitServerHandshake()
-    {
-        
-    }
-
-    // getters and setters
-
-    // rpcVersion
-
-    public int getRpcVersion()
-    {
-        return rpcVersion;
-    }
-
-    public BitServerHandshake setRpcVersion(int rpcVersion)
-    {
-        this.rpcVersion = rpcVersion;
-        return this;
-    }
-
-    // authenticationMechanisms
-
-    public List<String> getAuthenticationMechanismsList()
-    {
-        return authenticationMechanisms;
-    }
-
-    public BitServerHandshake setAuthenticationMechanismsList(List<String> authenticationMechanisms)
-    {
-        this.authenticationMechanisms = authenticationMechanisms;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<BitServerHandshake> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public BitServerHandshake newMessage()
-    {
-        return new BitServerHandshake();
-    }
-
-    public Class<BitServerHandshake> typeClass()
-    {
-        return BitServerHandshake.class;
-    }
-
-    public String messageName()
-    {
-        return BitServerHandshake.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return BitServerHandshake.class.getName();
-    }
-
-    public boolean isInitialized(BitServerHandshake message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, BitServerHandshake message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.rpcVersion = input.readInt32();
-                    break;
-                case 2:
-                    if(message.authenticationMechanisms == null)
-                        message.authenticationMechanisms = new ArrayList<String>();
-                    message.authenticationMechanisms.add(input.readString());
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, BitServerHandshake message) throws IOException
-    {
-        if(message.rpcVersion != 0)
-            output.writeInt32(1, message.rpcVersion, false);
-
-        if(message.authenticationMechanisms != null)
-        {
-            for(String authenticationMechanisms : message.authenticationMechanisms)
-            {
-                if(authenticationMechanisms != null)
-                    output.writeString(2, authenticationMechanisms, true);
-            }
-        }
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "rpcVersion";
-            case 2: return "authenticationMechanisms";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("rpcVersion", 1);
-        __fieldMap.put("authenticationMechanisms", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitStatus.java
deleted file mode 100644
index 0cba0c8..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitStatus.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class BitStatus implements Externalizable, Message<BitStatus>, Schema<BitStatus>
-{
-
-    public static Schema<BitStatus> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static BitStatus getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final BitStatus DEFAULT_INSTANCE = new BitStatus();
-
-    
-    private List<FragmentStatus> fragmentStatus;
-
-    public BitStatus()
-    {
-        
-    }
-
-    // getters and setters
-
-    // fragmentStatus
-
-    public List<FragmentStatus> getFragmentStatusList()
-    {
-        return fragmentStatus;
-    }
-
-    public BitStatus setFragmentStatusList(List<FragmentStatus> fragmentStatus)
-    {
-        this.fragmentStatus = fragmentStatus;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<BitStatus> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public BitStatus newMessage()
-    {
-        return new BitStatus();
-    }
-
-    public Class<BitStatus> typeClass()
-    {
-        return BitStatus.class;
-    }
-
-    public String messageName()
-    {
-        return BitStatus.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return BitStatus.class.getName();
-    }
-
-    public boolean isInitialized(BitStatus message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, BitStatus message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    if(message.fragmentStatus == null)
-                        message.fragmentStatus = new ArrayList<FragmentStatus>();
-                    message.fragmentStatus.add(input.mergeObject(null, FragmentStatus.getSchema()));
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, BitStatus message) throws IOException
-    {
-        if(message.fragmentStatus != null)
-        {
-            for(FragmentStatus fragmentStatus : message.fragmentStatus)
-            {
-                if(fragmentStatus != null)
-                    output.writeObject(1, fragmentStatus, FragmentStatus.getSchema(), true);
-            }
-        }
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "fragmentStatus";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("fragmentStatus", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitToUserHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitToUserHandshake.java
deleted file mode 100644
index 9c87c61..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitToUserHandshake.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class BitToUserHandshake implements Externalizable, Message<BitToUserHandshake>, Schema<BitToUserHandshake>
-{
-
-    public static Schema<BitToUserHandshake> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static BitToUserHandshake getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final BitToUserHandshake DEFAULT_INSTANCE = new BitToUserHandshake();
-
-    
-    private int rpcVersion;
-    private HandshakeStatus status;
-    private String errorId;
-    private String errorMessage;
-    private RpcEndpointInfos serverInfos;
-    private List<String> authenticationMechanisms;
-    private List<RpcType> supportedMethods;
-    private Boolean encrypted;
-    private int maxWrappedSize;
-
-    public BitToUserHandshake()
-    {
-        
-    }
-
-    // getters and setters
-
-    // rpcVersion
-
-    public int getRpcVersion()
-    {
-        return rpcVersion;
-    }
-
-    public BitToUserHandshake setRpcVersion(int rpcVersion)
-    {
-        this.rpcVersion = rpcVersion;
-        return this;
-    }
-
-    // status
-
-    public HandshakeStatus getStatus()
-    {
-        return status == null ? HandshakeStatus.SUCCESS : status;
-    }
-
-    public BitToUserHandshake setStatus(HandshakeStatus status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // errorId
-
-    public String getErrorId()
-    {
-        return errorId;
-    }
-
-    public BitToUserHandshake setErrorId(String errorId)
-    {
-        this.errorId = errorId;
-        return this;
-    }
-
-    // errorMessage
-
-    public String getErrorMessage()
-    {
-        return errorMessage;
-    }
-
-    public BitToUserHandshake setErrorMessage(String errorMessage)
-    {
-        this.errorMessage = errorMessage;
-        return this;
-    }
-
-    // serverInfos
-
-    public RpcEndpointInfos getServerInfos()
-    {
-        return serverInfos;
-    }
-
-    public BitToUserHandshake setServerInfos(RpcEndpointInfos serverInfos)
-    {
-        this.serverInfos = serverInfos;
-        return this;
-    }
-
-    // authenticationMechanisms
-
-    public List<String> getAuthenticationMechanismsList()
-    {
-        return authenticationMechanisms;
-    }
-
-    public BitToUserHandshake setAuthenticationMechanismsList(List<String> authenticationMechanisms)
-    {
-        this.authenticationMechanisms = authenticationMechanisms;
-        return this;
-    }
-
-    // supportedMethods
-
-    public List<RpcType> getSupportedMethodsList()
-    {
-        return supportedMethods;
-    }
-
-    public BitToUserHandshake setSupportedMethodsList(List<RpcType> supportedMethods)
-    {
-        this.supportedMethods = supportedMethods;
-        return this;
-    }
-
-    // encrypted
-
-    public Boolean getEncrypted()
-    {
-        return encrypted;
-    }
-
-    public BitToUserHandshake setEncrypted(Boolean encrypted)
-    {
-        this.encrypted = encrypted;
-        return this;
-    }
-
-    // maxWrappedSize
-
-    public int getMaxWrappedSize()
-    {
-        return maxWrappedSize;
-    }
-
-    public BitToUserHandshake setMaxWrappedSize(int maxWrappedSize)
-    {
-        this.maxWrappedSize = maxWrappedSize;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<BitToUserHandshake> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public BitToUserHandshake newMessage()
-    {
-        return new BitToUserHandshake();
-    }
-
-    public Class<BitToUserHandshake> typeClass()
-    {
-        return BitToUserHandshake.class;
-    }
-
-    public String messageName()
-    {
-        return BitToUserHandshake.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return BitToUserHandshake.class.getName();
-    }
-
-    public boolean isInitialized(BitToUserHandshake message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, BitToUserHandshake message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 2:
-                    message.rpcVersion = input.readInt32();
-                    break;
-                case 3:
-                    message.status = HandshakeStatus.valueOf(input.readEnum());
-                    break;
-                case 4:
-                    message.errorId = input.readString();
-                    break;
-                case 5:
-                    message.errorMessage = input.readString();
-                    break;
-                case 6:
-                    message.serverInfos = input.mergeObject(message.serverInfos, RpcEndpointInfos.getSchema());
-                    break;
-
-                case 7:
-                    if(message.authenticationMechanisms == null)
-                        message.authenticationMechanisms = new ArrayList<String>();
-                    message.authenticationMechanisms.add(input.readString());
-                    break;
-                case 8:
-                    if(message.supportedMethods == null)
-                        message.supportedMethods = new ArrayList<RpcType>();
-                    message.supportedMethods.add(RpcType.valueOf(input.readEnum()));
-                    break;
-                case 9:
-                    message.encrypted = input.readBool();
-                    break;
-                case 10:
-                    message.maxWrappedSize = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, BitToUserHandshake message) throws IOException
-    {
-        if(message.rpcVersion != 0)
-            output.writeInt32(2, message.rpcVersion, false);
-
-        if(message.status != null)
-             output.writeEnum(3, message.status.number, false);
-
-        if(message.errorId != null)
-            output.writeString(4, message.errorId, false);
-
-        if(message.errorMessage != null)
-            output.writeString(5, message.errorMessage, false);
-
-        if(message.serverInfos != null)
-             output.writeObject(6, message.serverInfos, RpcEndpointInfos.getSchema(), false);
-
-
-        if(message.authenticationMechanisms != null)
-        {
-            for(String authenticationMechanisms : message.authenticationMechanisms)
-            {
-                if(authenticationMechanisms != null)
-                    output.writeString(7, authenticationMechanisms, true);
-            }
-        }
-
-        if(message.supportedMethods != null)
-        {
-            for(RpcType supportedMethods : message.supportedMethods)
-            {
-                if(supportedMethods != null)
-                    output.writeEnum(8, supportedMethods.number, true);
-            }
-        }
-
-        if(message.encrypted != null)
-            output.writeBool(9, message.encrypted, false);
-
-        if(message.maxWrappedSize != 0)
-            output.writeInt32(10, message.maxWrappedSize, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 2: return "rpcVersion";
-            case 3: return "status";
-            case 4: return "errorId";
-            case 5: return "errorMessage";
-            case 6: return "serverInfos";
-            case 7: return "authenticationMechanisms";
-            case 8: return "supportedMethods";
-            case 9: return "encrypted";
-            case 10: return "maxWrappedSize";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("rpcVersion", 2);
-        __fieldMap.put("status", 3);
-        __fieldMap.put("errorId", 4);
-        __fieldMap.put("errorMessage", 5);
-        __fieldMap.put("serverInfos", 6);
-        __fieldMap.put("authenticationMechanisms", 7);
-        __fieldMap.put("supportedMethods", 8);
-        __fieldMap.put("encrypted", 9);
-        __fieldMap.put("maxWrappedSize", 10);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CatalogMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CatalogMetadata.java
deleted file mode 100644
index ea4f946..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CatalogMetadata.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class CatalogMetadata implements Externalizable, Message<CatalogMetadata>, Schema<CatalogMetadata>
-{
-
-    public static Schema<CatalogMetadata> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static CatalogMetadata getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final CatalogMetadata DEFAULT_INSTANCE = new CatalogMetadata();
-
-    
-    private String catalogName;
-    private String description;
-    private String connect;
-
-    public CatalogMetadata()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogName
-
-    public String getCatalogName()
-    {
-        return catalogName;
-    }
-
-    public CatalogMetadata setCatalogName(String catalogName)
-    {
-        this.catalogName = catalogName;
-        return this;
-    }
-
-    // description
-
-    public String getDescription()
-    {
-        return description;
-    }
-
-    public CatalogMetadata setDescription(String description)
-    {
-        this.description = description;
-        return this;
-    }
-
-    // connect
-
-    public String getConnect()
-    {
-        return connect;
-    }
-
-    public CatalogMetadata setConnect(String connect)
-    {
-        this.connect = connect;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<CatalogMetadata> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public CatalogMetadata newMessage()
-    {
-        return new CatalogMetadata();
-    }
-
-    public Class<CatalogMetadata> typeClass()
-    {
-        return CatalogMetadata.class;
-    }
-
-    public String messageName()
-    {
-        return CatalogMetadata.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return CatalogMetadata.class.getName();
-    }
-
-    public boolean isInitialized(CatalogMetadata message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, CatalogMetadata message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogName = input.readString();
-                    break;
-                case 2:
-                    message.description = input.readString();
-                    break;
-                case 3:
-                    message.connect = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, CatalogMetadata message) throws IOException
-    {
-        if(message.catalogName != null)
-            output.writeString(1, message.catalogName, false);
-
-        if(message.description != null)
-            output.writeString(2, message.description, false);
-
-        if(message.connect != null)
-            output.writeString(3, message.connect, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogName";
-            case 2: return "description";
-            case 3: return "connect";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogName", 1);
-        __fieldMap.put("description", 2);
-        __fieldMap.put("connect", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CollateSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CollateSupport.java
deleted file mode 100644
index bc51806..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CollateSupport.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum CollateSupport implements com.dyuproject.protostuff.EnumLite<CollateSupport>
-{
-    CS_UNKNOWN(0),
-    CS_GROUP_BY(1);
-    
-    public final int number;
-    
-    private CollateSupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static CollateSupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return CS_UNKNOWN;
-            case 1: return CS_GROUP_BY;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Collector.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Collector.java
deleted file mode 100644
index 1cce58c..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Collector.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class Collector implements Externalizable, Message<Collector>, Schema<Collector>
-{
-
-    public static Schema<Collector> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static Collector getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final Collector DEFAULT_INSTANCE = new Collector();
-
-    
-    private int oppositeMajorFragmentId;
-    private List<Integer> incomingMinorFragment;
-    private Boolean supportsOutOfOrder;
-    private Boolean isSpooling;
-
-    public Collector()
-    {
-        
-    }
-
-    // getters and setters
-
-    // oppositeMajorFragmentId
-
-    public int getOppositeMajorFragmentId()
-    {
-        return oppositeMajorFragmentId;
-    }
-
-    public Collector setOppositeMajorFragmentId(int oppositeMajorFragmentId)
-    {
-        this.oppositeMajorFragmentId = oppositeMajorFragmentId;
-        return this;
-    }
-
-    // incomingMinorFragment
-
-    public List<Integer> getIncomingMinorFragmentList()
-    {
-        return incomingMinorFragment;
-    }
-
-    public Collector setIncomingMinorFragmentList(List<Integer> incomingMinorFragment)
-    {
-        this.incomingMinorFragment = incomingMinorFragment;
-        return this;
-    }
-
-    // supportsOutOfOrder
-
-    public Boolean getSupportsOutOfOrder()
-    {
-        return supportsOutOfOrder;
-    }
-
-    public Collector setSupportsOutOfOrder(Boolean supportsOutOfOrder)
-    {
-        this.supportsOutOfOrder = supportsOutOfOrder;
-        return this;
-    }
-
-    // isSpooling
-
-    public Boolean getIsSpooling()
-    {
-        return isSpooling;
-    }
-
-    public Collector setIsSpooling(Boolean isSpooling)
-    {
-        this.isSpooling = isSpooling;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<Collector> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public Collector newMessage()
-    {
-        return new Collector();
-    }
-
-    public Class<Collector> typeClass()
-    {
-        return Collector.class;
-    }
-
-    public String messageName()
-    {
-        return Collector.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return Collector.class.getName();
-    }
-
-    public boolean isInitialized(Collector message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, Collector message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.oppositeMajorFragmentId = input.readInt32();
-                    break;
-                case 2:
-                    if(message.incomingMinorFragment == null)
-                        message.incomingMinorFragment = new ArrayList<Integer>();
-                    message.incomingMinorFragment.add(input.readInt32());
-                    break;
-                case 3:
-                    message.supportsOutOfOrder = input.readBool();
-                    break;
-                case 4:
-                    message.isSpooling = input.readBool();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, Collector message) throws IOException
-    {
-        if(message.oppositeMajorFragmentId != 0)
-            output.writeInt32(1, message.oppositeMajorFragmentId, false);
-
-        if(message.incomingMinorFragment != null)
-        {
-            for(Integer incomingMinorFragment : message.incomingMinorFragment)
-            {
-                if(incomingMinorFragment != null)
-                    output.writeInt32(2, incomingMinorFragment, true);
-            }
-        }
-
-        if(message.supportsOutOfOrder != null)
-            output.writeBool(3, message.supportsOutOfOrder, false);
-
-        if(message.isSpooling != null)
-            output.writeBool(4, message.isSpooling, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "oppositeMajorFragmentId";
-            case 2: return "incomingMinorFragment";
-            case 3: return "supportsOutOfOrder";
-            case 4: return "isSpooling";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("oppositeMajorFragmentId", 1);
-        __fieldMap.put("incomingMinorFragment", 2);
-        __fieldMap.put("supportsOutOfOrder", 3);
-        __fieldMap.put("isSpooling", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnMetadata.java
deleted file mode 100644
index 86eb2c6..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnMetadata.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class ColumnMetadata implements Externalizable, Message<ColumnMetadata>, Schema<ColumnMetadata>
-{
-
-    public static Schema<ColumnMetadata> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static ColumnMetadata getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final ColumnMetadata DEFAULT_INSTANCE = new ColumnMetadata();
-
-    
-    private String catalogName;
-    private String schemaName;
-    private String tableName;
-    private String columnName;
-    private int ordinalPosition;
-    private String defaultValue;
-    private Boolean isNullable;
-    private String dataType;
-    private int charMaxLength;
-    private int charOctetLength;
-    private int numericPrecision;
-    private int numericPrecisionRadix;
-    private int numericScale;
-    private int dateTimePrecision;
-    private String intervalType;
-    private int intervalPrecision;
-    private int columnSize;
-
-    public ColumnMetadata()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogName
-
-    public String getCatalogName()
-    {
-        return catalogName;
-    }
-
-    public ColumnMetadata setCatalogName(String catalogName)
-    {
-        this.catalogName = catalogName;
-        return this;
-    }
-
-    // schemaName
-
-    public String getSchemaName()
-    {
-        return schemaName;
-    }
-
-    public ColumnMetadata setSchemaName(String schemaName)
-    {
-        this.schemaName = schemaName;
-        return this;
-    }
-
-    // tableName
-
-    public String getTableName()
-    {
-        return tableName;
-    }
-
-    public ColumnMetadata setTableName(String tableName)
-    {
-        this.tableName = tableName;
-        return this;
-    }
-
-    // columnName
-
-    public String getColumnName()
-    {
-        return columnName;
-    }
-
-    public ColumnMetadata setColumnName(String columnName)
-    {
-        this.columnName = columnName;
-        return this;
-    }
-
-    // ordinalPosition
-
-    public int getOrdinalPosition()
-    {
-        return ordinalPosition;
-    }
-
-    public ColumnMetadata setOrdinalPosition(int ordinalPosition)
-    {
-        this.ordinalPosition = ordinalPosition;
-        return this;
-    }
-
-    // defaultValue
-
-    public String getDefaultValue()
-    {
-        return defaultValue;
-    }
-
-    public ColumnMetadata setDefaultValue(String defaultValue)
-    {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    // isNullable
-
-    public Boolean getIsNullable()
-    {
-        return isNullable;
-    }
-
-    public ColumnMetadata setIsNullable(Boolean isNullable)
-    {
-        this.isNullable = isNullable;
-        return this;
-    }
-
-    // dataType
-
-    public String getDataType()
-    {
-        return dataType;
-    }
-
-    public ColumnMetadata setDataType(String dataType)
-    {
-        this.dataType = dataType;
-        return this;
-    }
-
-    // charMaxLength
-
-    public int getCharMaxLength()
-    {
-        return charMaxLength;
-    }
-
-    public ColumnMetadata setCharMaxLength(int charMaxLength)
-    {
-        this.charMaxLength = charMaxLength;
-        return this;
-    }
-
-    // charOctetLength
-
-    public int getCharOctetLength()
-    {
-        return charOctetLength;
-    }
-
-    public ColumnMetadata setCharOctetLength(int charOctetLength)
-    {
-        this.charOctetLength = charOctetLength;
-        return this;
-    }
-
-    // numericPrecision
-
-    public int getNumericPrecision()
-    {
-        return numericPrecision;
-    }
-
-    public ColumnMetadata setNumericPrecision(int numericPrecision)
-    {
-        this.numericPrecision = numericPrecision;
-        return this;
-    }
-
-    // numericPrecisionRadix
-
-    public int getNumericPrecisionRadix()
-    {
-        return numericPrecisionRadix;
-    }
-
-    public ColumnMetadata setNumericPrecisionRadix(int numericPrecisionRadix)
-    {
-        this.numericPrecisionRadix = numericPrecisionRadix;
-        return this;
-    }
-
-    // numericScale
-
-    public int getNumericScale()
-    {
-        return numericScale;
-    }
-
-    public ColumnMetadata setNumericScale(int numericScale)
-    {
-        this.numericScale = numericScale;
-        return this;
-    }
-
-    // dateTimePrecision
-
-    public int getDateTimePrecision()
-    {
-        return dateTimePrecision;
-    }
-
-    public ColumnMetadata setDateTimePrecision(int dateTimePrecision)
-    {
-        this.dateTimePrecision = dateTimePrecision;
-        return this;
-    }
-
-    // intervalType
-
-    public String getIntervalType()
-    {
-        return intervalType;
-    }
-
-    public ColumnMetadata setIntervalType(String intervalType)
-    {
-        this.intervalType = intervalType;
-        return this;
-    }
-
-    // intervalPrecision
-
-    public int getIntervalPrecision()
-    {
-        return intervalPrecision;
-    }
-
-    public ColumnMetadata setIntervalPrecision(int intervalPrecision)
-    {
-        this.intervalPrecision = intervalPrecision;
-        return this;
-    }
-
-    // columnSize
-
-    public int getColumnSize()
-    {
-        return columnSize;
-    }
-
-    public ColumnMetadata setColumnSize(int columnSize)
-    {
-        this.columnSize = columnSize;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<ColumnMetadata> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public ColumnMetadata newMessage()
-    {
-        return new ColumnMetadata();
-    }
-
-    public Class<ColumnMetadata> typeClass()
-    {
-        return ColumnMetadata.class;
-    }
-
-    public String messageName()
-    {
-        return ColumnMetadata.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return ColumnMetadata.class.getName();
-    }
-
-    public boolean isInitialized(ColumnMetadata message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, ColumnMetadata message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogName = input.readString();
-                    break;
-                case 2:
-                    message.schemaName = input.readString();
-                    break;
-                case 3:
-                    message.tableName = input.readString();
-                    break;
-                case 4:
-                    message.columnName = input.readString();
-                    break;
-                case 5:
-                    message.ordinalPosition = input.readInt32();
-                    break;
-                case 6:
-                    message.defaultValue = input.readString();
-                    break;
-                case 7:
-                    message.isNullable = input.readBool();
-                    break;
-                case 8:
-                    message.dataType = input.readString();
-                    break;
-                case 9:
-                    message.charMaxLength = input.readInt32();
-                    break;
-                case 10:
-                    message.charOctetLength = input.readInt32();
-                    break;
-                case 11:
-                    message.numericPrecision = input.readInt32();
-                    break;
-                case 12:
-                    message.numericPrecisionRadix = input.readInt32();
-                    break;
-                case 13:
-                    message.numericScale = input.readInt32();
-                    break;
-                case 14:
-                    message.dateTimePrecision = input.readInt32();
-                    break;
-                case 15:
-                    message.intervalType = input.readString();
-                    break;
-                case 16:
-                    message.intervalPrecision = input.readInt32();
-                    break;
-                case 17:
-                    message.columnSize = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, ColumnMetadata message) throws IOException
-    {
-        if(message.catalogName != null)
-            output.writeString(1, message.catalogName, false);
-
-        if(message.schemaName != null)
-            output.writeString(2, message.schemaName, false);
-
-        if(message.tableName != null)
-            output.writeString(3, message.tableName, false);
-
-        if(message.columnName != null)
-            output.writeString(4, message.columnName, false);
-
-        if(message.ordinalPosition != 0)
-            output.writeInt32(5, message.ordinalPosition, false);
-
-        if(message.defaultValue != null)
-            output.writeString(6, message.defaultValue, false);
-
-        if(message.isNullable != null)
-            output.writeBool(7, message.isNullable, false);
-
-        if(message.dataType != null)
-            output.writeString(8, message.dataType, false);
-
-        if(message.charMaxLength != 0)
-            output.writeInt32(9, message.charMaxLength, false);
-
-        if(message.charOctetLength != 0)
-            output.writeInt32(10, message.charOctetLength, false);
-
-        if(message.numericPrecision != 0)
-            output.writeInt32(11, message.numericPrecision, false);
-
-        if(message.numericPrecisionRadix != 0)
-            output.writeInt32(12, message.numericPrecisionRadix, false);
-
-        if(message.numericScale != 0)
-            output.writeInt32(13, message.numericScale, false);
-
-        if(message.dateTimePrecision != 0)
-            output.writeInt32(14, message.dateTimePrecision, false);
-
-        if(message.intervalType != null)
-            output.writeString(15, message.intervalType, false);
-
-        if(message.intervalPrecision != 0)
-            output.writeInt32(16, message.intervalPrecision, false);
-
-        if(message.columnSize != 0)
-            output.writeInt32(17, message.columnSize, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogName";
-            case 2: return "schemaName";
-            case 3: return "tableName";
-            case 4: return "columnName";
-            case 5: return "ordinalPosition";
-            case 6: return "defaultValue";
-            case 7: return "isNullable";
-            case 8: return "dataType";
-            case 9: return "charMaxLength";
-            case 10: return "charOctetLength";
-            case 11: return "numericPrecision";
-            case 12: return "numericPrecisionRadix";
-            case 13: return "numericScale";
-            case 14: return "dateTimePrecision";
-            case 15: return "intervalType";
-            case 16: return "intervalPrecision";
-            case 17: return "columnSize";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogName", 1);
-        __fieldMap.put("schemaName", 2);
-        __fieldMap.put("tableName", 3);
-        __fieldMap.put("columnName", 4);
-        __fieldMap.put("ordinalPosition", 5);
-        __fieldMap.put("defaultValue", 6);
-        __fieldMap.put("isNullable", 7);
-        __fieldMap.put("dataType", 8);
-        __fieldMap.put("charMaxLength", 9);
-        __fieldMap.put("charOctetLength", 10);
-        __fieldMap.put("numericPrecision", 11);
-        __fieldMap.put("numericPrecisionRadix", 12);
-        __fieldMap.put("numericScale", 13);
-        __fieldMap.put("dateTimePrecision", 14);
-        __fieldMap.put("intervalType", 15);
-        __fieldMap.put("intervalPrecision", 16);
-        __fieldMap.put("columnSize", 17);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnSearchability.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnSearchability.java
deleted file mode 100644
index 508fe88..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnSearchability.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum ColumnSearchability implements com.dyuproject.protostuff.EnumLite<ColumnSearchability>
-{
-    UNKNOWN_SEARCHABILITY(0),
-    NONE(1),
-    CHAR(2),
-    NUMBER(3),
-    ALL(4);
-    
-    public final int number;
-    
-    private ColumnSearchability (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static ColumnSearchability valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return UNKNOWN_SEARCHABILITY;
-            case 1: return NONE;
-            case 2: return CHAR;
-            case 3: return NUMBER;
-            case 4: return ALL;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnUpdatability.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnUpdatability.java
deleted file mode 100644
index 9470adb..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnUpdatability.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum ColumnUpdatability implements com.dyuproject.protostuff.EnumLite<ColumnUpdatability>
-{
-    UNKNOWN_UPDATABILITY(0),
-    READ_ONLY(1),
-    WRITABLE(2);
-    
-    public final int number;
-    
-    private ColumnUpdatability (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static ColumnUpdatability valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return UNKNOWN_UPDATABILITY;
-            case 1: return READ_ONLY;
-            case 2: return WRITABLE;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CompleteRpcMessage.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CompleteRpcMessage.java
deleted file mode 100644
index f6d578c..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CompleteRpcMessage.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.ByteString;
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class CompleteRpcMessage implements Externalizable, Message<CompleteRpcMessage>, Schema<CompleteRpcMessage>
-{
-
-    public static Schema<CompleteRpcMessage> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static CompleteRpcMessage getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final CompleteRpcMessage DEFAULT_INSTANCE = new CompleteRpcMessage();
-
-    
-    private RpcHeader header;
-    private ByteString protobufBody;
-    private ByteString rawBody;
-
-    public CompleteRpcMessage()
-    {
-        
-    }
-
-    // getters and setters
-
-    // header
-
-    public RpcHeader getHeader()
-    {
-        return header;
-    }
-
-    public CompleteRpcMessage setHeader(RpcHeader header)
-    {
-        this.header = header;
-        return this;
-    }
-
-    // protobufBody
-
-    public ByteString getProtobufBody()
-    {
-        return protobufBody;
-    }
-
-    public CompleteRpcMessage setProtobufBody(ByteString protobufBody)
-    {
-        this.protobufBody = protobufBody;
-        return this;
-    }
-
-    // rawBody
-
-    public ByteString getRawBody()
-    {
-        return rawBody;
-    }
-
-    public CompleteRpcMessage setRawBody(ByteString rawBody)
-    {
-        this.rawBody = rawBody;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<CompleteRpcMessage> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public CompleteRpcMessage newMessage()
-    {
-        return new CompleteRpcMessage();
-    }
-
-    public Class<CompleteRpcMessage> typeClass()
-    {
-        return CompleteRpcMessage.class;
-    }
-
-    public String messageName()
-    {
-        return CompleteRpcMessage.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return CompleteRpcMessage.class.getName();
-    }
-
-    public boolean isInitialized(CompleteRpcMessage message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, CompleteRpcMessage message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.header = input.mergeObject(message.header, RpcHeader.getSchema());
-                    break;
-
-                case 2:
-                    message.protobufBody = input.readBytes();
-                    break;
-                case 3:
-                    message.rawBody = input.readBytes();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, CompleteRpcMessage message) throws IOException
-    {
-        if(message.header != null)
-             output.writeObject(1, message.header, RpcHeader.getSchema(), false);
-
-
-        if(message.protobufBody != null)
-            output.writeBytes(2, message.protobufBody, false);
-
-        if(message.rawBody != null)
-            output.writeBytes(3, message.rawBody, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "header";
-            case 2: return "protobufBody";
-            case 3: return "rawBody";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("header", 1);
-        __fieldMap.put("protobufBody", 2);
-        __fieldMap.put("rawBody", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ConvertSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ConvertSupport.java
deleted file mode 100644
index 96da4c1..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ConvertSupport.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-import com.dyuproject.protostuff.UninitializedMessageException;
-
-public final class ConvertSupport implements Externalizable, Message<ConvertSupport>, Schema<ConvertSupport>
-{
-
-    public static Schema<ConvertSupport> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static ConvertSupport getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final ConvertSupport DEFAULT_INSTANCE = new ConvertSupport();
-
-    
-    private org.apache.drill.common.types.MinorType from;
-    private org.apache.drill.common.types.MinorType to;
-
-    public ConvertSupport()
-    {
-        
-    }
-
-    public ConvertSupport(
-        org.apache.drill.common.types.MinorType from,
-        org.apache.drill.common.types.MinorType to
-    )
-    {
-        this.from = from;
-        this.to = to;
-    }
-
-    // getters and setters
-
-    // from
-
-    public org.apache.drill.common.types.MinorType getFrom()
-    {
-        return from;
-    }
-
-    public ConvertSupport setFrom(org.apache.drill.common.types.MinorType from)
-    {
-        this.from = from;
-        return this;
-    }
-
-    // to
-
-    public org.apache.drill.common.types.MinorType getTo()
-    {
-        return to;
-    }
-
-    public ConvertSupport setTo(org.apache.drill.common.types.MinorType to)
-    {
-        this.to = to;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<ConvertSupport> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public ConvertSupport newMessage()
-    {
-        return new ConvertSupport();
-    }
-
-    public Class<ConvertSupport> typeClass()
-    {
-        return ConvertSupport.class;
-    }
-
-    public String messageName()
-    {
-        return ConvertSupport.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return ConvertSupport.class.getName();
-    }
-
-    public boolean isInitialized(ConvertSupport message)
-    {
-        return 
-            message.from != null 
-            && message.to != null;
-    }
-
-    public void mergeFrom(Input input, ConvertSupport message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.from = org.apache.drill.common.types.MinorType.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.to = org.apache.drill.common.types.MinorType.valueOf(input.readEnum());
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, ConvertSupport message) throws IOException
-    {
-        if(message.from == null)
-            throw new UninitializedMessageException(message);
-        output.writeEnum(1, message.from.number, false);
-
-        if(message.to == null)
-            throw new UninitializedMessageException(message);
-        output.writeEnum(2, message.to.number, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "from";
-            case 2: return "to";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("from", 1);
-        __fieldMap.put("to", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java
deleted file mode 100644
index eea96ca..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum CoreOperatorType implements com.dyuproject.protostuff.EnumLite<CoreOperatorType>
-{
-    SINGLE_SENDER(0),
-    BROADCAST_SENDER(1),
-    FILTER(2),
-    HASH_AGGREGATE(3),
-    HASH_JOIN(4),
-    MERGE_JOIN(5),
-    HASH_PARTITION_SENDER(6),
-    LIMIT(7),
-    MERGING_RECEIVER(8),
-    ORDERED_PARTITION_SENDER(9),
-    PROJECT(10),
-    UNORDERED_RECEIVER(11),
-    RANGE_PARTITION_SENDER(12),
-    SCREEN(13),
-    SELECTION_VECTOR_REMOVER(14),
-    STREAMING_AGGREGATE(15),
-    TOP_N_SORT(16),
-    EXTERNAL_SORT(17),
-    TRACE(18),
-    UNION(19),
-    OLD_SORT(20),
-    PARQUET_ROW_GROUP_SCAN(21),
-    HIVE_SUB_SCAN(22),
-    SYSTEM_TABLE_SCAN(23),
-    MOCK_SUB_SCAN(24),
-    PARQUET_WRITER(25),
-    DIRECT_SUB_SCAN(26),
-    TEXT_WRITER(27),
-    TEXT_SUB_SCAN(28),
-    JSON_SUB_SCAN(29),
-    INFO_SCHEMA_SUB_SCAN(30),
-    COMPLEX_TO_JSON(31),
-    PRODUCER_CONSUMER(32),
-    HBASE_SUB_SCAN(33),
-    WINDOW(34),
-    NESTED_LOOP_JOIN(35),
-    AVRO_SUB_SCAN(36),
-    PCAP_SUB_SCAN(37),
-    KAFKA_SUB_SCAN(38),
-    KUDU_SUB_SCAN(39),
-    FLATTEN(40),
-    LATERAL_JOIN(41),
-    UNNEST(42),
-    HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN(43),
-    JDBC_SCAN(44),
-    REGEX_SUB_SCAN(45),
-    MAPRDB_SUB_SCAN(46),
-    MONGO_SUB_SCAN(47),
-    KUDU_WRITER(48),
-    OPEN_TSDB_SUB_SCAN(49),
-    JSON_WRITER(50),
-    HTPPD_LOG_SUB_SCAN(51),
-    IMAGE_SUB_SCAN(52),
-    SEQUENCE_SUB_SCAN(53),
-    PARTITION_LIMIT(54),
-    PCAPNG_SUB_SCAN(55),
-    RUNTIME_FILTER(56),
-    ROWKEY_JOIN(57),
-    SYSLOG_SUB_SCAN(58),
-    STATISTICS_AGGREGATE(59),
-    UNPIVOT_MAPS(60),
-    STATISTICS_MERGE(61),
-    LTSV_SUB_SCAN(62);
-    
-    public final int number;
-    
-    private CoreOperatorType (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static CoreOperatorType valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return SINGLE_SENDER;
-            case 1: return BROADCAST_SENDER;
-            case 2: return FILTER;
-            case 3: return HASH_AGGREGATE;
-            case 4: return HASH_JOIN;
-            case 5: return MERGE_JOIN;
-            case 6: return HASH_PARTITION_SENDER;
-            case 7: return LIMIT;
-            case 8: return MERGING_RECEIVER;
-            case 9: return ORDERED_PARTITION_SENDER;
-            case 10: return PROJECT;
-            case 11: return UNORDERED_RECEIVER;
-            case 12: return RANGE_PARTITION_SENDER;
-            case 13: return SCREEN;
-            case 14: return SELECTION_VECTOR_REMOVER;
-            case 15: return STREAMING_AGGREGATE;
-            case 16: return TOP_N_SORT;
-            case 17: return EXTERNAL_SORT;
-            case 18: return TRACE;
-            case 19: return UNION;
-            case 20: return OLD_SORT;
-            case 21: return PARQUET_ROW_GROUP_SCAN;
-            case 22: return HIVE_SUB_SCAN;
-            case 23: return SYSTEM_TABLE_SCAN;
-            case 24: return MOCK_SUB_SCAN;
-            case 25: return PARQUET_WRITER;
-            case 26: return DIRECT_SUB_SCAN;
-            case 27: return TEXT_WRITER;
-            case 28: return TEXT_SUB_SCAN;
-            case 29: return JSON_SUB_SCAN;
-            case 30: return INFO_SCHEMA_SUB_SCAN;
-            case 31: return COMPLEX_TO_JSON;
-            case 32: return PRODUCER_CONSUMER;
-            case 33: return HBASE_SUB_SCAN;
-            case 34: return WINDOW;
-            case 35: return NESTED_LOOP_JOIN;
-            case 36: return AVRO_SUB_SCAN;
-            case 37: return PCAP_SUB_SCAN;
-            case 38: return KAFKA_SUB_SCAN;
-            case 39: return KUDU_SUB_SCAN;
-            case 40: return FLATTEN;
-            case 41: return LATERAL_JOIN;
-            case 42: return UNNEST;
-            case 43: return HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN;
-            case 44: return JDBC_SCAN;
-            case 45: return REGEX_SUB_SCAN;
-            case 46: return MAPRDB_SUB_SCAN;
-            case 47: return MONGO_SUB_SCAN;
-            case 48: return KUDU_WRITER;
-            case 49: return OPEN_TSDB_SUB_SCAN;
-            case 50: return JSON_WRITER;
-            case 51: return HTPPD_LOG_SUB_SCAN;
-            case 52: return IMAGE_SUB_SCAN;
-            case 53: return SEQUENCE_SUB_SCAN;
-            case 54: return PARTITION_LIMIT;
-            case 55: return PCAPNG_SUB_SCAN;
-            case 56: return RUNTIME_FILTER;
-            case 57: return ROWKEY_JOIN;
-            case 58: return SYSLOG_SUB_SCAN;
-            case 59: return STATISTICS_AGGREGATE;
-            case 60: return UNPIVOT_MAPS;
-            case 61: return STATISTICS_MERGE;
-            case 62: return LTSV_SUB_SCAN;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CorrelationNamesSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CorrelationNamesSupport.java
deleted file mode 100644
index 061ea6d..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CorrelationNamesSupport.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum CorrelationNamesSupport implements com.dyuproject.protostuff.EnumLite<CorrelationNamesSupport>
-{
-    CN_NONE(1),
-    CN_DIFFERENT_NAMES(2),
-    CN_ANY(3);
-    
-    public final int number;
-    
-    private CorrelationNamesSupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static CorrelationNamesSupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 1: return CN_NONE;
-            case 2: return CN_DIFFERENT_NAMES;
-            case 3: return CN_ANY;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementReq.java
deleted file mode 100644
index c21015f..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementReq.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class CreatePreparedStatementReq implements Externalizable, Message<CreatePreparedStatementReq>, Schema<CreatePreparedStatementReq>
-{
-
-    public static Schema<CreatePreparedStatementReq> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static CreatePreparedStatementReq getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final CreatePreparedStatementReq DEFAULT_INSTANCE = new CreatePreparedStatementReq();
-
-    
-    private String sqlQuery;
-
-    public CreatePreparedStatementReq()
-    {
-        
-    }
-
-    // getters and setters
-
-    // sqlQuery
-
-    public String getSqlQuery()
-    {
-        return sqlQuery;
-    }
-
-    public CreatePreparedStatementReq setSqlQuery(String sqlQuery)
-    {
-        this.sqlQuery = sqlQuery;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<CreatePreparedStatementReq> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public CreatePreparedStatementReq newMessage()
-    {
-        return new CreatePreparedStatementReq();
-    }
-
-    public Class<CreatePreparedStatementReq> typeClass()
-    {
-        return CreatePreparedStatementReq.class;
-    }
-
-    public String messageName()
-    {
-        return CreatePreparedStatementReq.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return CreatePreparedStatementReq.class.getName();
-    }
-
-    public boolean isInitialized(CreatePreparedStatementReq message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, CreatePreparedStatementReq message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.sqlQuery = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, CreatePreparedStatementReq message) throws IOException
-    {
-        if(message.sqlQuery != null)
-            output.writeString(1, message.sqlQuery, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "sqlQuery";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("sqlQuery", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementResp.java
deleted file mode 100644
index 452af40..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementResp.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class CreatePreparedStatementResp implements Externalizable, Message<CreatePreparedStatementResp>, Schema<CreatePreparedStatementResp>
-{
-
-    public static Schema<CreatePreparedStatementResp> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static CreatePreparedStatementResp getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final CreatePreparedStatementResp DEFAULT_INSTANCE = new CreatePreparedStatementResp();
-
-    
-    private RequestStatus status;
-    private PreparedStatement preparedStatement;
-    private DrillPBError error;
-
-    public CreatePreparedStatementResp()
-    {
-        
-    }
-
-    // getters and setters
-
-    // status
-
-    public RequestStatus getStatus()
-    {
-        return status == null ? RequestStatus.UNKNOWN_STATUS : status;
-    }
-
-    public CreatePreparedStatementResp setStatus(RequestStatus status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // preparedStatement
-
-    public PreparedStatement getPreparedStatement()
-    {
-        return preparedStatement;
-    }
-
-    public CreatePreparedStatementResp setPreparedStatement(PreparedStatement preparedStatement)
-    {
-        this.preparedStatement = preparedStatement;
-        return this;
-    }
-
-    // error
-
-    public DrillPBError getError()
-    {
-        return error;
-    }
-
-    public CreatePreparedStatementResp setError(DrillPBError error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<CreatePreparedStatementResp> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public CreatePreparedStatementResp newMessage()
-    {
-        return new CreatePreparedStatementResp();
-    }
-
-    public Class<CreatePreparedStatementResp> typeClass()
-    {
-        return CreatePreparedStatementResp.class;
-    }
-
-    public String messageName()
-    {
-        return CreatePreparedStatementResp.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return CreatePreparedStatementResp.class.getName();
-    }
-
-    public boolean isInitialized(CreatePreparedStatementResp message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, CreatePreparedStatementResp message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.status = RequestStatus.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.preparedStatement = input.mergeObject(message.preparedStatement, PreparedStatement.getSchema());
-                    break;
-
-                case 3:
-                    message.error = input.mergeObject(message.error, DrillPBError.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, CreatePreparedStatementResp message) throws IOException
-    {
-        if(message.status != null)
-             output.writeEnum(1, message.status.number, false);
-
-        if(message.preparedStatement != null)
-             output.writeObject(2, message.preparedStatement, PreparedStatement.getSchema(), false);
-
-
-        if(message.error != null)
-             output.writeObject(3, message.error, DrillPBError.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "status";
-            case 2: return "preparedStatement";
-            case 3: return "error";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("status", 1);
-        __fieldMap.put("preparedStatement", 2);
-        __fieldMap.put("error", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CustomMessage.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CustomMessage.java
deleted file mode 100644
index 8be7718..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CustomMessage.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.ByteString;
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class CustomMessage implements Externalizable, Message<CustomMessage>, Schema<CustomMessage>
-{
-
-    public static Schema<CustomMessage> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static CustomMessage getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final CustomMessage DEFAULT_INSTANCE = new CustomMessage();
-
-    
-    private int type;
-    private ByteString message;
-
-    public CustomMessage()
-    {
-        
-    }
-
-    // getters and setters
-
-    // type
-
-    public int getType()
-    {
-        return type;
-    }
-
-    public CustomMessage setType(int type)
-    {
-        this.type = type;
-        return this;
-    }
-
-    // message
-
-    public ByteString getMessage()
-    {
-        return message;
-    }
-
-    public CustomMessage setMessage(ByteString message)
-    {
-        this.message = message;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<CustomMessage> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public CustomMessage newMessage()
-    {
-        return new CustomMessage();
-    }
-
-    public Class<CustomMessage> typeClass()
-    {
-        return CustomMessage.class;
-    }
-
-    public String messageName()
-    {
-        return CustomMessage.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return CustomMessage.class.getName();
-    }
-
-    public boolean isInitialized(CustomMessage message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, CustomMessage message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.type = input.readInt32();
-                    break;
-                case 2:
-                    message.message = input.readBytes();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, CustomMessage message) throws IOException
-    {
-        if(message.type != 0)
-            output.writeInt32(1, message.type, false);
-
-        if(message.message != null)
-            output.writeBytes(2, message.message, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "type";
-            case 2: return "message";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("type", 1);
-        __fieldMap.put("message", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DateTimeLiteralsSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DateTimeLiteralsSupport.java
deleted file mode 100644
index f965b33..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DateTimeLiteralsSupport.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum DateTimeLiteralsSupport implements com.dyuproject.protostuff.EnumLite<DateTimeLiteralsSupport>
-{
-    DL_UNKNOWN(0),
-    DL_DATE(1),
-    DL_TIME(2),
-    DL_TIMESTAMP(3),
-    DL_INTERVAL_YEAR(4),
-    DL_INTERVAL_MONTH(5),
-    DL_INTERVAL_DAY(6),
-    DL_INTERVAL_HOUR(7),
-    DL_INTERVAL_MINUTE(8),
-    DL_INTERVAL_SECOND(9),
-    DL_INTERVAL_YEAR_TO_MONTH(10),
-    DL_INTERVAL_DAY_TO_HOUR(11),
-    DL_INTERVAL_DAY_TO_MINUTE(12),
-    DL_INTERVAL_DAY_TO_SECOND(13),
-    DL_INTERVAL_HOUR_TO_MINUTE(14),
-    DL_INTERVAL_HOUR_TO_SECOND(15),
-    DL_INTERVAL_MINUTE_TO_SECOND(16);
-    
-    public final int number;
-    
-    private DateTimeLiteralsSupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static DateTimeLiteralsSupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return DL_UNKNOWN;
-            case 1: return DL_DATE;
-            case 2: return DL_TIME;
-            case 3: return DL_TIMESTAMP;
-            case 4: return DL_INTERVAL_YEAR;
-            case 5: return DL_INTERVAL_MONTH;
-            case 6: return DL_INTERVAL_DAY;
-            case 7: return DL_INTERVAL_HOUR;
-            case 8: return DL_INTERVAL_MINUTE;
-            case 9: return DL_INTERVAL_SECOND;
-            case 10: return DL_INTERVAL_YEAR_TO_MONTH;
-            case 11: return DL_INTERVAL_DAY_TO_HOUR;
-            case 12: return DL_INTERVAL_DAY_TO_MINUTE;
-            case 13: return DL_INTERVAL_DAY_TO_SECOND;
-            case 14: return DL_INTERVAL_HOUR_TO_MINUTE;
-            case 15: return DL_INTERVAL_HOUR_TO_SECOND;
-            case 16: return DL_INTERVAL_MINUTE_TO_SECOND;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillPBError.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillPBError.java
deleted file mode 100644
index 172dd96..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillPBError.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class DrillPBError implements Externalizable, Message<DrillPBError>, Schema<DrillPBError>
-{
-    public enum ErrorType implements com.dyuproject.protostuff.EnumLite<ErrorType>
-    {
-        CONNECTION(0),
-        DATA_READ(1),
-        DATA_WRITE(2),
-        FUNCTION(3),
-        PARSE(4),
-        PERMISSION(5),
-        PLAN(6),
-        RESOURCE(7),
-        SYSTEM(8),
-        UNSUPPORTED_OPERATION(9),
-        VALIDATION(10),
-        EXECUTION_ERROR(11),
-        INTERNAL_ERROR(12),
-        UNSPECIFIED_ERROR(13);
-        
-        public final int number;
-        
-        private ErrorType (int number)
-        {
-            this.number = number;
-        }
-        
-        public int getNumber()
-        {
-            return number;
-        }
-        
-        public static ErrorType valueOf(int number)
-        {
-            switch(number) 
-            {
-                case 0: return CONNECTION;
-                case 1: return DATA_READ;
-                case 2: return DATA_WRITE;
-                case 3: return FUNCTION;
-                case 4: return PARSE;
-                case 5: return PERMISSION;
-                case 6: return PLAN;
-                case 7: return RESOURCE;
-                case 8: return SYSTEM;
-                case 9: return UNSUPPORTED_OPERATION;
-                case 10: return VALIDATION;
-                case 11: return EXECUTION_ERROR;
-                case 12: return INTERNAL_ERROR;
-                case 13: return UNSPECIFIED_ERROR;
-                default: return null;
-            }
-        }
-    }
-
-
-    public static Schema<DrillPBError> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static DrillPBError getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final DrillPBError DEFAULT_INSTANCE = new DrillPBError();
-
-    
-    private String errorId;
-    private DrillbitEndpoint endpoint;
-    private ErrorType errorType;
-    private String message;
-    private ExceptionWrapper exception;
-    private List<ParsingError> parsingError;
-
-    public DrillPBError()
-    {
-        
-    }
-
-    // getters and setters
-
-    // errorId
-
-    public String getErrorId()
-    {
-        return errorId;
-    }
-
-    public DrillPBError setErrorId(String errorId)
-    {
-        this.errorId = errorId;
-        return this;
-    }
-
-    // endpoint
-
-    public DrillbitEndpoint getEndpoint()
-    {
-        return endpoint;
-    }
-
-    public DrillPBError setEndpoint(DrillbitEndpoint endpoint)
-    {
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    // errorType
-
-    public ErrorType getErrorType()
-    {
-        return errorType == null ? ErrorType.CONNECTION : errorType;
-    }
-
-    public DrillPBError setErrorType(ErrorType errorType)
-    {
-        this.errorType = errorType;
-        return this;
-    }
-
-    // message
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    public DrillPBError setMessage(String message)
-    {
-        this.message = message;
-        return this;
-    }
-
-    // exception
-
-    public ExceptionWrapper getException()
-    {
-        return exception;
-    }
-
-    public DrillPBError setException(ExceptionWrapper exception)
-    {
-        this.exception = exception;
-        return this;
-    }
-
-    // parsingError
-
-    public List<ParsingError> getParsingErrorList()
-    {
-        return parsingError;
-    }
-
-    public DrillPBError setParsingErrorList(List<ParsingError> parsingError)
-    {
-        this.parsingError = parsingError;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<DrillPBError> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public DrillPBError newMessage()
-    {
-        return new DrillPBError();
-    }
-
-    public Class<DrillPBError> typeClass()
-    {
-        return DrillPBError.class;
-    }
-
-    public String messageName()
-    {
-        return DrillPBError.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return DrillPBError.class.getName();
-    }
-
-    public boolean isInitialized(DrillPBError message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, DrillPBError message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.errorId = input.readString();
-                    break;
-                case 2:
-                    message.endpoint = input.mergeObject(message.endpoint, DrillbitEndpoint.getSchema());
-                    break;
-
-                case 3:
-                    message.errorType = ErrorType.valueOf(input.readEnum());
-                    break;
-                case 4:
-                    message.message = input.readString();
-                    break;
-                case 5:
-                    message.exception = input.mergeObject(message.exception, ExceptionWrapper.getSchema());
-                    break;
-
-                case 6:
-                    if(message.parsingError == null)
-                        message.parsingError = new ArrayList<ParsingError>();
-                    message.parsingError.add(input.mergeObject(null, ParsingError.getSchema()));
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, DrillPBError message) throws IOException
-    {
-        if(message.errorId != null)
-            output.writeString(1, message.errorId, false);
-
-        if(message.endpoint != null)
-             output.writeObject(2, message.endpoint, DrillbitEndpoint.getSchema(), false);
-
-
-        if(message.errorType != null)
-             output.writeEnum(3, message.errorType.number, false);
-
-        if(message.message != null)
-            output.writeString(4, message.message, false);
-
-        if(message.exception != null)
-             output.writeObject(5, message.exception, ExceptionWrapper.getSchema(), false);
-
-
-        if(message.parsingError != null)
-        {
-            for(ParsingError parsingError : message.parsingError)
-            {
-                if(parsingError != null)
-                    output.writeObject(6, parsingError, ParsingError.getSchema(), true);
-            }
-        }
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "errorId";
-            case 2: return "endpoint";
-            case 3: return "errorType";
-            case 4: return "message";
-            case 5: return "exception";
-            case 6: return "parsingError";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("errorId", 1);
-        __fieldMap.put("endpoint", 2);
-        __fieldMap.put("errorType", 3);
-        __fieldMap.put("message", 4);
-        __fieldMap.put("exception", 5);
-        __fieldMap.put("parsingError", 6);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillServiceInstance.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillServiceInstance.java
deleted file mode 100644
index 6a68b382..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillServiceInstance.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class DrillServiceInstance implements Externalizable, Message<DrillServiceInstance>, Schema<DrillServiceInstance>
-{
-
-    public static Schema<DrillServiceInstance> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static DrillServiceInstance getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final DrillServiceInstance DEFAULT_INSTANCE = new DrillServiceInstance();
-
-    
-    private String id;
-    private long registrationTimeUTC;
-    private DrillbitEndpoint endpoint;
-
-    public DrillServiceInstance()
-    {
-        
-    }
-
-    // getters and setters
-
-    // id
-
-    public String getId()
-    {
-        return id;
-    }
-
-    public DrillServiceInstance setId(String id)
-    {
-        this.id = id;
-        return this;
-    }
-
-    // registrationTimeUTC
-
-    public long getRegistrationTimeUTC()
-    {
-        return registrationTimeUTC;
-    }
-
-    public DrillServiceInstance setRegistrationTimeUTC(long registrationTimeUTC)
-    {
-        this.registrationTimeUTC = registrationTimeUTC;
-        return this;
-    }
-
-    // endpoint
-
-    public DrillbitEndpoint getEndpoint()
-    {
-        return endpoint;
-    }
-
-    public DrillServiceInstance setEndpoint(DrillbitEndpoint endpoint)
-    {
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<DrillServiceInstance> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public DrillServiceInstance newMessage()
-    {
-        return new DrillServiceInstance();
-    }
-
-    public Class<DrillServiceInstance> typeClass()
-    {
-        return DrillServiceInstance.class;
-    }
-
-    public String messageName()
-    {
-        return DrillServiceInstance.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return DrillServiceInstance.class.getName();
-    }
-
-    public boolean isInitialized(DrillServiceInstance message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, DrillServiceInstance message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.id = input.readString();
-                    break;
-                case 2:
-                    message.registrationTimeUTC = input.readInt64();
-                    break;
-                case 3:
-                    message.endpoint = input.mergeObject(message.endpoint, DrillbitEndpoint.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, DrillServiceInstance message) throws IOException
-    {
-        if(message.id != null)
-            output.writeString(1, message.id, false);
-
-        if(message.registrationTimeUTC != 0)
-            output.writeInt64(2, message.registrationTimeUTC, false);
-
-        if(message.endpoint != null)
-             output.writeObject(3, message.endpoint, DrillbitEndpoint.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "id";
-            case 2: return "registrationTimeUTC";
-            case 3: return "endpoint";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("id", 1);
-        __fieldMap.put("registrationTimeUTC", 2);
-        __fieldMap.put("endpoint", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillbitEndpoint.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillbitEndpoint.java
deleted file mode 100644
index 0e642c5..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillbitEndpoint.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class DrillbitEndpoint implements Externalizable, Message<DrillbitEndpoint>, Schema<DrillbitEndpoint>
-{
-    public enum State implements com.dyuproject.protostuff.EnumLite<State>
-    {
-        STARTUP(0),
-        ONLINE(1),
-        QUIESCENT(2),
-        OFFLINE(3);
-        
-        public final int number;
-        
-        private State (int number)
-        {
-            this.number = number;
-        }
-        
-        public int getNumber()
-        {
-            return number;
-        }
-        
-        public static State valueOf(int number)
-        {
-            switch(number) 
-            {
-                case 0: return STARTUP;
-                case 1: return ONLINE;
-                case 2: return QUIESCENT;
-                case 3: return OFFLINE;
-                default: return null;
-            }
-        }
-    }
-
-
-    public static Schema<DrillbitEndpoint> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static DrillbitEndpoint getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final DrillbitEndpoint DEFAULT_INSTANCE = new DrillbitEndpoint();
-
-    
-    private String address;
-    private int userPort;
-    private int controlPort;
-    private int dataPort;
-    private Roles roles;
-    private String version;
-    private State state;
-    private int httpPort;
-
-    public DrillbitEndpoint()
-    {
-        
-    }
-
-    // getters and setters
-
-    // address
-
-    public String getAddress()
-    {
-        return address;
-    }
-
-    public DrillbitEndpoint setAddress(String address)
-    {
-        this.address = address;
-        return this;
-    }
-
-    // userPort
-
-    public int getUserPort()
-    {
-        return userPort;
-    }
-
-    public DrillbitEndpoint setUserPort(int userPort)
-    {
-        this.userPort = userPort;
-        return this;
-    }
-
-    // controlPort
-
-    public int getControlPort()
-    {
-        return controlPort;
-    }
-
-    public DrillbitEndpoint setControlPort(int controlPort)
-    {
-        this.controlPort = controlPort;
-        return this;
-    }
-
-    // dataPort
-
-    public int getDataPort()
-    {
-        return dataPort;
-    }
-
-    public DrillbitEndpoint setDataPort(int dataPort)
-    {
-        this.dataPort = dataPort;
-        return this;
-    }
-
-    // roles
-
-    public Roles getRoles()
-    {
-        return roles;
-    }
-
-    public DrillbitEndpoint setRoles(Roles roles)
-    {
-        this.roles = roles;
-        return this;
-    }
-
-    // version
-
-    public String getVersion()
-    {
-        return version;
-    }
-
-    public DrillbitEndpoint setVersion(String version)
-    {
-        this.version = version;
-        return this;
-    }
-
-    // state
-
-    public State getState()
-    {
-        return state == null ? State.STARTUP : state;
-    }
-
-    public DrillbitEndpoint setState(State state)
-    {
-        this.state = state;
-        return this;
-    }
-
-    // httpPort
-
-    public int getHttpPort()
-    {
-        return httpPort;
-    }
-
-    public DrillbitEndpoint setHttpPort(int httpPort)
-    {
-        this.httpPort = httpPort;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<DrillbitEndpoint> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public DrillbitEndpoint newMessage()
-    {
-        return new DrillbitEndpoint();
-    }
-
-    public Class<DrillbitEndpoint> typeClass()
-    {
-        return DrillbitEndpoint.class;
-    }
-
-    public String messageName()
-    {
-        return DrillbitEndpoint.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return DrillbitEndpoint.class.getName();
-    }
-
-    public boolean isInitialized(DrillbitEndpoint message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, DrillbitEndpoint message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.address = input.readString();
-                    break;
-                case 2:
-                    message.userPort = input.readInt32();
-                    break;
-                case 3:
-                    message.controlPort = input.readInt32();
-                    break;
-                case 4:
-                    message.dataPort = input.readInt32();
-                    break;
-                case 5:
-                    message.roles = input.mergeObject(message.roles, Roles.getSchema());
-                    break;
-
-                case 6:
-                    message.version = input.readString();
-                    break;
-                case 7:
-                    message.state = State.valueOf(input.readEnum());
-                    break;
-                case 8:
-                    message.httpPort = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, DrillbitEndpoint message) throws IOException
-    {
-        if(message.address != null)
-            output.writeString(1, message.address, false);
-
-        if(message.userPort != 0)
-            output.writeInt32(2, message.userPort, false);
-
-        if(message.controlPort != 0)
-            output.writeInt32(3, message.controlPort, false);
-
-        if(message.dataPort != 0)
-            output.writeInt32(4, message.dataPort, false);
-
-        if(message.roles != null)
-             output.writeObject(5, message.roles, Roles.getSchema(), false);
-
-
-        if(message.version != null)
-            output.writeString(6, message.version, false);
-
-        if(message.state != null)
-             output.writeEnum(7, message.state.number, false);
-
-        if(message.httpPort != 0)
-            output.writeInt32(8, message.httpPort, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "address";
-            case 2: return "userPort";
-            case 3: return "controlPort";
-            case 4: return "dataPort";
-            case 5: return "roles";
-            case 6: return "version";
-            case 7: return "state";
-            case 8: return "httpPort";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("address", 1);
-        __fieldMap.put("userPort", 2);
-        __fieldMap.put("controlPort", 3);
-        __fieldMap.put("dataPort", 4);
-        __fieldMap.put("roles", 5);
-        __fieldMap.put("version", 6);
-        __fieldMap.put("state", 7);
-        __fieldMap.put("httpPort", 8);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ExceptionWrapper.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ExceptionWrapper.java
deleted file mode 100644
index de0ee10..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ExceptionWrapper.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class ExceptionWrapper implements Externalizable, Message<ExceptionWrapper>, Schema<ExceptionWrapper>
-{
-
-    public static Schema<ExceptionWrapper> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static ExceptionWrapper getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final ExceptionWrapper DEFAULT_INSTANCE = new ExceptionWrapper();
-
-    
-    private String exceptionClass;
-    private String message;
-    private List<StackTraceElementWrapper> stackTrace;
-    private ExceptionWrapper cause;
-
-    public ExceptionWrapper()
-    {
-        
-    }
-
-    // getters and setters
-
-    // exceptionClass
-
-    public String getExceptionClass()
-    {
-        return exceptionClass;
-    }
-
-    public ExceptionWrapper setExceptionClass(String exceptionClass)
-    {
-        this.exceptionClass = exceptionClass;
-        return this;
-    }
-
-    // message
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    public ExceptionWrapper setMessage(String message)
-    {
-        this.message = message;
-        return this;
-    }
-
-    // stackTrace
-
-    public List<StackTraceElementWrapper> getStackTraceList()
-    {
-        return stackTrace;
-    }
-
-    public ExceptionWrapper setStackTraceList(List<StackTraceElementWrapper> stackTrace)
-    {
-        this.stackTrace = stackTrace;
-        return this;
-    }
-
-    // cause
-
-    public ExceptionWrapper getCause()
-    {
-        return cause;
-    }
-
-    public ExceptionWrapper setCause(ExceptionWrapper cause)
-    {
-        this.cause = cause;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<ExceptionWrapper> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public ExceptionWrapper newMessage()
-    {
-        return new ExceptionWrapper();
-    }
-
-    public Class<ExceptionWrapper> typeClass()
-    {
-        return ExceptionWrapper.class;
-    }
-
-    public String messageName()
-    {
-        return ExceptionWrapper.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return ExceptionWrapper.class.getName();
-    }
-
-    public boolean isInitialized(ExceptionWrapper message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, ExceptionWrapper message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.exceptionClass = input.readString();
-                    break;
-                case 2:
-                    message.message = input.readString();
-                    break;
-                case 3:
-                    if(message.stackTrace == null)
-                        message.stackTrace = new ArrayList<StackTraceElementWrapper>();
-                    message.stackTrace.add(input.mergeObject(null, StackTraceElementWrapper.getSchema()));
-                    break;
-
-                case 4:
-                    message.cause = input.mergeObject(message.cause, ExceptionWrapper.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, ExceptionWrapper message) throws IOException
-    {
-        if(message.exceptionClass != null)
-            output.writeString(1, message.exceptionClass, false);
-
-        if(message.message != null)
-            output.writeString(2, message.message, false);
-
-        if(message.stackTrace != null)
-        {
-            for(StackTraceElementWrapper stackTrace : message.stackTrace)
-            {
-                if(stackTrace != null)
-                    output.writeObject(3, stackTrace, StackTraceElementWrapper.getSchema(), true);
-            }
-        }
-
-
-        if(message.cause != null)
-             output.writeObject(4, message.cause, ExceptionWrapper.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "exceptionClass";
-            case 2: return "message";
-            case 3: return "stackTrace";
-            case 4: return "cause";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("exceptionClass", 1);
-        __fieldMap.put("message", 2);
-        __fieldMap.put("stackTrace", 3);
-        __fieldMap.put("cause", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FinishedReceiver.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FinishedReceiver.java
deleted file mode 100644
index 24aa562..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FinishedReceiver.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class FinishedReceiver implements Externalizable, Message<FinishedReceiver>, Schema<FinishedReceiver>
-{
-
-    public static Schema<FinishedReceiver> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static FinishedReceiver getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final FinishedReceiver DEFAULT_INSTANCE = new FinishedReceiver();
-
-    
-    private FragmentHandle receiver;
-    private FragmentHandle sender;
-
-    public FinishedReceiver()
-    {
-        
-    }
-
-    // getters and setters
-
-    // receiver
-
-    public FragmentHandle getReceiver()
-    {
-        return receiver;
-    }
-
-    public FinishedReceiver setReceiver(FragmentHandle receiver)
-    {
-        this.receiver = receiver;
-        return this;
-    }
-
-    // sender
-
-    public FragmentHandle getSender()
-    {
-        return sender;
-    }
-
-    public FinishedReceiver setSender(FragmentHandle sender)
-    {
-        this.sender = sender;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<FinishedReceiver> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public FinishedReceiver newMessage()
-    {
-        return new FinishedReceiver();
-    }
-
-    public Class<FinishedReceiver> typeClass()
-    {
-        return FinishedReceiver.class;
-    }
-
-    public String messageName()
-    {
-        return FinishedReceiver.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return FinishedReceiver.class.getName();
-    }
-
-    public boolean isInitialized(FinishedReceiver message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, FinishedReceiver message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.receiver = input.mergeObject(message.receiver, FragmentHandle.getSchema());
-                    break;
-
-                case 2:
-                    message.sender = input.mergeObject(message.sender, FragmentHandle.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, FinishedReceiver message) throws IOException
-    {
-        if(message.receiver != null)
-             output.writeObject(1, message.receiver, FragmentHandle.getSchema(), false);
-
-
-        if(message.sender != null)
-             output.writeObject(2, message.sender, FragmentHandle.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "receiver";
-            case 2: return "sender";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("receiver", 1);
-        __fieldMap.put("sender", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentHandle.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentHandle.java
deleted file mode 100644
index f7088e9..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentHandle.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class FragmentHandle implements Externalizable, Message<FragmentHandle>, Schema<FragmentHandle>
-{
-
-    public static Schema<FragmentHandle> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static FragmentHandle getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final FragmentHandle DEFAULT_INSTANCE = new FragmentHandle();
-
-    
-    private QueryId queryId;
-    private int majorFragmentId;
-    private int minorFragmentId;
-    private QueryId parentQueryId;
-
-    public FragmentHandle()
-    {
-        
-    }
-
-    // getters and setters
-
-    // queryId
-
-    public QueryId getQueryId()
-    {
-        return queryId;
-    }
-
-    public FragmentHandle setQueryId(QueryId queryId)
-    {
-        this.queryId = queryId;
-        return this;
-    }
-
-    // majorFragmentId
-
-    public int getMajorFragmentId()
-    {
-        return majorFragmentId;
-    }
-
-    public FragmentHandle setMajorFragmentId(int majorFragmentId)
-    {
-        this.majorFragmentId = majorFragmentId;
-        return this;
-    }
-
-    // minorFragmentId
-
-    public int getMinorFragmentId()
-    {
-        return minorFragmentId;
-    }
-
-    public FragmentHandle setMinorFragmentId(int minorFragmentId)
-    {
-        this.minorFragmentId = minorFragmentId;
-        return this;
-    }
-
-    // parentQueryId
-
-    public QueryId getParentQueryId()
-    {
-        return parentQueryId;
-    }
-
-    public FragmentHandle setParentQueryId(QueryId parentQueryId)
-    {
-        this.parentQueryId = parentQueryId;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<FragmentHandle> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public FragmentHandle newMessage()
-    {
-        return new FragmentHandle();
-    }
-
-    public Class<FragmentHandle> typeClass()
-    {
-        return FragmentHandle.class;
-    }
-
-    public String messageName()
-    {
-        return FragmentHandle.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return FragmentHandle.class.getName();
-    }
-
-    public boolean isInitialized(FragmentHandle message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, FragmentHandle message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.queryId = input.mergeObject(message.queryId, QueryId.getSchema());
-                    break;
-
-                case 2:
-                    message.majorFragmentId = input.readInt32();
-                    break;
-                case 3:
-                    message.minorFragmentId = input.readInt32();
-                    break;
-                case 4:
-                    message.parentQueryId = input.mergeObject(message.parentQueryId, QueryId.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, FragmentHandle message) throws IOException
-    {
-        if(message.queryId != null)
-             output.writeObject(1, message.queryId, QueryId.getSchema(), false);
-
-
-        if(message.majorFragmentId != 0)
-            output.writeInt32(2, message.majorFragmentId, false);
-
-        if(message.minorFragmentId != 0)
-            output.writeInt32(3, message.minorFragmentId, false);
-
-        if(message.parentQueryId != null)
-             output.writeObject(4, message.parentQueryId, QueryId.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "queryId";
-            case 2: return "majorFragmentId";
-            case 3: return "minorFragmentId";
-            case 4: return "parentQueryId";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("queryId", 1);
-        __fieldMap.put("majorFragmentId", 2);
-        __fieldMap.put("minorFragmentId", 3);
-        __fieldMap.put("parentQueryId", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentRecordBatch.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentRecordBatch.java
deleted file mode 100644
index 5bad25c..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentRecordBatch.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class FragmentRecordBatch implements Externalizable, Message<FragmentRecordBatch>, Schema<FragmentRecordBatch>
-{
-
-    public static Schema<FragmentRecordBatch> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static FragmentRecordBatch getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final FragmentRecordBatch DEFAULT_INSTANCE = new FragmentRecordBatch();
-
-    
-    private QueryId queryId;
-    private int receivingMajorFragmentId;
-    private List<Integer> receivingMinorFragmentId;
-    private int sendingMajorFragmentId;
-    private int sendingMinorFragmentId;
-    private RecordBatchDef def;
-    private Boolean isLastBatch;
-
-    public FragmentRecordBatch()
-    {
-        
-    }
-
-    // getters and setters
-
-    // queryId
-
-    public QueryId getQueryId()
-    {
-        return queryId;
-    }
-
-    public FragmentRecordBatch setQueryId(QueryId queryId)
-    {
-        this.queryId = queryId;
-        return this;
-    }
-
-    // receivingMajorFragmentId
-
-    public int getReceivingMajorFragmentId()
-    {
-        return receivingMajorFragmentId;
-    }
-
-    public FragmentRecordBatch setReceivingMajorFragmentId(int receivingMajorFragmentId)
-    {
-        this.receivingMajorFragmentId = receivingMajorFragmentId;
-        return this;
-    }
-
-    // receivingMinorFragmentId
-
-    public List<Integer> getReceivingMinorFragmentIdList()
-    {
-        return receivingMinorFragmentId;
-    }
-
-    public FragmentRecordBatch setReceivingMinorFragmentIdList(List<Integer> receivingMinorFragmentId)
-    {
-        this.receivingMinorFragmentId = receivingMinorFragmentId;
-        return this;
-    }
-
-    // sendingMajorFragmentId
-
-    public int getSendingMajorFragmentId()
-    {
-        return sendingMajorFragmentId;
-    }
-
-    public FragmentRecordBatch setSendingMajorFragmentId(int sendingMajorFragmentId)
-    {
-        this.sendingMajorFragmentId = sendingMajorFragmentId;
-        return this;
-    }
-
-    // sendingMinorFragmentId
-
-    public int getSendingMinorFragmentId()
-    {
-        return sendingMinorFragmentId;
-    }
-
-    public FragmentRecordBatch setSendingMinorFragmentId(int sendingMinorFragmentId)
-    {
-        this.sendingMinorFragmentId = sendingMinorFragmentId;
-        return this;
-    }
-
-    // def
-
-    public RecordBatchDef getDef()
-    {
-        return def;
-    }
-
-    public FragmentRecordBatch setDef(RecordBatchDef def)
-    {
-        this.def = def;
-        return this;
-    }
-
-    // isLastBatch
-
-    public Boolean getIsLastBatch()
-    {
-        return isLastBatch;
-    }
-
-    public FragmentRecordBatch setIsLastBatch(Boolean isLastBatch)
-    {
-        this.isLastBatch = isLastBatch;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<FragmentRecordBatch> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public FragmentRecordBatch newMessage()
-    {
-        return new FragmentRecordBatch();
-    }
-
-    public Class<FragmentRecordBatch> typeClass()
-    {
-        return FragmentRecordBatch.class;
-    }
-
-    public String messageName()
-    {
-        return FragmentRecordBatch.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return FragmentRecordBatch.class.getName();
-    }
-
-    public boolean isInitialized(FragmentRecordBatch message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, FragmentRecordBatch message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.queryId = input.mergeObject(message.queryId, QueryId.getSchema());
-                    break;
-
-                case 2:
-                    message.receivingMajorFragmentId = input.readInt32();
-                    break;
-                case 3:
-                    if(message.receivingMinorFragmentId == null)
-                        message.receivingMinorFragmentId = new ArrayList<Integer>();
-                    message.receivingMinorFragmentId.add(input.readInt32());
-                    break;
-                case 4:
-                    message.sendingMajorFragmentId = input.readInt32();
-                    break;
-                case 5:
-                    message.sendingMinorFragmentId = input.readInt32();
-                    break;
-                case 6:
-                    message.def = input.mergeObject(message.def, RecordBatchDef.getSchema());
-                    break;
-
-                case 7:
-                    message.isLastBatch = input.readBool();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, FragmentRecordBatch message) throws IOException
-    {
-        if(message.queryId != null)
-             output.writeObject(1, message.queryId, QueryId.getSchema(), false);
-
-
-        if(message.receivingMajorFragmentId != 0)
-            output.writeInt32(2, message.receivingMajorFragmentId, false);
-
-        if(message.receivingMinorFragmentId != null)
-        {
-            for(Integer receivingMinorFragmentId : message.receivingMinorFragmentId)
-            {
-                if(receivingMinorFragmentId != null)
-                    output.writeInt32(3, receivingMinorFragmentId, true);
-            }
-        }
-
-        if(message.sendingMajorFragmentId != 0)
-            output.writeInt32(4, message.sendingMajorFragmentId, false);
-
-        if(message.sendingMinorFragmentId != 0)
-            output.writeInt32(5, message.sendingMinorFragmentId, false);
-
-        if(message.def != null)
-             output.writeObject(6, message.def, RecordBatchDef.getSchema(), false);
-
-
-        if(message.isLastBatch != null)
-            output.writeBool(7, message.isLastBatch, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "queryId";
-            case 2: return "receivingMajorFragmentId";
-            case 3: return "receivingMinorFragmentId";
-            case 4: return "sendingMajorFragmentId";
-            case 5: return "sendingMinorFragmentId";
-            case 6: return "def";
-            case 7: return "isLastBatch";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("queryId", 1);
-        __fieldMap.put("receivingMajorFragmentId", 2);
-        __fieldMap.put("receivingMinorFragmentId", 3);
-        __fieldMap.put("sendingMajorFragmentId", 4);
-        __fieldMap.put("sendingMinorFragmentId", 5);
-        __fieldMap.put("def", 6);
-        __fieldMap.put("isLastBatch", 7);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentState.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentState.java
deleted file mode 100644
index 1869318..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentState.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum FragmentState implements com.dyuproject.protostuff.EnumLite<FragmentState>
-{
-    SENDING(0),
-    AWAITING_ALLOCATION(1),
-    RUNNING(2),
-    FINISHED(3),
-    CANCELLED(4),
-    FAILED(5),
-    CANCELLATION_REQUESTED(6);
-    
-    public final int number;
-    
-    private FragmentState (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static FragmentState valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return SENDING;
-            case 1: return AWAITING_ALLOCATION;
-            case 2: return RUNNING;
-            case 3: return FINISHED;
-            case 4: return CANCELLED;
-            case 5: return FAILED;
-            case 6: return CANCELLATION_REQUESTED;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentStatus.java
deleted file mode 100644
index de916b4..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentStatus.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class FragmentStatus implements Externalizable, Message<FragmentStatus>, Schema<FragmentStatus>
-{
-
-    public static Schema<FragmentStatus> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static FragmentStatus getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final FragmentStatus DEFAULT_INSTANCE = new FragmentStatus();
-
-    
-    private MinorFragmentProfile profile;
-    private FragmentHandle handle;
-
-    public FragmentStatus()
-    {
-        
-    }
-
-    // getters and setters
-
-    // profile
-
-    public MinorFragmentProfile getProfile()
-    {
-        return profile;
-    }
-
-    public FragmentStatus setProfile(MinorFragmentProfile profile)
-    {
-        this.profile = profile;
-        return this;
-    }
-
-    // handle
-
-    public FragmentHandle getHandle()
-    {
-        return handle;
-    }
-
-    public FragmentStatus setHandle(FragmentHandle handle)
-    {
-        this.handle = handle;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<FragmentStatus> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public FragmentStatus newMessage()
-    {
-        return new FragmentStatus();
-    }
-
-    public Class<FragmentStatus> typeClass()
-    {
-        return FragmentStatus.class;
-    }
-
-    public String messageName()
-    {
-        return FragmentStatus.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return FragmentStatus.class.getName();
-    }
-
-    public boolean isInitialized(FragmentStatus message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, FragmentStatus message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.profile = input.mergeObject(message.profile, MinorFragmentProfile.getSchema());
-                    break;
-
-                case 2:
-                    message.handle = input.mergeObject(message.handle, FragmentHandle.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, FragmentStatus message) throws IOException
-    {
-        if(message.profile != null)
-             output.writeObject(1, message.profile, MinorFragmentProfile.getSchema(), false);
-
-
-        if(message.handle != null)
-             output.writeObject(2, message.handle, FragmentHandle.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "profile";
-            case 2: return "handle";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("profile", 1);
-        __fieldMap.put("handle", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsReq.java
deleted file mode 100644
index 328ad3c..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsReq.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetCatalogsReq implements Externalizable, Message<GetCatalogsReq>, Schema<GetCatalogsReq>
-{
-
-    public static Schema<GetCatalogsReq> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetCatalogsReq getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetCatalogsReq DEFAULT_INSTANCE = new GetCatalogsReq();
-
-    
-    private LikeFilter catalogNameFilter;
-
-    public GetCatalogsReq()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogNameFilter
-
-    public LikeFilter getCatalogNameFilter()
-    {
-        return catalogNameFilter;
-    }
-
-    public GetCatalogsReq setCatalogNameFilter(LikeFilter catalogNameFilter)
-    {
-        this.catalogNameFilter = catalogNameFilter;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetCatalogsReq> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetCatalogsReq newMessage()
-    {
-        return new GetCatalogsReq();
-    }
-
-    public Class<GetCatalogsReq> typeClass()
-    {
-        return GetCatalogsReq.class;
-    }
-
-    public String messageName()
-    {
-        return GetCatalogsReq.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetCatalogsReq.class.getName();
-    }
-
-    public boolean isInitialized(GetCatalogsReq message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetCatalogsReq message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogNameFilter = input.mergeObject(message.catalogNameFilter, LikeFilter.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetCatalogsReq message) throws IOException
-    {
-        if(message.catalogNameFilter != null)
-             output.writeObject(1, message.catalogNameFilter, LikeFilter.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogNameFilter";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogNameFilter", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsResp.java
deleted file mode 100644
index 23981f3e..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsResp.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetCatalogsResp implements Externalizable, Message<GetCatalogsResp>, Schema<GetCatalogsResp>
-{
-
-    public static Schema<GetCatalogsResp> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetCatalogsResp getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetCatalogsResp DEFAULT_INSTANCE = new GetCatalogsResp();
-
-    
-    private RequestStatus status;
-    private List<CatalogMetadata> catalogs;
-    private DrillPBError error;
-
-    public GetCatalogsResp()
-    {
-        
-    }
-
-    // getters and setters
-
-    // status
-
-    public RequestStatus getStatus()
-    {
-        return status == null ? RequestStatus.UNKNOWN_STATUS : status;
-    }
-
-    public GetCatalogsResp setStatus(RequestStatus status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // catalogs
-
-    public List<CatalogMetadata> getCatalogsList()
-    {
-        return catalogs;
-    }
-
-    public GetCatalogsResp setCatalogsList(List<CatalogMetadata> catalogs)
-    {
-        this.catalogs = catalogs;
-        return this;
-    }
-
-    // error
-
-    public DrillPBError getError()
-    {
-        return error;
-    }
-
-    public GetCatalogsResp setError(DrillPBError error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetCatalogsResp> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetCatalogsResp newMessage()
-    {
-        return new GetCatalogsResp();
-    }
-
-    public Class<GetCatalogsResp> typeClass()
-    {
-        return GetCatalogsResp.class;
-    }
-
-    public String messageName()
-    {
-        return GetCatalogsResp.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetCatalogsResp.class.getName();
-    }
-
-    public boolean isInitialized(GetCatalogsResp message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetCatalogsResp message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.status = RequestStatus.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    if(message.catalogs == null)
-                        message.catalogs = new ArrayList<CatalogMetadata>();
-                    message.catalogs.add(input.mergeObject(null, CatalogMetadata.getSchema()));
-                    break;
-
-                case 3:
-                    message.error = input.mergeObject(message.error, DrillPBError.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetCatalogsResp message) throws IOException
-    {
-        if(message.status != null)
-             output.writeEnum(1, message.status.number, false);
-
-        if(message.catalogs != null)
-        {
-            for(CatalogMetadata catalogs : message.catalogs)
-            {
-                if(catalogs != null)
-                    output.writeObject(2, catalogs, CatalogMetadata.getSchema(), true);
-            }
-        }
-
-
-        if(message.error != null)
-             output.writeObject(3, message.error, DrillPBError.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "status";
-            case 2: return "catalogs";
-            case 3: return "error";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("status", 1);
-        __fieldMap.put("catalogs", 2);
-        __fieldMap.put("error", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsReq.java
deleted file mode 100644
index 276d162..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsReq.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetColumnsReq implements Externalizable, Message<GetColumnsReq>, Schema<GetColumnsReq>
-{
-
-    public static Schema<GetColumnsReq> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetColumnsReq getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetColumnsReq DEFAULT_INSTANCE = new GetColumnsReq();
-
-    
-    private LikeFilter catalogNameFilter;
-    private LikeFilter schemaNameFilter;
-    private LikeFilter tableNameFilter;
-    private LikeFilter columnNameFilter;
-
-    public GetColumnsReq()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogNameFilter
-
-    public LikeFilter getCatalogNameFilter()
-    {
-        return catalogNameFilter;
-    }
-
-    public GetColumnsReq setCatalogNameFilter(LikeFilter catalogNameFilter)
-    {
-        this.catalogNameFilter = catalogNameFilter;
-        return this;
-    }
-
-    // schemaNameFilter
-
-    public LikeFilter getSchemaNameFilter()
-    {
-        return schemaNameFilter;
-    }
-
-    public GetColumnsReq setSchemaNameFilter(LikeFilter schemaNameFilter)
-    {
-        this.schemaNameFilter = schemaNameFilter;
-        return this;
-    }
-
-    // tableNameFilter
-
-    public LikeFilter getTableNameFilter()
-    {
-        return tableNameFilter;
-    }
-
-    public GetColumnsReq setTableNameFilter(LikeFilter tableNameFilter)
-    {
-        this.tableNameFilter = tableNameFilter;
-        return this;
-    }
-
-    // columnNameFilter
-
-    public LikeFilter getColumnNameFilter()
-    {
-        return columnNameFilter;
-    }
-
-    public GetColumnsReq setColumnNameFilter(LikeFilter columnNameFilter)
-    {
-        this.columnNameFilter = columnNameFilter;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetColumnsReq> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetColumnsReq newMessage()
-    {
-        return new GetColumnsReq();
-    }
-
-    public Class<GetColumnsReq> typeClass()
-    {
-        return GetColumnsReq.class;
-    }
-
-    public String messageName()
-    {
-        return GetColumnsReq.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetColumnsReq.class.getName();
-    }
-
-    public boolean isInitialized(GetColumnsReq message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetColumnsReq message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogNameFilter = input.mergeObject(message.catalogNameFilter, LikeFilter.getSchema());
-                    break;
-
-                case 2:
-                    message.schemaNameFilter = input.mergeObject(message.schemaNameFilter, LikeFilter.getSchema());
-                    break;
-
-                case 3:
-                    message.tableNameFilter = input.mergeObject(message.tableNameFilter, LikeFilter.getSchema());
-                    break;
-
-                case 4:
-                    message.columnNameFilter = input.mergeObject(message.columnNameFilter, LikeFilter.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetColumnsReq message) throws IOException
-    {
-        if(message.catalogNameFilter != null)
-             output.writeObject(1, message.catalogNameFilter, LikeFilter.getSchema(), false);
-
-
-        if(message.schemaNameFilter != null)
-             output.writeObject(2, message.schemaNameFilter, LikeFilter.getSchema(), false);
-
-
-        if(message.tableNameFilter != null)
-             output.writeObject(3, message.tableNameFilter, LikeFilter.getSchema(), false);
-
-
-        if(message.columnNameFilter != null)
-             output.writeObject(4, message.columnNameFilter, LikeFilter.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogNameFilter";
-            case 2: return "schemaNameFilter";
-            case 3: return "tableNameFilter";
-            case 4: return "columnNameFilter";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogNameFilter", 1);
-        __fieldMap.put("schemaNameFilter", 2);
-        __fieldMap.put("tableNameFilter", 3);
-        __fieldMap.put("columnNameFilter", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsResp.java
deleted file mode 100644
index 470d02b..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsResp.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetColumnsResp implements Externalizable, Message<GetColumnsResp>, Schema<GetColumnsResp>
-{
-
-    public static Schema<GetColumnsResp> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetColumnsResp getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetColumnsResp DEFAULT_INSTANCE = new GetColumnsResp();
-
-    
-    private RequestStatus status;
-    private List<ColumnMetadata> columns;
-    private DrillPBError error;
-
-    public GetColumnsResp()
-    {
-        
-    }
-
-    // getters and setters
-
-    // status
-
-    public RequestStatus getStatus()
-    {
-        return status == null ? RequestStatus.UNKNOWN_STATUS : status;
-    }
-
-    public GetColumnsResp setStatus(RequestStatus status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // columns
-
-    public List<ColumnMetadata> getColumnsList()
-    {
-        return columns;
-    }
-
-    public GetColumnsResp setColumnsList(List<ColumnMetadata> columns)
-    {
-        this.columns = columns;
-        return this;
-    }
-
-    // error
-
-    public DrillPBError getError()
-    {
-        return error;
-    }
-
-    public GetColumnsResp setError(DrillPBError error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetColumnsResp> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetColumnsResp newMessage()
-    {
-        return new GetColumnsResp();
-    }
-
-    public Class<GetColumnsResp> typeClass()
-    {
-        return GetColumnsResp.class;
-    }
-
-    public String messageName()
-    {
-        return GetColumnsResp.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetColumnsResp.class.getName();
-    }
-
-    public boolean isInitialized(GetColumnsResp message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetColumnsResp message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.status = RequestStatus.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    if(message.columns == null)
-                        message.columns = new ArrayList<ColumnMetadata>();
-                    message.columns.add(input.mergeObject(null, ColumnMetadata.getSchema()));
-                    break;
-
-                case 3:
-                    message.error = input.mergeObject(message.error, DrillPBError.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetColumnsResp message) throws IOException
-    {
-        if(message.status != null)
-             output.writeEnum(1, message.status.number, false);
-
-        if(message.columns != null)
-        {
-            for(ColumnMetadata columns : message.columns)
-            {
-                if(columns != null)
-                    output.writeObject(2, columns, ColumnMetadata.getSchema(), true);
-            }
-        }
-
-
-        if(message.error != null)
-             output.writeObject(3, message.error, DrillPBError.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "status";
-            case 2: return "columns";
-            case 3: return "error";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("status", 1);
-        __fieldMap.put("columns", 2);
-        __fieldMap.put("error", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetQueryPlanFragments.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetQueryPlanFragments.java
deleted file mode 100644
index 7d6e949..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetQueryPlanFragments.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-import com.dyuproject.protostuff.UninitializedMessageException;
-
-public final class GetQueryPlanFragments implements Externalizable, Message<GetQueryPlanFragments>, Schema<GetQueryPlanFragments>
-{
-
-    public static Schema<GetQueryPlanFragments> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetQueryPlanFragments getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetQueryPlanFragments DEFAULT_INSTANCE = new GetQueryPlanFragments();
-
-    static final Boolean DEFAULT_SPLIT_PLAN = new Boolean(false);
-    
-    private String query;
-    private QueryType type;
-    private Boolean splitPlan = DEFAULT_SPLIT_PLAN;
-
-    public GetQueryPlanFragments()
-    {
-        
-    }
-
-    public GetQueryPlanFragments(
-        String query
-    )
-    {
-        this.query = query;
-    }
-
-    // getters and setters
-
-    // query
-
-    public String getQuery()
-    {
-        return query;
-    }
-
-    public GetQueryPlanFragments setQuery(String query)
-    {
-        this.query = query;
-        return this;
-    }
-
-    // type
-
-    public QueryType getType()
-    {
-        return type == null ? QueryType.SQL : type;
-    }
-
-    public GetQueryPlanFragments setType(QueryType type)
-    {
-        this.type = type;
-        return this;
-    }
-
-    // splitPlan
-
-    public Boolean getSplitPlan()
-    {
-        return splitPlan;
-    }
-
-    public GetQueryPlanFragments setSplitPlan(Boolean splitPlan)
-    {
-        this.splitPlan = splitPlan;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetQueryPlanFragments> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetQueryPlanFragments newMessage()
-    {
-        return new GetQueryPlanFragments();
-    }
-
-    public Class<GetQueryPlanFragments> typeClass()
-    {
-        return GetQueryPlanFragments.class;
-    }
-
-    public String messageName()
-    {
-        return GetQueryPlanFragments.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetQueryPlanFragments.class.getName();
-    }
-
-    public boolean isInitialized(GetQueryPlanFragments message)
-    {
-        return 
-            message.query != null;
-    }
-
-    public void mergeFrom(Input input, GetQueryPlanFragments message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.query = input.readString();
-                    break;
-                case 2:
-                    message.type = QueryType.valueOf(input.readEnum());
-                    break;
-                case 3:
-                    message.splitPlan = input.readBool();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetQueryPlanFragments message) throws IOException
-    {
-        if(message.query == null)
-            throw new UninitializedMessageException(message);
-        output.writeString(1, message.query, false);
-
-        if(message.type != null)
-             output.writeEnum(2, message.type.number, false);
-
-        if(message.splitPlan != null && message.splitPlan != DEFAULT_SPLIT_PLAN)
-            output.writeBool(3, message.splitPlan, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "query";
-            case 2: return "type";
-            case 3: return "splitPlan";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("query", 1);
-        __fieldMap.put("type", 2);
-        __fieldMap.put("splitPlan", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasReq.java
deleted file mode 100644
index 8f82005..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasReq.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetSchemasReq implements Externalizable, Message<GetSchemasReq>, Schema<GetSchemasReq>
-{
-
-    public static Schema<GetSchemasReq> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetSchemasReq getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetSchemasReq DEFAULT_INSTANCE = new GetSchemasReq();
-
-    
-    private LikeFilter catalogNameFilter;
-    private LikeFilter schemaNameFilter;
-
-    public GetSchemasReq()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogNameFilter
-
-    public LikeFilter getCatalogNameFilter()
-    {
-        return catalogNameFilter;
-    }
-
-    public GetSchemasReq setCatalogNameFilter(LikeFilter catalogNameFilter)
-    {
-        this.catalogNameFilter = catalogNameFilter;
-        return this;
-    }
-
-    // schemaNameFilter
-
-    public LikeFilter getSchemaNameFilter()
-    {
-        return schemaNameFilter;
-    }
-
-    public GetSchemasReq setSchemaNameFilter(LikeFilter schemaNameFilter)
-    {
-        this.schemaNameFilter = schemaNameFilter;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetSchemasReq> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetSchemasReq newMessage()
-    {
-        return new GetSchemasReq();
-    }
-
-    public Class<GetSchemasReq> typeClass()
-    {
-        return GetSchemasReq.class;
-    }
-
-    public String messageName()
-    {
-        return GetSchemasReq.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetSchemasReq.class.getName();
-    }
-
-    public boolean isInitialized(GetSchemasReq message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetSchemasReq message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogNameFilter = input.mergeObject(message.catalogNameFilter, LikeFilter.getSchema());
-                    break;
-
-                case 2:
-                    message.schemaNameFilter = input.mergeObject(message.schemaNameFilter, LikeFilter.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetSchemasReq message) throws IOException
-    {
-        if(message.catalogNameFilter != null)
-             output.writeObject(1, message.catalogNameFilter, LikeFilter.getSchema(), false);
-
-
-        if(message.schemaNameFilter != null)
-             output.writeObject(2, message.schemaNameFilter, LikeFilter.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogNameFilter";
-            case 2: return "schemaNameFilter";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogNameFilter", 1);
-        __fieldMap.put("schemaNameFilter", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasResp.java
deleted file mode 100644
index 40baaca..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasResp.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetSchemasResp implements Externalizable, Message<GetSchemasResp>, Schema<GetSchemasResp>
-{
-
-    public static Schema<GetSchemasResp> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetSchemasResp getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetSchemasResp DEFAULT_INSTANCE = new GetSchemasResp();
-
-    
-    private RequestStatus status;
-    private List<SchemaMetadata> schemas;
-    private DrillPBError error;
-
-    public GetSchemasResp()
-    {
-        
-    }
-
-    // getters and setters
-
-    // status
-
-    public RequestStatus getStatus()
-    {
-        return status == null ? RequestStatus.UNKNOWN_STATUS : status;
-    }
-
-    public GetSchemasResp setStatus(RequestStatus status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // schemas
-
-    public List<SchemaMetadata> getSchemasList()
-    {
-        return schemas;
-    }
-
-    public GetSchemasResp setSchemasList(List<SchemaMetadata> schemas)
-    {
-        this.schemas = schemas;
-        return this;
-    }
-
-    // error
-
-    public DrillPBError getError()
-    {
-        return error;
-    }
-
-    public GetSchemasResp setError(DrillPBError error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetSchemasResp> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetSchemasResp newMessage()
-    {
-        return new GetSchemasResp();
-    }
-
-    public Class<GetSchemasResp> typeClass()
-    {
-        return GetSchemasResp.class;
-    }
-
-    public String messageName()
-    {
-        return GetSchemasResp.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetSchemasResp.class.getName();
-    }
-
-    public boolean isInitialized(GetSchemasResp message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetSchemasResp message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.status = RequestStatus.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    if(message.schemas == null)
-                        message.schemas = new ArrayList<SchemaMetadata>();
-                    message.schemas.add(input.mergeObject(null, SchemaMetadata.getSchema()));
-                    break;
-
-                case 3:
-                    message.error = input.mergeObject(message.error, DrillPBError.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetSchemasResp message) throws IOException
-    {
-        if(message.status != null)
-             output.writeEnum(1, message.status.number, false);
-
-        if(message.schemas != null)
-        {
-            for(SchemaMetadata schemas : message.schemas)
-            {
-                if(schemas != null)
-                    output.writeObject(2, schemas, SchemaMetadata.getSchema(), true);
-            }
-        }
-
-
-        if(message.error != null)
-             output.writeObject(3, message.error, DrillPBError.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "status";
-            case 2: return "schemas";
-            case 3: return "error";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("status", 1);
-        __fieldMap.put("schemas", 2);
-        __fieldMap.put("error", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetServerMetaResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetServerMetaResp.java
deleted file mode 100644
index 41d0c58..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetServerMetaResp.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetServerMetaResp implements Externalizable, Message<GetServerMetaResp>, Schema<GetServerMetaResp>
-{
-
-    public static Schema<GetServerMetaResp> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetServerMetaResp getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetServerMetaResp DEFAULT_INSTANCE = new GetServerMetaResp();
-
-    
-    private RequestStatus status;
-    private ServerMeta serverMeta;
-    private DrillPBError error;
-
-    public GetServerMetaResp()
-    {
-        
-    }
-
-    // getters and setters
-
-    // status
-
-    public RequestStatus getStatus()
-    {
-        return status == null ? RequestStatus.UNKNOWN_STATUS : status;
-    }
-
-    public GetServerMetaResp setStatus(RequestStatus status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // serverMeta
-
-    public ServerMeta getServerMeta()
-    {
-        return serverMeta;
-    }
-
-    public GetServerMetaResp setServerMeta(ServerMeta serverMeta)
-    {
-        this.serverMeta = serverMeta;
-        return this;
-    }
-
-    // error
-
-    public DrillPBError getError()
-    {
-        return error;
-    }
-
-    public GetServerMetaResp setError(DrillPBError error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetServerMetaResp> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetServerMetaResp newMessage()
-    {
-        return new GetServerMetaResp();
-    }
-
-    public Class<GetServerMetaResp> typeClass()
-    {
-        return GetServerMetaResp.class;
-    }
-
-    public String messageName()
-    {
-        return GetServerMetaResp.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetServerMetaResp.class.getName();
-    }
-
-    public boolean isInitialized(GetServerMetaResp message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetServerMetaResp message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.status = RequestStatus.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.serverMeta = input.mergeObject(message.serverMeta, ServerMeta.getSchema());
-                    break;
-
-                case 3:
-                    message.error = input.mergeObject(message.error, DrillPBError.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetServerMetaResp message) throws IOException
-    {
-        if(message.status != null)
-             output.writeEnum(1, message.status.number, false);
-
-        if(message.serverMeta != null)
-             output.writeObject(2, message.serverMeta, ServerMeta.getSchema(), false);
-
-
-        if(message.error != null)
-             output.writeObject(3, message.error, DrillPBError.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "status";
-            case 2: return "serverMeta";
-            case 3: return "error";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("status", 1);
-        __fieldMap.put("serverMeta", 2);
-        __fieldMap.put("error", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesReq.java
deleted file mode 100644
index 003ada9..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesReq.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetTablesReq implements Externalizable, Message<GetTablesReq>, Schema<GetTablesReq>
-{
-
-    public static Schema<GetTablesReq> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetTablesReq getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetTablesReq DEFAULT_INSTANCE = new GetTablesReq();
-
-    
-    private LikeFilter catalogNameFilter;
-    private LikeFilter schemaNameFilter;
-    private LikeFilter tableNameFilter;
-    private List<String> tableTypeFilter;
-
-    public GetTablesReq()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogNameFilter
-
-    public LikeFilter getCatalogNameFilter()
-    {
-        return catalogNameFilter;
-    }
-
-    public GetTablesReq setCatalogNameFilter(LikeFilter catalogNameFilter)
-    {
-        this.catalogNameFilter = catalogNameFilter;
-        return this;
-    }
-
-    // schemaNameFilter
-
-    public LikeFilter getSchemaNameFilter()
-    {
-        return schemaNameFilter;
-    }
-
-    public GetTablesReq setSchemaNameFilter(LikeFilter schemaNameFilter)
-    {
-        this.schemaNameFilter = schemaNameFilter;
-        return this;
-    }
-
-    // tableNameFilter
-
-    public LikeFilter getTableNameFilter()
-    {
-        return tableNameFilter;
-    }
-
-    public GetTablesReq setTableNameFilter(LikeFilter tableNameFilter)
-    {
-        this.tableNameFilter = tableNameFilter;
-        return this;
-    }
-
-    // tableTypeFilter
-
-    public List<String> getTableTypeFilterList()
-    {
-        return tableTypeFilter;
-    }
-
-    public GetTablesReq setTableTypeFilterList(List<String> tableTypeFilter)
-    {
-        this.tableTypeFilter = tableTypeFilter;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetTablesReq> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetTablesReq newMessage()
-    {
-        return new GetTablesReq();
-    }
-
-    public Class<GetTablesReq> typeClass()
-    {
-        return GetTablesReq.class;
-    }
-
-    public String messageName()
-    {
-        return GetTablesReq.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetTablesReq.class.getName();
-    }
-
-    public boolean isInitialized(GetTablesReq message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetTablesReq message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogNameFilter = input.mergeObject(message.catalogNameFilter, LikeFilter.getSchema());
-                    break;
-
-                case 2:
-                    message.schemaNameFilter = input.mergeObject(message.schemaNameFilter, LikeFilter.getSchema());
-                    break;
-
-                case 3:
-                    message.tableNameFilter = input.mergeObject(message.tableNameFilter, LikeFilter.getSchema());
-                    break;
-
-                case 4:
-                    if(message.tableTypeFilter == null)
-                        message.tableTypeFilter = new ArrayList<String>();
-                    message.tableTypeFilter.add(input.readString());
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetTablesReq message) throws IOException
-    {
-        if(message.catalogNameFilter != null)
-             output.writeObject(1, message.catalogNameFilter, LikeFilter.getSchema(), false);
-
-
-        if(message.schemaNameFilter != null)
-             output.writeObject(2, message.schemaNameFilter, LikeFilter.getSchema(), false);
-
-
-        if(message.tableNameFilter != null)
-             output.writeObject(3, message.tableNameFilter, LikeFilter.getSchema(), false);
-
-
-        if(message.tableTypeFilter != null)
-        {
-            for(String tableTypeFilter : message.tableTypeFilter)
-            {
-                if(tableTypeFilter != null)
-                    output.writeString(4, tableTypeFilter, true);
-            }
-        }
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogNameFilter";
-            case 2: return "schemaNameFilter";
-            case 3: return "tableNameFilter";
-            case 4: return "tableTypeFilter";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogNameFilter", 1);
-        __fieldMap.put("schemaNameFilter", 2);
-        __fieldMap.put("tableNameFilter", 3);
-        __fieldMap.put("tableTypeFilter", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesResp.java
deleted file mode 100644
index 317b7d8..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesResp.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class GetTablesResp implements Externalizable, Message<GetTablesResp>, Schema<GetTablesResp>
-{
-
-    public static Schema<GetTablesResp> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static GetTablesResp getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final GetTablesResp DEFAULT_INSTANCE = new GetTablesResp();
-
-    
-    private RequestStatus status;
-    private List<TableMetadata> tables;
-    private DrillPBError error;
-
-    public GetTablesResp()
-    {
-        
-    }
-
-    // getters and setters
-
-    // status
-
-    public RequestStatus getStatus()
-    {
-        return status == null ? RequestStatus.UNKNOWN_STATUS : status;
-    }
-
-    public GetTablesResp setStatus(RequestStatus status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // tables
-
-    public List<TableMetadata> getTablesList()
-    {
-        return tables;
-    }
-
-    public GetTablesResp setTablesList(List<TableMetadata> tables)
-    {
-        this.tables = tables;
-        return this;
-    }
-
-    // error
-
-    public DrillPBError getError()
-    {
-        return error;
-    }
-
-    public GetTablesResp setError(DrillPBError error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<GetTablesResp> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public GetTablesResp newMessage()
-    {
-        return new GetTablesResp();
-    }
-
-    public Class<GetTablesResp> typeClass()
-    {
-        return GetTablesResp.class;
-    }
-
-    public String messageName()
-    {
-        return GetTablesResp.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return GetTablesResp.class.getName();
-    }
-
-    public boolean isInitialized(GetTablesResp message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, GetTablesResp message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.status = RequestStatus.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    if(message.tables == null)
-                        message.tables = new ArrayList<TableMetadata>();
-                    message.tables.add(input.mergeObject(null, TableMetadata.getSchema()));
-                    break;
-
-                case 3:
-                    message.error = input.mergeObject(message.error, DrillPBError.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, GetTablesResp message) throws IOException
-    {
-        if(message.status != null)
-             output.writeEnum(1, message.status.number, false);
-
-        if(message.tables != null)
-        {
-            for(TableMetadata tables : message.tables)
-            {
-                if(tables != null)
-                    output.writeObject(2, tables, TableMetadata.getSchema(), true);
-            }
-        }
-
-
-        if(message.error != null)
-             output.writeObject(3, message.error, DrillPBError.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "status";
-            case 2: return "tables";
-            case 3: return "error";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("status", 1);
-        __fieldMap.put("tables", 2);
-        __fieldMap.put("error", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GroupBySupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GroupBySupport.java
deleted file mode 100644
index c61a6f7..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GroupBySupport.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum GroupBySupport implements com.dyuproject.protostuff.EnumLite<GroupBySupport>
-{
-    GB_NONE(1),
-    GB_SELECT_ONLY(2),
-    GB_BEYOND_SELECT(3),
-    GB_UNRELATED(4);
-    
-    public final int number;
-    
-    private GroupBySupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static GroupBySupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 1: return GB_NONE;
-            case 2: return GB_SELECT_ONLY;
-            case 3: return GB_BEYOND_SELECT;
-            case 4: return GB_UNRELATED;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/HandshakeStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/HandshakeStatus.java
deleted file mode 100644
index 1bf95e4..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/HandshakeStatus.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum HandshakeStatus implements com.dyuproject.protostuff.EnumLite<HandshakeStatus>
-{
-    SUCCESS(1),
-    RPC_VERSION_MISMATCH(2),
-    AUTH_FAILED(3),
-    UNKNOWN_FAILURE(4),
-    AUTH_REQUIRED(5);
-    
-    public final int number;
-    
-    private HandshakeStatus (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static HandshakeStatus valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 1: return SUCCESS;
-            case 2: return RPC_VERSION_MISMATCH;
-            case 3: return AUTH_FAILED;
-            case 4: return UNKNOWN_FAILURE;
-            case 5: return AUTH_REQUIRED;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/IdentifierCasing.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/IdentifierCasing.java
deleted file mode 100644
index eac0828..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/IdentifierCasing.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum IdentifierCasing implements com.dyuproject.protostuff.EnumLite<IdentifierCasing>
-{
-    IC_UNKNOWN(0),
-    IC_STORES_LOWER(1),
-    IC_STORES_MIXED(2),
-    IC_STORES_UPPER(3),
-    IC_SUPPORTS_MIXED(4);
-    
-    public final int number;
-    
-    private IdentifierCasing (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static IdentifierCasing valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return IC_UNKNOWN;
-            case 1: return IC_STORES_LOWER;
-            case 2: return IC_STORES_MIXED;
-            case 3: return IC_STORES_UPPER;
-            case 4: return IC_SUPPORTS_MIXED;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/InitializeFragments.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/InitializeFragments.java
deleted file mode 100644
index d768797..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/InitializeFragments.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class InitializeFragments implements Externalizable, Message<InitializeFragments>, Schema<InitializeFragments>
-{
-
-    public static Schema<InitializeFragments> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static InitializeFragments getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final InitializeFragments DEFAULT_INSTANCE = new InitializeFragments();
-
-    
-    private List<PlanFragment> fragment;
-
-    public InitializeFragments()
-    {
-        
-    }
-
-    // getters and setters
-
-    // fragment
-
-    public List<PlanFragment> getFragmentList()
-    {
-        return fragment;
-    }
-
-    public InitializeFragments setFragmentList(List<PlanFragment> fragment)
-    {
-        this.fragment = fragment;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<InitializeFragments> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public InitializeFragments newMessage()
-    {
-        return new InitializeFragments();
-    }
-
-    public Class<InitializeFragments> typeClass()
-    {
-        return InitializeFragments.class;
-    }
-
-    public String messageName()
-    {
-        return InitializeFragments.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return InitializeFragments.class.getName();
-    }
-
-    public boolean isInitialized(InitializeFragments message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, InitializeFragments message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    if(message.fragment == null)
-                        message.fragment = new ArrayList<PlanFragment>();
-                    message.fragment.add(input.mergeObject(null, PlanFragment.getSchema()));
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, InitializeFragments message) throws IOException
-    {
-        if(message.fragment != null)
-        {
-            for(PlanFragment fragment : message.fragment)
-            {
-                if(fragment != null)
-                    output.writeObject(1, fragment, PlanFragment.getSchema(), true);
-            }
-        }
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "fragment";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("fragment", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Jar.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Jar.java
deleted file mode 100644
index aa406b9..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Jar.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class Jar implements Externalizable, Message<Jar>, Schema<Jar>
-{
-
-    public static Schema<Jar> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static Jar getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final Jar DEFAULT_INSTANCE = new Jar();
-
-    
-    private String name;
-    private List<String> functionSignature;
-
-    public Jar()
-    {
-        
-    }
-
-    // getters and setters
-
-    // name
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public Jar setName(String name)
-    {
-        this.name = name;
-        return this;
-    }
-
-    // functionSignature
-
-    public List<String> getFunctionSignatureList()
-    {
-        return functionSignature;
-    }
-
-    public Jar setFunctionSignatureList(List<String> functionSignature)
-    {
-        this.functionSignature = functionSignature;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<Jar> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public Jar newMessage()
-    {
-        return new Jar();
-    }
-
-    public Class<Jar> typeClass()
-    {
-        return Jar.class;
-    }
-
-    public String messageName()
-    {
-        return Jar.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return Jar.class.getName();
-    }
-
-    public boolean isInitialized(Jar message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, Jar message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.name = input.readString();
-                    break;
-                case 2:
-                    if(message.functionSignature == null)
-                        message.functionSignature = new ArrayList<String>();
-                    message.functionSignature.add(input.readString());
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, Jar message) throws IOException
-    {
-        if(message.name != null)
-            output.writeString(1, message.name, false);
-
-        if(message.functionSignature != null)
-        {
-            for(String functionSignature : message.functionSignature)
-            {
-                if(functionSignature != null)
-                    output.writeString(2, functionSignature, true);
-            }
-        }
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "name";
-            case 2: return "functionSignature";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("name", 1);
-        __fieldMap.put("functionSignature", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/LikeFilter.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/LikeFilter.java
deleted file mode 100644
index c0b1847..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/LikeFilter.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class LikeFilter implements Externalizable, Message<LikeFilter>, Schema<LikeFilter>
-{
-
-    public static Schema<LikeFilter> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static LikeFilter getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final LikeFilter DEFAULT_INSTANCE = new LikeFilter();
-
-    
-    private String pattern;
-    private String escape;
-
-    public LikeFilter()
-    {
-        
-    }
-
-    // getters and setters
-
-    // pattern
-
-    public String getPattern()
-    {
-        return pattern;
-    }
-
-    public LikeFilter setPattern(String pattern)
-    {
-        this.pattern = pattern;
-        return this;
-    }
-
-    // escape
-
-    public String getEscape()
-    {
-        return escape;
-    }
-
-    public LikeFilter setEscape(String escape)
-    {
-        this.escape = escape;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<LikeFilter> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public LikeFilter newMessage()
-    {
-        return new LikeFilter();
-    }
-
-    public Class<LikeFilter> typeClass()
-    {
-        return LikeFilter.class;
-    }
-
-    public String messageName()
-    {
-        return LikeFilter.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return LikeFilter.class.getName();
-    }
-
-    public boolean isInitialized(LikeFilter message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, LikeFilter message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.pattern = input.readString();
-                    break;
-                case 2:
-                    message.escape = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, LikeFilter message) throws IOException
-    {
-        if(message.pattern != null)
-            output.writeString(1, message.pattern, false);
-
-        if(message.escape != null)
-            output.writeString(2, message.escape, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "pattern";
-            case 2: return "escape";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("pattern", 1);
-        __fieldMap.put("escape", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MajorFragmentProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MajorFragmentProfile.java
deleted file mode 100644
index d07e5f8..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MajorFragmentProfile.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class MajorFragmentProfile implements Externalizable, Message<MajorFragmentProfile>, Schema<MajorFragmentProfile>
-{
-
-    public static Schema<MajorFragmentProfile> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static MajorFragmentProfile getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final MajorFragmentProfile DEFAULT_INSTANCE = new MajorFragmentProfile();
-
-    
-    private int majorFragmentId;
-    private List<MinorFragmentProfile> minorFragmentProfile;
-
-    public MajorFragmentProfile()
-    {
-        
-    }
-
-    // getters and setters
-
-    // majorFragmentId
-
-    public int getMajorFragmentId()
-    {
-        return majorFragmentId;
-    }
-
-    public MajorFragmentProfile setMajorFragmentId(int majorFragmentId)
-    {
-        this.majorFragmentId = majorFragmentId;
-        return this;
-    }
-
-    // minorFragmentProfile
-
-    public List<MinorFragmentProfile> getMinorFragmentProfileList()
-    {
-        return minorFragmentProfile;
-    }
-
-    public MajorFragmentProfile setMinorFragmentProfileList(List<MinorFragmentProfile> minorFragmentProfile)
-    {
-        this.minorFragmentProfile = minorFragmentProfile;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<MajorFragmentProfile> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public MajorFragmentProfile newMessage()
-    {
-        return new MajorFragmentProfile();
-    }
-
-    public Class<MajorFragmentProfile> typeClass()
-    {
-        return MajorFragmentProfile.class;
-    }
-
-    public String messageName()
-    {
-        return MajorFragmentProfile.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return MajorFragmentProfile.class.getName();
-    }
-
-    public boolean isInitialized(MajorFragmentProfile message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, MajorFragmentProfile message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.majorFragmentId = input.readInt32();
-                    break;
-                case 2:
-                    if(message.minorFragmentProfile == null)
-                        message.minorFragmentProfile = new ArrayList<MinorFragmentProfile>();
-                    message.minorFragmentProfile.add(input.mergeObject(null, MinorFragmentProfile.getSchema()));
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, MajorFragmentProfile message) throws IOException
-    {
-        if(message.majorFragmentId != 0)
-            output.writeInt32(1, message.majorFragmentId, false);
-
-        if(message.minorFragmentProfile != null)
-        {
-            for(MinorFragmentProfile minorFragmentProfile : message.minorFragmentProfile)
-            {
-                if(minorFragmentProfile != null)
-                    output.writeObject(2, minorFragmentProfile, MinorFragmentProfile.getSchema(), true);
-            }
-        }
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "majorFragmentId";
-            case 2: return "minorFragmentProfile";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("majorFragmentId", 1);
-        __fieldMap.put("minorFragmentProfile", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MetricValue.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MetricValue.java
deleted file mode 100644
index f749a1e..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MetricValue.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class MetricValue implements Externalizable, Message<MetricValue>, Schema<MetricValue>
-{
-
-    public static Schema<MetricValue> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static MetricValue getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final MetricValue DEFAULT_INSTANCE = new MetricValue();
-
-    
-    private int metricId;
-    private long longValue;
-    private double doubleValue;
-
-    public MetricValue()
-    {
-        
-    }
-
-    // getters and setters
-
-    // metricId
-
-    public int getMetricId()
-    {
-        return metricId;
-    }
-
-    public MetricValue setMetricId(int metricId)
-    {
-        this.metricId = metricId;
-        return this;
-    }
-
-    // longValue
-
-    public long getLongValue()
-    {
-        return longValue;
-    }
-
-    public MetricValue setLongValue(long longValue)
-    {
-        this.longValue = longValue;
-        return this;
-    }
-
-    // doubleValue
-
-    public double getDoubleValue()
-    {
-        return doubleValue;
-    }
-
-    public MetricValue setDoubleValue(double doubleValue)
-    {
-        this.doubleValue = doubleValue;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<MetricValue> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public MetricValue newMessage()
-    {
-        return new MetricValue();
-    }
-
-    public Class<MetricValue> typeClass()
-    {
-        return MetricValue.class;
-    }
-
-    public String messageName()
-    {
-        return MetricValue.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return MetricValue.class.getName();
-    }
-
-    public boolean isInitialized(MetricValue message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, MetricValue message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.metricId = input.readInt32();
-                    break;
-                case 2:
-                    message.longValue = input.readInt64();
-                    break;
-                case 3:
-                    message.doubleValue = input.readDouble();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, MetricValue message) throws IOException
-    {
-        if(message.metricId != 0)
-            output.writeInt32(1, message.metricId, false);
-
-        if(message.longValue != 0)
-            output.writeInt64(2, message.longValue, false);
-
-        if(message.doubleValue != 0)
-            output.writeDouble(3, message.doubleValue, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "metricId";
-            case 2: return "longValue";
-            case 3: return "doubleValue";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("metricId", 1);
-        __fieldMap.put("longValue", 2);
-        __fieldMap.put("doubleValue", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MinorFragmentProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MinorFragmentProfile.java
deleted file mode 100644
index 0eaad10..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MinorFragmentProfile.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class MinorFragmentProfile implements Externalizable, Message<MinorFragmentProfile>, Schema<MinorFragmentProfile>
-{
-
-    public static Schema<MinorFragmentProfile> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static MinorFragmentProfile getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final MinorFragmentProfile DEFAULT_INSTANCE = new MinorFragmentProfile();
-
-    
-    private FragmentState state;
-    private DrillPBError error;
-    private int minorFragmentId;
-    private List<OperatorProfile> operatorProfile;
-    private long startTime;
-    private long endTime;
-    private long memoryUsed;
-    private long maxMemoryUsed;
-    private DrillbitEndpoint endpoint;
-    private long lastUpdate;
-    private long lastProgress;
-
-    public MinorFragmentProfile()
-    {
-        
-    }
-
-    // getters and setters
-
-    // state
-
-    public FragmentState getState()
-    {
-        return state == null ? FragmentState.SENDING : state;
-    }
-
-    public MinorFragmentProfile setState(FragmentState state)
-    {
-        this.state = state;
-        return this;
-    }
-
-    // error
-
-    public DrillPBError getError()
-    {
-        return error;
-    }
-
-    public MinorFragmentProfile setError(DrillPBError error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // minorFragmentId
-
-    public int getMinorFragmentId()
-    {
-        return minorFragmentId;
-    }
-
-    public MinorFragmentProfile setMinorFragmentId(int minorFragmentId)
-    {
-        this.minorFragmentId = minorFragmentId;
-        return this;
-    }
-
-    // operatorProfile
-
-    public List<OperatorProfile> getOperatorProfileList()
-    {
-        return operatorProfile;
-    }
-
-    public MinorFragmentProfile setOperatorProfileList(List<OperatorProfile> operatorProfile)
-    {
-        this.operatorProfile = operatorProfile;
-        return this;
-    }
-
-    // startTime
-
-    public long getStartTime()
-    {
-        return startTime;
-    }
-
-    public MinorFragmentProfile setStartTime(long startTime)
-    {
-        this.startTime = startTime;
-        return this;
-    }
-
-    // endTime
-
-    public long getEndTime()
-    {
-        return endTime;
-    }
-
-    public MinorFragmentProfile setEndTime(long endTime)
-    {
-        this.endTime = endTime;
-        return this;
-    }
-
-    // memoryUsed
-
-    public long getMemoryUsed()
-    {
-        return memoryUsed;
-    }
-
-    public MinorFragmentProfile setMemoryUsed(long memoryUsed)
-    {
-        this.memoryUsed = memoryUsed;
-        return this;
-    }
-
-    // maxMemoryUsed
-
-    public long getMaxMemoryUsed()
-    {
-        return maxMemoryUsed;
-    }
-
-    public MinorFragmentProfile setMaxMemoryUsed(long maxMemoryUsed)
-    {
-        this.maxMemoryUsed = maxMemoryUsed;
-        return this;
-    }
-
-    // endpoint
-
-    public DrillbitEndpoint getEndpoint()
-    {
-        return endpoint;
-    }
-
-    public MinorFragmentProfile setEndpoint(DrillbitEndpoint endpoint)
-    {
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    // lastUpdate
-
-    public long getLastUpdate()
-    {
-        return lastUpdate;
-    }
-
-    public MinorFragmentProfile setLastUpdate(long lastUpdate)
-    {
-        this.lastUpdate = lastUpdate;
-        return this;
-    }
-
-    // lastProgress
-
-    public long getLastProgress()
-    {
-        return lastProgress;
-    }
-
-    public MinorFragmentProfile setLastProgress(long lastProgress)
-    {
-        this.lastProgress = lastProgress;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<MinorFragmentProfile> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public MinorFragmentProfile newMessage()
-    {
-        return new MinorFragmentProfile();
-    }
-
-    public Class<MinorFragmentProfile> typeClass()
-    {
-        return MinorFragmentProfile.class;
-    }
-
-    public String messageName()
-    {
-        return MinorFragmentProfile.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return MinorFragmentProfile.class.getName();
-    }
-
-    public boolean isInitialized(MinorFragmentProfile message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, MinorFragmentProfile message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.state = FragmentState.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.error = input.mergeObject(message.error, DrillPBError.getSchema());
-                    break;
-
-                case 3:
-                    message.minorFragmentId = input.readInt32();
-                    break;
-                case 4:
-                    if(message.operatorProfile == null)
-                        message.operatorProfile = new ArrayList<OperatorProfile>();
-                    message.operatorProfile.add(input.mergeObject(null, OperatorProfile.getSchema()));
-                    break;
-
-                case 5:
-                    message.startTime = input.readInt64();
-                    break;
-                case 6:
-                    message.endTime = input.readInt64();
-                    break;
-                case 7:
-                    message.memoryUsed = input.readInt64();
-                    break;
-                case 8:
-                    message.maxMemoryUsed = input.readInt64();
-                    break;
-                case 9:
-                    message.endpoint = input.mergeObject(message.endpoint, DrillbitEndpoint.getSchema());
-                    break;
-
-                case 10:
-                    message.lastUpdate = input.readInt64();
-                    break;
-                case 11:
-                    message.lastProgress = input.readInt64();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, MinorFragmentProfile message) throws IOException
-    {
-        if(message.state != null)
-             output.writeEnum(1, message.state.number, false);
-
-        if(message.error != null)
-             output.writeObject(2, message.error, DrillPBError.getSchema(), false);
-
-
-        if(message.minorFragmentId != 0)
-            output.writeInt32(3, message.minorFragmentId, false);
-
-        if(message.operatorProfile != null)
-        {
-            for(OperatorProfile operatorProfile : message.operatorProfile)
-            {
-                if(operatorProfile != null)
-                    output.writeObject(4, operatorProfile, OperatorProfile.getSchema(), true);
-            }
-        }
-
-
-        if(message.startTime != 0)
-            output.writeInt64(5, message.startTime, false);
-
-        if(message.endTime != 0)
-            output.writeInt64(6, message.endTime, false);
-
-        if(message.memoryUsed != 0)
-            output.writeInt64(7, message.memoryUsed, false);
-
-        if(message.maxMemoryUsed != 0)
-            output.writeInt64(8, message.maxMemoryUsed, false);
-
-        if(message.endpoint != null)
-             output.writeObject(9, message.endpoint, DrillbitEndpoint.getSchema(), false);
-
-
-        if(message.lastUpdate != 0)
-            output.writeInt64(10, message.lastUpdate, false);
-
-        if(message.lastProgress != 0)
-            output.writeInt64(11, message.lastProgress, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "state";
-            case 2: return "error";
-            case 3: return "minorFragmentId";
-            case 4: return "operatorProfile";
-            case 5: return "startTime";
-            case 6: return "endTime";
-            case 7: return "memoryUsed";
-            case 8: return "maxMemoryUsed";
-            case 9: return "endpoint";
-            case 10: return "lastUpdate";
-            case 11: return "lastProgress";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("state", 1);
-        __fieldMap.put("error", 2);
-        __fieldMap.put("minorFragmentId", 3);
-        __fieldMap.put("operatorProfile", 4);
-        __fieldMap.put("startTime", 5);
-        __fieldMap.put("endTime", 6);
-        __fieldMap.put("memoryUsed", 7);
-        __fieldMap.put("maxMemoryUsed", 8);
-        __fieldMap.put("endpoint", 9);
-        __fieldMap.put("lastUpdate", 10);
-        __fieldMap.put("lastProgress", 11);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NamePart.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NamePart.java
deleted file mode 100644
index 264915b..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NamePart.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class NamePart implements Externalizable, Message<NamePart>, Schema<NamePart>
-{
-    public enum Type implements com.dyuproject.protostuff.EnumLite<Type>
-    {
-        NAME(0),
-        ARRAY(1);
-        
-        public final int number;
-        
-        private Type (int number)
-        {
-            this.number = number;
-        }
-        
-        public int getNumber()
-        {
-            return number;
-        }
-        
-        public static Type valueOf(int number)
-        {
-            switch(number) 
-            {
-                case 0: return NAME;
-                case 1: return ARRAY;
-                default: return null;
-            }
-        }
-    }
-
-
-    public static Schema<NamePart> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static NamePart getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final NamePart DEFAULT_INSTANCE = new NamePart();
-
-    
-    private Type type;
-    private String name;
-    private NamePart child;
-
-    public NamePart()
-    {
-        
-    }
-
-    // getters and setters
-
-    // type
-
-    public Type getType()
-    {
-        return type == null ? Type.NAME : type;
-    }
-
-    public NamePart setType(Type type)
-    {
-        this.type = type;
-        return this;
-    }
-
-    // name
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public NamePart setName(String name)
-    {
-        this.name = name;
-        return this;
-    }
-
-    // child
-
-    public NamePart getChild()
-    {
-        return child;
-    }
-
-    public NamePart setChild(NamePart child)
-    {
-        this.child = child;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<NamePart> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public NamePart newMessage()
-    {
-        return new NamePart();
-    }
-
-    public Class<NamePart> typeClass()
-    {
-        return NamePart.class;
-    }
-
-    public String messageName()
-    {
-        return NamePart.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return NamePart.class.getName();
-    }
-
-    public boolean isInitialized(NamePart message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, NamePart message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.type = Type.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.name = input.readString();
-                    break;
-                case 3:
-                    message.child = input.mergeObject(message.child, NamePart.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, NamePart message) throws IOException
-    {
-        if(message.type != null)
-             output.writeEnum(1, message.type.number, false);
-
-        if(message.name != null)
-            output.writeString(2, message.name, false);
-
-        if(message.child != null)
-             output.writeObject(3, message.child, NamePart.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "type";
-            case 2: return "name";
-            case 3: return "child";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("type", 1);
-        __fieldMap.put("name", 2);
-        __fieldMap.put("child", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NodeStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NodeStatus.java
deleted file mode 100644
index 910b014..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NodeStatus.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class NodeStatus implements Externalizable, Message<NodeStatus>, Schema<NodeStatus>
-{
-
-    public static Schema<NodeStatus> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static NodeStatus getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final NodeStatus DEFAULT_INSTANCE = new NodeStatus();
-
-    
-    private int nodeId;
-    private long memoryFootprint;
-
-    public NodeStatus()
-    {
-        
-    }
-
-    // getters and setters
-
-    // nodeId
-
-    public int getNodeId()
-    {
-        return nodeId;
-    }
-
-    public NodeStatus setNodeId(int nodeId)
-    {
-        this.nodeId = nodeId;
-        return this;
-    }
-
-    // memoryFootprint
-
-    public long getMemoryFootprint()
-    {
-        return memoryFootprint;
-    }
-
-    public NodeStatus setMemoryFootprint(long memoryFootprint)
-    {
-        this.memoryFootprint = memoryFootprint;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<NodeStatus> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public NodeStatus newMessage()
-    {
-        return new NodeStatus();
-    }
-
-    public Class<NodeStatus> typeClass()
-    {
-        return NodeStatus.class;
-    }
-
-    public String messageName()
-    {
-        return NodeStatus.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return NodeStatus.class.getName();
-    }
-
-    public boolean isInitialized(NodeStatus message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, NodeStatus message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.nodeId = input.readInt32();
-                    break;
-                case 2:
-                    message.memoryFootprint = input.readInt64();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, NodeStatus message) throws IOException
-    {
-        if(message.nodeId != 0)
-            output.writeInt32(1, message.nodeId, false);
-
-        if(message.memoryFootprint != 0)
-            output.writeInt64(2, message.memoryFootprint, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "nodeId";
-            case 2: return "memoryFootprint";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("nodeId", 1);
-        __fieldMap.put("memoryFootprint", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NullCollation.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NullCollation.java
deleted file mode 100644
index ed830a6..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NullCollation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum NullCollation implements com.dyuproject.protostuff.EnumLite<NullCollation>
-{
-    NC_UNKNOWN(0),
-    NC_AT_START(1),
-    NC_AT_END(2),
-    NC_HIGH(3),
-    NC_LOW(4);
-    
-    public final int number;
-    
-    private NullCollation (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static NullCollation valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return NC_UNKNOWN;
-            case 1: return NC_AT_START;
-            case 2: return NC_AT_END;
-            case 3: return NC_HIGH;
-            case 4: return NC_LOW;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OperatorProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OperatorProfile.java
deleted file mode 100644
index d6275fa..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OperatorProfile.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class OperatorProfile implements Externalizable, Message<OperatorProfile>, Schema<OperatorProfile>
-{
-
-    public static Schema<OperatorProfile> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static OperatorProfile getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final OperatorProfile DEFAULT_INSTANCE = new OperatorProfile();
-
-    
-    private List<StreamProfile> inputProfile;
-    private int operatorId;
-    private int operatorType;
-    private long setupNanos;
-    private long processNanos;
-    private long peakLocalMemoryAllocated;
-    private List<MetricValue> metric;
-    private long waitNanos;
-
-    public OperatorProfile()
-    {
-        
-    }
-
-    // getters and setters
-
-    // inputProfile
-
-    public List<StreamProfile> getInputProfileList()
-    {
-        return inputProfile;
-    }
-
-    public OperatorProfile setInputProfileList(List<StreamProfile> inputProfile)
-    {
-        this.inputProfile = inputProfile;
-        return this;
-    }
-
-    // operatorId
-
-    public int getOperatorId()
-    {
-        return operatorId;
-    }
-
-    public OperatorProfile setOperatorId(int operatorId)
-    {
-        this.operatorId = operatorId;
-        return this;
-    }
-
-    // operatorType
-
-    public int getOperatorType()
-    {
-        return operatorType;
-    }
-
-    public OperatorProfile setOperatorType(int operatorType)
-    {
-        this.operatorType = operatorType;
-        return this;
-    }
-
-    // setupNanos
-
-    public long getSetupNanos()
-    {
-        return setupNanos;
-    }
-
-    public OperatorProfile setSetupNanos(long setupNanos)
-    {
-        this.setupNanos = setupNanos;
-        return this;
-    }
-
-    // processNanos
-
-    public long getProcessNanos()
-    {
-        return processNanos;
-    }
-
-    public OperatorProfile setProcessNanos(long processNanos)
-    {
-        this.processNanos = processNanos;
-        return this;
-    }
-
-    // peakLocalMemoryAllocated
-
-    public long getPeakLocalMemoryAllocated()
-    {
-        return peakLocalMemoryAllocated;
-    }
-
-    public OperatorProfile setPeakLocalMemoryAllocated(long peakLocalMemoryAllocated)
-    {
-        this.peakLocalMemoryAllocated = peakLocalMemoryAllocated;
-        return this;
-    }
-
-    // metric
-
-    public List<MetricValue> getMetricList()
-    {
-        return metric;
-    }
-
-    public OperatorProfile setMetricList(List<MetricValue> metric)
-    {
-        this.metric = metric;
-        return this;
-    }
-
-    // waitNanos
-
-    public long getWaitNanos()
-    {
-        return waitNanos;
-    }
-
-    public OperatorProfile setWaitNanos(long waitNanos)
-    {
-        this.waitNanos = waitNanos;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<OperatorProfile> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public OperatorProfile newMessage()
-    {
-        return new OperatorProfile();
-    }
-
-    public Class<OperatorProfile> typeClass()
-    {
-        return OperatorProfile.class;
-    }
-
-    public String messageName()
-    {
-        return OperatorProfile.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return OperatorProfile.class.getName();
-    }
-
-    public boolean isInitialized(OperatorProfile message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, OperatorProfile message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    if(message.inputProfile == null)
-                        message.inputProfile = new ArrayList<StreamProfile>();
-                    message.inputProfile.add(input.mergeObject(null, StreamProfile.getSchema()));
-                    break;
-
-                case 3:
-                    message.operatorId = input.readInt32();
-                    break;
-                case 4:
-                    message.operatorType = input.readInt32();
-                    break;
-                case 5:
-                    message.setupNanos = input.readInt64();
-                    break;
-                case 6:
-                    message.processNanos = input.readInt64();
-                    break;
-                case 7:
-                    message.peakLocalMemoryAllocated = input.readInt64();
-                    break;
-                case 8:
-                    if(message.metric == null)
-                        message.metric = new ArrayList<MetricValue>();
-                    message.metric.add(input.mergeObject(null, MetricValue.getSchema()));
-                    break;
-
-                case 9:
-                    message.waitNanos = input.readInt64();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, OperatorProfile message) throws IOException
-    {
-        if(message.inputProfile != null)
-        {
-            for(StreamProfile inputProfile : message.inputProfile)
-            {
-                if(inputProfile != null)
-                    output.writeObject(1, inputProfile, StreamProfile.getSchema(), true);
-            }
-        }
-
-
-        if(message.operatorId != 0)
-            output.writeInt32(3, message.operatorId, false);
-
-        if(message.operatorType != 0)
-            output.writeInt32(4, message.operatorType, false);
-
-        if(message.setupNanos != 0)
-            output.writeInt64(5, message.setupNanos, false);
-
-        if(message.processNanos != 0)
-            output.writeInt64(6, message.processNanos, false);
-
-        if(message.peakLocalMemoryAllocated != 0)
-            output.writeInt64(7, message.peakLocalMemoryAllocated, false);
-
-        if(message.metric != null)
-        {
-            for(MetricValue metric : message.metric)
-            {
-                if(metric != null)
-                    output.writeObject(8, metric, MetricValue.getSchema(), true);
-            }
-        }
-
-
-        if(message.waitNanos != 0)
-            output.writeInt64(9, message.waitNanos, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "inputProfile";
-            case 3: return "operatorId";
-            case 4: return "operatorType";
-            case 5: return "setupNanos";
-            case 6: return "processNanos";
-            case 7: return "peakLocalMemoryAllocated";
-            case 8: return "metric";
-            case 9: return "waitNanos";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("inputProfile", 1);
-        __fieldMap.put("operatorId", 3);
-        __fieldMap.put("operatorType", 4);
-        __fieldMap.put("setupNanos", 5);
-        __fieldMap.put("processNanos", 6);
-        __fieldMap.put("peakLocalMemoryAllocated", 7);
-        __fieldMap.put("metric", 8);
-        __fieldMap.put("waitNanos", 9);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OrderBySupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OrderBySupport.java
deleted file mode 100644
index 54d181d..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OrderBySupport.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum OrderBySupport implements com.dyuproject.protostuff.EnumLite<OrderBySupport>
-{
-    OB_UNKNOWN(0),
-    OB_UNRELATED(1),
-    OB_EXPRESSION(2);
-    
-    public final int number;
-    
-    private OrderBySupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static OrderBySupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return OB_UNKNOWN;
-            case 1: return OB_UNRELATED;
-            case 2: return OB_EXPRESSION;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OuterJoinSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OuterJoinSupport.java
deleted file mode 100644
index a6b9d6e..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OuterJoinSupport.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum OuterJoinSupport implements com.dyuproject.protostuff.EnumLite<OuterJoinSupport>
-{
-    OJ_UNKNOWN(0),
-    OJ_LEFT(1),
-    OJ_RIGHT(2),
-    OJ_FULL(3),
-    OJ_NESTED(4),
-    OJ_NOT_ORDERED(5),
-    OJ_INNER(6),
-    OJ_ALL_COMPARISON_OPS(7);
-    
-    public final int number;
-    
-    private OuterJoinSupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static OuterJoinSupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return OJ_UNKNOWN;
-            case 1: return OJ_LEFT;
-            case 2: return OJ_RIGHT;
-            case 3: return OJ_FULL;
-            case 4: return OJ_NESTED;
-            case 5: return OJ_NOT_ORDERED;
-            case 6: return OJ_INNER;
-            case 7: return OJ_ALL_COMPARISON_OPS;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ParsingError.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ParsingError.java
deleted file mode 100644
index 71204a4..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ParsingError.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class ParsingError implements Externalizable, Message<ParsingError>, Schema<ParsingError>
-{
-
-    public static Schema<ParsingError> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static ParsingError getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final ParsingError DEFAULT_INSTANCE = new ParsingError();
-
-    
-    private int startColumn;
-    private int startRow;
-    private int endColumn;
-    private int endRow;
-
-    public ParsingError()
-    {
-        
-    }
-
-    // getters and setters
-
-    // startColumn
-
-    public int getStartColumn()
-    {
-        return startColumn;
-    }
-
-    public ParsingError setStartColumn(int startColumn)
-    {
-        this.startColumn = startColumn;
-        return this;
-    }
-
-    // startRow
-
-    public int getStartRow()
-    {
-        return startRow;
-    }
-
-    public ParsingError setStartRow(int startRow)
-    {
-        this.startRow = startRow;
-        return this;
-    }
-
-    // endColumn
-
-    public int getEndColumn()
-    {
-        return endColumn;
-    }
-
-    public ParsingError setEndColumn(int endColumn)
-    {
-        this.endColumn = endColumn;
-        return this;
-    }
-
-    // endRow
-
-    public int getEndRow()
-    {
-        return endRow;
-    }
-
-    public ParsingError setEndRow(int endRow)
-    {
-        this.endRow = endRow;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<ParsingError> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public ParsingError newMessage()
-    {
-        return new ParsingError();
-    }
-
-    public Class<ParsingError> typeClass()
-    {
-        return ParsingError.class;
-    }
-
-    public String messageName()
-    {
-        return ParsingError.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return ParsingError.class.getName();
-    }
-
-    public boolean isInitialized(ParsingError message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, ParsingError message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 2:
-                    message.startColumn = input.readInt32();
-                    break;
-                case 3:
-                    message.startRow = input.readInt32();
-                    break;
-                case 4:
-                    message.endColumn = input.readInt32();
-                    break;
-                case 5:
-                    message.endRow = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, ParsingError message) throws IOException
-    {
-        if(message.startColumn != 0)
-            output.writeInt32(2, message.startColumn, false);
-
-        if(message.startRow != 0)
-            output.writeInt32(3, message.startRow, false);
-
-        if(message.endColumn != 0)
-            output.writeInt32(4, message.endColumn, false);
-
-        if(message.endRow != 0)
-            output.writeInt32(5, message.endRow, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 2: return "startColumn";
-            case 3: return "startRow";
-            case 4: return "endColumn";
-            case 5: return "endRow";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("startColumn", 2);
-        __fieldMap.put("startRow", 3);
-        __fieldMap.put("endColumn", 4);
-        __fieldMap.put("endRow", 5);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PlanFragment.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PlanFragment.java
deleted file mode 100644
index ebbdf63..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PlanFragment.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class PlanFragment implements Externalizable, Message<PlanFragment>, Schema<PlanFragment>
-{
-
-    public static Schema<PlanFragment> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static PlanFragment getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final PlanFragment DEFAULT_INSTANCE = new PlanFragment();
-
-    static final long DEFAULT_MEM_INITIAL = 20000000l;
-    static final long DEFAULT_MEM_MAX = 2000000000l;
-    
-    private FragmentHandle handle;
-    private float networkCost;
-    private float cpuCost;
-    private float diskCost;
-    private float memoryCost;
-    private String fragmentJson;
-    private Boolean leafFragment;
-    private DrillbitEndpoint assignment;
-    private DrillbitEndpoint foreman;
-    private long memInitial = DEFAULT_MEM_INITIAL;
-    private long memMax = DEFAULT_MEM_MAX;
-    private UserCredentials credentials;
-    private String optionsJson;
-    private QueryContextInformation context;
-    private List<Collector> collector;
-
-    public PlanFragment()
-    {
-        
-    }
-
-    // getters and setters
-
-    // handle
-
-    public FragmentHandle getHandle()
-    {
-        return handle;
-    }
-
-    public PlanFragment setHandle(FragmentHandle handle)
-    {
-        this.handle = handle;
-        return this;
-    }
-
-    // networkCost
-
-    public float getNetworkCost()
-    {
-        return networkCost;
-    }
-
-    public PlanFragment setNetworkCost(float networkCost)
-    {
-        this.networkCost = networkCost;
-        return this;
-    }
-
-    // cpuCost
-
-    public float getCpuCost()
-    {
-        return cpuCost;
-    }
-
-    public PlanFragment setCpuCost(float cpuCost)
-    {
-        this.cpuCost = cpuCost;
-        return this;
-    }
-
-    // diskCost
-
-    public float getDiskCost()
-    {
-        return diskCost;
-    }
-
-    public PlanFragment setDiskCost(float diskCost)
-    {
-        this.diskCost = diskCost;
-        return this;
-    }
-
-    // memoryCost
-
-    public float getMemoryCost()
-    {
-        return memoryCost;
-    }
-
-    public PlanFragment setMemoryCost(float memoryCost)
-    {
-        this.memoryCost = memoryCost;
-        return this;
-    }
-
-    // fragmentJson
-
-    public String getFragmentJson()
-    {
-        return fragmentJson;
-    }
-
-    public PlanFragment setFragmentJson(String fragmentJson)
-    {
-        this.fragmentJson = fragmentJson;
-        return this;
-    }
-
-    // leafFragment
-
-    public Boolean getLeafFragment()
-    {
-        return leafFragment;
-    }
-
-    public PlanFragment setLeafFragment(Boolean leafFragment)
-    {
-        this.leafFragment = leafFragment;
-        return this;
-    }
-
-    // assignment
-
-    public DrillbitEndpoint getAssignment()
-    {
-        return assignment;
-    }
-
-    public PlanFragment setAssignment(DrillbitEndpoint assignment)
-    {
-        this.assignment = assignment;
-        return this;
-    }
-
-    // foreman
-
-    public DrillbitEndpoint getForeman()
-    {
-        return foreman;
-    }
-
-    public PlanFragment setForeman(DrillbitEndpoint foreman)
-    {
-        this.foreman = foreman;
-        return this;
-    }
-
-    // memInitial
-
-    public long getMemInitial()
-    {
-        return memInitial;
-    }
-
-    public PlanFragment setMemInitial(long memInitial)
-    {
-        this.memInitial = memInitial;
-        return this;
-    }
-
-    // memMax
-
-    public long getMemMax()
-    {
-        return memMax;
-    }
-
-    public PlanFragment setMemMax(long memMax)
-    {
-        this.memMax = memMax;
-        return this;
-    }
-
-    // credentials
-
-    public UserCredentials getCredentials()
-    {
-        return credentials;
-    }
-
-    public PlanFragment setCredentials(UserCredentials credentials)
-    {
-        this.credentials = credentials;
-        return this;
-    }
-
-    // optionsJson
-
-    public String getOptionsJson()
-    {
-        return optionsJson;
-    }
-
-    public PlanFragment setOptionsJson(String optionsJson)
-    {
-        this.optionsJson = optionsJson;
-        return this;
-    }
-
-    // context
-
-    public QueryContextInformation getContext()
-    {
-        return context;
-    }
-
-    public PlanFragment setContext(QueryContextInformation context)
-    {
-        this.context = context;
-        return this;
-    }
-
-    // collector
-
-    public List<Collector> getCollectorList()
-    {
-        return collector;
-    }
-
-    public PlanFragment setCollectorList(List<Collector> collector)
-    {
-        this.collector = collector;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<PlanFragment> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public PlanFragment newMessage()
-    {
-        return new PlanFragment();
-    }
-
-    public Class<PlanFragment> typeClass()
-    {
-        return PlanFragment.class;
-    }
-
-    public String messageName()
-    {
-        return PlanFragment.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return PlanFragment.class.getName();
-    }
-
-    public boolean isInitialized(PlanFragment message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, PlanFragment message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.handle = input.mergeObject(message.handle, FragmentHandle.getSchema());
-                    break;
-
-                case 4:
-                    message.networkCost = input.readFloat();
-                    break;
-                case 5:
-                    message.cpuCost = input.readFloat();
-                    break;
-                case 6:
-                    message.diskCost = input.readFloat();
-                    break;
-                case 7:
-                    message.memoryCost = input.readFloat();
-                    break;
-                case 8:
-                    message.fragmentJson = input.readString();
-                    break;
-                case 9:
-                    message.leafFragment = input.readBool();
-                    break;
-                case 10:
-                    message.assignment = input.mergeObject(message.assignment, DrillbitEndpoint.getSchema());
-                    break;
-
-                case 11:
-                    message.foreman = input.mergeObject(message.foreman, DrillbitEndpoint.getSchema());
-                    break;
-
-                case 12:
-                    message.memInitial = input.readInt64();
-                    break;
-                case 13:
-                    message.memMax = input.readInt64();
-                    break;
-                case 14:
-                    message.credentials = input.mergeObject(message.credentials, UserCredentials.getSchema());
-                    break;
-
-                case 15:
-                    message.optionsJson = input.readString();
-                    break;
-                case 16:
-                    message.context = input.mergeObject(message.context, QueryContextInformation.getSchema());
-                    break;
-
-                case 17:
-                    if(message.collector == null)
-                        message.collector = new ArrayList<Collector>();
-                    message.collector.add(input.mergeObject(null, Collector.getSchema()));
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, PlanFragment message) throws IOException
-    {
-        if(message.handle != null)
-             output.writeObject(1, message.handle, FragmentHandle.getSchema(), false);
-
-
-        if(message.networkCost != 0)
-            output.writeFloat(4, message.networkCost, false);
-
-        if(message.cpuCost != 0)
-            output.writeFloat(5, message.cpuCost, false);
-
-        if(message.diskCost != 0)
-            output.writeFloat(6, message.diskCost, false);
-
-        if(message.memoryCost != 0)
-            output.writeFloat(7, message.memoryCost, false);
-
-        if(message.fragmentJson != null)
-            output.writeString(8, message.fragmentJson, false);
-
-        if(message.leafFragment != null)
-            output.writeBool(9, message.leafFragment, false);
-
-        if(message.assignment != null)
-             output.writeObject(10, message.assignment, DrillbitEndpoint.getSchema(), false);
-
-
-        if(message.foreman != null)
-             output.writeObject(11, message.foreman, DrillbitEndpoint.getSchema(), false);
-
-
-        if(message.memInitial != DEFAULT_MEM_INITIAL)
-            output.writeInt64(12, message.memInitial, false);
-
-        if(message.memMax != DEFAULT_MEM_MAX)
-            output.writeInt64(13, message.memMax, false);
-
-        if(message.credentials != null)
-             output.writeObject(14, message.credentials, UserCredentials.getSchema(), false);
-
-
-        if(message.optionsJson != null)
-            output.writeString(15, message.optionsJson, false);
-
-        if(message.context != null)
-             output.writeObject(16, message.context, QueryContextInformation.getSchema(), false);
-
-
-        if(message.collector != null)
-        {
-            for(Collector collector : message.collector)
-            {
-                if(collector != null)
-                    output.writeObject(17, collector, Collector.getSchema(), true);
-            }
-        }
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "handle";
-            case 4: return "networkCost";
-            case 5: return "cpuCost";
-            case 6: return "diskCost";
-            case 7: return "memoryCost";
-            case 8: return "fragmentJson";
-            case 9: return "leafFragment";
-            case 10: return "assignment";
-            case 11: return "foreman";
-            case 12: return "memInitial";
-            case 13: return "memMax";
-            case 14: return "credentials";
-            case 15: return "optionsJson";
-            case 16: return "context";
-            case 17: return "collector";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("handle", 1);
-        __fieldMap.put("networkCost", 4);
-        __fieldMap.put("cpuCost", 5);
-        __fieldMap.put("diskCost", 6);
-        __fieldMap.put("memoryCost", 7);
-        __fieldMap.put("fragmentJson", 8);
-        __fieldMap.put("leafFragment", 9);
-        __fieldMap.put("assignment", 10);
-        __fieldMap.put("foreman", 11);
-        __fieldMap.put("memInitial", 12);
-        __fieldMap.put("memMax", 13);
-        __fieldMap.put("credentials", 14);
-        __fieldMap.put("optionsJson", 15);
-        __fieldMap.put("context", 16);
-        __fieldMap.put("collector", 17);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatement.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatement.java
deleted file mode 100644
index 1a23c05..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatement.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class PreparedStatement implements Externalizable, Message<PreparedStatement>, Schema<PreparedStatement>
-{
-
-    public static Schema<PreparedStatement> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static PreparedStatement getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final PreparedStatement DEFAULT_INSTANCE = new PreparedStatement();
-
-    
-    private List<ResultColumnMetadata> columns;
-    private PreparedStatementHandle serverHandle;
-
-    public PreparedStatement()
-    {
-        
-    }
-
-    // getters and setters
-
-    // columns
-
-    public List<ResultColumnMetadata> getColumnsList()
-    {
-        return columns;
-    }
-
-    public PreparedStatement setColumnsList(List<ResultColumnMetadata> columns)
-    {
-        this.columns = columns;
-        return this;
-    }
-
-    // serverHandle
-
-    public PreparedStatementHandle getServerHandle()
-    {
-        return serverHandle;
-    }
-
-    public PreparedStatement setServerHandle(PreparedStatementHandle serverHandle)
-    {
-        this.serverHandle = serverHandle;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<PreparedStatement> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public PreparedStatement newMessage()
-    {
-        return new PreparedStatement();
-    }
-
-    public Class<PreparedStatement> typeClass()
-    {
-        return PreparedStatement.class;
-    }
-
-    public String messageName()
-    {
-        return PreparedStatement.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return PreparedStatement.class.getName();
-    }
-
-    public boolean isInitialized(PreparedStatement message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, PreparedStatement message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    if(message.columns == null)
-                        message.columns = new ArrayList<ResultColumnMetadata>();
-                    message.columns.add(input.mergeObject(null, ResultColumnMetadata.getSchema()));
-                    break;
-
-                case 2:
-                    message.serverHandle = input.mergeObject(message.serverHandle, PreparedStatementHandle.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, PreparedStatement message) throws IOException
-    {
-        if(message.columns != null)
-        {
-            for(ResultColumnMetadata columns : message.columns)
-            {
-                if(columns != null)
-                    output.writeObject(1, columns, ResultColumnMetadata.getSchema(), true);
-            }
-        }
-
-
-        if(message.serverHandle != null)
-             output.writeObject(2, message.serverHandle, PreparedStatementHandle.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "columns";
-            case 2: return "serverHandle";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("columns", 1);
-        __fieldMap.put("serverHandle", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatementHandle.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatementHandle.java
deleted file mode 100644
index 226aa77..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatementHandle.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.ByteString;
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class PreparedStatementHandle implements Externalizable, Message<PreparedStatementHandle>, Schema<PreparedStatementHandle>
-{
-
-    public static Schema<PreparedStatementHandle> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static PreparedStatementHandle getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final PreparedStatementHandle DEFAULT_INSTANCE = new PreparedStatementHandle();
-
-    
-    private ByteString serverInfo;
-
-    public PreparedStatementHandle()
-    {
-        
-    }
-
-    // getters and setters
-
-    // serverInfo
-
-    public ByteString getServerInfo()
-    {
-        return serverInfo;
-    }
-
-    public PreparedStatementHandle setServerInfo(ByteString serverInfo)
-    {
-        this.serverInfo = serverInfo;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<PreparedStatementHandle> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public PreparedStatementHandle newMessage()
-    {
-        return new PreparedStatementHandle();
-    }
-
-    public Class<PreparedStatementHandle> typeClass()
-    {
-        return PreparedStatementHandle.class;
-    }
-
-    public String messageName()
-    {
-        return PreparedStatementHandle.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return PreparedStatementHandle.class.getName();
-    }
-
-    public boolean isInitialized(PreparedStatementHandle message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, PreparedStatementHandle message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.serverInfo = input.readBytes();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, PreparedStatementHandle message) throws IOException
-    {
-        if(message.serverInfo != null)
-            output.writeBytes(1, message.serverInfo, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "serverInfo";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("serverInfo", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Property.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Property.java
deleted file mode 100644
index e9bbac6..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Property.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-import com.dyuproject.protostuff.UninitializedMessageException;
-
-public final class Property implements Externalizable, Message<Property>, Schema<Property>
-{
-
-    public static Schema<Property> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static Property getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final Property DEFAULT_INSTANCE = new Property();
-
-    
-    private String key;
-    private String value;
-
-    public Property()
-    {
-        
-    }
-
-    public Property(
-        String key,
-        String value
-    )
-    {
-        this.key = key;
-        this.value = value;
-    }
-
-    // getters and setters
-
-    // key
-
-    public String getKey()
-    {
-        return key;
-    }
-
-    public Property setKey(String key)
-    {
-        this.key = key;
-        return this;
-    }
-
-    // value
-
-    public String getValue()
-    {
-        return value;
-    }
-
-    public Property setValue(String value)
-    {
-        this.value = value;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<Property> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public Property newMessage()
-    {
-        return new Property();
-    }
-
-    public Class<Property> typeClass()
-    {
-        return Property.class;
-    }
-
-    public String messageName()
-    {
-        return Property.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return Property.class.getName();
-    }
-
-    public boolean isInitialized(Property message)
-    {
-        return 
-            message.key != null 
-            && message.value != null;
-    }
-
-    public void mergeFrom(Input input, Property message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.key = input.readString();
-                    break;
-                case 2:
-                    message.value = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, Property message) throws IOException
-    {
-        if(message.key == null)
-            throw new UninitializedMessageException(message);
-        output.writeString(1, message.key, false);
-
-        if(message.value == null)
-            throw new UninitializedMessageException(message);
-        output.writeString(2, message.value, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "key";
-            case 2: return "value";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("key", 1);
-        __fieldMap.put("value", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryContextInformation.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryContextInformation.java
deleted file mode 100644
index c175c9f..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryContextInformation.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class QueryContextInformation implements Externalizable, Message<QueryContextInformation>, Schema<QueryContextInformation>
-{
-
-    public static Schema<QueryContextInformation> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static QueryContextInformation getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final QueryContextInformation DEFAULT_INSTANCE = new QueryContextInformation();
-
-    
-    private long queryStartTime;
-    private int timeZone;
-    private String defaultSchemaName;
-    private String sessionId;
-
-    public QueryContextInformation()
-    {
-        
-    }
-
-    // getters and setters
-
-    // queryStartTime
-
-    public long getQueryStartTime()
-    {
-        return queryStartTime;
-    }
-
-    public QueryContextInformation setQueryStartTime(long queryStartTime)
-    {
-        this.queryStartTime = queryStartTime;
-        return this;
-    }
-
-    // timeZone
-
-    public int getTimeZone()
-    {
-        return timeZone;
-    }
-
-    public QueryContextInformation setTimeZone(int timeZone)
-    {
-        this.timeZone = timeZone;
-        return this;
-    }
-
-    // defaultSchemaName
-
-    public String getDefaultSchemaName()
-    {
-        return defaultSchemaName;
-    }
-
-    public QueryContextInformation setDefaultSchemaName(String defaultSchemaName)
-    {
-        this.defaultSchemaName = defaultSchemaName;
-        return this;
-    }
-
-    // sessionId
-
-    public String getSessionId()
-    {
-        return sessionId;
-    }
-
-    public QueryContextInformation setSessionId(String sessionId)
-    {
-        this.sessionId = sessionId;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<QueryContextInformation> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public QueryContextInformation newMessage()
-    {
-        return new QueryContextInformation();
-    }
-
-    public Class<QueryContextInformation> typeClass()
-    {
-        return QueryContextInformation.class;
-    }
-
-    public String messageName()
-    {
-        return QueryContextInformation.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return QueryContextInformation.class.getName();
-    }
-
-    public boolean isInitialized(QueryContextInformation message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, QueryContextInformation message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.queryStartTime = input.readInt64();
-                    break;
-                case 2:
-                    message.timeZone = input.readInt32();
-                    break;
-                case 3:
-                    message.defaultSchemaName = input.readString();
-                    break;
-                case 4:
-                    message.sessionId = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, QueryContextInformation message) throws IOException
-    {
-        if(message.queryStartTime != 0)
-            output.writeInt64(1, message.queryStartTime, false);
-
-        if(message.timeZone != 0)
-            output.writeInt32(2, message.timeZone, false);
-
-        if(message.defaultSchemaName != null)
-            output.writeString(3, message.defaultSchemaName, false);
-
-        if(message.sessionId != null)
-            output.writeString(4, message.sessionId, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "queryStartTime";
-            case 2: return "timeZone";
-            case 3: return "defaultSchemaName";
-            case 4: return "sessionId";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("queryStartTime", 1);
-        __fieldMap.put("timeZone", 2);
-        __fieldMap.put("defaultSchemaName", 3);
-        __fieldMap.put("sessionId", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryData.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryData.java
deleted file mode 100644
index 7744848..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryData.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class QueryData implements Externalizable, Message<QueryData>, Schema<QueryData>
-{
-
-    public static Schema<QueryData> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static QueryData getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final QueryData DEFAULT_INSTANCE = new QueryData();
-
-    
-    private QueryId queryId;
-    private int rowCount;
-    private RecordBatchDef def;
-    private int affectedRowsCount;
-
-    public QueryData()
-    {
-        
-    }
-
-    // getters and setters
-
-    // queryId
-
-    public QueryId getQueryId()
-    {
-        return queryId;
-    }
-
-    public QueryData setQueryId(QueryId queryId)
-    {
-        this.queryId = queryId;
-        return this;
-    }
-
-    // rowCount
-
-    public int getRowCount()
-    {
-        return rowCount;
-    }
-
-    public QueryData setRowCount(int rowCount)
-    {
-        this.rowCount = rowCount;
-        return this;
-    }
-
-    // def
-
-    public RecordBatchDef getDef()
-    {
-        return def;
-    }
-
-    public QueryData setDef(RecordBatchDef def)
-    {
-        this.def = def;
-        return this;
-    }
-
-    // affectedRowsCount
-
-    public int getAffectedRowsCount()
-    {
-        return affectedRowsCount;
-    }
-
-    public QueryData setAffectedRowsCount(int affectedRowsCount)
-    {
-        this.affectedRowsCount = affectedRowsCount;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<QueryData> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public QueryData newMessage()
-    {
-        return new QueryData();
-    }
-
-    public Class<QueryData> typeClass()
-    {
-        return QueryData.class;
-    }
-
-    public String messageName()
-    {
-        return QueryData.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return QueryData.class.getName();
-    }
-
-    public boolean isInitialized(QueryData message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, QueryData message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.queryId = input.mergeObject(message.queryId, QueryId.getSchema());
-                    break;
-
-                case 2:
-                    message.rowCount = input.readInt32();
-                    break;
-                case 3:
-                    message.def = input.mergeObject(message.def, RecordBatchDef.getSchema());
-                    break;
-
-                case 4:
-                    message.affectedRowsCount = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, QueryData message) throws IOException
-    {
-        if(message.queryId != null)
-             output.writeObject(1, message.queryId, QueryId.getSchema(), false);
-
-
-        if(message.rowCount != 0)
-            output.writeInt32(2, message.rowCount, false);
-
-        if(message.def != null)
-             output.writeObject(3, message.def, RecordBatchDef.getSchema(), false);
-
-
-        if(message.affectedRowsCount != 0)
-            output.writeInt32(4, message.affectedRowsCount, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "queryId";
-            case 2: return "rowCount";
-            case 3: return "def";
-            case 4: return "affectedRowsCount";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("queryId", 1);
-        __fieldMap.put("rowCount", 2);
-        __fieldMap.put("def", 3);
-        __fieldMap.put("affectedRowsCount", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryId.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryId.java
deleted file mode 100644
index 338234f..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryId.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class QueryId implements Externalizable, Message<QueryId>, Schema<QueryId>
-{
-
-    public static Schema<QueryId> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static QueryId getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final QueryId DEFAULT_INSTANCE = new QueryId();
-
-    
-    private long part1;
-    private long part2;
-
-    public QueryId()
-    {
-        
-    }
-
-    // getters and setters
-
-    // part1
-
-    public long getPart1()
-    {
-        return part1;
-    }
-
-    public QueryId setPart1(long part1)
-    {
-        this.part1 = part1;
-        return this;
-    }
-
-    // part2
-
-    public long getPart2()
-    {
-        return part2;
-    }
-
-    public QueryId setPart2(long part2)
-    {
-        this.part2 = part2;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<QueryId> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public QueryId newMessage()
-    {
-        return new QueryId();
-    }
-
-    public Class<QueryId> typeClass()
-    {
-        return QueryId.class;
-    }
-
-    public String messageName()
-    {
-        return QueryId.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return QueryId.class.getName();
-    }
-
-    public boolean isInitialized(QueryId message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, QueryId message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.part1 = input.readSFixed64();
-                    break;
-                case 2:
-                    message.part2 = input.readSFixed64();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, QueryId message) throws IOException
-    {
-        if(message.part1 != 0)
-            output.writeSFixed64(1, message.part1, false);
-
-        if(message.part2 != 0)
-            output.writeSFixed64(2, message.part2, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "part1";
-            case 2: return "part2";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("part1", 1);
-        __fieldMap.put("part2", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryInfo.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryInfo.java
deleted file mode 100644
index 06cff57..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryInfo.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.ByteString;
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class QueryInfo implements Externalizable, Message<QueryInfo>, Schema<QueryInfo>
-{
-
-    public static Schema<QueryInfo> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static QueryInfo getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final QueryInfo DEFAULT_INSTANCE = new QueryInfo();
-
-    static final String DEFAULT_USER = ByteString.stringDefaultValue("-");
-    static final String DEFAULT_QUEUE_NAME = ByteString.stringDefaultValue("-");
-    
-    private String query;
-    private long start;
-    private QueryResult.QueryState state;
-    private String user = DEFAULT_USER;
-    private DrillbitEndpoint foreman;
-    private String optionsJson;
-    private double totalCost;
-    private String queueName = DEFAULT_QUEUE_NAME;
-
-    public QueryInfo()
-    {
-        
-    }
-
-    // getters and setters
-
-    // query
-
-    public String getQuery()
-    {
-        return query;
-    }
-
-    public QueryInfo setQuery(String query)
-    {
-        this.query = query;
-        return this;
-    }
-
-    // start
-
-    public long getStart()
-    {
-        return start;
-    }
-
-    public QueryInfo setStart(long start)
-    {
-        this.start = start;
-        return this;
-    }
-
-    // state
-
-    public QueryResult.QueryState getState()
-    {
-        return state == null ? QueryResult.QueryState.STARTING : state;
-    }
-
-    public QueryInfo setState(QueryResult.QueryState state)
-    {
-        this.state = state;
-        return this;
-    }
-
-    // user
-
-    public String getUser()
-    {
-        return user;
-    }
-
-    public QueryInfo setUser(String user)
-    {
-        this.user = user;
-        return this;
-    }
-
-    // foreman
-
-    public DrillbitEndpoint getForeman()
-    {
-        return foreman;
-    }
-
-    public QueryInfo setForeman(DrillbitEndpoint foreman)
-    {
-        this.foreman = foreman;
-        return this;
-    }
-
-    // optionsJson
-
-    public String getOptionsJson()
-    {
-        return optionsJson;
-    }
-
-    public QueryInfo setOptionsJson(String optionsJson)
-    {
-        this.optionsJson = optionsJson;
-        return this;
-    }
-
-    // totalCost
-
-    public double getTotalCost()
-    {
-        return totalCost;
-    }
-
-    public QueryInfo setTotalCost(double totalCost)
-    {
-        this.totalCost = totalCost;
-        return this;
-    }
-
-    // queueName
-
-    public String getQueueName()
-    {
-        return queueName;
-    }
-
-    public QueryInfo setQueueName(String queueName)
-    {
-        this.queueName = queueName;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<QueryInfo> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public QueryInfo newMessage()
-    {
-        return new QueryInfo();
-    }
-
-    public Class<QueryInfo> typeClass()
-    {
-        return QueryInfo.class;
-    }
-
-    public String messageName()
-    {
-        return QueryInfo.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return QueryInfo.class.getName();
-    }
-
-    public boolean isInitialized(QueryInfo message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, QueryInfo message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.query = input.readString();
-                    break;
-                case 2:
-                    message.start = input.readInt64();
-                    break;
-                case 3:
-                    message.state = QueryResult.QueryState.valueOf(input.readEnum());
-                    break;
-                case 4:
-                    message.user = input.readString();
-                    break;
-                case 5:
-                    message.foreman = input.mergeObject(message.foreman, DrillbitEndpoint.getSchema());
-                    break;
-
-                case 6:
-                    message.optionsJson = input.readString();
-                    break;
-                case 7:
-                    message.totalCost = input.readDouble();
-                    break;
-                case 8:
-                    message.queueName = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, QueryInfo message) throws IOException
-    {
-        if(message.query != null)
-            output.writeString(1, message.query, false);
-
-        if(message.start != 0)
-            output.writeInt64(2, message.start, false);
-
-        if(message.state != null)
-             output.writeEnum(3, message.state.number, false);
-
-        if(message.user != null && message.user != DEFAULT_USER)
-            output.writeString(4, message.user, false);
-
-        if(message.foreman != null)
-             output.writeObject(5, message.foreman, DrillbitEndpoint.getSchema(), false);
-
-
-        if(message.optionsJson != null)
-            output.writeString(6, message.optionsJson, false);
-
-        if(message.totalCost != 0)
-            output.writeDouble(7, message.totalCost, false);
-
-        if(message.queueName != null && message.queueName != DEFAULT_QUEUE_NAME)
-            output.writeString(8, message.queueName, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "query";
-            case 2: return "start";
-            case 3: return "state";
-            case 4: return "user";
-            case 5: return "foreman";
-            case 6: return "optionsJson";
-            case 7: return "totalCost";
-            case 8: return "queueName";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("query", 1);
-        __fieldMap.put("start", 2);
-        __fieldMap.put("state", 3);
-        __fieldMap.put("user", 4);
-        __fieldMap.put("foreman", 5);
-        __fieldMap.put("optionsJson", 6);
-        __fieldMap.put("totalCost", 7);
-        __fieldMap.put("queueName", 8);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryPlanFragments.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryPlanFragments.java
deleted file mode 100644
index f19569d..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryPlanFragments.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-import com.dyuproject.protostuff.UninitializedMessageException;
-
-public final class QueryPlanFragments implements Externalizable, Message<QueryPlanFragments>, Schema<QueryPlanFragments>
-{
-
-    public static Schema<QueryPlanFragments> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static QueryPlanFragments getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final QueryPlanFragments DEFAULT_INSTANCE = new QueryPlanFragments();
-
-    
-    private QueryResult.QueryState status;
-    private QueryId queryId;
-    private List<PlanFragment> fragments;
-    private DrillPBError error;
-
-    public QueryPlanFragments()
-    {
-        
-    }
-
-    public QueryPlanFragments(
-        QueryResult.QueryState status
-    )
-    {
-        this.status = status;
-    }
-
-    // getters and setters
-
-    // status
-
-    public QueryResult.QueryState getStatus()
-    {
-        return status;
-    }
-
-    public QueryPlanFragments setStatus(QueryResult.QueryState status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // queryId
-
-    public QueryId getQueryId()
-    {
-        return queryId;
-    }
-
-    public QueryPlanFragments setQueryId(QueryId queryId)
-    {
-        this.queryId = queryId;
-        return this;
-    }
-
-    // fragments
-
-    public List<PlanFragment> getFragmentsList()
-    {
-        return fragments;
-    }
-
-    public QueryPlanFragments setFragmentsList(List<PlanFragment> fragments)
-    {
-        this.fragments = fragments;
-        return this;
-    }
-
-    // error
-
-    public DrillPBError getError()
-    {
-        return error;
-    }
-
-    public QueryPlanFragments setError(DrillPBError error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<QueryPlanFragments> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public QueryPlanFragments newMessage()
-    {
-        return new QueryPlanFragments();
-    }
-
-    public Class<QueryPlanFragments> typeClass()
-    {
-        return QueryPlanFragments.class;
-    }
-
-    public String messageName()
-    {
-        return QueryPlanFragments.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return QueryPlanFragments.class.getName();
-    }
-
-    public boolean isInitialized(QueryPlanFragments message)
-    {
-        return 
-            message.status != null;
-    }
-
-    public void mergeFrom(Input input, QueryPlanFragments message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.status = QueryResult.QueryState.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.queryId = input.mergeObject(message.queryId, QueryId.getSchema());
-                    break;
-
-                case 3:
-                    if(message.fragments == null)
-                        message.fragments = new ArrayList<PlanFragment>();
-                    message.fragments.add(input.mergeObject(null, PlanFragment.getSchema()));
-                    break;
-
-                case 4:
-                    message.error = input.mergeObject(message.error, DrillPBError.getSchema());
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, QueryPlanFragments message) throws IOException
-    {
-        if(message.status == null)
-            throw new UninitializedMessageException(message);
-        output.writeEnum(1, message.status.number, false);
-
-        if(message.queryId != null)
-             output.writeObject(2, message.queryId, QueryId.getSchema(), false);
-
-
-        if(message.fragments != null)
-        {
-            for(PlanFragment fragments : message.fragments)
-            {
-                if(fragments != null)
-                    output.writeObject(3, fragments, PlanFragment.getSchema(), true);
-            }
-        }
-
-
-        if(message.error != null)
-             output.writeObject(4, message.error, DrillPBError.getSchema(), false);
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "status";
-            case 2: return "queryId";
-            case 3: return "fragments";
-            case 4: return "error";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("status", 1);
-        __fieldMap.put("queryId", 2);
-        __fieldMap.put("fragments", 3);
-        __fieldMap.put("error", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryProfile.java
deleted file mode 100644
index 94286b5..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryProfile.java
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.ByteString;
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class QueryProfile implements Externalizable, Message<QueryProfile>, Schema<QueryProfile>
-{
-
-    public static Schema<QueryProfile> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static QueryProfile getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final QueryProfile DEFAULT_INSTANCE = new QueryProfile();
-
-    static final String DEFAULT_USER = ByteString.stringDefaultValue("-");
-    static final String DEFAULT_QUEUE_NAME = ByteString.stringDefaultValue("-");
-    
-    private QueryId id;
-    private QueryType type;
-    private long start;
-    private long end;
-    private String query;
-    private String plan;
-    private DrillbitEndpoint foreman;
-    private QueryResult.QueryState state;
-    private int totalFragments;
-    private int finishedFragments;
-    private List<MajorFragmentProfile> fragmentProfile;
-    private String user = DEFAULT_USER;
-    private String error;
-    private String verboseError;
-    private String errorId;
-    private String errorNode;
-    private String optionsJson;
-    private long planEnd;
-    private long queueWaitEnd;
-    private double totalCost;
-    private String queueName = DEFAULT_QUEUE_NAME;
-    private String queryId;
-    private int autoLimit;
-
-    public QueryProfile()
-    {
-        
-    }
-
-    // getters and setters
-
-    // id
-
-    public QueryId getId()
-    {
-        return id;
-    }
-
-    public QueryProfile setId(QueryId id)
-    {
-        this.id = id;
-        return this;
-    }
-
-    // type
-
-    public QueryType getType()
-    {
-        return type == null ? QueryType.SQL : type;
-    }
-
-    public QueryProfile setType(QueryType type)
-    {
-        this.type = type;
-        return this;
-    }
-
-    // start
-
-    public long getStart()
-    {
-        return start;
-    }
-
-    public QueryProfile setStart(long start)
-    {
-        this.start = start;
-        return this;
-    }
-
-    // end
-
-    public long getEnd()
-    {
-        return end;
-    }
-
-    public QueryProfile setEnd(long end)
-    {
-        this.end = end;
-        return this;
-    }
-
-    // query
-
-    public String getQuery()
-    {
-        return query;
-    }
-
-    public QueryProfile setQuery(String query)
-    {
-        this.query = query;
-        return this;
-    }
-
-    // plan
-
-    public String getPlan()
-    {
-        return plan;
-    }
-
-    public QueryProfile setPlan(String plan)
-    {
-        this.plan = plan;
-        return this;
-    }
-
-    // foreman
-
-    public DrillbitEndpoint getForeman()
-    {
-        return foreman;
-    }
-
-    public QueryProfile setForeman(DrillbitEndpoint foreman)
-    {
-        this.foreman = foreman;
-        return this;
-    }
-
-    // state
-
-    public QueryResult.QueryState getState()
-    {
-        return state == null ? QueryResult.QueryState.STARTING : state;
-    }
-
-    public QueryProfile setState(QueryResult.QueryState state)
-    {
-        this.state = state;
-        return this;
-    }
-
-    // totalFragments
-
-    public int getTotalFragments()
-    {
-        return totalFragments;
-    }
-
-    public QueryProfile setTotalFragments(int totalFragments)
-    {
-        this.totalFragments = totalFragments;
-        return this;
-    }
-
-    // finishedFragments
-
-    public int getFinishedFragments()
-    {
-        return finishedFragments;
-    }
-
-    public QueryProfile setFinishedFragments(int finishedFragments)
-    {
-        this.finishedFragments = finishedFragments;
-        return this;
-    }
-
-    // fragmentProfile
-
-    public List<MajorFragmentProfile> getFragmentProfileList()
-    {
-        return fragmentProfile;
-    }
-
-    public QueryProfile setFragmentProfileList(List<MajorFragmentProfile> fragmentProfile)
-    {
-        this.fragmentProfile = fragmentProfile;
-        return this;
-    }
-
-    // user
-
-    public String getUser()
-    {
-        return user;
-    }
-
-    public QueryProfile setUser(String user)
-    {
-        this.user = user;
-        return this;
-    }
-
-    // error
-
-    public String getError()
-    {
-        return error;
-    }
-
-    public QueryProfile setError(String error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // verboseError
-
-    public String getVerboseError()
-    {
-        return verboseError;
-    }
-
-    public QueryProfile setVerboseError(String verboseError)
-    {
-        this.verboseError = verboseError;
-        return this;
-    }
-
-    // errorId
-
-    public String getErrorId()
-    {
-        return errorId;
-    }
-
-    public QueryProfile setErrorId(String errorId)
-    {
-        this.errorId = errorId;
-        return this;
-    }
-
-    // errorNode
-
-    public String getErrorNode()
-    {
-        return errorNode;
-    }
-
-    public QueryProfile setErrorNode(String errorNode)
-    {
-        this.errorNode = errorNode;
-        return this;
-    }
-
-    // optionsJson
-
-    public String getOptionsJson()
-    {
-        return optionsJson;
-    }
-
-    public QueryProfile setOptionsJson(String optionsJson)
-    {
-        this.optionsJson = optionsJson;
-        return this;
-    }
-
-    // planEnd
-
-    public long getPlanEnd()
-    {
-        return planEnd;
-    }
-
-    public QueryProfile setPlanEnd(long planEnd)
-    {
-        this.planEnd = planEnd;
-        return this;
-    }
-
-    // queueWaitEnd
-
-    public long getQueueWaitEnd()
-    {
-        return queueWaitEnd;
-    }
-
-    public QueryProfile setQueueWaitEnd(long queueWaitEnd)
-    {
-        this.queueWaitEnd = queueWaitEnd;
-        return this;
-    }
-
-    // totalCost
-
-    public double getTotalCost()
-    {
-        return totalCost;
-    }
-
-    public QueryProfile setTotalCost(double totalCost)
-    {
-        this.totalCost = totalCost;
-        return this;
-    }
-
-    // queueName
-
-    public String getQueueName()
-    {
-        return queueName;
-    }
-
-    public QueryProfile setQueueName(String queueName)
-    {
-        this.queueName = queueName;
-        return this;
-    }
-
-    // queryId
-
-    public String getQueryId()
-    {
-        return queryId;
-    }
-
-    public QueryProfile setQueryId(String queryId)
-    {
-        this.queryId = queryId;
-        return this;
-    }
-
-    // autoLimit
-
-    public int getAutoLimit()
-    {
-        return autoLimit;
-    }
-
-    public QueryProfile setAutoLimit(int autoLimit)
-    {
-        this.autoLimit = autoLimit;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<QueryProfile> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public QueryProfile newMessage()
-    {
-        return new QueryProfile();
-    }
-
-    public Class<QueryProfile> typeClass()
-    {
-        return QueryProfile.class;
-    }
-
-    public String messageName()
-    {
-        return QueryProfile.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return QueryProfile.class.getName();
-    }
-
-    public boolean isInitialized(QueryProfile message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, QueryProfile message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.id = input.mergeObject(message.id, QueryId.getSchema());
-                    break;
-
-                case 2:
-                    message.type = QueryType.valueOf(input.readEnum());
-                    break;
-                case 3:
-                    message.start = input.readInt64();
-                    break;
-                case 4:
-                    message.end = input.readInt64();
-                    break;
-                case 5:
-                    message.query = input.readString();
-                    break;
-                case 6:
-                    message.plan = input.readString();
-                    break;
-                case 7:
-                    message.foreman = input.mergeObject(message.foreman, DrillbitEndpoint.getSchema());
-                    break;
-
-                case 8:
-                    message.state = QueryResult.QueryState.valueOf(input.readEnum());
-                    break;
-                case 9:
-                    message.totalFragments = input.readInt32();
-                    break;
-                case 10:
-                    message.finishedFragments = input.readInt32();
-                    break;
-                case 11:
-                    if(message.fragmentProfile == null)
-                        message.fragmentProfile = new ArrayList<MajorFragmentProfile>();
-                    message.fragmentProfile.add(input.mergeObject(null, MajorFragmentProfile.getSchema()));
-                    break;
-
-                case 12:
-                    message.user = input.readString();
-                    break;
-                case 13:
-                    message.error = input.readString();
-                    break;
-                case 14:
-                    message.verboseError = input.readString();
-                    break;
-                case 15:
-                    message.errorId = input.readString();
-                    break;
-                case 16:
-                    message.errorNode = input.readString();
-                    break;
-                case 17:
-                    message.optionsJson = input.readString();
-                    break;
-                case 18:
-                    message.planEnd = input.readInt64();
-                    break;
-                case 19:
-                    message.queueWaitEnd = input.readInt64();
-                    break;
-                case 20:
-                    message.totalCost = input.readDouble();
-                    break;
-                case 21:
-                    message.queueName = input.readString();
-                    break;
-                case 22:
-                    message.queryId = input.readString();
-                    break;
-                case 23:
-                    message.autoLimit = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, QueryProfile message) throws IOException
-    {
-        if(message.id != null)
-             output.writeObject(1, message.id, QueryId.getSchema(), false);
-
-
-        if(message.type != null)
-             output.writeEnum(2, message.type.number, false);
-
-        if(message.start != 0)
-            output.writeInt64(3, message.start, false);
-
-        if(message.end != 0)
-            output.writeInt64(4, message.end, false);
-
-        if(message.query != null)
-            output.writeString(5, message.query, false);
-
-        if(message.plan != null)
-            output.writeString(6, message.plan, false);
-
-        if(message.foreman != null)
-             output.writeObject(7, message.foreman, DrillbitEndpoint.getSchema(), false);
-
-
-        if(message.state != null)
-             output.writeEnum(8, message.state.number, false);
-
-        if(message.totalFragments != 0)
-            output.writeInt32(9, message.totalFragments, false);
-
-        if(message.finishedFragments != 0)
-            output.writeInt32(10, message.finishedFragments, false);
-
-        if(message.fragmentProfile != null)
-        {
-            for(MajorFragmentProfile fragmentProfile : message.fragmentProfile)
-            {
-                if(fragmentProfile != null)
-                    output.writeObject(11, fragmentProfile, MajorFragmentProfile.getSchema(), true);
-            }
-        }
-
-
-        if(message.user != null && message.user != DEFAULT_USER)
-            output.writeString(12, message.user, false);
-
-        if(message.error != null)
-            output.writeString(13, message.error, false);
-
-        if(message.verboseError != null)
-            output.writeString(14, message.verboseError, false);
-
-        if(message.errorId != null)
-            output.writeString(15, message.errorId, false);
-
-        if(message.errorNode != null)
-            output.writeString(16, message.errorNode, false);
-
-        if(message.optionsJson != null)
-            output.writeString(17, message.optionsJson, false);
-
-        if(message.planEnd != 0)
-            output.writeInt64(18, message.planEnd, false);
-
-        if(message.queueWaitEnd != 0)
-            output.writeInt64(19, message.queueWaitEnd, false);
-
-        if(message.totalCost != 0)
-            output.writeDouble(20, message.totalCost, false);
-
-        if(message.queueName != null && message.queueName != DEFAULT_QUEUE_NAME)
-            output.writeString(21, message.queueName, false);
-
-        if(message.queryId != null)
-            output.writeString(22, message.queryId, false);
-
-        if(message.autoLimit != 0)
-            output.writeInt32(23, message.autoLimit, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "id";
-            case 2: return "type";
-            case 3: return "start";
-            case 4: return "end";
-            case 5: return "query";
-            case 6: return "plan";
-            case 7: return "foreman";
-            case 8: return "state";
-            case 9: return "totalFragments";
-            case 10: return "finishedFragments";
-            case 11: return "fragmentProfile";
-            case 12: return "user";
-            case 13: return "error";
-            case 14: return "verboseError";
-            case 15: return "errorId";
-            case 16: return "errorNode";
-            case 17: return "optionsJson";
-            case 18: return "planEnd";
-            case 19: return "queueWaitEnd";
-            case 20: return "totalCost";
-            case 21: return "queueName";
-            case 22: return "queryId";
-            case 23: return "autoLimit";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("id", 1);
-        __fieldMap.put("type", 2);
-        __fieldMap.put("start", 3);
-        __fieldMap.put("end", 4);
-        __fieldMap.put("query", 5);
-        __fieldMap.put("plan", 6);
-        __fieldMap.put("foreman", 7);
-        __fieldMap.put("state", 8);
-        __fieldMap.put("totalFragments", 9);
-        __fieldMap.put("finishedFragments", 10);
-        __fieldMap.put("fragmentProfile", 11);
-        __fieldMap.put("user", 12);
-        __fieldMap.put("error", 13);
-        __fieldMap.put("verboseError", 14);
-        __fieldMap.put("errorId", 15);
-        __fieldMap.put("errorNode", 16);
-        __fieldMap.put("optionsJson", 17);
-        __fieldMap.put("planEnd", 18);
-        __fieldMap.put("queueWaitEnd", 19);
-        __fieldMap.put("totalCost", 20);
-        __fieldMap.put("queueName", 21);
-        __fieldMap.put("queryId", 22);
-        __fieldMap.put("autoLimit", 23);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java
deleted file mode 100644
index b9546ef..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class QueryResult implements Externalizable, Message<QueryResult>, Schema<QueryResult>
-{
-    public enum QueryState implements com.dyuproject.protostuff.EnumLite<QueryState>
-    {
-        STARTING(0),
-        RUNNING(1),
-        COMPLETED(2),
-        CANCELED(3),
-        FAILED(4),
-        CANCELLATION_REQUESTED(5),
-        ENQUEUED(6),
-        PREPARING(7),
-        PLANNING(8);
-        
-        public final int number;
-        
-        private QueryState (int number)
-        {
-            this.number = number;
-        }
-        
-        public int getNumber()
-        {
-            return number;
-        }
-        
-        public static QueryState valueOf(int number)
-        {
-            switch(number) 
-            {
-                case 0: return STARTING;
-                case 1: return RUNNING;
-                case 2: return COMPLETED;
-                case 3: return CANCELED;
-                case 4: return FAILED;
-                case 5: return CANCELLATION_REQUESTED;
-                case 6: return ENQUEUED;
-                case 7: return PREPARING;
-                case 8: return PLANNING;
-                default: return null;
-            }
-        }
-    }
-
-
-    public static Schema<QueryResult> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static QueryResult getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final QueryResult DEFAULT_INSTANCE = new QueryResult();
-
-    
-    private QueryState queryState;
-    private QueryId queryId;
-    private List<DrillPBError> error;
-
-    public QueryResult()
-    {
-        
-    }
-
-    // getters and setters
-
-    // queryState
-
-    public QueryState getQueryState()
-    {
-        return queryState == null ? QueryState.STARTING : queryState;
-    }
-
-    public QueryResult setQueryState(QueryState queryState)
-    {
-        this.queryState = queryState;
-        return this;
-    }
-
-    // queryId
-
-    public QueryId getQueryId()
-    {
-        return queryId;
-    }
-
-    public QueryResult setQueryId(QueryId queryId)
-    {
-        this.queryId = queryId;
-        return this;
-    }
-
-    // error
-
-    public List<DrillPBError> getErrorList()
-    {
-        return error;
-    }
-
-    public QueryResult setErrorList(List<DrillPBError> error)
-    {
-        this.error = error;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<QueryResult> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public QueryResult newMessage()
-    {
-        return new QueryResult();
-    }
-
-    public Class<QueryResult> typeClass()
-    {
-        return QueryResult.class;
-    }
-
-    public String messageName()
-    {
-        return QueryResult.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return QueryResult.class.getName();
-    }
-
-    public boolean isInitialized(QueryResult message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, QueryResult message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.queryState = QueryState.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.queryId = input.mergeObject(message.queryId, QueryId.getSchema());
-                    break;
-
-                case 3:
-                    if(message.error == null)
-                        message.error = new ArrayList<DrillPBError>();
-                    message.error.add(input.mergeObject(null, DrillPBError.getSchema()));
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, QueryResult message) throws IOException
-    {
-        if(message.queryState != null)
-             output.writeEnum(1, message.queryState.number, false);
-
-        if(message.queryId != null)
-             output.writeObject(2, message.queryId, QueryId.getSchema(), false);
-
-
-        if(message.error != null)
-        {
-            for(DrillPBError error : message.error)
-            {
-                if(error != null)
-                    output.writeObject(3, error, DrillPBError.getSchema(), true);
-            }
-        }
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "queryState";
-            case 2: return "queryId";
-            case 3: return "error";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("queryState", 1);
-        __fieldMap.put("queryId", 2);
-        __fieldMap.put("error", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResultsMode.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResultsMode.java
deleted file mode 100644
index c557488..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResultsMode.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum QueryResultsMode implements com.dyuproject.protostuff.EnumLite<QueryResultsMode>
-{
-    STREAM_FULL(1);
-    
-    public final int number;
-    
-    private QueryResultsMode (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static QueryResultsMode valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 1: return STREAM_FULL;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryType.java
deleted file mode 100644
index 34367b4..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryType.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum QueryType implements com.dyuproject.protostuff.EnumLite<QueryType>
-{
-    SQL(1),
-    LOGICAL(2),
-    PHYSICAL(3),
-    EXECUTION(4),
-    PREPARED_STATEMENT(5);
-    
-    public final int number;
-    
-    private QueryType (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static QueryType valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 1: return SQL;
-            case 2: return LOGICAL;
-            case 3: return PHYSICAL;
-            case 4: return EXECUTION;
-            case 5: return PREPARED_STATEMENT;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RecordBatchDef.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RecordBatchDef.java
deleted file mode 100644
index 8376013..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RecordBatchDef.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class RecordBatchDef implements Externalizable, Message<RecordBatchDef>, Schema<RecordBatchDef>
-{
-
-    public static Schema<RecordBatchDef> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static RecordBatchDef getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final RecordBatchDef DEFAULT_INSTANCE = new RecordBatchDef();
-
-    
-    private int recordCount;
-    private List<SerializedField> field;
-    private Boolean carriesTwoByteSelectionVector;
-    private int affectedRowsCount;
-
-    public RecordBatchDef()
-    {
-        
-    }
-
-    // getters and setters
-
-    // recordCount
-
-    public int getRecordCount()
-    {
-        return recordCount;
-    }
-
-    public RecordBatchDef setRecordCount(int recordCount)
-    {
-        this.recordCount = recordCount;
-        return this;
-    }
-
-    // field
-
-    public List<SerializedField> getFieldList()
-    {
-        return field;
-    }
-
-    public RecordBatchDef setFieldList(List<SerializedField> field)
-    {
-        this.field = field;
-        return this;
-    }
-
-    // carriesTwoByteSelectionVector
-
-    public Boolean getCarriesTwoByteSelectionVector()
-    {
-        return carriesTwoByteSelectionVector;
-    }
-
-    public RecordBatchDef setCarriesTwoByteSelectionVector(Boolean carriesTwoByteSelectionVector)
-    {
-        this.carriesTwoByteSelectionVector = carriesTwoByteSelectionVector;
-        return this;
-    }
-
-    // affectedRowsCount
-
-    public int getAffectedRowsCount()
-    {
-        return affectedRowsCount;
-    }
-
-    public RecordBatchDef setAffectedRowsCount(int affectedRowsCount)
-    {
-        this.affectedRowsCount = affectedRowsCount;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<RecordBatchDef> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public RecordBatchDef newMessage()
-    {
-        return new RecordBatchDef();
-    }
-
-    public Class<RecordBatchDef> typeClass()
-    {
-        return RecordBatchDef.class;
-    }
-
-    public String messageName()
-    {
-        return RecordBatchDef.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return RecordBatchDef.class.getName();
-    }
-
-    public boolean isInitialized(RecordBatchDef message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, RecordBatchDef message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.recordCount = input.readInt32();
-                    break;
-                case 2:
-                    if(message.field == null)
-                        message.field = new ArrayList<SerializedField>();
-                    message.field.add(input.mergeObject(null, SerializedField.getSchema()));
-                    break;
-
-                case 3:
-                    message.carriesTwoByteSelectionVector = input.readBool();
-                    break;
-                case 4:
-                    message.affectedRowsCount = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, RecordBatchDef message) throws IOException
-    {
-        if(message.recordCount != 0)
-            output.writeInt32(1, message.recordCount, false);
-
-        if(message.field != null)
-        {
-            for(SerializedField field : message.field)
-            {
-                if(field != null)
-                    output.writeObject(2, field, SerializedField.getSchema(), true);
-            }
-        }
-
-
-        if(message.carriesTwoByteSelectionVector != null)
-            output.writeBool(3, message.carriesTwoByteSelectionVector, false);
-
-        if(message.affectedRowsCount != 0)
-            output.writeInt32(4, message.affectedRowsCount, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "recordCount";
-            case 2: return "field";
-            case 3: return "carriesTwoByteSelectionVector";
-            case 4: return "affectedRowsCount";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("recordCount", 1);
-        __fieldMap.put("field", 2);
-        __fieldMap.put("carriesTwoByteSelectionVector", 3);
-        __fieldMap.put("affectedRowsCount", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Registry.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Registry.java
deleted file mode 100644
index ff4506d..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Registry.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class Registry implements Externalizable, Message<Registry>, Schema<Registry>
-{
-
-    public static Schema<Registry> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static Registry getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final Registry DEFAULT_INSTANCE = new Registry();
-
-    
-    private List<Jar> jar;
-
-    public Registry()
-    {
-        
-    }
-
-    // getters and setters
-
-    // jar
-
-    public List<Jar> getJarList()
-    {
-        return jar;
-    }
-
-    public Registry setJarList(List<Jar> jar)
-    {
-        this.jar = jar;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<Registry> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public Registry newMessage()
-    {
-        return new Registry();
-    }
-
-    public Class<Registry> typeClass()
-    {
-        return Registry.class;
-    }
-
-    public String messageName()
-    {
-        return Registry.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return Registry.class.getName();
-    }
-
-    public boolean isInitialized(Registry message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, Registry message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    if(message.jar == null)
-                        message.jar = new ArrayList<Jar>();
-                    message.jar.add(input.mergeObject(null, Jar.getSchema()));
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, Registry message) throws IOException
-    {
-        if(message.jar != null)
-        {
-            for(Jar jar : message.jar)
-            {
-                if(jar != null)
-                    output.writeObject(1, jar, Jar.getSchema(), true);
-            }
-        }
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "jar";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("jar", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestResults.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestResults.java
deleted file mode 100644
index 0ec6fc9..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestResults.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class RequestResults implements Externalizable, Message<RequestResults>, Schema<RequestResults>
-{
-
-    public static Schema<RequestResults> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static RequestResults getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final RequestResults DEFAULT_INSTANCE = new RequestResults();
-
-    
-    private QueryId queryId;
-    private int maximumResponses;
-
-    public RequestResults()
-    {
-        
-    }
-
-    // getters and setters
-
-    // queryId
-
-    public QueryId getQueryId()
-    {
-        return queryId;
-    }
-
-    public RequestResults setQueryId(QueryId queryId)
-    {
-        this.queryId = queryId;
-        return this;
-    }
-
-    // maximumResponses
-
-    public int getMaximumResponses()
-    {
-        return maximumResponses;
-    }
-
-    public RequestResults setMaximumResponses(int maximumResponses)
-    {
-        this.maximumResponses = maximumResponses;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<RequestResults> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public RequestResults newMessage()
-    {
-        return new RequestResults();
-    }
-
-    public Class<RequestResults> typeClass()
-    {
-        return RequestResults.class;
-    }
-
-    public String messageName()
-    {
-        return RequestResults.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return RequestResults.class.getName();
-    }
-
-    public boolean isInitialized(RequestResults message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, RequestResults message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.queryId = input.mergeObject(message.queryId, QueryId.getSchema());
-                    break;
-
-                case 2:
-                    message.maximumResponses = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, RequestResults message) throws IOException
-    {
-        if(message.queryId != null)
-             output.writeObject(1, message.queryId, QueryId.getSchema(), false);
-
-
-        if(message.maximumResponses != 0)
-            output.writeInt32(2, message.maximumResponses, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "queryId";
-            case 2: return "maximumResponses";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("queryId", 1);
-        __fieldMap.put("maximumResponses", 2);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestStatus.java
deleted file mode 100644
index 0c7cc5d..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestStatus.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum RequestStatus implements com.dyuproject.protostuff.EnumLite<RequestStatus>
-{
-    UNKNOWN_STATUS(0),
-    OK(1),
-    FAILED(2),
-    TIMEOUT(3);
-    
-    public final int number;
-    
-    private RequestStatus (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static RequestStatus valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return UNKNOWN_STATUS;
-            case 1: return OK;
-            case 2: return FAILED;
-            case 3: return TIMEOUT;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ResultColumnMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ResultColumnMetadata.java
deleted file mode 100644
index 7e5fa98..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ResultColumnMetadata.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class ResultColumnMetadata implements Externalizable, Message<ResultColumnMetadata>, Schema<ResultColumnMetadata>
-{
-
-    public static Schema<ResultColumnMetadata> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static ResultColumnMetadata getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final ResultColumnMetadata DEFAULT_INSTANCE = new ResultColumnMetadata();
-
-    
-    private String catalogName;
-    private String schemaName;
-    private String tableName;
-    private String columnName;
-    private String label;
-    private String dataType;
-    private Boolean isNullable;
-    private int precision;
-    private int scale;
-    private Boolean signed;
-    private int displaySize;
-    private Boolean isAliased;
-    private ColumnSearchability searchability;
-    private ColumnUpdatability updatability;
-    private Boolean autoIncrement;
-    private Boolean caseSensitivity;
-    private Boolean sortable;
-    private String className;
-    private Boolean isCurrency;
-
-    public ResultColumnMetadata()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogName
-
-    public String getCatalogName()
-    {
-        return catalogName;
-    }
-
-    public ResultColumnMetadata setCatalogName(String catalogName)
-    {
-        this.catalogName = catalogName;
-        return this;
-    }
-
-    // schemaName
-
-    public String getSchemaName()
-    {
-        return schemaName;
-    }
-
-    public ResultColumnMetadata setSchemaName(String schemaName)
-    {
-        this.schemaName = schemaName;
-        return this;
-    }
-
-    // tableName
-
-    public String getTableName()
-    {
-        return tableName;
-    }
-
-    public ResultColumnMetadata setTableName(String tableName)
-    {
-        this.tableName = tableName;
-        return this;
-    }
-
-    // columnName
-
-    public String getColumnName()
-    {
-        return columnName;
-    }
-
-    public ResultColumnMetadata setColumnName(String columnName)
-    {
-        this.columnName = columnName;
-        return this;
-    }
-
-    // label
-
-    public String getLabel()
-    {
-        return label;
-    }
-
-    public ResultColumnMetadata setLabel(String label)
-    {
-        this.label = label;
-        return this;
-    }
-
-    // dataType
-
-    public String getDataType()
-    {
-        return dataType;
-    }
-
-    public ResultColumnMetadata setDataType(String dataType)
-    {
-        this.dataType = dataType;
-        return this;
-    }
-
-    // isNullable
-
-    public Boolean getIsNullable()
-    {
-        return isNullable;
-    }
-
-    public ResultColumnMetadata setIsNullable(Boolean isNullable)
-    {
-        this.isNullable = isNullable;
-        return this;
-    }
-
-    // precision
-
-    public int getPrecision()
-    {
-        return precision;
-    }
-
-    public ResultColumnMetadata setPrecision(int precision)
-    {
-        this.precision = precision;
-        return this;
-    }
-
-    // scale
-
-    public int getScale()
-    {
-        return scale;
-    }
-
-    public ResultColumnMetadata setScale(int scale)
-    {
-        this.scale = scale;
-        return this;
-    }
-
-    // signed
-
-    public Boolean getSigned()
-    {
-        return signed;
-    }
-
-    public ResultColumnMetadata setSigned(Boolean signed)
-    {
-        this.signed = signed;
-        return this;
-    }
-
-    // displaySize
-
-    public int getDisplaySize()
-    {
-        return displaySize;
-    }
-
-    public ResultColumnMetadata setDisplaySize(int displaySize)
-    {
-        this.displaySize = displaySize;
-        return this;
-    }
-
-    // isAliased
-
-    public Boolean getIsAliased()
-    {
-        return isAliased;
-    }
-
-    public ResultColumnMetadata setIsAliased(Boolean isAliased)
-    {
-        this.isAliased = isAliased;
-        return this;
-    }
-
-    // searchability
-
-    public ColumnSearchability getSearchability()
-    {
-        return searchability == null ? ColumnSearchability.UNKNOWN_SEARCHABILITY : searchability;
-    }
-
-    public ResultColumnMetadata setSearchability(ColumnSearchability searchability)
-    {
-        this.searchability = searchability;
-        return this;
-    }
-
-    // updatability
-
-    public ColumnUpdatability getUpdatability()
-    {
-        return updatability == null ? ColumnUpdatability.UNKNOWN_UPDATABILITY : updatability;
-    }
-
-    public ResultColumnMetadata setUpdatability(ColumnUpdatability updatability)
-    {
-        this.updatability = updatability;
-        return this;
-    }
-
-    // autoIncrement
-
-    public Boolean getAutoIncrement()
-    {
-        return autoIncrement;
-    }
-
-    public ResultColumnMetadata setAutoIncrement(Boolean autoIncrement)
-    {
-        this.autoIncrement = autoIncrement;
-        return this;
-    }
-
-    // caseSensitivity
-
-    public Boolean getCaseSensitivity()
-    {
-        return caseSensitivity;
-    }
-
-    public ResultColumnMetadata setCaseSensitivity(Boolean caseSensitivity)
-    {
-        this.caseSensitivity = caseSensitivity;
-        return this;
-    }
-
-    // sortable
-
-    public Boolean getSortable()
-    {
-        return sortable;
-    }
-
-    public ResultColumnMetadata setSortable(Boolean sortable)
-    {
-        this.sortable = sortable;
-        return this;
-    }
-
-    // className
-
-    public String getClassName()
-    {
-        return className;
-    }
-
-    public ResultColumnMetadata setClassName(String className)
-    {
-        this.className = className;
-        return this;
-    }
-
-    // isCurrency
-
-    public Boolean getIsCurrency()
-    {
-        return isCurrency;
-    }
-
-    public ResultColumnMetadata setIsCurrency(Boolean isCurrency)
-    {
-        this.isCurrency = isCurrency;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<ResultColumnMetadata> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public ResultColumnMetadata newMessage()
-    {
-        return new ResultColumnMetadata();
-    }
-
-    public Class<ResultColumnMetadata> typeClass()
-    {
-        return ResultColumnMetadata.class;
-    }
-
-    public String messageName()
-    {
-        return ResultColumnMetadata.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return ResultColumnMetadata.class.getName();
-    }
-
-    public boolean isInitialized(ResultColumnMetadata message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, ResultColumnMetadata message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogName = input.readString();
-                    break;
-                case 2:
-                    message.schemaName = input.readString();
-                    break;
-                case 3:
-                    message.tableName = input.readString();
-                    break;
-                case 4:
-                    message.columnName = input.readString();
-                    break;
-                case 5:
-                    message.label = input.readString();
-                    break;
-                case 6:
-                    message.dataType = input.readString();
-                    break;
-                case 7:
-                    message.isNullable = input.readBool();
-                    break;
-                case 8:
-                    message.precision = input.readInt32();
-                    break;
-                case 9:
-                    message.scale = input.readInt32();
-                    break;
-                case 10:
-                    message.signed = input.readBool();
-                    break;
-                case 11:
-                    message.displaySize = input.readInt32();
-                    break;
-                case 12:
-                    message.isAliased = input.readBool();
-                    break;
-                case 13:
-                    message.searchability = ColumnSearchability.valueOf(input.readEnum());
-                    break;
-                case 14:
-                    message.updatability = ColumnUpdatability.valueOf(input.readEnum());
-                    break;
-                case 15:
-                    message.autoIncrement = input.readBool();
-                    break;
-                case 16:
-                    message.caseSensitivity = input.readBool();
-                    break;
-                case 17:
-                    message.sortable = input.readBool();
-                    break;
-                case 18:
-                    message.className = input.readString();
-                    break;
-                case 20:
-                    message.isCurrency = input.readBool();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, ResultColumnMetadata message) throws IOException
-    {
-        if(message.catalogName != null)
-            output.writeString(1, message.catalogName, false);
-
-        if(message.schemaName != null)
-            output.writeString(2, message.schemaName, false);
-
-        if(message.tableName != null)
-            output.writeString(3, message.tableName, false);
-
-        if(message.columnName != null)
-            output.writeString(4, message.columnName, false);
-
-        if(message.label != null)
-            output.writeString(5, message.label, false);
-
-        if(message.dataType != null)
-            output.writeString(6, message.dataType, false);
-
-        if(message.isNullable != null)
-            output.writeBool(7, message.isNullable, false);
-
-        if(message.precision != 0)
-            output.writeInt32(8, message.precision, false);
-
-        if(message.scale != 0)
-            output.writeInt32(9, message.scale, false);
-
-        if(message.signed != null)
-            output.writeBool(10, message.signed, false);
-
-        if(message.displaySize != 0)
-            output.writeInt32(11, message.displaySize, false);
-
-        if(message.isAliased != null)
-            output.writeBool(12, message.isAliased, false);
-
-        if(message.searchability != null)
-             output.writeEnum(13, message.searchability.number, false);
-
-        if(message.updatability != null)
-             output.writeEnum(14, message.updatability.number, false);
-
-        if(message.autoIncrement != null)
-            output.writeBool(15, message.autoIncrement, false);
-
-        if(message.caseSensitivity != null)
-            output.writeBool(16, message.caseSensitivity, false);
-
-        if(message.sortable != null)
-            output.writeBool(17, message.sortable, false);
-
-        if(message.className != null)
-            output.writeString(18, message.className, false);
-
-        if(message.isCurrency != null)
-            output.writeBool(20, message.isCurrency, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogName";
-            case 2: return "schemaName";
-            case 3: return "tableName";
-            case 4: return "columnName";
-            case 5: return "label";
-            case 6: return "dataType";
-            case 7: return "isNullable";
-            case 8: return "precision";
-            case 9: return "scale";
-            case 10: return "signed";
-            case 11: return "displaySize";
-            case 12: return "isAliased";
-            case 13: return "searchability";
-            case 14: return "updatability";
-            case 15: return "autoIncrement";
-            case 16: return "caseSensitivity";
-            case 17: return "sortable";
-            case 18: return "className";
-            case 20: return "isCurrency";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogName", 1);
-        __fieldMap.put("schemaName", 2);
-        __fieldMap.put("tableName", 3);
-        __fieldMap.put("columnName", 4);
-        __fieldMap.put("label", 5);
-        __fieldMap.put("dataType", 6);
-        __fieldMap.put("isNullable", 7);
-        __fieldMap.put("precision", 8);
-        __fieldMap.put("scale", 9);
-        __fieldMap.put("signed", 10);
-        __fieldMap.put("displaySize", 11);
-        __fieldMap.put("isAliased", 12);
-        __fieldMap.put("searchability", 13);
-        __fieldMap.put("updatability", 14);
-        __fieldMap.put("autoIncrement", 15);
-        __fieldMap.put("caseSensitivity", 16);
-        __fieldMap.put("sortable", 17);
-        __fieldMap.put("className", 18);
-        __fieldMap.put("isCurrency", 20);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Roles.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Roles.java
deleted file mode 100644
index e7d4403..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Roles.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class Roles implements Externalizable, Message<Roles>, Schema<Roles>
-{
-
-    public static Schema<Roles> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static Roles getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final Roles DEFAULT_INSTANCE = new Roles();
-
-    static final Boolean DEFAULT_SQL_QUERY = new Boolean(true);
-    static final Boolean DEFAULT_LOGICAL_PLAN = new Boolean(true);
-    static final Boolean DEFAULT_PHYSICAL_PLAN = new Boolean(true);
-    static final Boolean DEFAULT_JAVA_EXECUTOR = new Boolean(true);
-    static final Boolean DEFAULT_DISTRIBUTED_CACHE = new Boolean(true);
-    
-    private Boolean sqlQuery = DEFAULT_SQL_QUERY;
-    private Boolean logicalPlan = DEFAULT_LOGICAL_PLAN;
-    private Boolean physicalPlan = DEFAULT_PHYSICAL_PLAN;
-    private Boolean javaExecutor = DEFAULT_JAVA_EXECUTOR;
-    private Boolean distributedCache = DEFAULT_DISTRIBUTED_CACHE;
-
-    public Roles()
-    {
-        
-    }
-
-    // getters and setters
-
-    // sqlQuery
-
-    public Boolean getSqlQuery()
-    {
-        return sqlQuery;
-    }
-
-    public Roles setSqlQuery(Boolean sqlQuery)
-    {
-        this.sqlQuery = sqlQuery;
-        return this;
-    }
-
-    // logicalPlan
-
-    public Boolean getLogicalPlan()
-    {
-        return logicalPlan;
-    }
-
-    public Roles setLogicalPlan(Boolean logicalPlan)
-    {
-        this.logicalPlan = logicalPlan;
-        return this;
-    }
-
-    // physicalPlan
-
-    public Boolean getPhysicalPlan()
-    {
-        return physicalPlan;
-    }
-
-    public Roles setPhysicalPlan(Boolean physicalPlan)
-    {
-        this.physicalPlan = physicalPlan;
-        return this;
-    }
-
-    // javaExecutor
-
-    public Boolean getJavaExecutor()
-    {
-        return javaExecutor;
-    }
-
-    public Roles setJavaExecutor(Boolean javaExecutor)
-    {
-        this.javaExecutor = javaExecutor;
-        return this;
-    }
-
-    // distributedCache
-
-    public Boolean getDistributedCache()
-    {
-        return distributedCache;
-    }
-
-    public Roles setDistributedCache(Boolean distributedCache)
-    {
-        this.distributedCache = distributedCache;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<Roles> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public Roles newMessage()
-    {
-        return new Roles();
-    }
-
-    public Class<Roles> typeClass()
-    {
-        return Roles.class;
-    }
-
-    public String messageName()
-    {
-        return Roles.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return Roles.class.getName();
-    }
-
-    public boolean isInitialized(Roles message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, Roles message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.sqlQuery = input.readBool();
-                    break;
-                case 2:
-                    message.logicalPlan = input.readBool();
-                    break;
-                case 3:
-                    message.physicalPlan = input.readBool();
-                    break;
-                case 4:
-                    message.javaExecutor = input.readBool();
-                    break;
-                case 5:
-                    message.distributedCache = input.readBool();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, Roles message) throws IOException
-    {
-        if(message.sqlQuery != null && message.sqlQuery != DEFAULT_SQL_QUERY)
-            output.writeBool(1, message.sqlQuery, false);
-
-        if(message.logicalPlan != null && message.logicalPlan != DEFAULT_LOGICAL_PLAN)
-            output.writeBool(2, message.logicalPlan, false);
-
-        if(message.physicalPlan != null && message.physicalPlan != DEFAULT_PHYSICAL_PLAN)
-            output.writeBool(3, message.physicalPlan, false);
-
-        if(message.javaExecutor != null && message.javaExecutor != DEFAULT_JAVA_EXECUTOR)
-            output.writeBool(4, message.javaExecutor, false);
-
-        if(message.distributedCache != null && message.distributedCache != DEFAULT_DISTRIBUTED_CACHE)
-            output.writeBool(5, message.distributedCache, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "sqlQuery";
-            case 2: return "logicalPlan";
-            case 3: return "physicalPlan";
-            case 4: return "javaExecutor";
-            case 5: return "distributedCache";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("sqlQuery", 1);
-        __fieldMap.put("logicalPlan", 2);
-        __fieldMap.put("physicalPlan", 3);
-        __fieldMap.put("javaExecutor", 4);
-        __fieldMap.put("distributedCache", 5);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcChannel.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcChannel.java
deleted file mode 100644
index 63e9de8..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcChannel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum RpcChannel implements com.dyuproject.protostuff.EnumLite<RpcChannel>
-{
-    BIT_CONTROL(0),
-    BIT_DATA(1),
-    USER(2);
-    
-    public final int number;
-    
-    private RpcChannel (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static RpcChannel valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return BIT_CONTROL;
-            case 1: return BIT_DATA;
-            case 2: return USER;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcEndpointInfos.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcEndpointInfos.java
deleted file mode 100644
index 79e6d9e..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcEndpointInfos.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class RpcEndpointInfos implements Externalizable, Message<RpcEndpointInfos>, Schema<RpcEndpointInfos>
-{
-
-    public static Schema<RpcEndpointInfos> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static RpcEndpointInfos getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final RpcEndpointInfos DEFAULT_INSTANCE = new RpcEndpointInfos();
-
-    
-    private String name;
-    private String version;
-    private int majorVersion;
-    private int minorVersion;
-    private int patchVersion;
-    private String application;
-    private int buildNumber;
-    private String versionQualifier;
-
-    public RpcEndpointInfos()
-    {
-        
-    }
-
-    // getters and setters
-
-    // name
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public RpcEndpointInfos setName(String name)
-    {
-        this.name = name;
-        return this;
-    }
-
-    // version
-
-    public String getVersion()
-    {
-        return version;
-    }
-
-    public RpcEndpointInfos setVersion(String version)
-    {
-        this.version = version;
-        return this;
-    }
-
-    // majorVersion
-
-    public int getMajorVersion()
-    {
-        return majorVersion;
-    }
-
-    public RpcEndpointInfos setMajorVersion(int majorVersion)
-    {
-        this.majorVersion = majorVersion;
-        return this;
-    }
-
-    // minorVersion
-
-    public int getMinorVersion()
-    {
-        return minorVersion;
-    }
-
-    public RpcEndpointInfos setMinorVersion(int minorVersion)
-    {
-        this.minorVersion = minorVersion;
-        return this;
-    }
-
-    // patchVersion
-
-    public int getPatchVersion()
-    {
-        return patchVersion;
-    }
-
-    public RpcEndpointInfos setPatchVersion(int patchVersion)
-    {
-        this.patchVersion = patchVersion;
-        return this;
-    }
-
-    // application
-
-    public String getApplication()
-    {
-        return application;
-    }
-
-    public RpcEndpointInfos setApplication(String application)
-    {
-        this.application = application;
-        return this;
-    }
-
-    // buildNumber
-
-    public int getBuildNumber()
-    {
-        return buildNumber;
-    }
-
-    public RpcEndpointInfos setBuildNumber(int buildNumber)
-    {
-        this.buildNumber = buildNumber;
-        return this;
-    }
-
-    // versionQualifier
-
-    public String getVersionQualifier()
-    {
-        return versionQualifier;
-    }
-
-    public RpcEndpointInfos setVersionQualifier(String versionQualifier)
-    {
-        this.versionQualifier = versionQualifier;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<RpcEndpointInfos> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public RpcEndpointInfos newMessage()
-    {
-        return new RpcEndpointInfos();
-    }
-
-    public Class<RpcEndpointInfos> typeClass()
-    {
-        return RpcEndpointInfos.class;
-    }
-
-    public String messageName()
-    {
-        return RpcEndpointInfos.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return RpcEndpointInfos.class.getName();
-    }
-
-    public boolean isInitialized(RpcEndpointInfos message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, RpcEndpointInfos message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.name = input.readString();
-                    break;
-                case 2:
-                    message.version = input.readString();
-                    break;
-                case 3:
-                    message.majorVersion = input.readUInt32();
-                    break;
-                case 4:
-                    message.minorVersion = input.readUInt32();
-                    break;
-                case 5:
-                    message.patchVersion = input.readUInt32();
-                    break;
-                case 6:
-                    message.application = input.readString();
-                    break;
-                case 7:
-                    message.buildNumber = input.readUInt32();
-                    break;
-                case 8:
-                    message.versionQualifier = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, RpcEndpointInfos message) throws IOException
-    {
-        if(message.name != null)
-            output.writeString(1, message.name, false);
-
-        if(message.version != null)
-            output.writeString(2, message.version, false);
-
-        if(message.majorVersion != 0)
-            output.writeUInt32(3, message.majorVersion, false);
-
-        if(message.minorVersion != 0)
-            output.writeUInt32(4, message.minorVersion, false);
-
-        if(message.patchVersion != 0)
-            output.writeUInt32(5, message.patchVersion, false);
-
-        if(message.application != null)
-            output.writeString(6, message.application, false);
-
-        if(message.buildNumber != 0)
-            output.writeUInt32(7, message.buildNumber, false);
-
-        if(message.versionQualifier != null)
-            output.writeString(8, message.versionQualifier, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "name";
-            case 2: return "version";
-            case 3: return "majorVersion";
-            case 4: return "minorVersion";
-            case 5: return "patchVersion";
-            case 6: return "application";
-            case 7: return "buildNumber";
-            case 8: return "versionQualifier";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("name", 1);
-        __fieldMap.put("version", 2);
-        __fieldMap.put("majorVersion", 3);
-        __fieldMap.put("minorVersion", 4);
-        __fieldMap.put("patchVersion", 5);
-        __fieldMap.put("application", 6);
-        __fieldMap.put("buildNumber", 7);
-        __fieldMap.put("versionQualifier", 8);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcHeader.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcHeader.java
deleted file mode 100644
index 5a4f561..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcHeader.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class RpcHeader implements Externalizable, Message<RpcHeader>, Schema<RpcHeader>
-{
-
-    public static Schema<RpcHeader> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static RpcHeader getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final RpcHeader DEFAULT_INSTANCE = new RpcHeader();
-
-    
-    private RpcMode mode;
-    private int coordinationId;
-    private int rpcType;
-
-    public RpcHeader()
-    {
-        
-    }
-
-    // getters and setters
-
-    // mode
-
-    public RpcMode getMode()
-    {
-        return mode == null ? RpcMode.REQUEST : mode;
-    }
-
-    public RpcHeader setMode(RpcMode mode)
-    {
-        this.mode = mode;
-        return this;
-    }
-
-    // coordinationId
-
-    public int getCoordinationId()
-    {
-        return coordinationId;
-    }
-
-    public RpcHeader setCoordinationId(int coordinationId)
-    {
-        this.coordinationId = coordinationId;
-        return this;
-    }
-
-    // rpcType
-
-    public int getRpcType()
-    {
-        return rpcType;
-    }
-
-    public RpcHeader setRpcType(int rpcType)
-    {
-        this.rpcType = rpcType;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<RpcHeader> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public RpcHeader newMessage()
-    {
-        return new RpcHeader();
-    }
-
-    public Class<RpcHeader> typeClass()
-    {
-        return RpcHeader.class;
-    }
-
-    public String messageName()
-    {
-        return RpcHeader.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return RpcHeader.class.getName();
-    }
-
-    public boolean isInitialized(RpcHeader message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, RpcHeader message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.mode = RpcMode.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.coordinationId = input.readInt32();
-                    break;
-                case 3:
-                    message.rpcType = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, RpcHeader message) throws IOException
-    {
-        if(message.mode != null)
-             output.writeEnum(1, message.mode.number, false);
-
-        if(message.coordinationId != 0)
-            output.writeInt32(2, message.coordinationId, false);
-
-        if(message.rpcType != 0)
-            output.writeInt32(3, message.rpcType, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "mode";
-            case 2: return "coordinationId";
-            case 3: return "rpcType";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("mode", 1);
-        __fieldMap.put("coordinationId", 2);
-        __fieldMap.put("rpcType", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcMode.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcMode.java
deleted file mode 100644
index f25a4d5..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcMode.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum RpcMode implements com.dyuproject.protostuff.EnumLite<RpcMode>
-{
-    REQUEST(0),
-    RESPONSE(1),
-    RESPONSE_FAILURE(2),
-    PING(3),
-    PONG(4);
-    
-    public final int number;
-    
-    private RpcMode (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static RpcMode valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return REQUEST;
-            case 1: return RESPONSE;
-            case 2: return RESPONSE_FAILURE;
-            case 3: return PING;
-            case 4: return PONG;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcType.java
deleted file mode 100644
index c46b920..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcType.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum RpcType implements com.dyuproject.protostuff.EnumLite<RpcType>
-{
-    HANDSHAKE(0),
-    ACK(1),
-    GOODBYE(2),
-    RUN_QUERY(3),
-    CANCEL_QUERY(4),
-    REQUEST_RESULTS(5),
-    RESUME_PAUSED_QUERY(11),
-    GET_QUERY_PLAN_FRAGMENTS(12),
-    GET_CATALOGS(14),
-    GET_SCHEMAS(15),
-    GET_TABLES(16),
-    GET_COLUMNS(17),
-    CREATE_PREPARED_STATEMENT(22),
-    GET_SERVER_META(8),
-    QUERY_DATA(6),
-    QUERY_HANDLE(7),
-    QUERY_PLAN_FRAGMENTS(13),
-    CATALOGS(18),
-    SCHEMAS(19),
-    TABLES(20),
-    COLUMNS(21),
-    PREPARED_STATEMENT(23),
-    SERVER_META(9),
-    QUERY_RESULT(10),
-    SASL_MESSAGE(24);
-    
-    public final int number;
-    
-    private RpcType (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static RpcType valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return HANDSHAKE;
-            case 1: return ACK;
-            case 2: return GOODBYE;
-            case 3: return RUN_QUERY;
-            case 4: return CANCEL_QUERY;
-            case 5: return REQUEST_RESULTS;
-            case 6: return QUERY_DATA;
-            case 7: return QUERY_HANDLE;
-            case 8: return GET_SERVER_META;
-            case 9: return SERVER_META;
-            case 10: return QUERY_RESULT;
-            case 11: return RESUME_PAUSED_QUERY;
-            case 12: return GET_QUERY_PLAN_FRAGMENTS;
-            case 13: return QUERY_PLAN_FRAGMENTS;
-            case 14: return GET_CATALOGS;
-            case 15: return GET_SCHEMAS;
-            case 16: return GET_TABLES;
-            case 17: return GET_COLUMNS;
-            case 18: return CATALOGS;
-            case 19: return SCHEMAS;
-            case 20: return TABLES;
-            case 21: return COLUMNS;
-            case 22: return CREATE_PREPARED_STATEMENT;
-            case 23: return PREPARED_STATEMENT;
-            case 24: return SASL_MESSAGE;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RunQuery.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RunQuery.java
deleted file mode 100644
index 0b257b3..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RunQuery.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class RunQuery implements Externalizable, Message<RunQuery>, Schema<RunQuery>
-{
-
-    public static Schema<RunQuery> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static RunQuery getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final RunQuery DEFAULT_INSTANCE = new RunQuery();
-
-    
-    private QueryResultsMode resultsMode;
-    private QueryType type;
-    private String plan;
-    private List<PlanFragment> fragments;
-    private PreparedStatementHandle preparedStatementHandle;
-    private int autolimitRowcount;
-
-    public RunQuery()
-    {
-        
-    }
-
-    // getters and setters
-
-    // resultsMode
-
-    public QueryResultsMode getResultsMode()
-    {
-        return resultsMode == null ? QueryResultsMode.STREAM_FULL : resultsMode;
-    }
-
-    public RunQuery setResultsMode(QueryResultsMode resultsMode)
-    {
-        this.resultsMode = resultsMode;
-        return this;
-    }
-
-    // type
-
-    public QueryType getType()
-    {
-        return type == null ? QueryType.SQL : type;
-    }
-
-    public RunQuery setType(QueryType type)
-    {
-        this.type = type;
-        return this;
-    }
-
-    // plan
-
-    public String getPlan()
-    {
-        return plan;
-    }
-
-    public RunQuery setPlan(String plan)
-    {
-        this.plan = plan;
-        return this;
-    }
-
-    // fragments
-
-    public List<PlanFragment> getFragmentsList()
-    {
-        return fragments;
-    }
-
-    public RunQuery setFragmentsList(List<PlanFragment> fragments)
-    {
-        this.fragments = fragments;
-        return this;
-    }
-
-    // preparedStatementHandle
-
-    public PreparedStatementHandle getPreparedStatementHandle()
-    {
-        return preparedStatementHandle;
-    }
-
-    public RunQuery setPreparedStatementHandle(PreparedStatementHandle preparedStatementHandle)
-    {
-        this.preparedStatementHandle = preparedStatementHandle;
-        return this;
-    }
-
-    // autolimitRowcount
-
-    public int getAutolimitRowcount()
-    {
-        return autolimitRowcount;
-    }
-
-    public RunQuery setAutolimitRowcount(int autolimitRowcount)
-    {
-        this.autolimitRowcount = autolimitRowcount;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<RunQuery> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public RunQuery newMessage()
-    {
-        return new RunQuery();
-    }
-
-    public Class<RunQuery> typeClass()
-    {
-        return RunQuery.class;
-    }
-
-    public String messageName()
-    {
-        return RunQuery.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return RunQuery.class.getName();
-    }
-
-    public boolean isInitialized(RunQuery message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, RunQuery message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.resultsMode = QueryResultsMode.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.type = QueryType.valueOf(input.readEnum());
-                    break;
-                case 3:
-                    message.plan = input.readString();
-                    break;
-                case 4:
-                    if(message.fragments == null)
-                        message.fragments = new ArrayList<PlanFragment>();
-                    message.fragments.add(input.mergeObject(null, PlanFragment.getSchema()));
-                    break;
-
-                case 5:
-                    message.preparedStatementHandle = input.mergeObject(message.preparedStatementHandle, PreparedStatementHandle.getSchema());
-                    break;
-
-                case 6:
-                    message.autolimitRowcount = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, RunQuery message) throws IOException
-    {
-        if(message.resultsMode != null)
-             output.writeEnum(1, message.resultsMode.number, false);
-
-        if(message.type != null)
-             output.writeEnum(2, message.type.number, false);
-
-        if(message.plan != null)
-            output.writeString(3, message.plan, false);
-
-        if(message.fragments != null)
-        {
-            for(PlanFragment fragments : message.fragments)
-            {
-                if(fragments != null)
-                    output.writeObject(4, fragments, PlanFragment.getSchema(), true);
-            }
-        }
-
-
-        if(message.preparedStatementHandle != null)
-             output.writeObject(5, message.preparedStatementHandle, PreparedStatementHandle.getSchema(), false);
-
-
-        if(message.autolimitRowcount != 0)
-            output.writeInt32(6, message.autolimitRowcount, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "resultsMode";
-            case 2: return "type";
-            case 3: return "plan";
-            case 4: return "fragments";
-            case 5: return "preparedStatementHandle";
-            case 6: return "autolimitRowcount";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("resultsMode", 1);
-        __fieldMap.put("type", 2);
-        __fieldMap.put("plan", 3);
-        __fieldMap.put("fragments", 4);
-        __fieldMap.put("preparedStatementHandle", 5);
-        __fieldMap.put("autolimitRowcount", 6);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RuntimeFilterBDef.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RuntimeFilterBDef.java
deleted file mode 100644
index 3b2c102..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RuntimeFilterBDef.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class RuntimeFilterBDef implements Externalizable, Message<RuntimeFilterBDef>, Schema<RuntimeFilterBDef>
-{
-
-    public static Schema<RuntimeFilterBDef> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static RuntimeFilterBDef getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final RuntimeFilterBDef DEFAULT_INSTANCE = new RuntimeFilterBDef();
-
-    
-    private QueryId queryId;
-    private int majorFragmentId;
-    private int minorFragmentId;
-    private Boolean toForeman;
-    private List<Integer> bloomFilterSizeInBytes;
-    private List<String> probeFields;
-    private int hjOpId;
-    private long rfIdentifier;
-
-    public RuntimeFilterBDef()
-    {
-        
-    }
-
-    // getters and setters
-
-    // queryId
-
-    public QueryId getQueryId()
-    {
-        return queryId;
-    }
-
-    public RuntimeFilterBDef setQueryId(QueryId queryId)
-    {
-        this.queryId = queryId;
-        return this;
-    }
-
-    // majorFragmentId
-
-    public int getMajorFragmentId()
-    {
-        return majorFragmentId;
-    }
-
-    public RuntimeFilterBDef setMajorFragmentId(int majorFragmentId)
-    {
-        this.majorFragmentId = majorFragmentId;
-        return this;
-    }
-
-    // minorFragmentId
-
-    public int getMinorFragmentId()
-    {
-        return minorFragmentId;
-    }
-
-    public RuntimeFilterBDef setMinorFragmentId(int minorFragmentId)
-    {
-        this.minorFragmentId = minorFragmentId;
-        return this;
-    }
-
-    // toForeman
-
-    public Boolean getToForeman()
-    {
-        return toForeman;
-    }
-
-    public RuntimeFilterBDef setToForeman(Boolean toForeman)
-    {
-        this.toForeman = toForeman;
-        return this;
-    }
-
-    // bloomFilterSizeInBytes
-
-    public List<Integer> getBloomFilterSizeInBytesList()
-    {
-        return bloomFilterSizeInBytes;
-    }
-
-    public RuntimeFilterBDef setBloomFilterSizeInBytesList(List<Integer> bloomFilterSizeInBytes)
-    {
-        this.bloomFilterSizeInBytes = bloomFilterSizeInBytes;
-        return this;
-    }
-
-    // probeFields
-
-    public List<String> getProbeFieldsList()
-    {
-        return probeFields;
-    }
-
-    public RuntimeFilterBDef setProbeFieldsList(List<String> probeFields)
-    {
-        this.probeFields = probeFields;
-        return this;
-    }
-
-    // hjOpId
-
-    public int getHjOpId()
-    {
-        return hjOpId;
-    }
-
-    public RuntimeFilterBDef setHjOpId(int hjOpId)
-    {
-        this.hjOpId = hjOpId;
-        return this;
-    }
-
-    // rfIdentifier
-
-    public long getRfIdentifier()
-    {
-        return rfIdentifier;
-    }
-
-    public RuntimeFilterBDef setRfIdentifier(long rfIdentifier)
-    {
-        this.rfIdentifier = rfIdentifier;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<RuntimeFilterBDef> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public RuntimeFilterBDef newMessage()
-    {
-        return new RuntimeFilterBDef();
-    }
-
-    public Class<RuntimeFilterBDef> typeClass()
-    {
-        return RuntimeFilterBDef.class;
-    }
-
-    public String messageName()
-    {
-        return RuntimeFilterBDef.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return RuntimeFilterBDef.class.getName();
-    }
-
-    public boolean isInitialized(RuntimeFilterBDef message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, RuntimeFilterBDef message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.queryId = input.mergeObject(message.queryId, QueryId.getSchema());
-                    break;
-
-                case 2:
-                    message.majorFragmentId = input.readInt32();
-                    break;
-                case 3:
-                    message.minorFragmentId = input.readInt32();
-                    break;
-                case 4:
-                    message.toForeman = input.readBool();
-                    break;
-                case 5:
-                    if(message.bloomFilterSizeInBytes == null)
-                        message.bloomFilterSizeInBytes = new ArrayList<Integer>();
-                    message.bloomFilterSizeInBytes.add(input.readInt32());
-                    break;
-                case 6:
-                    if(message.probeFields == null)
-                        message.probeFields = new ArrayList<String>();
-                    message.probeFields.add(input.readString());
-                    break;
-                case 7:
-                    message.hjOpId = input.readInt32();
-                    break;
-                case 8:
-                    message.rfIdentifier = input.readInt64();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, RuntimeFilterBDef message) throws IOException
-    {
-        if(message.queryId != null)
-             output.writeObject(1, message.queryId, QueryId.getSchema(), false);
-
-
-        if(message.majorFragmentId != 0)
-            output.writeInt32(2, message.majorFragmentId, false);
-
-        if(message.minorFragmentId != 0)
-            output.writeInt32(3, message.minorFragmentId, false);
-
-        if(message.toForeman != null)
-            output.writeBool(4, message.toForeman, false);
-
-        if(message.bloomFilterSizeInBytes != null)
-        {
-            for(Integer bloomFilterSizeInBytes : message.bloomFilterSizeInBytes)
-            {
-                if(bloomFilterSizeInBytes != null)
-                    output.writeInt32(5, bloomFilterSizeInBytes, true);
-            }
-        }
-
-        if(message.probeFields != null)
-        {
-            for(String probeFields : message.probeFields)
-            {
-                if(probeFields != null)
-                    output.writeString(6, probeFields, true);
-            }
-        }
-
-        if(message.hjOpId != 0)
-            output.writeInt32(7, message.hjOpId, false);
-
-        if(message.rfIdentifier != 0)
-            output.writeInt64(8, message.rfIdentifier, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "queryId";
-            case 2: return "majorFragmentId";
-            case 3: return "minorFragmentId";
-            case 4: return "toForeman";
-            case 5: return "bloomFilterSizeInBytes";
-            case 6: return "probeFields";
-            case 7: return "hjOpId";
-            case 8: return "rfIdentifier";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("queryId", 1);
-        __fieldMap.put("majorFragmentId", 2);
-        __fieldMap.put("minorFragmentId", 3);
-        __fieldMap.put("toForeman", 4);
-        __fieldMap.put("bloomFilterSizeInBytes", 5);
-        __fieldMap.put("probeFields", 6);
-        __fieldMap.put("hjOpId", 7);
-        __fieldMap.put("rfIdentifier", 8);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslMessage.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslMessage.java
deleted file mode 100644
index 6dcf15e..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslMessage.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.ByteString;
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class SaslMessage implements Externalizable, Message<SaslMessage>, Schema<SaslMessage>
-{
-
-    public static Schema<SaslMessage> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static SaslMessage getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final SaslMessage DEFAULT_INSTANCE = new SaslMessage();
-
-    
-    private String mechanism;
-    private ByteString data;
-    private SaslStatus status;
-
-    public SaslMessage()
-    {
-        
-    }
-
-    // getters and setters
-
-    // mechanism
-
-    public String getMechanism()
-    {
-        return mechanism;
-    }
-
-    public SaslMessage setMechanism(String mechanism)
-    {
-        this.mechanism = mechanism;
-        return this;
-    }
-
-    // data
-
-    public ByteString getData()
-    {
-        return data;
-    }
-
-    public SaslMessage setData(ByteString data)
-    {
-        this.data = data;
-        return this;
-    }
-
-    // status
-
-    public SaslStatus getStatus()
-    {
-        return status == null ? SaslStatus.SASL_UNKNOWN : status;
-    }
-
-    public SaslMessage setStatus(SaslStatus status)
-    {
-        this.status = status;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<SaslMessage> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public SaslMessage newMessage()
-    {
-        return new SaslMessage();
-    }
-
-    public Class<SaslMessage> typeClass()
-    {
-        return SaslMessage.class;
-    }
-
-    public String messageName()
-    {
-        return SaslMessage.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return SaslMessage.class.getName();
-    }
-
-    public boolean isInitialized(SaslMessage message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, SaslMessage message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.mechanism = input.readString();
-                    break;
-                case 2:
-                    message.data = input.readBytes();
-                    break;
-                case 3:
-                    message.status = SaslStatus.valueOf(input.readEnum());
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, SaslMessage message) throws IOException
-    {
-        if(message.mechanism != null)
-            output.writeString(1, message.mechanism, false);
-
-        if(message.data != null)
-            output.writeBytes(2, message.data, false);
-
-        if(message.status != null)
-             output.writeEnum(3, message.status.number, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "mechanism";
-            case 2: return "data";
-            case 3: return "status";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("mechanism", 1);
-        __fieldMap.put("data", 2);
-        __fieldMap.put("status", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslStatus.java
deleted file mode 100644
index 2bcdbbd..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslStatus.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum SaslStatus implements com.dyuproject.protostuff.EnumLite<SaslStatus>
-{
-    SASL_UNKNOWN(0),
-    SASL_START(1),
-    SASL_IN_PROGRESS(2),
-    SASL_SUCCESS(3),
-    SASL_FAILED(4);
-    
-    public final int number;
-    
-    private SaslStatus (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static SaslStatus valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return SASL_UNKNOWN;
-            case 1: return SASL_START;
-            case 2: return SASL_IN_PROGRESS;
-            case 3: return SASL_SUCCESS;
-            case 4: return SASL_FAILED;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslSupport.java
deleted file mode 100644
index dfcf56d..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslSupport.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum SaslSupport implements com.dyuproject.protostuff.EnumLite<SaslSupport>
-{
-    UNKNOWN_SASL_SUPPORT(0),
-    SASL_AUTH(1),
-    SASL_PRIVACY(2);
-    
-    public final int number;
-    
-    private SaslSupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static SaslSupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return UNKNOWN_SASL_SUPPORT;
-            case 1: return SASL_AUTH;
-            case 2: return SASL_PRIVACY;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SchemaMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SchemaMetadata.java
deleted file mode 100644
index c2f4488..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SchemaMetadata.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class SchemaMetadata implements Externalizable, Message<SchemaMetadata>, Schema<SchemaMetadata>
-{
-
-    public static Schema<SchemaMetadata> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static SchemaMetadata getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final SchemaMetadata DEFAULT_INSTANCE = new SchemaMetadata();
-
-    
-    private String catalogName;
-    private String schemaName;
-    private String owner;
-    private String type;
-    private String mutable;
-
-    public SchemaMetadata()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogName
-
-    public String getCatalogName()
-    {
-        return catalogName;
-    }
-
-    public SchemaMetadata setCatalogName(String catalogName)
-    {
-        this.catalogName = catalogName;
-        return this;
-    }
-
-    // schemaName
-
-    public String getSchemaName()
-    {
-        return schemaName;
-    }
-
-    public SchemaMetadata setSchemaName(String schemaName)
-    {
-        this.schemaName = schemaName;
-        return this;
-    }
-
-    // owner
-
-    public String getOwner()
-    {
-        return owner;
-    }
-
-    public SchemaMetadata setOwner(String owner)
-    {
-        this.owner = owner;
-        return this;
-    }
-
-    // type
-
-    public String getType()
-    {
-        return type;
-    }
-
-    public SchemaMetadata setType(String type)
-    {
-        this.type = type;
-        return this;
-    }
-
-    // mutable
-
-    public String getMutable()
-    {
-        return mutable;
-    }
-
-    public SchemaMetadata setMutable(String mutable)
-    {
-        this.mutable = mutable;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<SchemaMetadata> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public SchemaMetadata newMessage()
-    {
-        return new SchemaMetadata();
-    }
-
-    public Class<SchemaMetadata> typeClass()
-    {
-        return SchemaMetadata.class;
-    }
-
-    public String messageName()
-    {
-        return SchemaMetadata.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return SchemaMetadata.class.getName();
-    }
-
-    public boolean isInitialized(SchemaMetadata message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, SchemaMetadata message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogName = input.readString();
-                    break;
-                case 2:
-                    message.schemaName = input.readString();
-                    break;
-                case 3:
-                    message.owner = input.readString();
-                    break;
-                case 4:
-                    message.type = input.readString();
-                    break;
-                case 5:
-                    message.mutable = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, SchemaMetadata message) throws IOException
-    {
-        if(message.catalogName != null)
-            output.writeString(1, message.catalogName, false);
-
-        if(message.schemaName != null)
-            output.writeString(2, message.schemaName, false);
-
-        if(message.owner != null)
-            output.writeString(3, message.owner, false);
-
-        if(message.type != null)
-            output.writeString(4, message.type, false);
-
-        if(message.mutable != null)
-            output.writeString(5, message.mutable, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogName";
-            case 2: return "schemaName";
-            case 3: return "owner";
-            case 4: return "type";
-            case 5: return "mutable";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogName", 1);
-        __fieldMap.put("schemaName", 2);
-        __fieldMap.put("owner", 3);
-        __fieldMap.put("type", 4);
-        __fieldMap.put("mutable", 5);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java
deleted file mode 100644
index 6f5e962..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class SerializedField implements Externalizable, Message<SerializedField>, Schema<SerializedField>
-{
-
-    public static Schema<SerializedField> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static SerializedField getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final SerializedField DEFAULT_INSTANCE = new SerializedField();
-
-    
-    private org.apache.drill.common.types.MajorType majorType;
-    private NamePart namePart;
-    private List<SerializedField> child;
-    private int valueCount;
-    private int varByteLength;
-    private int bufferLength;
-
-    public SerializedField()
-    {
-        
-    }
-
-    // getters and setters
-
-    // majorType
-
-    public org.apache.drill.common.types.MajorType getMajorType()
-    {
-        return majorType;
-    }
-
-    public SerializedField setMajorType(org.apache.drill.common.types.MajorType majorType)
-    {
-        this.majorType = majorType;
-        return this;
-    }
-
-    // namePart
-
-    public NamePart getNamePart()
-    {
-        return namePart;
-    }
-
-    public SerializedField setNamePart(NamePart namePart)
-    {
-        this.namePart = namePart;
-        return this;
-    }
-
-    // child
-
-    public List<SerializedField> getChildList()
-    {
-        return child;
-    }
-
-    public SerializedField setChildList(List<SerializedField> child)
-    {
-        this.child = child;
-        return this;
-    }
-
-    // valueCount
-
-    public int getValueCount()
-    {
-        return valueCount;
-    }
-
-    public SerializedField setValueCount(int valueCount)
-    {
-        this.valueCount = valueCount;
-        return this;
-    }
-
-    // varByteLength
-
-    public int getVarByteLength()
-    {
-        return varByteLength;
-    }
-
-    public SerializedField setVarByteLength(int varByteLength)
-    {
-        this.varByteLength = varByteLength;
-        return this;
-    }
-
-    // bufferLength
-
-    public int getBufferLength()
-    {
-        return bufferLength;
-    }
-
-    public SerializedField setBufferLength(int bufferLength)
-    {
-        this.bufferLength = bufferLength;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<SerializedField> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public SerializedField newMessage()
-    {
-        return new SerializedField();
-    }
-
-    public Class<SerializedField> typeClass()
-    {
-        return SerializedField.class;
-    }
-
-    public String messageName()
-    {
-        return SerializedField.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return SerializedField.class.getName();
-    }
-
-    public boolean isInitialized(SerializedField message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, SerializedField message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.majorType = input.mergeObject(message.majorType, org.apache.drill.common.types.MajorType.getSchema());
-                    break;
-
-                case 2:
-                    message.namePart = input.mergeObject(message.namePart, NamePart.getSchema());
-                    break;
-
-                case 3:
-                    if(message.child == null)
-                        message.child = new ArrayList<SerializedField>();
-                    message.child.add(input.mergeObject(null, SerializedField.getSchema()));
-                    break;
-
-                case 4:
-                    message.valueCount = input.readInt32();
-                    break;
-                case 5:
-                    message.varByteLength = input.readInt32();
-                    break;
-                case 7:
-                    message.bufferLength = input.readInt32();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, SerializedField message) throws IOException
-    {
-        if(message.majorType != null)
-             output.writeObject(1, message.majorType, org.apache.drill.common.types.MajorType.getSchema(), false);
-
-
-        if(message.namePart != null)
-             output.writeObject(2, message.namePart, NamePart.getSchema(), false);
-
-
-        if(message.child != null)
-        {
-            for(SerializedField child : message.child)
-            {
-                if(child != null)
-                    output.writeObject(3, child, SerializedField.getSchema(), true);
-            }
-        }
-
-
-        if(message.valueCount != 0)
-            output.writeInt32(4, message.valueCount, false);
-
-        if(message.varByteLength != 0)
-            output.writeInt32(5, message.varByteLength, false);
-
-        if(message.bufferLength != 0)
-            output.writeInt32(7, message.bufferLength, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "majorType";
-            case 2: return "namePart";
-            case 3: return "child";
-            case 4: return "valueCount";
-            case 5: return "varByteLength";
-            case 7: return "bufferLength";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("majorType", 1);
-        __fieldMap.put("namePart", 2);
-        __fieldMap.put("child", 3);
-        __fieldMap.put("valueCount", 4);
-        __fieldMap.put("varByteLength", 5);
-        __fieldMap.put("bufferLength", 7);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerMeta.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerMeta.java
deleted file mode 100644
index d5032f9..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerMeta.java
+++ /dev/null
@@ -1,1341 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class ServerMeta implements Externalizable, Message<ServerMeta>, Schema<ServerMeta>
-{
-
-    public static Schema<ServerMeta> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static ServerMeta getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final ServerMeta DEFAULT_INSTANCE = new ServerMeta();
-
-    
-    private Boolean allTablesSelectable;
-    private Boolean blobIncludedInMaxRowSize;
-    private Boolean catalogAtStart;
-    private String catalogSeparator;
-    private String catalogTerm;
-    private List<CollateSupport> collateSupport;
-    private Boolean columnAliasingSupported;
-    private List<ConvertSupport> convertSupport;
-    private CorrelationNamesSupport correlationNamesSupport;
-    private List<String> dateTimeFunctions;
-    private List<DateTimeLiteralsSupport> dateTimeLiteralsSupport;
-    private GroupBySupport groupBySupport;
-    private IdentifierCasing identifierCasing;
-    private String identifierQuoteString;
-    private Boolean likeEscapeClauseSupported;
-    private int maxBinaryLiteralLength;
-    private int maxCatalogNameLength;
-    private int maxCharLiteralLength;
-    private int maxColumnNameLength;
-    private int maxColumnsInGroupBy;
-    private int maxColumnsInOrderBy;
-    private int maxColumnsInSelect;
-    private int maxCursorNameLength;
-    private int maxLogicalLobSize;
-    private int maxRowSize;
-    private int maxSchemaNameLength;
-    private int maxStatementLength;
-    private int maxStatements;
-    private int maxTableNameLength;
-    private int maxTablesInSelect;
-    private int maxUserNameLength;
-    private NullCollation nullCollation;
-    private Boolean nullPlusNonNullEqualsNull;
-    private List<String> numericFunctions;
-    private List<OrderBySupport> orderBySupport;
-    private List<OuterJoinSupport> outerJoinSupport;
-    private IdentifierCasing quotedIdentifierCasing;
-    private Boolean readOnly;
-    private String schemaTerm;
-    private String searchEscapeString;
-    private Boolean selectForUpdateSupported;
-    private String specialCharacters;
-    private List<String> sqlKeywords;
-    private List<String> stringFunctions;
-    private List<SubQuerySupport> subquerySupport;
-    private List<String> systemFunctions;
-    private String tableTerm;
-    private Boolean transactionSupported;
-    private List<UnionSupport> unionSupport;
-    private String currentSchema;
-
-    public ServerMeta()
-    {
-        
-    }
-
-    // getters and setters
-
-    // allTablesSelectable
-
-    public Boolean getAllTablesSelectable()
-    {
-        return allTablesSelectable;
-    }
-
-    public ServerMeta setAllTablesSelectable(Boolean allTablesSelectable)
-    {
-        this.allTablesSelectable = allTablesSelectable;
-        return this;
-    }
-
-    // blobIncludedInMaxRowSize
-
-    public Boolean getBlobIncludedInMaxRowSize()
-    {
-        return blobIncludedInMaxRowSize;
-    }
-
-    public ServerMeta setBlobIncludedInMaxRowSize(Boolean blobIncludedInMaxRowSize)
-    {
-        this.blobIncludedInMaxRowSize = blobIncludedInMaxRowSize;
-        return this;
-    }
-
-    // catalogAtStart
-
-    public Boolean getCatalogAtStart()
-    {
-        return catalogAtStart;
-    }
-
-    public ServerMeta setCatalogAtStart(Boolean catalogAtStart)
-    {
-        this.catalogAtStart = catalogAtStart;
-        return this;
-    }
-
-    // catalogSeparator
-
-    public String getCatalogSeparator()
-    {
-        return catalogSeparator;
-    }
-
-    public ServerMeta setCatalogSeparator(String catalogSeparator)
-    {
-        this.catalogSeparator = catalogSeparator;
-        return this;
-    }
-
-    // catalogTerm
-
-    public String getCatalogTerm()
-    {
-        return catalogTerm;
-    }
-
-    public ServerMeta setCatalogTerm(String catalogTerm)
-    {
-        this.catalogTerm = catalogTerm;
-        return this;
-    }
-
-    // collateSupport
-
-    public List<CollateSupport> getCollateSupportList()
-    {
-        return collateSupport;
-    }
-
-    public ServerMeta setCollateSupportList(List<CollateSupport> collateSupport)
-    {
-        this.collateSupport = collateSupport;
-        return this;
-    }
-
-    // columnAliasingSupported
-
-    public Boolean getColumnAliasingSupported()
-    {
-        return columnAliasingSupported;
-    }
-
-    public ServerMeta setColumnAliasingSupported(Boolean columnAliasingSupported)
-    {
-        this.columnAliasingSupported = columnAliasingSupported;
-        return this;
-    }
-
-    // convertSupport
-
-    public List<ConvertSupport> getConvertSupportList()
-    {
-        return convertSupport;
-    }
-
-    public ServerMeta setConvertSupportList(List<ConvertSupport> convertSupport)
-    {
-        this.convertSupport = convertSupport;
-        return this;
-    }
-
-    // correlationNamesSupport
-
-    public CorrelationNamesSupport getCorrelationNamesSupport()
-    {
-        return correlationNamesSupport == null ? CorrelationNamesSupport.CN_NONE : correlationNamesSupport;
-    }
-
-    public ServerMeta setCorrelationNamesSupport(CorrelationNamesSupport correlationNamesSupport)
-    {
-        this.correlationNamesSupport = correlationNamesSupport;
-        return this;
-    }
-
-    // dateTimeFunctions
-
-    public List<String> getDateTimeFunctionsList()
-    {
-        return dateTimeFunctions;
-    }
-
-    public ServerMeta setDateTimeFunctionsList(List<String> dateTimeFunctions)
-    {
-        this.dateTimeFunctions = dateTimeFunctions;
-        return this;
-    }
-
-    // dateTimeLiteralsSupport
-
-    public List<DateTimeLiteralsSupport> getDateTimeLiteralsSupportList()
-    {
-        return dateTimeLiteralsSupport;
-    }
-
-    public ServerMeta setDateTimeLiteralsSupportList(List<DateTimeLiteralsSupport> dateTimeLiteralsSupport)
-    {
-        this.dateTimeLiteralsSupport = dateTimeLiteralsSupport;
-        return this;
-    }
-
-    // groupBySupport
-
-    public GroupBySupport getGroupBySupport()
-    {
-        return groupBySupport == null ? GroupBySupport.GB_NONE : groupBySupport;
-    }
-
-    public ServerMeta setGroupBySupport(GroupBySupport groupBySupport)
-    {
-        this.groupBySupport = groupBySupport;
-        return this;
-    }
-
-    // identifierCasing
-
-    public IdentifierCasing getIdentifierCasing()
-    {
-        return identifierCasing == null ? IdentifierCasing.IC_UNKNOWN : identifierCasing;
-    }
-
-    public ServerMeta setIdentifierCasing(IdentifierCasing identifierCasing)
-    {
-        this.identifierCasing = identifierCasing;
-        return this;
-    }
-
-    // identifierQuoteString
-
-    public String getIdentifierQuoteString()
-    {
-        return identifierQuoteString;
-    }
-
-    public ServerMeta setIdentifierQuoteString(String identifierQuoteString)
-    {
-        this.identifierQuoteString = identifierQuoteString;
-        return this;
-    }
-
-    // likeEscapeClauseSupported
-
-    public Boolean getLikeEscapeClauseSupported()
-    {
-        return likeEscapeClauseSupported;
-    }
-
-    public ServerMeta setLikeEscapeClauseSupported(Boolean likeEscapeClauseSupported)
-    {
-        this.likeEscapeClauseSupported = likeEscapeClauseSupported;
-        return this;
-    }
-
-    // maxBinaryLiteralLength
-
-    public int getMaxBinaryLiteralLength()
-    {
-        return maxBinaryLiteralLength;
-    }
-
-    public ServerMeta setMaxBinaryLiteralLength(int maxBinaryLiteralLength)
-    {
-        this.maxBinaryLiteralLength = maxBinaryLiteralLength;
-        return this;
-    }
-
-    // maxCatalogNameLength
-
-    public int getMaxCatalogNameLength()
-    {
-        return maxCatalogNameLength;
-    }
-
-    public ServerMeta setMaxCatalogNameLength(int maxCatalogNameLength)
-    {
-        this.maxCatalogNameLength = maxCatalogNameLength;
-        return this;
-    }
-
-    // maxCharLiteralLength
-
-    public int getMaxCharLiteralLength()
-    {
-        return maxCharLiteralLength;
-    }
-
-    public ServerMeta setMaxCharLiteralLength(int maxCharLiteralLength)
-    {
-        this.maxCharLiteralLength = maxCharLiteralLength;
-        return this;
-    }
-
-    // maxColumnNameLength
-
-    public int getMaxColumnNameLength()
-    {
-        return maxColumnNameLength;
-    }
-
-    public ServerMeta setMaxColumnNameLength(int maxColumnNameLength)
-    {
-        this.maxColumnNameLength = maxColumnNameLength;
-        return this;
-    }
-
-    // maxColumnsInGroupBy
-
-    public int getMaxColumnsInGroupBy()
-    {
-        return maxColumnsInGroupBy;
-    }
-
-    public ServerMeta setMaxColumnsInGroupBy(int maxColumnsInGroupBy)
-    {
-        this.maxColumnsInGroupBy = maxColumnsInGroupBy;
-        return this;
-    }
-
-    // maxColumnsInOrderBy
-
-    public int getMaxColumnsInOrderBy()
-    {
-        return maxColumnsInOrderBy;
-    }
-
-    public ServerMeta setMaxColumnsInOrderBy(int maxColumnsInOrderBy)
-    {
-        this.maxColumnsInOrderBy = maxColumnsInOrderBy;
-        return this;
-    }
-
-    // maxColumnsInSelect
-
-    public int getMaxColumnsInSelect()
-    {
-        return maxColumnsInSelect;
-    }
-
-    public ServerMeta setMaxColumnsInSelect(int maxColumnsInSelect)
-    {
-        this.maxColumnsInSelect = maxColumnsInSelect;
-        return this;
-    }
-
-    // maxCursorNameLength
-
-    public int getMaxCursorNameLength()
-    {
-        return maxCursorNameLength;
-    }
-
-    public ServerMeta setMaxCursorNameLength(int maxCursorNameLength)
-    {
-        this.maxCursorNameLength = maxCursorNameLength;
-        return this;
-    }
-
-    // maxLogicalLobSize
-
-    public int getMaxLogicalLobSize()
-    {
-        return maxLogicalLobSize;
-    }
-
-    public ServerMeta setMaxLogicalLobSize(int maxLogicalLobSize)
-    {
-        this.maxLogicalLobSize = maxLogicalLobSize;
-        return this;
-    }
-
-    // maxRowSize
-
-    public int getMaxRowSize()
-    {
-        return maxRowSize;
-    }
-
-    public ServerMeta setMaxRowSize(int maxRowSize)
-    {
-        this.maxRowSize = maxRowSize;
-        return this;
-    }
-
-    // maxSchemaNameLength
-
-    public int getMaxSchemaNameLength()
-    {
-        return maxSchemaNameLength;
-    }
-
-    public ServerMeta setMaxSchemaNameLength(int maxSchemaNameLength)
-    {
-        this.maxSchemaNameLength = maxSchemaNameLength;
-        return this;
-    }
-
-    // maxStatementLength
-
-    public int getMaxStatementLength()
-    {
-        return maxStatementLength;
-    }
-
-    public ServerMeta setMaxStatementLength(int maxStatementLength)
-    {
-        this.maxStatementLength = maxStatementLength;
-        return this;
-    }
-
-    // maxStatements
-
-    public int getMaxStatements()
-    {
-        return maxStatements;
-    }
-
-    public ServerMeta setMaxStatements(int maxStatements)
-    {
-        this.maxStatements = maxStatements;
-        return this;
-    }
-
-    // maxTableNameLength
-
-    public int getMaxTableNameLength()
-    {
-        return maxTableNameLength;
-    }
-
-    public ServerMeta setMaxTableNameLength(int maxTableNameLength)
-    {
-        this.maxTableNameLength = maxTableNameLength;
-        return this;
-    }
-
-    // maxTablesInSelect
-
-    public int getMaxTablesInSelect()
-    {
-        return maxTablesInSelect;
-    }
-
-    public ServerMeta setMaxTablesInSelect(int maxTablesInSelect)
-    {
-        this.maxTablesInSelect = maxTablesInSelect;
-        return this;
-    }
-
-    // maxUserNameLength
-
-    public int getMaxUserNameLength()
-    {
-        return maxUserNameLength;
-    }
-
-    public ServerMeta setMaxUserNameLength(int maxUserNameLength)
-    {
-        this.maxUserNameLength = maxUserNameLength;
-        return this;
-    }
-
-    // nullCollation
-
-    public NullCollation getNullCollation()
-    {
-        return nullCollation == null ? NullCollation.NC_UNKNOWN : nullCollation;
-    }
-
-    public ServerMeta setNullCollation(NullCollation nullCollation)
-    {
-        this.nullCollation = nullCollation;
-        return this;
-    }
-
-    // nullPlusNonNullEqualsNull
-
-    public Boolean getNullPlusNonNullEqualsNull()
-    {
-        return nullPlusNonNullEqualsNull;
-    }
-
-    public ServerMeta setNullPlusNonNullEqualsNull(Boolean nullPlusNonNullEqualsNull)
-    {
-        this.nullPlusNonNullEqualsNull = nullPlusNonNullEqualsNull;
-        return this;
-    }
-
-    // numericFunctions
-
-    public List<String> getNumericFunctionsList()
-    {
-        return numericFunctions;
-    }
-
-    public ServerMeta setNumericFunctionsList(List<String> numericFunctions)
-    {
-        this.numericFunctions = numericFunctions;
-        return this;
-    }
-
-    // orderBySupport
-
-    public List<OrderBySupport> getOrderBySupportList()
-    {
-        return orderBySupport;
-    }
-
-    public ServerMeta setOrderBySupportList(List<OrderBySupport> orderBySupport)
-    {
-        this.orderBySupport = orderBySupport;
-        return this;
-    }
-
-    // outerJoinSupport
-
-    public List<OuterJoinSupport> getOuterJoinSupportList()
-    {
-        return outerJoinSupport;
-    }
-
-    public ServerMeta setOuterJoinSupportList(List<OuterJoinSupport> outerJoinSupport)
-    {
-        this.outerJoinSupport = outerJoinSupport;
-        return this;
-    }
-
-    // quotedIdentifierCasing
-
-    public IdentifierCasing getQuotedIdentifierCasing()
-    {
-        return quotedIdentifierCasing == null ? IdentifierCasing.IC_UNKNOWN : quotedIdentifierCasing;
-    }
-
-    public ServerMeta setQuotedIdentifierCasing(IdentifierCasing quotedIdentifierCasing)
-    {
-        this.quotedIdentifierCasing = quotedIdentifierCasing;
-        return this;
-    }
-
-    // readOnly
-
-    public Boolean getReadOnly()
-    {
-        return readOnly;
-    }
-
-    public ServerMeta setReadOnly(Boolean readOnly)
-    {
-        this.readOnly = readOnly;
-        return this;
-    }
-
-    // schemaTerm
-
-    public String getSchemaTerm()
-    {
-        return schemaTerm;
-    }
-
-    public ServerMeta setSchemaTerm(String schemaTerm)
-    {
-        this.schemaTerm = schemaTerm;
-        return this;
-    }
-
-    // searchEscapeString
-
-    public String getSearchEscapeString()
-    {
-        return searchEscapeString;
-    }
-
-    public ServerMeta setSearchEscapeString(String searchEscapeString)
-    {
-        this.searchEscapeString = searchEscapeString;
-        return this;
-    }
-
-    // selectForUpdateSupported
-
-    public Boolean getSelectForUpdateSupported()
-    {
-        return selectForUpdateSupported;
-    }
-
-    public ServerMeta setSelectForUpdateSupported(Boolean selectForUpdateSupported)
-    {
-        this.selectForUpdateSupported = selectForUpdateSupported;
-        return this;
-    }
-
-    // specialCharacters
-
-    public String getSpecialCharacters()
-    {
-        return specialCharacters;
-    }
-
-    public ServerMeta setSpecialCharacters(String specialCharacters)
-    {
-        this.specialCharacters = specialCharacters;
-        return this;
-    }
-
-    // sqlKeywords
-
-    public List<String> getSqlKeywordsList()
-    {
-        return sqlKeywords;
-    }
-
-    public ServerMeta setSqlKeywordsList(List<String> sqlKeywords)
-    {
-        this.sqlKeywords = sqlKeywords;
-        return this;
-    }
-
-    // stringFunctions
-
-    public List<String> getStringFunctionsList()
-    {
-        return stringFunctions;
-    }
-
-    public ServerMeta setStringFunctionsList(List<String> stringFunctions)
-    {
-        this.stringFunctions = stringFunctions;
-        return this;
-    }
-
-    // subquerySupport
-
-    public List<SubQuerySupport> getSubquerySupportList()
-    {
-        return subquerySupport;
-    }
-
-    public ServerMeta setSubquerySupportList(List<SubQuerySupport> subquerySupport)
-    {
-        this.subquerySupport = subquerySupport;
-        return this;
-    }
-
-    // systemFunctions
-
-    public List<String> getSystemFunctionsList()
-    {
-        return systemFunctions;
-    }
-
-    public ServerMeta setSystemFunctionsList(List<String> systemFunctions)
-    {
-        this.systemFunctions = systemFunctions;
-        return this;
-    }
-
-    // tableTerm
-
-    public String getTableTerm()
-    {
-        return tableTerm;
-    }
-
-    public ServerMeta setTableTerm(String tableTerm)
-    {
-        this.tableTerm = tableTerm;
-        return this;
-    }
-
-    // transactionSupported
-
-    public Boolean getTransactionSupported()
-    {
-        return transactionSupported;
-    }
-
-    public ServerMeta setTransactionSupported(Boolean transactionSupported)
-    {
-        this.transactionSupported = transactionSupported;
-        return this;
-    }
-
-    // unionSupport
-
-    public List<UnionSupport> getUnionSupportList()
-    {
-        return unionSupport;
-    }
-
-    public ServerMeta setUnionSupportList(List<UnionSupport> unionSupport)
-    {
-        this.unionSupport = unionSupport;
-        return this;
-    }
-
-    // currentSchema
-
-    public String getCurrentSchema()
-    {
-        return currentSchema;
-    }
-
-    public ServerMeta setCurrentSchema(String currentSchema)
-    {
-        this.currentSchema = currentSchema;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<ServerMeta> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public ServerMeta newMessage()
-    {
-        return new ServerMeta();
-    }
-
-    public Class<ServerMeta> typeClass()
-    {
-        return ServerMeta.class;
-    }
-
-    public String messageName()
-    {
-        return ServerMeta.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return ServerMeta.class.getName();
-    }
-
-    public boolean isInitialized(ServerMeta message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, ServerMeta message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.allTablesSelectable = input.readBool();
-                    break;
-                case 2:
-                    message.blobIncludedInMaxRowSize = input.readBool();
-                    break;
-                case 3:
-                    message.catalogAtStart = input.readBool();
-                    break;
-                case 4:
-                    message.catalogSeparator = input.readString();
-                    break;
-                case 5:
-                    message.catalogTerm = input.readString();
-                    break;
-                case 6:
-                    if(message.collateSupport == null)
-                        message.collateSupport = new ArrayList<CollateSupport>();
-                    message.collateSupport.add(CollateSupport.valueOf(input.readEnum()));
-                    break;
-                case 7:
-                    message.columnAliasingSupported = input.readBool();
-                    break;
-                case 8:
-                    if(message.convertSupport == null)
-                        message.convertSupport = new ArrayList<ConvertSupport>();
-                    message.convertSupport.add(input.mergeObject(null, ConvertSupport.getSchema()));
-                    break;
-
-                case 9:
-                    message.correlationNamesSupport = CorrelationNamesSupport.valueOf(input.readEnum());
-                    break;
-                case 10:
-                    if(message.dateTimeFunctions == null)
-                        message.dateTimeFunctions = new ArrayList<String>();
-                    message.dateTimeFunctions.add(input.readString());
-                    break;
-                case 11:
-                    if(message.dateTimeLiteralsSupport == null)
-                        message.dateTimeLiteralsSupport = new ArrayList<DateTimeLiteralsSupport>();
-                    message.dateTimeLiteralsSupport.add(DateTimeLiteralsSupport.valueOf(input.readEnum()));
-                    break;
-                case 12:
-                    message.groupBySupport = GroupBySupport.valueOf(input.readEnum());
-                    break;
-                case 13:
-                    message.identifierCasing = IdentifierCasing.valueOf(input.readEnum());
-                    break;
-                case 14:
-                    message.identifierQuoteString = input.readString();
-                    break;
-                case 15:
-                    message.likeEscapeClauseSupported = input.readBool();
-                    break;
-                case 16:
-                    message.maxBinaryLiteralLength = input.readUInt32();
-                    break;
-                case 17:
-                    message.maxCatalogNameLength = input.readUInt32();
-                    break;
-                case 18:
-                    message.maxCharLiteralLength = input.readUInt32();
-                    break;
-                case 19:
-                    message.maxColumnNameLength = input.readUInt32();
-                    break;
-                case 20:
-                    message.maxColumnsInGroupBy = input.readUInt32();
-                    break;
-                case 21:
-                    message.maxColumnsInOrderBy = input.readUInt32();
-                    break;
-                case 22:
-                    message.maxColumnsInSelect = input.readUInt32();
-                    break;
-                case 23:
-                    message.maxCursorNameLength = input.readUInt32();
-                    break;
-                case 24:
-                    message.maxLogicalLobSize = input.readUInt32();
-                    break;
-                case 25:
-                    message.maxRowSize = input.readUInt32();
-                    break;
-                case 26:
-                    message.maxSchemaNameLength = input.readUInt32();
-                    break;
-                case 27:
-                    message.maxStatementLength = input.readUInt32();
-                    break;
-                case 28:
-                    message.maxStatements = input.readUInt32();
-                    break;
-                case 29:
-                    message.maxTableNameLength = input.readUInt32();
-                    break;
-                case 30:
-                    message.maxTablesInSelect = input.readUInt32();
-                    break;
-                case 31:
-                    message.maxUserNameLength = input.readUInt32();
-                    break;
-                case 32:
-                    message.nullCollation = NullCollation.valueOf(input.readEnum());
-                    break;
-                case 33:
-                    message.nullPlusNonNullEqualsNull = input.readBool();
-                    break;
-                case 34:
-                    if(message.numericFunctions == null)
-                        message.numericFunctions = new ArrayList<String>();
-                    message.numericFunctions.add(input.readString());
-                    break;
-                case 35:
-                    if(message.orderBySupport == null)
-                        message.orderBySupport = new ArrayList<OrderBySupport>();
-                    message.orderBySupport.add(OrderBySupport.valueOf(input.readEnum()));
-                    break;
-                case 36:
-                    if(message.outerJoinSupport == null)
-                        message.outerJoinSupport = new ArrayList<OuterJoinSupport>();
-                    message.outerJoinSupport.add(OuterJoinSupport.valueOf(input.readEnum()));
-                    break;
-                case 37:
-                    message.quotedIdentifierCasing = IdentifierCasing.valueOf(input.readEnum());
-                    break;
-                case 38:
-                    message.readOnly = input.readBool();
-                    break;
-                case 39:
-                    message.schemaTerm = input.readString();
-                    break;
-                case 40:
-                    message.searchEscapeString = input.readString();
-                    break;
-                case 41:
-                    message.selectForUpdateSupported = input.readBool();
-                    break;
-                case 42:
-                    message.specialCharacters = input.readString();
-                    break;
-                case 43:
-                    if(message.sqlKeywords == null)
-                        message.sqlKeywords = new ArrayList<String>();
-                    message.sqlKeywords.add(input.readString());
-                    break;
-                case 44:
-                    if(message.stringFunctions == null)
-                        message.stringFunctions = new ArrayList<String>();
-                    message.stringFunctions.add(input.readString());
-                    break;
-                case 45:
-                    if(message.subquerySupport == null)
-                        message.subquerySupport = new ArrayList<SubQuerySupport>();
-                    message.subquerySupport.add(SubQuerySupport.valueOf(input.readEnum()));
-                    break;
-                case 46:
-                    if(message.systemFunctions == null)
-                        message.systemFunctions = new ArrayList<String>();
-                    message.systemFunctions.add(input.readString());
-                    break;
-                case 47:
-                    message.tableTerm = input.readString();
-                    break;
-                case 48:
-                    message.transactionSupported = input.readBool();
-                    break;
-                case 49:
-                    if(message.unionSupport == null)
-                        message.unionSupport = new ArrayList<UnionSupport>();
-                    message.unionSupport.add(UnionSupport.valueOf(input.readEnum()));
-                    break;
-                case 50:
-                    message.currentSchema = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, ServerMeta message) throws IOException
-    {
-        if(message.allTablesSelectable != null)
-            output.writeBool(1, message.allTablesSelectable, false);
-
-        if(message.blobIncludedInMaxRowSize != null)
-            output.writeBool(2, message.blobIncludedInMaxRowSize, false);
-
-        if(message.catalogAtStart != null)
-            output.writeBool(3, message.catalogAtStart, false);
-
-        if(message.catalogSeparator != null)
-            output.writeString(4, message.catalogSeparator, false);
-
-        if(message.catalogTerm != null)
-            output.writeString(5, message.catalogTerm, false);
-
-        if(message.collateSupport != null)
-        {
-            for(CollateSupport collateSupport : message.collateSupport)
-            {
-                if(collateSupport != null)
-                    output.writeEnum(6, collateSupport.number, true);
-            }
-        }
-
-        if(message.columnAliasingSupported != null)
-            output.writeBool(7, message.columnAliasingSupported, false);
-
-        if(message.convertSupport != null)
-        {
-            for(ConvertSupport convertSupport : message.convertSupport)
-            {
-                if(convertSupport != null)
-                    output.writeObject(8, convertSupport, ConvertSupport.getSchema(), true);
-            }
-        }
-
-
-        if(message.correlationNamesSupport != null)
-             output.writeEnum(9, message.correlationNamesSupport.number, false);
-
-        if(message.dateTimeFunctions != null)
-        {
-            for(String dateTimeFunctions : message.dateTimeFunctions)
-            {
-                if(dateTimeFunctions != null)
-                    output.writeString(10, dateTimeFunctions, true);
-            }
-        }
-
-        if(message.dateTimeLiteralsSupport != null)
-        {
-            for(DateTimeLiteralsSupport dateTimeLiteralsSupport : message.dateTimeLiteralsSupport)
-            {
-                if(dateTimeLiteralsSupport != null)
-                    output.writeEnum(11, dateTimeLiteralsSupport.number, true);
-            }
-        }
-
-        if(message.groupBySupport != null)
-             output.writeEnum(12, message.groupBySupport.number, false);
-
-        if(message.identifierCasing != null)
-             output.writeEnum(13, message.identifierCasing.number, false);
-
-        if(message.identifierQuoteString != null)
-            output.writeString(14, message.identifierQuoteString, false);
-
-        if(message.likeEscapeClauseSupported != null)
-            output.writeBool(15, message.likeEscapeClauseSupported, false);
-
-        if(message.maxBinaryLiteralLength != 0)
-            output.writeUInt32(16, message.maxBinaryLiteralLength, false);
-
-        if(message.maxCatalogNameLength != 0)
-            output.writeUInt32(17, message.maxCatalogNameLength, false);
-
-        if(message.maxCharLiteralLength != 0)
-            output.writeUInt32(18, message.maxCharLiteralLength, false);
-
-        if(message.maxColumnNameLength != 0)
-            output.writeUInt32(19, message.maxColumnNameLength, false);
-
-        if(message.maxColumnsInGroupBy != 0)
-            output.writeUInt32(20, message.maxColumnsInGroupBy, false);
-
-        if(message.maxColumnsInOrderBy != 0)
-            output.writeUInt32(21, message.maxColumnsInOrderBy, false);
-
-        if(message.maxColumnsInSelect != 0)
-            output.writeUInt32(22, message.maxColumnsInSelect, false);
-
-        if(message.maxCursorNameLength != 0)
-            output.writeUInt32(23, message.maxCursorNameLength, false);
-
-        if(message.maxLogicalLobSize != 0)
-            output.writeUInt32(24, message.maxLogicalLobSize, false);
-
-        if(message.maxRowSize != 0)
-            output.writeUInt32(25, message.maxRowSize, false);
-
-        if(message.maxSchemaNameLength != 0)
-            output.writeUInt32(26, message.maxSchemaNameLength, false);
-
-        if(message.maxStatementLength != 0)
-            output.writeUInt32(27, message.maxStatementLength, false);
-
-        if(message.maxStatements != 0)
-            output.writeUInt32(28, message.maxStatements, false);
-
-        if(message.maxTableNameLength != 0)
-            output.writeUInt32(29, message.maxTableNameLength, false);
-
-        if(message.maxTablesInSelect != 0)
-            output.writeUInt32(30, message.maxTablesInSelect, false);
-
-        if(message.maxUserNameLength != 0)
-            output.writeUInt32(31, message.maxUserNameLength, false);
-
-        if(message.nullCollation != null)
-             output.writeEnum(32, message.nullCollation.number, false);
-
-        if(message.nullPlusNonNullEqualsNull != null)
-            output.writeBool(33, message.nullPlusNonNullEqualsNull, false);
-
-        if(message.numericFunctions != null)
-        {
-            for(String numericFunctions : message.numericFunctions)
-            {
-                if(numericFunctions != null)
-                    output.writeString(34, numericFunctions, true);
-            }
-        }
-
-        if(message.orderBySupport != null)
-        {
-            for(OrderBySupport orderBySupport : message.orderBySupport)
-            {
-                if(orderBySupport != null)
-                    output.writeEnum(35, orderBySupport.number, true);
-            }
-        }
-
-        if(message.outerJoinSupport != null)
-        {
-            for(OuterJoinSupport outerJoinSupport : message.outerJoinSupport)
-            {
-                if(outerJoinSupport != null)
-                    output.writeEnum(36, outerJoinSupport.number, true);
-            }
-        }
-
-        if(message.quotedIdentifierCasing != null)
-             output.writeEnum(37, message.quotedIdentifierCasing.number, false);
-
-        if(message.readOnly != null)
-            output.writeBool(38, message.readOnly, false);
-
-        if(message.schemaTerm != null)
-            output.writeString(39, message.schemaTerm, false);
-
-        if(message.searchEscapeString != null)
-            output.writeString(40, message.searchEscapeString, false);
-
-        if(message.selectForUpdateSupported != null)
-            output.writeBool(41, message.selectForUpdateSupported, false);
-
-        if(message.specialCharacters != null)
-            output.writeString(42, message.specialCharacters, false);
-
-        if(message.sqlKeywords != null)
-        {
-            for(String sqlKeywords : message.sqlKeywords)
-            {
-                if(sqlKeywords != null)
-                    output.writeString(43, sqlKeywords, true);
-            }
-        }
-
-        if(message.stringFunctions != null)
-        {
-            for(String stringFunctions : message.stringFunctions)
-            {
-                if(stringFunctions != null)
-                    output.writeString(44, stringFunctions, true);
-            }
-        }
-
-        if(message.subquerySupport != null)
-        {
-            for(SubQuerySupport subquerySupport : message.subquerySupport)
-            {
-                if(subquerySupport != null)
-                    output.writeEnum(45, subquerySupport.number, true);
-            }
-        }
-
-        if(message.systemFunctions != null)
-        {
-            for(String systemFunctions : message.systemFunctions)
-            {
-                if(systemFunctions != null)
-                    output.writeString(46, systemFunctions, true);
-            }
-        }
-
-        if(message.tableTerm != null)
-            output.writeString(47, message.tableTerm, false);
-
-        if(message.transactionSupported != null)
-            output.writeBool(48, message.transactionSupported, false);
-
-        if(message.unionSupport != null)
-        {
-            for(UnionSupport unionSupport : message.unionSupport)
-            {
-                if(unionSupport != null)
-                    output.writeEnum(49, unionSupport.number, true);
-            }
-        }
-
-        if(message.currentSchema != null)
-            output.writeString(50, message.currentSchema, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "allTablesSelectable";
-            case 2: return "blobIncludedInMaxRowSize";
-            case 3: return "catalogAtStart";
-            case 4: return "catalogSeparator";
-            case 5: return "catalogTerm";
-            case 6: return "collateSupport";
-            case 7: return "columnAliasingSupported";
-            case 8: return "convertSupport";
-            case 9: return "correlationNamesSupport";
-            case 10: return "dateTimeFunctions";
-            case 11: return "dateTimeLiteralsSupport";
-            case 12: return "groupBySupport";
-            case 13: return "identifierCasing";
-            case 14: return "identifierQuoteString";
-            case 15: return "likeEscapeClauseSupported";
-            case 16: return "maxBinaryLiteralLength";
-            case 17: return "maxCatalogNameLength";
-            case 18: return "maxCharLiteralLength";
-            case 19: return "maxColumnNameLength";
-            case 20: return "maxColumnsInGroupBy";
-            case 21: return "maxColumnsInOrderBy";
-            case 22: return "maxColumnsInSelect";
-            case 23: return "maxCursorNameLength";
-            case 24: return "maxLogicalLobSize";
-            case 25: return "maxRowSize";
-            case 26: return "maxSchemaNameLength";
-            case 27: return "maxStatementLength";
-            case 28: return "maxStatements";
-            case 29: return "maxTableNameLength";
-            case 30: return "maxTablesInSelect";
-            case 31: return "maxUserNameLength";
-            case 32: return "nullCollation";
-            case 33: return "nullPlusNonNullEqualsNull";
-            case 34: return "numericFunctions";
-            case 35: return "orderBySupport";
-            case 36: return "outerJoinSupport";
-            case 37: return "quotedIdentifierCasing";
-            case 38: return "readOnly";
-            case 39: return "schemaTerm";
-            case 40: return "searchEscapeString";
-            case 41: return "selectForUpdateSupported";
-            case 42: return "specialCharacters";
-            case 43: return "sqlKeywords";
-            case 44: return "stringFunctions";
-            case 45: return "subquerySupport";
-            case 46: return "systemFunctions";
-            case 47: return "tableTerm";
-            case 48: return "transactionSupported";
-            case 49: return "unionSupport";
-            case 50: return "currentSchema";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("allTablesSelectable", 1);
-        __fieldMap.put("blobIncludedInMaxRowSize", 2);
-        __fieldMap.put("catalogAtStart", 3);
-        __fieldMap.put("catalogSeparator", 4);
-        __fieldMap.put("catalogTerm", 5);
-        __fieldMap.put("collateSupport", 6);
-        __fieldMap.put("columnAliasingSupported", 7);
-        __fieldMap.put("convertSupport", 8);
-        __fieldMap.put("correlationNamesSupport", 9);
-        __fieldMap.put("dateTimeFunctions", 10);
-        __fieldMap.put("dateTimeLiteralsSupport", 11);
-        __fieldMap.put("groupBySupport", 12);
-        __fieldMap.put("identifierCasing", 13);
-        __fieldMap.put("identifierQuoteString", 14);
-        __fieldMap.put("likeEscapeClauseSupported", 15);
-        __fieldMap.put("maxBinaryLiteralLength", 16);
-        __fieldMap.put("maxCatalogNameLength", 17);
-        __fieldMap.put("maxCharLiteralLength", 18);
-        __fieldMap.put("maxColumnNameLength", 19);
-        __fieldMap.put("maxColumnsInGroupBy", 20);
-        __fieldMap.put("maxColumnsInOrderBy", 21);
-        __fieldMap.put("maxColumnsInSelect", 22);
-        __fieldMap.put("maxCursorNameLength", 23);
-        __fieldMap.put("maxLogicalLobSize", 24);
-        __fieldMap.put("maxRowSize", 25);
-        __fieldMap.put("maxSchemaNameLength", 26);
-        __fieldMap.put("maxStatementLength", 27);
-        __fieldMap.put("maxStatements", 28);
-        __fieldMap.put("maxTableNameLength", 29);
-        __fieldMap.put("maxTablesInSelect", 30);
-        __fieldMap.put("maxUserNameLength", 31);
-        __fieldMap.put("nullCollation", 32);
-        __fieldMap.put("nullPlusNonNullEqualsNull", 33);
-        __fieldMap.put("numericFunctions", 34);
-        __fieldMap.put("orderBySupport", 35);
-        __fieldMap.put("outerJoinSupport", 36);
-        __fieldMap.put("quotedIdentifierCasing", 37);
-        __fieldMap.put("readOnly", 38);
-        __fieldMap.put("schemaTerm", 39);
-        __fieldMap.put("searchEscapeString", 40);
-        __fieldMap.put("selectForUpdateSupported", 41);
-        __fieldMap.put("specialCharacters", 42);
-        __fieldMap.put("sqlKeywords", 43);
-        __fieldMap.put("stringFunctions", 44);
-        __fieldMap.put("subquerySupport", 45);
-        __fieldMap.put("systemFunctions", 46);
-        __fieldMap.put("tableTerm", 47);
-        __fieldMap.put("transactionSupported", 48);
-        __fieldMap.put("unionSupport", 49);
-        __fieldMap.put("currentSchema", 50);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerPreparedStatementState.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerPreparedStatementState.java
deleted file mode 100644
index 9e88f82..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerPreparedStatementState.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class ServerPreparedStatementState implements Externalizable, Message<ServerPreparedStatementState>, Schema<ServerPreparedStatementState>
-{
-
-    public static Schema<ServerPreparedStatementState> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static ServerPreparedStatementState getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final ServerPreparedStatementState DEFAULT_INSTANCE = new ServerPreparedStatementState();
-
-    
-    private String sqlQuery;
-
-    public ServerPreparedStatementState()
-    {
-        
-    }
-
-    // getters and setters
-
-    // sqlQuery
-
-    public String getSqlQuery()
-    {
-        return sqlQuery;
-    }
-
-    public ServerPreparedStatementState setSqlQuery(String sqlQuery)
-    {
-        this.sqlQuery = sqlQuery;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<ServerPreparedStatementState> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public ServerPreparedStatementState newMessage()
-    {
-        return new ServerPreparedStatementState();
-    }
-
-    public Class<ServerPreparedStatementState> typeClass()
-    {
-        return ServerPreparedStatementState.class;
-    }
-
-    public String messageName()
-    {
-        return ServerPreparedStatementState.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return ServerPreparedStatementState.class.getName();
-    }
-
-    public boolean isInitialized(ServerPreparedStatementState message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, ServerPreparedStatementState message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.sqlQuery = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, ServerPreparedStatementState message) throws IOException
-    {
-        if(message.sqlQuery != null)
-            output.writeString(1, message.sqlQuery, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "sqlQuery";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("sqlQuery", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/StackTraceElementWrapper.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/StackTraceElementWrapper.java
deleted file mode 100644
index f931883..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/StackTraceElementWrapper.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class StackTraceElementWrapper implements Externalizable, Message<StackTraceElementWrapper>, Schema<StackTraceElementWrapper>
-{
-
-    public static Schema<StackTraceElementWrapper> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static StackTraceElementWrapper getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final StackTraceElementWrapper DEFAULT_INSTANCE = new StackTraceElementWrapper();
-
-    
-    private String className;
-    private String fileName;
-    private int lineNumber;
-    private String methodName;
-    private Boolean isNativeMethod;
-
-    public StackTraceElementWrapper()
-    {
-        
-    }
-
-    // getters and setters
-
-    // className
-
-    public String getClassName()
-    {
-        return className;
-    }
-
-    public StackTraceElementWrapper setClassName(String className)
-    {
-        this.className = className;
-        return this;
-    }
-
-    // fileName
-
-    public String getFileName()
-    {
-        return fileName;
-    }
-
-    public StackTraceElementWrapper setFileName(String fileName)
-    {
-        this.fileName = fileName;
-        return this;
-    }
-
-    // lineNumber
-
-    public int getLineNumber()
-    {
-        return lineNumber;
-    }
-
-    public StackTraceElementWrapper setLineNumber(int lineNumber)
-    {
-        this.lineNumber = lineNumber;
-        return this;
-    }
-
-    // methodName
-
-    public String getMethodName()
-    {
-        return methodName;
-    }
-
-    public StackTraceElementWrapper setMethodName(String methodName)
-    {
-        this.methodName = methodName;
-        return this;
-    }
-
-    // isNativeMethod
-
-    public Boolean getIsNativeMethod()
-    {
-        return isNativeMethod;
-    }
-
-    public StackTraceElementWrapper setIsNativeMethod(Boolean isNativeMethod)
-    {
-        this.isNativeMethod = isNativeMethod;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<StackTraceElementWrapper> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public StackTraceElementWrapper newMessage()
-    {
-        return new StackTraceElementWrapper();
-    }
-
-    public Class<StackTraceElementWrapper> typeClass()
-    {
-        return StackTraceElementWrapper.class;
-    }
-
-    public String messageName()
-    {
-        return StackTraceElementWrapper.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return StackTraceElementWrapper.class.getName();
-    }
-
-    public boolean isInitialized(StackTraceElementWrapper message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, StackTraceElementWrapper message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.className = input.readString();
-                    break;
-                case 2:
-                    message.fileName = input.readString();
-                    break;
-                case 3:
-                    message.lineNumber = input.readInt32();
-                    break;
-                case 4:
-                    message.methodName = input.readString();
-                    break;
-                case 5:
-                    message.isNativeMethod = input.readBool();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, StackTraceElementWrapper message) throws IOException
-    {
-        if(message.className != null)
-            output.writeString(1, message.className, false);
-
-        if(message.fileName != null)
-            output.writeString(2, message.fileName, false);
-
-        if(message.lineNumber != 0)
-            output.writeInt32(3, message.lineNumber, false);
-
-        if(message.methodName != null)
-            output.writeString(4, message.methodName, false);
-
-        if(message.isNativeMethod != null)
-            output.writeBool(5, message.isNativeMethod, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "className";
-            case 2: return "fileName";
-            case 3: return "lineNumber";
-            case 4: return "methodName";
-            case 5: return "isNativeMethod";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("className", 1);
-        __fieldMap.put("fileName", 2);
-        __fieldMap.put("lineNumber", 3);
-        __fieldMap.put("methodName", 4);
-        __fieldMap.put("isNativeMethod", 5);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/StreamProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/StreamProfile.java
deleted file mode 100644
index ce526b1..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/StreamProfile.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class StreamProfile implements Externalizable, Message<StreamProfile>, Schema<StreamProfile>
-{
-
-    public static Schema<StreamProfile> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static StreamProfile getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final StreamProfile DEFAULT_INSTANCE = new StreamProfile();
-
-    
-    private long records;
-    private long batches;
-    private long schemas;
-
-    public StreamProfile()
-    {
-        
-    }
-
-    // getters and setters
-
-    // records
-
-    public long getRecords()
-    {
-        return records;
-    }
-
-    public StreamProfile setRecords(long records)
-    {
-        this.records = records;
-        return this;
-    }
-
-    // batches
-
-    public long getBatches()
-    {
-        return batches;
-    }
-
-    public StreamProfile setBatches(long batches)
-    {
-        this.batches = batches;
-        return this;
-    }
-
-    // schemas
-
-    public long getSchemas()
-    {
-        return schemas;
-    }
-
-    public StreamProfile setSchemas(long schemas)
-    {
-        this.schemas = schemas;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<StreamProfile> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public StreamProfile newMessage()
-    {
-        return new StreamProfile();
-    }
-
-    public Class<StreamProfile> typeClass()
-    {
-        return StreamProfile.class;
-    }
-
-    public String messageName()
-    {
-        return StreamProfile.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return StreamProfile.class.getName();
-    }
-
-    public boolean isInitialized(StreamProfile message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, StreamProfile message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.records = input.readInt64();
-                    break;
-                case 2:
-                    message.batches = input.readInt64();
-                    break;
-                case 3:
-                    message.schemas = input.readInt64();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, StreamProfile message) throws IOException
-    {
-        if(message.records != 0)
-            output.writeInt64(1, message.records, false);
-
-        if(message.batches != 0)
-            output.writeInt64(2, message.batches, false);
-
-        if(message.schemas != 0)
-            output.writeInt64(3, message.schemas, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "records";
-            case 2: return "batches";
-            case 3: return "schemas";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("records", 1);
-        __fieldMap.put("batches", 2);
-        __fieldMap.put("schemas", 3);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SubQuerySupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SubQuerySupport.java
deleted file mode 100644
index 5191cf9..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SubQuerySupport.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum SubQuerySupport implements com.dyuproject.protostuff.EnumLite<SubQuerySupport>
-{
-    SQ_UNKNOWN(0),
-    SQ_CORRELATED(1),
-    SQ_IN_COMPARISON(2),
-    SQ_IN_EXISTS(3),
-    SQ_IN_INSERT(4),
-    SQ_IN_QUANTIFIED(5);
-    
-    public final int number;
-    
-    private SubQuerySupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static SubQuerySupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return SQ_UNKNOWN;
-            case 1: return SQ_CORRELATED;
-            case 2: return SQ_IN_COMPARISON;
-            case 3: return SQ_IN_EXISTS;
-            case 4: return SQ_IN_INSERT;
-            case 5: return SQ_IN_QUANTIFIED;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/TableMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/TableMetadata.java
deleted file mode 100644
index c0c11ac..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/TableMetadata.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class TableMetadata implements Externalizable, Message<TableMetadata>, Schema<TableMetadata>
-{
-
-    public static Schema<TableMetadata> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static TableMetadata getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final TableMetadata DEFAULT_INSTANCE = new TableMetadata();
-
-    
-    private String catalogName;
-    private String schemaName;
-    private String tableName;
-    private String type;
-
-    public TableMetadata()
-    {
-        
-    }
-
-    // getters and setters
-
-    // catalogName
-
-    public String getCatalogName()
-    {
-        return catalogName;
-    }
-
-    public TableMetadata setCatalogName(String catalogName)
-    {
-        this.catalogName = catalogName;
-        return this;
-    }
-
-    // schemaName
-
-    public String getSchemaName()
-    {
-        return schemaName;
-    }
-
-    public TableMetadata setSchemaName(String schemaName)
-    {
-        this.schemaName = schemaName;
-        return this;
-    }
-
-    // tableName
-
-    public String getTableName()
-    {
-        return tableName;
-    }
-
-    public TableMetadata setTableName(String tableName)
-    {
-        this.tableName = tableName;
-        return this;
-    }
-
-    // type
-
-    public String getType()
-    {
-        return type;
-    }
-
-    public TableMetadata setType(String type)
-    {
-        this.type = type;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<TableMetadata> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public TableMetadata newMessage()
-    {
-        return new TableMetadata();
-    }
-
-    public Class<TableMetadata> typeClass()
-    {
-        return TableMetadata.class;
-    }
-
-    public String messageName()
-    {
-        return TableMetadata.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return TableMetadata.class.getName();
-    }
-
-    public boolean isInitialized(TableMetadata message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, TableMetadata message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.catalogName = input.readString();
-                    break;
-                case 2:
-                    message.schemaName = input.readString();
-                    break;
-                case 3:
-                    message.tableName = input.readString();
-                    break;
-                case 4:
-                    message.type = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, TableMetadata message) throws IOException
-    {
-        if(message.catalogName != null)
-            output.writeString(1, message.catalogName, false);
-
-        if(message.schemaName != null)
-            output.writeString(2, message.schemaName, false);
-
-        if(message.tableName != null)
-            output.writeString(3, message.tableName, false);
-
-        if(message.type != null)
-            output.writeString(4, message.type, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "catalogName";
-            case 2: return "schemaName";
-            case 3: return "tableName";
-            case 4: return "type";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("catalogName", 1);
-        __fieldMap.put("schemaName", 2);
-        __fieldMap.put("tableName", 3);
-        __fieldMap.put("type", 4);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UnionSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UnionSupport.java
deleted file mode 100644
index f751b61..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UnionSupport.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum UnionSupport implements com.dyuproject.protostuff.EnumLite<UnionSupport>
-{
-    U_UNKNOWN(0),
-    U_UNION(1),
-    U_UNION_ALL(2);
-    
-    public final int number;
-    
-    private UnionSupport (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static UnionSupport valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return U_UNKNOWN;
-            case 1: return U_UNION;
-            case 2: return U_UNION_ALL;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserCredentials.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserCredentials.java
deleted file mode 100644
index 4c4491b..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserCredentials.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class UserCredentials implements Externalizable, Message<UserCredentials>, Schema<UserCredentials>
-{
-
-    public static Schema<UserCredentials> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static UserCredentials getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final UserCredentials DEFAULT_INSTANCE = new UserCredentials();
-
-    
-    private String userName;
-
-    public UserCredentials()
-    {
-        
-    }
-
-    // getters and setters
-
-    // userName
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public UserCredentials setUserName(String userName)
-    {
-        this.userName = userName;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<UserCredentials> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public UserCredentials newMessage()
-    {
-        return new UserCredentials();
-    }
-
-    public Class<UserCredentials> typeClass()
-    {
-        return UserCredentials.class;
-    }
-
-    public String messageName()
-    {
-        return UserCredentials.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return UserCredentials.class.getName();
-    }
-
-    public boolean isInitialized(UserCredentials message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, UserCredentials message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.userName = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, UserCredentials message) throws IOException
-    {
-        if(message.userName != null)
-            output.writeString(1, message.userName, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "userName";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("userName", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserProperties.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserProperties.java
deleted file mode 100644
index f189bf8..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserProperties.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class UserProperties implements Externalizable, Message<UserProperties>, Schema<UserProperties>
-{
-
-    public static Schema<UserProperties> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static UserProperties getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final UserProperties DEFAULT_INSTANCE = new UserProperties();
-
-    
-    private List<Property> properties;
-
-    public UserProperties()
-    {
-        
-    }
-
-    // getters and setters
-
-    // properties
-
-    public List<Property> getPropertiesList()
-    {
-        return properties;
-    }
-
-    public UserProperties setPropertiesList(List<Property> properties)
-    {
-        this.properties = properties;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<UserProperties> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public UserProperties newMessage()
-    {
-        return new UserProperties();
-    }
-
-    public Class<UserProperties> typeClass()
-    {
-        return UserProperties.class;
-    }
-
-    public String messageName()
-    {
-        return UserProperties.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return UserProperties.class.getName();
-    }
-
-    public boolean isInitialized(UserProperties message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, UserProperties message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    if(message.properties == null)
-                        message.properties = new ArrayList<Property>();
-                    message.properties.add(input.mergeObject(null, Property.getSchema()));
-                    break;
-
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, UserProperties message) throws IOException
-    {
-        if(message.properties != null)
-        {
-            for(Property properties : message.properties)
-            {
-                if(properties != null)
-                    output.writeObject(1, properties, Property.getSchema(), true);
-            }
-        }
-
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "properties";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("properties", 1);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserToBitHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserToBitHandshake.java
deleted file mode 100644
index 043d3ca..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserToBitHandshake.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class UserToBitHandshake implements Externalizable, Message<UserToBitHandshake>, Schema<UserToBitHandshake>
-{
-
-    public static Schema<UserToBitHandshake> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static UserToBitHandshake getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final UserToBitHandshake DEFAULT_INSTANCE = new UserToBitHandshake();
-
-    static final Boolean DEFAULT_SUPPORT_COMPLEX_TYPES = new Boolean(false);
-    static final Boolean DEFAULT_SUPPORT_TIMEOUT = new Boolean(false);
-    
-    private RpcChannel channel;
-    private Boolean supportListening;
-    private int rpcVersion;
-    private UserCredentials credentials;
-    private UserProperties properties;
-    private Boolean supportComplexTypes = DEFAULT_SUPPORT_COMPLEX_TYPES;
-    private Boolean supportTimeout = DEFAULT_SUPPORT_TIMEOUT;
-    private RpcEndpointInfos clientInfos;
-    private SaslSupport saslSupport;
-
-    public UserToBitHandshake()
-    {
-        
-    }
-
-    // getters and setters
-
-    // channel
-
-    public RpcChannel getChannel()
-    {
-        return channel == null ? RpcChannel.USER : channel;
-    }
-
-    public UserToBitHandshake setChannel(RpcChannel channel)
-    {
-        this.channel = channel;
-        return this;
-    }
-
-    // supportListening
-
-    public Boolean getSupportListening()
-    {
-        return supportListening;
-    }
-
-    public UserToBitHandshake setSupportListening(Boolean supportListening)
-    {
-        this.supportListening = supportListening;
-        return this;
-    }
-
-    // rpcVersion
-
-    public int getRpcVersion()
-    {
-        return rpcVersion;
-    }
-
-    public UserToBitHandshake setRpcVersion(int rpcVersion)
-    {
-        this.rpcVersion = rpcVersion;
-        return this;
-    }
-
-    // credentials
-
-    public UserCredentials getCredentials()
-    {
-        return credentials;
-    }
-
-    public UserToBitHandshake setCredentials(UserCredentials credentials)
-    {
-        this.credentials = credentials;
-        return this;
-    }
-
-    // properties
-
-    public UserProperties getProperties()
-    {
-        return properties;
-    }
-
-    public UserToBitHandshake setProperties(UserProperties properties)
-    {
-        this.properties = properties;
-        return this;
-    }
-
-    // supportComplexTypes
-
-    public Boolean getSupportComplexTypes()
-    {
-        return supportComplexTypes;
-    }
-
-    public UserToBitHandshake setSupportComplexTypes(Boolean supportComplexTypes)
-    {
-        this.supportComplexTypes = supportComplexTypes;
-        return this;
-    }
-
-    // supportTimeout
-
-    public Boolean getSupportTimeout()
-    {
-        return supportTimeout;
-    }
-
-    public UserToBitHandshake setSupportTimeout(Boolean supportTimeout)
-    {
-        this.supportTimeout = supportTimeout;
-        return this;
-    }
-
-    // clientInfos
-
-    public RpcEndpointInfos getClientInfos()
-    {
-        return clientInfos;
-    }
-
-    public UserToBitHandshake setClientInfos(RpcEndpointInfos clientInfos)
-    {
-        this.clientInfos = clientInfos;
-        return this;
-    }
-
-    // saslSupport
-
-    public SaslSupport getSaslSupport()
-    {
-        return saslSupport == null ? SaslSupport.UNKNOWN_SASL_SUPPORT : saslSupport;
-    }
-
-    public UserToBitHandshake setSaslSupport(SaslSupport saslSupport)
-    {
-        this.saslSupport = saslSupport;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<UserToBitHandshake> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public UserToBitHandshake newMessage()
-    {
-        return new UserToBitHandshake();
-    }
-
-    public Class<UserToBitHandshake> typeClass()
-    {
-        return UserToBitHandshake.class;
-    }
-
-    public String messageName()
-    {
-        return UserToBitHandshake.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return UserToBitHandshake.class.getName();
-    }
-
-    public boolean isInitialized(UserToBitHandshake message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, UserToBitHandshake message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.channel = RpcChannel.valueOf(input.readEnum());
-                    break;
-                case 2:
-                    message.supportListening = input.readBool();
-                    break;
-                case 3:
-                    message.rpcVersion = input.readInt32();
-                    break;
-                case 4:
-                    message.credentials = input.mergeObject(message.credentials, UserCredentials.getSchema());
-                    break;
-
-                case 5:
-                    message.properties = input.mergeObject(message.properties, UserProperties.getSchema());
-                    break;
-
-                case 6:
-                    message.supportComplexTypes = input.readBool();
-                    break;
-                case 7:
-                    message.supportTimeout = input.readBool();
-                    break;
-                case 8:
-                    message.clientInfos = input.mergeObject(message.clientInfos, RpcEndpointInfos.getSchema());
-                    break;
-
-                case 9:
-                    message.saslSupport = SaslSupport.valueOf(input.readEnum());
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, UserToBitHandshake message) throws IOException
-    {
-        if(message.channel != null)
-             output.writeEnum(1, message.channel.number, false);
-
-        if(message.supportListening != null)
-            output.writeBool(2, message.supportListening, false);
-
-        if(message.rpcVersion != 0)
-            output.writeInt32(3, message.rpcVersion, false);
-
-        if(message.credentials != null)
-             output.writeObject(4, message.credentials, UserCredentials.getSchema(), false);
-
-
-        if(message.properties != null)
-             output.writeObject(5, message.properties, UserProperties.getSchema(), false);
-
-
-        if(message.supportComplexTypes != null && message.supportComplexTypes != DEFAULT_SUPPORT_COMPLEX_TYPES)
-            output.writeBool(6, message.supportComplexTypes, false);
-
-        if(message.supportTimeout != null && message.supportTimeout != DEFAULT_SUPPORT_TIMEOUT)
-            output.writeBool(7, message.supportTimeout, false);
-
-        if(message.clientInfos != null)
-             output.writeObject(8, message.clientInfos, RpcEndpointInfos.getSchema(), false);
-
-
-        if(message.saslSupport != null)
-             output.writeEnum(9, message.saslSupport.number, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "channel";
-            case 2: return "supportListening";
-            case 3: return "rpcVersion";
-            case 4: return "credentials";
-            case 5: return "properties";
-            case 6: return "supportComplexTypes";
-            case 7: return "supportTimeout";
-            case 8: return "clientInfos";
-            case 9: return "saslSupport";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("channel", 1);
-        __fieldMap.put("supportListening", 2);
-        __fieldMap.put("rpcVersion", 3);
-        __fieldMap.put("credentials", 4);
-        __fieldMap.put("properties", 5);
-        __fieldMap.put("supportComplexTypes", 6);
-        __fieldMap.put("supportTimeout", 7);
-        __fieldMap.put("clientInfos", 8);
-        __fieldMap.put("saslSupport", 9);
-    }
-    
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ValueMode.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ValueMode.java
deleted file mode 100644
index ed538c0..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ValueMode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-public enum ValueMode implements com.dyuproject.protostuff.EnumLite<ValueMode>
-{
-    VALUE_VECTOR(0),
-    RLE(1),
-    DICT(2);
-    
-    public final int number;
-    
-    private ValueMode (int number)
-    {
-        this.number = number;
-    }
-    
-    public int getNumber()
-    {
-        return number;
-    }
-    
-    public static ValueMode valueOf(int number)
-    {
-        switch(number) 
-        {
-            case 0: return VALUE_VECTOR;
-            case 1: return RLE;
-            case 2: return DICT;
-            default: return null;
-        }
-    }
-}
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java
deleted file mode 100644
index 89b2bb1..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class WorkQueueStatus implements Externalizable, Message<WorkQueueStatus>, Schema<WorkQueueStatus>
-{
-
-    public static Schema<WorkQueueStatus> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static WorkQueueStatus getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final WorkQueueStatus DEFAULT_INSTANCE = new WorkQueueStatus();
-
-    
-    private DrillbitEndpoint endpoint;
-    private int queueLength;
-    private long reportTime;
-
-    public WorkQueueStatus()
-    {
-        
-    }
-
-    // getters and setters
-
-    // endpoint
-
-    public DrillbitEndpoint getEndpoint()
-    {
-        return endpoint;
-    }
-
-    public WorkQueueStatus setEndpoint(DrillbitEndpoint endpoint)
-    {
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    // queueLength
-
-    public int getQueueLength()
-    {
-        return queueLength;
-    }
-
-    public WorkQueueStatus setQueueLength(int queueLength)
-    {
-        this.queueLength = queueLength;
-        return this;
-    }
-
-    // reportTime
-
-    public long getReportTime()
-    {
-        return reportTime;
-    }
-
-    public WorkQueueStatus setReportTime(long reportTime)
-    {
-        this.reportTime = reportTime;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<WorkQueueStatus> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public WorkQueueStatus newMessage()
-    {
-        return new WorkQueueStatus();
-    }
-
-    public Class<WorkQueueStatus> typeClass()
-    {
-        return WorkQueueStatus.class;
-    }
-
-    public String messageName()
-    {
-        return WorkQueueStatus.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return WorkQueueStatus.class.getName();
-    }
-
-    public boolean isInitialized(WorkQueueStatus message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, WorkQueueStatus message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.endpoint = input.mergeObject(message.endpoint, DrillbitEndpoint.getSchema());
-                    break;
-
-                case 2:
-                    message.queueLength = input.readInt32();
-                    break;
-                case 3:
-                    message.reportTime = input.readInt64();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, WorkQueueStatus message) throws IOException
-    {
-        if(message.endpoint != null)
-             output.writeObject(1, message.endpoint, DrillbitEndpoint.getSchema(), false);
-
-
-        if(message.queueLength != 0)
-            output.writeInt32(2, message.queueLength, false);
-
-        if(message.reportTime != 0)
-            output.writeInt64(3, message.reportTime, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "endpoint";
-            case 2: return "queueLength";
-            case 3: return "reportTime";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("endpoint", 1);
-        __fieldMap.put("queueLength", 2);
-        __fieldMap.put("reportTime", 3);
-    }
-    
-}