You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2015/03/19 22:08:12 UTC
[2/9] drill git commit: DRILL-2245: Clean up query setup and
execution kickoff in Foreman/WorkManager in order to ensure consistent
handling, and avoid hangs and races,
with the goal of improving Drillbit robustness.
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java
index 5682a3b..00a4905 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java
@@ -704,10 +704,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(enum_scope:exec.shared.CoreOperatorType)
}
- public interface UserCredentialsOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface UserCredentialsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.UserCredentials)
+ com.google.protobuf.MessageOrBuilder {
- // optional string user_name = 1;
/**
* <code>optional string user_name = 1;</code>
*/
@@ -726,8 +726,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.UserCredentials}
*/
public static final class UserCredentials extends
- com.google.protobuf.GeneratedMessage
- implements UserCredentialsOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.UserCredentials)
+ UserCredentialsOrBuilder {
// Use UserCredentials.newBuilder() to construct.
private UserCredentials(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -774,8 +775,9 @@ public final class UserBitShared {
break;
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- userName_ = input.readBytes();
+ userName_ = bs;
break;
}
}
@@ -818,7 +820,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string user_name = 1;
public static final int USER_NAME_FIELD_NUMBER = 1;
private java.lang.Object userName_;
/**
@@ -867,7 +868,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -974,8 +976,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.UserCredentials}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.UserCredentials)
+ org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_UserCredentials_descriptor;
@@ -1090,7 +1093,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string user_name = 1;
private java.lang.Object userName_ = "";
/**
* <code>optional string user_name = 1;</code>
@@ -1104,9 +1106,12 @@ public final class UserBitShared {
public java.lang.String getUserName() {
java.lang.Object ref = userName_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- userName_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ userName_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -1175,10 +1180,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.UserCredentials)
}
- public interface QueryIdOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface QueryIdOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.QueryId)
+ com.google.protobuf.MessageOrBuilder {
- // optional sfixed64 part1 = 1;
/**
* <code>optional sfixed64 part1 = 1;</code>
*/
@@ -1188,7 +1193,6 @@ public final class UserBitShared {
*/
long getPart1();
- // optional sfixed64 part2 = 2;
/**
* <code>optional sfixed64 part2 = 2;</code>
*/
@@ -1202,8 +1206,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.QueryId}
*/
public static final class QueryId extends
- com.google.protobuf.GeneratedMessage
- implements QueryIdOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.QueryId)
+ QueryIdOrBuilder {
// Use QueryId.newBuilder() to construct.
private QueryId(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1299,7 +1304,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional sfixed64 part1 = 1;
public static final int PART1_FIELD_NUMBER = 1;
private long part1_;
/**
@@ -1315,7 +1319,6 @@ public final class UserBitShared {
return part1_;
}
- // optional sfixed64 part2 = 2;
public static final int PART2_FIELD_NUMBER = 2;
private long part2_;
/**
@@ -1338,7 +1341,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -1452,8 +1456,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.QueryId}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.QueryId)
+ org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_QueryId_descriptor;
@@ -1575,7 +1580,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional sfixed64 part1 = 1;
private long part1_ ;
/**
* <code>optional sfixed64 part1 = 1;</code>
@@ -1608,7 +1612,6 @@ public final class UserBitShared {
return this;
}
- // optional sfixed64 part2 = 2;
private long part2_ ;
/**
* <code>optional sfixed64 part2 = 2;</code>
@@ -1652,10 +1655,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.QueryId)
}
- public interface DrillPBErrorOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface DrillPBErrorOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.DrillPBError)
+ com.google.protobuf.MessageOrBuilder {
- // optional string error_id = 1;
/**
* <code>optional string error_id = 1;</code>
*
@@ -1682,7 +1685,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getErrorIdBytes();
- // optional .exec.DrillbitEndpoint endpoint = 2;
/**
* <code>optional .exec.DrillbitEndpoint endpoint = 2;</code>
*/
@@ -1696,7 +1698,6 @@ public final class UserBitShared {
*/
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getEndpointOrBuilder();
- // optional int32 error_type = 3;
/**
* <code>optional int32 error_type = 3;</code>
*/
@@ -1706,7 +1707,6 @@ public final class UserBitShared {
*/
int getErrorType();
- // optional string message = 4;
/**
* <code>optional string message = 4;</code>
*/
@@ -1721,7 +1721,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getMessageBytes();
- // optional .exec.shared.ExceptionWrapper exception = 5;
/**
* <code>optional .exec.shared.ExceptionWrapper exception = 5;</code>
*/
@@ -1735,7 +1734,6 @@ public final class UserBitShared {
*/
org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder getExceptionOrBuilder();
- // repeated .exec.shared.ParsingError parsing_error = 6;
/**
* <code>repeated .exec.shared.ParsingError parsing_error = 6;</code>
*
@@ -1784,8 +1782,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.DrillPBError}
*/
public static final class DrillPBError extends
- com.google.protobuf.GeneratedMessage
- implements DrillPBErrorOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.DrillPBError)
+ DrillPBErrorOrBuilder {
// Use DrillPBError.newBuilder() to construct.
private DrillPBError(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1832,8 +1831,9 @@ public final class UserBitShared {
break;
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- errorId_ = input.readBytes();
+ errorId_ = bs;
break;
}
case 18: {
@@ -1855,8 +1855,9 @@ public final class UserBitShared {
break;
}
case 34: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000008;
- message_ = input.readBytes();
+ message_ = bs;
break;
}
case 42: {
@@ -1923,7 +1924,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string error_id = 1;
public static final int ERROR_ID_FIELD_NUMBER = 1;
private java.lang.Object errorId_;
/**
@@ -1978,7 +1978,6 @@ public final class UserBitShared {
}
}
- // optional .exec.DrillbitEndpoint endpoint = 2;
public static final int ENDPOINT_FIELD_NUMBER = 2;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_;
/**
@@ -2000,7 +1999,6 @@ public final class UserBitShared {
return endpoint_;
}
- // optional int32 error_type = 3;
public static final int ERROR_TYPE_FIELD_NUMBER = 3;
private int errorType_;
/**
@@ -2016,7 +2014,6 @@ public final class UserBitShared {
return errorType_;
}
- // optional string message = 4;
public static final int MESSAGE_FIELD_NUMBER = 4;
private java.lang.Object message_;
/**
@@ -2059,7 +2056,6 @@ public final class UserBitShared {
}
}
- // optional .exec.shared.ExceptionWrapper exception = 5;
public static final int EXCEPTION_FIELD_NUMBER = 5;
private org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper exception_;
/**
@@ -2081,7 +2077,6 @@ public final class UserBitShared {
return exception_;
}
- // repeated .exec.shared.ParsingError parsing_error = 6;
public static final int PARSING_ERROR_FIELD_NUMBER = 6;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.ParsingError> parsingError_;
/**
@@ -2148,7 +2143,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -2290,8 +2286,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.DrillPBError}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.DrillPBErrorOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.DrillPBError)
+ org.apache.drill.exec.proto.UserBitShared.DrillPBErrorOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_DrillPBError_descriptor;
@@ -2504,7 +2501,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string error_id = 1;
private java.lang.Object errorId_ = "";
/**
* <code>optional string error_id = 1;</code>
@@ -2526,9 +2522,12 @@ public final class UserBitShared {
public java.lang.String getErrorId() {
java.lang.Object ref = errorId_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- errorId_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ errorId_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -2602,7 +2601,6 @@ public final class UserBitShared {
return this;
}
- // optional .exec.DrillbitEndpoint endpoint = 2;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_ = org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder> endpointBuilder_;
@@ -2711,7 +2709,7 @@ public final class UserBitShared {
if (endpointBuilder_ == null) {
endpointBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder>(
- endpoint_,
+ getEndpoint(),
getParentForChildren(),
isClean());
endpoint_ = null;
@@ -2719,7 +2717,6 @@ public final class UserBitShared {
return endpointBuilder_;
}
- // optional int32 error_type = 3;
private int errorType_ ;
/**
* <code>optional int32 error_type = 3;</code>
@@ -2752,7 +2749,6 @@ public final class UserBitShared {
return this;
}
- // optional string message = 4;
private java.lang.Object message_ = "";
/**
* <code>optional string message = 4;</code>
@@ -2766,9 +2762,12 @@ public final class UserBitShared {
public java.lang.String getMessage() {
java.lang.Object ref = message_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- message_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ message_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -2826,7 +2825,6 @@ public final class UserBitShared {
return this;
}
- // optional .exec.shared.ExceptionWrapper exception = 5;
private org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper exception_ = org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder> exceptionBuilder_;
@@ -2935,7 +2933,7 @@ public final class UserBitShared {
if (exceptionBuilder_ == null) {
exceptionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder>(
- exception_,
+ getException(),
getParentForChildren(),
isClean());
exception_ = null;
@@ -2943,7 +2941,6 @@ public final class UserBitShared {
return exceptionBuilder_;
}
- // repeated .exec.shared.ParsingError parsing_error = 6;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.ParsingError> parsingError_ =
java.util.Collections.emptyList();
private void ensureParsingErrorIsMutable() {
@@ -3125,7 +3122,8 @@ public final class UserBitShared {
java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.ParsingError> values) {
if (parsingErrorBuilder_ == null) {
ensureParsingErrorIsMutable();
- super.addAll(values, parsingError_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, parsingError_);
onChanged();
} else {
parsingErrorBuilder_.addAllMessages(values);
@@ -3266,10 +3264,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.DrillPBError)
}
- public interface ExceptionWrapperOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface ExceptionWrapperOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.ExceptionWrapper)
+ com.google.protobuf.MessageOrBuilder {
- // optional string exception_class = 1;
/**
* <code>optional string exception_class = 1;</code>
*/
@@ -3284,7 +3282,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getExceptionClassBytes();
- // optional string message = 2;
/**
* <code>optional string message = 2;</code>
*/
@@ -3299,7 +3296,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getMessageBytes();
- // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
/**
* <code>repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;</code>
*/
@@ -3324,7 +3320,6 @@ public final class UserBitShared {
org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapperOrBuilder getStackTraceOrBuilder(
int index);
- // optional .exec.shared.ExceptionWrapper cause = 4;
/**
* <code>optional .exec.shared.ExceptionWrapper cause = 4;</code>
*/
@@ -3342,8 +3337,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.ExceptionWrapper}
*/
public static final class ExceptionWrapper extends
- com.google.protobuf.GeneratedMessage
- implements ExceptionWrapperOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.ExceptionWrapper)
+ ExceptionWrapperOrBuilder {
// Use ExceptionWrapper.newBuilder() to construct.
private ExceptionWrapper(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -3390,13 +3386,15 @@ public final class UserBitShared {
break;
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- exceptionClass_ = input.readBytes();
+ exceptionClass_ = bs;
break;
}
case 18: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000002;
- message_ = input.readBytes();
+ message_ = bs;
break;
}
case 26: {
@@ -3463,7 +3461,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string exception_class = 1;
public static final int EXCEPTION_CLASS_FIELD_NUMBER = 1;
private java.lang.Object exceptionClass_;
/**
@@ -3506,7 +3503,6 @@ public final class UserBitShared {
}
}
- // optional string message = 2;
public static final int MESSAGE_FIELD_NUMBER = 2;
private java.lang.Object message_;
/**
@@ -3549,7 +3545,6 @@ public final class UserBitShared {
}
}
- // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
public static final int STACK_TRACE_FIELD_NUMBER = 3;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper> stackTrace_;
/**
@@ -3585,7 +3580,6 @@ public final class UserBitShared {
return stackTrace_.get(index);
}
- // optional .exec.shared.ExceptionWrapper cause = 4;
public static final int CAUSE_FIELD_NUMBER = 4;
private org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper cause_;
/**
@@ -3616,7 +3610,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -3744,8 +3739,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.ExceptionWrapper}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.ExceptionWrapper)
+ org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_ExceptionWrapper_descriptor;
@@ -3931,7 +3927,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string exception_class = 1;
private java.lang.Object exceptionClass_ = "";
/**
* <code>optional string exception_class = 1;</code>
@@ -3945,9 +3940,12 @@ public final class UserBitShared {
public java.lang.String getExceptionClass() {
java.lang.Object ref = exceptionClass_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- exceptionClass_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ exceptionClass_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -4005,7 +4003,6 @@ public final class UserBitShared {
return this;
}
- // optional string message = 2;
private java.lang.Object message_ = "";
/**
* <code>optional string message = 2;</code>
@@ -4019,9 +4016,12 @@ public final class UserBitShared {
public java.lang.String getMessage() {
java.lang.Object ref = message_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- message_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ message_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -4079,7 +4079,6 @@ public final class UserBitShared {
return this;
}
- // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper> stackTrace_ =
java.util.Collections.emptyList();
private void ensureStackTraceIsMutable() {
@@ -4221,7 +4220,8 @@ public final class UserBitShared {
java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper> values) {
if (stackTraceBuilder_ == null) {
ensureStackTraceIsMutable();
- super.addAll(values, stackTrace_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, stackTrace_);
onChanged();
} else {
stackTraceBuilder_.addAllMessages(values);
@@ -4319,7 +4319,6 @@ public final class UserBitShared {
return stackTraceBuilder_;
}
- // optional .exec.shared.ExceptionWrapper cause = 4;
private org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper cause_ = org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder> causeBuilder_;
@@ -4428,7 +4427,7 @@ public final class UserBitShared {
if (causeBuilder_ == null) {
causeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder>(
- cause_,
+ getCause(),
getParentForChildren(),
isClean());
cause_ = null;
@@ -4447,10 +4446,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.ExceptionWrapper)
}
- public interface StackTraceElementWrapperOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface StackTraceElementWrapperOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.StackTraceElementWrapper)
+ com.google.protobuf.MessageOrBuilder {
- // optional string class_name = 1;
/**
* <code>optional string class_name = 1;</code>
*/
@@ -4465,7 +4464,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getClassNameBytes();
- // optional string file_name = 2;
/**
* <code>optional string file_name = 2;</code>
*/
@@ -4480,7 +4478,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getFileNameBytes();
- // optional int32 line_number = 3;
/**
* <code>optional int32 line_number = 3;</code>
*/
@@ -4490,7 +4487,6 @@ public final class UserBitShared {
*/
int getLineNumber();
- // optional string method_name = 4;
/**
* <code>optional string method_name = 4;</code>
*/
@@ -4505,7 +4501,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getMethodNameBytes();
- // optional bool is_native_method = 5;
/**
* <code>optional bool is_native_method = 5;</code>
*/
@@ -4519,8 +4514,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.StackTraceElementWrapper}
*/
public static final class StackTraceElementWrapper extends
- com.google.protobuf.GeneratedMessage
- implements StackTraceElementWrapperOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.StackTraceElementWrapper)
+ StackTraceElementWrapperOrBuilder {
// Use StackTraceElementWrapper.newBuilder() to construct.
private StackTraceElementWrapper(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -4567,13 +4563,15 @@ public final class UserBitShared {
break;
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- className_ = input.readBytes();
+ className_ = bs;
break;
}
case 18: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000002;
- fileName_ = input.readBytes();
+ fileName_ = bs;
break;
}
case 24: {
@@ -4582,8 +4580,9 @@ public final class UserBitShared {
break;
}
case 34: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000008;
- methodName_ = input.readBytes();
+ methodName_ = bs;
break;
}
case 40: {
@@ -4631,7 +4630,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string class_name = 1;
public static final int CLASS_NAME_FIELD_NUMBER = 1;
private java.lang.Object className_;
/**
@@ -4674,7 +4672,6 @@ public final class UserBitShared {
}
}
- // optional string file_name = 2;
public static final int FILE_NAME_FIELD_NUMBER = 2;
private java.lang.Object fileName_;
/**
@@ -4717,7 +4714,6 @@ public final class UserBitShared {
}
}
- // optional int32 line_number = 3;
public static final int LINE_NUMBER_FIELD_NUMBER = 3;
private int lineNumber_;
/**
@@ -4733,7 +4729,6 @@ public final class UserBitShared {
return lineNumber_;
}
- // optional string method_name = 4;
public static final int METHOD_NAME_FIELD_NUMBER = 4;
private java.lang.Object methodName_;
/**
@@ -4776,7 +4771,6 @@ public final class UserBitShared {
}
}
- // optional bool is_native_method = 5;
public static final int IS_NATIVE_METHOD_FIELD_NUMBER = 5;
private boolean isNativeMethod_;
/**
@@ -4802,7 +4796,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -4937,8 +4932,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.StackTraceElementWrapper}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapperOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.StackTraceElementWrapper)
+ org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapperOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_StackTraceElementWrapper_descriptor;
@@ -5093,7 +5089,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string class_name = 1;
private java.lang.Object className_ = "";
/**
* <code>optional string class_name = 1;</code>
@@ -5107,9 +5102,12 @@ public final class UserBitShared {
public java.lang.String getClassName() {
java.lang.Object ref = className_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- className_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ className_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -5167,7 +5165,6 @@ public final class UserBitShared {
return this;
}
- // optional string file_name = 2;
private java.lang.Object fileName_ = "";
/**
* <code>optional string file_name = 2;</code>
@@ -5181,9 +5178,12 @@ public final class UserBitShared {
public java.lang.String getFileName() {
java.lang.Object ref = fileName_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- fileName_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ fileName_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -5241,7 +5241,6 @@ public final class UserBitShared {
return this;
}
- // optional int32 line_number = 3;
private int lineNumber_ ;
/**
* <code>optional int32 line_number = 3;</code>
@@ -5274,7 +5273,6 @@ public final class UserBitShared {
return this;
}
- // optional string method_name = 4;
private java.lang.Object methodName_ = "";
/**
* <code>optional string method_name = 4;</code>
@@ -5288,9 +5286,12 @@ public final class UserBitShared {
public java.lang.String getMethodName() {
java.lang.Object ref = methodName_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- methodName_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ methodName_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -5348,7 +5349,6 @@ public final class UserBitShared {
return this;
}
- // optional bool is_native_method = 5;
private boolean isNativeMethod_ ;
/**
* <code>optional bool is_native_method = 5;</code>
@@ -5392,10 +5392,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.StackTraceElementWrapper)
}
- public interface ParsingErrorOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface ParsingErrorOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.ParsingError)
+ com.google.protobuf.MessageOrBuilder {
- // optional int32 start_column = 2;
/**
* <code>optional int32 start_column = 2;</code>
*/
@@ -5405,7 +5405,6 @@ public final class UserBitShared {
*/
int getStartColumn();
- // optional int32 start_row = 3;
/**
* <code>optional int32 start_row = 3;</code>
*/
@@ -5415,7 +5414,6 @@ public final class UserBitShared {
*/
int getStartRow();
- // optional int32 end_column = 4;
/**
* <code>optional int32 end_column = 4;</code>
*/
@@ -5425,7 +5423,6 @@ public final class UserBitShared {
*/
int getEndColumn();
- // optional int32 end_row = 5;
/**
* <code>optional int32 end_row = 5;</code>
*/
@@ -5439,8 +5436,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.ParsingError}
*/
public static final class ParsingError extends
- com.google.protobuf.GeneratedMessage
- implements ParsingErrorOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.ParsingError)
+ ParsingErrorOrBuilder {
// Use ParsingError.newBuilder() to construct.
private ParsingError(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -5546,7 +5544,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional int32 start_column = 2;
public static final int START_COLUMN_FIELD_NUMBER = 2;
private int startColumn_;
/**
@@ -5562,7 +5559,6 @@ public final class UserBitShared {
return startColumn_;
}
- // optional int32 start_row = 3;
public static final int START_ROW_FIELD_NUMBER = 3;
private int startRow_;
/**
@@ -5578,7 +5574,6 @@ public final class UserBitShared {
return startRow_;
}
- // optional int32 end_column = 4;
public static final int END_COLUMN_FIELD_NUMBER = 4;
private int endColumn_;
/**
@@ -5594,7 +5589,6 @@ public final class UserBitShared {
return endColumn_;
}
- // optional int32 end_row = 5;
public static final int END_ROW_FIELD_NUMBER = 5;
private int endRow_;
/**
@@ -5619,7 +5613,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -5747,8 +5742,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.ParsingError}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.ParsingErrorOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.ParsingError)
+ org.apache.drill.exec.proto.UserBitShared.ParsingErrorOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_ParsingError_descriptor;
@@ -5888,7 +5884,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional int32 start_column = 2;
private int startColumn_ ;
/**
* <code>optional int32 start_column = 2;</code>
@@ -5921,7 +5916,6 @@ public final class UserBitShared {
return this;
}
- // optional int32 start_row = 3;
private int startRow_ ;
/**
* <code>optional int32 start_row = 3;</code>
@@ -5954,7 +5948,6 @@ public final class UserBitShared {
return this;
}
- // optional int32 end_column = 4;
private int endColumn_ ;
/**
* <code>optional int32 end_column = 4;</code>
@@ -5987,7 +5980,6 @@ public final class UserBitShared {
return this;
}
- // optional int32 end_row = 5;
private int endRow_ ;
/**
* <code>optional int32 end_row = 5;</code>
@@ -6031,10 +6023,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.ParsingError)
}
- public interface RecordBatchDefOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface RecordBatchDefOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.RecordBatchDef)
+ com.google.protobuf.MessageOrBuilder {
- // optional int32 record_count = 1;
/**
* <code>optional int32 record_count = 1;</code>
*/
@@ -6044,7 +6036,6 @@ public final class UserBitShared {
*/
int getRecordCount();
- // repeated .exec.shared.SerializedField field = 2;
/**
* <code>repeated .exec.shared.SerializedField field = 2;</code>
*/
@@ -6069,7 +6060,6 @@ public final class UserBitShared {
org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder getFieldOrBuilder(
int index);
- // optional bool carries_two_byte_selection_vector = 3;
/**
* <code>optional bool carries_two_byte_selection_vector = 3;</code>
*/
@@ -6083,8 +6073,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.RecordBatchDef}
*/
public static final class RecordBatchDef extends
- com.google.protobuf.GeneratedMessage
- implements RecordBatchDefOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.RecordBatchDef)
+ RecordBatchDefOrBuilder {
// Use RecordBatchDef.newBuilder() to construct.
private RecordBatchDef(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -6191,7 +6182,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional int32 record_count = 1;
public static final int RECORD_COUNT_FIELD_NUMBER = 1;
private int recordCount_;
/**
@@ -6207,7 +6197,6 @@ public final class UserBitShared {
return recordCount_;
}
- // repeated .exec.shared.SerializedField field = 2;
public static final int FIELD_FIELD_NUMBER = 2;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.SerializedField> field_;
/**
@@ -6243,7 +6232,6 @@ public final class UserBitShared {
return field_.get(index);
}
- // optional bool carries_two_byte_selection_vector = 3;
public static final int CARRIES_TWO_BYTE_SELECTION_VECTOR_FIELD_NUMBER = 3;
private boolean carriesTwoByteSelectionVector_;
/**
@@ -6267,7 +6255,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -6388,8 +6377,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.RecordBatchDef}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.RecordBatchDef)
+ org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_RecordBatchDef_descriptor;
@@ -6553,7 +6543,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional int32 record_count = 1;
private int recordCount_ ;
/**
* <code>optional int32 record_count = 1;</code>
@@ -6586,7 +6575,6 @@ public final class UserBitShared {
return this;
}
- // repeated .exec.shared.SerializedField field = 2;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.SerializedField> field_ =
java.util.Collections.emptyList();
private void ensureFieldIsMutable() {
@@ -6728,7 +6716,8 @@ public final class UserBitShared {
java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.SerializedField> values) {
if (fieldBuilder_ == null) {
ensureFieldIsMutable();
- super.addAll(values, field_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, field_);
onChanged();
} else {
fieldBuilder_.addAllMessages(values);
@@ -6826,7 +6815,6 @@ public final class UserBitShared {
return fieldBuilder_;
}
- // optional bool carries_two_byte_selection_vector = 3;
private boolean carriesTwoByteSelectionVector_ ;
/**
* <code>optional bool carries_two_byte_selection_vector = 3;</code>
@@ -6870,10 +6858,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.RecordBatchDef)
}
- public interface NamePartOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface NamePartOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.NamePart)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.shared.NamePart.Type type = 1;
/**
* <code>optional .exec.shared.NamePart.Type type = 1;</code>
*/
@@ -6883,7 +6871,6 @@ public final class UserBitShared {
*/
org.apache.drill.exec.proto.UserBitShared.NamePart.Type getType();
- // optional string name = 2;
/**
* <code>optional string name = 2;</code>
*/
@@ -6898,7 +6885,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getNameBytes();
- // optional .exec.shared.NamePart child = 3;
/**
* <code>optional .exec.shared.NamePart child = 3;</code>
*/
@@ -6916,8 +6902,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.NamePart}
*/
public static final class NamePart extends
- com.google.protobuf.GeneratedMessage
- implements NamePartOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.NamePart)
+ NamePartOrBuilder {
// Use NamePart.newBuilder() to construct.
private NamePart(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -6975,8 +6962,9 @@ public final class UserBitShared {
break;
}
case 18: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000002;
- name_ = input.readBytes();
+ name_ = bs;
break;
}
case 26: {
@@ -7114,7 +7102,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional .exec.shared.NamePart.Type type = 1;
public static final int TYPE_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.UserBitShared.NamePart.Type type_;
/**
@@ -7130,7 +7117,6 @@ public final class UserBitShared {
return type_;
}
- // optional string name = 2;
public static final int NAME_FIELD_NUMBER = 2;
private java.lang.Object name_;
/**
@@ -7173,7 +7159,6 @@ public final class UserBitShared {
}
}
- // optional .exec.shared.NamePart child = 3;
public static final int CHILD_FIELD_NUMBER = 3;
private org.apache.drill.exec.proto.UserBitShared.NamePart child_;
/**
@@ -7203,7 +7188,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -7324,8 +7310,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.NamePart}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.NamePart)
+ org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_NamePart_descriptor;
@@ -7467,7 +7454,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional .exec.shared.NamePart.Type type = 1;
private org.apache.drill.exec.proto.UserBitShared.NamePart.Type type_ = org.apache.drill.exec.proto.UserBitShared.NamePart.Type.NAME;
/**
* <code>optional .exec.shared.NamePart.Type type = 1;</code>
@@ -7503,7 +7489,6 @@ public final class UserBitShared {
return this;
}
- // optional string name = 2;
private java.lang.Object name_ = "";
/**
* <code>optional string name = 2;</code>
@@ -7517,9 +7502,12 @@ public final class UserBitShared {
public java.lang.String getName() {
java.lang.Object ref = name_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- name_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ name_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -7577,7 +7565,6 @@ public final class UserBitShared {
return this;
}
- // optional .exec.shared.NamePart child = 3;
private org.apache.drill.exec.proto.UserBitShared.NamePart child_ = org.apache.drill.exec.proto.UserBitShared.NamePart.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.NamePart, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder, org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder> childBuilder_;
@@ -7686,7 +7673,7 @@ public final class UserBitShared {
if (childBuilder_ == null) {
childBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.NamePart, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder, org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder>(
- child_,
+ getChild(),
getParentForChildren(),
isClean());
child_ = null;
@@ -7705,10 +7692,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.NamePart)
}
- public interface SerializedFieldOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface SerializedFieldOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.SerializedField)
+ com.google.protobuf.MessageOrBuilder {
- // optional .common.MajorType major_type = 1;
/**
* <code>optional .common.MajorType major_type = 1;</code>
*
@@ -7734,7 +7721,6 @@ public final class UserBitShared {
*/
org.apache.drill.common.types.TypeProtos.MajorTypeOrBuilder getMajorTypeOrBuilder();
- // optional .exec.shared.NamePart name_part = 2;
/**
* <code>optional .exec.shared.NamePart name_part = 2;</code>
*/
@@ -7748,7 +7734,6 @@ public final class UserBitShared {
*/
org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder getNamePartOrBuilder();
- // repeated .exec.shared.SerializedField child = 3;
/**
* <code>repeated .exec.shared.SerializedField child = 3;</code>
*
@@ -7793,7 +7778,6 @@ public final class UserBitShared {
org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder getChildOrBuilder(
int index);
- // optional int32 value_count = 4;
/**
* <code>optional int32 value_count = 4;</code>
*/
@@ -7803,7 +7787,6 @@ public final class UserBitShared {
*/
int getValueCount();
- // optional int32 var_byte_length = 5;
/**
* <code>optional int32 var_byte_length = 5;</code>
*/
@@ -7813,7 +7796,6 @@ public final class UserBitShared {
*/
int getVarByteLength();
- // optional int32 group_count = 6;
/**
* <code>optional int32 group_count = 6;</code>
*
@@ -7831,7 +7813,6 @@ public final class UserBitShared {
*/
int getGroupCount();
- // optional int32 buffer_length = 7;
/**
* <code>optional int32 buffer_length = 7;</code>
*/
@@ -7845,8 +7826,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.SerializedField}
*/
public static final class SerializedField extends
- com.google.protobuf.GeneratedMessage
- implements SerializedFieldOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.SerializedField)
+ SerializedFieldOrBuilder {
// Use SerializedField.newBuilder() to construct.
private SerializedField(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -7989,7 +7971,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional .common.MajorType major_type = 1;
public static final int MAJOR_TYPE_FIELD_NUMBER = 1;
private org.apache.drill.common.types.TypeProtos.MajorType majorType_;
/**
@@ -8023,7 +8004,6 @@ public final class UserBitShared {
return majorType_;
}
- // optional .exec.shared.NamePart name_part = 2;
public static final int NAME_PART_FIELD_NUMBER = 2;
private org.apache.drill.exec.proto.UserBitShared.NamePart namePart_;
/**
@@ -8045,7 +8025,6 @@ public final class UserBitShared {
return namePart_;
}
- // repeated .exec.shared.SerializedField child = 3;
public static final int CHILD_FIELD_NUMBER = 3;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.SerializedField> child_;
/**
@@ -8101,7 +8080,6 @@ public final class UserBitShared {
return child_.get(index);
}
- // optional int32 value_count = 4;
public static final int VALUE_COUNT_FIELD_NUMBER = 4;
private int valueCount_;
/**
@@ -8117,7 +8095,6 @@ public final class UserBitShared {
return valueCount_;
}
- // optional int32 var_byte_length = 5;
public static final int VAR_BYTE_LENGTH_FIELD_NUMBER = 5;
private int varByteLength_;
/**
@@ -8133,7 +8110,6 @@ public final class UserBitShared {
return varByteLength_;
}
- // optional int32 group_count = 6;
public static final int GROUP_COUNT_FIELD_NUMBER = 6;
private int groupCount_;
/**
@@ -8157,7 +8133,6 @@ public final class UserBitShared {
return groupCount_;
}
- // optional int32 buffer_length = 7;
public static final int BUFFER_LENGTH_FIELD_NUMBER = 7;
private int bufferLength_;
/**
@@ -8185,7 +8160,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -8334,8 +8310,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.SerializedField}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.SerializedField)
+ org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_SerializedField_descriptor;
@@ -8553,7 +8530,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional .common.MajorType major_type = 1;
private org.apache.drill.common.types.TypeProtos.MajorType majorType_ = org.apache.drill.common.types.TypeProtos.MajorType.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.common.types.TypeProtos.MajorType, org.apache.drill.common.types.TypeProtos.MajorType.Builder, org.apache.drill.common.types.TypeProtos.MajorTypeOrBuilder> majorTypeBuilder_;
@@ -8698,7 +8674,7 @@ public final class UserBitShared {
if (majorTypeBuilder_ == null) {
majorTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.common.types.TypeProtos.MajorType, org.apache.drill.common.types.TypeProtos.MajorType.Builder, org.apache.drill.common.types.TypeProtos.MajorTypeOrBuilder>(
- majorType_,
+ getMajorType(),
getParentForChildren(),
isClean());
majorType_ = null;
@@ -8706,7 +8682,6 @@ public final class UserBitShared {
return majorTypeBuilder_;
}
- // optional .exec.shared.NamePart name_part = 2;
private org.apache.drill.exec.proto.UserBitShared.NamePart namePart_ = org.apache.drill.exec.proto.UserBitShared.NamePart.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.NamePart, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder, org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder> namePartBuilder_;
@@ -8815,7 +8790,7 @@ public final class UserBitShared {
if (namePartBuilder_ == null) {
namePartBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.NamePart, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder, org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder>(
- namePart_,
+ getNamePart(),
getParentForChildren(),
isClean());
namePart_ = null;
@@ -8823,7 +8798,6 @@ public final class UserBitShared {
return namePartBuilder_;
}
- // repeated .exec.shared.SerializedField child = 3;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.SerializedField> child_ =
java.util.Collections.emptyList();
private void ensureChildIsMutable() {
@@ -9005,7 +8979,8 @@ public final class UserBitShared {
java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.SerializedField> values) {
if (childBuilder_ == null) {
ensureChildIsMutable();
- super.addAll(values, child_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, child_);
onChanged();
} else {
childBuilder_.addAllMessages(values);
@@ -9135,7 +9110,6 @@ public final class UserBitShared {
return childBuilder_;
}
- // optional int32 value_count = 4;
private int valueCount_ ;
/**
* <code>optional int32 value_count = 4;</code>
@@ -9168,7 +9142,6 @@ public final class UserBitShared {
return this;
}
- // optional int32 var_byte_length = 5;
private int varByteLength_ ;
/**
* <code>optional int32 var_byte_length = 5;</code>
@@ -9201,7 +9174,6 @@ public final class UserBitShared {
return this;
}
- // optional int32 group_count = 6;
private int groupCount_ ;
/**
* <code>optional int32 group_count = 6;</code>
@@ -9250,7 +9222,6 @@ public final class UserBitShared {
return this;
}
- // optional int32 buffer_length = 7;
private int bufferLength_ ;
/**
* <code>optional int32 buffer_length = 7;</code>
@@ -9294,10 +9265,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.SerializedField)
}
- public interface NodeStatusOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface NodeStatusOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.NodeStatus)
+ com.google.protobuf.MessageOrBuilder {
- // optional int32 node_id = 1;
/**
* <code>optional int32 node_id = 1;</code>
*/
@@ -9307,7 +9278,6 @@ public final class UserBitShared {
*/
int getNodeId();
- // optional int64 memory_footprint = 2;
/**
* <code>optional int64 memory_footprint = 2;</code>
*/
@@ -9321,8 +9291,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.NodeStatus}
*/
public static final class NodeStatus extends
- com.google.protobuf.GeneratedMessage
- implements NodeStatusOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.NodeStatus)
+ NodeStatusOrBuilder {
// Use NodeStatus.newBuilder() to construct.
private NodeStatus(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -9418,7 +9389,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional int32 node_id = 1;
public static final int NODE_ID_FIELD_NUMBER = 1;
private int nodeId_;
/**
@@ -9434,7 +9404,6 @@ public final class UserBitShared {
return nodeId_;
}
- // optional int64 memory_footprint = 2;
public static final int MEMORY_FOOTPRINT_FIELD_NUMBER = 2;
private long memoryFootprint_;
/**
@@ -9457,7 +9426,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -9571,8 +9541,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.NodeStatus}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.NodeStatusOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.NodeStatus)
+ org.apache.drill.exec.proto.UserBitShared.NodeStatusOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_NodeStatus_descriptor;
@@ -9694,7 +9665,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional int32 node_id = 1;
private int nodeId_ ;
/**
* <code>optional int32 node_id = 1;</code>
@@ -9727,7 +9697,6 @@ public final class UserBitShared {
return this;
}
- // optional int64 memory_footprint = 2;
private long memoryFootprint_ ;
/**
* <code>optional int64 memory_footprint = 2;</code>
@@ -9771,10 +9740,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.NodeStatus)
}
- public interface QueryResultOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface QueryResultOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.QueryResult)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.shared.QueryResult.QueryState query_state = 1;
/**
* <code>optional .exec.shared.QueryResult.QueryState query_state = 1;</code>
*/
@@ -9784,7 +9753,6 @@ public final class UserBitShared {
*/
org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState getQueryState();
- // optional .exec.shared.QueryId query_id = 2;
/**
* <code>optional .exec.shared.QueryId query_id = 2;</code>
*/
@@ -9798,7 +9766,6 @@ public final class UserBitShared {
*/
org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder getQueryIdOrBuilder();
- // optional bool is_last_chunk = 3;
/**
* <code>optional bool is_last_chunk = 3;</code>
*/
@@ -9808,7 +9775,6 @@ public final class UserBitShared {
*/
boolean getIsLastChunk();
- // optional int32 row_count = 4;
/**
* <code>optional int32 row_count = 4;</code>
*/
@@ -9818,7 +9784,6 @@ public final class UserBitShared {
*/
int getRowCount();
- // optional int64 records_scan = 5;
/**
* <code>optional int64 records_scan = 5;</code>
*/
@@ -9828,7 +9793,6 @@ public final class UserBitShared {
*/
long getRecordsScan();
- // optional int64 records_error = 6;
/**
* <code>optional int64 records_error = 6;</code>
*/
@@ -9838,7 +9802,6 @@ public final class UserBitShared {
*/
long getRecordsError();
- // optional int64 submission_time = 7;
/**
* <code>optional int64 submission_time = 7;</code>
*/
@@ -9848,7 +9811,6 @@ public final class UserBitShared {
*/
long getSubmissionTime();
- // repeated .exec.shared.NodeStatus node_status = 8;
/**
* <code>repeated .exec.shared.NodeStatus node_status = 8;</code>
*/
@@ -9873,7 +9835,6 @@ public final class UserBitShared {
org.apache.drill.exec.proto.UserBitShared.NodeStatusOrBuilder getNodeStatusOrBuilder(
int index);
- // repeated .exec.shared.DrillPBError error = 9;
/**
* <code>repeated .exec.shared.DrillPBError error = 9;</code>
*/
@@ -9898,7 +9859,6 @@ public final class UserBitShared {
org.apache.drill.exec.proto.UserBitShared.DrillPBErrorOrBuilder getErrorOrBuilder(
int index);
- // optional .exec.shared.RecordBatchDef def = 10;
/**
* <code>optional .exec.shared.RecordBatchDef def = 10;</code>
*/
@@ -9912,7 +9872,6 @@ public final class UserBitShared {
*/
org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder getDefOrBuilder();
- // optional bool schema_changed = 11;
/**
* <code>optional bool schema_changed = 11;</code>
*/
@@ -9926,8 +9885,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.QueryResult}
*/
public static final class QueryResult extends
- com.google.protobuf.GeneratedMessage
- implements QueryResultOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.QueryResult)
+ QueryResultOrBuilder {
// Use QueryResult.newBuilder() to construct.
private QueryResult(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -10116,10 +10076,18 @@ public final class UserBitShared {
RUNNING(1, 1),
/**
* <code>COMPLETED = 2;</code>
+ *
+ * <pre>
+ * query has completed successfully
+ * </pre>
*/
COMPLETED(2, 2),
/**
* <code>CANCELED = 3;</code>
+ *
+ * <pre>
+ * query has been cancelled, and all cleanup is complete
+ * </pre>
*/
CANCELED(3, 3),
/**
@@ -10127,9 +10095,13 @@ public final class UserBitShared {
*/
FAILED(4, 4),
/**
- * <code>UNKNOWN_QUERY = 5;</code>
+ * <code>CANCELLATION_REQUESTED = 5;</code>
+ *
+ * <pre>
+ * cancellation has been requested, and is being processed
+ * </pre>
*/
- UNKNOWN_QUERY(5, 5),
+ CANCELLATION_REQUESTED(5, 5),
;
/**
@@ -10142,10 +10114,18 @@ public final class UserBitShared {
public static final int RUNNING_VALUE = 1;
/**
* <code>COMPLETED = 2;</code>
+ *
+ * <pre>
+ * query has completed successfully
+ * </pre>
*/
public static final int COMPLETED_VALUE = 2;
/**
* <code>CANCELED = 3;</code>
+ *
+ * <pre>
+ * query has been cancelled, and all cleanup is complete
+ * </pre>
*/
public static final int CANCELED_VALUE = 3;
/**
@@ -10153,9 +10133,13 @@ public final class UserBitShared {
*/
public static final int FAILED_VALUE = 4;
/**
- * <code>UNKNOWN_QUERY = 5;</code>
+ * <code>CANCELLATION_REQUESTED = 5;</code>
+ *
+ * <pre>
+ * cancellation has been requested, and is being processed
+ * </pre>
*/
- public static final int UNKNOWN_QUERY_VALUE = 5;
+ public static final int CANCELLATION_REQUESTED_VALUE = 5;
public final int getNumber() { return value; }
@@ -10167,7 +10151,7 @@ public final class UserBitShared {
case 2: return COMPLETED;
case 3: return CANCELED;
case 4: return FAILED;
- case 5: return UNKNOWN_QUERY;
+ case 5: return CANCELLATION_REQUESTED;
default: return null;
}
}
@@ -10220,7 +10204,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional .exec.shared.QueryResult.QueryState query_state = 1;
public static final int QUERY_STATE_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState queryState_;
/**
@@ -10236,7 +10219,6 @@ public final class UserBitShared {
return queryState_;
}
- // optional .exec.shared.QueryId query_id = 2;
public static final int QUERY_ID_FIELD_NUMBER = 2;
private org.apache.drill.exec.proto.UserBitShared.QueryId queryId_;
/**
@@ -10258,7 +10240,6 @@ public final class UserBitShared {
return queryId_;
}
- // optional bool is_last_chunk = 3;
public static final int IS_LAST_CHUNK_FIELD_NUMBER = 3;
private boolean isLastChunk_;
/**
@@ -10274,7 +10255,6 @@ public final class UserBitShared {
return isLastChunk_;
}
- // optional int32 row_count = 4;
public static final int ROW_COUNT_FIELD_NUMBER = 4;
private int rowCount_;
/**
@@ -10290,7 +10270,6 @@ public final class UserBitShared {
return rowCount_;
}
- // optional int64 records_scan = 5;
public static final int RECORDS_SCAN_FIELD_NUMBER = 5;
private long recordsScan_;
/**
@@ -10306,7 +10285,6 @@ public final class UserBitShared {
return recordsScan_;
}
- // optional int64 records_error = 6;
public static final int RECORDS_ERROR_FIELD_NUMBER = 6;
private long recordsError_;
/**
@@ -10322,7 +10300,6 @@ public final class UserBitShared {
return recordsError_;
}
- // optional int64 submission_time = 7;
public static final int SUBMISSION_TIME_FIELD_NUMBER = 7;
private long submissionTime_;
/**
@@ -10338,7 +10315,6 @@ public final class UserBitShared {
return submissionTime_;
}
- // repeated .exec.shared.NodeStatus node_status = 8;
public static final int NODE_STATUS_FIELD_NUMBER = 8;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.NodeStatus> nodeStatus_;
/**
@@ -10374,7 +10350,6 @@ public final class UserBitShared {
return nodeStatus_.get(index);
}
- // repeated .exec.shared.DrillPBError error = 9;
public static final int ERROR_FIELD_NUMBER = 9;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.DrillPBError> error_;
/**
@@ -10410,7 +10385,6 @@ public final class UserBitShared {
return error_.get(index);
}
- // optional .exec.shared.RecordBatchDef def = 10;
public static final int DEF_FIELD_NUMBER = 10;
private org.apache.drill.exec.proto.UserBitShared.RecordBatchDef def_;
/**
@@ -10432,7 +10406,6 @@ public final class UserBitShared {
return def_;
}
- // optional bool schema_changed = 11;
public static final int SCHEMA_CHANGED_FIELD_NUMBER = 11;
private boolean schemaChanged_;
/**
@@ -10464,7 +10437,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -10641,8 +10615,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.QueryResult}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.QueryResultOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.QueryResult)
+ org.apache.drill.exec.proto.UserBitShared.QueryResultOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_QueryResult_descriptor;
@@ -10929,7 +10904,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional .exec.shared.QueryResult.QueryState query_state = 1;
private org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState queryState_ = org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState.PENDING;
/**
* <code>optional .exec.shared.QueryResult.QueryState query_state = 1;</code>
@@ -10965,7 +10939,6 @@ public final class UserBitShared {
return this;
}
- // optional .exec.shared.QueryId query_id = 2;
private org.apache.drill.exec.proto.UserBitShared.QueryId queryId_ = org.apache.drill.exec.proto.UserBitShared.QueryId.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.QueryId, org.apache.drill.exec.proto.UserBitShared.QueryId.Builder, org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder> queryIdBuilder_;
@@ -11074,7 +11047,7 @@ public final class UserBitShared {
if (queryIdBuilder_ == null) {
queryIdBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.QueryId, org.apache.drill.exec.proto.UserBitShared.QueryId.Builder, org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder>(
- queryId_,
+ getQueryId(),
getParentForChildren(),
isClean());
queryId_ = null;
@@ -11082,7 +11055,6 @@ public final class UserBitShared {
return queryIdBuilder_;
}
- // optional bool is_last_chunk = 3;
private boolean isLastChunk_ ;
/**
* <code>optional bool is_last_chunk = 3;</code>
@@ -11115,7 +11087,6 @@ public final class UserBitShared {
return this;
}
- // optional int32 row_count = 4;
private int rowCount_ ;
/**
* <code>optional int32 row_count = 4;</code>
@@ -11148,7 +11119,6 @@ public final class UserBitShared {
return this;
}
- // optional int64 records_scan = 5;
private long recordsScan_ ;
/**
* <code>optional int64 records_scan = 5;</code>
@@ -11181,7 +11151,6 @@ public final class UserBitShared {
return this;
}
- // optional int64 records_error = 6;
private long recordsError_ ;
/**
* <code>optional int64 records_error = 6;</code>
@@ -11214,7 +11183,6 @@ public final class UserBitShared {
return this;
}
- // optional int64 submission_time = 7;
private long submissionTime_ ;
/**
* <code>optional int64 submission_time = 7;</code>
@@ -11247,7 +11215,6 @@ public final class UserBitShared {
return this;
}
- // repeated .exec.shared.NodeStatus node_status = 8;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.NodeStatus> nodeStatus_ =
java.util.Collections.emptyList();
private void ensureNodeStatusIsMutable() {
@@ -11389,7 +11356,8 @@ public final class UserBitShared {
java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.NodeStatus> values) {
if (nodeStatusBuilder_ == null) {
ensureNodeStatusIsMutable();
- super.addAll(values, nodeStatus_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, nodeStatus_);
onChanged();
} else {
nodeStatusBuilder_.addAllMessages(values);
@@ -11487,7 +11455,6 @@ public final class UserBitShared {
return nodeStatusBuilder_;
}
- // repeated .exec.shared.DrillPBError error = 9;
private java.util.List<org.apache.drill.exec.proto.UserBitShared.DrillPBError> error_ =
java.util.Collections.emptyList();
private void ensureErrorIsMutable() {
@@ -11629,7 +11596,8 @@ public final class UserBitShared {
java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.DrillPBError> values) {
if (errorBuilder_ == null) {
ensureErrorIsMutable();
- super.addAll(values, error_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, error_);
onChanged();
} else {
errorBuilder_.addAllMessages(values);
@@ -11727,7 +11695,6 @@ public final class UserBitShared {
return errorBuilder_;
}
- // optional .exec.shared.RecordBatchDef def = 10;
private org.apache.drill.exec.proto.UserBitShared.RecordBatchDef def_ = org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.RecordBatchDef, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder, org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder> defBuilder_;
@@ -11836,7 +11803,7 @@ public final class UserBitShared {
if (defBuilder_ == null) {
defBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.RecordBatchDef, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder, org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder>(
- def_,
+ getDef(),
getParentForChildren(),
isClean());
def_ = null;
@@ -11844,7 +11811,6 @@ public final class UserBitShared {
return defBuilder_;
}
- // optional bool schema_changed = 11;
private boolean schemaChanged_ ;
/**
* <code>optional bool schema_changed = 11;</code>
@@ -11888,10 +11854,10 @@ public final class UserBitShared {
// @@protoc_insertion_point(class_scope:exec.shared.QueryResult)
}
- public interface QueryInfoOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface QueryInfoOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.shared.QueryInfo)
+ com.google.protobuf.MessageOrBuilder {
- // optional string query = 1;
/**
* <code>optional string query = 1;</code>
*/
@@ -11906,7 +11872,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getQueryBytes();
- // optional int64 start = 2;
/**
* <code>optional int64 start = 2;</code>
*/
@@ -11916,7 +11881,6 @@ public final class UserBitShared {
*/
long getStart();
- // optional .exec.shared.QueryResult.QueryState state = 3;
/**
* <code>optional .exec.shared.QueryResult.QueryState state = 3;</code>
*/
@@ -11926,7 +11890,6 @@ public final class UserBitShared {
*/
org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState getState();
- // optional string user = 4;
/**
* <code>optional string user = 4;</code>
*/
@@ -11941,7 +11904,6 @@ public final class UserBitShared {
com.google.protobuf.ByteString
getUserBytes();
- // optional .exec.DrillbitEndpoint foreman = 5;
/**
* <code>optional .exec.DrillbitEndpoint foreman = 5;</code>
*/
@@ -11959,8 +11921,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.QueryInfo}
*/
public static final class QueryInfo extends
- com.google.protobuf.GeneratedMessage
- implements QueryInfoOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.shared.QueryInfo)
+ QueryInfoOrBuilder {
// Use QueryInfo.newBuilder() to construct.
private QueryInfo(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -12007,8 +11970,9 @@ public final class UserBitShared {
break;
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- query_ = input.readBytes();
+ query_ = bs;
break;
}
case 16: {
@@ -12028,8 +11992,9 @@ public final class UserBitShared {
break;
}
case 34: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000008;
- user_ = input.readBytes();
+ user_ = bs;
break;
}
case 42: {
@@ -12085,7 +12050,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string query = 1;
public static final int QUERY_FIELD_NUMBER = 1;
private java.lang.Object query_;
/**
@@ -12128,7 +12092,6 @@ public final class UserBitShared {
}
}
- // optional int64 start = 2;
public static final int START_FIELD_NUMBER = 2;
private long start_;
/**
@@ -12144,7 +12107,6 @@ public final class UserBitShared {
return start_;
}
- // optional .exec.shared.QueryResult.QueryState state = 3;
public static final int STATE_FIELD_NUMBER = 3;
private org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState state_;
/**
@@ -12160,7 +12122,6 @@ public final class UserBitShared {
return state_;
}
- // optional string user = 4;
public static final int USER_FIELD_NUMBER = 4;
private java.lang.Object user_;
/**
@@ -12203,7 +12164,6 @@ public final class UserBitShared {
}
}
- // optional .exec.DrillbitEndpoint foreman = 5;
public static final int FOREMAN_FIELD_NUMBER = 5;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint foreman_;
/**
@@ -12235,7 +12195,8 @@ public final class UserBitShared {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -12370,8 +12331,9 @@ public final class UserBitShared {
* Protobuf type {@code exec.shared.QueryInfo}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserBitShared.QueryInfoOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.shared.QueryInfo)
+ org.apache.drill.exec.proto.UserBitShared.QueryInfoOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_QueryInfo_descriptor;
@@ -12533,7 +12495,6 @@ public final class UserBitShared {
}
private int bitField0_;
- // optional string query = 1;
private java.lang.Object query_ = "";
/**
* <code>optional string query = 1;</code>
@@ -12547,9 +12508,12 @@ public final class UserBitShared {
public java.lang.String getQuery() {
java.lang.Object ref = query_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- query_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ query_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -12607,7 +12571,6 @@ public final class UserBitShared {
return this;
}
- // optional int64 start = 2;
private long start_ ;
/**
* <code>optional int64 start = 2;</code>
@@ -12640,7 +12603,6 @@ public final class UserBitShared {
return this;
}
- // optional .exec.shared.QueryResult.QueryState state = 3;
private org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState state_ = org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState.PENDING;
/**
* <code>optional .exec.shared.QueryResult.QueryState state = 3;</code>
@@ -12676,7 +12638,6 @@ public final class UserBitShared {
return this;
}
- // optional string user = 4;
private java.lang.Object user_ = "";
/**
* <code>optional string user = 4;</code>
@@ -12690,9 +12651,12 @@ public final class UserBitShared {
public java.lang.String getUser() {
java.lang.Object ref = user_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- user_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ user_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -12750,7 +12714,6 @@ public final class UserBitShared {
return this;
}
- // optional .exec.DrillbitEndpoint foreman = 5;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint foreman_ = org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder> foremanBuilder_;
@@ -12859,7 +12822,7 @@ public final class UserBitShared {
if (foremanBuilder_ == null) {
foremanBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder>(
- foreman_,
+ getForeman(),
getParentForChildren(),
isClean());
foreman_ = null;
@@ -12878,10 +12841,10 @@ public final class UserBitShared {
// @@protoc_insertion_p
<TRUNCATED>