You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/10/23 19:47:39 UTC

[4/6] calcite git commit: [CALCITE-1355] Upgrade to protobuf-java 3.1.0

http://git-wip-us.apache.org/repos/asf/calcite/blob/221d1804/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
index fe1ce16..496553d 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
@@ -22,66 +22,72 @@ package org.apache.calcite.avatica.proto;
 @SuppressWarnings({"unused", "rawtypes"}) public final class Common {
   private Common() {}
   public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * Protobuf enum {@code StatementType}
-   *
    * <pre>
    * Has to be consistent with Meta.StatementType
    * </pre>
+   *
+   * Protobuf enum {@code StatementType}
    */
   public enum StatementType
       implements com.google.protobuf.ProtocolMessageEnum {
     /**
      * <code>SELECT = 0;</code>
      */
-    SELECT(0, 0),
+    SELECT(0),
     /**
      * <code>INSERT = 1;</code>
      */
-    INSERT(1, 1),
+    INSERT(1),
     /**
      * <code>UPDATE = 2;</code>
      */
-    UPDATE(2, 2),
+    UPDATE(2),
     /**
      * <code>DELETE = 3;</code>
      */
-    DELETE(3, 3),
+    DELETE(3),
     /**
      * <code>UPSERT = 4;</code>
      */
-    UPSERT(4, 4),
+    UPSERT(4),
     /**
      * <code>MERGE = 5;</code>
      */
-    MERGE(5, 5),
+    MERGE(5),
     /**
      * <code>OTHER_DML = 6;</code>
      */
-    OTHER_DML(6, 6),
+    OTHER_DML(6),
     /**
      * <code>CREATE = 7;</code>
      */
-    CREATE(7, 7),
+    CREATE(7),
     /**
      * <code>DROP = 8;</code>
      */
-    DROP(8, 8),
+    DROP(8),
     /**
      * <code>ALTER = 9;</code>
      */
-    ALTER(9, 9),
+    ALTER(9),
     /**
      * <code>OTHER_DDL = 10;</code>
      */
-    OTHER_DDL(10, 10),
+    OTHER_DDL(10),
     /**
      * <code>CALL = 11;</code>
      */
-    CALL(11, 11),
-    UNRECOGNIZED(-1, -1),
+    CALL(11),
+    UNRECOGNIZED(-1),
     ;
 
     /**
@@ -135,14 +141,22 @@ package org.apache.calcite.avatica.proto;
 
 
     public final int getNumber() {
-      if (index == -1) {
+      if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
             "Can't get the number of an unknown enum value.");
       }
       return value;
     }
 
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
     public static StatementType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static StatementType forNumber(int value) {
       switch (value) {
         case 0: return SELECT;
         case 1: return INSERT;
@@ -168,13 +182,13 @@ package org.apache.calcite.avatica.proto;
         StatementType> internalValueMap =
           new com.google.protobuf.Internal.EnumLiteMap<StatementType>() {
             public StatementType findValueByNumber(int number) {
-              return StatementType.valueOf(number);
+              return StatementType.forNumber(number);
             }
           };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
-      return getDescriptor().getValues().get(index);
+      return getDescriptor().getValues().get(ordinal());
     }
     public final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptorForType() {
@@ -199,11 +213,9 @@ package org.apache.calcite.avatica.proto;
       return VALUES[desc.getIndex()];
     }
 
-    private final int index;
     private final int value;
 
-    private StatementType(int index, int value) {
-      this.index = index;
+    private StatementType(int value) {
       this.value = value;
     }
 
@@ -218,124 +230,124 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>PRIMITIVE_BOOLEAN = 0;</code>
      */
-    PRIMITIVE_BOOLEAN(0, 0),
+    PRIMITIVE_BOOLEAN(0),
     /**
      * <code>PRIMITIVE_BYTE = 1;</code>
      */
-    PRIMITIVE_BYTE(1, 1),
+    PRIMITIVE_BYTE(1),
     /**
      * <code>PRIMITIVE_CHAR = 2;</code>
      */
-    PRIMITIVE_CHAR(2, 2),
+    PRIMITIVE_CHAR(2),
     /**
      * <code>PRIMITIVE_SHORT = 3;</code>
      */
-    PRIMITIVE_SHORT(3, 3),
+    PRIMITIVE_SHORT(3),
     /**
      * <code>PRIMITIVE_INT = 4;</code>
      */
-    PRIMITIVE_INT(4, 4),
+    PRIMITIVE_INT(4),
     /**
      * <code>PRIMITIVE_LONG = 5;</code>
      */
-    PRIMITIVE_LONG(5, 5),
+    PRIMITIVE_LONG(5),
     /**
      * <code>PRIMITIVE_FLOAT = 6;</code>
      */
-    PRIMITIVE_FLOAT(6, 6),
+    PRIMITIVE_FLOAT(6),
     /**
      * <code>PRIMITIVE_DOUBLE = 7;</code>
      */
-    PRIMITIVE_DOUBLE(7, 7),
+    PRIMITIVE_DOUBLE(7),
     /**
      * <code>BOOLEAN = 8;</code>
      */
-    BOOLEAN(8, 8),
+    BOOLEAN(8),
     /**
      * <code>BYTE = 9;</code>
      */
-    BYTE(9, 9),
+    BYTE(9),
     /**
      * <code>CHARACTER = 10;</code>
      */
-    CHARACTER(10, 10),
+    CHARACTER(10),
     /**
      * <code>SHORT = 11;</code>
      */
-    SHORT(11, 11),
+    SHORT(11),
     /**
      * <code>INTEGER = 12;</code>
      */
-    INTEGER(12, 12),
+    INTEGER(12),
     /**
      * <code>LONG = 13;</code>
      */
-    LONG(13, 13),
+    LONG(13),
     /**
      * <code>FLOAT = 14;</code>
      */
-    FLOAT(14, 14),
+    FLOAT(14),
     /**
      * <code>DOUBLE = 15;</code>
      */
-    DOUBLE(15, 15),
+    DOUBLE(15),
     /**
      * <code>BIG_INTEGER = 25;</code>
      */
-    BIG_INTEGER(16, 25),
+    BIG_INTEGER(25),
     /**
      * <code>BIG_DECIMAL = 26;</code>
      */
-    BIG_DECIMAL(17, 26),
+    BIG_DECIMAL(26),
     /**
      * <code>JAVA_SQL_TIME = 16;</code>
      */
-    JAVA_SQL_TIME(18, 16),
+    JAVA_SQL_TIME(16),
     /**
      * <code>JAVA_SQL_TIMESTAMP = 17;</code>
      */
-    JAVA_SQL_TIMESTAMP(19, 17),
+    JAVA_SQL_TIMESTAMP(17),
     /**
      * <code>JAVA_SQL_DATE = 18;</code>
      */
-    JAVA_SQL_DATE(20, 18),
+    JAVA_SQL_DATE(18),
     /**
      * <code>JAVA_UTIL_DATE = 19;</code>
      */
-    JAVA_UTIL_DATE(21, 19),
+    JAVA_UTIL_DATE(19),
     /**
      * <code>BYTE_STRING = 20;</code>
      */
-    BYTE_STRING(22, 20),
+    BYTE_STRING(20),
     /**
      * <code>STRING = 21;</code>
      */
-    STRING(23, 21),
+    STRING(21),
     /**
      * <code>NUMBER = 22;</code>
      */
-    NUMBER(24, 22),
+    NUMBER(22),
     /**
      * <code>OBJECT = 23;</code>
      */
-    OBJECT(25, 23),
+    OBJECT(23),
     /**
      * <code>NULL = 24;</code>
      */
-    NULL(26, 24),
+    NULL(24),
     /**
      * <code>ARRAY = 27;</code>
      */
-    ARRAY(27, 27),
+    ARRAY(27),
     /**
      * <code>STRUCT = 28;</code>
      */
-    STRUCT(28, 28),
+    STRUCT(28),
     /**
      * <code>MULTISET = 29;</code>
      */
-    MULTISET(29, 29),
-    UNRECOGNIZED(-1, -1),
+    MULTISET(29),
+    UNRECOGNIZED(-1),
     ;
 
     /**
@@ -461,14 +473,22 @@ package org.apache.calcite.avatica.proto;
 
 
     public final int getNumber() {
-      if (index == -1) {
+      if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
             "Can't get the number of an unknown enum value.");
       }
       return value;
     }
 
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
     public static Rep valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static Rep forNumber(int value) {
       switch (value) {
         case 0: return PRIMITIVE_BOOLEAN;
         case 1: return PRIMITIVE_BYTE;
@@ -512,13 +532,13 @@ package org.apache.calcite.avatica.proto;
         Rep> internalValueMap =
           new com.google.protobuf.Internal.EnumLiteMap<Rep>() {
             public Rep findValueByNumber(int number) {
-              return Rep.valueOf(number);
+              return Rep.forNumber(number);
             }
           };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
-      return getDescriptor().getValues().get(index);
+      return getDescriptor().getValues().get(ordinal());
     }
     public final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptorForType() {
@@ -543,11 +563,9 @@ package org.apache.calcite.avatica.proto;
       return VALUES[desc.getIndex()];
     }
 
-    private final int index;
     private final int value;
 
-    private Rep(int index, int value) {
-      this.index = index;
+    private Rep(int value) {
       this.value = value;
     }
 
@@ -555,32 +573,32 @@ package org.apache.calcite.avatica.proto;
   }
 
   /**
-   * Protobuf enum {@code Severity}
-   *
    * <pre>
    * The severity of some unexpected outcome to an operation.
    * Protobuf enum values must be unique across all other enums
    * </pre>
+   *
+   * Protobuf enum {@code Severity}
    */
   public enum Severity
       implements com.google.protobuf.ProtocolMessageEnum {
     /**
      * <code>UNKNOWN_SEVERITY = 0;</code>
      */
-    UNKNOWN_SEVERITY(0, 0),
+    UNKNOWN_SEVERITY(0),
     /**
      * <code>FATAL_SEVERITY = 1;</code>
      */
-    FATAL_SEVERITY(1, 1),
+    FATAL_SEVERITY(1),
     /**
      * <code>ERROR_SEVERITY = 2;</code>
      */
-    ERROR_SEVERITY(2, 2),
+    ERROR_SEVERITY(2),
     /**
      * <code>WARNING_SEVERITY = 3;</code>
      */
-    WARNING_SEVERITY(3, 3),
-    UNRECOGNIZED(-1, -1),
+    WARNING_SEVERITY(3),
+    UNRECOGNIZED(-1),
     ;
 
     /**
@@ -602,14 +620,22 @@ package org.apache.calcite.avatica.proto;
 
 
     public final int getNumber() {
-      if (index == -1) {
+      if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
             "Can't get the number of an unknown enum value.");
       }
       return value;
     }
 
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
     public static Severity valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static Severity forNumber(int value) {
       switch (value) {
         case 0: return UNKNOWN_SEVERITY;
         case 1: return FATAL_SEVERITY;
@@ -627,13 +653,13 @@ package org.apache.calcite.avatica.proto;
         Severity> internalValueMap =
           new com.google.protobuf.Internal.EnumLiteMap<Severity>() {
             public Severity findValueByNumber(int number) {
-              return Severity.valueOf(number);
+              return Severity.forNumber(number);
             }
           };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
-      return getDescriptor().getValues().get(index);
+      return getDescriptor().getValues().get(ordinal());
     }
     public final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptorForType() {
@@ -658,11 +684,9 @@ package org.apache.calcite.avatica.proto;
       return VALUES[desc.getIndex()];
     }
 
-    private final int index;
     private final int value;
 
-    private Severity(int index, int value) {
-      this.index = index;
+    private Severity(int value) {
       this.value = value;
     }
 
@@ -670,119 +694,119 @@ package org.apache.calcite.avatica.proto;
   }
 
   /**
-   * Protobuf enum {@code MetaDataOperation}
-   *
    * <pre>
    * Enumeration corresponding to DatabaseMetaData operations
    * </pre>
+   *
+   * Protobuf enum {@code MetaDataOperation}
    */
   public enum MetaDataOperation
       implements com.google.protobuf.ProtocolMessageEnum {
     /**
      * <code>GET_ATTRIBUTES = 0;</code>
      */
-    GET_ATTRIBUTES(0, 0),
+    GET_ATTRIBUTES(0),
     /**
      * <code>GET_BEST_ROW_IDENTIFIER = 1;</code>
      */
-    GET_BEST_ROW_IDENTIFIER(1, 1),
+    GET_BEST_ROW_IDENTIFIER(1),
     /**
      * <code>GET_CATALOGS = 2;</code>
      */
-    GET_CATALOGS(2, 2),
+    GET_CATALOGS(2),
     /**
      * <code>GET_CLIENT_INFO_PROPERTIES = 3;</code>
      */
-    GET_CLIENT_INFO_PROPERTIES(3, 3),
+    GET_CLIENT_INFO_PROPERTIES(3),
     /**
      * <code>GET_COLUMN_PRIVILEGES = 4;</code>
      */
-    GET_COLUMN_PRIVILEGES(4, 4),
+    GET_COLUMN_PRIVILEGES(4),
     /**
      * <code>GET_COLUMNS = 5;</code>
      */
-    GET_COLUMNS(5, 5),
+    GET_COLUMNS(5),
     /**
      * <code>GET_CROSS_REFERENCE = 6;</code>
      */
-    GET_CROSS_REFERENCE(6, 6),
+    GET_CROSS_REFERENCE(6),
     /**
      * <code>GET_EXPORTED_KEYS = 7;</code>
      */
-    GET_EXPORTED_KEYS(7, 7),
+    GET_EXPORTED_KEYS(7),
     /**
      * <code>GET_FUNCTION_COLUMNS = 8;</code>
      */
-    GET_FUNCTION_COLUMNS(8, 8),
+    GET_FUNCTION_COLUMNS(8),
     /**
      * <code>GET_FUNCTIONS = 9;</code>
      */
-    GET_FUNCTIONS(9, 9),
+    GET_FUNCTIONS(9),
     /**
      * <code>GET_IMPORTED_KEYS = 10;</code>
      */
-    GET_IMPORTED_KEYS(10, 10),
+    GET_IMPORTED_KEYS(10),
     /**
      * <code>GET_INDEX_INFO = 11;</code>
      */
-    GET_INDEX_INFO(11, 11),
+    GET_INDEX_INFO(11),
     /**
      * <code>GET_PRIMARY_KEYS = 12;</code>
      */
-    GET_PRIMARY_KEYS(12, 12),
+    GET_PRIMARY_KEYS(12),
     /**
      * <code>GET_PROCEDURE_COLUMNS = 13;</code>
      */
-    GET_PROCEDURE_COLUMNS(13, 13),
+    GET_PROCEDURE_COLUMNS(13),
     /**
      * <code>GET_PROCEDURES = 14;</code>
      */
-    GET_PROCEDURES(14, 14),
+    GET_PROCEDURES(14),
     /**
      * <code>GET_PSEUDO_COLUMNS = 15;</code>
      */
-    GET_PSEUDO_COLUMNS(15, 15),
+    GET_PSEUDO_COLUMNS(15),
     /**
      * <code>GET_SCHEMAS = 16;</code>
      */
-    GET_SCHEMAS(16, 16),
+    GET_SCHEMAS(16),
     /**
      * <code>GET_SCHEMAS_WITH_ARGS = 17;</code>
      */
-    GET_SCHEMAS_WITH_ARGS(17, 17),
+    GET_SCHEMAS_WITH_ARGS(17),
     /**
      * <code>GET_SUPER_TABLES = 18;</code>
      */
-    GET_SUPER_TABLES(18, 18),
+    GET_SUPER_TABLES(18),
     /**
      * <code>GET_SUPER_TYPES = 19;</code>
      */
-    GET_SUPER_TYPES(19, 19),
+    GET_SUPER_TYPES(19),
     /**
      * <code>GET_TABLE_PRIVILEGES = 20;</code>
      */
-    GET_TABLE_PRIVILEGES(20, 20),
+    GET_TABLE_PRIVILEGES(20),
     /**
      * <code>GET_TABLES = 21;</code>
      */
-    GET_TABLES(21, 21),
+    GET_TABLES(21),
     /**
      * <code>GET_TABLE_TYPES = 22;</code>
      */
-    GET_TABLE_TYPES(22, 22),
+    GET_TABLE_TYPES(22),
     /**
      * <code>GET_TYPE_INFO = 23;</code>
      */
-    GET_TYPE_INFO(23, 23),
+    GET_TYPE_INFO(23),
     /**
      * <code>GET_UDTS = 24;</code>
      */
-    GET_UDTS(24, 24),
+    GET_UDTS(24),
     /**
      * <code>GET_VERSION_COLUMNS = 25;</code>
      */
-    GET_VERSION_COLUMNS(25, 25),
-    UNRECOGNIZED(-1, -1),
+    GET_VERSION_COLUMNS(25),
+    UNRECOGNIZED(-1),
     ;
 
     /**
@@ -892,14 +916,22 @@ package org.apache.calcite.avatica.proto;
 
 
     public final int getNumber() {
-      if (index == -1) {
+      if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
             "Can't get the number of an unknown enum value.");
       }
       return value;
     }
 
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
     public static MetaDataOperation valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static MetaDataOperation forNumber(int value) {
       switch (value) {
         case 0: return GET_ATTRIBUTES;
         case 1: return GET_BEST_ROW_IDENTIFIER;
@@ -939,13 +971,13 @@ package org.apache.calcite.avatica.proto;
         MetaDataOperation> internalValueMap =
           new com.google.protobuf.Internal.EnumLiteMap<MetaDataOperation>() {
             public MetaDataOperation findValueByNumber(int number) {
-              return MetaDataOperation.valueOf(number);
+              return MetaDataOperation.forNumber(number);
             }
           };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
-      return getDescriptor().getValues().get(index);
+      return getDescriptor().getValues().get(ordinal());
     }
     public final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptorForType() {
@@ -970,11 +1002,9 @@ package org.apache.calcite.avatica.proto;
       return VALUES[desc.getIndex()];
     }
 
-    private final int index;
     private final int value;
 
-    private MetaDataOperation(int index, int value) {
-      this.index = index;
+    private MetaDataOperation(int value) {
       this.value = value;
     }
 
@@ -989,12 +1019,12 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>SQL = 0;</code>
      */
-    SQL(0, 0),
+    SQL(0),
     /**
      * <code>METADATA = 1;</code>
      */
-    METADATA(1, 1),
-    UNRECOGNIZED(-1, -1),
+    METADATA(1),
+    UNRECOGNIZED(-1),
     ;
 
     /**
@@ -1008,14 +1038,22 @@ package org.apache.calcite.avatica.proto;
 
 
     public final int getNumber() {
-      if (index == -1) {
+      if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
             "Can't get the number of an unknown enum value.");
       }
       return value;
     }
 
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
     public static StateType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static StateType forNumber(int value) {
       switch (value) {
         case 0: return SQL;
         case 1: return METADATA;
@@ -1031,13 +1069,13 @@ package org.apache.calcite.avatica.proto;
         StateType> internalValueMap =
           new com.google.protobuf.Internal.EnumLiteMap<StateType>() {
             public StateType findValueByNumber(int number) {
-              return StateType.valueOf(number);
+              return StateType.forNumber(number);
             }
           };
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
-      return getDescriptor().getValues().get(index);
+      return getDescriptor().getValues().get(ordinal());
     }
     public final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptorForType() {
@@ -1062,11 +1100,9 @@ package org.apache.calcite.avatica.proto;
       return VALUES[desc.getIndex()];
     }
 
-    private final int index;
     private final int value;
 
-    private StateType(int index, int value) {
-      this.index = index;
+    private StateType(int value) {
       this.value = value;
     }
 
@@ -1088,11 +1124,11 @@ package org.apache.calcite.avatica.proto;
     boolean getAutoCommit();
 
     /**
-     * <code>optional bool has_auto_commit = 7;</code>
-     *
      * <pre>
      * field is a Boolean, need to discern null and default value
      * </pre>
+     *
+     * <code>optional bool has_auto_commit = 7;</code>
      */
     boolean getHasAutoCommit();
 
@@ -1102,11 +1138,11 @@ package org.apache.calcite.avatica.proto;
     boolean getReadOnly();
 
     /**
-     * <code>optional bool has_read_only = 8;</code>
-     *
      * <pre>
      * field is a Boolean, need to discern null and default value
      * </pre>
+     *
+     * <code>optional bool has_read_only = 8;</code>
      */
     boolean getHasReadOnly();
 
@@ -1136,18 +1172,18 @@ package org.apache.calcite.avatica.proto;
         getSchemaBytes();
   }
   /**
-   * Protobuf type {@code ConnectionProperties}
-   *
    * <pre>
    * Details about a connection
    * </pre>
+   *
+   * Protobuf type {@code ConnectionProperties}
    */
   public  static final class ConnectionProperties extends
-      com.google.protobuf.GeneratedMessage implements
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ConnectionProperties)
       ConnectionPropertiesOrBuilder {
     // Use ConnectionProperties.newBuilder() to construct.
-    private ConnectionProperties(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ConnectionProperties(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
     private ConnectionProperties() {
@@ -1168,7 +1204,8 @@ package org.apache.calcite.avatica.proto;
     }
     private ConnectionProperties(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
       try {
@@ -1206,13 +1243,13 @@ package org.apache.calcite.avatica.proto;
               break;
             }
             case 42: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               catalog_ = s;
               break;
             }
             case 50: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               schema_ = s;
               break;
@@ -1230,11 +1267,10 @@ package org.apache.calcite.avatica.proto;
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw new RuntimeException(e.setUnfinishedMessage(this));
+        throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new RuntimeException(
-            new com.google.protobuf.InvalidProtocolBufferException(
-                e.getMessage()).setUnfinishedMessage(this));
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
       } finally {
         makeExtensionsImmutable();
       }
@@ -1244,7 +1280,7 @@ package org.apache.calcite.avatica.proto;
       return org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -1272,11 +1308,11 @@ package org.apache.calcite.avatica.proto;
     public static final int HAS_AUTO_COMMIT_FIELD_NUMBER = 7;
     private boolean hasAutoCommit_;
     /**
-     * <code>optional bool has_auto_commit = 7;</code>
-     *
      * <pre>
      * field is a Boolean, need to discern null and default value
      * </pre>
+     *
+     * <code>optional bool has_auto_commit = 7;</code>
      */
     public boolean getHasAutoCommit() {
       return hasAutoCommit_;
@@ -1294,11 +1330,11 @@ package org.apache.calcite.avatica.proto;
     public static final int HAS_READ_ONLY_FIELD_NUMBER = 8;
     private boolean hasReadOnly_;
     /**
-     * <code>optional bool has_read_only = 8;</code>
-     *
      * <pre>
      * field is a Boolean, need to discern null and default value
      * </pre>
+     *
+     * <code>optional bool has_read_only = 8;</code>
      */
     public boolean getHasReadOnly() {
       return hasReadOnly_;
@@ -1406,10 +1442,10 @@ package org.apache.calcite.avatica.proto;
         output.writeUInt32(4, transactionIsolation_);
       }
       if (!getCatalogBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 5, catalog_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, catalog_);
       }
       if (!getSchemaBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 6, schema_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, schema_);
       }
       if (hasAutoCommit_ != false) {
         output.writeBool(7, hasAutoCommit_);
@@ -1441,10 +1477,10 @@ package org.apache.calcite.avatica.proto;
           .computeUInt32Size(4, transactionIsolation_);
       }
       if (!getCatalogBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(5, catalog_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, catalog_);
       }
       if (!getSchemaBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(6, schema_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, schema_);
       }
       if (hasAutoCommit_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -1459,6 +1495,69 @@ package org.apache.calcite.avatica.proto;
     }
 
     private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.apache.calcite.avatica.proto.Common.ConnectionProperties)) {
+        return super.equals(obj);
+      }
+      org.apache.calcite.avatica.proto.Common.ConnectionProperties other = (org.apache.calcite.avatica.proto.Common.ConnectionProperties) obj;
+
+      boolean result = true;
+      result = result && (getIsDirty()
+          == other.getIsDirty());
+      result = result && (getAutoCommit()
+          == other.getAutoCommit());
+      result = result && (getHasAutoCommit()
+          == other.getHasAutoCommit());
+      result = result && (getReadOnly()
+          == other.getReadOnly());
+      result = result && (getHasReadOnly()
+          == other.getHasReadOnly());
+      result = result && (getTransactionIsolation()
+          == other.getTransactionIsolation());
+      result = result && getCatalog()
+          .equals(other.getCatalog());
+      result = result && getSchema()
+          .equals(other.getSchema());
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (37 * hash) + IS_DIRTY_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsDirty());
+      hash = (37 * hash) + AUTO_COMMIT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getAutoCommit());
+      hash = (37 * hash) + HAS_AUTO_COMMIT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHasAutoCommit());
+      hash = (37 * hash) + READ_ONLY_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getReadOnly());
+      hash = (37 * hash) + HAS_READ_ONLY_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHasReadOnly());
+      hash = (37 * hash) + TRANSACTION_ISOLATION_FIELD_NUMBER;
+      hash = (53 * hash) + getTransactionIsolation();
+      hash = (37 * hash) + CATALOG_FIELD_NUMBER;
+      hash = (53 * hash) + getCatalog().hashCode();
+      hash = (37 * hash) + SCHEMA_FIELD_NUMBER;
+      hash = (53 * hash) + getSchema().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
     public static org.apache.calcite.avatica.proto.Common.ConnectionProperties parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1482,34 +1581,40 @@ package org.apache.calcite.avatica.proto;
     }
     public static org.apache.calcite.avatica.proto.Common.ConnectionProperties parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.ConnectionProperties parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.apache.calcite.avatica.proto.Common.ConnectionProperties parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.ConnectionProperties parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.apache.calcite.avatica.proto.Common.ConnectionProperties parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.ConnectionProperties parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     public Builder newBuilderForType() { return newBuilder(); }
