http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/af2fded6/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/proto/Common.java 
b/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
index e768457..0ebb683 100644
--- a/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
+++ b/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
@@ -1166,6 +1166,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ConnectionProperties)
       ConnectionPropertiesOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ConnectionProperties.newBuilder() to construct.
     private 
ConnectionProperties(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) 
{
       super(builder);
@@ -1184,14 +1185,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ConnectionProperties(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1200,12 +1206,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
 
               isDirty_ = input.readBool();
@@ -1248,6 +1248,13 @@ public final class Common {
               hasReadOnly_ = input.readBool();
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1256,6 +1263,7 @@ public final class Common {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1264,6 +1272,7 @@ public final class Common {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_fieldAccessorTable
@@ -1402,6 +1411,7 @@ public final class Common {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1411,6 +1421,7 @@ public final class Common {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isDirty_ != false) {
@@ -1437,8 +1448,10 @@ public final class Common {
       if (hasReadOnly_ != false) {
         output.writeBool(8, hasReadOnly_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1474,11 +1487,11 @@ public final class Common {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(8, hasReadOnly_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1506,6 +1519,7 @@ public final class Common {
           .equals(other.getCatalog());
       result = result && getSchema()
           .equals(other.getSchema());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1612,6 +1626,7 @@ public final class Common {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1619,6 +1634,7 @@ public final class Common {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Common.ConnectionProperties 
prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1646,6 +1662,7 @@ public final class Common {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_fieldAccessorTable
@@ -1668,6 +1685,7 @@ public final class Common {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         isDirty_ = false;
@@ -1689,15 +1707,18 @@ public final class Common {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_ConnectionProperties_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.ConnectionProperties 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Common.ConnectionProperties.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.ConnectionProperties 
build() {
         org.apache.calcite.avatica.proto.Common.ConnectionProperties result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -1706,6 +1727,7 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.ConnectionProperties 
buildPartial() {
         org.apache.calcite.avatica.proto.Common.ConnectionProperties result = 
new org.apache.calcite.avatica.proto.Common.ConnectionProperties(this);
         result.isDirty_ = isDirty_;
@@ -1720,32 +1742,39 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       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);
@@ -1783,14 +1812,17 @@ public final class Common {
           schema_ = other.schema_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2126,14 +2158,16 @@ public final class Common {
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -2152,11 +2186,12 @@ public final class Common {
 
     private static final com.google.protobuf.Parser<ConnectionProperties>
         PARSER = new 
com.google.protobuf.AbstractParser<ConnectionProperties>() {
+      @java.lang.Override
       public ConnectionProperties parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ConnectionProperties(input, extensionRegistry);
+        return new ConnectionProperties(input, extensionRegistry);
       }
     };
 
@@ -2169,6 +2204,7 @@ public final class Common {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Common.ConnectionProperties 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2218,6 +2254,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:StatementHandle)
       StatementHandleOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StatementHandle.newBuilder() to construct.
     private StatementHandle(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -2230,14 +2267,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private StatementHandle(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2246,12 +2288,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -2276,6 +2312,13 @@ public final class Common {
 
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2284,6 +2327,7 @@ public final class Common {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -2292,6 +2336,7 @@ public final class Common {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_fieldAccessorTable
@@ -2364,6 +2409,7 @@ public final class Common {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2373,6 +2419,7 @@ public final class Common {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getConnectionIdBytes().isEmpty()) {
@@ -2384,8 +2431,10 @@ public final class Common {
       if (signature_ != null) {
         output.writeMessage(3, getSignature());
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2402,11 +2451,11 @@ public final class Common {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getSignature());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2427,6 +2476,7 @@ public final class Common {
         result = result && getSignature()
             .equals(other.getSignature());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2520,6 +2570,7 @@ public final class Common {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2527,6 +2578,7 @@ public final class Common {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Common.StatementHandle prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2554,6 +2606,7 @@ public final class Common {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_fieldAccessorTable
@@ -2576,6 +2629,7 @@ public final class Common {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         connectionId_ = "";
@@ -2591,15 +2645,18 @@ public final class Common {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_StatementHandle_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.StatementHandle 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Common.StatementHandle.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.StatementHandle build() {
         org.apache.calcite.avatica.proto.Common.StatementHandle result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -2608,6 +2665,7 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.StatementHandle 
buildPartial() {
         org.apache.calcite.avatica.proto.Common.StatementHandle result = new 
org.apache.calcite.avatica.proto.Common.StatementHandle(this);
         result.connectionId_ = connectionId_;
@@ -2621,32 +2679,39 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       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);
@@ -2668,14 +2733,17 @@ public final class Common {
         if (other.hasSignature()) {
           mergeSignature(other.getSignature());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2905,14 +2973,16 @@ public final class Common {
         }
         return signatureBuilder_;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -2931,11 +3001,12 @@ public final class Common {
 
     private static final com.google.protobuf.Parser<StatementHandle>
         PARSER = new com.google.protobuf.AbstractParser<StatementHandle>() {
+      @java.lang.Override
       public StatementHandle parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new StatementHandle(input, extensionRegistry);
+        return new StatementHandle(input, extensionRegistry);
       }
     };
 
@@ -2948,6 +3019,7 @@ public final class Common {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Common.StatementHandle 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3049,6 +3121,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Signature)
       SignatureOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Signature.newBuilder() to construct.
     private Signature(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -3063,14 +3136,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Signature(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3079,12 +3157,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 columns_ = new 
java.util.ArrayList<org.apache.calcite.avatica.proto.Common.ColumnMetaData>();
@@ -3128,6 +3200,13 @@ public final class Common {
               statementType_ = rawValue;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3142,6 +3221,7 @@ public final class Common {
         if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
           parameters_ = java.util.Collections.unmodifiableList(parameters_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -3150,6 +3230,7 @@ public final class Common {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_Signature_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_Signature_fieldAccessorTable
@@ -3295,11 +3376,13 @@ public final class Common {
      * <code>.StatementType statementType = 5;</code>
      */
     public org.apache.calcite.avatica.proto.Common.StatementType 
getStatementType() {
+      @SuppressWarnings("deprecation")
       org.apache.calcite.avatica.proto.Common.StatementType result = 
org.apache.calcite.avatica.proto.Common.StatementType.valueOf(statementType_);
       return result == null ? 
org.apache.calcite.avatica.proto.Common.StatementType.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3309,6 +3392,7 @@ public final class Common {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < columns_.size(); i++) {
@@ -3326,8 +3410,10 @@ public final class Common {
       if (statementType_ != 
org.apache.calcite.avatica.proto.Common.StatementType.SELECT.getNumber()) {
         output.writeEnum(5, statementType_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3352,11 +3438,11 @@ public final class Common {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(5, statementType_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -3380,6 +3466,7 @@ public final class Common {
             .equals(other.getCursorFactory());
       }
       result = result && statementType_ == other.statementType_;
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -3481,6 +3568,7 @@ public final class Common {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3488,6 +3576,7 @@ public final class Common {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Common.Signature prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -3515,6 +3604,7 @@ public final class Common {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_Signature_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_Signature_fieldAccessorTable
@@ -3539,6 +3629,7 @@ public final class Common {
           getParametersFieldBuilder();
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (columnsBuilder_ == null) {
@@ -3566,15 +3657,18 @@ public final class Common {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_Signature_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.Signature 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Common.Signature.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.Signature build() {
         org.apache.calcite.avatica.proto.Common.Signature result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -3583,6 +3677,7 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.Signature buildPartial() {
         org.apache.calcite.avatica.proto.Common.Signature result = new 
org.apache.calcite.avatica.proto.Common.Signature(this);
         int from_bitField0_ = bitField0_;
@@ -3617,32 +3712,39 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       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);
@@ -3716,14 +3818,17 @@ public final class Common {
         if (other.statementType_ != 0) {
           setStatementTypeValue(other.getStatementTypeValue());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4428,6 +4533,7 @@ public final class Common {
        * <code>.StatementType statementType = 5;</code>
        */
       public org.apache.calcite.avatica.proto.Common.StatementType 
getStatementType() {
+        @SuppressWarnings("deprecation")
         org.apache.calcite.avatica.proto.Common.StatementType result = 
org.apache.calcite.avatica.proto.Common.StatementType.valueOf(statementType_);
         return result == null ? 
org.apache.calcite.avatica.proto.Common.StatementType.UNRECOGNIZED : result;
       }
@@ -4452,14 +4558,16 @@ public final class Common {
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -4478,11 +4586,12 @@ public final class Common {
 
     private static final com.google.protobuf.Parser<Signature>
         PARSER = new com.google.protobuf.AbstractParser<Signature>() {
+      @java.lang.Override
       public Signature parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Signature(input, extensionRegistry);
+        return new Signature(input, extensionRegistry);
       }
     };
 
@@ -4495,6 +4604,7 @@ public final class Common {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Common.Signature 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4650,6 +4760,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ColumnMetaData)
       ColumnMetaDataOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ColumnMetaData.newBuilder() to construct.
     private ColumnMetaData(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -4679,14 +4790,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ColumnMetaData(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4695,12 +4811,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
 
               ordinal_ = input.readUInt32();
@@ -4815,6 +4925,13 @@ public final class Common {
 
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4823,6 +4940,7 @@ public final class Common {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -4831,6 +4949,7 @@ public final class Common {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_fieldAccessorTable
@@ -5181,6 +5300,7 @@ public final class Common {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -5190,6 +5310,7 @@ public final class Common {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (ordinal_ != 0) {
@@ -5252,8 +5373,10 @@ public final class Common {
       if (type_ != null) {
         output.writeMessage(20, getType());
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -5333,11 +5456,11 @@ public final class Common {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(20, getType());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -5392,6 +5515,7 @@ public final class Common {
         result = result && getType()
             .equals(other.getType());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -5527,6 +5651,7 @@ public final class Common {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -5534,6 +5659,7 @@ public final class Common {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Common.ColumnMetaData prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -5557,6 +5683,7 @@ public final class Common {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_fieldAccessorTable
@@ -5579,6 +5706,7 @@ public final class Common {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         ordinal_ = 0;
@@ -5628,15 +5756,18 @@ public final class Common {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_ColumnMetaData_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.ColumnMetaData 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Common.ColumnMetaData.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.ColumnMetaData build() {
         org.apache.calcite.avatica.proto.Common.ColumnMetaData result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -5645,6 +5776,7 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.ColumnMetaData 
buildPartial() {
         org.apache.calcite.avatica.proto.Common.ColumnMetaData result = new 
org.apache.calcite.avatica.proto.Common.ColumnMetaData(this);
         result.ordinal_ = ordinal_;
@@ -5675,32 +5807,39 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       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);
@@ -5778,14 +5917,17 @@ public final class Common {
         if (other.hasType()) {
           mergeType(other.getType());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6672,14 +6814,16 @@ public final class Common {
         }
         return typeBuilder_;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -6698,11 +6842,12 @@ public final class Common {
 
     private static final com.google.protobuf.Parser<ColumnMetaData>
         PARSER = new com.google.protobuf.AbstractParser<ColumnMetaData>() {
+      @java.lang.Override
       public ColumnMetaData parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ColumnMetaData(input, extensionRegistry);
+        return new ColumnMetaData(input, extensionRegistry);
       }
     };
 
@@ -6715,6 +6860,7 @@ public final class Common {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Common.ColumnMetaData 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -6829,6 +6975,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AvaticaType)
       AvaticaTypeOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use AvaticaType.newBuilder() to construct.
     private AvaticaType(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -6843,14 +6990,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private AvaticaType(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6859,12 +7011,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
 
               id_ = input.readUInt32();
@@ -6904,6 +7050,13 @@ public final class Common {
 
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -6915,6 +7068,7 @@ public final class Common {
         if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
           columns_ = java.util.Collections.unmodifiableList(columns_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -6923,6 +7077,7 @@ public final class Common {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaType_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaType_fieldAccessorTable
@@ -6986,6 +7141,7 @@ public final class Common {
      * <code>.Rep rep = 3;</code>
      */
     public org.apache.calcite.avatica.proto.Common.Rep getRep() {
+      @SuppressWarnings("deprecation")
       org.apache.calcite.avatica.proto.Common.Rep result = 
org.apache.calcite.avatica.proto.Common.Rep.valueOf(rep_);
       return result == null ? 
org.apache.calcite.avatica.proto.Common.Rep.UNRECOGNIZED : result;
     }
@@ -7079,6 +7235,7 @@ public final class Common {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -7088,6 +7245,7 @@ public final class Common {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (id_ != 0) {
@@ -7105,8 +7263,10 @@ public final class Common {
       if (component_ != null) {
         output.writeMessage(5, getComponent());
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -7131,11 +7291,11 @@ public final class Common {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(5, getComponent());
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -7159,6 +7319,7 @@ public final class Common {
         result = result && getComponent()
             .equals(other.getComponent());
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -7258,6 +7419,7 @@ public final class Common {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -7265,6 +7427,7 @@ public final class Common {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Common.AvaticaType prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -7292,6 +7455,7 @@ public final class Common {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaType_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaType_fieldAccessorTable
@@ -7315,6 +7479,7 @@ public final class Common {
           getColumnsFieldBuilder();
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         id_ = 0;
@@ -7338,15 +7503,18 @@ public final class Common {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaType_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.AvaticaType 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Common.AvaticaType.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.AvaticaType build() {
         org.apache.calcite.avatica.proto.Common.AvaticaType result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -7355,6 +7523,7 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.AvaticaType 
buildPartial() {
         org.apache.calcite.avatica.proto.Common.AvaticaType result = new 
org.apache.calcite.avatica.proto.Common.AvaticaType(this);
         int from_bitField0_ = bitField0_;
@@ -7381,32 +7550,39 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof 
org.apache.calcite.avatica.proto.Common.AvaticaType) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Common.AvaticaType)other);
@@ -7457,14 +7633,17 @@ public final class Common {
         if (other.hasComponent()) {
           mergeComponent(other.getComponent());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7598,6 +7777,7 @@ public final class Common {
        * <code>.Rep rep = 3;</code>
        */
       public org.apache.calcite.avatica.proto.Common.Rep getRep() {
+        @SuppressWarnings("deprecation")
         org.apache.calcite.avatica.proto.Common.Rep result = 
org.apache.calcite.avatica.proto.Common.Rep.valueOf(rep_);
         return result == null ? 
org.apache.calcite.avatica.proto.Common.Rep.UNRECOGNIZED : result;
       }
@@ -8087,14 +8267,16 @@ public final class Common {
         }
         return componentBuilder_;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -8113,11 +8295,12 @@ public final class Common {
 
     private static final com.google.protobuf.Parser<AvaticaType>
         PARSER = new com.google.protobuf.AbstractParser<AvaticaType>() {
+      @java.lang.Override
       public AvaticaType parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new AvaticaType(input, extensionRegistry);
+        return new AvaticaType(input, extensionRegistry);
       }
     };
 
@@ -8130,6 +8313,7 @@ public final class Common {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Common.AvaticaType 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -8201,6 +8385,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AvaticaParameter)
       AvaticaParameterOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use AvaticaParameter.newBuilder() to construct.
     private AvaticaParameter(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -8218,14 +8403,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private AvaticaParameter(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8234,12 +8424,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
 
               signed_ = input.readBool();
@@ -8278,6 +8462,13 @@ public final class Common {
               name_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -8286,6 +8477,7 @@ public final class Common {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -8294,6 +8486,7 @@ public final class Common {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaParameter_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaParameter_fieldAccessorTable
@@ -8440,6 +8633,7 @@ public final class Common {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -8449,6 +8643,7 @@ public final class Common {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (signed_ != false) {
@@ -8472,8 +8667,10 @@ public final class Common {
       if (!getNameBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 7, name_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -8504,11 +8701,11 @@ public final class Common {
       if (!getNameBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, 
name_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -8534,6 +8731,7 @@ public final class Common {
           .equals(other.getClassName());
       result = result && getName()
           .equals(other.getName());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -8634,6 +8832,7 @@ public final class Common {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -8641,6 +8840,7 @@ public final class Common {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Common.AvaticaParameter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -8668,6 +8868,7 @@ public final class Common {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaParameter_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaParameter_fieldAccessorTable
@@ -8690,6 +8891,7 @@ public final class Common {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         signed_ = false;
@@ -8709,15 +8911,18 @@ public final class Common {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_AvaticaParameter_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.AvaticaParameter 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Common.AvaticaParameter.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.AvaticaParameter build() {
         org.apache.calcite.avatica.proto.Common.AvaticaParameter result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -8726,6 +8931,7 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.AvaticaParameter 
buildPartial() {
         org.apache.calcite.avatica.proto.Common.AvaticaParameter result = new 
org.apache.calcite.avatica.proto.Common.AvaticaParameter(this);
         result.signed_ = signed_;
@@ -8739,32 +8945,39 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof 
org.apache.calcite.avatica.proto.Common.AvaticaParameter) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Common.AvaticaParameter)other);
@@ -8800,14 +9013,17 @@ public final class Common {
           name_ = other.name_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -9136,14 +9352,16 @@ public final class Common {
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -9162,11 +9380,12 @@ public final class Common {
 
     private static final com.google.protobuf.Parser<AvaticaParameter>
         PARSER = new com.google.protobuf.AbstractParser<AvaticaParameter>() {
+      @java.lang.Override
       public AvaticaParameter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new AvaticaParameter(input, extensionRegistry);
+        return new AvaticaParameter(input, extensionRegistry);
       }
     };
 
@@ -9179,6 +9398,7 @@ public final class Common {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Common.AvaticaParameter 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -9238,6 +9458,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CursorFactory)
       CursorFactoryOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use CursorFactory.newBuilder() to construct.
     private CursorFactory(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -9251,14 +9472,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private CursorFactory(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9267,12 +9493,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               int rawValue = input.readEnum();
 
@@ -9294,6 +9514,13 @@ public final class Common {
               fieldNames_.add(s);
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -9305,6 +9532,7 @@ public final class Common {
         if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
           fieldNames_ = fieldNames_.getUnmodifiableView();
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -9313,6 +9541,7 @@ public final class Common {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_CursorFactory_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_CursorFactory_fieldAccessorTable
@@ -9467,6 +9696,7 @@ public final class Common {
      * <code>.CursorFactory.Style style = 1;</code>
      */
     public org.apache.calcite.avatica.proto.Common.CursorFactory.Style 
getStyle() {
+      @SuppressWarnings("deprecation")
       org.apache.calcite.avatica.proto.Common.CursorFactory.Style result = 
org.apache.calcite.avatica.proto.Common.CursorFactory.Style.valueOf(style_);
       return result == null ? 
org.apache.calcite.avatica.proto.Common.CursorFactory.Style.UNRECOGNIZED : 
result;
     }
@@ -9535,6 +9765,7 @@ public final class Common {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -9544,6 +9775,7 @@ public final class Common {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (style_ != 
org.apache.calcite.avatica.proto.Common.CursorFactory.Style.OBJECT.getNumber()) 
{
@@ -9555,8 +9787,10 @@ public final class Common {
       for (int i = 0; i < fieldNames_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, 
fieldNames_.getRaw(i));
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -9577,11 +9811,11 @@ public final class Common {
         size += dataSize;
         size += 1 * getFieldNamesList().size();
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -9598,6 +9832,7 @@ public final class Common {
           .equals(other.getClassName());
       result = result && getFieldNamesList()
           .equals(other.getFieldNamesList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -9691,6 +9926,7 @@ public final class Common {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -9698,6 +9934,7 @@ public final class Common {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Common.CursorFactory prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -9725,6 +9962,7 @@ public final class Common {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_CursorFactory_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_CursorFactory_fieldAccessorTable
@@ -9747,6 +9985,7 @@ public final class Common {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         style_ = 0;
@@ -9758,15 +9997,18 @@ public final class Common {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_CursorFactory_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.CursorFactory 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Common.CursorFactory.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.CursorFactory build() {
         org.apache.calcite.avatica.proto.Common.CursorFactory result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -9775,6 +10017,7 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.CursorFactory 
buildPartial() {
         org.apache.calcite.avatica.proto.Common.CursorFactory result = new 
org.apache.calcite.avatica.proto.Common.CursorFactory(this);
         int from_bitField0_ = bitField0_;
@@ -9791,32 +10034,39 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof 
org.apache.calcite.avatica.proto.Common.CursorFactory) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Common.CursorFactory)other);
@@ -9845,14 +10095,17 @@ public final class Common {
           }
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -9891,6 +10144,7 @@ public final class Common {
        * <code>.CursorFactory.Style style = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Common.CursorFactory.Style 
getStyle() {
+        @SuppressWarnings("deprecation")
         org.apache.calcite.avatica.proto.Common.CursorFactory.Style result = 
org.apache.calcite.avatica.proto.Common.CursorFactory.Style.valueOf(style_);
         return result == null ? 
org.apache.calcite.avatica.proto.Common.CursorFactory.Style.UNRECOGNIZED : 
result;
       }
@@ -10078,14 +10332,16 @@ public final class Common {
         onChanged();
         return this;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -10104,11 +10360,12 @@ public final class Common {
 
     private static final com.google.protobuf.Parser<CursorFactory>
         PARSER = new com.google.protobuf.AbstractParser<CursorFactory>() {
+      @java.lang.Override
       public CursorFactory parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CursorFactory(input, extensionRegistry);
+        return new CursorFactory(input, extensionRegistry);
       }
     };
 
@@ -10121,6 +10378,7 @@ public final class Common {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Common.CursorFactory 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -10176,6 +10434,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Frame)
       FrameOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Frame.newBuilder() to construct.
     private Frame(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -10189,14 +10448,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Frame(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -10205,12 +10469,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
 
               offset_ = input.readUInt64();
@@ -10230,6 +10488,13 @@ public final class Common {
                   
input.readMessage(org.apache.calcite.avatica.proto.Common.Row.parser(), 
extensionRegistry));
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -10241,6 +10506,7 @@ public final class Common {
         if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
           rows_ = java.util.Collections.unmodifiableList(rows_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -10249,6 +10515,7 @@ public final class Common {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_Frame_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Common.internal_static_Frame_fieldAccessorTable
@@ -10311,6 +10578,7 @@ public final class Common {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -10320,6 +10588,7 @@ public final class Common {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (offset_ != 0L) {
@@ -10331,8 +10600,10 @@ public final class Common {
       for (int i = 0; i < rows_.size(); i++) {
         output.writeMessage(3, rows_.get(i));
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -10350,11 +10621,11 @@ public final class Common {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, rows_.get(i));
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -10372,6 +10643,7 @@ public final class Common {
           == other.getDone());
       result = result && getRowsList()
           .equals(other.getRowsList());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -10467,6 +10739,7 @@ public final class Common {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -10474,6 +10747,7 @@ public final class Common {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Common.Frame prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -10501,6 +10775,7 @@ public final class Common {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_Frame_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_Frame_fieldAccessorTable
@@ -10524,6 +10799,7 @@ public final class Common {
           getRowsFieldBuilder();
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         offset_ = 0L;
@@ -10539,15 +10815,18 @@ public final class Common {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Common.internal_static_Frame_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.Frame 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Common.Frame.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.Frame build() {
         org.apache.calcite.avatica.proto.Common.Frame result = buildPartial();
         if (!result.isInitialized()) {
@@ -10556,6 +10835,7 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Common.Frame buildPartial() {
         org.apache.calcite.avatica.proto.Common.Frame result = new 
org.apache.calcite.avatica.proto.Common.Frame(this);
         int from_bitField0_ = bitField0_;
@@ -10576,32 +10856,39 @@ public final class Common {
         return result;
       }
 
+      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
+      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
+      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
+      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
+      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
+      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.calcite.avatica.proto.Common.Frame) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Common.Frame)other);
@@ -10645,14 +10932,17 @@ public final class Common {
             }
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -10963,14 +11253,16 @@ public final class Common {
         }
         return rowsBuilder_;
       }
+      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
+      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -10989,11 +11281,12 @@ public final class Common {
 
     private static final com.google.protobuf.Parser<Frame>
         PARSER = new com.google.protobuf.AbstractParser<Frame>() {
+      @java.lang.Override
       public Frame parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Frame(input, extensionRegistry);
+        return new Frame(input, extensionRegistry);
       }
     };
 
@@ -11006,6 +11299,7 @@ public final class Common {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Common.Frame 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -11051,6 +11345,7 @@ public final class Common {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Row)
       RowOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Row.newBuilder() to construct.
     private Row(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -11062,14 +11357,19 @@ public final class Common {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private Row(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -11078,12 +11378,6 @@ public final class Common {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 value_ = new 
java.util.ArrayList<org.apache.calcite.avatica.proto.Common.ColumnValue>();
@@ -11093,6 +11387,13 @@ public final class Common {
                   
input.readMessage(org.apache.calcite.avatica.proto.Common.ColumnValue.parser(), 
extensionRegistry));
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -11104,6 +11405,7 @@ public final class Common {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           value_ = java.util.Collections.unmodifiableList(value_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -11112,6 +11414,7 @@ public f

<TRUNCATED>

Reply via email to