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:49 UTC

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

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>