@@ -1526,19 +1631,19 @@ package org.apache.calcite.avatica.proto;
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code ConnectionProperties}
-     *
      * <pre>
      * Details about a connection
      * </pre>
+     *
+     * Protobuf type {@code ConnectionProperties}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:ConnectionProperties)
         org.apache.calcite.avatica.proto.Common.ConnectionPropertiesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -1546,7 +1651,7 @@ package org.apache.calcite.avatica.proto;
         return org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1559,12 +1664,13 @@ package org.apache.calcite.avatica.proto;
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
       public Builder clear() {
@@ -1619,6 +1725,32 @@ package org.apache.calcite.avatica.proto;
         return result;
       }
 
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.calcite.avatica.proto.Common.ConnectionProperties) {
           return mergeFrom((org.apache.calcite.avatica.proto.Common.ConnectionProperties)other);
@@ -1673,7 +1805,7 @@ package org.apache.calcite.avatica.proto;
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.apache.calcite.avatica.proto.Common.ConnectionProperties) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -1736,21 +1868,21 @@ package org.apache.calcite.avatica.proto;
 
       private boolean hasAutoCommit_ ;
       /**
-       * <code>optional bool has_auto_commit = 7;</code>
-       *
        * <pre>
        * field is a Boolean, need to discern null and default value
        * </pre>
+       *
+       * <code>optional bool has_auto_commit = 7;</code>
        */
       public boolean getHasAutoCommit() {
         return hasAutoCommit_;
       }
       /**
-       * <code>optional bool has_auto_commit = 7;</code>
-       *
        * <pre>
        * field is a Boolean, need to discern null and default value
        * </pre>
+       *
+       * <code>optional bool has_auto_commit = 7;</code>
        */
       public Builder setHasAutoCommit(boolean value) {
 
@@ -1759,11 +1891,11 @@ package org.apache.calcite.avatica.proto;
         return this;
       }
       /**
-       * <code>optional bool has_auto_commit = 7;</code>
-       *
        * <pre>
        * field is a Boolean, need to discern null and default value
        * </pre>
+       *
+       * <code>optional bool has_auto_commit = 7;</code>
        */
       public Builder clearHasAutoCommit() {
 
@@ -1800,21 +1932,21 @@ package org.apache.calcite.avatica.proto;
 
       private boolean hasReadOnly_ ;
       /**
-       * <code>optional bool has_read_only = 8;</code>
-       *
        * <pre>
        * field is a Boolean, need to discern null and default value
        * </pre>
+       *
+       * <code>optional bool has_read_only = 8;</code>
        */
       public boolean getHasReadOnly() {
         return hasReadOnly_;
       }
       /**
-       * <code>optional bool has_read_only = 8;</code>
-       *
        * <pre>
        * field is a Boolean, need to discern null and default value
        * </pre>
+       *
+       * <code>optional bool has_read_only = 8;</code>
        */
       public Builder setHasReadOnly(boolean value) {
 
@@ -1823,11 +1955,11 @@ package org.apache.calcite.avatica.proto;
         return this;
       }
       /**
-       * <code>optional bool has_read_only = 8;</code>
-       *
        * <pre>
        * field is a Boolean, need to discern null and default value
        * </pre>
+       *
+       * <code>optional bool has_read_only = 8;</code>
        */
       public Builder clearHasReadOnly() {
 
@@ -2029,16 +2161,7 @@ package org.apache.calcite.avatica.proto;
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        try {
           return new ConnectionProperties(input, extensionRegistry);
-        } catch (RuntimeException e) {
-          if (e.getCause() instanceof
-              com.google.protobuf.InvalidProtocolBufferException) {
-            throw (com.google.protobuf.InvalidProtocolBufferException)
-                e.getCause();
-          }
-          throw e;
-        }
       }
     };
 
