You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2017/01/14 22:42:47 UTC

[1/4] calcite git commit: [CALCITE-1576] Use the protobuf-maven-plugin

Repository: calcite
Updated Branches:
  refs/heads/master b656c0c7a -> d06e5000e


http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java
index 9513b46..87d567d 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java
@@ -1,25 +1,9 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: responses.proto
 
 package org.apache.calcite.avatica.proto;
 
-@SuppressWarnings({"unused", "rawtypes"}) public final class Responses {
+public final class Responses {
   private Responses() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
@@ -254,7 +238,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -268,7 +252,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -823,7 +807,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -840,7 +824,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -849,7 +833,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -863,7 +847,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -880,7 +864,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -889,7 +873,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -906,7 +890,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool own_statement = 3;</code>
        */
       public Builder setOwnStatement(boolean value) {
-
+        
         ownStatement_ = value;
         onChanged();
         return this;
@@ -915,7 +899,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool own_statement = 3;</code>
        */
       public Builder clearOwnStatement() {
-
+        
         ownStatement_ = false;
         onChanged();
         return this;
@@ -1006,7 +990,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Signature signature = 4;</code>
        */
       public org.apache.calcite.avatica.proto.Common.Signature.Builder getSignatureBuilder() {
-
+        
         onChanged();
         return getSignatureFieldBuilder().getBuilder();
       }
@@ -1025,7 +1009,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Signature signature = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder>
+          org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder> 
           getSignatureFieldBuilder() {
         if (signatureBuilder_ == null) {
           signatureBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -1123,7 +1107,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Frame first_frame = 5;</code>
        */
       public org.apache.calcite.avatica.proto.Common.Frame.Builder getFirstFrameBuilder() {
-
+        
         onChanged();
         return getFirstFrameFieldBuilder().getBuilder();
       }
@@ -1142,7 +1126,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Frame first_frame = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.Frame, org.apache.calcite.avatica.proto.Common.Frame.Builder, org.apache.calcite.avatica.proto.Common.FrameOrBuilder>
+          org.apache.calcite.avatica.proto.Common.Frame, org.apache.calcite.avatica.proto.Common.Frame.Builder, org.apache.calcite.avatica.proto.Common.FrameOrBuilder> 
           getFirstFrameFieldBuilder() {
         if (firstFrameBuilder_ == null) {
           firstFrameBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -1174,7 +1158,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 update_count = 6;</code>
        */
       public Builder setUpdateCount(long value) {
-
+        
         updateCount_ = value;
         onChanged();
         return this;
@@ -1187,7 +1171,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 update_count = 6;</code>
        */
       public Builder clearUpdateCount() {
-
+        
         updateCount_ = 0L;
         onChanged();
         return this;
@@ -1306,7 +1290,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 7;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -1333,7 +1317,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -1401,7 +1385,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ResultSetResponse results = 1;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse>
+    java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse> 
         getResultsList();
     /**
      * <code>repeated .ResultSetResponse results = 1;</code>
@@ -1414,7 +1398,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ResultSetResponse results = 1;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder> 
         getResultsOrBuilderList();
     /**
      * <code>repeated .ResultSetResponse results = 1;</code>
@@ -1554,7 +1538,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ResultSetResponse results = 1;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder> 
         getResultsOrBuilderList() {
       return results_;
     }
@@ -1934,7 +1918,7 @@ package org.apache.calcite.avatica.proto;
               resultsBuilder_ = null;
               results_ = other.results_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              resultsBuilder_ =
+              resultsBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getResultsFieldBuilder() : null;
             } else {
@@ -2170,7 +2154,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .ResultSetResponse results = 1;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder> 
            getResultsOrBuilderList() {
         if (resultsBuilder_ != null) {
           return resultsBuilder_.getMessageOrBuilderList();
@@ -2196,12 +2180,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .ResultSetResponse results = 1;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder> 
            getResultsBuilderList() {
         return getResultsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.ResultSetResponse, org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder, org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.ResultSetResponse, org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder, org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder> 
           getResultsFieldBuilder() {
         if (resultsBuilder_ == null) {
           resultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -2234,7 +2218,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_statement = 2;</code>
        */
       public Builder setMissingStatement(boolean value) {
-
+        
         missingStatement_ = value;
         onChanged();
         return this;
@@ -2247,7 +2231,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_statement = 2;</code>
        */
       public Builder clearMissingStatement() {
-
+        
         missingStatement_ = false;
         onChanged();
         return this;
@@ -2338,7 +2322,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 3;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -2357,7 +2341,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -2983,7 +2967,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .StatementHandle statement = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Common.StatementHandle.Builder getStatementBuilder() {
-
+        
         onChanged();
         return getStatementFieldBuilder().getBuilder();
       }
@@ -3002,7 +2986,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .StatementHandle statement = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.StatementHandle, org.apache.calcite.avatica.proto.Common.StatementHandle.Builder, org.apache.calcite.avatica.proto.Common.StatementHandleOrBuilder>
+          org.apache.calcite.avatica.proto.Common.StatementHandle, org.apache.calcite.avatica.proto.Common.StatementHandle.Builder, org.apache.calcite.avatica.proto.Common.StatementHandleOrBuilder> 
           getStatementFieldBuilder() {
         if (statementBuilder_ == null) {
           statementBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -3100,7 +3084,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 2;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -3119,7 +3103,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -3837,7 +3821,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Frame frame = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Common.Frame.Builder getFrameBuilder() {
-
+        
         onChanged();
         return getFrameFieldBuilder().getBuilder();
       }
@@ -3856,7 +3840,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Frame frame = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.Frame, org.apache.calcite.avatica.proto.Common.Frame.Builder, org.apache.calcite.avatica.proto.Common.FrameOrBuilder>
+          org.apache.calcite.avatica.proto.Common.Frame, org.apache.calcite.avatica.proto.Common.Frame.Builder, org.apache.calcite.avatica.proto.Common.FrameOrBuilder> 
           getFrameFieldBuilder() {
         if (frameBuilder_ == null) {
           frameBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -3888,7 +3872,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_statement = 2;</code>
        */
       public Builder setMissingStatement(boolean value) {
-
+        
         missingStatement_ = value;
         onChanged();
         return this;
@@ -3901,7 +3885,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_statement = 2;</code>
        */
       public Builder clearMissingStatement() {
-
+        
         missingStatement_ = false;
         onChanged();
         return this;
@@ -3926,7 +3910,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_results = 3;</code>
        */
       public Builder setMissingResults(boolean value) {
-
+        
         missingResults_ = value;
         onChanged();
         return this;
@@ -3939,7 +3923,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_results = 3;</code>
        */
       public Builder clearMissingResults() {
-
+        
         missingResults_ = false;
         onChanged();
         return this;
@@ -4030,7 +4014,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 4;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -4049,7 +4033,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -4244,7 +4228,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -4258,7 +4242,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -4641,7 +4625,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -4658,7 +4642,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -4667,7 +4651,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -4681,7 +4665,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -4698,7 +4682,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -4707,7 +4691,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -4798,7 +4782,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 3;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -4817,7 +4801,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -5366,7 +5350,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -5385,7 +5369,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -5934,7 +5918,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -5953,7 +5937,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -6502,7 +6486,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -6521,7 +6505,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -7147,7 +7131,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .ConnectionProperties conn_props = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder getConnPropsBuilder() {
-
+        
         onChanged();
         return getConnPropsFieldBuilder().getBuilder();
       }
@@ -7166,7 +7150,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .ConnectionProperties conn_props = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.ConnectionProperties, org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder, org.apache.calcite.avatica.proto.Common.ConnectionPropertiesOrBuilder>
+          org.apache.calcite.avatica.proto.Common.ConnectionProperties, org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder, org.apache.calcite.avatica.proto.Common.ConnectionPropertiesOrBuilder> 
           getConnPropsFieldBuilder() {
         if (connPropsBuilder_ == null) {
           connPropsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -7264,7 +7248,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 2;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -7283,7 +7267,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -7978,7 +7962,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .DatabaseProperty key = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Common.DatabaseProperty.Builder getKeyBuilder() {
-
+        
         onChanged();
         return getKeyFieldBuilder().getBuilder();
       }
@@ -7997,7 +7981,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .DatabaseProperty key = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.DatabaseProperty, org.apache.calcite.avatica.proto.Common.DatabaseProperty.Builder, org.apache.calcite.avatica.proto.Common.DatabasePropertyOrBuilder>
+          org.apache.calcite.avatica.proto.Common.DatabaseProperty, org.apache.calcite.avatica.proto.Common.DatabaseProperty.Builder, org.apache.calcite.avatica.proto.Common.DatabasePropertyOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
           keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -8095,7 +8079,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .TypedValue value = 2;</code>
        */
       public org.apache.calcite.avatica.proto.Common.TypedValue.Builder getValueBuilder() {
-
+        
         onChanged();
         return getValueFieldBuilder().getBuilder();
       }
@@ -8114,7 +8098,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .TypedValue value = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
           getValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -8212,7 +8196,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 3;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -8231,7 +8215,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -8299,7 +8283,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .DatabasePropertyElement props = 1;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement>
+    java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement> 
         getPropsList();
     /**
      * <code>repeated .DatabasePropertyElement props = 1;</code>
@@ -8312,7 +8296,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .DatabasePropertyElement props = 1;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder> 
         getPropsOrBuilderList();
     /**
      * <code>repeated .DatabasePropertyElement props = 1;</code>
@@ -8437,7 +8421,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .DatabasePropertyElement props = 1;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder> 
         getPropsOrBuilderList() {
       return props_;
     }
@@ -8789,7 +8773,7 @@ package org.apache.calcite.avatica.proto;
               propsBuilder_ = null;
               props_ = other.props_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              propsBuilder_ =
+              propsBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getPropsFieldBuilder() : null;
             } else {
@@ -9022,7 +9006,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .DatabasePropertyElement props = 1;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder> 
            getPropsOrBuilderList() {
         if (propsBuilder_ != null) {
           return propsBuilder_.getMessageOrBuilderList();
@@ -9048,12 +9032,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .DatabasePropertyElement props = 1;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder> 
            getPropsBuilderList() {
         return getPropsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder> 
           getPropsFieldBuilder() {
         if (propsBuilder_ == null) {
           propsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -9152,7 +9136,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 2;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -9171,7 +9155,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -9545,7 +9529,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         errorMessage_ = s;
@@ -9563,7 +9547,7 @@ package org.apache.calcite.avatica.proto;
         getErrorMessageBytes() {
       java.lang.Object ref = errorMessage_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         errorMessage_ = b;
@@ -9616,7 +9600,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         sqlState_ = s;
@@ -9634,7 +9618,7 @@ package org.apache.calcite.avatica.proto;
         getSqlStateBytes() {
       java.lang.Object ref = sqlState_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         sqlState_ = b;
@@ -10223,7 +10207,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_exceptions = 7;</code>
        */
       public Builder setHasExceptions(boolean value) {
-
+        
         hasExceptions_ = value;
         onChanged();
         return this;
@@ -10236,7 +10220,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_exceptions = 7;</code>
        */
       public Builder clearHasExceptions() {
-
+        
         hasExceptions_ = false;
         onChanged();
         return this;
@@ -10273,7 +10257,7 @@ package org.apache.calcite.avatica.proto;
           getErrorMessageBytes() {
         java.lang.Object ref = errorMessage_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           errorMessage_ = b;
@@ -10294,7 +10278,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         errorMessage_ = value;
         onChanged();
         return this;
@@ -10307,7 +10291,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string error_message = 2;</code>
        */
       public Builder clearErrorMessage() {
-
+        
         errorMessage_ = getDefaultInstance().getErrorMessage();
         onChanged();
         return this;
@@ -10325,7 +10309,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         errorMessage_ = value;
         onChanged();
         return this;
@@ -10360,7 +10344,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
           throw new NullPointerException();
         }
-
+        
         severity_ = value.getNumber();
         onChanged();
         return this;
@@ -10369,7 +10353,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Severity severity = 3;</code>
        */
       public Builder clearSeverity() {
-
+        
         severity_ = 0;
         onChanged();
         return this;
@@ -10394,7 +10378,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 error_code = 4;</code>
        */
       public Builder setErrorCode(int value) {
-
+        
         errorCode_ = value;
         onChanged();
         return this;
@@ -10407,7 +10391,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 error_code = 4;</code>
        */
       public Builder clearErrorCode() {
-
+        
         errorCode_ = 0;
         onChanged();
         return this;
@@ -10444,7 +10428,7 @@ package org.apache.calcite.avatica.proto;
           getSqlStateBytes() {
         java.lang.Object ref = sqlState_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           sqlState_ = b;
@@ -10465,7 +10449,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         sqlState_ = value;
         onChanged();
         return this;
@@ -10478,7 +10462,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string sql_state = 5;</code>
        */
       public Builder clearSqlState() {
-
+        
         sqlState_ = getDefaultInstance().getSqlState();
         onChanged();
         return this;
@@ -10496,7 +10480,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         sqlState_ = value;
         onChanged();
         return this;
@@ -10587,7 +10571,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 6;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -10606,7 +10590,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 6;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -11173,7 +11157,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_statement = 1;</code>
        */
       public Builder setMissingStatement(boolean value) {
-
+        
         missingStatement_ = value;
         onChanged();
         return this;
@@ -11186,7 +11170,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_statement = 1;</code>
        */
       public Builder clearMissingStatement() {
-
+        
         missingStatement_ = false;
         onChanged();
         return this;
@@ -11211,7 +11195,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool more_results = 2;</code>
        */
       public Builder setMoreResults(boolean value) {
-
+        
         moreResults_ = value;
         onChanged();
         return this;
@@ -11224,7 +11208,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool more_results = 2;</code>
        */
       public Builder clearMoreResults() {
-
+        
         moreResults_ = false;
         onChanged();
         return this;
@@ -11315,7 +11299,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 3;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -11334,7 +11318,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -11504,7 +11488,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         serverAddress_ = s;
@@ -11522,7 +11506,7 @@ package org.apache.calcite.avatica.proto;
         getServerAddressBytes() {
       java.lang.Object ref = serverAddress_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         serverAddress_ = b;
@@ -11836,7 +11820,7 @@ package org.apache.calcite.avatica.proto;
           getServerAddressBytes() {
         java.lang.Object ref = serverAddress_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           serverAddress_ = b;
@@ -11857,7 +11841,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         serverAddress_ = value;
         onChanged();
         return this;
@@ -11870,7 +11854,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string server_address = 1;</code>
        */
       public Builder clearServerAddress() {
-
+        
         serverAddress_ = getDefaultInstance().getServerAddress();
         onChanged();
         return this;
@@ -11888,7 +11872,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         serverAddress_ = value;
         onChanged();
         return this;
@@ -12876,7 +12860,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -12890,7 +12874,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -13376,7 +13360,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -13393,7 +13377,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -13402,7 +13386,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -13416,7 +13400,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -13433,7 +13417,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -13442,7 +13426,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -13533,7 +13517,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_statement = 4;</code>
        */
       public Builder setMissingStatement(boolean value) {
-
+        
         missingStatement_ = value;
         onChanged();
         return this;
@@ -13546,7 +13530,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool missing_statement = 4;</code>
        */
       public Builder clearMissingStatement() {
-
+        
         missingStatement_ = false;
         onChanged();
         return this;
@@ -13637,7 +13621,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 5;</code>
        */
       public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+        
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
@@ -13656,7 +13640,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .RpcMetadata metadata = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+          org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder> 
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -13719,87 +13703,87 @@ package org.apache.calcite.avatica.proto;
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_ResultSetResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_ResultSetResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_ExecuteResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_ExecuteResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_PrepareResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_PrepareResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_FetchResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_FetchResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_CreateStatementResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_CreateStatementResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_CloseStatementResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_CloseStatementResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_OpenConnectionResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_OpenConnectionResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_CloseConnectionResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_CloseConnectionResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_ConnectionSyncResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_ConnectionSyncResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_DatabasePropertyElement_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_DatabasePropertyElement_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_DatabasePropertyResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_DatabasePropertyResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_ErrorResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_ErrorResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_SyncResultsResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_SyncResultsResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_RpcMetadata_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_RpcMetadata_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_CommitResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_CommitResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_RollbackResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_RollbackResponse_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_ExecuteBatchResponse_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_ExecuteBatchResponse_fieldAccessorTable;
 

http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/core/src/main/scripts/generate-protobuf.sh
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/scripts/generate-protobuf.sh b/avatica/core/src/main/scripts/generate-protobuf.sh
deleted file mode 100755
index 0d07c01..0000000
--- a/avatica/core/src/main/scripts/generate-protobuf.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This script will regenerate the protobuf code for Avatica. Slightly
-# modified script over one in Accumulo.
-
-# NOTES:
-#   To support this script being called by other modules, only edit the right side.
-#   In other scripts, set the variables that diverge from the defaults below, then call this script.
-#   Leave the BUILD_DIR and FINAL_DIR alone for Maven builds.
-# ========================================================================================================================
-[[ -z $REQUIRED_PROTOC_VERSION ]] && REQUIRED_PROTOC_VERSION='libprotoc 3.1.0'
-[[ -z $BUILD_DIR ]]               && BUILD_DIR='target/proto-tmp'
-[[ -z $FINAL_DIR ]]               && FINAL_DIR='src/main'
-# ========================================================================================================================
-
-fail() {
-  echo "$@"
-  exit 1
-}
-
-# Test to see if we have protoc installed
-VERSION=$(protoc --version 2>/dev/null | grep -F "${REQUIRED_PROTOC_VERSION}" |  wc -l)
-if [[ $VERSION -ne 1 ]] ; then
-  # Nope: bail
-  echo "****************************************************"
-  echo "*** protoc is not available"
-  echo "***   expecting 'protoc --version' to return ${REQUIRED_PROTOC_VERSION}"
-  echo "*** generated code will not be updated"
-  fail "****************************************************"
-fi
-
-# Ensure output directories are created
-PROTOC_ARGS="-I src/main/protobuf --java_out=$BUILD_DIR"
-rm -rf $BUILD_DIR
-mkdir -p $BUILD_DIR
-
-protoc ${PROTOC_ARGS} src/main/protobuf/*.proto || fail unable to generate Java protocol buffer classes
-
-# For all generated protobuf code, suppress all warnings and add the LICENSE header
-s='@SuppressWarnings({"unused", "rawtypes"})'
-find $BUILD_DIR -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/\(public final class \)/'"$s"' \1/;s/ *$//'
-
-PREFIX="/*
-"
-LINE_NOTATION=" *"
-SUFFIX="
- */"
-FILE_SUFFIX=(.java)
-
-for file in "${FILE_SUFFIX[@]}"; do
-  for f in $(find $BUILD_DIR/ -name "*$file"); do
-    cat - "$f" > "${f}-with-license" <<EOF
-${PREFIX}${LINE_NOTATION} Licensed to the Apache Software Foundation (ASF) under one or more
-${LINE_NOTATION} contributor license agreements.  See the NOTICE file distributed with
-${LINE_NOTATION} this work for additional information regarding copyright ownership.
-${LINE_NOTATION} The ASF licenses this file to you under the Apache License, Version 2.0
-${LINE_NOTATION} (the "License"); you may not use this file except in compliance with
-${LINE_NOTATION} the License.  You may obtain a copy of the License at
-${LINE_NOTATION}
-${LINE_NOTATION} http://www.apache.org/licenses/LICENSE-2.0
-${LINE_NOTATION}
-${LINE_NOTATION} Unless required by applicable law or agreed to in writing, software
-${LINE_NOTATION} distributed under the License is distributed on an "AS IS" BASIS,
-${LINE_NOTATION} WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-${LINE_NOTATION} See the License for the specific language governing permissions and
-${LINE_NOTATION} limitations under the License.${SUFFIX}
-EOF
-  done
-done
-
-# For every generated java file, compare it with the version-controlled one, and copy the ones that have changed into place
-SDIR="${BUILD_DIR}/org/apache/calcite/avatica/proto"
-DDIR="${FINAL_DIR}/java/org/apache/calcite/avatica/proto"
-FILE_SUFFIX=(.java)
-mkdir -p "$DDIR"
-for file in "${FILE_SUFFIX[@]}"; do
-  for f in $(find $SDIR -name *$file); do
-    DEST=$DDIR/$(basename "$f")
-    if ! cmp -s "${f}-with-license" "${DEST}" ; then
-      echo cp -f "${f}-with-license" "${DEST}"
-      cp -f "${f}-with-license" "${DEST}" || fail unable to copy files to java workspace
-    fi
-  done
-done

http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/metrics-dropwizardmetrics3/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/metrics-dropwizardmetrics3/pom.xml b/avatica/metrics-dropwizardmetrics3/pom.xml
index 0b9787c..bd60ffe 100644
--- a/avatica/metrics-dropwizardmetrics3/pom.xml
+++ b/avatica/metrics-dropwizardmetrics3/pom.xml
@@ -103,6 +103,15 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>src/main/resources/META-INF/services/org.apache.calcite.avatica.metrics.MetricsSystemFactory</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/noop-driver/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/noop-driver/pom.xml b/avatica/noop-driver/pom.xml
index 346b3d4..b15d7a7 100644
--- a/avatica/noop-driver/pom.xml
+++ b/avatica/noop-driver/pom.xml
@@ -94,6 +94,15 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index eddd0a6..02a5d20 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -291,22 +291,22 @@ limitations under the License.
   </dependencyManagement>
 
   <build>
+    <extensions>
+      <extension>
+        <groupId>kr.motd.maven</groupId>
+        <artifactId>os-maven-plugin</artifactId>
+        <version>1.5.0.Final</version>
+      </extension>
+    </extensions>
     <plugins>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
-            <!-- The following files have file formats that do not
-                 admit comments, and therefore cannot contain
-                 license notices. -->
-            <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
-            <exclude>src/main/resources/META-INF/services/org.apache.calcite.avatica.metrics.MetricsSystemFactory</exclude>
-
             <!-- Do not exclude site/target; it should not exist
                  in any sandbox from which you are making a
                  release. Also, do not exclude site/.sass-cache. -->
-
             <!-- Files generated by Jekyll. -->
             <exclude>site/_includes/anchor_links.html</exclude>
             <exclude>site/_includes/docs_contents.html</exclude>
@@ -331,7 +331,6 @@ limitations under the License.
             <exclude>site/css/screen.scss</exclude>
             <exclude>site/fonts/**</exclude>
             <exclude>site/js/**</exclude>
-
             <!-- Images -->
             <exclude>site/img/*.png</exclude>
             <exclude>site/favicon.ico</exclude>
@@ -561,6 +560,18 @@ limitations under the License.
           <artifactId>git-commit-id-plugin</artifactId>
           <version>${git-commit-id-plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.xolstice.maven.plugins</groupId>
+          <artifactId>protobuf-maven-plugin</artifactId>
+          <version>0.5.0</version>
+          <configuration>
+            <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+            <protoSourceRoot>${basedir}/src/main/protobuf/</protoSourceRoot>
+            <outputDirectory>${basedir}/src/main/java/</outputDirectory>
+            <clearOutputDirectory>false</clearOutputDirectory>
+            <checkStaleness>true</checkStaleness>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/standalone-server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/standalone-server/pom.xml b/avatica/standalone-server/pom.xml
index 6700edd..c5dd24e 100644
--- a/avatica/standalone-server/pom.xml
+++ b/avatica/standalone-server/pom.xml
@@ -220,6 +220,15 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>


[2/4] calcite git commit: [CALCITE-1576] Use the protobuf-maven-plugin

Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java
index adb1dae..8e10849 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Requests.java
@@ -1,25 +1,9 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: requests.proto
 
 package org.apache.calcite.avatica.proto;
 
-@SuppressWarnings({"unused", "rawtypes"}) public final class Requests {
+public final class Requests {
   private Requests() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
@@ -127,7 +111,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -141,7 +125,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -447,7 +431,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -464,7 +448,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -473,7 +457,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -487,7 +471,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -638,7 +622,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -652,7 +636,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -958,7 +942,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -975,7 +959,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -984,7 +968,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -998,7 +982,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -1183,7 +1167,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         catalog_ = s;
@@ -1197,7 +1181,7 @@ package org.apache.calcite.avatica.proto;
         getCatalogBytes() {
       java.lang.Object ref = catalog_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         catalog_ = b;
@@ -1217,7 +1201,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         schemaPattern_ = s;
@@ -1231,7 +1215,7 @@ package org.apache.calcite.avatica.proto;
         getSchemaPatternBytes() {
       java.lang.Object ref = schemaPattern_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         schemaPattern_ = b;
@@ -1251,7 +1235,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -1265,7 +1249,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -1605,7 +1589,7 @@ package org.apache.calcite.avatica.proto;
           getCatalogBytes() {
         java.lang.Object ref = catalog_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           catalog_ = b;
@@ -1622,7 +1606,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         catalog_ = value;
         onChanged();
         return this;
@@ -1631,7 +1615,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string catalog = 1;</code>
        */
       public Builder clearCatalog() {
-
+        
         catalog_ = getDefaultInstance().getCatalog();
         onChanged();
         return this;
@@ -1645,7 +1629,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         catalog_ = value;
         onChanged();
         return this;
@@ -1674,7 +1658,7 @@ package org.apache.calcite.avatica.proto;
           getSchemaPatternBytes() {
         java.lang.Object ref = schemaPattern_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           schemaPattern_ = b;
@@ -1691,7 +1675,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         schemaPattern_ = value;
         onChanged();
         return this;
@@ -1700,7 +1684,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string schema_pattern = 2;</code>
        */
       public Builder clearSchemaPattern() {
-
+        
         schemaPattern_ = getDefaultInstance().getSchemaPattern();
         onChanged();
         return this;
@@ -1714,7 +1698,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         schemaPattern_ = value;
         onChanged();
         return this;
@@ -1743,7 +1727,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -1760,7 +1744,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -1769,7 +1753,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 3;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -1783,7 +1767,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -2034,7 +2018,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         catalog_ = s;
@@ -2048,7 +2032,7 @@ package org.apache.calcite.avatica.proto;
         getCatalogBytes() {
       java.lang.Object ref = catalog_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         catalog_ = b;
@@ -2068,7 +2052,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         schemaPattern_ = s;
@@ -2082,7 +2066,7 @@ package org.apache.calcite.avatica.proto;
         getSchemaPatternBytes() {
       java.lang.Object ref = schemaPattern_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         schemaPattern_ = b;
@@ -2102,7 +2086,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         tableNamePattern_ = s;
@@ -2116,7 +2100,7 @@ package org.apache.calcite.avatica.proto;
         getTableNamePatternBytes() {
       java.lang.Object ref = tableNamePattern_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         tableNamePattern_ = b;
@@ -2178,7 +2162,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -2192,7 +2176,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -2606,7 +2590,7 @@ package org.apache.calcite.avatica.proto;
           getCatalogBytes() {
         java.lang.Object ref = catalog_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           catalog_ = b;
@@ -2623,7 +2607,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         catalog_ = value;
         onChanged();
         return this;
@@ -2632,7 +2616,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string catalog = 1;</code>
        */
       public Builder clearCatalog() {
-
+        
         catalog_ = getDefaultInstance().getCatalog();
         onChanged();
         return this;
@@ -2646,7 +2630,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         catalog_ = value;
         onChanged();
         return this;
@@ -2675,7 +2659,7 @@ package org.apache.calcite.avatica.proto;
           getSchemaPatternBytes() {
         java.lang.Object ref = schemaPattern_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           schemaPattern_ = b;
@@ -2692,7 +2676,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         schemaPattern_ = value;
         onChanged();
         return this;
@@ -2701,7 +2685,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string schema_pattern = 2;</code>
        */
       public Builder clearSchemaPattern() {
-
+        
         schemaPattern_ = getDefaultInstance().getSchemaPattern();
         onChanged();
         return this;
@@ -2715,7 +2699,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         schemaPattern_ = value;
         onChanged();
         return this;
@@ -2744,7 +2728,7 @@ package org.apache.calcite.avatica.proto;
           getTableNamePatternBytes() {
         java.lang.Object ref = tableNamePattern_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           tableNamePattern_ = b;
@@ -2761,7 +2745,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         tableNamePattern_ = value;
         onChanged();
         return this;
@@ -2770,7 +2754,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string table_name_pattern = 3;</code>
        */
       public Builder clearTableNamePattern() {
-
+        
         tableNamePattern_ = getDefaultInstance().getTableNamePattern();
         onChanged();
         return this;
@@ -2784,7 +2768,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         tableNamePattern_ = value;
         onChanged();
         return this;
@@ -2903,7 +2887,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_type_list = 6;</code>
        */
       public Builder setHasTypeList(boolean value) {
-
+        
         hasTypeList_ = value;
         onChanged();
         return this;
@@ -2916,7 +2900,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_type_list = 6;</code>
        */
       public Builder clearHasTypeList() {
-
+        
         hasTypeList_ = false;
         onChanged();
         return this;
@@ -2945,7 +2929,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -2962,7 +2946,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -2971,7 +2955,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 7;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -2985,7 +2969,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -3136,7 +3120,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -3150,7 +3134,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -3456,7 +3440,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -3473,7 +3457,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -3482,7 +3466,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -3496,7 +3480,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -3716,7 +3700,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         catalog_ = s;
@@ -3730,7 +3714,7 @@ package org.apache.calcite.avatica.proto;
         getCatalogBytes() {
       java.lang.Object ref = catalog_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         catalog_ = b;
@@ -3750,7 +3734,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         schemaPattern_ = s;
@@ -3764,7 +3748,7 @@ package org.apache.calcite.avatica.proto;
         getSchemaPatternBytes() {
       java.lang.Object ref = schemaPattern_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         schemaPattern_ = b;
@@ -3784,7 +3768,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         tableNamePattern_ = s;
@@ -3798,7 +3782,7 @@ package org.apache.calcite.avatica.proto;
         getTableNamePatternBytes() {
       java.lang.Object ref = tableNamePattern_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         tableNamePattern_ = b;
@@ -3818,7 +3802,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         columnNamePattern_ = s;
@@ -3832,7 +3816,7 @@ package org.apache.calcite.avatica.proto;
         getColumnNamePatternBytes() {
       java.lang.Object ref = columnNamePattern_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         columnNamePattern_ = b;
@@ -3852,7 +3836,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -3866,7 +3850,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -4241,7 +4225,7 @@ package org.apache.calcite.avatica.proto;
           getCatalogBytes() {
         java.lang.Object ref = catalog_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           catalog_ = b;
@@ -4258,7 +4242,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         catalog_ = value;
         onChanged();
         return this;
@@ -4267,7 +4251,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string catalog = 1;</code>
        */
       public Builder clearCatalog() {
-
+        
         catalog_ = getDefaultInstance().getCatalog();
         onChanged();
         return this;
@@ -4281,7 +4265,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         catalog_ = value;
         onChanged();
         return this;
@@ -4310,7 +4294,7 @@ package org.apache.calcite.avatica.proto;
           getSchemaPatternBytes() {
         java.lang.Object ref = schemaPattern_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           schemaPattern_ = b;
@@ -4327,7 +4311,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         schemaPattern_ = value;
         onChanged();
         return this;
@@ -4336,7 +4320,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string schema_pattern = 2;</code>
        */
       public Builder clearSchemaPattern() {
-
+        
         schemaPattern_ = getDefaultInstance().getSchemaPattern();
         onChanged();
         return this;
@@ -4350,7 +4334,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         schemaPattern_ = value;
         onChanged();
         return this;
@@ -4379,7 +4363,7 @@ package org.apache.calcite.avatica.proto;
           getTableNamePatternBytes() {
         java.lang.Object ref = tableNamePattern_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           tableNamePattern_ = b;
@@ -4396,7 +4380,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         tableNamePattern_ = value;
         onChanged();
         return this;
@@ -4405,7 +4389,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string table_name_pattern = 3;</code>
        */
       public Builder clearTableNamePattern() {
-
+        
         tableNamePattern_ = getDefaultInstance().getTableNamePattern();
         onChanged();
         return this;
@@ -4419,7 +4403,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         tableNamePattern_ = value;
         onChanged();
         return this;
@@ -4448,7 +4432,7 @@ package org.apache.calcite.avatica.proto;
           getColumnNamePatternBytes() {
         java.lang.Object ref = columnNamePattern_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           columnNamePattern_ = b;
@@ -4465,7 +4449,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         columnNamePattern_ = value;
         onChanged();
         return this;
@@ -4474,7 +4458,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string column_name_pattern = 4;</code>
        */
       public Builder clearColumnNamePattern() {
-
+        
         columnNamePattern_ = getDefaultInstance().getColumnNamePattern();
         onChanged();
         return this;
@@ -4488,7 +4472,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         columnNamePattern_ = value;
         onChanged();
         return this;
@@ -4517,7 +4501,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -4534,7 +4518,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -4543,7 +4527,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 5;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -4557,7 +4541,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -4708,7 +4692,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -4722,7 +4706,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -5028,7 +5012,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -5045,7 +5029,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -5054,7 +5038,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -5068,7 +5052,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -5292,7 +5276,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -5306,7 +5290,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -5326,7 +5310,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         sql_ = s;
@@ -5340,7 +5324,7 @@ package org.apache.calcite.avatica.proto;
         getSqlBytes() {
       java.lang.Object ref = sql_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         sql_ = b;
@@ -5781,7 +5765,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -5798,7 +5782,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -5807,7 +5791,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -5821,7 +5805,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -5850,7 +5834,7 @@ package org.apache.calcite.avatica.proto;
           getSqlBytes() {
         java.lang.Object ref = sql_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           sql_ = b;
@@ -5867,7 +5851,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         sql_ = value;
         onChanged();
         return this;
@@ -5876,7 +5860,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string sql = 2;</code>
        */
       public Builder clearSql() {
-
+        
         sql_ = getDefaultInstance().getSql();
         onChanged();
         return this;
@@ -5890,7 +5874,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         sql_ = value;
         onChanged();
         return this;
@@ -5915,7 +5899,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 max_row_count = 3;</code>
        */
       public Builder setMaxRowCount(long value) {
-
+        
         maxRowCount_ = value;
         onChanged();
         return this;
@@ -5928,7 +5912,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 max_row_count = 3;</code>
        */
       public Builder clearMaxRowCount() {
-
+        
         maxRowCount_ = 0L;
         onChanged();
         return this;
@@ -5945,7 +5929,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 4;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -5954,7 +5938,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 4;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -5979,7 +5963,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional int64 max_rows_total = 5;</code>
        */
       public Builder setMaxRowsTotal(long value) {
-
+        
         maxRowsTotal_ = value;
         onChanged();
         return this;
@@ -5992,7 +5976,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional int64 max_rows_total = 5;</code>
        */
       public Builder clearMaxRowsTotal() {
-
+        
         maxRowsTotal_ = 0L;
         onChanged();
         return this;
@@ -6017,7 +6001,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional int32 first_frame_max_size = 6;</code>
        */
       public Builder setFirstFrameMaxSize(int value) {
-
+        
         firstFrameMaxSize_ = value;
         onChanged();
         return this;
@@ -6030,7 +6014,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional int32 first_frame_max_size = 6;</code>
        */
       public Builder clearFirstFrameMaxSize() {
-
+        
         firstFrameMaxSize_ = 0;
         onChanged();
         return this;
@@ -6228,7 +6212,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -6242,7 +6226,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -6262,7 +6246,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         sql_ = s;
@@ -6276,7 +6260,7 @@ package org.apache.calcite.avatica.proto;
         getSqlBytes() {
       java.lang.Object ref = sql_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         sql_ = b;
@@ -6661,7 +6645,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -6678,7 +6662,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -6687,7 +6671,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -6701,7 +6685,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -6730,7 +6714,7 @@ package org.apache.calcite.avatica.proto;
           getSqlBytes() {
         java.lang.Object ref = sql_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           sql_ = b;
@@ -6747,7 +6731,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         sql_ = value;
         onChanged();
         return this;
@@ -6756,7 +6740,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string sql = 2;</code>
        */
       public Builder clearSql() {
-
+        
         sql_ = getDefaultInstance().getSql();
         onChanged();
         return this;
@@ -6770,7 +6754,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         sql_ = value;
         onChanged();
         return this;
@@ -6795,7 +6779,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 max_row_count = 3;</code>
        */
       public Builder setMaxRowCount(long value) {
-
+        
         maxRowCount_ = value;
         onChanged();
         return this;
@@ -6808,7 +6792,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 max_row_count = 3;</code>
        */
       public Builder clearMaxRowCount() {
-
+        
         maxRowCount_ = 0L;
         onChanged();
         return this;
@@ -6833,7 +6817,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional int64 max_rows_total = 4;</code>
        */
       public Builder setMaxRowsTotal(long value) {
-
+        
         maxRowsTotal_ = value;
         onChanged();
         return this;
@@ -6846,7 +6830,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional int64 max_rows_total = 4;</code>
        */
       public Builder clearMaxRowsTotal() {
-
+        
         maxRowsTotal_ = 0L;
         onChanged();
         return this;
@@ -7045,7 +7029,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -7059,7 +7043,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -7474,7 +7458,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -7491,7 +7475,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -7500,7 +7484,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -7514,7 +7498,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -7531,7 +7515,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -7540,7 +7524,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -7557,7 +7541,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 offset = 3;</code>
        */
       public Builder setOffset(long value) {
-
+        
         offset_ = value;
         onChanged();
         return this;
@@ -7566,7 +7550,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 offset = 3;</code>
        */
       public Builder clearOffset() {
-
+        
         offset_ = 0L;
         onChanged();
         return this;
@@ -7591,7 +7575,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 fetch_max_row_count = 4;</code>
        */
       public Builder setFetchMaxRowCount(int value) {
-
+        
         fetchMaxRowCount_ = value;
         onChanged();
         return this;
@@ -7604,7 +7588,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 fetch_max_row_count = 4;</code>
        */
       public Builder clearFetchMaxRowCount() {
-
+        
         fetchMaxRowCount_ = 0;
         onChanged();
         return this;
@@ -7621,7 +7605,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional int32 frame_max_size = 5;</code>
        */
       public Builder setFrameMaxSize(int value) {
-
+        
         frameMaxSize_ = value;
         onChanged();
         return this;
@@ -7630,7 +7614,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional int32 frame_max_size = 5;</code>
        */
       public Builder clearFrameMaxSize() {
-
+        
         frameMaxSize_ = 0;
         onChanged();
         return this;
@@ -7781,7 +7765,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -7795,7 +7779,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -8101,7 +8085,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -8118,7 +8102,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -8127,7 +8111,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -8141,7 +8125,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -8303,7 +8287,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -8317,7 +8301,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -8649,7 +8633,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -8666,7 +8650,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -8675,7 +8659,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -8689,7 +8673,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -8706,7 +8690,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -8715,7 +8699,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -8925,7 +8909,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -8939,7 +8923,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -8955,7 +8939,7 @@ package org.apache.calcite.avatica.proto;
           java.lang.String, java.lang.String> defaultEntry =
               com.google.protobuf.MapEntry
               .<java.lang.String, java.lang.String>newDefaultInstance(
-                  org.apache.calcite.avatica.proto.Requests.internal_static_OpenConnectionRequest_InfoEntry_descriptor,
+                  org.apache.calcite.avatica.proto.Requests.internal_static_OpenConnectionRequest_InfoEntry_descriptor, 
                   com.google.protobuf.WireFormat.FieldType.STRING,
                   "",
                   com.google.protobuf.WireFormat.FieldType.STRING,
@@ -9374,7 +9358,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -9391,7 +9375,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -9400,7 +9384,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -9414,7 +9398,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -9684,7 +9668,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -9698,7 +9682,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -10004,7 +9988,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -10021,7 +10005,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -10030,7 +10014,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -10044,7 +10028,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -10217,7 +10201,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -10231,7 +10215,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -10584,7 +10568,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -10601,7 +10585,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -10610,7 +10594,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -10624,7 +10608,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -10715,7 +10699,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .ConnectionProperties conn_props = 2;</code>
        */
       public org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder getConnPropsBuilder() {
-
+        
         onChanged();
         return getConnPropsFieldBuilder().getBuilder();
       }
@@ -10734,7 +10718,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .ConnectionProperties conn_props = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.ConnectionProperties, org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder, org.apache.calcite.avatica.proto.Common.ConnectionPropertiesOrBuilder>
+          org.apache.calcite.avatica.proto.Common.ConnectionProperties, org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder, org.apache.calcite.avatica.proto.Common.ConnectionPropertiesOrBuilder> 
           getConnPropsFieldBuilder() {
         if (connPropsBuilder_ == null) {
           connPropsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -10815,7 +10799,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue parameter_values = 2;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue>
+    java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue> 
         getParameterValuesList();
     /**
      * <code>repeated .TypedValue parameter_values = 2;</code>
@@ -10828,7 +10812,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue parameter_values = 2;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
         getParameterValuesOrBuilderList();
     /**
      * <code>repeated .TypedValue parameter_values = 2;</code>
@@ -10987,7 +10971,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue parameter_values = 2;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
         getParameterValuesOrBuilderList() {
       return parameterValues_;
     }
@@ -11373,7 +11357,7 @@ package org.apache.calcite.avatica.proto;
               parameterValuesBuilder_ = null;
               parameterValues_ = other.parameterValues_;
               bitField0_ = (bitField0_ & ~0x00000002);
-              parameterValuesBuilder_ =
+              parameterValuesBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getParameterValuesFieldBuilder() : null;
             } else {
@@ -11499,7 +11483,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .StatementHandle statementHandle = 1;</code>
        */
       public org.apache.calcite.avatica.proto.Common.StatementHandle.Builder getStatementHandleBuilder() {
-
+        
         onChanged();
         return getStatementHandleFieldBuilder().getBuilder();
       }
@@ -11518,7 +11502,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .StatementHandle statementHandle = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.StatementHandle, org.apache.calcite.avatica.proto.Common.StatementHandle.Builder, org.apache.calcite.avatica.proto.Common.StatementHandleOrBuilder>
+          org.apache.calcite.avatica.proto.Common.StatementHandle, org.apache.calcite.avatica.proto.Common.StatementHandle.Builder, org.apache.calcite.avatica.proto.Common.StatementHandleOrBuilder> 
           getStatementHandleFieldBuilder() {
         if (statementHandleBuilder_ == null) {
           statementHandleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -11726,7 +11710,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .TypedValue parameter_values = 2;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
            getParameterValuesOrBuilderList() {
         if (parameterValuesBuilder_ != null) {
           return parameterValuesBuilder_.getMessageOrBuilderList();
@@ -11752,12 +11736,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .TypedValue parameter_values = 2;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue.Builder> 
            getParameterValuesBuilderList() {
         return getParameterValuesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
           getParameterValuesFieldBuilder() {
         if (parameterValuesBuilder_ == null) {
           parameterValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -11790,7 +11774,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 first_frame_max_size = 3;</code>
        */
       public Builder setFirstFrameMaxSize(long value) {
-
+        
         firstFrameMaxSize_ = value;
         onChanged();
         return this;
@@ -11803,7 +11787,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 first_frame_max_size = 3;</code>
        */
       public Builder clearFirstFrameMaxSize() {
-
+        
         firstFrameMaxSize_ = 0L;
         onChanged();
         return this;
@@ -11820,7 +11804,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_parameter_values = 4;</code>
        */
       public Builder setHasParameterValues(boolean value) {
-
+        
         hasParameterValues_ = value;
         onChanged();
         return this;
@@ -11829,7 +11813,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_parameter_values = 4;</code>
        */
       public Builder clearHasParameterValues() {
-
+        
         hasParameterValues_ = false;
         onChanged();
         return this;
@@ -12024,7 +12008,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -12038,7 +12022,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -12444,7 +12428,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -12461,7 +12445,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -12470,7 +12454,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -12484,7 +12468,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -12501,7 +12485,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -12510,7 +12494,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -12601,7 +12585,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .QueryState state = 3;</code>
        */
       public org.apache.calcite.avatica.proto.Common.QueryState.Builder getStateBuilder() {
-
+        
         onChanged();
         return getStateFieldBuilder().getBuilder();
       }
@@ -12620,7 +12604,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .QueryState state = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.QueryState, org.apache.calcite.avatica.proto.Common.QueryState.Builder, org.apache.calcite.avatica.proto.Common.QueryStateOrBuilder>
+          org.apache.calcite.avatica.proto.Common.QueryState, org.apache.calcite.avatica.proto.Common.QueryState.Builder, org.apache.calcite.avatica.proto.Common.QueryStateOrBuilder> 
           getStateFieldBuilder() {
         if (stateBuilder_ == null) {
           stateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -12644,7 +12628,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 offset = 4;</code>
        */
       public Builder setOffset(long value) {
-
+        
         offset_ = value;
         onChanged();
         return this;
@@ -12653,7 +12637,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 offset = 4;</code>
        */
       public Builder clearOffset() {
-
+        
         offset_ = 0L;
         onChanged();
         return this;
@@ -12804,7 +12788,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -12818,7 +12802,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -13124,7 +13108,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -13141,7 +13125,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -13150,7 +13134,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -13164,7 +13148,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -13315,7 +13299,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -13329,7 +13313,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -13635,7 +13619,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -13652,7 +13636,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -13661,7 +13645,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -13675,7 +13659,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -13870,7 +13854,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -13884,7 +13868,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -14283,7 +14267,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -14300,7 +14284,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -14309,7 +14293,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -14323,7 +14307,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -14340,7 +14324,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -14349,7 +14333,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -14504,7 +14488,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue parameter_values = 1;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue>
+    java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue> 
         getParameterValuesList();
     /**
      * <code>repeated .TypedValue parameter_values = 1;</code>
@@ -14517,7 +14501,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue parameter_values = 1;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
         getParameterValuesOrBuilderList();
     /**
      * <code>repeated .TypedValue parameter_values = 1;</code>
@@ -14615,7 +14599,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue parameter_values = 1;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
         getParameterValuesOrBuilderList() {
       return parameterValues_;
     }
@@ -14917,7 +14901,7 @@ package org.apache.calcite.avatica.proto;
               parameterValuesBuilder_ = null;
               parameterValues_ = other.parameterValues_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              parameterValuesBuilder_ =
+              parameterValuesBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getParameterValuesFieldBuilder() : null;
             } else {
@@ -15147,7 +15131,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .TypedValue parameter_values = 1;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
            getParameterValuesOrBuilderList() {
         if (parameterValuesBuilder_ != null) {
           return parameterValuesBuilder_.getMessageOrBuilderList();
@@ -15173,12 +15157,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .TypedValue parameter_values = 1;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue.Builder> 
            getParameterValuesBuilderList() {
         return getParameterValuesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
           getParameterValuesFieldBuilder() {
         if (parameterValuesBuilder_ == null) {
           parameterValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -15266,7 +15250,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .UpdateBatch updates = 3;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Requests.UpdateBatch>
+    java.util.List<org.apache.calcite.avatica.proto.Requests.UpdateBatch> 
         getUpdatesList();
     /**
      * <pre>
@@ -15291,7 +15275,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .UpdateBatch updates = 3;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Requests.UpdateBatchOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Requests.UpdateBatchOrBuilder> 
         getUpdatesOrBuilderList();
     /**
      * <pre>
@@ -15402,7 +15386,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -15416,7 +15400,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -15454,7 +15438,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .UpdateBatch updates = 3;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Requests.UpdateBatchOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Requests.UpdateBatchOrBuilder> 
         getUpdatesOrBuilderList() {
       return updates_;
     }
@@ -15800,7 +15784,7 @@ package org.apache.calcite.avatica.proto;
               updatesBuilder_ = null;
               updates_ = other.updates_;
               bitField0_ = (bitField0_ & ~0x00000004);
-              updatesBuilder_ =
+              updatesBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getUpdatesFieldBuilder() : null;
             } else {
@@ -15858,7 +15842,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -15875,7 +15859,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -15884,7 +15868,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -15898,7 +15882,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -15915,7 +15899,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder setStatementId(int value) {
-
+        
         statementId_ = value;
         onChanged();
         return this;
@@ -15924,7 +15908,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 statement_id = 2;</code>
        */
       public Builder clearStatementId() {
-
+        
         statementId_ = 0;
         onChanged();
         return this;
@@ -16185,7 +16169,7 @@ package org.apache.calcite.avatica.proto;
        *
        * <code>repeated .UpdateBatch updates = 3;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Requests.UpdateBatchOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Requests.UpdateBatchOrBuilder> 
            getUpdatesOrBuilderList() {
         if (updatesBuilder_ != null) {
           return updatesBuilder_.getMessageOrBuilderList();
@@ -16223,12 +16207,12 @@ package org.apache.calcite.avatica.proto;
        *
        * <code>repeated .UpdateBatch updates = 3;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Requests.UpdateBatch.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Requests.UpdateBatch.Builder> 
            getUpdatesBuilderList() {
         return getUpdatesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Requests.UpdateBatch, org.apache.calcite.avatica.proto.Requests.UpdateBatch.Builder, org.apache.calcite.avatica.proto.Requests.UpdateBatchOrBuilder>
+          org.apache.calcite.avatica.proto.Requests.UpdateBatch, org.apache.calcite.avatica.proto.Requests.UpdateBatch.Builder, org.apache.calcite.avatica.proto.Requests.UpdateBatchOrBuilder> 
           getUpdatesFieldBuilder() {
         if (updatesBuilder_ == null) {
           updatesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -16292,117 +16276,117 @@ package org.apache.calcite.avatica.proto;
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_CatalogsRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_CatalogsRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_DatabasePropertyRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_DatabasePropertyRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_SchemasRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_SchemasRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_TablesRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_TablesRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_TableTypesRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_TableTypesRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_ColumnsRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_ColumnsRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_TypeInfoRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_TypeInfoRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_PrepareAndExecuteRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_PrepareAndExecuteRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_PrepareRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_PrepareRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_FetchRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_FetchRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_CreateStatementRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_CreateStatementRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_CloseStatementRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_CloseStatementRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_OpenConnectionRequest_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_OpenConnectionRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_OpenConnectionRequest_InfoEntry_descriptor;
-  private static final
+  private static final 
     com.google.protobuf.Gener

<TRUNCATED>

[3/4] calcite git commit: [CALCITE-1576] Use the protobuf-maven-plugin

Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
index 496553d..892608e 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Common.java
@@ -1,25 +1,9 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: common.proto
 
 package org.apache.calcite.avatica.proto;
 
-@SuppressWarnings({"unused", "rawtypes"}) public final class Common {
+public final class Common {
   private Common() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
@@ -1359,7 +1343,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         catalog_ = s;
@@ -1373,7 +1357,7 @@ package org.apache.calcite.avatica.proto;
         getCatalogBytes() {
       java.lang.Object ref = catalog_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         catalog_ = b;
@@ -1393,7 +1377,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         schema_ = s;
@@ -1407,7 +1391,7 @@ package org.apache.calcite.avatica.proto;
         getSchemaBytes() {
       java.lang.Object ref = schema_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         schema_ = b;
@@ -1825,7 +1809,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool is_dirty = 1;</code>
        */
       public Builder setIsDirty(boolean value) {
-
+        
         isDirty_ = value;
         onChanged();
         return this;
@@ -1834,7 +1818,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool is_dirty = 1;</code>
        */
       public Builder clearIsDirty() {
-
+        
         isDirty_ = false;
         onChanged();
         return this;
@@ -1851,7 +1835,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool auto_commit = 2;</code>
        */
       public Builder setAutoCommit(boolean value) {
-
+        
         autoCommit_ = value;
         onChanged();
         return this;
@@ -1860,7 +1844,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool auto_commit = 2;</code>
        */
       public Builder clearAutoCommit() {
-
+        
         autoCommit_ = false;
         onChanged();
         return this;
@@ -1885,7 +1869,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_auto_commit = 7;</code>
        */
       public Builder setHasAutoCommit(boolean value) {
-
+        
         hasAutoCommit_ = value;
         onChanged();
         return this;
@@ -1898,7 +1882,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_auto_commit = 7;</code>
        */
       public Builder clearHasAutoCommit() {
-
+        
         hasAutoCommit_ = false;
         onChanged();
         return this;
@@ -1915,7 +1899,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool read_only = 3;</code>
        */
       public Builder setReadOnly(boolean value) {
-
+        
         readOnly_ = value;
         onChanged();
         return this;
@@ -1924,7 +1908,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool read_only = 3;</code>
        */
       public Builder clearReadOnly() {
-
+        
         readOnly_ = false;
         onChanged();
         return this;
@@ -1949,7 +1933,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_read_only = 8;</code>
        */
       public Builder setHasReadOnly(boolean value) {
-
+        
         hasReadOnly_ = value;
         onChanged();
         return this;
@@ -1962,7 +1946,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_read_only = 8;</code>
        */
       public Builder clearHasReadOnly() {
-
+        
         hasReadOnly_ = false;
         onChanged();
         return this;
@@ -1979,7 +1963,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 transaction_isolation = 4;</code>
        */
       public Builder setTransactionIsolation(int value) {
-
+        
         transactionIsolation_ = value;
         onChanged();
         return this;
@@ -1988,7 +1972,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 transaction_isolation = 4;</code>
        */
       public Builder clearTransactionIsolation() {
-
+        
         transactionIsolation_ = 0;
         onChanged();
         return this;
@@ -2017,7 +2001,7 @@ package org.apache.calcite.avatica.proto;
           getCatalogBytes() {
         java.lang.Object ref = catalog_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           catalog_ = b;
@@ -2034,7 +2018,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         catalog_ = value;
         onChanged();
         return this;
@@ -2043,7 +2027,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string catalog = 5;</code>
        */
       public Builder clearCatalog() {
-
+        
         catalog_ = getDefaultInstance().getCatalog();
         onChanged();
         return this;
@@ -2057,7 +2041,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         catalog_ = value;
         onChanged();
         return this;
@@ -2086,7 +2070,7 @@ package org.apache.calcite.avatica.proto;
           getSchemaBytes() {
         java.lang.Object ref = schema_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           schema_ = b;
@@ -2103,7 +2087,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         schema_ = value;
         onChanged();
         return this;
@@ -2112,7 +2096,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string schema = 6;</code>
        */
       public Builder clearSchema() {
-
+        
         schema_ = getDefaultInstance().getSchema();
         onChanged();
         return this;
@@ -2126,7 +2110,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         schema_ = value;
         onChanged();
         return this;
@@ -2314,7 +2298,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         connectionId_ = s;
@@ -2328,7 +2312,7 @@ package org.apache.calcite.avatica.proto;
         getConnectionIdBytes() {
       java.lang.Object ref = connectionId_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         connectionId_ = b;
@@ -2711,7 +2695,7 @@ package org.apache.calcite.avatica.proto;
           getConnectionIdBytes() {
         java.lang.Object ref = connectionId_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           connectionId_ = b;
@@ -2728,7 +2712,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         connectionId_ = value;
         onChanged();
         return this;
@@ -2737,7 +2721,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string connection_id = 1;</code>
        */
       public Builder clearConnectionId() {
-
+        
         connectionId_ = getDefaultInstance().getConnectionId();
         onChanged();
         return this;
@@ -2751,7 +2735,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         connectionId_ = value;
         onChanged();
         return this;
@@ -2768,7 +2752,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 id = 2;</code>
        */
       public Builder setId(int value) {
-
+        
         id_ = value;
         onChanged();
         return this;
@@ -2777,7 +2761,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 id = 2;</code>
        */
       public Builder clearId() {
-
+        
         id_ = 0;
         onChanged();
         return this;
@@ -2868,7 +2852,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Signature signature = 3;</code>
        */
       public org.apache.calcite.avatica.proto.Common.Signature.Builder getSignatureBuilder() {
-
+        
         onChanged();
         return getSignatureFieldBuilder().getBuilder();
       }
@@ -2887,7 +2871,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Signature signature = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder>
+          org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder> 
           getSignatureFieldBuilder() {
         if (signatureBuilder_ == null) {
           signatureBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -2955,7 +2939,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ColumnMetaData columns = 1;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.ColumnMetaData>
+    java.util.List<org.apache.calcite.avatica.proto.Common.ColumnMetaData> 
         getColumnsList();
     /**
      * <code>repeated .ColumnMetaData columns = 1;</code>
@@ -2968,7 +2952,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ColumnMetaData columns = 1;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> 
         getColumnsOrBuilderList();
     /**
      * <code>repeated .ColumnMetaData columns = 1;</code>
@@ -2989,7 +2973,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .AvaticaParameter parameters = 3;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.AvaticaParameter>
+    java.util.List<org.apache.calcite.avatica.proto.Common.AvaticaParameter> 
         getParametersList();
     /**
      * <code>repeated .AvaticaParameter parameters = 3;</code>
@@ -3002,7 +2986,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .AvaticaParameter parameters = 3;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder> 
         getParametersOrBuilderList();
     /**
      * <code>repeated .AvaticaParameter parameters = 3;</code>
@@ -3163,7 +3147,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ColumnMetaData columns = 1;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> 
         getColumnsOrBuilderList() {
       return columns_;
     }
@@ -3197,7 +3181,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         sql_ = s;
@@ -3211,7 +3195,7 @@ package org.apache.calcite.avatica.proto;
         getSqlBytes() {
       java.lang.Object ref = sql_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         sql_ = b;
@@ -3232,7 +3216,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .AvaticaParameter parameters = 3;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder> 
         getParametersOrBuilderList() {
       return parameters_;
     }
@@ -3655,7 +3639,7 @@ package org.apache.calcite.avatica.proto;
               columnsBuilder_ = null;
               columns_ = other.columns_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              columnsBuilder_ =
+              columnsBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getColumnsFieldBuilder() : null;
             } else {
@@ -3685,7 +3669,7 @@ package org.apache.calcite.avatica.proto;
               parametersBuilder_ = null;
               parameters_ = other.parameters_;
               bitField0_ = (bitField0_ & ~0x00000004);
-              parametersBuilder_ =
+              parametersBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getParametersFieldBuilder() : null;
             } else {
@@ -3921,7 +3905,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .ColumnMetaData columns = 1;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> 
            getColumnsOrBuilderList() {
         if (columnsBuilder_ != null) {
           return columnsBuilder_.getMessageOrBuilderList();
@@ -3947,12 +3931,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .ColumnMetaData columns = 1;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder> 
            getColumnsBuilderList() {
         return getColumnsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.ColumnMetaData, org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder, org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
+          org.apache.calcite.avatica.proto.Common.ColumnMetaData, org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder, org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> 
           getColumnsFieldBuilder() {
         if (columnsBuilder_ == null) {
           columnsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -3989,7 +3973,7 @@ package org.apache.calcite.avatica.proto;
           getSqlBytes() {
         java.lang.Object ref = sql_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           sql_ = b;
@@ -4006,7 +3990,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         sql_ = value;
         onChanged();
         return this;
@@ -4015,7 +3999,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string sql = 2;</code>
        */
       public Builder clearSql() {
-
+        
         sql_ = getDefaultInstance().getSql();
         onChanged();
         return this;
@@ -4029,7 +4013,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         sql_ = value;
         onChanged();
         return this;
@@ -4230,7 +4214,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .AvaticaParameter parameters = 3;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder> 
            getParametersOrBuilderList() {
         if (parametersBuilder_ != null) {
           return parametersBuilder_.getMessageOrBuilderList();
@@ -4256,12 +4240,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .AvaticaParameter parameters = 3;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.AvaticaParameter.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.AvaticaParameter.Builder> 
            getParametersBuilderList() {
         return getParametersFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.AvaticaParameter, org.apache.calcite.avatica.proto.Common.AvaticaParameter.Builder, org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder>
+          org.apache.calcite.avatica.proto.Common.AvaticaParameter, org.apache.calcite.avatica.proto.Common.AvaticaParameter.Builder, org.apache.calcite.avatica.proto.Common.AvaticaParameterOrBuilder> 
           getParametersFieldBuilder() {
         if (parametersBuilder_ == null) {
           parametersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -4360,7 +4344,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .CursorFactory cursor_factory = 4;</code>
        */
       public org.apache.calcite.avatica.proto.Common.CursorFactory.Builder getCursorFactoryBuilder() {
-
+        
         onChanged();
         return getCursorFactoryFieldBuilder().getBuilder();
       }
@@ -4379,7 +4363,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .CursorFactory cursor_factory = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.CursorFactory, org.apache.calcite.avatica.proto.Common.CursorFactory.Builder, org.apache.calcite.avatica.proto.Common.CursorFactoryOrBuilder>
+          org.apache.calcite.avatica.proto.Common.CursorFactory, org.apache.calcite.avatica.proto.Common.CursorFactory.Builder, org.apache.calcite.avatica.proto.Common.CursorFactoryOrBuilder> 
           getCursorFactoryFieldBuilder() {
         if (cursorFactoryBuilder_ == null) {
           cursorFactoryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -4421,7 +4405,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
           throw new NullPointerException();
         }
-
+        
         statementType_ = value.getNumber();
         onChanged();
         return this;
@@ -4430,7 +4414,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .StatementType statementType = 5;</code>
        */
       public Builder clearStatementType() {
-
+        
         statementType_ = 0;
         onChanged();
         return this;
@@ -4903,7 +4887,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         label_ = s;
@@ -4917,7 +4901,7 @@ package org.apache.calcite.avatica.proto;
         getLabelBytes() {
       java.lang.Object ref = label_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         label_ = b;
@@ -4937,7 +4921,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         columnName_ = s;
@@ -4951,7 +4935,7 @@ package org.apache.calcite.avatica.proto;
         getColumnNameBytes() {
       java.lang.Object ref = columnName_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         columnName_ = b;
@@ -4971,7 +4955,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         schemaName_ = s;
@@ -4985,7 +4969,7 @@ package org.apache.calcite.avatica.proto;
         getSchemaNameBytes() {
       java.lang.Object ref = schemaName_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         schemaName_ = b;
@@ -5023,7 +5007,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         tableName_ = s;
@@ -5037,7 +5021,7 @@ package org.apache.calcite.avatica.proto;
         getTableNameBytes() {
       java.lang.Object ref = tableName_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         tableName_ = b;
@@ -5057,7 +5041,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         catalogName_ = s;
@@ -5071,7 +5055,7 @@ package org.apache.calcite.avatica.proto;
         getCatalogNameBytes() {
       java.lang.Object ref = catalogName_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         catalogName_ = b;
@@ -5118,7 +5102,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         columnClassName_ = s;
@@ -5132,7 +5116,7 @@ package org.apache.calcite.avatica.proto;
         getColumnClassNameBytes() {
       java.lang.Object ref = columnClassName_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         columnClassName_ = b;
@@ -5787,7 +5771,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 ordinal = 1;</code>
        */
       public Builder setOrdinal(int value) {
-
+        
         ordinal_ = value;
         onChanged();
         return this;
@@ -5796,7 +5780,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 ordinal = 1;</code>
        */
       public Builder clearOrdinal() {
-
+        
         ordinal_ = 0;
         onChanged();
         return this;
@@ -5813,7 +5797,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool auto_increment = 2;</code>
        */
       public Builder setAutoIncrement(boolean value) {
-
+        
         autoIncrement_ = value;
         onChanged();
         return this;
@@ -5822,7 +5806,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool auto_increment = 2;</code>
        */
       public Builder clearAutoIncrement() {
-
+        
         autoIncrement_ = false;
         onChanged();
         return this;
@@ -5839,7 +5823,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool case_sensitive = 3;</code>
        */
       public Builder setCaseSensitive(boolean value) {
-
+        
         caseSensitive_ = value;
         onChanged();
         return this;
@@ -5848,7 +5832,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool case_sensitive = 3;</code>
        */
       public Builder clearCaseSensitive() {
-
+        
         caseSensitive_ = false;
         onChanged();
         return this;
@@ -5865,7 +5849,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool searchable = 4;</code>
        */
       public Builder setSearchable(boolean value) {
-
+        
         searchable_ = value;
         onChanged();
         return this;
@@ -5874,7 +5858,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool searchable = 4;</code>
        */
       public Builder clearSearchable() {
-
+        
         searchable_ = false;
         onChanged();
         return this;
@@ -5891,7 +5875,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool currency = 5;</code>
        */
       public Builder setCurrency(boolean value) {
-
+        
         currency_ = value;
         onChanged();
         return this;
@@ -5900,7 +5884,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool currency = 5;</code>
        */
       public Builder clearCurrency() {
-
+        
         currency_ = false;
         onChanged();
         return this;
@@ -5917,7 +5901,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 nullable = 6;</code>
        */
       public Builder setNullable(int value) {
-
+        
         nullable_ = value;
         onChanged();
         return this;
@@ -5926,7 +5910,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 nullable = 6;</code>
        */
       public Builder clearNullable() {
-
+        
         nullable_ = 0;
         onChanged();
         return this;
@@ -5943,7 +5927,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool signed = 7;</code>
        */
       public Builder setSigned(boolean value) {
-
+        
         signed_ = value;
         onChanged();
         return this;
@@ -5952,7 +5936,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool signed = 7;</code>
        */
       public Builder clearSigned() {
-
+        
         signed_ = false;
         onChanged();
         return this;
@@ -5969,7 +5953,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 display_size = 8;</code>
        */
       public Builder setDisplaySize(int value) {
-
+        
         displaySize_ = value;
         onChanged();
         return this;
@@ -5978,7 +5962,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 display_size = 8;</code>
        */
       public Builder clearDisplaySize() {
-
+        
         displaySize_ = 0;
         onChanged();
         return this;
@@ -6007,7 +5991,7 @@ package org.apache.calcite.avatica.proto;
           getLabelBytes() {
         java.lang.Object ref = label_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           label_ = b;
@@ -6024,7 +6008,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         label_ = value;
         onChanged();
         return this;
@@ -6033,7 +6017,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string label = 9;</code>
        */
       public Builder clearLabel() {
-
+        
         label_ = getDefaultInstance().getLabel();
         onChanged();
         return this;
@@ -6047,7 +6031,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         label_ = value;
         onChanged();
         return this;
@@ -6076,7 +6060,7 @@ package org.apache.calcite.avatica.proto;
           getColumnNameBytes() {
         java.lang.Object ref = columnName_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           columnName_ = b;
@@ -6093,7 +6077,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         columnName_ = value;
         onChanged();
         return this;
@@ -6102,7 +6086,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string column_name = 10;</code>
        */
       public Builder clearColumnName() {
-
+        
         columnName_ = getDefaultInstance().getColumnName();
         onChanged();
         return this;
@@ -6116,7 +6100,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         columnName_ = value;
         onChanged();
         return this;
@@ -6145,7 +6129,7 @@ package org.apache.calcite.avatica.proto;
           getSchemaNameBytes() {
         java.lang.Object ref = schemaName_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           schemaName_ = b;
@@ -6162,7 +6146,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         schemaName_ = value;
         onChanged();
         return this;
@@ -6171,7 +6155,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string schema_name = 11;</code>
        */
       public Builder clearSchemaName() {
-
+        
         schemaName_ = getDefaultInstance().getSchemaName();
         onChanged();
         return this;
@@ -6185,7 +6169,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         schemaName_ = value;
         onChanged();
         return this;
@@ -6202,7 +6186,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 precision = 12;</code>
        */
       public Builder setPrecision(int value) {
-
+        
         precision_ = value;
         onChanged();
         return this;
@@ -6211,7 +6195,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 precision = 12;</code>
        */
       public Builder clearPrecision() {
-
+        
         precision_ = 0;
         onChanged();
         return this;
@@ -6228,7 +6212,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 scale = 13;</code>
        */
       public Builder setScale(int value) {
-
+        
         scale_ = value;
         onChanged();
         return this;
@@ -6237,7 +6221,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 scale = 13;</code>
        */
       public Builder clearScale() {
-
+        
         scale_ = 0;
         onChanged();
         return this;
@@ -6266,7 +6250,7 @@ package org.apache.calcite.avatica.proto;
           getTableNameBytes() {
         java.lang.Object ref = tableName_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           tableName_ = b;
@@ -6283,7 +6267,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         tableName_ = value;
         onChanged();
         return this;
@@ -6292,7 +6276,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string table_name = 14;</code>
        */
       public Builder clearTableName() {
-
+        
         tableName_ = getDefaultInstance().getTableName();
         onChanged();
         return this;
@@ -6306,7 +6290,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         tableName_ = value;
         onChanged();
         return this;
@@ -6335,7 +6319,7 @@ package org.apache.calcite.avatica.proto;
           getCatalogNameBytes() {
         java.lang.Object ref = catalogName_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           catalogName_ = b;
@@ -6352,7 +6336,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         catalogName_ = value;
         onChanged();
         return this;
@@ -6361,7 +6345,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string catalog_name = 15;</code>
        */
       public Builder clearCatalogName() {
-
+        
         catalogName_ = getDefaultInstance().getCatalogName();
         onChanged();
         return this;
@@ -6375,7 +6359,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         catalogName_ = value;
         onChanged();
         return this;
@@ -6392,7 +6376,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool read_only = 16;</code>
        */
       public Builder setReadOnly(boolean value) {
-
+        
         readOnly_ = value;
         onChanged();
         return this;
@@ -6401,7 +6385,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool read_only = 16;</code>
        */
       public Builder clearReadOnly() {
-
+        
         readOnly_ = false;
         onChanged();
         return this;
@@ -6418,7 +6402,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool writable = 17;</code>
        */
       public Builder setWritable(boolean value) {
-
+        
         writable_ = value;
         onChanged();
         return this;
@@ -6427,7 +6411,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool writable = 17;</code>
        */
       public Builder clearWritable() {
-
+        
         writable_ = false;
         onChanged();
         return this;
@@ -6444,7 +6428,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool definitely_writable = 18;</code>
        */
       public Builder setDefinitelyWritable(boolean value) {
-
+        
         definitelyWritable_ = value;
         onChanged();
         return this;
@@ -6453,7 +6437,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool definitely_writable = 18;</code>
        */
       public Builder clearDefinitelyWritable() {
-
+        
         definitelyWritable_ = false;
         onChanged();
         return this;
@@ -6482,7 +6466,7 @@ package org.apache.calcite.avatica.proto;
           getColumnClassNameBytes() {
         java.lang.Object ref = columnClassName_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           columnClassName_ = b;
@@ -6499,7 +6483,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         columnClassName_ = value;
         onChanged();
         return this;
@@ -6508,7 +6492,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string column_class_name = 19;</code>
        */
       public Builder clearColumnClassName() {
-
+        
         columnClassName_ = getDefaultInstance().getColumnClassName();
         onChanged();
         return this;
@@ -6522,7 +6506,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         columnClassName_ = value;
         onChanged();
         return this;
@@ -6613,7 +6597,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .AvaticaType type = 20;</code>
        */
       public org.apache.calcite.avatica.proto.Common.AvaticaType.Builder getTypeBuilder() {
-
+        
         onChanged();
         return getTypeFieldBuilder().getBuilder();
       }
@@ -6632,7 +6616,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .AvaticaType type = 20;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.AvaticaType, org.apache.calcite.avatica.proto.Common.AvaticaType.Builder, org.apache.calcite.avatica.proto.Common.AvaticaTypeOrBuilder>
+          org.apache.calcite.avatica.proto.Common.AvaticaType, org.apache.calcite.avatica.proto.Common.AvaticaType.Builder, org.apache.calcite.avatica.proto.Common.AvaticaTypeOrBuilder> 
           getTypeFieldBuilder() {
         if (typeBuilder_ == null) {
           typeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -6728,7 +6712,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .ColumnMetaData columns = 4;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.ColumnMetaData>
+    java.util.List<org.apache.calcite.avatica.proto.Common.ColumnMetaData> 
         getColumnsList();
     /**
      * <pre>
@@ -6753,7 +6737,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .ColumnMetaData columns = 4;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> 
         getColumnsOrBuilderList();
     /**
      * <pre>
@@ -6922,7 +6906,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         name_ = s;
@@ -6936,7 +6920,7 @@ package org.apache.calcite.avatica.proto;
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
@@ -6981,7 +6965,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .ColumnMetaData columns = 4;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> 
         getColumnsOrBuilderList() {
       return columns_;
     }
@@ -7407,7 +7391,7 @@ package org.apache.calcite.avatica.proto;
               columnsBuilder_ = null;
               columns_ = other.columns_;
               bitField0_ = (bitField0_ & ~0x00000008);
-              columnsBuilder_ =
+              columnsBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getColumnsFieldBuilder() : null;
             } else {
@@ -7456,7 +7440,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 id = 1;</code>
        */
       public Builder setId(int value) {
-
+        
         id_ = value;
         onChanged();
         return this;
@@ -7465,7 +7449,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 id = 1;</code>
        */
       public Builder clearId() {
-
+        
         id_ = 0;
         onChanged();
         return this;
@@ -7494,7 +7478,7 @@ package org.apache.calcite.avatica.proto;
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
@@ -7511,7 +7495,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         name_ = value;
         onChanged();
         return this;
@@ -7520,7 +7504,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string name = 2;</code>
        */
       public Builder clearName() {
-
+        
         name_ = getDefaultInstance().getName();
         onChanged();
         return this;
@@ -7534,7 +7518,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         name_ = value;
         onChanged();
         return this;
@@ -7569,7 +7553,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
           throw new NullPointerException();
         }
-
+        
         rep_ = value.getNumber();
         onChanged();
         return this;
@@ -7578,7 +7562,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Rep rep = 3;</code>
        */
       public Builder clearRep() {
-
+        
         rep_ = 0;
         onChanged();
         return this;
@@ -7839,7 +7823,7 @@ package org.apache.calcite.avatica.proto;
        *
        * <code>repeated .ColumnMetaData columns = 4;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> 
            getColumnsOrBuilderList() {
         if (columnsBuilder_ != null) {
           return columnsBuilder_.getMessageOrBuilderList();
@@ -7877,12 +7861,12 @@ package org.apache.calcite.avatica.proto;
        *
        * <code>repeated .ColumnMetaData columns = 4;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder> 
            getColumnsBuilderList() {
         return getColumnsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.ColumnMetaData, org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder, org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder>
+          org.apache.calcite.avatica.proto.Common.ColumnMetaData, org.apache.calcite.avatica.proto.Common.ColumnMetaData.Builder, org.apache.calcite.avatica.proto.Common.ColumnMetaDataOrBuilder> 
           getColumnsFieldBuilder() {
         if (columnsBuilder_ == null) {
           columnsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -8009,7 +7993,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .AvaticaType component = 5;</code>
        */
       public org.apache.calcite.avatica.proto.Common.AvaticaType.Builder getComponentBuilder() {
-
+        
         onChanged();
         return getComponentFieldBuilder().getBuilder();
       }
@@ -8036,7 +8020,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .AvaticaType component = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.AvaticaType, org.apache.calcite.avatica.proto.Common.AvaticaType.Builder, org.apache.calcite.avatica.proto.Common.AvaticaTypeOrBuilder>
+          org.apache.calcite.avatica.proto.Common.AvaticaType, org.apache.calcite.avatica.proto.Common.AvaticaType.Builder, org.apache.calcite.avatica.proto.Common.AvaticaTypeOrBuilder> 
           getComponentFieldBuilder() {
         if (componentBuilder_ == null) {
           componentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -8308,7 +8292,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         typeName_ = s;
@@ -8322,7 +8306,7 @@ package org.apache.calcite.avatica.proto;
         getTypeNameBytes() {
       java.lang.Object ref = typeName_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         typeName_ = b;
@@ -8342,7 +8326,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         className_ = s;
@@ -8356,7 +8340,7 @@ package org.apache.calcite.avatica.proto;
         getClassNameBytes() {
       java.lang.Object ref = className_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         className_ = b;
@@ -8376,7 +8360,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         name_ = s;
@@ -8390,7 +8374,7 @@ package org.apache.calcite.avatica.proto;
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
@@ -8787,7 +8771,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool signed = 1;</code>
        */
       public Builder setSigned(boolean value) {
-
+        
         signed_ = value;
         onChanged();
         return this;
@@ -8796,7 +8780,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool signed = 1;</code>
        */
       public Builder clearSigned() {
-
+        
         signed_ = false;
         onChanged();
         return this;
@@ -8813,7 +8797,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 precision = 2;</code>
        */
       public Builder setPrecision(int value) {
-
+        
         precision_ = value;
         onChanged();
         return this;
@@ -8822,7 +8806,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 precision = 2;</code>
        */
       public Builder clearPrecision() {
-
+        
         precision_ = 0;
         onChanged();
         return this;
@@ -8839,7 +8823,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 scale = 3;</code>
        */
       public Builder setScale(int value) {
-
+        
         scale_ = value;
         onChanged();
         return this;
@@ -8848,7 +8832,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 scale = 3;</code>
        */
       public Builder clearScale() {
-
+        
         scale_ = 0;
         onChanged();
         return this;
@@ -8865,7 +8849,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 parameter_type = 4;</code>
        */
       public Builder setParameterType(int value) {
-
+        
         parameterType_ = value;
         onChanged();
         return this;
@@ -8874,7 +8858,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint32 parameter_type = 4;</code>
        */
       public Builder clearParameterType() {
-
+        
         parameterType_ = 0;
         onChanged();
         return this;
@@ -8903,7 +8887,7 @@ package org.apache.calcite.avatica.proto;
           getTypeNameBytes() {
         java.lang.Object ref = typeName_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           typeName_ = b;
@@ -8920,7 +8904,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         typeName_ = value;
         onChanged();
         return this;
@@ -8929,7 +8913,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string type_name = 5;</code>
        */
       public Builder clearTypeName() {
-
+        
         typeName_ = getDefaultInstance().getTypeName();
         onChanged();
         return this;
@@ -8943,7 +8927,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         typeName_ = value;
         onChanged();
         return this;
@@ -8972,7 +8956,7 @@ package org.apache.calcite.avatica.proto;
           getClassNameBytes() {
         java.lang.Object ref = className_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           className_ = b;
@@ -8989,7 +8973,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         className_ = value;
         onChanged();
         return this;
@@ -8998,7 +8982,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string class_name = 6;</code>
        */
       public Builder clearClassName() {
-
+        
         className_ = getDefaultInstance().getClassName();
         onChanged();
         return this;
@@ -9012,7 +8996,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         className_ = value;
         onChanged();
         return this;
@@ -9041,7 +9025,7 @@ package org.apache.calcite.avatica.proto;
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
@@ -9058,7 +9042,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         name_ = value;
         onChanged();
         return this;
@@ -9067,7 +9051,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string name = 7;</code>
        */
       public Builder clearName() {
-
+        
         name_ = getDefaultInstance().getName();
         onChanged();
         return this;
@@ -9081,7 +9065,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         name_ = value;
         onChanged();
         return this;
@@ -9431,7 +9415,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         className_ = s;
@@ -9445,7 +9429,7 @@ package org.apache.calcite.avatica.proto;
         getClassNameBytes() {
       java.lang.Object ref = className_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         className_ = b;
@@ -9840,7 +9824,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
           throw new NullPointerException();
         }
-
+        
         style_ = value.getNumber();
         onChanged();
         return this;
@@ -9849,7 +9833,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .CursorFactory.Style style = 1;</code>
        */
       public Builder clearStyle() {
-
+        
         style_ = 0;
         onChanged();
         return this;
@@ -9878,7 +9862,7 @@ package org.apache.calcite.avatica.proto;
           getClassNameBytes() {
         java.lang.Object ref = className_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           className_ = b;
@@ -9895,7 +9879,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         className_ = value;
         onChanged();
         return this;
@@ -9904,7 +9888,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string class_name = 2;</code>
        */
       public Builder clearClassName() {
-
+        
         className_ = getDefaultInstance().getClassName();
         onChanged();
         return this;
@@ -9918,7 +9902,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         className_ = value;
         onChanged();
         return this;
@@ -10083,7 +10067,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .Row rows = 3;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.Row>
+    java.util.List<org.apache.calcite.avatica.proto.Common.Row> 
         getRowsList();
     /**
      * <code>repeated .Row rows = 3;</code>
@@ -10096,7 +10080,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .Row rows = 3;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.RowOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.RowOrBuilder> 
         getRowsOrBuilderList();
     /**
      * <code>repeated .Row rows = 3;</code>
@@ -10225,7 +10209,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .Row rows = 3;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.RowOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.RowOrBuilder> 
         getRowsOrBuilderList() {
       return rows_;
     }
@@ -10565,7 +10549,7 @@ package org.apache.calcite.avatica.proto;
               rowsBuilder_ = null;
               rows_ = other.rows_;
               bitField0_ = (bitField0_ & ~0x00000004);
-              rowsBuilder_ =
+              rowsBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getRowsFieldBuilder() : null;
             } else {
@@ -10611,7 +10595,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 offset = 1;</code>
        */
       public Builder setOffset(long value) {
-
+        
         offset_ = value;
         onChanged();
         return this;
@@ -10620,7 +10604,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional uint64 offset = 1;</code>
        */
       public Builder clearOffset() {
-
+        
         offset_ = 0L;
         onChanged();
         return this;
@@ -10637,7 +10621,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool done = 2;</code>
        */
       public Builder setDone(boolean value) {
-
+        
         done_ = value;
         onChanged();
         return this;
@@ -10646,7 +10630,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool done = 2;</code>
        */
       public Builder clearDone() {
-
+        
         done_ = false;
         onChanged();
         return this;
@@ -10847,7 +10831,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .Row rows = 3;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.RowOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.RowOrBuilder> 
            getRowsOrBuilderList() {
         if (rowsBuilder_ != null) {
           return rowsBuilder_.getMessageOrBuilderList();
@@ -10873,12 +10857,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .Row rows = 3;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.Row.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.Row.Builder> 
            getRowsBuilderList() {
         return getRowsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.Row, org.apache.calcite.avatica.proto.Common.Row.Builder, org.apache.calcite.avatica.proto.Common.RowOrBuilder>
+          org.apache.calcite.avatica.proto.Common.Row, org.apache.calcite.avatica.proto.Common.Row.Builder, org.apache.calcite.avatica.proto.Common.RowOrBuilder> 
           getRowsFieldBuilder() {
         if (rowsBuilder_ == null) {
           rowsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -10947,7 +10931,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ColumnValue value = 1;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.ColumnValue>
+    java.util.List<org.apache.calcite.avatica.proto.Common.ColumnValue> 
         getValueList();
     /**
      * <code>repeated .ColumnValue value = 1;</code>
@@ -10960,7 +10944,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ColumnValue value = 1;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnValueOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnValueOrBuilder> 
         getValueOrBuilderList();
     /**
      * <code>repeated .ColumnValue value = 1;</code>
@@ -11058,7 +11042,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .ColumnValue value = 1;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnValueOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnValueOrBuilder> 
         getValueOrBuilderList() {
       return value_;
     }
@@ -11360,7 +11344,7 @@ package org.apache.calcite.avatica.proto;
               valueBuilder_ = null;
               value_ = other.value_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              valueBuilder_ =
+              valueBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getValueFieldBuilder() : null;
             } else {
@@ -11590,7 +11574,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .ColumnValue value = 1;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnValueOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.ColumnValueOrBuilder> 
            getValueOrBuilderList() {
         if (valueBuilder_ != null) {
           return valueBuilder_.getMessageOrBuilderList();
@@ -11616,12 +11600,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .ColumnValue value = 1;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.ColumnValue.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.ColumnValue.Builder> 
            getValueBuilderList() {
         return getValueFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.ColumnValue, org.apache.calcite.avatica.proto.Common.ColumnValue.Builder, org.apache.calcite.avatica.proto.Common.ColumnValueOrBuilder>
+          org.apache.calcite.avatica.proto.Common.ColumnValue, org.apache.calcite.avatica.proto.Common.ColumnValue.Builder, org.apache.calcite.avatica.proto.Common.ColumnValueOrBuilder> 
           getValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -11813,7 +11797,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         name_ = s;
@@ -11827,7 +11811,7 @@ package org.apache.calcite.avatica.proto;
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
@@ -12200,7 +12184,7 @@ package org.apache.calcite.avatica.proto;
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
@@ -12217,7 +12201,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         name_ = value;
         onChanged();
         return this;
@@ -12226,7 +12210,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string name = 1;</code>
        */
       public Builder clearName() {
-
+        
         name_ = getDefaultInstance().getName();
         onChanged();
         return this;
@@ -12240,7 +12224,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         name_ = value;
         onChanged();
         return this;
@@ -12496,7 +12480,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         name_ = s;
@@ -12510,7 +12494,7 @@ package org.apache.calcite.avatica.proto;
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
@@ -12842,7 +12826,7 @@ package org.apache.calcite.avatica.proto;
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
@@ -12859,7 +12843,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         name_ = value;
         onChanged();
         return this;
@@ -12868,7 +12852,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string name = 1;</code>
        */
       public Builder clearName() {
-
+        
         name_ = getDefaultInstance().getName();
         onChanged();
         return this;
@@ -12882,7 +12866,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         name_ = value;
         onChanged();
         return this;
@@ -12902,7 +12886,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         wrappedMessage_ = value;
         onChanged();
         return this;
@@ -12911,7 +12895,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bytes wrapped_message = 2;</code>
        */
       public Builder clearWrappedMessage() {
-
+        
         wrappedMessage_ = getDefaultInstance().getWrappedMessage();
         onChanged();
         return this;
@@ -12976,7 +12960,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .TypedValue value = 1;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue>
+    java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue> 
         getValueList();
     /**
      * <pre>
@@ -13001,7 +12985,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .TypedValue value = 1;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
         getValueOrBuilderList();
     /**
      * <pre>
@@ -13016,7 +13000,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue array_value = 2;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue>
+    java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue> 
         getArrayValueList();
     /**
      * <code>repeated .TypedValue array_value = 2;</code>
@@ -13029,7 +13013,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue array_value = 2;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
         getArrayValueOrBuilderList();
     /**
      * <code>repeated .TypedValue array_value = 2;</code>
@@ -13190,7 +13174,7 @@ package org.apache.calcite.avatica.proto;
      *
      * <code>repeated .TypedValue value = 1;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
         getValueOrBuilderList() {
       return value_;
     }
@@ -13237,7 +13221,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .TypedValue array_value = 2;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
         getArrayValueOrBuilderList() {
       return arrayValue_;
     }
@@ -13646,7 +13630,7 @@ package org.apache.calcite.avatica.proto;
               valueBuilder_ = null;
               value_ = other.value_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              valueBuilder_ =
+              valueBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getValueFieldBuilder() : null;
             } else {
@@ -13672,7 +13656,7 @@ package org.apache.calcite.avatica.proto;
               arrayValueBuilder_ = null;
               arrayValue_ = other.arrayValue_;
               bitField0_ = (bitField0_ & ~0x00000002);
-              arrayValueBuilder_ =
+              arrayValueBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getArrayValueFieldBuilder() : null;
             } else {
@@ -13968,7 +13952,7 @@ package org.apache.calcite.avatica.proto;
        *
        * <code>repeated .TypedValue value = 1;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
            getValueOrBuilderList() {
         if (valueBuilder_ != null) {
           return valueBuilder_.getMessageOrBuilderList();
@@ -14006,12 +13990,12 @@ package org.apache.calcite.avatica.proto;
        *
        * <code>repeated .TypedValue value = 1;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue.Builder> 
            getValueBuilderList() {
         return getValueFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
           getValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -14220,7 +14204,7 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .TypedValue array_value = 2;</code>
        */
-      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+      public java.util.List<? extends org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
            getArrayValueOrBuilderList() {
         if (arrayValueBuilder_ != null) {
           return arrayValueBuilder_.getMessageOrBuilderList();
@@ -14246,12 +14230,12 @@ package org.apache.calcite.avatica.proto;
       /**
        * <code>repeated .TypedValue array_value = 2;</code>
        */
-      public java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue.Builder>
+      public java.util.List<org.apache.calcite.avatica.proto.Common.TypedValue.Builder> 
            getArrayValueBuilderList() {
         return getArrayValueFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
           getArrayValueFieldBuilder() {
         if (arrayValueBuilder_ == null) {
           arrayValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
@@ -14284,7 +14268,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_array_value = 3;</code>
        */
       public Builder setHasArrayValue(boolean value) {
-
+        
         hasArrayValue_ = value;
         onChanged();
         return this;
@@ -14297,7 +14281,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool has_array_value = 3;</code>
        */
       public Builder clearHasArrayValue() {
-
+        
         hasArrayValue_ = false;
         onChanged();
         return this;
@@ -14388,7 +14372,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .TypedValue scalar_value = 4;</code>
        */
       public org.apache.calcite.avatica.proto.Common.TypedValue.Builder getScalarValueBuilder() {
-
+        
         onChanged();
         return getScalarValueFieldBuilder().getBuilder();
       }
@@ -14407,7 +14391,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .TypedValue scalar_value = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+          org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder> 
           getScalarValueFieldBuilder() {
         if (scalarValueBuilder_ == null) {
           scalarValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -14713,7 +14697,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         stringValue_ = s;
@@ -14731,7 +14715,7 @@ package org.apache.calcite.avatica.proto;
         getStringValueBytes() {
       java.lang.Object ref = stringValue_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         stringValue_ = b;
@@ -15218,7 +15202,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
           throw new NullPointerException();
         }
-
+        
         type_ = value.getNumber();
         onChanged();
         return this;
@@ -15231,7 +15215,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .Rep type = 1;</code>
        */
       public Builder clearType() {
-
+        
         type_ = 0;
         onChanged();
         return this;
@@ -15256,7 +15240,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool bool_value = 2;</code>
        */
       public Builder setBoolValue(boolean value) {
-
+        
         boolValue_ = value;
         onChanged();
         return this;
@@ -15269,7 +15253,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool bool_value = 2;</code>
        */
       public Builder clearBoolValue() {
-
+        
         boolValue_ = false;
         onChanged();
         return this;
@@ -15306,7 +15290,7 @@ package org.apache.calcite.avatica.proto;
           getStringValueBytes() {
         java.lang.Object ref = stringValue_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           stringValue_ = b;
@@ -15327,7 +15311,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         stringValue_ = value;
         onChanged();
         return this;
@@ -15340,7 +15324,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string string_value = 3;</code>
        */
       public Builder clearStringValue() {
-
+        
         stringValue_ = getDefaultInstance().getStringValue();
         onChanged();
         return this;
@@ -15358,7 +15342,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         stringValue_ = value;
         onChanged();
         return this;
@@ -15383,7 +15367,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional sint64 number_value = 4;</code>
        */
       public Builder setNumberValue(long value) {
-
+        
         numberValue_ = value;
         onChanged();
         return this;
@@ -15396,7 +15380,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional sint64 number_value = 4;</code>
        */
       public Builder clearNumberValue() {
-
+        
         numberValue_ = 0L;
         onChanged();
         return this;
@@ -15424,7 +15408,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         bytesValue_ = value;
         onChanged();
         return this;
@@ -15437,7 +15421,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bytes bytes_value = 5;</code>
        */
       public Builder clearBytesValue() {
-
+        
         bytesValue_ = getDefaultInstance().getBytesValue();
         onChanged();
         return this;
@@ -15462,7 +15446,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional double double_value = 6;</code>
        */
       public Builder setDoubleValue(double value) {
-
+        
         doubleValue_ = value;
         onChanged();
         return this;
@@ -15475,7 +15459,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional double double_value = 6;</code>
        */
       public Builder clearDoubleValue() {
-
+        
         doubleValue_ = 0D;
         onChanged();
         return this;
@@ -15500,7 +15484,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool null = 7;</code>
        */
       public Builder setNull(boolean value) {
-
+        
         null_ = value;
         onChanged();
         return this;
@@ -15513,7 +15497,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool null = 7;</code>
        */
       public Builder clearNull() {
-
+        
         null_ = false;
         onChanged();
         return this;
@@ -15907,7 +15891,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         stringValue_ = s;
@@ -15921,7 +15905,7 @@ package org.apache.calcite.avatica.proto;
         getStringValueBytes() {
       java.lang.Object ref = stringValue_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         stringValue_ = b;
@@ -16447,7 +16431,7 @@ package org.apache.calcite.avatica.proto;
           getStringValueBytes() {
         java.lang.Object ref = stringValue_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           stringValue_ = b;
@@ -16464,7 +16448,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
     throw new NullPointerException();
   }
-
+  
         stringValue_ = value;
         onChanged();
         return this;
@@ -16473,7 +16457,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional string string_value = 1;</code>
        */
       public Builder clearStringValue() {
-
+        
         stringValue_ = getDefaultInstance().getStringValue();
         onChanged();
         return this;
@@ -16487,7 +16471,7 @@ package org.apache.calcite.avatica.proto;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-
+        
         stringValue_ = value;
         onChanged();
         return this;
@@ -16504,7 +16488,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool bool_value = 2;</code>
        */
       public Builder setBoolValue(boolean value) {
-
+        
         boolValue_ = value;
         onChanged();
         return this;
@@ -16513,7 +16497,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional bool bool_value = 2;</code>
        */
       public Builder clearBoolValue() {
-
+        
         boolValue_ = false;
         onChanged();
         return this;
@@ -16530,7 +16514,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional sint32 int_value = 3;</code>
        */
       public Builder setIntValue(int value) {
-
+        
         intValue_ = value;
         onChanged();
         return this;
@@ -16539,7 +16523,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional sint32 int_value = 3;</code>
        */
       public Builder clearIntValue() {
-
+        
         intValue_ = 0;
         onChanged();
         return this;
@@ -16734,7 +16718,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
           throw new NullPointerException();
         }
-
+        
         type_ = value.getNumber();
         onChanged();
         return this;
@@ -16743,7 +16727,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .MetaDataOperationArgument.ArgumentType type = 6;</code>
        */
       public Builder clearType() {
-
+        
         type_ = 0;
         onChanged();
         return this;
@@ -16832,7 +16816,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .MetaDataOperationArgument args = 4;</code>
      */
-    java.util.List<org.apache.calcite.avatica.proto.Common.MetaDataOperationArgument>
+    java.util.List<org.apache.calcite.avatica.proto.Common.MetaDataOperationArgument> 
         getArgsList();
     /**
      * <code>repeated .MetaDataOperationArgument args = 4;</code>
@@ -16845,7 +16829,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .MetaDataOperationArgument args = 4;</code>
      */
-    java.util.List<? extends org.apache.calcite.avatica.proto.Common.MetaDataOperationArgumentOrBuilder>
+    java.util.List<? extends org.apache.calcite.avatica.proto.Common.MetaDataOperationArgumentOrBuilder> 
         getArgsOrBuilderList();
     /**
      * <code>repeated .MetaDataOperationArgument args = 4;</code>
@@ -17009,7 +16993,7 @@ package org.apache.calcite.avatica.proto;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs =
+        com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         sql_ = s;
@@ -17023,7 +17007,7 @@ package org.apache.calcite.avatica.proto;
         getSqlBytes() {
       java.lang.Object ref = sql_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
+        com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         sql_ = b;
@@ -17060,7 +17044,7 @@ package org.apache.calcite.avatica.proto;
     /**
      * <code>repeated .MetaDataOperationArgument args = 4;</code>
      */
-    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.MetaDataOperationArgumentOrBuilder>
+    public java.util.List<? extends org.apache.calcite.avatica.proto.Common.MetaDataOperationArgumentOrBuilder> 
         getArgsOrBuilderList() {
       return args_;
     }
@@ -17481,7 +17465,7 @@ package org.apache.calcite.avatica.proto;
               argsBuilder_ = null;
               args_ = other.args_;
               bitField0_ = (bitField0_ & ~0x00000008);
-              argsBuilder_ =
+              argsBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getArgsFieldBuilder() : null;
             } else {
@@ -17554,7 +17538,7 @@ package org.apache.calcite.avatica.proto;
         if (value == null) {
           throw new NullPointerException();
         }
-
+        
         type_ = value.getNumber();
         onChanged();
         return this;
@@ -17563,7 +17547,7 @@ package org.apache.calcite.avatica.proto;
        * <code>optional .StateType type = 1;</code>
        */
       public Builder clearType() {
-
+        
         type_ = 0;
         onChanged();
         return this;
@@ -17592,7 +17576,7 @@ package org.apache.calcite.avatica.proto;
           getSqlBytes() {
         java.lang.Object ref = sql_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
+          com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.S

<TRUNCATED>

[4/4] calcite git commit: [CALCITE-1576] Use the protobuf-maven-plugin

Posted by el...@apache.org.
[CALCITE-1576] Use the protobuf-maven-plugin

* Remove the old script to generate protobuf
* Update the rat check
* Commit the new generated files


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d06e5000
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d06e5000
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d06e5000

Branch: refs/heads/master
Commit: d06e5000eba40d7ac4b6cfad739e41a5d8f22047
Parents: b656c0c
Author: Josh Elser <el...@apache.org>
Authored: Sat Jan 14 17:40:46 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sat Jan 14 17:42:04 2017 -0500

----------------------------------------------------------------------
 avatica/core/pom.xml                            |  23 +
 .../apache/calcite/avatica/proto/Common.java    | 604 +++++++++----------
 .../apache/calcite/avatica/proto/Requests.java  | 564 +++++++++--------
 .../apache/calcite/avatica/proto/Responses.java | 292 +++++----
 .../core/src/main/scripts/generate-protobuf.sh  |  99 ---
 avatica/metrics-dropwizardmetrics3/pom.xml      |   9 +
 avatica/noop-driver/pom.xml                     |   9 +
 avatica/pom.xml                                 |  27 +-
 avatica/standalone-server/pom.xml               |   9 +
 9 files changed, 775 insertions(+), 861 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/d06e5000/avatica/core/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/core/pom.xml b/avatica/core/pom.xml
index c5f60de..7ed2816 100644
--- a/avatica/core/pom.xml
+++ b/avatica/core/pom.xml
@@ -209,6 +209,29 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.xolstice.maven.plugins</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>compile-protoc</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>src/main/java/org/apache/calcite/avatica/proto/*.java</exclude>
+            <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>