You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by vo...@apache.org on 2019/06/18 18:22:51 UTC

[drill] 02/03: DRILL-7294: Regenerate protobufs

This is an automated email from the ASF dual-hosted git repository.

volodymyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git

commit 24ec98043ecdce6af8ccb054cf44ae943cd6cb4e
Author: Volodymyr Vysotskyi <vv...@gmail.com>
AuthorDate: Thu Jun 13 17:03:09 2019 +0300

    DRILL-7294: Regenerate protobufs
---
 .../org/apache/drill/common/types/DataMode.java    |   51 -
 .../org/apache/drill/common/types/MajorType.java   |  305 -----
 .../org/apache/drill/common/types/MinorType.java   |  123 --
 .../drill/common/types/SchemaTypeProtos.java       |   12 +-
 .../apache/drill/exec/proto/SchemaBitControl.java  |  120 +-
 .../org/apache/drill/exec/proto/SchemaBitData.java |   48 +-
 .../drill/exec/proto/SchemaCoordinationProtos.java |   36 +-
 .../apache/drill/exec/proto/SchemaExecProtos.java  |   24 +-
 .../drill/exec/proto/SchemaGeneralRPCProtos.java   |   36 +-
 .../drill/exec/proto/SchemaUserBitShared.java      |  264 ++--
 .../apache/drill/exec/proto/SchemaUserProtos.java  |  372 +++---
 .../org/apache/drill/exec/proto/beans/Ack.java     |  163 ---
 .../drill/exec/proto/beans/BitClientHandshake.java |  185 ---
 .../exec/proto/beans/BitControlHandshake.java      |  241 ----
 .../drill/exec/proto/beans/BitServerHandshake.java |  195 ---
 .../apache/drill/exec/proto/beans/BitStatus.java   |  175 ---
 .../drill/exec/proto/beans/BitToUserHandshake.java |  359 ------
 .../drill/exec/proto/beans/CatalogMetadata.java    |  207 ---
 .../drill/exec/proto/beans/CollateSupport.java     |   49 -
 .../apache/drill/exec/proto/beans/Collector.java   |  239 ----
 .../drill/exec/proto/beans/ColumnMetadata.java     |  515 --------
 .../exec/proto/beans/ColumnSearchability.java      |   55 -
 .../drill/exec/proto/beans/ColumnUpdatability.java |   51 -
 .../drill/exec/proto/beans/CompleteRpcMessage.java |  210 ---
 .../drill/exec/proto/beans/ConvertSupport.java     |  199 ---
 .../drill/exec/proto/beans/CoreOperatorType.java   |  171 ---
 .../exec/proto/beans/CorrelationNamesSupport.java  |   51 -
 .../proto/beans/CreatePreparedStatementReq.java    |  163 ---
 .../proto/beans/CreatePreparedStatementResp.java   |  211 ---
 .../drill/exec/proto/beans/CustomMessage.java      |  186 ---
 .../exec/proto/beans/DateTimeLiteralsSupport.java  |   79 --
 .../drill/exec/proto/beans/DrillPBError.java       |  341 -----
 .../exec/proto/beans/DrillServiceInstance.java     |  209 ---
 .../drill/exec/proto/beans/DrillbitEndpoint.java   |  351 -----
 .../drill/exec/proto/beans/ExceptionWrapper.java   |  243 ----
 .../drill/exec/proto/beans/FinishedReceiver.java   |  189 ---
 .../drill/exec/proto/beans/FragmentHandle.java     |  233 ----
 .../exec/proto/beans/FragmentRecordBatch.java      |  309 -----
 .../drill/exec/proto/beans/FragmentState.java      |   59 -
 .../drill/exec/proto/beans/FragmentStatus.java     |  189 ---
 .../drill/exec/proto/beans/GetCatalogsReq.java     |  165 ---
 .../drill/exec/proto/beans/GetCatalogsResp.java    |  221 ----
 .../drill/exec/proto/beans/GetColumnsReq.java      |  237 ----
 .../drill/exec/proto/beans/GetColumnsResp.java     |  221 ----
 .../exec/proto/beans/GetQueryPlanFragments.java    |  218 ----
 .../drill/exec/proto/beans/GetSchemasReq.java      |  189 ---
 .../drill/exec/proto/beans/GetSchemasResp.java     |  221 ----
 .../drill/exec/proto/beans/GetServerMetaResp.java  |  211 ---
 .../drill/exec/proto/beans/GetTablesReq.java       |  245 ----
 .../drill/exec/proto/beans/GetTablesResp.java      |  221 ----
 .../drill/exec/proto/beans/GroupBySupport.java     |   53 -
 .../drill/exec/proto/beans/HandshakeStatus.java    |   55 -
 .../drill/exec/proto/beans/IdentifierCasing.java   |   55 -
 .../exec/proto/beans/InitializeFragments.java      |  175 ---
 .../org/apache/drill/exec/proto/beans/Jar.java     |  195 ---
 .../apache/drill/exec/proto/beans/LikeFilter.java  |  185 ---
 .../exec/proto/beans/MajorFragmentProfile.java     |  197 ---
 .../apache/drill/exec/proto/beans/MetricValue.java |  207 ---
 .../exec/proto/beans/MinorFragmentProfile.java     |  399 ------
 .../apache/drill/exec/proto/beans/NamePart.java    |  237 ----
 .../apache/drill/exec/proto/beans/NodeStatus.java  |  185 ---
 .../drill/exec/proto/beans/NullCollation.java      |   55 -
 .../drill/exec/proto/beans/OperatorProfile.java    |  339 -----
 .../drill/exec/proto/beans/OrderBySupport.java     |   51 -
 .../drill/exec/proto/beans/OuterJoinSupport.java   |   61 -
 .../drill/exec/proto/beans/ParsingError.java       |  229 ----
 .../drill/exec/proto/beans/PlanFragment.java       |  495 --------
 .../drill/exec/proto/beans/PreparedStatement.java  |  199 ---
 .../exec/proto/beans/PreparedStatementHandle.java  |  164 ---
 .../apache/drill/exec/proto/beans/Property.java    |  199 ---
 .../exec/proto/beans/QueryContextInformation.java  |  229 ----
 .../apache/drill/exec/proto/beans/QueryData.java   |  233 ----
 .../org/apache/drill/exec/proto/beans/QueryId.java |  185 ---
 .../apache/drill/exec/proto/beans/QueryInfo.java   |  322 -----
 .../drill/exec/proto/beans/QueryPlanFragments.java |  255 ----
 .../drill/exec/proto/beans/QueryProfile.java       |  666 ----------
 .../apache/drill/exec/proto/beans/QueryResult.java |  263 ----
 .../drill/exec/proto/beans/QueryResultsMode.java   |   47 -
 .../apache/drill/exec/proto/beans/QueryType.java   |   55 -
 .../drill/exec/proto/beans/RecordBatchDef.java     |  241 ----
 .../apache/drill/exec/proto/beans/Registry.java    |  175 ---
 .../drill/exec/proto/beans/RequestResults.java     |  187 ---
 .../drill/exec/proto/beans/RequestStatus.java      |   53 -
 .../exec/proto/beans/ResultColumnMetadata.java     |  559 --------
 .../org/apache/drill/exec/proto/beans/Roles.java   |  256 ----
 .../apache/drill/exec/proto/beans/RpcChannel.java  |   51 -
 .../drill/exec/proto/beans/RpcEndpointInfos.java   |  317 -----
 .../apache/drill/exec/proto/beans/RpcHeader.java   |  207 ---
 .../org/apache/drill/exec/proto/beans/RpcMode.java |   55 -
 .../org/apache/drill/exec/proto/beans/RpcType.java |   95 --
 .../apache/drill/exec/proto/beans/RunQuery.java    |  287 -----
 .../drill/exec/proto/beans/RuntimeFilterBDef.java  |  337 -----
 .../apache/drill/exec/proto/beans/SaslMessage.java |  208 ---
 .../apache/drill/exec/proto/beans/SaslStatus.java  |   55 -
 .../apache/drill/exec/proto/beans/SaslSupport.java |   51 -
 .../drill/exec/proto/beans/SchemaMetadata.java     |  251 ----
 .../drill/exec/proto/beans/SerializedField.java    |  289 -----
 .../apache/drill/exec/proto/beans/ServerMeta.java  | 1341 --------------------
 .../proto/beans/ServerPreparedStatementState.java  |  163 ---
 .../exec/proto/beans/StackTraceElementWrapper.java |  251 ----
 .../drill/exec/proto/beans/StreamProfile.java      |  207 ---
 .../drill/exec/proto/beans/SubQuerySupport.java    |   57 -
 .../drill/exec/proto/beans/TableMetadata.java      |  229 ----
 .../drill/exec/proto/beans/UnionSupport.java       |   51 -
 .../drill/exec/proto/beans/UserCredentials.java    |  163 ---
 .../drill/exec/proto/beans/UserProperties.java     |  175 ---
 .../drill/exec/proto/beans/UserToBitHandshake.java |  347 -----
 .../apache/drill/exec/proto/beans/ValueMode.java   |   51 -
 .../drill/exec/proto/beans/WorkQueueStatus.java    |  209 ---
 109 files changed, 456 insertions(+), 21819 deletions(-)

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 final class SchemaTypeProtos
         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 @@ public final class SchemaTypeProtos
                 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 @@ public final class SchemaTypeProtos
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitControl
         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 @@ public final class SchemaBitControl
                 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 @@ public final class SchemaBitControl
                 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 final class SchemaBitData
         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 @@ public final class SchemaBitData
                 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 @@ public final class SchemaBitData
                 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 final class SchemaBitData
         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 @@ public final class SchemaBitData
                 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 @@ public final class SchemaBitData
                 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 final class SchemaBitData
         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 @@ public final class SchemaBitData
                 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 @@ public final class SchemaBitData
                 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 final class SchemaBitData
         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 @@ public final class SchemaBitData
                 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 @@ public final class SchemaBitData
                 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 final class SchemaCoordinationProtos
         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 @@ public final class SchemaCoordinationProtos
                 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 @@ public final class SchemaCoordinationProtos
                 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 final class SchemaCoordinationProtos
         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 @@ public final class SchemaCoordinationProtos
                 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 @@ public final class SchemaCoordinationProtos
                 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 final class SchemaCoordinationProtos
         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 @@ public final class SchemaCoordinationProtos
                 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 @@ public final class SchemaCoordinationProtos
                 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 final class SchemaExecProtos
         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 @@ public final class SchemaExecProtos
                 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 @@ public final class SchemaExecProtos
                 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 final class SchemaExecProtos
         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 @@ public final class SchemaExecProtos
                 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 @@ public final class SchemaExecProtos
                 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 final class SchemaGeneralRPCProtos
         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 @@ public final class SchemaGeneralRPCProtos
                 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 @@ public final class SchemaGeneralRPCProtos
                 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 final class SchemaGeneralRPCProtos
         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 @@ public final class SchemaGeneralRPCProtos
                 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 @@ public final class SchemaGeneralRPCProtos
                 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 final class SchemaGeneralRPCProtos
         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 @@ public final class SchemaGeneralRPCProtos
                 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 @@ public final class SchemaGeneralRPCProtos
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserBitShared
         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 @@ public final class SchemaUserBitShared
                 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 @@ public final class SchemaUserBitShared
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 final class SchemaUserProtos
         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 @@ public final class SchemaUserProtos
                 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 @@ public final class SchemaUserProtos
                 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 6a68b38..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 23981f3..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();
... 14930 lines suppressed ...