@@ -2090,18 +2213,18 @@ package org.apache.calcite.avatica.proto;
     org.apache.calcite.avatica.proto.Common.SignatureOrBuilder getSignatureOrBuilder();
   }
   /**
-   * Protobuf type {@code StatementHandle}
-   *
    * <pre>
    * Statement handle
    * </pre>
+   *
+   * Protobuf type {@code StatementHandle}
    */
   public  static final class StatementHandle extends
-      com.google.protobuf.GeneratedMessage implements
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:StatementHandle)
       StatementHandleOrBuilder {
     // Use StatementHandle.newBuilder() to construct.
-    private StatementHandle(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private StatementHandle(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
     private StatementHandle() {
@@ -2116,7 +2239,8 @@ package org.apache.calcite.avatica.proto;
     }
     private StatementHandle(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
       try {
@@ -2134,7 +2258,7 @@ package org.apache.calcite.avatica.proto;
               break;
             }
             case 10: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               connectionId_ = s;
               break;
@@ -2160,11 +2284,10 @@ package org.apache.calcite.avatica.proto;
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw new RuntimeException(e.setUnfinishedMessage(this));
+        throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new RuntimeException(
-            new com.google.protobuf.InvalidProtocolBufferException(
-                e.getMessage()).setUnfinishedMessage(this));
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
       } finally {
         makeExtensionsImmutable();
       }
@@ -2174,7 +2297,7 @@ package org.apache.calcite.avatica.proto;
       return org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -2258,7 +2381,7 @@ package org.apache.calcite.avatica.proto;
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getConnectionIdBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 1, connectionId_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, connectionId_);
       }
       if (id_ != 0) {
         output.writeUInt32(2, id_);
@@ -2274,7 +2397,7 @@ package org.apache.calcite.avatica.proto;
 
       size = 0;
       if (!getConnectionIdBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(1, connectionId_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, connectionId_);
       }
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -2289,6 +2412,49 @@ package org.apache.calcite.avatica.proto;
     }
 
     private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.apache.calcite.avatica.proto.Common.StatementHandle)) {
+        return super.equals(obj);
+      }
+      org.apache.calcite.avatica.proto.Common.StatementHandle other = (org.apache.calcite.avatica.proto.Common.StatementHandle) obj;
+
+      boolean result = true;
+      result = result && getConnectionId()
+          .equals(other.getConnectionId());
+      result = result && (getId()
+          == other.getId());
+      result = result && (hasSignature() == other.hasSignature());
+      if (hasSignature()) {
+        result = result && getSignature()
+            .equals(other.getSignature());
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (37 * hash) + CONNECTION_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getConnectionId().hashCode();
+      hash = (37 * hash) + ID_FIELD_NUMBER;
+      hash = (53 * hash) + getId();
+      if (hasSignature()) {
+        hash = (37 * hash) + SIGNATURE_FIELD_NUMBER;
+        hash = (53 * hash) + getSignature().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
     public static org.apache.calcite.avatica.proto.Common.StatementHandle parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2312,34 +2478,40 @@ package org.apache.calcite.avatica.proto;
     }
     public static org.apache.calcite.avatica.proto.Common.StatementHandle parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.StatementHandle parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.apache.calcite.avatica.proto.Common.StatementHandle parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.StatementHandle parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.apache.calcite.avatica.proto.Common.StatementHandle parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.StatementHandle parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     public Builder newBuilderForType() { return newBuilder(); }
@@ -2356,19 +2528,19 @@ package org.apache.calcite.avatica.proto;
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code StatementHandle}
-     *
      * <pre>
      * Statement handle
      * </pre>
