http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/af2fded6/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java 
b/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java
index 87dffcb..5e845e8 100644
--- a/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java
+++ b/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java
@@ -39,6 +39,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CatalogsRequest)
       CatalogsRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use CatalogsRequest.newBuilder() to construct.
     private CatalogsRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -50,14 +51,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private CatalogsRequest(
         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) {
@@ -66,18 +72,19 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
               connectionId_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -86,6 +93,7 @@ public final class Requests {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -94,6 +102,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_CatalogsRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_CatalogsRequest_fieldAccessorTable
@@ -136,6 +145,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -145,13 +155,16 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getConnectionIdBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, 
connectionId_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -160,11 +173,11 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, 
connectionId_);
       }
+      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) {
@@ -178,6 +191,7 @@ public final class Requests {
       boolean result = true;
       result = result && getConnectionId()
           .equals(other.getConnectionId());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -265,6 +279,7 @@ public final class Requests {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -272,6 +287,7 @@ public final class Requests {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Requests.CatalogsRequest prototype) 
{
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -299,6 +315,7 @@ public final class Requests {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_CatalogsRequest_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_CatalogsRequest_fieldAccessorTable
@@ -321,6 +338,7 @@ public final class Requests {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         connectionId_ = "";
@@ -328,15 +346,18 @@ public final class Requests {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_CatalogsRequest_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.CatalogsRequest 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Requests.CatalogsRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.CatalogsRequest build() 
{
         org.apache.calcite.avatica.proto.Requests.CatalogsRequest result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -345,6 +366,7 @@ public final class Requests {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.CatalogsRequest 
buildPartial() {
         org.apache.calcite.avatica.proto.Requests.CatalogsRequest result = new 
org.apache.calcite.avatica.proto.Requests.CatalogsRequest(this);
         result.connectionId_ = connectionId_;
@@ -352,32 +374,39 @@ public final class Requests {
         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.Requests.CatalogsRequest) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Requests.CatalogsRequest)other);
@@ -393,14 +422,17 @@ public final class Requests {
           connectionId_ = other.connectionId_;
           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)
@@ -487,14 +519,16 @@ public final class Requests {
         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);
       }
 
 
@@ -513,11 +547,12 @@ public final class Requests {
 
     private static final com.google.protobuf.Parser<CatalogsRequest>
         PARSER = new com.google.protobuf.AbstractParser<CatalogsRequest>() {
+      @java.lang.Override
       public CatalogsRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CatalogsRequest(input, extensionRegistry);
+        return new CatalogsRequest(input, extensionRegistry);
       }
     };
 
@@ -530,6 +565,7 @@ public final class Requests {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Requests.CatalogsRequest 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -561,6 +597,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:DatabasePropertyRequest)
       DatabasePropertyRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use DatabasePropertyRequest.newBuilder() to construct.
     private 
DatabasePropertyRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -572,14 +609,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private DatabasePropertyRequest(
         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) {
@@ -588,18 +630,19 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
               connectionId_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -608,6 +651,7 @@ public final class Requests {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -616,6 +660,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_DatabasePropertyRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_DatabasePropertyRequest_fieldAccessorTable
@@ -658,6 +703,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -667,13 +713,16 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getConnectionIdBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, 
connectionId_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -682,11 +731,11 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, 
connectionId_);
       }
+      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) {
@@ -700,6 +749,7 @@ public final class Requests {
       boolean result = true;
       result = result && getConnectionId()
           .equals(other.getConnectionId());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -787,6 +837,7 @@ public final class Requests {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -794,6 +845,7 @@ public final class Requests {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest 
prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -821,6 +873,7 @@ public final class Requests {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_DatabasePropertyRequest_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_DatabasePropertyRequest_fieldAccessorTable
@@ -843,6 +896,7 @@ public final class Requests {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         connectionId_ = "";
@@ -850,15 +904,18 @@ public final class Requests {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_DatabasePropertyRequest_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest 
build() {
         org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest 
result = buildPartial();
         if (!result.isInitialized()) {
@@ -867,6 +924,7 @@ public final class Requests {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest 
buildPartial() {
         org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest 
result = new 
org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest(this);
         result.connectionId_ = connectionId_;
@@ -874,32 +932,39 @@ public final class Requests {
         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.Requests.DatabasePropertyRequest) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest)other);
@@ -915,14 +980,17 @@ public final class Requests {
           connectionId_ = other.connectionId_;
           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)
@@ -1009,14 +1077,16 @@ public final class Requests {
         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);
       }
 
 
@@ -1035,11 +1105,12 @@ public final class Requests {
 
     private static final com.google.protobuf.Parser<DatabasePropertyRequest>
         PARSER = new 
com.google.protobuf.AbstractParser<DatabasePropertyRequest>() {
+      @java.lang.Override
       public DatabasePropertyRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new DatabasePropertyRequest(input, extensionRegistry);
+        return new DatabasePropertyRequest(input, extensionRegistry);
       }
     };
 
@@ -1052,6 +1123,7 @@ public final class Requests {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Requests.DatabasePropertyRequest 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1103,6 +1175,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SchemasRequest)
       SchemasRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SchemasRequest.newBuilder() to construct.
     private SchemasRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -1116,14 +1189,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SchemasRequest(
         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) {
@@ -1132,12 +1210,6 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1156,6 +1228,13 @@ public final class Requests {
               connectionId_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1164,6 +1243,7 @@ public final class Requests {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1172,6 +1252,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_SchemasRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_SchemasRequest_fieldAccessorTable
@@ -1282,6 +1363,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1291,6 +1373,7 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getCatalogBytes().isEmpty()) {
@@ -1302,8 +1385,10 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, 
connectionId_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1318,11 +1403,11 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, 
connectionId_);
       }
+      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) {
@@ -1340,6 +1425,7 @@ public final class Requests {
           .equals(other.getSchemaPattern());
       result = result && getConnectionId()
           .equals(other.getConnectionId());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1431,6 +1517,7 @@ public final class Requests {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1438,6 +1525,7 @@ public final class Requests {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Requests.SchemasRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1465,6 +1553,7 @@ public final class Requests {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_SchemasRequest_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_SchemasRequest_fieldAccessorTable
@@ -1487,6 +1576,7 @@ public final class Requests {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         catalog_ = "";
@@ -1498,15 +1588,18 @@ public final class Requests {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_SchemasRequest_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.SchemasRequest 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Requests.SchemasRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.SchemasRequest build() {
         org.apache.calcite.avatica.proto.Requests.SchemasRequest result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -1515,6 +1608,7 @@ public final class Requests {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.SchemasRequest 
buildPartial() {
         org.apache.calcite.avatica.proto.Requests.SchemasRequest result = new 
org.apache.calcite.avatica.proto.Requests.SchemasRequest(this);
         result.catalog_ = catalog_;
@@ -1524,32 +1618,39 @@ public final class Requests {
         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.Requests.SchemasRequest) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Requests.SchemasRequest)other);
@@ -1573,14 +1674,17 @@ public final class Requests {
           connectionId_ = other.connectionId_;
           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)
@@ -1805,14 +1909,16 @@ public final class Requests {
         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);
       }
 
 
@@ -1831,11 +1937,12 @@ public final class Requests {
 
     private static final com.google.protobuf.Parser<SchemasRequest>
         PARSER = new com.google.protobuf.AbstractParser<SchemasRequest>() {
+      @java.lang.Override
       public SchemasRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SchemasRequest(input, extensionRegistry);
+        return new SchemasRequest(input, extensionRegistry);
       }
     };
 
@@ -1848,6 +1955,7 @@ public final class Requests {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Requests.SchemasRequest 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1938,6 +2046,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:TablesRequest)
       TablesRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use TablesRequest.newBuilder() to construct.
     private TablesRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -1954,14 +2063,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private TablesRequest(
         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) {
@@ -1970,12 +2084,6 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -2014,6 +2122,13 @@ public final class Requests {
               connectionId_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2025,6 +2140,7 @@ public final class Requests {
         if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
           typeList_ = typeList_.getUnmodifiableView();
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -2033,6 +2149,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_TablesRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_TablesRequest_fieldAccessorTable
@@ -2220,6 +2337,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2229,6 +2347,7 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getCatalogBytes().isEmpty()) {
@@ -2249,8 +2368,10 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 7, 
connectionId_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2280,11 +2401,11 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, 
connectionId_);
       }
+      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) {
@@ -2308,6 +2429,7 @@ public final class Requests {
           == other.getHasTypeList());
       result = result && getConnectionId()
           .equals(other.getConnectionId());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2408,6 +2530,7 @@ public final class Requests {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2415,6 +2538,7 @@ public final class Requests {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Requests.TablesRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2443,6 +2567,7 @@ public final class Requests {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TablesRequest_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TablesRequest_fieldAccessorTable
@@ -2465,6 +2590,7 @@ public final class Requests {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         catalog_ = "";
@@ -2482,15 +2608,18 @@ public final class Requests {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TablesRequest_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TablesRequest 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Requests.TablesRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TablesRequest build() {
         org.apache.calcite.avatica.proto.Requests.TablesRequest result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -2499,6 +2628,7 @@ public final class Requests {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TablesRequest 
buildPartial() {
         org.apache.calcite.avatica.proto.Requests.TablesRequest result = new 
org.apache.calcite.avatica.proto.Requests.TablesRequest(this);
         int from_bitField0_ = bitField0_;
@@ -2518,32 +2648,39 @@ public final class Requests {
         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.Requests.TablesRequest) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Requests.TablesRequest)other);
@@ -2584,14 +2721,17 @@ public final class Requests {
           connectionId_ = other.connectionId_;
           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)
@@ -3018,14 +3158,16 @@ public final class Requests {
         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);
       }
 
 
@@ -3044,11 +3186,12 @@ public final class Requests {
 
     private static final com.google.protobuf.Parser<TablesRequest>
         PARSER = new com.google.protobuf.AbstractParser<TablesRequest>() {
+      @java.lang.Override
       public TablesRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new TablesRequest(input, extensionRegistry);
+        return new TablesRequest(input, extensionRegistry);
       }
     };
 
@@ -3061,6 +3204,7 @@ public final class Requests {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Requests.TablesRequest 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3092,6 +3236,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:TableTypesRequest)
       TableTypesRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use TableTypesRequest.newBuilder() to construct.
     private 
TableTypesRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -3103,14 +3248,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private TableTypesRequest(
         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) {
@@ -3119,18 +3269,19 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
               connectionId_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3139,6 +3290,7 @@ public final class Requests {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -3147,6 +3299,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_TableTypesRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_TableTypesRequest_fieldAccessorTable
@@ -3189,6 +3342,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3198,13 +3352,16 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getConnectionIdBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, 
connectionId_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3213,11 +3370,11 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, 
connectionId_);
       }
+      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) {
@@ -3231,6 +3388,7 @@ public final class Requests {
       boolean result = true;
       result = result && getConnectionId()
           .equals(other.getConnectionId());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -3318,6 +3476,7 @@ public final class Requests {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3325,6 +3484,7 @@ public final class Requests {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Requests.TableTypesRequest 
prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -3352,6 +3512,7 @@ public final class Requests {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TableTypesRequest_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TableTypesRequest_fieldAccessorTable
@@ -3374,6 +3535,7 @@ public final class Requests {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         connectionId_ = "";
@@ -3381,15 +3543,18 @@ public final class Requests {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TableTypesRequest_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TableTypesRequest 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Requests.TableTypesRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TableTypesRequest 
build() {
         org.apache.calcite.avatica.proto.Requests.TableTypesRequest result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -3398,6 +3563,7 @@ public final class Requests {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TableTypesRequest 
buildPartial() {
         org.apache.calcite.avatica.proto.Requests.TableTypesRequest result = 
new org.apache.calcite.avatica.proto.Requests.TableTypesRequest(this);
         result.connectionId_ = connectionId_;
@@ -3405,32 +3571,39 @@ public final class Requests {
         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.Requests.TableTypesRequest) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Requests.TableTypesRequest)other);
@@ -3446,14 +3619,17 @@ public final class Requests {
           connectionId_ = other.connectionId_;
           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)
@@ -3540,14 +3716,16 @@ public final class Requests {
         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);
       }
 
 
@@ -3566,11 +3744,12 @@ public final class Requests {
 
     private static final com.google.protobuf.Parser<TableTypesRequest>
         PARSER = new com.google.protobuf.AbstractParser<TableTypesRequest>() {
+      @java.lang.Override
       public TableTypesRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new TableTypesRequest(input, extensionRegistry);
+        return new TableTypesRequest(input, extensionRegistry);
       }
     };
 
@@ -3583,6 +3762,7 @@ public final class Requests {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Requests.TableTypesRequest 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3655,6 +3835,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ColumnsRequest)
       ColumnsRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ColumnsRequest.newBuilder() to construct.
     private ColumnsRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -3670,14 +3851,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ColumnsRequest(
         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) {
@@ -3686,12 +3872,6 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -3722,6 +3902,13 @@ public final class Requests {
               connectionId_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3730,6 +3917,7 @@ public final class Requests {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -3738,6 +3926,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_ColumnsRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_ColumnsRequest_fieldAccessorTable
@@ -3916,6 +4105,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3925,6 +4115,7 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getCatalogBytes().isEmpty()) {
@@ -3942,8 +4133,10 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 5, 
connectionId_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3964,11 +4157,11 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, 
connectionId_);
       }
+      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) {
@@ -3990,6 +4183,7 @@ public final class Requests {
           .equals(other.getColumnNamePattern());
       result = result && getConnectionId()
           .equals(other.getConnectionId());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -4085,6 +4279,7 @@ public final class Requests {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -4092,6 +4287,7 @@ public final class Requests {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Requests.ColumnsRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4120,6 +4316,7 @@ public final class Requests {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_ColumnsRequest_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_ColumnsRequest_fieldAccessorTable
@@ -4142,6 +4339,7 @@ public final class Requests {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         catalog_ = "";
@@ -4157,15 +4355,18 @@ public final class Requests {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_ColumnsRequest_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.ColumnsRequest 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Requests.ColumnsRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.ColumnsRequest build() {
         org.apache.calcite.avatica.proto.Requests.ColumnsRequest result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -4174,6 +4375,7 @@ public final class Requests {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.ColumnsRequest 
buildPartial() {
         org.apache.calcite.avatica.proto.Requests.ColumnsRequest result = new 
org.apache.calcite.avatica.proto.Requests.ColumnsRequest(this);
         result.catalog_ = catalog_;
@@ -4185,32 +4387,39 @@ public final class Requests {
         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.Requests.ColumnsRequest) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Requests.ColumnsRequest)other);
@@ -4242,14 +4451,17 @@ public final class Requests {
           connectionId_ = other.connectionId_;
           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)
@@ -4612,14 +4824,16 @@ public final class Requests {
         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);
       }
 
 
@@ -4638,11 +4852,12 @@ public final class Requests {
 
     private static final com.google.protobuf.Parser<ColumnsRequest>
         PARSER = new com.google.protobuf.AbstractParser<ColumnsRequest>() {
+      @java.lang.Override
       public ColumnsRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ColumnsRequest(input, extensionRegistry);
+        return new ColumnsRequest(input, extensionRegistry);
       }
     };
 
@@ -4655,6 +4870,7 @@ public final class Requests {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Requests.ColumnsRequest 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4686,6 +4902,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:TypeInfoRequest)
       TypeInfoRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use TypeInfoRequest.newBuilder() to construct.
     private TypeInfoRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -4697,14 +4914,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private TypeInfoRequest(
         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) {
@@ -4713,18 +4935,19 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
               connectionId_ = s;
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4733,6 +4956,7 @@ public final class Requests {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -4741,6 +4965,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_TypeInfoRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_TypeInfoRequest_fieldAccessorTable
@@ -4783,6 +5008,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -4792,13 +5018,16 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getConnectionIdBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, 
connectionId_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -4807,11 +5036,11 @@ public final class Requests {
       if (!getConnectionIdBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, 
connectionId_);
       }
+      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) {
@@ -4825,6 +5054,7 @@ public final class Requests {
       boolean result = true;
       result = result && getConnectionId()
           .equals(other.getConnectionId());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -4912,6 +5142,7 @@ public final class Requests {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -4919,6 +5150,7 @@ public final class Requests {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Requests.TypeInfoRequest prototype) 
{
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4946,6 +5178,7 @@ public final class Requests {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TypeInfoRequest_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TypeInfoRequest_fieldAccessorTable
@@ -4968,6 +5201,7 @@ public final class Requests {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         connectionId_ = "";
@@ -4975,15 +5209,18 @@ public final class Requests {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_TypeInfoRequest_descriptor;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TypeInfoRequest 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Requests.TypeInfoRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TypeInfoRequest build() 
{
         org.apache.calcite.avatica.proto.Requests.TypeInfoRequest result = 
buildPartial();
         if (!result.isInitialized()) {
@@ -4992,6 +5229,7 @@ public final class Requests {
         return result;
       }
 
+      @java.lang.Override
       public org.apache.calcite.avatica.proto.Requests.TypeInfoRequest 
buildPartial() {
         org.apache.calcite.avatica.proto.Requests.TypeInfoRequest result = new 
org.apache.calcite.avatica.proto.Requests.TypeInfoRequest(this);
         result.connectionId_ = connectionId_;
@@ -4999,32 +5237,39 @@ public final class Requests {
         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.Requests.TypeInfoRequest) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Requests.TypeInfoRequest)other);
@@ -5040,14 +5285,17 @@ public final class Requests {
           connectionId_ = other.connectionId_;
           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)
@@ -5134,14 +5382,16 @@ public final class Requests {
         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);
       }
 
 
@@ -5160,11 +5410,12 @@ public final class Requests {
 
     private static final com.google.protobuf.Parser<TypeInfoRequest>
         PARSER = new com.google.protobuf.AbstractParser<TypeInfoRequest>() {
+      @java.lang.Override
       public TypeInfoRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new TypeInfoRequest(input, extensionRegistry);
+        return new TypeInfoRequest(input, extensionRegistry);
       }
     };
 
@@ -5177,6 +5428,7 @@ public final class Requests {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Requests.TypeInfoRequest 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -5250,6 +5502,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PrepareAndExecuteRequest)
       PrepareAndExecuteRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PrepareAndExecuteRequest.newBuilder() to construct.
     private 
PrepareAndExecuteRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -5266,14 +5519,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private PrepareAndExecuteRequest(
         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) {
@@ -5282,12 +5540,6 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -5320,6 +5572,13 @@ public final class Requests {
               firstFrameMaxSize_ = input.readInt32();
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5328,6 +5587,7 @@ public final class Requests {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -5336,6 +5596,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_PrepareAndExecuteRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_PrepareAndExecuteRequest_fieldAccessorTable
@@ -5460,6 +5721,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -5469,6 +5731,7 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getConnectionIdBytes().isEmpty()) {
@@ -5489,8 +5752,10 @@ public final class Requests {
       if (firstFrameMaxSize_ != 0) {
         output.writeInt32(6, firstFrameMaxSize_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -5518,11 +5783,11 @@ public final class Requests {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(6, firstFrameMaxSize_);
       }
+      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) {
@@ -5546,6 +5811,7 @@ public final class Requests {
           == other.getMaxRowsTotal());
       result = result && (getFirstFrameMaxSize()
           == other.getFirstFrameMaxSize());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -5645,6 +5911,7 @@ public final class Requests {
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -5652,6 +5919,7 @@ public final class Requests {
     public static Builder 
newBuilder(org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest 
prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
+    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -5679,6 +5947,7 @@ public final class Requests {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_PrepareAndExecuteRequest_descriptor;
       }
 
+      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_PrepareAndExecuteRequest_fieldAccessorTable
@@ -5701,6 +5970,7 @@ public final class Requests {
                 .alwaysUseFieldBuilders) {
         }
       }
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         connectionId_ = "";
@@ -5718,15 +5988,18 @@ public final class Requests {
         return this;
       }
 
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return 
org.apache.calcite.avatica.proto.Requests.internal_static_PrepareAndExecuteRequest_descriptor;
       }
 
+      @java.lang.Override
       public 
org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest 
getDefaultInstanceForType() {
         return 
org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public 
org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest build() {
         org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest 
result = buildPartial();
         if (!result.isInitialized()) {
@@ -5735,6 +6008,7 @@ public final class Requests {
         return result;
       }
 
+      @java.lang.Override
       public 
org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest 
buildPartial() {
         org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest 
result = new 
org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest(this);
         result.connectionId_ = connectionId_;
@@ -5747,32 +6021,39 @@ public final class Requests {
         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.Requests.PrepareAndExecuteRequest) {
           return 
mergeFrom((org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest)other);
@@ -5804,14 +6085,17 @@ public final class Requests {
         if (other.getFirstFrameMaxSize() != 0) {
           setFirstFrameMaxSize(other.getFirstFrameMaxSize());
         }
+        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)
@@ -6107,14 +6391,16 @@ public final class Requests {
         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);
       }
 
 
@@ -6133,11 +6419,12 @@ public final class Requests {
 
     private static final com.google.protobuf.Parser<PrepareAndExecuteRequest>
         PARSER = new 
com.google.protobuf.AbstractParser<PrepareAndExecuteRequest>() {
+      @java.lang.Override
       public PrepareAndExecuteRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PrepareAndExecuteRequest(input, extensionRegistry);
+        return new PrepareAndExecuteRequest(input, extensionRegistry);
       }
     };
 
@@ -6150,6 +6437,7 @@ public final class Requests {
       return PARSER;
     }
 
+    @java.lang.Override
     public org.apache.calcite.avatica.proto.Requests.PrepareAndExecuteRequest 
getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -6209,6 +6497,7 @@ public final class Requests {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PrepareRequest)
       PrepareRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PrepareRequest.newBuilder() to construct.
     private PrepareRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> 
builder) {
       super(builder);
@@ -6223,14 +6512,19 @@ public final class Requests {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private PrepareRequest(
         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) {
@@ -6239,12 +6533,6 @@ public final class Requests {
             case 0:
               done = true;
               break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -6267,6 +6555,13 @@ public final class Requests {
               maxRowsTotal_ = input.readInt64();
               break;
             }
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -6275,6 +6570,7 @@ public final class Requests {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -6283,6 +6579,7 @@ public final class Requests {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_PrepareRequest_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return 
org.apache.calcite.avatica.proto.Requests.internal_static_PrepareRequest_fieldAccessorTable
@@ -6385,6 +6682,7 @@ public final class Requests {
     }
 
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -6394,6 +6692,7 @@ public final class Requests {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getConnectionIdBytes().isEmpty()) {
@@ -6408,8 +6707,10 @@ public final class Requests {
       if (maxRowsTotal_ != 0L) {
         output.writeInt64(4, maxRowsTotal_);
       }
+      unknownFields.writeTo(output);
     }
 
+    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -6429,11 +6730,11 @@ public final class Requests {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(4, maxRowsTotal_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
- 

<TRUNCATED>

Reply via email to