http://git-wip-us.apache.org/repos/asf/calcite/blob/86610552/avatica/src/main/java/org/apache/calcite/avatica/proto/Responses.java ---------------------------------------------------------------------- diff --git a/avatica/src/main/java/org/apache/calcite/avatica/proto/Responses.java b/avatica/src/main/java/org/apache/calcite/avatica/proto/Responses.java index e41078a..82cc88e 100644 --- a/avatica/src/main/java/org/apache/calcite/avatica/proto/Responses.java +++ b/avatica/src/main/java/org/apache/calcite/avatica/proto/Responses.java @@ -95,7 +95,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:ResultSetResponse) ResultSetResponseOrBuilder { // Use ResultSetResponse.newBuilder() to construct. - private ResultSetResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private ResultSetResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private ResultSetResponse() { @@ -112,8 +112,7 @@ package org.apache.calcite.avatica.proto; } private ResultSetResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -131,9 +130,9 @@ package org.apache.calcite.avatica.proto; break; } case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); + String s = input.readStringRequireUtf8(); - connectionId_ = bs; + connectionId_ = s; break; } case 16: { @@ -151,7 +150,7 @@ package org.apache.calcite.avatica.proto; if (signature_ != null) { subBuilder = signature_.toBuilder(); } - signature_ = input.readMessage(org.apache.calcite.avatica.proto.Common.Signature.PARSER, extensionRegistry); + signature_ = input.readMessage(org.apache.calcite.avatica.proto.Common.Signature.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(signature_); signature_ = subBuilder.buildPartial(); @@ -164,7 +163,7 @@ package org.apache.calcite.avatica.proto; if (firstFrame_ != null) { subBuilder = firstFrame_.toBuilder(); } - firstFrame_ = input.readMessage(org.apache.calcite.avatica.proto.Common.Frame.PARSER, extensionRegistry); + firstFrame_ = input.readMessage(org.apache.calcite.avatica.proto.Common.Frame.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(firstFrame_); firstFrame_ = subBuilder.buildPartial(); @@ -180,10 +179,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -200,23 +200,8 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.ResultSetResponse.class, org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder.class); } - public static final com.google.protobuf.Parser<ResultSetResponse> PARSER = - new com.google.protobuf.AbstractParser<ResultSetResponse>() { - public ResultSetResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ResultSetResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<ResultSetResponse> getParserForType() { - return PARSER; - } - public static final int CONNECTION_ID_FIELD_NUMBER = 1; - private java.lang.Object connectionId_; + private volatile java.lang.Object connectionId_; /** * <code>optional string connection_id = 1;</code> */ @@ -228,9 +213,7 @@ package org.apache.calcite.avatica.proto; com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - connectionId_ = s; - } + connectionId_ = s; return s; } } @@ -336,9 +319,8 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); if (!getConnectionIdBytes().isEmpty()) { - output.writeBytes(1, getConnectionIdBytes()); + com.google.protobuf.GeneratedMessage.writeString(output, 1, connectionId_); } if (statementId_ != 0) { output.writeUInt32(2, statementId_); @@ -357,15 +339,13 @@ package org.apache.calcite.avatica.proto; } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; if (!getConnectionIdBytes().isEmpty()) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getConnectionIdBytes()); + size += com.google.protobuf.GeneratedMessage.computeStringSize(1, connectionId_); } if (statementId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -387,7 +367,7 @@ package org.apache.calcite.avatica.proto; size += com.google.protobuf.CodedOutputStream .computeUInt64Size(6, updateCount_); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -445,12 +425,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.ResultSetResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -623,9 +608,7 @@ package org.apache.calcite.avatica.proto; com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - connectionId_ = s; - } + connectionId_ = s; return s; } else { return (java.lang.String) ref; @@ -677,7 +660,8 @@ package org.apache.calcite.avatica.proto; if (value == null) { throw new NullPointerException(); } - + checkByteStringIsUtf8(value); + connectionId_ = value; onChanged(); return this; @@ -1021,16 +1005,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:ResultSetResponse) - private static final org.apache.calcite.avatica.proto.Responses.ResultSetResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.ResultSetResponse(); + private static final org.apache.calcite.avatica.proto.Responses.ResultSetResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.ResultSetResponse(); } public static org.apache.calcite.avatica.proto.Responses.ResultSetResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<ResultSetResponse> + PARSER = new com.google.protobuf.AbstractParser<ResultSetResponse>() { + public ResultSetResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new ResultSetResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<ResultSetResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<ResultSetResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.ResultSetResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -1075,7 +1088,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:ExecuteResponse) ExecuteResponseOrBuilder { // Use ExecuteResponse.newBuilder() to construct. - private ExecuteResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private ExecuteResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private ExecuteResponse() { @@ -1089,8 +1102,7 @@ package org.apache.calcite.avatica.proto; } private ExecuteResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -1112,16 +1124,17 @@ package org.apache.calcite.avatica.proto; results_ = new java.util.ArrayList<org.apache.calcite.avatica.proto.Responses.ResultSetResponse>(); mutable_bitField0_ |= 0x00000001; } - results_.add(input.readMessage(org.apache.calcite.avatica.proto.Responses.ResultSetResponse.PARSER, extensionRegistry)); + results_.add(input.readMessage(org.apache.calcite.avatica.proto.Responses.ResultSetResponse.parser(), extensionRegistry)); break; } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { results_ = java.util.Collections.unmodifiableList(results_); @@ -1141,21 +1154,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.ExecuteResponse.class, org.apache.calcite.avatica.proto.Responses.ExecuteResponse.Builder.class); } - public static final com.google.protobuf.Parser<ExecuteResponse> PARSER = - new com.google.protobuf.AbstractParser<ExecuteResponse>() { - public ExecuteResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ExecuteResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<ExecuteResponse> getParserForType() { - return PARSER; - } - public static final int RESULTS_FIELD_NUMBER = 1; private java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse> results_; /** @@ -1203,15 +1201,13 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); for (int i = 0; i < results_.size(); i++) { output.writeMessage(1, results_.get(i)); } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; @@ -1219,7 +1215,7 @@ package org.apache.calcite.avatica.proto; size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, results_.get(i)); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -1277,12 +1273,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.ExecuteResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -1690,16 +1691,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:ExecuteResponse) - private static final org.apache.calcite.avatica.proto.Responses.ExecuteResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.ExecuteResponse(); + private static final org.apache.calcite.avatica.proto.Responses.ExecuteResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.ExecuteResponse(); } public static org.apache.calcite.avatica.proto.Responses.ExecuteResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<ExecuteResponse> + PARSER = new com.google.protobuf.AbstractParser<ExecuteResponse>() { + public ExecuteResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new ExecuteResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<ExecuteResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<ExecuteResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.ExecuteResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -1733,7 +1763,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:PrepareResponse) PrepareResponseOrBuilder { // Use PrepareResponse.newBuilder() to construct. - private PrepareResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private PrepareResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private PrepareResponse() { @@ -1746,8 +1776,7 @@ package org.apache.calcite.avatica.proto; } private PrepareResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -1769,7 +1798,7 @@ package org.apache.calcite.avatica.proto; if (statement_ != null) { subBuilder = statement_.toBuilder(); } - statement_ = input.readMessage(org.apache.calcite.avatica.proto.Common.StatementHandle.PARSER, extensionRegistry); + statement_ = input.readMessage(org.apache.calcite.avatica.proto.Common.StatementHandle.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(statement_); statement_ = subBuilder.buildPartial(); @@ -1780,10 +1809,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -1800,21 +1830,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.PrepareResponse.class, org.apache.calcite.avatica.proto.Responses.PrepareResponse.Builder.class); } - public static final com.google.protobuf.Parser<PrepareResponse> PARSER = - new com.google.protobuf.AbstractParser<PrepareResponse>() { - public PrepareResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new PrepareResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<PrepareResponse> getParserForType() { - return PARSER; - } - public static final int STATEMENT_FIELD_NUMBER = 1; private org.apache.calcite.avatica.proto.Common.StatementHandle statement_; /** @@ -1848,15 +1863,13 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); if (statement_ != null) { output.writeMessage(1, getStatement()); } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; @@ -1864,7 +1877,7 @@ package org.apache.calcite.avatica.proto; size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getStatement()); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -1922,12 +1935,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.PrepareResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -2182,16 +2200,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:PrepareResponse) - private static final org.apache.calcite.avatica.proto.Responses.PrepareResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.PrepareResponse(); + private static final org.apache.calcite.avatica.proto.Responses.PrepareResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.PrepareResponse(); } public static org.apache.calcite.avatica.proto.Responses.PrepareResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<PrepareResponse> + PARSER = new com.google.protobuf.AbstractParser<PrepareResponse>() { + public PrepareResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new PrepareResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<PrepareResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<PrepareResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.PrepareResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -2225,7 +2272,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:FetchResponse) FetchResponseOrBuilder { // Use FetchResponse.newBuilder() to construct. - private FetchResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private FetchResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private FetchResponse() { @@ -2238,8 +2285,7 @@ package org.apache.calcite.avatica.proto; } private FetchResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -2261,7 +2307,7 @@ package org.apache.calcite.avatica.proto; if (frame_ != null) { subBuilder = frame_.toBuilder(); } - frame_ = input.readMessage(org.apache.calcite.avatica.proto.Common.Frame.PARSER, extensionRegistry); + frame_ = input.readMessage(org.apache.calcite.avatica.proto.Common.Frame.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(frame_); frame_ = subBuilder.buildPartial(); @@ -2272,10 +2318,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -2292,21 +2339,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.FetchResponse.class, org.apache.calcite.avatica.proto.Responses.FetchResponse.Builder.class); } - public static final com.google.protobuf.Parser<FetchResponse> PARSER = - new com.google.protobuf.AbstractParser<FetchResponse>() { - public FetchResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new FetchResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<FetchResponse> getParserForType() { - return PARSER; - } - public static final int FRAME_FIELD_NUMBER = 1; private org.apache.calcite.avatica.proto.Common.Frame frame_; /** @@ -2340,15 +2372,13 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); if (frame_ != null) { output.writeMessage(1, getFrame()); } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; @@ -2356,7 +2386,7 @@ package org.apache.calcite.avatica.proto; size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getFrame()); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -2414,12 +2444,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.FetchResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -2674,16 +2709,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:FetchResponse) - private static final org.apache.calcite.avatica.proto.Responses.FetchResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.FetchResponse(); + private static final org.apache.calcite.avatica.proto.Responses.FetchResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.FetchResponse(); } public static org.apache.calcite.avatica.proto.Responses.FetchResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<FetchResponse> + PARSER = new com.google.protobuf.AbstractParser<FetchResponse>() { + public FetchResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new FetchResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<FetchResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<FetchResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.FetchResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -2719,7 +2783,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:CreateStatementResponse) CreateStatementResponseOrBuilder { // Use CreateStatementResponse.newBuilder() to construct. - private CreateStatementResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private CreateStatementResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private CreateStatementResponse() { @@ -2734,8 +2798,7 @@ package org.apache.calcite.avatica.proto; } private CreateStatementResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -2753,9 +2816,9 @@ package org.apache.calcite.avatica.proto; break; } case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); + String s = input.readStringRequireUtf8(); - connectionId_ = bs; + connectionId_ = s; break; } case 16: { @@ -2766,10 +2829,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -2786,23 +2850,8 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.CreateStatementResponse.class, org.apache.calcite.avatica.proto.Responses.CreateStatementResponse.Builder.class); } - public static final com.google.protobuf.Parser<CreateStatementResponse> PARSER = - new com.google.protobuf.AbstractParser<CreateStatementResponse>() { - public CreateStatementResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CreateStatementResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<CreateStatementResponse> getParserForType() { - return PARSER; - } - public static final int CONNECTION_ID_FIELD_NUMBER = 1; - private java.lang.Object connectionId_; + private volatile java.lang.Object connectionId_; /** * <code>optional string connection_id = 1;</code> */ @@ -2814,9 +2863,7 @@ package org.apache.calcite.avatica.proto; com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - connectionId_ = s; - } + connectionId_ = s; return s; } } @@ -2858,30 +2905,27 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); if (!getConnectionIdBytes().isEmpty()) { - output.writeBytes(1, getConnectionIdBytes()); + com.google.protobuf.GeneratedMessage.writeString(output, 1, connectionId_); } if (statementId_ != 0) { output.writeUInt32(2, statementId_); } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; if (!getConnectionIdBytes().isEmpty()) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getConnectionIdBytes()); + size += com.google.protobuf.GeneratedMessage.computeStringSize(1, connectionId_); } if (statementId_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, statementId_); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -2939,12 +2983,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.CreateStatementResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -3077,9 +3126,7 @@ package org.apache.calcite.avatica.proto; com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - connectionId_ = s; - } + connectionId_ = s; return s; } else { return (java.lang.String) ref; @@ -3131,7 +3178,8 @@ package org.apache.calcite.avatica.proto; if (value == null) { throw new NullPointerException(); } - + checkByteStringIsUtf8(value); + connectionId_ = value; onChanged(); return this; @@ -3177,16 +3225,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:CreateStatementResponse) - private static final org.apache.calcite.avatica.proto.Responses.CreateStatementResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.CreateStatementResponse(); + private static final org.apache.calcite.avatica.proto.Responses.CreateStatementResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.CreateStatementResponse(); } public static org.apache.calcite.avatica.proto.Responses.CreateStatementResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<CreateStatementResponse> + PARSER = new com.google.protobuf.AbstractParser<CreateStatementResponse>() { + public CreateStatementResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new CreateStatementResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<CreateStatementResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<CreateStatementResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.CreateStatementResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -3207,7 +3284,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:CloseStatementResponse) CloseStatementResponseOrBuilder { // Use CloseStatementResponse.newBuilder() to construct. - private CloseStatementResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private CloseStatementResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private CloseStatementResponse() { @@ -3220,8 +3297,7 @@ package org.apache.calcite.avatica.proto; } private CloseStatementResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); try { boolean done = false; @@ -3240,10 +3316,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -3260,21 +3337,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.CloseStatementResponse.class, org.apache.calcite.avatica.proto.Responses.CloseStatementResponse.Builder.class); } - public static final com.google.protobuf.Parser<CloseStatementResponse> PARSER = - new com.google.protobuf.AbstractParser<CloseStatementResponse>() { - public CloseStatementResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CloseStatementResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<CloseStatementResponse> getParserForType() { - return PARSER; - } - private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -3287,16 +3349,14 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -3354,12 +3414,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.CloseStatementResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -3483,16 +3548,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:CloseStatementResponse) - private static final org.apache.calcite.avatica.proto.Responses.CloseStatementResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.CloseStatementResponse(); + private static final org.apache.calcite.avatica.proto.Responses.CloseStatementResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.CloseStatementResponse(); } public static org.apache.calcite.avatica.proto.Responses.CloseStatementResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<CloseStatementResponse> + PARSER = new com.google.protobuf.AbstractParser<CloseStatementResponse>() { + public CloseStatementResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new CloseStatementResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<CloseStatementResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<CloseStatementResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.CloseStatementResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -3513,7 +3607,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:OpenConnectionResponse) OpenConnectionResponseOrBuilder { // Use OpenConnectionResponse.newBuilder() to construct. - private OpenConnectionResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private OpenConnectionResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private OpenConnectionResponse() { @@ -3526,8 +3620,7 @@ package org.apache.calcite.avatica.proto; } private OpenConnectionResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); try { boolean done = false; @@ -3546,10 +3639,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -3566,21 +3660,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse.class, org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse.Builder.class); } - public static final com.google.protobuf.Parser<OpenConnectionResponse> PARSER = - new com.google.protobuf.AbstractParser<OpenConnectionResponse>() { - public OpenConnectionResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new OpenConnectionResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<OpenConnectionResponse> getParserForType() { - return PARSER; - } - private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -3593,16 +3672,14 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -3660,12 +3737,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -3789,16 +3871,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:OpenConnectionResponse) - private static final org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse(); + private static final org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse(); } public static org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<OpenConnectionResponse> + PARSER = new com.google.protobuf.AbstractParser<OpenConnectionResponse>() { + public OpenConnectionResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new OpenConnectionResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<OpenConnectionResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<OpenConnectionResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.OpenConnectionResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -3819,7 +3930,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:CloseConnectionResponse) CloseConnectionResponseOrBuilder { // Use CloseConnectionResponse.newBuilder() to construct. - private CloseConnectionResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private CloseConnectionResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private CloseConnectionResponse() { @@ -3832,8 +3943,7 @@ package org.apache.calcite.avatica.proto; } private CloseConnectionResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); try { boolean done = false; @@ -3852,10 +3962,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -3872,21 +3983,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse.class, org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse.Builder.class); } - public static final com.google.protobuf.Parser<CloseConnectionResponse> PARSER = - new com.google.protobuf.AbstractParser<CloseConnectionResponse>() { - public CloseConnectionResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CloseConnectionResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<CloseConnectionResponse> getParserForType() { - return PARSER; - } - private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -3899,16 +3995,14 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -3966,12 +4060,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -4095,16 +4194,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:CloseConnectionResponse) - private static final org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse(); + private static final org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse(); } public static org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<CloseConnectionResponse> + PARSER = new com.google.protobuf.AbstractParser<CloseConnectionResponse>() { + public CloseConnectionResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new CloseConnectionResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<CloseConnectionResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<CloseConnectionResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.CloseConnectionResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -4138,7 +4266,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:ConnectionSyncResponse) ConnectionSyncResponseOrBuilder { // Use ConnectionSyncResponse.newBuilder() to construct. - private ConnectionSyncResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private ConnectionSyncResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private ConnectionSyncResponse() { @@ -4151,8 +4279,7 @@ package org.apache.calcite.avatica.proto; } private ConnectionSyncResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -4174,7 +4301,7 @@ package org.apache.calcite.avatica.proto; if (connProps_ != null) { subBuilder = connProps_.toBuilder(); } - connProps_ = input.readMessage(org.apache.calcite.avatica.proto.Common.ConnectionProperties.PARSER, extensionRegistry); + connProps_ = input.readMessage(org.apache.calcite.avatica.proto.Common.ConnectionProperties.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(connProps_); connProps_ = subBuilder.buildPartial(); @@ -4185,10 +4312,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -4205,21 +4333,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse.class, org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse.Builder.class); } - public static final com.google.protobuf.Parser<ConnectionSyncResponse> PARSER = - new com.google.protobuf.AbstractParser<ConnectionSyncResponse>() { - public ConnectionSyncResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ConnectionSyncResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<ConnectionSyncResponse> getParserForType() { - return PARSER; - } - public static final int CONN_PROPS_FIELD_NUMBER = 1; private org.apache.calcite.avatica.proto.Common.ConnectionProperties connProps_; /** @@ -4253,15 +4366,13 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); if (connProps_ != null) { output.writeMessage(1, getConnProps()); } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; @@ -4269,7 +4380,7 @@ package org.apache.calcite.avatica.proto; size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getConnProps()); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -4327,12 +4438,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -4587,16 +4703,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:ConnectionSyncResponse) - private static final org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse(); + private static final org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse(); } public static org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<ConnectionSyncResponse> + PARSER = new com.google.protobuf.AbstractParser<ConnectionSyncResponse>() { + public ConnectionSyncResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new ConnectionSyncResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<ConnectionSyncResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<ConnectionSyncResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.ConnectionSyncResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -4639,7 +4784,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:DatabasePropertyElement) DatabasePropertyElementOrBuilder { // Use DatabasePropertyElement.newBuilder() to construct. - private DatabasePropertyElement(com.google.protobuf.GeneratedMessage.Builder builder) { + private DatabasePropertyElement(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private DatabasePropertyElement() { @@ -4652,8 +4797,7 @@ package org.apache.calcite.avatica.proto; } private DatabasePropertyElement( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -4675,7 +4819,7 @@ package org.apache.calcite.avatica.proto; if (key_ != null) { subBuilder = key_.toBuilder(); } - key_ = input.readMessage(org.apache.calcite.avatica.proto.Common.DatabaseProperty.PARSER, extensionRegistry); + key_ = input.readMessage(org.apache.calcite.avatica.proto.Common.DatabaseProperty.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(key_); key_ = subBuilder.buildPartial(); @@ -4688,7 +4832,7 @@ package org.apache.calcite.avatica.proto; if (value_ != null) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(org.apache.calcite.avatica.proto.Common.TypedValue.PARSER, extensionRegistry); + value_ = input.readMessage(org.apache.calcite.avatica.proto.Common.TypedValue.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -4699,10 +4843,11 @@ package org.apache.calcite.avatica.proto; } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { makeExtensionsImmutable(); } @@ -4719,21 +4864,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.class, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder.class); } - public static final com.google.protobuf.Parser<DatabasePropertyElement> PARSER = - new com.google.protobuf.AbstractParser<DatabasePropertyElement>() { - public DatabasePropertyElement parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DatabasePropertyElement(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<DatabasePropertyElement> getParserForType() { - return PARSER; - } - public static final int KEY_FIELD_NUMBER = 1; private org.apache.calcite.avatica.proto.Common.DatabaseProperty key_; /** @@ -4788,7 +4918,6 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); if (key_ != null) { output.writeMessage(1, getKey()); } @@ -4797,9 +4926,8 @@ package org.apache.calcite.avatica.proto; } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; @@ -4811,7 +4939,7 @@ package org.apache.calcite.avatica.proto; size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, getValue()); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -4869,12 +4997,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -5256,16 +5389,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:DatabasePropertyElement) - private static final org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement(); + private static final org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement(); } public static org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<DatabasePropertyElement> + PARSER = new com.google.protobuf.AbstractParser<DatabasePropertyElement>() { + public DatabasePropertyElement parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new DatabasePropertyElement(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<DatabasePropertyElement> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<DatabasePropertyElement> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -5310,7 +5472,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:DatabasePropertyResponse) DatabasePropertyResponseOrBuilder { // Use DatabasePropertyResponse.newBuilder() to construct. - private DatabasePropertyResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private DatabasePropertyResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private DatabasePropertyResponse() { @@ -5324,8 +5486,7 @@ package org.apache.calcite.avatica.proto; } private DatabasePropertyResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -5347,16 +5508,17 @@ package org.apache.calcite.avatica.proto; props_ = new java.util.ArrayList<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement>(); mutable_bitField0_ |= 0x00000001; } - props_.add(input.readMessage(org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.PARSER, extensionRegistry)); + props_.add(input.readMessage(org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.parser(), extensionRegistry)); break; } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { props_ = java.util.Collections.unmodifiableList(props_); @@ -5376,21 +5538,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse.class, org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse.Builder.class); } - public static final com.google.protobuf.Parser<DatabasePropertyResponse> PARSER = - new com.google.protobuf.AbstractParser<DatabasePropertyResponse>() { - public DatabasePropertyResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DatabasePropertyResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<DatabasePropertyResponse> getParserForType() { - return PARSER; - } - public static final int PROPS_FIELD_NUMBER = 1; private java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement> props_; /** @@ -5438,15 +5585,13 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); for (int i = 0; i < props_.size(); i++) { output.writeMessage(1, props_.get(i)); } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; @@ -5454,7 +5599,7 @@ package org.apache.calcite.avatica.proto; size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, props_.get(i)); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -5512,12 +5657,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -5925,16 +6075,45 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:DatabasePropertyResponse) - private static final org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse(); + private static final org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse(); } public static org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<DatabasePropertyResponse> + PARSER = new com.google.protobuf.AbstractParser<DatabasePropertyResponse>() { + public DatabasePropertyResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new DatabasePropertyResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { + throw (com.google.protobuf.InvalidProtocolBufferException) + e.getCause(); + } + throw e; + } + } + }; + + public static com.google.protobuf.Parser<DatabasePropertyResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<DatabasePropertyResponse> getParserForType() { + return PARSER; } public org.apache.calcite.avatica.proto.Responses.DatabasePropertyResponse getDefaultInstanceForType() { - return defaultInstance; + return DEFAULT_INSTANCE; } } @@ -6044,7 +6223,7 @@ package org.apache.calcite.avatica.proto; // @@protoc_insertion_point(message_implements:ErrorResponse) ErrorResponseOrBuilder { // Use ErrorResponse.newBuilder() to construct. - private ErrorResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + private ErrorResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); } private ErrorResponse() { @@ -6062,8 +6241,7 @@ package org.apache.calcite.avatica.proto; } private ErrorResponse( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ExtensionRegistryLite extensionRegistry) { this(); int mutable_bitField0_ = 0; try { @@ -6081,18 +6259,18 @@ package org.apache.calcite.avatica.proto; break; } case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); + String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { exceptions_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } - exceptions_.add(bs); + exceptions_.add(s); break; } case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); + String s = input.readStringRequireUtf8(); - errorMessage_ = bs; + errorMessage_ = s; break; } case 24: { @@ -6107,18 +6285,19 @@ package org.apache.calcite.avatica.proto; break; } case 42: { - com.google.protobuf.ByteString bs = input.readBytes(); + String s = input.readStringRequireUtf8(); - sqlState_ = bs; + sqlState_ = s; break; } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); + throw new RuntimeException(e.setUnfinishedMessage(this)); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { exceptions_ = exceptions_.getUnmodifiableView(); @@ -6138,21 +6317,6 @@ package org.apache.calcite.avatica.proto; org.apache.calcite.avatica.proto.Responses.ErrorResponse.class, org.apache.calcite.avatica.proto.Responses.ErrorResponse.Builder.class); } - public static final com.google.protobuf.Parser<ErrorResponse> PARSER = - new com.google.protobuf.AbstractParser<ErrorResponse>() { - public ErrorResponse parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ErrorResponse(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<ErrorResponse> getParserForType() { - return PARSER; - } - private int bitField0_; public static final int EXCEPTIONS_FIELD_NUMBER = 1; private com.google.protobuf.LazyStringList exceptions_; @@ -6200,7 +6364,7 @@ package org.apache.calcite.avatica.proto; } public static final int ERROR_MESSAGE_FIELD_NUMBER = 2; - private java.lang.Object errorMessage_; + private volatile java.lang.Object errorMessage_; /** * <code>optional string error_message = 2;</code> * @@ -6216,9 +6380,7 @@ package org.apache.calcite.avatica.proto; com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - errorMessage_ = s; - } + errorMessage_ = s; return s; } } @@ -6273,7 +6435,7 @@ package org.apache.calcite.avatica.proto; } public static final int SQL_STATE_FIELD_NUMBER = 5; - private java.lang.Object sqlState_; + private volatile java.lang.Object sqlState_; /** * <code>optional string sql_state = 5;</code> * @@ -6289,9 +6451,7 @@ package org.apache.calcite.avatica.proto; com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - sqlState_ = s; - } + sqlState_ = s; return s; } } @@ -6328,12 +6488,11 @@ package org.apache.calcite.avatica.proto; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); for (int i = 0; i < exceptions_.size(); i++) { - output.writeBytes(1, exceptions_.getByteString(i)); + com.google.protobuf.GeneratedMessage.writeString(output, 1, exceptions_.getRaw(i)); } if (!getErrorMessageBytes().isEmpty()) { - output.writeBytes(2, getErrorMessageBytes()); + com.google.protobuf.GeneratedMessage.writeString(output, 2, errorMessage_); } if (severity_ != org.apache.calcite.avatica.proto.Common.Severity.UNKNOWN_SEVERITY.getNumber()) { output.writeEnum(3, severity_); @@ -6342,28 +6501,25 @@ package org.apache.calcite.avatica.proto; output.writeUInt32(4, errorCode_); } if (!getSqlStateBytes().isEmpty()) { - output.writeBytes(5, getSqlStateBytes()); + com.google.protobuf.GeneratedMessage.writeString(output, 5, sqlState_); } } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; { int dataSize = 0; for (int i = 0; i < exceptions_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeBytesSizeNoTag(exceptions_.getByteString(i)); + dataSize += computeStringSizeNoTag(exceptions_.getRaw(i)); } size += dataSize; size += 1 * getExceptionsList().size(); } if (!getErrorMessageBytes().isEmpty()) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getErrorMessageBytes()); + size += com.google.protobuf.GeneratedMessage.computeStringSize(2, errorMessage_); } if (severity_ != org.apache.calcite.avatica.proto.Common.Severity.UNKNOWN_SEVERITY.getNumber()) { size += com.google.protobuf.CodedOutputStream @@ -6374,10 +6530,9 @@ package org.apache.calcite.avatica.proto; .computeUInt32Size(4, errorCode_); } if (!getSqlStateBytes().isEmpty()) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(5, getSqlStateBytes()); + size += com.google.protobuf.GeneratedMessage.computeStringSize(5, sqlState_); } - memoizedSerializedSize = size; + memoizedSize = size; return size; } @@ -6435,12 +6590,17 @@ package org.apache.calcite.avatica.proto; return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { return new Builder(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.calcite.avatica.proto.Responses.ErrorResponse prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -6720,7 +6880,8 @@ package org.apache.calcite.avatica.proto; if (value == null) { throw new NullPointerException(); } - ensureExceptionsIsMutable(); + checkByteStringIsUtf8(value); + ensureExceptionsIsMutable(); exceptions_.add(value); onChanged(); return this; @@ -6740,9 +6901,7 @@ package org.apache.calcite.avatica.proto; com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - errorMessage_ = s; - } + errorMessage_ = s; return s; } else { return (java.lang.String) ref; @@ -6810,7 +6969,8 @@ package org.apache.calcite.avatica.proto; if (value == null) { throw new NullPointerException(); } - + checkByteStringIsUtf8(value); + errorMessage_ = value; onChanged(); return this; @@ -6912,9 +7072,7 @@ package org.apache.calcite.avatica.proto; com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - sqlState_ = s; - } + sqlState_ = s; return s; } else { return (java.lang.String) ref; @@ -6982,7 +7140,8 @@ package org.apache.calcite.avatica.proto; if (value == null) { throw new NullPointerException(); } - + checkByteStringIsUtf8(value); + sqlState_ = value; onChanged(); return this; @@ -7002,76 +7161,105 @@ package org.apache.calcite.avatica.proto; } // @@protoc_insertion_point(class_scope:ErrorResponse) - private static final org.apache.calcite.avatica.proto.Responses.ErrorResponse defaultInstance;static { - defaultInstance = new org.apache.calcite.avatica.proto.Responses.ErrorResponse(); + private static final org.apache.calcite.avatica.proto.Responses.ErrorResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.calcite.avatica.proto.Responses.ErrorResponse(); } public static org.apache.calcite.avatica.proto.Responses.ErrorResponse getDefaultInstance() { - return defaultInstance; + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<ErrorResponse> + PARSER = new com.google.protobuf.AbstractParser<ErrorResponse>() { + public ErrorResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + try { + return new ErrorResponse(input, extensionRegistry); + } catch (RuntimeException e) { + if (e.getCause() instanceof + com.google.protobuf.InvalidProtocolBufferException) { +
<TRUNCATED>