+     *
+     * Protobuf type {@code StatementHandle}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:StatementHandle)
         org.apache.calcite.avatica.proto.Common.StatementHandleOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -2376,7 +2548,7 @@ package org.apache.calcite.avatica.proto;
         return org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -2389,12 +2561,13 @@ package org.apache.calcite.avatica.proto;
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
       public Builder clear() {
@@ -2442,6 +2615,32 @@ package org.apache.calcite.avatica.proto;
         return result;
       }
 
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.calcite.avatica.proto.Common.StatementHandle) {
           return mergeFrom((org.apache.calcite.avatica.proto.Common.StatementHandle)other);
@@ -2480,7 +2679,7 @@ package org.apache.calcite.avatica.proto;
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.apache.calcite.avatica.proto.Common.StatementHandle) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -2585,7 +2784,7 @@ package org.apache.calcite.avatica.proto;
       }
 
       private org.apache.calcite.avatica.proto.Common.Signature signature_ = null;
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder> signatureBuilder_;
       /**
        * <code>optional .Signature signature = 3;</code>
@@ -2687,11 +2886,11 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>optional .Signature signature = 3;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder>
           getSignatureFieldBuilder() {
         if (signatureBuilder_ == null) {
-          signatureBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          signatureBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder>(
                   getSignature(),
                   getParentForChildren(),
@@ -2730,16 +2929,7 @@ package org.apache.calcite.avatica.proto;
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        try {
           return new StatementHandle(input, extensionRegistry);
-        } catch (RuntimeException e) {
-          if (e.getCause() instanceof
-              com.google.protobuf.InvalidProtocolBufferException) {
-            throw (com.google.protobuf.InvalidProtocolBufferException)
-                e.getCause();
-          }
-          throw e;
-        }
       }
     };
 
@@ -2843,18 +3033,18 @@ package org.apache.calcite.avatica.proto;
     org.apache.calcite.avatica.proto.Common.StatementType getStatementType();
   }
   /**
-   * Protobuf type {@code Signature}
-   *
    * <pre>
    * Results of preparing a statement
    * </pre>
+   *
+   * Protobuf type {@code Signature}
    */
   public  static final class Signature extends
-      com.google.protobuf.GeneratedMessage implements
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Signature)
       SignatureOrBuilder {
     // Use Signature.newBuilder() to construct.
-    private Signature(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Signature(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
     private Signature() {
@@ -2871,7 +3061,8 @@ package org.apache.calcite.avatica.proto;
     }
     private Signature(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
       try {
@@ -2893,11 +3084,12 @@ package org.apache.calcite.avatica.proto;
                 columns_ = new java.util.ArrayList<org.apache.calcite.avatica.proto.Common.ColumnMetaData>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              columns_.add(input.readMessage(org.apache.calcite.avatica.proto.Common.ColumnMetaData.parser(), extensionRegistry));
+              columns_.add(
+                  input.readMessage(org.apache.calcite.avatica.proto.Common.ColumnMetaData.parser(), extensionRegistry));
               break;
             }
             case 18: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               sql_ = s;
               break;
@@ -2907,7 +3099,8 @@ package org.apache.calcite.avatica.proto;
                 parameters_ = new java.util.ArrayList<org.apache.calcite.avatica.proto.Common.AvaticaParameter>();
                 mutable_bitField0_ |= 0x00000004;
               }
-              parameters_.add(input.readMessage(org.apache.calcite.avatica.proto.Common.AvaticaParameter.parser(), extensionRegistry));
+              parameters_.add(
+                  input.readMessage(org.apache.calcite.avatica.proto.Common.AvaticaParameter.parser(), extensionRegistry));
               break;
             }
             case 34: {
@@ -2932,11 +3125,10 @@ package org.apache.calcite.avatica.proto;
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw new RuntimeException(e.setUnfinishedMessage(this));
+        throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new RuntimeException(
-            new com.google.protobuf.InvalidProtocolBufferException(
-                e.getMessage()).setUnfinishedMessage(this));
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           columns_ = java.util.Collections.unmodifiableList(columns_);
@@ -2952,7 +3144,7 @@ package org.apache.calcite.avatica.proto;
       return org.apache.calcite.avatica.proto.Common.internal_static_Signature_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.apache.calcite.avatica.proto.Common.internal_static_Signature_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -3117,7 +3309,7 @@ package org.apache.calcite.avatica.proto;
         output.writeMessage(1, columns_.get(i));
       }
       if (!getSqlBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 2, sql_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, sql_);
       }
       for (int i = 0; i < parameters_.size(); i++) {
         output.writeMessage(3, parameters_.get(i));
@@ -3140,7 +3332,7 @@ package org.apache.calcite.avatica.proto;
           .computeMessageSize(1, columns_.get(i));
       }
       if (!getSqlBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(2, sql_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, sql_);
       }
       for (int i = 0; i < parameters_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -3159,6 +3351,60 @@ package org.apache.calcite.avatica.proto;
     }
 
     private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.apache.calcite.avatica.proto.Common.Signature)) {
+        return super.equals(obj);
+      }
+      org.apache.calcite.avatica.proto.Common.Signature other = (org.apache.calcite.avatica.proto.Common.Signature) obj;
+
+      boolean result = true;
+      result = result && getColumnsList()
+          .equals(other.getColumnsList());
+      result = result && getSql()
+          .equals(other.getSql());
+      result = result && getParametersList()
+          .equals(other.getParametersList());
+      result = result && (hasCursorFactory() == other.hasCursorFactory());
+      if (hasCursorFactory()) {
+        result = result && getCursorFactory()
+            .equals(other.getCursorFactory());
+      }
+      result = result && statementType_ == other.statementType_;
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptorForType().hashCode();
+      if (getColumnsCount() > 0) {
+        hash = (37 * hash) + COLUMNS_FIELD_NUMBER;
+        hash = (53 * hash) + getColumnsList().hashCode();
+      }
+      hash = (37 * hash) + SQL_FIELD_NUMBER;
+      hash = (53 * hash) + getSql().hashCode();
+      if (getParametersCount() > 0) {
+        hash = (37 * hash) + PARAMETERS_FIELD_NUMBER;
+        hash = (53 * hash) + getParametersList().hashCode();
+      }
+      if (hasCursorFactory()) {
+        hash = (37 * hash) + CURSOR_FACTORY_FIELD_NUMBER;
+        hash = (53 * hash) + getCursorFactory().hashCode();
+      }
+      hash = (37 * hash) + STATEMENTTYPE_FIELD_NUMBER;
+      hash = (53 * hash) + statementType_;
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
     public static org.apache.calcite.avatica.proto.Common.Signature parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3182,34 +3428,40 @@ package org.apache.calcite.avatica.proto;
     }
     public static org.apache.calcite.avatica.proto.Common.Signature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.Signature parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.apache.calcite.avatica.proto.Common.Signature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.Signature parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.apache.calcite.avatica.proto.Common.Signature parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.Signature parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     public Builder newBuilderForType() { return newBuilder(); }
@@ -3226,19 +3478,19 @@ package org.apache.calcite.avatica.proto;
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code Signature}
-     *
      * <pre>
      * Results of preparing a statement
      * </pre>
+     *
+     * Protobuf type {@code Signature}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:Signature)
         org.apache.calcite.avatica.proto.Common.SignatureOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -3246,7 +3498,7 @@ package org.apache.calcite.avatica.proto;
         return org.apache.calcite.avatica.proto.Common.internal_static_Signature_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.apache.calcite.avatica.proto.Common.internal_static_Signature_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -3259,12 +3511,13 @@ package org.apache.calcite.avatica.proto;
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getColumnsFieldBuilder();
           getParametersFieldBuilder();
         }
@@ -3347,6 +3600,32 @@ package org.apache.calcite.avatica.proto;
         return result;
       }
 
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.calcite.avatica.proto.Common.Signature) {
           return mergeFrom((org.apache.calcite.avatica.proto.Common.Signature)other);
@@ -3377,7 +3656,7 @@ package org.apache.calcite.avatica.proto;
               columns_ = other.columns_;
               bitField0_ = (bitField0_ & ~0x00000001);
               columnsBuilder_ =
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getColumnsFieldBuilder() : null;
             } else {
               columnsBuilder_.addAllMessages(other.columns_);
@@ -3407,7 +3686,7 @@ package org.apache.calcite.avatica.proto;
               parameters_ = other.parameters_;
               bitField0_ = (bitField0_ & ~0x00000004);
               parametersBuilder_ =
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getParametersFieldBuilder() : null;
             } else {
               parametersBuilder_.addAllMessages(other.parameters_);
@@ -3437,7 +3716,7 @@ package org.apache.calcite.avatica.proto;
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.apache.calcite.avatica.proto.Common.Signature) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -3456,7 +3735,7 @@ package org.apache.calcite.avatica.proto;
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.apache.calcite.avatica.proto.Common.ColumnMetaData, org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder, org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> columnsBuilder_;
 
       /**
@@ -3672,11 +3951,11 @@ package org.apache.calcite.avatica.proto;
            getColumnsBuilderList() {
         return getColumnsFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.apache.calcite.avatica.proto.Common.ColumnMetaData, org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder, org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
           getColumnsFieldBuilder() {
         if (columnsBuilder_ == null) {
-          columnsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          columnsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.apache.calcite.avatica.proto.Common.ColumnMetaData, org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder, org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>(
                   columns_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
@@ -3765,7 +4044,7 @@ package org.apache.calcite.avatica.proto;
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.apache.calcite.avatica.proto.Common.AvaticaParameter, org.apache.calcite.avatica.proto.Common.AvaticaParameter.Builder, org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder> parametersBuilder_;
 
       /**
@@ -3981,11 +4260,11 @@ package org.apache.calcite.avatica.proto;
            getParametersBuilderList() {
         return getParametersFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.apache.calcite.avatica.proto.Common.AvaticaParameter, org.apache.calcite.avatica.proto.Common.AvaticaParameter.Builder, org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder>
           getParametersFieldBuilder() {
         if (parametersBuilder_ == null) {
-          parametersBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          parametersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.apache.calcite.avatica.proto.Common.AvaticaParameter, org.apache.calcite.avatica.proto.Common.AvaticaParameter.Builder, org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder>(
                   parameters_,
                   ((bitField0_ & 0x00000004) == 0x00000004),
@@ -3997,7 +4276,7 @@ package org.apache.calcite.avatica.proto;
       }
 
       private org.apache.calcite.avatica.proto.Common.CursorFactory cursorFactory_ = null;
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.apache.calcite.avatica.proto.Common.CursorFactory, org.apache.calcite.avatica.proto.Common.CursorFactory.Builder, org.apache.calcite.avatica.proto.Common.CursorFactoryOrBuilder> cursorFactoryBuilder_;
       /**
        * <code>optional .CursorFactory cursor_factory = 4;</code>
@@ -4099,11 +4378,11 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>optional .CursorFactory cursor_factory = 4;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.apache.calcite.avatica.proto.Common.CursorFactory, org.apache.calcite.avatica.proto.Common.CursorFactory.Builder, org.apache.calcite.avatica.proto.Common.CursorFactoryOrBuilder>
           getCursorFactoryFieldBuilder() {
         if (cursorFactoryBuilder_ == null) {
-          cursorFactoryBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          cursorFactoryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.apache.calcite.avatica.proto.Common.CursorFactory, org.apache.calcite.avatica.proto.Common.CursorFactory.Builder, org.apache.calcite.avatica.proto.Common.CursorFactoryOrBuilder>(
                   getCursorFactory(),
                   getParentForChildren(),
@@ -4186,16 +4465,7 @@ package org.apache.calcite.avatica.proto;
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        try {
           return new Signature(input, extensionRegistry);
-        } catch (RuntimeException e) {
-          if (e.getCause() instanceof
-              com.google.protobuf.InvalidProtocolBufferException) {
-            throw (com.google.protobuf.InvalidProtocolBufferException)
-                e.getCause();
-          }
-          throw e;
-        }
       }
     };
 
@@ -4360,11 +4630,11 @@ package org.apache.calcite.avatica.proto;
    * Protobuf type {@code ColumnMetaData}
    */
   public  static final class ColumnMetaData extends
-      com.google.protobuf.GeneratedMessage implements
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ColumnMetaData)
       ColumnMetaDataOrBuilder {
     // Use ColumnMetaData.newBuilder() to construct.
-    private ColumnMetaData(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ColumnMetaData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
     private ColumnMetaData() {
@@ -4396,7 +4666,8 @@ package org.apache.calcite.avatica.proto;
     }
     private ColumnMetaData(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
       try {
@@ -4454,19 +4725,19 @@ package org.apache.calcite.avatica.proto;
               break;
             }
             case 74: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               label_ = s;
               break;
             }
             case 82: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               columnName_ = s;
               break;
             }
             case 90: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               schemaName_ = s;
               break;
@@ -4482,13 +4753,13 @@ package org.apache.calcite.avatica.proto;
               break;
             }
             case 114: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               tableName_ = s;
               break;
             }
             case 122: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               catalogName_ = s;
               break;
@@ -4509,7 +4780,7 @@ package org.apache.calcite.avatica.proto;
               break;
             }
             case 154: {
-              String s = input.readStringRequireUtf8();
+              java.lang.String s = input.readStringRequireUtf8();
 
               columnClassName_ = s;
               break;
@@ -4530,11 +4801,10 @@ package org.apache.calcite.avatica.proto;
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw new RuntimeException(e.setUnfinishedMessage(this));
+        throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new RuntimeException(
-            new com.google.protobuf.InvalidProtocolBufferException(
-                e.getMessage()).setUnfinishedMessage(this));
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
       } finally {
         makeExtensionsImmutable();
       }
@@ -4544,7 +4814,7 @@ package org.apache.calcite.avatica.proto;
       return org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -4930,13 +5200,13 @@ package org.apache.calcite.avatica.proto;
         output.writeUInt32(8, displaySize_);
       }
       if (!getLabelBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 9, label_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, label_);
       }
       if (!getColumnNameBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 10, columnName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, columnName_);
       }
       if (!getSchemaNameBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 11, schemaName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, schemaName_);
       }
       if (precision_ != 0) {
         output.writeUInt32(12, precision_);
@@ -4945,10 +5215,10 @@ package org.apache.calcite.avatica.proto;
         output.writeUInt32(13, scale_);
       }
       if (!getTableNameBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 14, tableName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, tableName_);
       }
       if (!getCatalogNameBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 15, catalogName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, catalogName_);
       }
       if (readOnly_ != false) {
         output.writeBool(16, readOnly_);
@@ -4960,7 +5230,7 @@ package org.apache.calcite.avatica.proto;
         output.writeBool(18, definitelyWritable_);
       }
       if (!getColumnClassNameBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessage.writeString(output, 19, columnClassName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 19, columnClassName_);
       }
       if (type_ != null) {
         output.writeMessage(20, getType());
@@ -5005,13 +5275,13 @@ package org.apache.calcite.avatica.proto;
           .computeUInt32Size(8, displaySize_);
       }
       if (!getLabelBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(9, label_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, label_);
       }
       if (!getColumnNameBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(10, columnName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, columnName_);
       }
       if (!getSchemaNameBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(11, schemaName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, schemaName_);
       }
       if (precision_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -5022,10 +5292,10 @@ package org.apache.calcite.avatica.proto;
           .computeUInt32Size(13, scale_);
       }
       if (!getTableNameBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(14, tableName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, tableName_);
       }
       if (!getCatalogNameBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(15, catalogName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, catalogName_);
       }
       if (readOnly_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -5040,7 +5310,7 @@ package org.apache.calcite.avatica.proto;
           .computeBoolSize(18, definitelyWritable_);
       }
       if (!getColumnClassNameBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessage.computeStringSize(19, columnClassName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(19, columnClassName_);
       }
       if (type_ != null) {
         size += com.google.protobuf.CodedOutputStream
@@ -5051,6 +5321,125 @@ package org.apache.calcite.avatica.proto;
     }
 
     private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.apache.calcite.avatica.proto.Common.ColumnMetaData)) {
+        return super.equals(obj);
+      }
+      org.apache.calcite.avatica.proto.Common.ColumnMetaData other = (org.apache.calcite.avatica.proto.Common.ColumnMetaData) obj;
+
+      boolean result = true;
+      result = result && (getOrdinal()
+          == other.getOrdinal());
+      result = result && (getAutoIncrement()
+          == other.getAutoIncrement());
+      result = result && (getCaseSensitive()
+          == other.getCaseSensitive());
+      result = result && (getSearchable()
+          == other.getSearchable());
+      result = result && (getCurrency()
+          == other.getCurrency());
+      result = result && (getNullable()
+          == other.getNullable());
+      result = result && (getSigned()
+          == other.getSigned());
+      result = result && (getDisplaySize()
+          == other.getDisplaySize());
+      result = result && getLabel()
+          .equals(other.getLabel());
+      result = result && getColumnName()
+          .equals(other.getColumnName());
+      result = result && getSchemaName()
+          .equals(other.getSchemaName());
+      result = result && (getPrecision()
+          == other.getPrecision());
+      result = result && (getScale()
+          == other.getScale());
+      result = result && getTableName()
+          .equals(other.getTableName());
+      result = result && getCatalogName()
+          .equals(other.getCatalogName());
+      result = result && (getReadOnly()
+          == other.getReadOnly());
+      result = result && (getWritable()
+          == other.getWritable());
+      result = result && (getDefinitelyWritable()
+          == other.getDefinitelyWritable());
+      result = result && getColumnClassName()
+          .equals(other.getColumnClassName());
+      result = result && (hasType() == other.hasType());
+      if (hasType()) {
+        result = result && getType()
+            .equals(other.getType());
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptorForType().hashCode();
+      hash = (37 * hash) + ORDINAL_FIELD_NUMBER;
+      hash = (53 * hash) + getOrdinal();
+      hash = (37 * hash) + AUTO_INCREMENT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getAutoIncrement());
+      hash = (37 * hash) + CASE_SENSITIVE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getCaseSensitive());
+      hash = (37 * hash) + SEARCHABLE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getSearchable());
+      hash = (37 * hash) + CURRENCY_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getCurrency());
+      hash = (37 * hash) + NULLABLE_FIELD_NUMBER;
+      hash = (53 * hash) + getNullable();
+      hash = (37 * hash) + SIGNED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getSigned());
+      hash = (37 * hash) + DISPLAY_SIZE_FIELD_NUMBER;
+      hash = (53 * hash) + getDisplaySize();
+      hash = (37 * hash) + LABEL_FIELD_NUMBER;
+      hash = (53 * hash) + getLabel().hashCode();
+      hash = (37 * hash) + COLUMN_NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getColumnName().hashCode();
+      hash = (37 * hash) + SCHEMA_NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getSchemaName().hashCode();
+      hash = (37 * hash) + PRECISION_FIELD_NUMBER;
+      hash = (53 * hash) + getPrecision();
+      hash = (37 * hash) + SCALE_FIELD_NUMBER;
+      hash = (53 * hash) + getScale();
+      hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getTableName().hashCode();
+      hash = (37 * hash) + CATALOG_NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getCatalogName().hashCode();
+      hash = (37 * hash) + READ_ONLY_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getReadOnly());
+      hash = (37 * hash) + WRITABLE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getWritable());
+      hash = (37 * hash) + DEFINITELY_WRITABLE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getDefinitelyWritable());
+      hash = (37 * hash) + COLUMN_CLASS_NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getColumnClassName().hashCode();
+      if (hasType()) {
+        hash = (37 * hash) + TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + getType().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
     public static org.apache.calcite.avatica.proto.Common.ColumnMetaData parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -5074,34 +5463,40 @@ package org.apache.calcite.avatica.proto;
     }
     public static org.apache.calcite.avatica.proto.Common.ColumnMetaData parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.ColumnMetaData parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.apache.calcite.avatica.proto.Common.ColumnMetaData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.ColumnMetaData parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.apache.calcite.avatica.proto.Common.ColumnMetaData parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.apache.calcite.avatica.proto.Common.ColumnMetaData parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     public Builder newBuilderForType() { return newBuilder(); }
@@ -5118,7 +5513,7 @@ package org.apache.calcite.avatica.proto;
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5126,7 +5521,7 @@ package org.apache.calcite.avatica.proto;
      * Protobuf type {@code ColumnMetaData}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:ColumnMetaData)
         org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -5134,7 +5529,7 @@ package org.apache.calcite.avatica.proto;
         return org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -5147,12 +5542,13 @@ package org.apache.calcite.avatica.proto;
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
       public Builder clear() {
@@ -5251,6 +5647,32 @@ package org.apache.calcite.avatica.proto;
         return result;
       }
 
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.calcite.avatica.proto.Common.ColumnMetaData) {
           return mergeFrom((org.apache.calcite.avatica.proto.Common.ColumnMetaData)other);
@@ -5345,7 +5767,7 @@ package org.apache.calcite.avatica.proto;
           parsedMessage 

<TRUNCATED>