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:11 UTC
[1/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.
Repository: drill
Updated Branches:
refs/heads/master ff9882be7 -> 2da618cd4
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java
index 048bd20..330e774 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java
@@ -280,10 +280,10 @@ public final class UserProtos {
// @@protoc_insertion_point(enum_scope:exec.user.QueryResultsMode)
}
- public interface PropertyOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface PropertyOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.user.Property)
+ com.google.protobuf.MessageOrBuilder {
- // required string key = 1;
/**
* <code>required string key = 1;</code>
*/
@@ -298,7 +298,6 @@ public final class UserProtos {
com.google.protobuf.ByteString
getKeyBytes();
- // required string value = 2;
/**
* <code>required string value = 2;</code>
*/
@@ -317,8 +316,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.Property}
*/
public static final class Property extends
- com.google.protobuf.GeneratedMessage
- implements PropertyOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.user.Property)
+ PropertyOrBuilder {
// Use Property.newBuilder() to construct.
private Property(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -365,13 +365,15 @@ public final class UserProtos {
break;
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- key_ = input.readBytes();
+ key_ = bs;
break;
}
case 18: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000002;
- value_ = input.readBytes();
+ value_ = bs;
break;
}
}
@@ -414,7 +416,6 @@ public final class UserProtos {
}
private int bitField0_;
- // required string key = 1;
public static final int KEY_FIELD_NUMBER = 1;
private java.lang.Object key_;
/**
@@ -457,7 +458,6 @@ public final class UserProtos {
}
}
- // required string value = 2;
public static final int VALUE_FIELD_NUMBER = 2;
private java.lang.Object value_;
/**
@@ -507,7 +507,8 @@ public final class UserProtos {
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;
if (!hasKey()) {
memoizedIsInitialized = 0;
@@ -629,8 +630,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.Property}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserProtos.PropertyOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.user.Property)
+ org.apache.drill.exec.proto.UserProtos.PropertyOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserProtos.internal_static_exec_user_Property_descriptor;
@@ -764,7 +766,6 @@ public final class UserProtos {
}
private int bitField0_;
- // required string key = 1;
private java.lang.Object key_ = "";
/**
* <code>required string key = 1;</code>
@@ -778,9 +779,12 @@ public final class UserProtos {
public java.lang.String getKey() {
java.lang.Object ref = key_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- key_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ key_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -838,7 +842,6 @@ public final class UserProtos {
return this;
}
- // required string value = 2;
private java.lang.Object value_ = "";
/**
* <code>required string value = 2;</code>
@@ -852,9 +855,12 @@ public final class UserProtos {
public java.lang.String getValue() {
java.lang.Object ref = value_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- value_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ value_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -923,10 +929,10 @@ public final class UserProtos {
// @@protoc_insertion_point(class_scope:exec.user.Property)
}
- public interface UserPropertiesOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface UserPropertiesOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.user.UserProperties)
+ com.google.protobuf.MessageOrBuilder {
- // repeated .exec.user.Property properties = 1;
/**
* <code>repeated .exec.user.Property properties = 1;</code>
*/
@@ -955,8 +961,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.UserProperties}
*/
public static final class UserProperties extends
- com.google.protobuf.GeneratedMessage
- implements UserPropertiesOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.user.UserProperties)
+ UserPropertiesOrBuilder {
// Use UserProperties.newBuilder() to construct.
private UserProperties(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1052,7 +1059,6 @@ public final class UserProtos {
return PARSER;
}
- // repeated .exec.user.Property properties = 1;
public static final int PROPERTIES_FIELD_NUMBER = 1;
private java.util.List<org.apache.drill.exec.proto.UserProtos.Property> properties_;
/**
@@ -1094,7 +1100,8 @@ public final class UserProtos {
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;
for (int i = 0; i < getPropertiesCount(); i++) {
if (!getProperties(i).isInitialized()) {
@@ -1207,8 +1214,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.UserProperties}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserProtos.UserPropertiesOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.user.UserProperties)
+ org.apache.drill.exec.proto.UserProtos.UserPropertiesOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserProtos.internal_static_exec_user_UserProperties_descriptor;
@@ -1358,7 +1366,6 @@ public final class UserProtos {
}
private int bitField0_;
- // repeated .exec.user.Property properties = 1;
private java.util.List<org.apache.drill.exec.proto.UserProtos.Property> properties_ =
java.util.Collections.emptyList();
private void ensurePropertiesIsMutable() {
@@ -1500,7 +1507,8 @@ public final class UserProtos {
java.lang.Iterable<? extends org.apache.drill.exec.proto.UserProtos.Property> values) {
if (propertiesBuilder_ == null) {
ensurePropertiesIsMutable();
- super.addAll(values, properties_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, properties_);
onChanged();
} else {
propertiesBuilder_.addAllMessages(values);
@@ -1609,10 +1617,10 @@ public final class UserProtos {
// @@protoc_insertion_point(class_scope:exec.user.UserProperties)
}
- public interface UserToBitHandshakeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface UserToBitHandshakeOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.user.UserToBitHandshake)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.shared.RpcChannel channel = 1 [default = USER];
/**
* <code>optional .exec.shared.RpcChannel channel = 1 [default = USER];</code>
*/
@@ -1622,7 +1630,6 @@ public final class UserProtos {
*/
org.apache.drill.exec.proto.UserBitShared.RpcChannel getChannel();
- // optional bool support_listening = 2;
/**
* <code>optional bool support_listening = 2;</code>
*/
@@ -1632,7 +1639,6 @@ public final class UserProtos {
*/
boolean getSupportListening();
- // optional int32 rpc_version = 3;
/**
* <code>optional int32 rpc_version = 3;</code>
*/
@@ -1642,7 +1648,6 @@ public final class UserProtos {
*/
int getRpcVersion();
- // optional .exec.shared.UserCredentials credentials = 4;
/**
* <code>optional .exec.shared.UserCredentials credentials = 4;</code>
*/
@@ -1656,7 +1661,6 @@ public final class UserProtos {
*/
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder getCredentialsOrBuilder();
- // optional .exec.user.UserProperties properties = 5;
/**
* <code>optional .exec.user.UserProperties properties = 5;</code>
*/
@@ -1670,7 +1674,6 @@ public final class UserProtos {
*/
org.apache.drill.exec.proto.UserProtos.UserPropertiesOrBuilder getPropertiesOrBuilder();
- // optional bool support_complex_types = 6 [default = false];
/**
* <code>optional bool support_complex_types = 6 [default = false];</code>
*/
@@ -1684,8 +1687,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.UserToBitHandshake}
*/
public static final class UserToBitHandshake extends
- com.google.protobuf.GeneratedMessage
- implements UserToBitHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.user.UserToBitHandshake)
+ UserToBitHandshakeOrBuilder {
// Use UserToBitHandshake.newBuilder() to construct.
private UserToBitHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1823,7 +1827,6 @@ public final class UserProtos {
}
private int bitField0_;
- // optional .exec.shared.RpcChannel channel = 1 [default = USER];
public static final int CHANNEL_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_;
/**
@@ -1839,7 +1842,6 @@ public final class UserProtos {
return channel_;
}
- // optional bool support_listening = 2;
public static final int SUPPORT_LISTENING_FIELD_NUMBER = 2;
private boolean supportListening_;
/**
@@ -1855,7 +1857,6 @@ public final class UserProtos {
return supportListening_;
}
- // optional int32 rpc_version = 3;
public static final int RPC_VERSION_FIELD_NUMBER = 3;
private int rpcVersion_;
/**
@@ -1871,7 +1872,6 @@ public final class UserProtos {
return rpcVersion_;
}
- // optional .exec.shared.UserCredentials credentials = 4;
public static final int CREDENTIALS_FIELD_NUMBER = 4;
private org.apache.drill.exec.proto.UserBitShared.UserCredentials credentials_;
/**
@@ -1893,7 +1893,6 @@ public final class UserProtos {
return credentials_;
}
- // optional .exec.user.UserProperties properties = 5;
public static final int PROPERTIES_FIELD_NUMBER = 5;
private org.apache.drill.exec.proto.UserProtos.UserProperties properties_;
/**
@@ -1915,7 +1914,6 @@ public final class UserProtos {
return properties_;
}
- // optional bool support_complex_types = 6 [default = false];
public static final int SUPPORT_COMPLEX_TYPES_FIELD_NUMBER = 6;
private boolean supportComplexTypes_;
/**
@@ -1942,7 +1940,8 @@ public final class UserProtos {
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;
if (hasProperties()) {
if (!getProperties().isInitialized()) {
@@ -2090,8 +2089,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.UserToBitHandshake}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserProtos.UserToBitHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.user.UserToBitHandshake)
+ org.apache.drill.exec.proto.UserProtos.UserToBitHandshakeOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserProtos.internal_static_exec_user_UserToBitHandshake_descriptor;
@@ -2273,7 +2273,6 @@ public final class UserProtos {
}
private int bitField0_;
- // optional .exec.shared.RpcChannel channel = 1 [default = USER];
private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_ = org.apache.drill.exec.proto.UserBitShared.RpcChannel.USER;
/**
* <code>optional .exec.shared.RpcChannel channel = 1 [default = USER];</code>
@@ -2309,7 +2308,6 @@ public final class UserProtos {
return this;
}
- // optional bool support_listening = 2;
private boolean supportListening_ ;
/**
* <code>optional bool support_listening = 2;</code>
@@ -2342,7 +2340,6 @@ public final class UserProtos {
return this;
}
- // optional int32 rpc_version = 3;
private int rpcVersion_ ;
/**
* <code>optional int32 rpc_version = 3;</code>
@@ -2375,7 +2372,6 @@ public final class UserProtos {
return this;
}
- // optional .exec.shared.UserCredentials credentials = 4;
private org.apache.drill.exec.proto.UserBitShared.UserCredentials credentials_ = org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.UserCredentials, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder> credentialsBuilder_;
@@ -2484,7 +2480,7 @@ public final class UserProtos {
if (credentialsBuilder_ == null) {
credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.UserCredentials, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder>(
- credentials_,
+ getCredentials(),
getParentForChildren(),
isClean());
credentials_ = null;
@@ -2492,7 +2488,6 @@ public final class UserProtos {
return credentialsBuilder_;
}
- // optional .exec.user.UserProperties properties = 5;
private org.apache.drill.exec.proto.UserProtos.UserProperties properties_ = org.apache.drill.exec.proto.UserProtos.UserProperties.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserProtos.UserProperties, org.apache.drill.exec.proto.UserProtos.UserProperties.Builder, org.apache.drill.exec.proto.UserProtos.UserPropertiesOrBuilder> propertiesBuilder_;
@@ -2601,7 +2596,7 @@ public final class UserProtos {
if (propertiesBuilder_ == null) {
propertiesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserProtos.UserProperties, org.apache.drill.exec.proto.UserProtos.UserProperties.Builder, org.apache.drill.exec.proto.UserProtos.UserPropertiesOrBuilder>(
- properties_,
+ getProperties(),
getParentForChildren(),
isClean());
properties_ = null;
@@ -2609,7 +2604,6 @@ public final class UserProtos {
return propertiesBuilder_;
}
- // optional bool support_complex_types = 6 [default = false];
private boolean supportComplexTypes_ ;
/**
* <code>optional bool support_complex_types = 6 [default = false];</code>
@@ -2653,10 +2647,10 @@ public final class UserProtos {
// @@protoc_insertion_point(class_scope:exec.user.UserToBitHandshake)
}
- public interface RequestResultsOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface RequestResultsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.user.RequestResults)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.shared.QueryId query_id = 1;
/**
* <code>optional .exec.shared.QueryId query_id = 1;</code>
*/
@@ -2670,7 +2664,6 @@ public final class UserProtos {
*/
org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder getQueryIdOrBuilder();
- // optional int32 maximum_responses = 2;
/**
* <code>optional int32 maximum_responses = 2;</code>
*/
@@ -2684,8 +2677,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.RequestResults}
*/
public static final class RequestResults extends
- com.google.protobuf.GeneratedMessage
- implements RequestResultsOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.user.RequestResults)
+ RequestResultsOrBuilder {
// Use RequestResults.newBuilder() to construct.
private RequestResults(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -2789,7 +2783,6 @@ public final class UserProtos {
}
private int bitField0_;
- // optional .exec.shared.QueryId query_id = 1;
public static final int QUERY_ID_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.UserBitShared.QueryId queryId_;
/**
@@ -2811,7 +2804,6 @@ public final class UserProtos {
return queryId_;
}
- // optional int32 maximum_responses = 2;
public static final int MAXIMUM_RESPONSES_FIELD_NUMBER = 2;
private int maximumResponses_;
/**
@@ -2834,7 +2826,8 @@ public final class UserProtos {
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;
@@ -2948,8 +2941,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.RequestResults}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserProtos.RequestResultsOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.user.RequestResults)
+ org.apache.drill.exec.proto.UserProtos.RequestResultsOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserProtos.internal_static_exec_user_RequestResults_descriptor;
@@ -3080,7 +3074,6 @@ public final class UserProtos {
}
private int bitField0_;
- // optional .exec.shared.QueryId query_id = 1;
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_;
@@ -3189,7 +3182,7 @@ public final class UserProtos {
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;
@@ -3197,7 +3190,6 @@ public final class UserProtos {
return queryIdBuilder_;
}
- // optional int32 maximum_responses = 2;
private int maximumResponses_ ;
/**
* <code>optional int32 maximum_responses = 2;</code>
@@ -3241,10 +3233,10 @@ public final class UserProtos {
// @@protoc_insertion_point(class_scope:exec.user.RequestResults)
}
- public interface RunQueryOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface RunQueryOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.user.RunQuery)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.user.QueryResultsMode results_mode = 1;
/**
* <code>optional .exec.user.QueryResultsMode results_mode = 1;</code>
*/
@@ -3254,7 +3246,6 @@ public final class UserProtos {
*/
org.apache.drill.exec.proto.UserProtos.QueryResultsMode getResultsMode();
- // optional .exec.shared.QueryType type = 2;
/**
* <code>optional .exec.shared.QueryType type = 2;</code>
*/
@@ -3264,7 +3255,6 @@ public final class UserProtos {
*/
org.apache.drill.exec.proto.UserBitShared.QueryType getType();
- // optional string plan = 3;
/**
* <code>optional string plan = 3;</code>
*/
@@ -3283,8 +3273,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.RunQuery}
*/
public static final class RunQuery extends
- com.google.protobuf.GeneratedMessage
- implements RunQueryOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.user.RunQuery)
+ RunQueryOrBuilder {
// Use RunQuery.newBuilder() to construct.
private RunQuery(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -3353,8 +3344,9 @@ public final class UserProtos {
break;
}
case 26: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000004;
- plan_ = input.readBytes();
+ plan_ = bs;
break;
}
}
@@ -3397,7 +3389,6 @@ public final class UserProtos {
}
private int bitField0_;
- // optional .exec.user.QueryResultsMode results_mode = 1;
public static final int RESULTS_MODE_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.UserProtos.QueryResultsMode resultsMode_;
/**
@@ -3413,7 +3404,6 @@ public final class UserProtos {
return resultsMode_;
}
- // optional .exec.shared.QueryType type = 2;
public static final int TYPE_FIELD_NUMBER = 2;
private org.apache.drill.exec.proto.UserBitShared.QueryType type_;
/**
@@ -3429,7 +3419,6 @@ public final class UserProtos {
return type_;
}
- // optional string plan = 3;
public static final int PLAN_FIELD_NUMBER = 3;
private java.lang.Object plan_;
/**
@@ -3480,7 +3469,8 @@ public final class UserProtos {
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;
@@ -3601,8 +3591,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.RunQuery}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserProtos.RunQueryOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.user.RunQuery)
+ org.apache.drill.exec.proto.UserProtos.RunQueryOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserProtos.internal_static_exec_user_RunQuery_descriptor;
@@ -3735,7 +3726,6 @@ public final class UserProtos {
}
private int bitField0_;
- // optional .exec.user.QueryResultsMode results_mode = 1;
private org.apache.drill.exec.proto.UserProtos.QueryResultsMode resultsMode_ = org.apache.drill.exec.proto.UserProtos.QueryResultsMode.STREAM_FULL;
/**
* <code>optional .exec.user.QueryResultsMode results_mode = 1;</code>
@@ -3771,7 +3761,6 @@ public final class UserProtos {
return this;
}
- // optional .exec.shared.QueryType type = 2;
private org.apache.drill.exec.proto.UserBitShared.QueryType type_ = org.apache.drill.exec.proto.UserBitShared.QueryType.SQL;
/**
* <code>optional .exec.shared.QueryType type = 2;</code>
@@ -3807,7 +3796,6 @@ public final class UserProtos {
return this;
}
- // optional string plan = 3;
private java.lang.Object plan_ = "";
/**
* <code>optional string plan = 3;</code>
@@ -3821,9 +3809,12 @@ public final class UserProtos {
public java.lang.String getPlan() {
java.lang.Object ref = plan_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- plan_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ plan_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -3892,10 +3883,10 @@ public final class UserProtos {
// @@protoc_insertion_point(class_scope:exec.user.RunQuery)
}
- public interface BitToUserHandshakeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface BitToUserHandshakeOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.user.BitToUserHandshake)
+ com.google.protobuf.MessageOrBuilder {
- // optional int32 rpc_version = 2;
/**
* <code>optional int32 rpc_version = 2;</code>
*/
@@ -3909,8 +3900,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.BitToUserHandshake}
*/
public static final class BitToUserHandshake extends
- com.google.protobuf.GeneratedMessage
- implements BitToUserHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.user.BitToUserHandshake)
+ BitToUserHandshakeOrBuilder {
// Use BitToUserHandshake.newBuilder() to construct.
private BitToUserHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -4001,7 +3993,6 @@ public final class UserProtos {
}
private int bitField0_;
- // optional int32 rpc_version = 2;
public static final int RPC_VERSION_FIELD_NUMBER = 2;
private int rpcVersion_;
/**
@@ -4023,7 +4014,8 @@ public final class UserProtos {
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;
@@ -4130,8 +4122,9 @@ public final class UserProtos {
* Protobuf type {@code exec.user.BitToUserHandshake}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.UserProtos.BitToUserHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.user.BitToUserHandshake)
+ org.apache.drill.exec.proto.UserProtos.BitToUserHandshakeOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.UserProtos.internal_static_exec_user_BitToUserHandshake_descriptor;
@@ -4244,7 +4237,6 @@ public final class UserProtos {
}
private int bitField0_;
- // optional int32 rpc_version = 2;
private int rpcVersion_ ;
/**
* <code>optional int32 rpc_version = 2;</code>
@@ -4288,32 +4280,32 @@ public final class UserProtos {
// @@protoc_insertion_point(class_scope:exec.user.BitToUserHandshake)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_user_Property_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_user_Property_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_user_UserProperties_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_user_UserProperties_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_user_UserToBitHandshake_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_user_UserToBitHandshake_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_user_RequestResults_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_user_RequestResults_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_user_RunQuery_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_user_RunQuery_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_user_BitToUserHandshake_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -4353,55 +4345,57 @@ public final class UserProtos {
"rotosH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_exec_user_Property_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_exec_user_Property_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_user_Property_descriptor,
- new java.lang.String[] { "Key", "Value", });
- internal_static_exec_user_UserProperties_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_exec_user_UserProperties_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_user_UserProperties_descriptor,
- new java.lang.String[] { "Properties", });
- internal_static_exec_user_UserToBitHandshake_descriptor =
- getDescriptor().getMessageTypes().get(2);
- internal_static_exec_user_UserToBitHandshake_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_user_UserToBitHandshake_descriptor,
- new java.lang.String[] { "Channel", "SupportListening", "RpcVersion", "Credentials", "Properties", "SupportComplexTypes", });
- internal_static_exec_user_RequestResults_descriptor =
- getDescriptor().getMessageTypes().get(3);
- internal_static_exec_user_RequestResults_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_user_RequestResults_descriptor,
- new java.lang.String[] { "QueryId", "MaximumResponses", });
- internal_static_exec_user_RunQuery_descriptor =
- getDescriptor().getMessageTypes().get(4);
- internal_static_exec_user_RunQuery_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_user_RunQuery_descriptor,
- new java.lang.String[] { "ResultsMode", "Type", "Plan", });
- internal_static_exec_user_BitToUserHandshake_descriptor =
- getDescriptor().getMessageTypes().get(5);
- internal_static_exec_user_BitToUserHandshake_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_user_BitToUserHandshake_descriptor,
- new java.lang.String[] { "RpcVersion", });
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
org.apache.drill.exec.proto.SchemaDefProtos.getDescriptor(),
org.apache.drill.exec.proto.UserBitShared.getDescriptor(),
}, assigner);
+ internal_static_exec_user_Property_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_exec_user_Property_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_user_Property_descriptor,
+ new java.lang.String[] { "Key", "Value", });
+ internal_static_exec_user_UserProperties_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_exec_user_UserProperties_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_user_UserProperties_descriptor,
+ new java.lang.String[] { "Properties", });
+ internal_static_exec_user_UserToBitHandshake_descriptor =
+ getDescriptor().getMessageTypes().get(2);
+ internal_static_exec_user_UserToBitHandshake_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_user_UserToBitHandshake_descriptor,
+ new java.lang.String[] { "Channel", "SupportListening", "RpcVersion", "Credentials", "Properties", "SupportComplexTypes", });
+ internal_static_exec_user_RequestResults_descriptor =
+ getDescriptor().getMessageTypes().get(3);
+ internal_static_exec_user_RequestResults_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_user_RequestResults_descriptor,
+ new java.lang.String[] { "QueryId", "MaximumResponses", });
+ internal_static_exec_user_RunQuery_descriptor =
+ getDescriptor().getMessageTypes().get(4);
+ internal_static_exec_user_RunQuery_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_user_RunQuery_descriptor,
+ new java.lang.String[] { "ResultsMode", "Type", "Plan", });
+ internal_static_exec_user_BitToUserHandshake_descriptor =
+ getDescriptor().getMessageTypes().get(5);
+ internal_static_exec_user_BitToUserHandshake_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_user_BitToUserHandshake_descriptor,
+ new java.lang.String[] { "RpcVersion", });
+ org.apache.drill.exec.proto.SchemaDefProtos.getDescriptor();
+ org.apache.drill.exec.proto.UserBitShared.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java
index d8841e8..d8eb92a 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java
@@ -42,7 +42,7 @@ public final class QueryResult implements Externalizable, Message<QueryResult>,
COMPLETED(2),
CANCELED(3),
FAILED(4),
- UNKNOWN_QUERY(5);
+ CANCELLATION_REQUESTED(5);
public final int number;
@@ -65,7 +65,7 @@ public final class QueryResult implements Externalizable, Message<QueryResult>,
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;
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/protobuf/UserBitShared.proto
----------------------------------------------------------------------
diff --git a/protocol/src/main/protobuf/UserBitShared.proto b/protocol/src/main/protobuf/UserBitShared.proto
index 8f05c45..1971e62 100644
--- a/protocol/src/main/protobuf/UserBitShared.proto
+++ b/protocol/src/main/protobuf/UserBitShared.proto
@@ -99,10 +99,10 @@ message QueryResult {
enum QueryState {
PENDING = 0;
RUNNING = 1;
- COMPLETED = 2;
- CANCELED = 3;
+ COMPLETED = 2; // query has completed successfully
+ CANCELED = 3; // query has been cancelled, and all cleanup is complete
FAILED = 4;
- UNKNOWN_QUERY = 5;
+ CANCELLATION_REQUESTED = 5; // cancellation has been requested, and is being processed
}
optional QueryState query_state = 1;
[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.
Posted by ja...@apache.org.
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>
[8/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.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicServer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicServer.java
index c00df4e..0e0398d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicServer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicServer.java
@@ -145,7 +145,7 @@ public abstract class BasicServer<T extends EnumLite, C extends RemoteConnection
return null;
}
- public int bind(final int initialPort, boolean allowPortHunting) throws InterruptedException, DrillbitStartupException {
+ public int bind(final int initialPort, boolean allowPortHunting) throws DrillbitStartupException {
int port = initialPort - 1;
while (true) {
try {
@@ -170,6 +170,7 @@ public abstract class BasicServer<T extends EnumLite, C extends RemoteConnection
eventLoopGroup.shutdownGracefully().get();
} catch (InterruptedException | ExecutionException e) {
logger.warn("Failure while shutting down {}. ", this.getClass().getName(), e);
+ // TODO InterruptedException
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java
index 2b49579..e7580b2 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java
@@ -20,29 +20,61 @@ package org.apache.drill.exec.rpc;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
+/**
+ * {@link ThreadFactory} for {@link ExecutorServices} that names threads sequentially.
+ * Creates Threads named with the prefix specified at construction time. Created threads
+ * have the daemon bit set and priority Thread.MAX_PRIORITY.
+ *
+ * <p>An instance creates names with an instance-specific prefix suffixed with sequential
+ * integers.</p>
+ *
+ * <p>Concurrency: See {@link newThread}.</p>
+ */
public class NamedThreadFactory implements ThreadFactory {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(NamedThreadFactory.class);
- private final AtomicInteger nextId = new AtomicInteger();
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(NamedThreadFactory.class);
+ private final AtomicInteger nextId = new AtomicInteger(); // used to generate unique ids
private final String prefix;
- public NamedThreadFactory(String prefix) {
+ /**
+ * Constructor.
+ *
+ * @param prefix the string prefix that will be used to name threads created by this factory
+ */
+ public NamedThreadFactory(final String prefix) {
this.prefix = prefix;
}
+ /**
+ * Creates a sequentially named thread running a given Runnable.
+ * <p>
+ * The thread's name will be this instance's prefix concatenated with
+ * this instance's next<sup><a href="#fn-1">*</a></sup> sequential integer.
+ * </p>
+ * <p>
+ * Concurrency: Thread-safe.
+ * </p>
+ * <p>
+ * (Concurrent calls get different numbers.
+ * Calls started after other calls complete get later/higher numbers than
+ * those other calls.
+ * </p>
+ * <p>
+ * <a name="fn-1" />*However, for concurrent calls, the order of numbers
+ * is not defined.)
+ */
@Override
- public Thread newThread(Runnable r) {
- Thread t = new Thread(r, prefix + nextId.incrementAndGet());
+ public Thread newThread(final Runnable runnable) {
+ final Thread thread = new Thread(runnable, prefix + nextId.incrementAndGet());
+ thread.setDaemon(true);
+
try {
- if (t.isDaemon()) {
- t.setDaemon(true);
- }
- if (t.getPriority() != Thread.MAX_PRIORITY) {
- t.setPriority(Thread.MAX_PRIORITY);
+ if (thread.getPriority() != Thread.MAX_PRIORITY) {
+ thread.setPriority(Thread.MAX_PRIORITY);
}
} catch (Exception ignored) {
// Doesn't matter even if failed to set.
+ logger.info("ignored exception " + ignored);
}
- return t;
+ return thread;
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java
index f214c4d..9948d3e 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java
@@ -114,6 +114,7 @@ public abstract class ReconnectingConnection<CONNECTION_TYPE extends RemoteConne
}
} catch (InterruptedException e) {
cmd.connectionFailed(FailureType.CONNECTION, e);
+ // TODO InterruptedException
} catch (ExecutionException e) {
throw new IllegalStateException();
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RemoteConnection.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RemoteConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RemoteConnection.java
index 3a139f8..a72dd32 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RemoteConnection.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RemoteConnection.java
@@ -54,6 +54,7 @@ public abstract class RemoteConnection implements ConnectionThrottle, AutoClosea
return true;
}catch(InterruptedException e){
listener.failed(new RpcException(e));
+ // TODO InterruptedException
return false;
}
}
@@ -109,6 +110,7 @@ public abstract class RemoteConnection implements ConnectionThrottle, AutoClosea
channel.close().get();
} catch (InterruptedException | ExecutionException e) {
logger.warn("Caught exception while closing channel.", e);
+ // TODO InterruptedException
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RpcBus.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RpcBus.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RpcBus.java
index 5eab16a..b974963 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RpcBus.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/RpcBus.java
@@ -30,7 +30,6 @@ import java.io.Closeable;
import java.util.Arrays;
import java.util.List;
-import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
import org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode;
import org.apache.drill.exec.proto.UserBitShared.DrillPBError;
import org.apache.drill.exec.work.ErrorHelper;
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java
index 7f84a2b..af60ff0 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java
@@ -39,7 +39,7 @@ public interface Controller extends Closeable {
*/
public ControlTunnel getTunnel(DrillbitEndpoint node) ;
- public DrillbitEndpoint start(DrillbitEndpoint partialEndpoint) throws InterruptedException, DrillbitStartupException;
+ public DrillbitEndpoint start(DrillbitEndpoint partialEndpoint) throws DrillbitStartupException;
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java
index f8f6fd7..631d479 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java
@@ -46,7 +46,7 @@ public class ControllerImpl implements Controller {
}
@Override
- public DrillbitEndpoint start(DrillbitEndpoint partialEndpoint) throws InterruptedException, DrillbitStartupException {
+ public DrillbitEndpoint start(DrillbitEndpoint partialEndpoint) throws DrillbitStartupException {
server = new ControlServer(handler, context, connectionRegistry);
int port = context.getConfig().getInt(ExecConstants.INITIAL_BIT_PORT);
port = server.bind(port, allowPortHunting);
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java
index d6b8637..a5a5441 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java
@@ -26,8 +26,6 @@ import org.apache.drill.exec.proto.BitControl.FragmentStatus;
import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
import org.apache.drill.exec.proto.UserBitShared.QueryId;
import org.apache.drill.exec.proto.helper.QueryIdHelper;
-import org.apache.drill.exec.rpc.RpcException;
-import org.apache.drill.exec.work.WorkManager.WorkerBee;
import org.apache.drill.exec.work.foreman.FragmentStatusListener;
import org.apache.drill.exec.work.foreman.ForemanSetupException;
import org.apache.drill.exec.work.fragment.FragmentManager;
@@ -37,60 +35,53 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Maps;
public class WorkEventBus {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(WorkEventBus.class);
-
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(WorkEventBus.class);
private final ConcurrentMap<FragmentHandle, FragmentManager> managers = Maps.newConcurrentMap();
- private final ConcurrentMap<QueryId, FragmentStatusListener> listeners = new ConcurrentHashMap<QueryId, FragmentStatusListener>(
- 16, 0.75f, 16);
- private final WorkerBee bee;
- private final Cache<FragmentHandle,Integer> recentlyFinishedFragments = CacheBuilder.newBuilder()
+ private final ConcurrentMap<QueryId, FragmentStatusListener> listeners =
+ new ConcurrentHashMap<>(16, 0.75f, 16);
+ private final Cache<FragmentHandle, Integer> recentlyFinishedFragments = CacheBuilder.newBuilder()
.maximumSize(10000)
-
.expireAfterWrite(10, TimeUnit.MINUTES)
.build();
- public WorkEventBus(WorkerBee bee) {
- this.bee = bee;
- }
-
- public void removeFragmentStatusListener(QueryId queryId) {
+ public void removeFragmentStatusListener(final QueryId queryId) {
logger.debug("Removing fragment status listener for queryId {}.", queryId);
listeners.remove(queryId);
}
- public void setFragmentStatusListener(QueryId queryId, FragmentStatusListener listener) throws ForemanSetupException {
+ public void addFragmentStatusListener(final QueryId queryId, final FragmentStatusListener listener)
+ throws ForemanSetupException {
logger.debug("Adding fragment status listener for queryId {}.", queryId);
- FragmentStatusListener old = listeners.putIfAbsent(queryId, listener);
+ final FragmentStatusListener old = listeners.putIfAbsent(queryId, listener);
if (old != null) {
throw new ForemanSetupException (
"Failure. The provided handle already exists in the listener pool. You need to remove one listener before adding another.");
}
}
- public void status(FragmentStatus status) {
- FragmentStatusListener l = listeners.get(status.getHandle().getQueryId());
- if (l == null) {
+ public void statusUpdate(final FragmentStatus status) {
+ final FragmentStatusListener listener = listeners.get(status.getHandle().getQueryId());
+ if (listener == null) {
logger.warn("A fragment message arrived but there was no registered listener for that message: {}.", status);
} else {
- l.statusUpdate(status);
+ listener.statusUpdate(status);
}
}
- public void setFragmentManager(FragmentManager fragmentManager) {
+ public void addFragmentManager(final FragmentManager fragmentManager) {
logger.debug("Manager created: {}", QueryIdHelper.getQueryIdentifier(fragmentManager.getHandle()));
- FragmentManager old = managers.putIfAbsent(fragmentManager.getHandle(), fragmentManager);
+ final FragmentManager old = managers.putIfAbsent(fragmentManager.getHandle(), fragmentManager);
if (old != null) {
throw new IllegalStateException(
"Tried to set fragment manager when has already been set for the provided fragment handle.");
}
}
- public FragmentManager getFragmentManagerIfExists(FragmentHandle handle){
+ public FragmentManager getFragmentManagerIfExists(final FragmentHandle handle) {
return managers.get(handle);
-
}
- public FragmentManager getFragmentManager(FragmentHandle handle) throws FragmentSetupException {
+ public FragmentManager getFragmentManager(final FragmentHandle handle) throws FragmentSetupException {
// check if this was a recently canceled fragment. If so, throw away message.
if (recentlyFinishedFragments.asMap().containsKey(handle)) {
logger.debug("Fragment: {} was cancelled. Ignoring fragment handle", handle);
@@ -98,17 +89,17 @@ public class WorkEventBus {
}
// since non-leaf fragments are sent first, it is an error condition if the manager is unavailable.
- FragmentManager m = managers.get(handle);
+ final FragmentManager m = managers.get(handle);
if(m != null) {
return m;
}
- throw new FragmentSetupException("Failed to receive plan fragment that was required for id: " + QueryIdHelper.getQueryIdentifier(handle));
+ throw new FragmentSetupException("Failed to receive plan fragment that was required for id: "
+ + QueryIdHelper.getQueryIdentifier(handle));
}
- public void removeFragmentManager(FragmentHandle handle) {
+ public void removeFragmentManager(final FragmentHandle handle) {
logger.debug("Removing fragment manager: {}", QueryIdHelper.getQueryIdentifier(handle));
recentlyFinishedFragments.put(handle, 1);
managers.remove(handle);
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java
index 33f0d09..a76d753 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java
@@ -50,7 +50,7 @@ public class DataConnectionCreator implements Closeable {
this.allowPortHunting = allowPortHunting;
}
- public DrillbitEndpoint start(DrillbitEndpoint partialEndpoint) throws InterruptedException, DrillbitStartupException {
+ public DrillbitEndpoint start(DrillbitEndpoint partialEndpoint) throws DrillbitStartupException {
server = new DataServer(context, workBus, dataHandler);
int port = server.bind(partialEndpoint.getControlPort() + 1, allowPortHunting);
DrillbitEndpoint completeEndpoint = partialEndpoint.toBuilder().setDataPort(port).build();
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataResponseHandlerImpl.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataResponseHandlerImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataResponseHandlerImpl.java
index e0392fd..33e0665 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataResponseHandlerImpl.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataResponseHandlerImpl.java
@@ -21,50 +21,43 @@ import io.netty.buffer.DrillBuf;
import org.apache.drill.exec.exception.FragmentSetupException;
import org.apache.drill.exec.proto.BitData.FragmentRecordBatch;
-import org.apache.drill.exec.proto.BitData.RpcType;
import org.apache.drill.exec.record.RawFragmentBatch;
-import org.apache.drill.exec.rpc.Acks;
-import org.apache.drill.exec.rpc.RemoteConnection;
-import org.apache.drill.exec.rpc.Response;
-import org.apache.drill.exec.rpc.ResponseSender;
-import org.apache.drill.exec.rpc.RpcException;
import org.apache.drill.exec.work.WorkManager.WorkerBee;
import org.apache.drill.exec.work.fragment.FragmentManager;
import java.io.IOException;
public class DataResponseHandlerImpl implements DataResponseHandler{
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DataResponseHandlerImpl.class);
-
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DataResponseHandlerImpl.class);
private final WorkerBee bee;
- public DataResponseHandlerImpl(WorkerBee bee) {
- super();
+ public DataResponseHandlerImpl(final WorkerBee bee) {
this.bee = bee;
}
-
@Override
public void informOutOfMemory() {
logger.error("Out of memory outside any particular fragment.");
}
-
- public void handle(FragmentManager manager, FragmentRecordBatch fragmentBatch, DrillBuf data, AckSender sender) throws FragmentSetupException, IOException {
-// logger.debug("Fragment Batch received {}", fragmentBatch);
+ @Override
+ public void handle(final FragmentManager manager, final FragmentRecordBatch fragmentBatch,
+ final DrillBuf data, final AckSender sender) throws FragmentSetupException, IOException {
+// logger.debug("Fragment Batch received {}", fragmentBatch);
boolean canRun = manager.handle(new RawFragmentBatch(fragmentBatch, data, sender));
if (canRun) {
-// logger.debug("Arriving batch means local batch can run, starting local batch.");
- // if we've reached the canRun threshold, we'll proceed. This expects handler.handle() to only return a single
- // true.
+// logger.debug("Arriving batch means local batch can run, starting local batch.");
+ /*
+ * If we've reached the canRun threshold, we'll proceed. This expects handler.handle() to
+ * only return a single true.
+ */
bee.startFragmentPendingRemote(manager);
}
if (fragmentBatch.getIsLastBatch() && !manager.isWaiting()) {
-// logger.debug("Removing handler. Is Last Batch {}. Is Waiting for more {}", fragmentBatch.getIsLastBatch(),
-// manager.isWaiting());
+// logger.debug("Removing handler. Is Last Batch {}. Is Waiting for more {}", fragmentBatch.getIsLastBatch(),
+// manager.isWaiting());
bee.getContext().getWorkBus().removeFragmentManager(manager.getHandle());
}
-
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java
index 5aa4aa6..11f5496 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java
@@ -50,6 +50,7 @@ public class DataTunnel {
manager.runCommand(b);
}catch(InterruptedException e){
outcomeListener.failed(new RpcException("Interrupted while trying to get sending semaphore.", e));
+ // TODO InterruptedException
}
}
@@ -60,6 +61,7 @@ public class DataTunnel {
manager.runCommand(b);
}catch(InterruptedException e){
b.connectionFailed(FailureType.CONNECTION, new RpcException("Interrupted while trying to get sending semaphore.", e));
+ // TODO InterruptedException
}
return b.getFuture();
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java
index 4e7fc92..925154d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java
@@ -57,7 +57,7 @@ public class UserClient extends BasicClientWithConnection<RpcType, UserToBitHand
}
public void connect(RpcConnectionHandler<ServerConnection> handler, DrillbitEndpoint endpoint, UserProperties props, UserBitShared.UserCredentials credentials)
- throws RpcException, InterruptedException {
+ throws RpcException {
UserToBitHandshake.Builder hsBuilder = UserToBitHandshake.newBuilder()
.setRpcVersion(UserRpcConfig.RPC_VERSION)
.setSupportListening(true)
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserServer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserServer.java
index dffb9a1..c76d324 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserServer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserServer.java
@@ -29,7 +29,6 @@ import org.apache.drill.exec.physical.impl.materialize.QueryWritableBatch;
import org.apache.drill.exec.proto.GeneralRPCProtos.Ack;
import org.apache.drill.exec.proto.UserBitShared.QueryId;
import org.apache.drill.exec.proto.UserProtos.BitToUserHandshake;
-import org.apache.drill.exec.proto.UserProtos.RequestResults;
import org.apache.drill.exec.proto.UserProtos.RpcType;
import org.apache.drill.exec.proto.UserProtos.RunQuery;
import org.apache.drill.exec.proto.UserProtos.UserToBitHandshake;
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java
index 6521303..b606707 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java
@@ -17,8 +17,7 @@
*/
package org.apache.drill.exec.server;
-import java.io.Closeable;
-
+import org.apache.drill.common.AutoCloseables;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.exec.ExecConstants;
import org.apache.drill.exec.coord.ClusterCoordinator;
@@ -52,27 +51,32 @@ import com.google.common.io.Closeables;
/**
* Starts, tracks and stops all the required services for a Drillbit daemon to work.
*/
-public class Drillbit implements Closeable{
- private static final org.slf4j.Logger logger;
+public class Drillbit implements AutoCloseable {
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Drillbit.class);
static {
- logger = org.slf4j.LoggerFactory.getLogger(Drillbit.class);
Environment.logEnv("Drillbit environment:.", logger);
}
- public static Drillbit start(StartupOptions options) throws DrillbitStartupException {
- return start(DrillConfig.create(options.getConfigLocation()));
+ public static Drillbit start(final StartupOptions options) throws DrillbitStartupException {
+ return start(DrillConfig.create(options.getConfigLocation()), null);
+ }
+
+ public static Drillbit start(final DrillConfig config) throws DrillbitStartupException {
+ return start(config, null);
}
- public static Drillbit start(DrillConfig config) throws DrillbitStartupException {
+ public static Drillbit start(final DrillConfig config, final RemoteServiceSet remoteServiceSet)
+ throws DrillbitStartupException {
+ logger.debug("Setting up Drillbit.");
Drillbit bit;
try {
- logger.debug("Setting up Drillbit.");
- bit = new Drillbit(config, null);
+ bit = new Drillbit(config, remoteServiceSet);
} catch (Exception ex) {
throw new DrillbitStartupException("Failure while initializing values in Drillbit.", ex);
}
+
+ logger.debug("Starting Drillbit.");
try {
- logger.debug("Starting Drillbit.");
bit.run();
} catch (Exception e) {
bit.close();
@@ -152,90 +156,94 @@ public class Drillbit implements Closeable{
}
}
- public static void main(String[] cli) throws DrillbitStartupException {
+ public static void main(final String[] cli) throws DrillbitStartupException {
StartupOptions options = StartupOptions.parse(cli);
start(options);
}
- final ClusterCoordinator coord;
- final ServiceEngine engine;
- final PStoreProvider storeProvider;
- final WorkManager manager;
- final BootStrapContext context;
- final Server embeddedJetty;
-
- private volatile RegistrationHandle handle;
+ private final ClusterCoordinator coord;
+ private final ServiceEngine engine;
+ private final PStoreProvider storeProvider;
+ private final WorkManager manager;
+ private final BootStrapContext context;
+ private final Server embeddedJetty;
+ private RegistrationHandle registrationHandle;
public Drillbit(DrillConfig config, RemoteServiceSet serviceSet) throws Exception {
- boolean allowPortHunting = serviceSet != null;
- boolean enableHttp = config.getBoolean(ExecConstants.HTTP_ENABLE);
- this.context = new BootStrapContext(config);
- this.manager = new WorkManager(context);
- this.engine = new ServiceEngine(manager.getControlMessageHandler(), manager.getUserWorker(), context, manager.getWorkBus(), manager.getDataHandler(), allowPortHunting);
-
- if(enableHttp) {
- this.embeddedJetty = new Server(config.getInt(ExecConstants.HTTP_PORT));
+ final boolean allowPortHunting = serviceSet != null;
+ final boolean enableHttp = config.getBoolean(ExecConstants.HTTP_ENABLE);
+ context = new BootStrapContext(config);
+ manager = new WorkManager(context);
+ engine = new ServiceEngine(manager.getControlMessageHandler(), manager.getUserWorker(), context,
+ manager.getWorkBus(), manager.getDataHandler(), allowPortHunting);
+
+ if (enableHttp) {
+ embeddedJetty = new Server(config.getInt(ExecConstants.HTTP_PORT));
} else {
- this.embeddedJetty = null;
+ embeddedJetty = null;
}
- if(serviceSet != null) {
- this.coord = serviceSet.getCoordinator();
- this.storeProvider = new CachingStoreProvider(new LocalPStoreProvider(config));
+ if (serviceSet != null) {
+ coord = serviceSet.getCoordinator();
+ storeProvider = new CachingStoreProvider(new LocalPStoreProvider(config));
} else {
- Runtime.getRuntime().addShutdownHook(new ShutdownThread(config));
- this.coord = new ZKClusterCoordinator(config);
- this.storeProvider = new PStoreRegistry(this.coord, config).newPStoreProvider();
+ coord = new ZKClusterCoordinator(config);
+ storeProvider = new PStoreRegistry(this.coord, config).newPStoreProvider();
}
}
- private void startJetty() throws Exception{
+ private void startJetty() throws Exception {
if (embeddedJetty == null) {
return;
}
- ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
-
- ErrorHandler errorHandler = new ErrorHandler();
+ final ErrorHandler errorHandler = new ErrorHandler();
errorHandler.setShowStacks(true);
errorHandler.setShowMessageInTitle(true);
- context.setErrorHandler(errorHandler);
- context.setContextPath("/");
- embeddedJetty.setHandler(context);
- ServletHolder h = new ServletHolder(new ServletContainer(new DrillRestServer(manager)));
-// h.setInitParameter(ServerProperties.PROVIDER_PACKAGES, "org.apache.drill.exec.server");
- h.setInitOrder(1);
- context.addServlet(h, "/*");
- context.addServlet(new ServletHolder(new MetricsServlet(this.context.getMetrics())), "/status/metrics");
- context.addServlet(new ServletHolder(new ThreadDumpServlet()), "/status/threads");
-
- ServletHolder staticHolder = new ServletHolder("static", DefaultServlet.class);
+
+ final ServletContextHandler servletContextHandler =
+ new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
+ servletContextHandler.setErrorHandler(errorHandler);
+ servletContextHandler.setContextPath("/");
+ embeddedJetty.setHandler(servletContextHandler);
+
+ final ServletHolder servletHolder = new ServletHolder(new ServletContainer(new DrillRestServer(manager)));
+// servletHolder.setInitParameter(ServerProperties.PROVIDER_PACKAGES, "org.apache.drill.exec.server");
+ servletHolder.setInitOrder(1);
+ servletContextHandler.addServlet(servletHolder, "/*");
+
+ servletContextHandler.addServlet(
+ new ServletHolder(new MetricsServlet(context.getMetrics())), "/status/metrics");
+ servletContextHandler.addServlet(new ServletHolder(new ThreadDumpServlet()), "/status/threads");
+
+ final ServletHolder staticHolder = new ServletHolder("static", DefaultServlet.class);
staticHolder.setInitParameter("resourceBase", Resource.newClassPathResource("/rest/static").toString());
staticHolder.setInitParameter("dirAllowed","false");
staticHolder.setInitParameter("pathInfoOnly","true");
- context.addServlet(staticHolder,"/static/*");
+ servletContextHandler.addServlet(staticHolder,"/static/*");
embeddedJetty.start();
-
}
-
-
public void run() throws Exception {
coord.start(10000);
storeProvider.start();
- DrillbitEndpoint md = engine.start();
+ final DrillbitEndpoint md = engine.start();
manager.start(md, engine.getController(), engine.getDataConnectionCreator(), coord, storeProvider);
- manager.getContext().getStorage().init();
- manager.getContext().getOptionManager().init();
+ final DrillbitContext drillbitContext = manager.getContext();
+ drillbitContext.getStorage().init();
+ drillbitContext.getOptionManager().init();
javaPropertiesToSystemOptions();
- handle = coord.register(md);
+ registrationHandle = coord.register(md);
startJetty();
+
+ Runtime.getRuntime().addShutdownHook(new ShutdownThread());
}
+ @Override
public void close() {
- if (coord != null && handle != null) {
- coord.unregister(handle);
+ if (coord != null && registrationHandle != null) {
+ coord.unregister(registrationHandle);
}
try {
@@ -243,28 +251,27 @@ public class Drillbit implements Closeable{
} catch (InterruptedException e) {
logger.warn("Interrupted while sleeping during coordination deregistration.");
}
- try {
- if (embeddedJetty != null) {
+
+ if (embeddedJetty != null) {
+ try {
embeddedJetty.stop();
+ } catch (Exception e) {
+ logger.warn("Failure while shutting down embedded jetty server.");
}
- } catch (Exception e) {
- logger.warn("Failure while shutting down embedded jetty server.");
}
+
Closeables.closeQuietly(engine);
- try{
- storeProvider.close();
- }catch(Exception e){
- logger.warn("Failure while closing store provider.", e);
- }
+ AutoCloseables.close(storeProvider, logger);
Closeables.closeQuietly(coord);
- Closeables.closeQuietly(manager);
+ AutoCloseables.close(manager, logger);
Closeables.closeQuietly(context);
+
logger.info("Shutdown completed.");
}
private class ShutdownThread extends Thread {
- ShutdownThread(DrillConfig config) {
- this.setName("ShutdownHook");
+ ShutdownThread() {
+ setName("Drillbit-ShutdownHook");
}
@Override
@@ -272,14 +279,9 @@ public class Drillbit implements Closeable{
logger.info("Received shutdown request.");
close();
}
-
- }
- public ClusterCoordinator getCoordinator() {
- return coord;
}
public DrillbitContext getContext() {
- return this.manager.getContext();
+ return manager.getContext();
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java
index 1b35aec..dbf3c74 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java
@@ -37,6 +37,7 @@ import org.apache.drill.exec.server.options.SystemOptionManager;
import org.apache.drill.exec.store.StoragePluginRegistry;
import org.apache.drill.exec.store.StoragePluginRegistry.DrillSchemaFactory;
import org.apache.drill.exec.store.sys.PStoreProvider;
+import org.apache.drill.exec.testing.SimulatedExceptions;
import com.codahale.metrics.MetricRegistry;
import com.google.common.base.Preconditions;
@@ -45,8 +46,7 @@ public class DrillbitContext {
// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillbitContext.class);
private final BootStrapContext context;
-
- private PhysicalPlanReader reader;
+ private final PhysicalPlanReader reader;
private final ClusterCoordinator coord;
private final DataConnectionCreator connectionsPool;
private final DrillbitEndpoint endpoint;
@@ -59,10 +59,11 @@ public class DrillbitContext {
private final PStoreProvider provider;
private final CodeCompiler compiler;
private final ExecutorService executor;
+ private final SimulatedExceptions simulatedExceptions = new SimulatedExceptions();
- public DrillbitContext(DrillbitEndpoint endpoint, BootStrapContext context, ClusterCoordinator coord, Controller controller, DataConnectionCreator connectionsPool, WorkEventBus workBus, PStoreProvider provider,
+ public DrillbitContext(DrillbitEndpoint endpoint, BootStrapContext context, ClusterCoordinator coord,
+ Controller controller, DataConnectionCreator connectionsPool, WorkEventBus workBus, PStoreProvider provider,
ExecutorService executor) {
- super();
Preconditions.checkNotNull(endpoint);
Preconditions.checkNotNull(context);
Preconditions.checkNotNull(controller);
@@ -87,7 +88,7 @@ public class DrillbitContext {
return functionRegistry;
}
- public WorkEventBus getWorkBus(){
+ public WorkEventBus getWorkBus() {
return workBus;
}
@@ -99,7 +100,7 @@ public class DrillbitContext {
return systemOptions;
}
- public DrillbitEndpoint getEndpoint(){
+ public DrillbitEndpoint getEndpoint() {
return endpoint;
}
@@ -107,11 +108,11 @@ public class DrillbitContext {
return context.getConfig();
}
- public Collection<DrillbitEndpoint> getBits(){
+ public Collection<DrillbitEndpoint> getBits() {
return coord.getAvailableEndpoints();
}
- public BufferAllocator getAllocator(){
+ public BufferAllocator getAllocator() {
return context.getAllocator();
}
@@ -119,35 +120,35 @@ public class DrillbitContext {
return operatorCreatorRegistry;
}
- public StoragePluginRegistry getStorage(){
+ public StoragePluginRegistry getStorage() {
return this.storagePlugins;
}
- public EventLoopGroup getBitLoopGroup(){
+ public EventLoopGroup getBitLoopGroup() {
return context.getBitLoopGroup();
}
- public DataConnectionCreator getDataConnectionsPool(){
+ public DataConnectionCreator getDataConnectionsPool() {
return connectionsPool;
}
- public Controller getController(){
+ public Controller getController() {
return controller;
}
- public MetricRegistry getMetrics(){
+ public MetricRegistry getMetrics() {
return context.getMetrics();
}
- public PhysicalPlanReader getPlanReader(){
+ public PhysicalPlanReader getPlanReader() {
return reader;
}
- public PStoreProvider getPersistentStoreProvider(){
+ public PStoreProvider getPersistentStoreProvider() {
return provider;
}
- public DrillSchemaFactory getSchemaFactory(){
+ public DrillSchemaFactory getSchemaFactory() {
return storagePlugins.getSchemaFactory();
}
@@ -162,4 +163,8 @@ public class DrillbitContext {
public ExecutorService getExecutor() {
return executor;
}
+
+ public SimulatedExceptions getSimulatedExceptions() {
+ return simulatedExceptions;
+ }
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java
index 5c2aede..34ebf80 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java
@@ -72,10 +72,6 @@ public class DrillConfigIterator implements Iterable<OptionValue> {
case NULL:
throw new IllegalStateException("Config value \"" + name + "\" has NULL type");
-/* TODO(cwestin)
- optionValue = OptionValue.createOption(kind, OptionType.BOOT, name, "");
- break;
-*/
}
return optionValue;
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java
index 45c0ce8..c3de190 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java
@@ -19,8 +19,8 @@ package org.apache.drill.exec.server.options;
import java.util.concurrent.ConcurrentHashMap;
-public class SessionOptionManager extends InMemoryOptionManager{
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SessionOptionManager.class);
+public class SessionOptionManager extends InMemoryOptionManager {
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SessionOptionManager.class);
public SessionOptionManager(OptionManager systemOptions) {
super(systemOptions, new ConcurrentHashMap<String, OptionValue>());
@@ -30,5 +30,4 @@ public class SessionOptionManager extends InMemoryOptionManager{
boolean supportsOption(OptionValue value) {
return value.type == OptionValue.OptionType.SESSION;
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
index fa4725d..608fac7 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
@@ -95,6 +95,7 @@ public class SystemOptionManager implements OptionManager {
QueryClassLoader.JAVA_COMPILER_DEBUG,
ExecConstants.ENABLE_VERBOSE_ERRORS,
ExecConstants.ENABLE_WINDOW_FUNCTIONS_VALIDATOR,
+ ExecConstants.DRILLBIT_EXCEPTION_INJECTIONS_VALIDATOR,
ClassTransformer.SCALAR_REPLACEMENT_VALIDATOR,
};
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java
index ae04bad..d22798d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java
@@ -38,14 +38,12 @@ import org.apache.drill.exec.proto.GeneralRPCProtos.Ack;
import org.apache.drill.exec.proto.UserBitShared.QueryId;
import org.apache.drill.exec.proto.UserBitShared.QueryInfo;
import org.apache.drill.exec.proto.UserBitShared.QueryProfile;
-import org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState;
import org.apache.drill.exec.proto.helper.QueryIdHelper;
-import org.apache.drill.exec.store.sys.EStore;
import org.apache.drill.exec.store.sys.PStore;
import org.apache.drill.exec.store.sys.PStoreProvider;
import org.apache.drill.exec.work.WorkManager;
import org.apache.drill.exec.work.foreman.Foreman;
-import org.apache.drill.exec.work.foreman.QueryStatus;
+import org.apache.drill.exec.work.foreman.QueryManager;
import org.glassfish.jersey.server.mvc.Viewable;
import com.google.common.collect.Lists;
@@ -137,8 +135,8 @@ public class ProfileResources {
PStore<QueryProfile> completed = null;
PStore<QueryInfo> running = null;
try {
- completed = provider().getStore(QueryStatus.QUERY_PROFILE);
- running = provider().getStore(QueryStatus.RUNNING_QUERY_INFO);
+ completed = provider().getStore(QueryManager.QUERY_PROFILE);
+ running = provider().getStore(QueryManager.RUNNING_QUERY_INFO);
} catch (IOException e) {
logger.debug("Failed to get profiles from persistent or ephemeral store.");
return new QProfiles(new ArrayList<ProfileInfo>(), new ArrayList<ProfileInfo>());
@@ -177,12 +175,12 @@ public class ProfileResources {
// first check local running
Foreman f = work.getBee().getForemanForQueryId(id);
if(f != null){
- return f.getQueryStatus().getAsProfile();
+ return f.getQueryManager().getQueryProfile();
}
// then check remote running
try{
- PStore<QueryInfo> runningQueries = provider().getStore(QueryStatus.RUNNING_QUERY_INFO);
+ PStore<QueryInfo> runningQueries = provider().getStore(QueryManager.RUNNING_QUERY_INFO);
QueryInfo info = runningQueries.get(queryId);
return work.getContext().getController().getTunnel(info.getForeman()).requestQueryProfile(id).checkedGet(2, TimeUnit.SECONDS);
}catch(Exception e){
@@ -191,7 +189,7 @@ public class ProfileResources {
// then check blob store
try{
- PStore<QueryProfile> profiles = provider().getStore(QueryStatus.QUERY_PROFILE);
+ PStore<QueryProfile> profiles = provider().getStore(QueryManager.QUERY_PROFILE);
return profiles.get(queryId);
}catch(Exception e){
logger.warn("Failure to load query profile for query {}", queryId, e);
@@ -208,7 +206,7 @@ public class ProfileResources {
@Produces(MediaType.APPLICATION_JSON)
public String getProfileJSON(@PathParam("queryid") String queryId) {
try {
- return new String(QueryStatus.QUERY_PROFILE.getSerializer().serialize(getQueryProfile(queryId)));
+ return new String(QueryManager.QUERY_PROFILE.getSerializer().serialize(getQueryProfile(queryId)));
} catch (IOException e) {
logger.debug("Failed to serialize profile for: " + queryId);
return ("{ 'message' : 'error (unable to serialize profile)' }");
@@ -242,7 +240,7 @@ public class ProfileResources {
// then check remote running
try{
- PStore<QueryInfo> runningQueries = provider().getStore(QueryStatus.RUNNING_QUERY_INFO);
+ PStore<QueryInfo> runningQueries = provider().getStore(QueryManager.RUNNING_QUERY_INFO);
QueryInfo info = runningQueries.get(queryId);
Ack a = work.getContext().getController().getTunnel(info.getForeman()).requestCancelQuery(id).checkedGet(2, TimeUnit.SECONDS);
if(a.getOk()){
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java b/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java
index ff6e13c..2efc9a9 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java
@@ -57,7 +57,7 @@ public class ServiceEngine implements Closeable{
this.allowPortHunting = allowPortHunting;
}
- public DrillbitEndpoint start() throws DrillbitStartupException, InterruptedException, UnknownHostException{
+ public DrillbitEndpoint start() throws DrillbitStartupException, UnknownHostException{
int userPort = userServer.bind(config.getInt(ExecConstants.INITIAL_USER_PORT), allowPortHunting);
String address = useIP ? InetAddress.getLocalHost().getHostAddress() : InetAddress.getLocalHost().getCanonicalHostName();
DrillbitEndpoint partialEndpoint = DrillbitEndpoint.newBuilder()
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/FilePStore.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/FilePStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/FilePStore.java
index baa998d..ebee7a8 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/FilePStore.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/FilePStore.java
@@ -56,13 +56,13 @@ public class FilePStore<V> implements PStore<V> {
this.fs = fs;
try {
- mk(basePath);
+ mkdirs(basePath);
} catch (IOException e) {
throw new RuntimeException("Failure setting pstore configuration path.");
}
}
- private void mk(Path path) throws IOException{
+ private void mkdirs(Path path) throws IOException{
fs.mkdirs(path);
}
@@ -112,20 +112,20 @@ public class FilePStore<V> implements PStore<V> {
}
}
- private Path p(String name) throws IOException {
+ private Path makePath(String name) {
Preconditions.checkArgument(
!name.contains("/") &&
!name.contains(":") &&
!name.contains(".."));
- Path f = new Path(basePath, name + DRILL_SYS_FILE_SUFFIX);
+ final Path path = new Path(basePath, name + DRILL_SYS_FILE_SUFFIX);
// do this to check file name.
- return f;
+ return path;
}
public V get(String key) {
try{
- Path path = p(key);
+ Path path = makePath(key);
if(!fs.exists(path)){
return null;
}
@@ -133,15 +133,16 @@ public class FilePStore<V> implements PStore<V> {
throw new RuntimeException(e);
}
- try (InputStream is = fs.open(p(key))) {
+ final Path path = makePath(key);
+ try (InputStream is = fs.open(path)) {
return config.getSerializer().deserialize(IOUtils.toByteArray(is));
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new RuntimeException("Unable to deserialize \"" + path + "\"", e);
}
}
public void put(String key, V value) {
- try (OutputStream os = fs.create(p(key))) {
+ try (OutputStream os = fs.create(makePath(key))) {
IOUtils.write(config.getSerializer().serialize(value), os);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -151,7 +152,7 @@ public class FilePStore<V> implements PStore<V> {
@Override
public boolean putIfAbsent(String key, V value) {
try {
- Path p = p(key);
+ Path p = makePath(key);
if (fs.exists(p)) {
return false;
} else {
@@ -165,7 +166,7 @@ public class FilePStore<V> implements PStore<V> {
public void delete(String key) {
try {
- fs.delete(p(key), false);
+ fs.delete(makePath(key), false);
} catch (IOException e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjection.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjection.java
new file mode 100644
index 0000000..68cbf08
--- /dev/null
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjection.java
@@ -0,0 +1,133 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.testing;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Injection for a single exception. Specifies how many times to inject it, and how many times to skip
+ * injecting it before the first injection. This class is used internally for tracking injected
+ * exceptions; injected exceptions are specified via the
+ * {@link org.apache.drill.exec.ExecConstants#DRILLBIT_EXCEPTION_INJECTIONS} system option.
+ */
+public class ExceptionInjection {
+ private final String desc; // description of the injection site
+
+ private final AtomicInteger nSkip; // the number of times to skip the injection; starts >= 0
+ private final AtomicInteger nThrow; // the number of times to do the injection, after any skips; starts > 0
+
+ private final Class<? extends Throwable> exceptionClass;
+
+ /**
+ * Constructor.
+ *
+ * @param desc description of the injection site; useful for multiple injections in a single class
+ * @param nSkip non-negative number of times to skip injecting the exception
+ * @param nFire positive number of times to inject the exception
+ * @param exceptionClass
+ */
+ public ExceptionInjection(final String desc, final int nSkip, final int nFire,
+ final Class<? extends Throwable> exceptionClass) {
+ this.desc = desc;
+ this.nSkip = new AtomicInteger(nSkip);
+ this.nThrow = new AtomicInteger(nFire);
+ this.exceptionClass = exceptionClass;
+ }
+
+ /**
+ * Constructs the exception to throw, if it is time to throw it.
+ *
+ * @return the exception to throw, or null if it isn't time to throw it
+ */
+ private Throwable constructException() {
+ final int remainingSkips = nSkip.decrementAndGet();
+ if (remainingSkips >= 0) {
+ return null;
+ }
+
+ final int remainingFirings = nThrow.decrementAndGet();
+ if (remainingFirings < 0) {
+ return null;
+ }
+
+ // if we get here, we should throw the specified exception
+ Constructor<?> constructor;
+ try {
+ constructor = exceptionClass.getConstructor(String.class);
+ } catch(NoSuchMethodException e) {
+ throw new RuntimeException("No constructor found that takes a single String argument");
+ }
+
+ Throwable throwable;
+ try {
+ throwable = (Throwable) constructor.newInstance(desc);
+ } catch(InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ throw new IllegalStateException("Couldn't construct exception instance", e);
+ }
+
+ return throwable;
+ }
+
+ /**
+ * Throw the unchecked exception specified by this injection.
+ *
+ * @throws IllegalStateException if it's time to throw, and the injection specified a checked exception
+ */
+ public void throwUnchecked() {
+ final Throwable throwable = constructException();
+ if (throwable == null) {
+ return;
+ }
+
+ if (throwable instanceof RuntimeException) {
+ final RuntimeException e = (RuntimeException) throwable;
+ throw e;
+ }
+ if (throwable instanceof Error) {
+ final Error e = (Error) throwable;
+ throw e;
+ }
+
+ throw new IllegalStateException("throwable was not an unchecked exception");
+ }
+
+ /**
+ * Throw the checked exception specified by this injection.
+ *
+ * @param exceptionClass the class of the exception to throw
+ * @throws T if it is time to throw the exception
+ * @throws IllegalStateException if it is time to throw the exception, and the exception's class
+ * is incompatible with the class specified by the injection
+ */
+ public <T extends Throwable> void throwChecked(final Class<T> exceptionClass) throws T {
+ final Throwable throwable = constructException();
+ if (throwable == null) {
+ return;
+ }
+
+ if (exceptionClass.isAssignableFrom(throwable.getClass())) {
+ final T exception = exceptionClass.cast(throwable);
+ throw exception;
+ }
+
+ throw new IllegalStateException("Constructed Throwable(" + throwable.getClass().getName()
+ + ") is incompatible with exceptionClass("+ exceptionClass.getName() + ")");
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjector.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjector.java
new file mode 100644
index 0000000..54bc351
--- /dev/null
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjector.java
@@ -0,0 +1,112 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.testing;
+
+import org.apache.drill.exec.server.DrillbitContext;
+
+/**
+ * Injects exceptions at execution time for testing. Any class that wants to simulate exceptions
+ * for testing should have it's own private static instance of an injector (similar to the use
+ * of loggers).
+ *
+ * <p>See {@link org.apache.drill.exec.testing.TestExceptionInjection} for examples of
+ * use.
+ */
+public class ExceptionInjector {
+ private final Class<?> clazz; // the class that owns this injector
+
+ /**
+ * Constructor. Classes should use the static {@link #getInjector()} method to obtain
+ * their injector.
+ *
+ * @param clazz the owning class
+ */
+ private ExceptionInjector(final Class<?> clazz) {
+ this.clazz = clazz;
+ }
+
+ /**
+ * Create an injector.
+ *
+ * @param clazz the owning class
+ * @return the newly created injector
+ */
+ public static ExceptionInjector getInjector(final Class<?> clazz) {
+ return new ExceptionInjector(clazz);
+ }
+
+ /**
+ * Get the injector's owning class.
+ *
+ * @return the injector's owning class
+ */
+ public Class<?> getSiteClass() {
+ return clazz;
+ }
+
+ /**
+ * Lookup an injection within this class that matches the site description.
+ *
+ * @param drillbitContext
+ * @param desc the site description
+ * @return the injection, if there is one; null otherwise
+ */
+ private ExceptionInjection getInjection(final DrillbitContext drillbitContext, final String desc) {
+ final SimulatedExceptions simulatedExceptions = drillbitContext.getSimulatedExceptions();
+ final ExceptionInjection exceptionInjection = simulatedExceptions.lookupInjection(drillbitContext, this, desc);
+ return exceptionInjection;
+ }
+
+ /**
+ * Inject (throw) an unchecked exception at this point, if an injection is specified, and it is time
+ * for it to be thrown.
+ *
+ * <p>Implementors use this in their code at a site where they want to simulate an exception
+ * during testing.
+ *
+ * @param drillbitContext
+ * @param desc the site description
+ * throws the exception specified by the injection, if it is time
+ */
+ public void injectUnchecked(final DrillbitContext drillbitContext, final String desc) {
+ final ExceptionInjection exceptionInjection = getInjection(drillbitContext, desc);
+ if (exceptionInjection != null) {
+ exceptionInjection.throwUnchecked();
+ }
+ }
+
+ /**
+ * Inject (throw) a checked exception at this point, if an injection is specified, and it is time
+ * for it to be thrown.
+ *
+ * <p>Implementors use this in their code at a site where they want to simulate an exception
+ * during testing.
+ *
+ * @param drillbitContext
+ * @param desc the site description
+ * @param exceptionClass the expected class of the exception (or a super class of it)
+ * @throws T the exception specified by the injection, if it is time
+ */
+ public <T extends Throwable> void injectChecked(
+ final DrillbitContext drillbitContext, final String desc, final Class<T> exceptionClass) throws T {
+ final ExceptionInjection exceptionInjection = getInjection(drillbitContext, desc);
+ if (exceptionInjection != null) {
+ exceptionInjection.throwChecked(exceptionClass);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java
new file mode 100644
index 0000000..9e19fdd
--- /dev/null
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.testing;
+
+import com.google.common.base.Preconditions;
+
+public class InjectionSite {
+ private final Class<?> clazz;
+ private final String desc;
+
+ public InjectionSite(final Class<?> clazz, final String desc) {
+ Preconditions.checkNotNull(clazz);
+ Preconditions.checkNotNull(desc);
+
+ this.clazz = clazz;
+ this.desc = desc;
+ }
+
+ public Class<?> getSiteClass() {
+ return clazz;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == null) {
+ return false;
+ }
+
+ if (this == o) {
+ return true;
+ }
+
+ if (!(o instanceof InjectionSite)) {
+ return false;
+ }
+
+ final InjectionSite other = (InjectionSite) o;
+ if (clazz != other.clazz) {
+ return false;
+ }
+
+ if (!desc.equals(other.desc)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return (clazz.hashCode() + 13) ^ (1 - desc.hashCode());
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/testing/SimulatedExceptions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/SimulatedExceptions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/SimulatedExceptions.java
new file mode 100644
index 0000000..0292c08
--- /dev/null
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/SimulatedExceptions.java
@@ -0,0 +1,164 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.testing;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.apache.drill.exec.ExecConstants;
+import org.apache.drill.exec.server.DrillbitContext;
+import org.apache.drill.exec.server.options.OptionManager;
+import org.apache.drill.exec.server.options.OptionValue;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Tracks the simulated exceptions that will be injected for testing purposes.
+ */
+public class SimulatedExceptions {
+ /**
+ * Caches the currently specified ExceptionInjections. Updated when
+ * {@link org.apache.drill.exec.ExecConstants.DRILLBIT_EXCEPTION_INJECTIONS} is noticed
+ * to have changed.
+ */
+ private HashMap<InjectionSite, ExceptionInjection> exMap = null;
+
+ /**
+ * The string that was parsed to produce exMap; we keep it as a means to quickly detect whether
+ * the option string has changed or not between calls to getOption().
+ */
+ private String exString = null;
+
+ /**
+ * POJO used to parse JSON-specified exception injection.
+ */
+ public static class InjectionOption {
+ public String siteClass;
+ public String desc;
+ public int nSkip;
+ public int nFire;
+ public String exceptionClass;
+ }
+
+ /**
+ * POJO used to parse JSON-specified set of exception injections.
+ */
+ public static class InjectionOptions {
+ public InjectionOption injections[];
+ }
+
+ /**
+ * Look for an exception injection matching the given injector and site description.
+ *
+ * @param drillbitContext
+ * @param injector the injector, which indicates a class
+ * @param desc the injection site description
+ * @return the exception injection, if there is one for the injector and site; null otherwise
+ */
+ public synchronized ExceptionInjection lookupInjection(
+ final DrillbitContext drillbitContext, final ExceptionInjector injector, final String desc) {
+ // get the option string
+ final OptionManager optionManager = drillbitContext.getOptionManager();
+ final OptionValue optionValue = optionManager.getOption(ExecConstants.DRILLBIT_EXCEPTION_INJECTIONS);
+ final String opString = optionValue.string_val;
+
+ // if the option string is empty, there's nothing to inject
+ if ((opString == null) || opString.isEmpty()) {
+ // clear these in case there used to be something to inject
+ exMap = null;
+ exString = null;
+ return null;
+ }
+
+ // if the option string is different from before, recreate the injection map
+ if ((exString == null) || (exString != opString) && !exString.equals(opString)) {
+ // parse the option string into JSON
+ final ObjectMapper objectMapper = new ObjectMapper();
+ InjectionOptions injectionOptions;
+ try {
+ injectionOptions = objectMapper.readValue(opString, InjectionOptions.class);
+ } catch(IOException e) {
+ throw new RuntimeException("Couldn't parse exception injections", e);
+ }
+
+ // create a new map from the option JSON
+ exMap = new HashMap<>();
+ for(InjectionOption injectionOption : injectionOptions.injections) {
+ addToMap(exMap, injectionOption);
+ }
+
+ // this is the current set of options in effect
+ exString = opString;
+ }
+
+ // lookup the request
+ final InjectionSite injectionSite = new InjectionSite(injector.getSiteClass(), desc);
+ final ExceptionInjection injection = exMap.get(injectionSite);
+ return injection;
+ }
+
+ /**
+ * Adds a single exception injection to the injection map
+ *
+ * <p>Validates injection options before adding to the map, and throws various exceptions for
+ * validation failures.
+ *
+ * @param exMap the injection map
+ * @param injectionOption the option to add
+ */
+ private static void addToMap(
+ final HashMap<InjectionSite, ExceptionInjection> exMap, final InjectionOption injectionOption) {
+ Class<?> siteClass;
+ try {
+ siteClass = Class.forName(injectionOption.siteClass);
+ } catch(ClassNotFoundException e) {
+ throw new RuntimeException("Injection siteClass not found", e);
+ }
+
+ if ((injectionOption.desc == null) || injectionOption.desc.isEmpty()) {
+ throw new RuntimeException("Injection desc is null or empty");
+ }
+
+ if (injectionOption.nSkip < 0) {
+ throw new RuntimeException("Injection nSkip is not non-negative");
+ }
+
+ if (injectionOption.nFire <= 0) {
+ throw new RuntimeException("Injection nFire is non-positive");
+ }
+
+ Class<?> clazz;
+ try {
+ clazz = Class.forName(injectionOption.exceptionClass);
+ } catch(ClassNotFoundException e) {
+ throw new RuntimeException("Injected exceptionClass not found", e);
+ }
+
+ if (!Throwable.class.isAssignableFrom(clazz)) {
+ throw new RuntimeException("Injected exceptionClass is not a Throwable");
+ }
+
+ @SuppressWarnings("unchecked")
+ final Class<? extends Throwable> exceptionClass = (Class<? extends Throwable>) clazz;
+
+ final InjectionSite injectionSite = new InjectionSite(siteClass, injectionOption.desc);
+ final ExceptionInjection exceptionInjection = new ExceptionInjection(
+ injectionOption.desc, injectionOption.nSkip, injectionOption.nFire, exceptionClass);
+ exMap.put(injectionSite, exceptionInjection);
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/CancelableQuery.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/CancelableQuery.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/CancelableQuery.java
deleted file mode 100644
index 5b11943..0000000
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/CancelableQuery.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.drill.exec.work;
-
-public interface CancelableQuery {
- public void cancel();
-}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java
index 9743d6e..4f99f85 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java
@@ -25,14 +25,13 @@ import org.apache.drill.exec.proto.BitControl.PlanFragment;
import com.google.common.base.Preconditions;
public class QueryWorkUnit {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryWorkUnit.class);
-
+ // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryWorkUnit.class);
private final PlanFragment rootFragment; // for local
private final FragmentRoot rootOperator; // for local
private final List<PlanFragment> fragments;
- public QueryWorkUnit(FragmentRoot rootOperator, PlanFragment rootFragment, List<PlanFragment> fragments) {
- super();
+ public QueryWorkUnit(final FragmentRoot rootOperator, final PlanFragment rootFragment,
+ final List<PlanFragment> fragments) {
Preconditions.checkNotNull(rootFragment);
Preconditions.checkNotNull(fragments);
Preconditions.checkNotNull(rootOperator);
@@ -53,11 +52,4 @@ public class QueryWorkUnit {
public FragmentRoot getRootOperator() {
return rootOperator;
}
-
-
-
-
-
-
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/StatusProvider.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/StatusProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/StatusProvider.java
deleted file mode 100644
index 6086f74..0000000
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/StatusProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.drill.exec.work;
-
-import org.apache.drill.exec.proto.BitControl.FragmentStatus;
-
-public interface StatusProvider {
-
- /**
- * Provides the current status of the FragmentExecutor's work.
- * @return Status if currently. Null if in another state.
- */
- public FragmentStatus getStatus();
-}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java
index 125c56d..a08630a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java
@@ -17,25 +17,21 @@
*/
package org.apache.drill.exec.work;
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import org.apache.drill.common.SelfCleaningRunnable;
import org.apache.drill.exec.coord.ClusterCoordinator;
import org.apache.drill.exec.proto.BitControl.FragmentStatus;
import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
import org.apache.drill.exec.proto.GeneralRPCProtos.Ack;
import org.apache.drill.exec.proto.UserBitShared.QueryId;
-import org.apache.drill.exec.proto.helper.QueryIdHelper;
import org.apache.drill.exec.rpc.DrillRpcFuture;
import org.apache.drill.exec.rpc.NamedThreadFactory;
import org.apache.drill.exec.rpc.RpcException;
@@ -50,7 +46,6 @@ import org.apache.drill.exec.store.sys.PStoreProvider;
import org.apache.drill.exec.work.batch.ControlHandlerImpl;
import org.apache.drill.exec.work.batch.ControlMessageHandler;
import org.apache.drill.exec.work.foreman.Foreman;
-import org.apache.drill.exec.work.foreman.QueryStatus;
import org.apache.drill.exec.work.fragment.FragmentExecutor;
import org.apache.drill.exec.work.fragment.FragmentManager;
import org.apache.drill.exec.work.user.UserWorker;
@@ -59,23 +54,24 @@ import com.codahale.metrics.Gauge;
import com.codahale.metrics.MetricRegistry;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import com.google.common.collect.Queues;
-public class WorkManager implements Closeable {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(WorkManager.class);
-
- private Set<FragmentManager> incomingFragments = Collections.newSetFromMap(Maps
- .<FragmentManager, Boolean> newConcurrentMap());
-
- private LinkedBlockingQueue<RunnableWrapper> pendingTasks = Queues.newLinkedBlockingQueue();
-
- private Map<FragmentHandle, FragmentExecutor> runningFragments = Maps.newConcurrentMap();
+/**
+ * Manages the running fragments in a Drillbit. Periodically requests run-time stats updates from fragments
+ * running elsewhere.
+ */
+public class WorkManager implements AutoCloseable {
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(WorkManager.class);
- private ConcurrentMap<QueryId, Foreman> queries = Maps.newConcurrentMap();
+ /*
+ * We use a {@see java.util.concurrent.ConcurrentHashMap} because it promises never to throw a
+ * {@see java.util.ConcurrentModificationException}; we need that because the statusThread may
+ * iterate over the map while other threads add FragmentExecutors via the {@see #WorkerBee}.
+ */
+ private final Map<FragmentHandle, FragmentExecutor> runningFragments = new ConcurrentHashMap<>();
- private ConcurrentMap<QueryId, QueryStatus> status = Maps.newConcurrentMap();
+ private final ConcurrentMap<QueryId, Foreman> queries = Maps.newConcurrentMap();
- private BootStrapContext bContext;
+ private final BootStrapContext bContext;
private DrillbitContext dContext;
private final ControlMessageHandler controlMessageWorker;
@@ -83,48 +79,50 @@ public class WorkManager implements Closeable {
private final UserWorker userWorker;
private final WorkerBee bee;
private final WorkEventBus workBus;
- private ExecutorService executor;
- private final EventThread eventThread;
+ private final ExecutorService executor;
private final StatusThread statusThread;
- private Controller controller;
- public WorkManager(BootStrapContext context) {
- this.bee = new WorkerBee();
- this.workBus = new WorkEventBus(bee);
+ /**
+ * How often the StatusThread collects statistics about running fragments.
+ */
+ private final static int STATUS_PERIOD_SECONDS = 5;
+
+ public WorkManager(final BootStrapContext context) {
this.bContext = context;
- this.controlMessageWorker = new ControlHandlerImpl(bee);
- this.userWorker = new UserWorker(bee);
- this.eventThread = new EventThread();
- this.statusThread = new StatusThread();
- this.dataHandler = new DataResponseHandlerImpl(bee);
+ bee = new WorkerBee(); // TODO should this just be an interface?
+ workBus = new WorkEventBus(); // TODO should this just be an interface?
+
+ /*
+ * TODO
+ * This executor isn't bounded in any way and could create an arbitrarily large number of
+ * threads, possibly choking the machine. We should really put an upper bound on the number of
+ * threads that can be created. Ideally, this might be computed based on the number of cores or
+ * some similar metric; ThreadPoolExecutor can impose an upper bound, and might be a better choice.
+ */
+ executor = Executors.newCachedThreadPool(new NamedThreadFactory("WorkManager-"));
+
+ // TODO references to this escape here (via WorkerBee) before construction is done
+ controlMessageWorker = new ControlHandlerImpl(bee); // TODO getFragmentRunner(), getForemanForQueryId()
+ userWorker = new UserWorker(bee); // TODO should just be an interface? addNewForeman(), getForemanForQueryId()
+ statusThread = new StatusThread();
+ dataHandler = new DataResponseHandlerImpl(bee); // TODO only uses startFragmentPendingRemote()
}
- public void start(DrillbitEndpoint endpoint, Controller controller,
- DataConnectionCreator data, ClusterCoordinator coord, PStoreProvider provider) {
- this.executor = Executors.newCachedThreadPool(new NamedThreadFactory("WorkManager-"));
- this.dContext = new DrillbitContext(endpoint, bContext, coord, controller, data, workBus, provider, executor);
- // executor = Executors.newFixedThreadPool(dContext.getConfig().getInt(ExecConstants.EXECUTOR_THREADS)
- this.controller = controller;
- this.eventThread.start();
- this.statusThread.start();
+ public void start(final DrillbitEndpoint endpoint, final Controller controller,
+ final DataConnectionCreator data, final ClusterCoordinator coord, final PStoreProvider provider) {
+ dContext = new DrillbitContext(endpoint, bContext, coord, controller, data, workBus, provider, executor);
+ statusThread.start();
+
// TODO remove try block once metrics moved from singleton, For now catch to avoid unit test failures
try {
dContext.getMetrics().register(
- MetricRegistry.name("drill.exec.work.running_fragments." + dContext.getEndpoint().getUserPort()),
+ MetricRegistry.name("drill.exec.work.running_fragments." + dContext.getEndpoint().getUserPort()),
new Gauge<Integer>() {
@Override
public Integer getValue() {
return runningFragments.size();
}
- });
- dContext.getMetrics().register(
- MetricRegistry.name("drill.exec.work.pendingTasks" + dContext.getEndpoint().getUserPort()),
- new Gauge<Integer>() {
- @Override
- public Integer getValue() {
- return pendingTasks.size();
- }
- });
+ });
} catch (IllegalArgumentException e) {
logger.warn("Exception while registering metrics", e);
}
@@ -155,7 +153,7 @@ public class WorkManager implements Closeable {
}
@Override
- public void close() throws IOException {
+ public void close() throws Exception {
try {
if (executor != null) {
executor.awaitTermination(1, TimeUnit.SECONDS);
@@ -169,147 +167,90 @@ public class WorkManager implements Closeable {
return dContext;
}
- private static String getId(FragmentHandle handle){
- return "FragmentExecutor: " + QueryIdHelper.getQueryId(handle.getQueryId()) + ':' + handle.getMajorFragmentId() + ':' + handle.getMinorFragmentId();
- }
-
- // create this so items can see the data here whether or not they are in this package.
+ /**
+ * Narrowed interface to WorkManager that is made available to tasks it is managing.
+ */
public class WorkerBee {
-
-
-
- public void addFragmentRunner(FragmentExecutor runner) {
- logger.debug("Adding pending task {}", runner);
- RunnableWrapper wrapper = new RunnableWrapper(runner, getId(runner.getContext().getHandle()));
- pendingTasks.add(wrapper);
- }
-
- public void addNewForeman(Foreman foreman) {
- String id = "Foreman: " + QueryIdHelper.getQueryId(foreman.getQueryId());
- RunnableWrapper wrapper = new RunnableWrapper(foreman, id);
- pendingTasks.add(wrapper);
+ public void addNewForeman(final Foreman foreman) {
queries.put(foreman.getQueryId(), foreman);
+ executor.execute(new SelfCleaningRunnable(foreman) {
+ @Override
+ protected void cleanup() {
+ queries.remove(foreman.getQueryId(), foreman);
+ }
+ });
}
- public void addFragmentPendingRemote(FragmentManager handler) {
- incomingFragments.add(handler);
- }
-
- public void startFragmentPendingRemote(FragmentManager handler) {
- incomingFragments.remove(handler);
- FragmentExecutor runner = handler.getRunnable();
- RunnableWrapper wrapper = new RunnableWrapper(runner, getId(runner.getContext().getHandle()));
- pendingTasks.add(wrapper);
- }
-
- public FragmentExecutor getFragmentRunner(FragmentHandle handle) {
- return runningFragments.get(handle);
+ public Foreman getForemanForQueryId(final QueryId queryId) {
+ return queries.get(queryId);
}
- public void removeFragment(FragmentHandle handle) {
- runningFragments.remove(handle);
+ public DrillbitContext getContext() {
+ return dContext;
}
- public Foreman getForemanForQueryId(QueryId queryId) {
- return queries.get(queryId);
+ public void startFragmentPendingRemote(final FragmentManager handler) {
+ executor.execute(handler.getRunnable());
}
- public void retireForeman(Foreman foreman) {
- queries.remove(foreman.getQueryId(), foreman);
+ public void addFragmentRunner(final FragmentExecutor fragmentExecutor) {
+ final FragmentHandle fragmentHandle = fragmentExecutor.getContext().getHandle();
+ runningFragments.put(fragmentHandle, fragmentExecutor);
+ executor.execute(new SelfCleaningRunnable(fragmentExecutor) {
+ @Override
+ protected void cleanup() {
+ runningFragments.remove(fragmentHandle);
+ }
+ });
}
- public DrillbitContext getContext() {
- return dContext;
+ public FragmentExecutor getFragmentRunner(final FragmentHandle handle) {
+ return runningFragments.get(handle);
}
-
}
+ /**
+ * Periodically gather current statistics. {@link QueryManager} uses a FragmentStatusListener to
+ * maintain changes to state, and should be current. However, we want to collect current statistics
+ * about RUNNING queries, such as current memory consumption, number of rows processed, and so on.
+ * The FragmentStatusListener only tracks changes to state, so the statistics kept there will be
+ * stale; this thread probes for current values.
+ */
private class StatusThread extends Thread {
public StatusThread() {
- this.setDaemon(true);
- this.setName("WorkManager Status Reporter");
+ setDaemon(true);
+ setName("WorkManager.StatusThread");
}
@Override
public void run() {
- while(true){
- List<DrillRpcFuture<Ack>> futures = Lists.newArrayList();
- for(FragmentExecutor e : runningFragments.values()){
- FragmentStatus status = e.getStatus();
- if(status == null){
+ while(true) {
+ final List<DrillRpcFuture<Ack>> futures = Lists.newArrayList();
+ for(FragmentExecutor fragmentExecutor : runningFragments.values()) {
+ final FragmentStatus status = fragmentExecutor.getStatus();
+ if (status == null) {
continue;
}
- DrillbitEndpoint ep = e.getContext().getForemanEndpoint();
- futures.add(controller.getTunnel(ep).sendFragmentStatus(status));
+
+ final DrillbitEndpoint ep = fragmentExecutor.getContext().getForemanEndpoint();
+ futures.add(dContext.getController().getTunnel(ep).sendFragmentStatus(status));
}
- for(DrillRpcFuture<Ack> future : futures){
- try{
+ for(DrillRpcFuture<Ack> future : futures) {
+ try {
future.checkedGet();
- }catch(RpcException ex){
+ } catch(RpcException ex) {
logger.info("Failure while sending intermediate fragment status to Foreman", ex);
}
}
- try{
- Thread.sleep(5000);
- }catch(InterruptedException e){
+ try {
+ Thread.sleep(STATUS_PERIOD_SECONDS * 1000);
+ } catch(InterruptedException e) {
// exit status thread on interrupt.
break;
}
}
}
-
- }
-
- private class EventThread extends Thread {
- public EventThread() {
- this.setDaemon(true);
- this.setName("WorkManager Event Thread");
- }
-
- @Override
- public void run() {
- try {
- while (true) {
- // logger.debug("Polling for pending work tasks.");
- RunnableWrapper r = pendingTasks.take();
- if (r != null) {
- logger.debug("Starting pending task {}", r);
- if (r.inner instanceof FragmentExecutor) {
- FragmentExecutor fragmentExecutor = (FragmentExecutor) r.inner;
- runningFragments.put(fragmentExecutor.getContext().getHandle(), fragmentExecutor);
- }
- executor.execute(r);
- }
-
- }
- } catch (InterruptedException e) {
- logger.info("Work Manager stopping as it was interrupted.");
- }
- }
-
}
-
- private class RunnableWrapper implements Runnable {
-
- final Runnable inner;
- private final String id;
-
- public RunnableWrapper(Runnable r, String id){
- this.inner = r;
- this.id = id;
- }
-
- @Override
- public void run() {
- try{
- inner.run();
- }catch(Exception | Error e){
- logger.error("Failure while running wrapper [{}]", id, e);
- }
- }
-
- }
-
}
[6/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.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java
deleted file mode 100644
index 4e18da6..0000000
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.drill.exec.work.foreman;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.drill.common.exceptions.DrillRuntimeException;
-import org.apache.drill.exec.proto.BitControl.FragmentStatus;
-import org.apache.drill.exec.proto.SchemaUserBitShared;
-import org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile;
-import org.apache.drill.exec.proto.UserBitShared.QueryId;
-import org.apache.drill.exec.proto.UserBitShared.QueryInfo;
-import org.apache.drill.exec.proto.UserBitShared.QueryProfile;
-import org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState;
-import org.apache.drill.exec.proto.UserProtos.RunQuery;
-import org.apache.drill.exec.proto.helper.QueryIdHelper;
-import org.apache.drill.exec.store.sys.EStore;
-import org.apache.drill.exec.store.sys.PStore;
-import org.apache.drill.exec.store.sys.PStoreConfig;
-import org.apache.drill.exec.store.sys.PStoreProvider;
-
-import com.carrotsearch.hppc.IntObjectOpenHashMap;
-import com.google.common.collect.Lists;
-
-public class QueryStatus {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryStatus.class);
-
- public static final PStoreConfig<QueryProfile> QUERY_PROFILE = PStoreConfig.
- newProtoBuilder(SchemaUserBitShared.QueryProfile.WRITE, SchemaUserBitShared.QueryProfile.MERGE) //
- .name("profiles") //
- .blob() //
- .max(100) //
- .build();
-
- public static final PStoreConfig<QueryInfo> RUNNING_QUERY_INFO = PStoreConfig.
- newProtoBuilder(SchemaUserBitShared.QueryInfo.WRITE, SchemaUserBitShared.QueryInfo.MERGE).name("running").ephemeral().build();
-
- // doesn't need to be thread safe as fragmentDataMap is generated in a single thread and then accessed by multiple threads for reads only.
- private IntObjectOpenHashMap<IntObjectOpenHashMap<FragmentData>> fragmentDataMap = new IntObjectOpenHashMap<IntObjectOpenHashMap<FragmentData>>();
- private List<FragmentData> fragmentDataSet = Lists.newArrayList();
-
- private final String queryId;
- private final QueryId id;
- private RunQuery query;
- private String planText;
- private Foreman foreman;
- private long startTime;
- private long endTime;
- private int totalFragments;
- private int finishedFragments = 0;
-
- private final PStore<QueryProfile> profilePStore;
- private final PStore<QueryInfo> profileEStore;
-
- public QueryStatus(RunQuery query, QueryId id, PStoreProvider provider, Foreman foreman) {
- this.id = id;
- this.query = query;
- this.queryId = QueryIdHelper.getQueryId(id);
- try {
- this.profilePStore = provider.getStore(QUERY_PROFILE);
- this.profileEStore = provider.getStore(RUNNING_QUERY_INFO);
- } catch (IOException e) {
- throw new DrillRuntimeException(e);
- }
- this.foreman = foreman;
- }
-
- public List<FragmentData> getFragmentData() {
- return fragmentDataSet;
- }
-
- public void setPlanText(String planText) {
- this.planText = planText;
- }
-
- public void markStart() {
- this.startTime = System.currentTimeMillis();
- }
-
- public void setEndTime(long endTime) {
- this.endTime = endTime;
- }
-
- public void setTotalFragments(int totalFragments) {
- this.totalFragments = totalFragments;
- }
-
- public void incrementFinishedFragments() {
- finishedFragments++;
- assert finishedFragments <= totalFragments;
- }
-
- void add(FragmentData data) {
- int majorFragmentId = data.getHandle().getMajorFragmentId();
- int minorFragmentId = data.getHandle().getMinorFragmentId();
- IntObjectOpenHashMap<FragmentData> minorMap = fragmentDataMap.get(majorFragmentId);
- if (minorMap == null) {
- minorMap = new IntObjectOpenHashMap<FragmentData>();
- fragmentDataMap.put(majorFragmentId, minorMap);
- }
-
- minorMap.put(minorFragmentId, data);
- fragmentDataSet.add(data);
- }
-
- void updateFragmentStatus(FragmentStatus fragmentStatus) {
- int majorFragmentId = fragmentStatus.getHandle().getMajorFragmentId();
- int minorFragmentId = fragmentStatus.getHandle().getMinorFragmentId();
- fragmentDataMap.get(majorFragmentId).get(minorFragmentId).setStatus(fragmentStatus);
- }
-
- synchronized QueryState updateQueryStateInStore(QueryState queryState) {
- switch (queryState) {
- case PENDING:
- case RUNNING:
- profileEStore.put(queryId, getAsInfo()); // store as ephemeral query profile.
- break;
- case COMPLETED:
- case CANCELED:
- case FAILED:
- try{
- profileEStore.delete(queryId);
- }catch(Exception e){
- logger.warn("Failure while trying to delete the estore profile for this query.", e);
- }
-
- profilePStore.put(queryId, getAsProfile());
- break;
- default:
- throw new IllegalStateException();
- }
- return queryState;
- }
-
- @Override
- public String toString() {
- return fragmentDataMap.toString();
- }
-
- public static class FragmentId{
- int major;
- int minor;
-
- public FragmentId(FragmentStatus status) {
- this.major = status.getHandle().getMajorFragmentId();
- this.minor = status.getHandle().getMinorFragmentId();
- }
-
- public FragmentId(FragmentData data) {
- this.major = data.getHandle().getMajorFragmentId();
- this.minor = data.getHandle().getMinorFragmentId();
- }
-
- public FragmentId(int major, int minor) {
- super();
- this.major = major;
- this.minor = minor;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + major;
- result = prime * result + minor;
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- FragmentId other = (FragmentId) obj;
- if (major != other.major) {
- return false;
- }
- if (minor != other.minor) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return major + ":" + minor;
- }
- }
-
- public QueryInfo getAsInfo() {
- return QueryInfo.newBuilder() //
- .setQuery(query.getPlan())
- .setState(foreman.getState())
- .setForeman(foreman.getContext().getCurrentEndpoint())
- .setStart(startTime)
- .build();
- }
-
- public QueryProfile getAsProfile() {
- QueryProfile.Builder b = QueryProfile.newBuilder();
- b.setQuery(query.getPlan());
- b.setType(query.getType());
- if (planText != null) {
- b.setPlan(planText);
- }
- b.setId(id);
- for (int i = 0; i < fragmentDataMap.allocated.length; i++) {
- if (fragmentDataMap.allocated[i]) {
- int majorFragmentId = fragmentDataMap.keys[i];
- IntObjectOpenHashMap<FragmentData> minorMap = (IntObjectOpenHashMap<FragmentData>) ((Object[]) fragmentDataMap.values)[i];
-
- MajorFragmentProfile.Builder fb = MajorFragmentProfile.newBuilder();
- fb.setMajorFragmentId(majorFragmentId);
- for (int v = 0; v < minorMap.allocated.length; v++) {
- if (minorMap.allocated[v]) {
- FragmentData data = (FragmentData) ((Object[]) minorMap.values)[v];
- fb.addMinorFragmentProfile(data.getStatus().getProfile());
- }
- }
- b.addFragmentProfile(fb);
- }
- }
-
- b.setState(foreman.getState());
- b.setForeman(foreman.getContext().getCurrentEndpoint());
- b.setStart(startTime);
- b.setEnd(endTime);
- b.setTotalFragments(totalFragments);
- b.setFinishedFragments(finishedFragments);
- return b.build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java
index e2f7bbf..b6176db 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java
@@ -18,70 +18,65 @@
package org.apache.drill.exec.work.fragment;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.drill.common.DeferredException;
+import org.apache.drill.exec.coord.ClusterCoordinator;
import org.apache.drill.exec.ops.FragmentContext;
-import org.apache.drill.exec.ops.FragmentStats;
import org.apache.drill.exec.physical.base.FragmentRoot;
import org.apache.drill.exec.physical.impl.ImplCreator;
import org.apache.drill.exec.physical.impl.RootExec;
import org.apache.drill.exec.proto.BitControl.FragmentStatus;
import org.apache.drill.exec.proto.CoordinationProtos;
+import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
import org.apache.drill.exec.proto.UserBitShared.FragmentState;
-import org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile;
import org.apache.drill.exec.proto.helper.QueryIdHelper;
-import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection;
-import org.apache.drill.exec.work.CancelableQuery;
-import org.apache.drill.exec.work.StatusProvider;
-import org.apache.drill.exec.work.WorkManager.WorkerBee;
import org.apache.drill.exec.work.foreman.DrillbitStatusListener;
/**
- * Responsible for running a single fragment on a single Drillbit. Listens/responds to status request and cancellation
- * messages.
+ * Responsible for running a single fragment on a single Drillbit. Listens/responds to status request
+ * and cancellation messages.
*/
-public class FragmentExecutor implements Runnable, CancelableQuery, StatusProvider, Comparable<Object>{
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentExecutor.class);
+public class FragmentExecutor implements Runnable {
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentExecutor.class);
private final AtomicInteger state = new AtomicInteger(FragmentState.AWAITING_ALLOCATION_VALUE);
private final FragmentRoot rootOperator;
- private final FragmentContext context;
- private final WorkerBee bee;
+ private final FragmentContext fragmentContext;
private final StatusReporter listener;
- private final DrillbitStatusListener drillbitStatusListener = new FragmentDrillbitStatusListener();
-
+ private volatile boolean closed;
private RootExec root;
- private boolean closed;
- public FragmentExecutor(FragmentContext context, WorkerBee bee, FragmentRoot rootOperator, StatusReporter listener) {
- this.context = context;
- this.bee = bee;
+ public FragmentExecutor(final FragmentContext context, final FragmentRoot rootOperator,
+ final StatusReporter listener) {
+ this.fragmentContext = context;
this.rootOperator = rootOperator;
this.listener = listener;
}
- @Override
public FragmentStatus getStatus() {
- // If the query is not in a running state, the operator tree is still being constructed and
- // there is no reason to poll for intermediate results.
-
- // Previously the call to get the operator stats with the AbstractStatusReporter was happening
- // before this check. This caused a concurrent modification exception as the list of operator
- // stats is iterated over while collecting info, and added to while building the operator tree.
- if(state.get() != FragmentState.RUNNING_VALUE){
+ /*
+ * If the query is not in a running state, the operator tree is still being constructed and
+ * there is no reason to poll for intermediate results.
+ *
+ * Previously the call to get the operator stats with the AbstractStatusReporter was happening
+ * before this check. This caused a concurrent modification exception as the list of operator
+ * stats is iterated over while collecting info, and added to while building the operator tree.
+ */
+ if(state.get() != FragmentState.RUNNING_VALUE) {
return null;
}
- FragmentStatus status = AbstractStatusReporter.getBuilder(context, FragmentState.RUNNING, null, null).build();
+ final FragmentStatus status =
+ AbstractStatusReporter.getBuilder(fragmentContext, FragmentState.RUNNING, null, null).build();
return status;
}
- @Override
public void cancel() {
+ // Note this will be called outside of run(), from another thread
updateState(FragmentState.CANCELLED);
- logger.debug("Cancelled Fragment {}", context.getHandle());
- context.cancel();
+ logger.debug("Cancelled Fragment {}", fragmentContext.getHandle());
+ fragmentContext.cancel();
}
public void receivingFragmentFinished(FragmentHandle handle) {
@@ -91,98 +86,116 @@ public class FragmentExecutor implements Runnable, CancelableQuery, StatusProvid
}
}
- public UserClientConnection getClient() {
- return context.getConnection();
- }
-
@Override
public void run() {
- final String originalThread = Thread.currentThread().getName();
- try {
- String newThreadName = String.format("%s:frag:%s:%s", //
- QueryIdHelper.getQueryId(context.getHandle().getQueryId()), //
- context.getHandle().getMajorFragmentId(),
- context.getHandle().getMinorFragmentId()
- );
- Thread.currentThread().setName(newThreadName);
+ final Thread myThread = Thread.currentThread();
+ final String originalThreadName = myThread.getName();
+ final FragmentHandle fragmentHandle = fragmentContext.getHandle();
+ final ClusterCoordinator clusterCoordinator = fragmentContext.getDrillbitContext().getClusterCoordinator();
+ final DrillbitStatusListener drillbitStatusListener = new FragmentDrillbitStatusListener();
- root = ImplCreator.getExec(context, rootOperator);
+ try {
+ final String newThreadName = String.format("%s:frag:%s:%s",
+ QueryIdHelper.getQueryId(fragmentHandle.getQueryId()),
+ fragmentHandle.getMajorFragmentId(), fragmentHandle.getMinorFragmentId());
+ myThread.setName(newThreadName);
- context.getDrillbitContext().getClusterCoordinator().addDrillbitStatusListener(drillbitStatusListener);
+ root = ImplCreator.getExec(fragmentContext, rootOperator);
+ clusterCoordinator.addDrillbitStatusListener(drillbitStatusListener);
- logger.debug("Starting fragment runner. {}:{}", context.getHandle().getMajorFragmentId(), context.getHandle().getMinorFragmentId());
+ logger.debug("Starting fragment runner. {}:{}",
+ fragmentHandle.getMajorFragmentId(), fragmentHandle.getMinorFragmentId());
if (!updateStateOrFail(FragmentState.AWAITING_ALLOCATION, FragmentState.RUNNING)) {
logger.warn("Unable to set fragment state to RUNNING. Cancelled or failed?");
return;
}
- // run the query until root.next returns false.
+ /*
+ * Run the query until root.next returns false.
+ * Note that we closeOutResources() here if we're done. That's because this can also throw
+ * exceptions that we want to treat as failures of the request, even if the request did fine
+ * up until this point. Any failures there will be caught in the catch clause below, which
+ * will be reported to the user. If they were to come from the finally clause, the uncaught
+ * exception there will simply terminate this thread without alerting the user -- the
+ * behavior then is to hang.
+ */
while (state.get() == FragmentState.RUNNING_VALUE) {
if (!root.next()) {
- if (context.isFailed()) {
- internalFail(context.getFailureCause());
- closeOutResources(false);
+ if (fragmentContext.isFailed()) {
+ internalFail(fragmentContext.getFailureCause());
+ closeOutResources();
} else {
- closeOutResources(true); // make sure to close out resources before we report success.
+ /*
+ * Close out resources before we report success. We do this so that we'll get an
+ * error if there's a problem cleaning up, even though the query execution portion
+ * succeeded.
+ */
+ closeOutResources();
updateStateOrFail(FragmentState.RUNNING, FragmentState.FINISHED);
}
-
break;
}
}
} catch (AssertionError | Exception e) {
logger.warn("Error while initializing or executing fragment", e);
- context.fail(e);
+ fragmentContext.fail(e);
internalFail(e);
} finally {
- bee.removeFragment(context.getHandle());
- context.getDrillbitContext().getClusterCoordinator().removeDrillbitStatusListener(drillbitStatusListener);
+ clusterCoordinator.removeDrillbitStatusListener(drillbitStatusListener);
// Final check to make sure RecordBatches are cleaned up.
- closeOutResources(false);
+ closeOutResources();
- Thread.currentThread().setName(originalThread);
+ myThread.setName(originalThreadName);
}
}
- private void closeOutResources(boolean throwFailure) {
+ private static final String CLOSE_FAILURE = "Failure while closing out resources";
+
+ private void closeOutResources() {
+ /*
+ * Because of the way this method can be called, it needs to be idempotent; it must
+ * be safe to call it more than once. We use this flag to bypass the body if it has
+ * been called before.
+ */
if (closed) {
return;
}
+ final DeferredException deferredException = fragmentContext.getDeferredException();
try {
- root.stop();
+ root.stop(); // TODO make this an AutoCloseable so we can detect lack of closure
} catch (RuntimeException e) {
- if (throwFailure) {
- throw e;
- }
- logger.warn("Failure while closing out resources.", e);
+ logger.warn(CLOSE_FAILURE, e);
+ deferredException.addException(e);
}
+ closed = true;
+
+ /*
+ * This must be last, because this may throw deferred exceptions.
+ * We are forced to wrap the checked exception (if any) so that it will be unchecked.
+ */
try {
- context.close();
- } catch (Exception e) {
- if (throwFailure) {
- throw new RuntimeException("Error closing fragment context.", e);
- }
- logger.warn("Failure while closing out resources.", e);
+ fragmentContext.close();
+ } catch(Exception e) {
+ throw new RuntimeException("Error closing fragment context.", e);
}
-
- closed = true;
}
- private void internalFail(Throwable excep) {
+ private void internalFail(final Throwable excep) {
state.set(FragmentState.FAILED_VALUE);
- listener.fail(context.getHandle(), "Failure while running fragment.", excep);
+ listener.fail(fragmentContext.getHandle(), "Failure while running fragment.", excep);
}
/**
* Updates the fragment state with the given state
+ *
* @param to target state
*/
- protected void updateState(FragmentState to) {;
+ private void updateState(final FragmentState to) {
state.set(to.getNumber());
- listener.stateChanged(context.getHandle(), to);
+ listener.stateChanged(fragmentContext.getHandle(), to);
}
/**
@@ -192,10 +205,10 @@ public class FragmentExecutor implements Runnable, CancelableQuery, StatusProvid
* @param to target state
* @return true only if update succeeds
*/
- protected boolean checkAndUpdateState(FragmentState expected, FragmentState to) {
- boolean success = state.compareAndSet(expected.getNumber(), to.getNumber());
+ private boolean checkAndUpdateState(final FragmentState expected, final FragmentState to) {
+ final boolean success = state.compareAndSet(expected.getNumber(), to.getNumber());
if (success) {
- listener.stateChanged(context.getHandle(), to);
+ listener.stateChanged(fragmentContext.getHandle(), to);
} else {
logger.debug("State change failed. Expected state: {} -- target state: {} -- current state: {}.",
expected.name(), to.name(), FragmentState.valueOf(state.get()));
@@ -206,7 +219,7 @@ public class FragmentExecutor implements Runnable, CancelableQuery, StatusProvid
/**
* Returns true if the fragment is in a terminal state
*/
- protected boolean isCompleted() {
+ private boolean isCompleted() {
return state.get() == FragmentState.CANCELLED_VALUE
|| state.get() == FragmentState.FAILED_VALUE
|| state.get() == FragmentState.FINISHED_VALUE;
@@ -220,38 +233,32 @@ public class FragmentExecutor implements Runnable, CancelableQuery, StatusProvid
* @param to target state
* @return true only if update succeeds
*/
- protected boolean updateStateOrFail(FragmentState expected, FragmentState to) {
+ private boolean updateStateOrFail(final FragmentState expected, final FragmentState to) {
final boolean updated = checkAndUpdateState(expected, to);
if (!updated && !isCompleted()) {
final String msg = "State was different than expected while attempting to update state from %s to %s however current state was %s.";
- internalFail(new StateTransitionException(String.format(msg, expected.name(), to.name(), FragmentState.valueOf(state.get()))));
+ internalFail(new StateTransitionException(
+ String.format(msg, expected.name(), to.name(), FragmentState.valueOf(state.get()))));
}
return updated;
}
-
- @Override
- public int compareTo(Object o) {
- return o.hashCode() - this.hashCode();
- }
-
public FragmentContext getContext() {
- return context;
+ return fragmentContext;
}
private class FragmentDrillbitStatusListener implements DrillbitStatusListener {
-
@Override
- public void drillbitRegistered(Set<CoordinationProtos.DrillbitEndpoint> registeredDrillbits) {
- // Do nothing.
+ public void drillbitRegistered(final Set<CoordinationProtos.DrillbitEndpoint> registeredDrillbits) {
}
@Override
- public void drillbitUnregistered(Set<CoordinationProtos.DrillbitEndpoint> unregisteredDrillbits) {
- if (unregisteredDrillbits.contains(FragmentExecutor.this.context.getForemanEndpoint())) {
- logger.warn("Forman : {} no longer active. Cancelling fragment {}.",
- FragmentExecutor.this.context.getForemanEndpoint().getAddress(),
- QueryIdHelper.getQueryIdentifier(context.getHandle()));
+ public void drillbitUnregistered(final Set<CoordinationProtos.DrillbitEndpoint> unregisteredDrillbits) {
+ // if the defunct Drillbit was running our Foreman, then cancel the query
+ final DrillbitEndpoint foremanEndpoint = FragmentExecutor.this.fragmentContext.getForemanEndpoint();
+ if (unregisteredDrillbits.contains(foremanEndpoint)) {
+ logger.warn("Foreman : {} no longer active. Cancelling fragment {}.",
+ foremanEndpoint.getAddress(), QueryIdHelper.getQueryIdentifier(fragmentContext.getHandle()));
FragmentExecutor.this.cancel();
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java
index 3671804..41e87cd 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java
@@ -30,13 +30,13 @@ import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
import org.apache.drill.exec.record.RawFragmentBatch;
import org.apache.drill.exec.rpc.RemoteConnection;
import org.apache.drill.exec.server.DrillbitContext;
-import org.apache.drill.exec.work.WorkManager.WorkerBee;
import org.apache.drill.exec.work.batch.IncomingBuffers;
import org.apache.drill.exec.work.foreman.ForemanException;
/**
* This managers determines when to run a non-root fragment node.
*/
+// TODO a lot of this is the same as RootFragmentManager
public class NonRootFragmentManager implements FragmentManager {
private final PlanFragment fragment;
private FragmentRoot root;
@@ -44,15 +44,13 @@ public class NonRootFragmentManager implements FragmentManager {
private final StatusReporter runnerListener;
private volatile FragmentExecutor runner;
private volatile boolean cancel = false;
- private final WorkerBee bee;
private final FragmentContext context;
private List<RemoteConnection> connections = new CopyOnWriteArrayList<>();
- public NonRootFragmentManager(PlanFragment fragment, WorkerBee bee) throws ExecutionSetupException {
+ public NonRootFragmentManager(final PlanFragment fragment, final DrillbitContext context)
+ throws ExecutionSetupException {
try {
this.fragment = fragment;
- DrillbitContext context = bee.getContext();
- this.bee = bee;
this.root = context.getPlanReader().readFragmentOperator(fragment.getFragmentJson());
this.context = new FragmentContext(context, fragment, null, context.getFunctionImplementationRegistry());
this.buffers = new IncomingBuffers(root, this.context);
@@ -84,8 +82,8 @@ public class NonRootFragmentManager implements FragmentManager {
if (cancel) {
return null;
}
- runner = new FragmentExecutor(context, bee, root, runnerListener);
- return this.runner;
+ runner = new FragmentExecutor(context, root, runnerListener);
+ return runner;
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java
index 54fc8c4..84071c3 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java
@@ -28,6 +28,7 @@ import org.apache.drill.exec.record.RawFragmentBatch;
import org.apache.drill.exec.rpc.RemoteConnection;
import org.apache.drill.exec.work.batch.IncomingBuffers;
+// TODO a lot of this is the same as NonRootFragmentManager
public class RootFragmentManager implements FragmentManager{
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(RootFragmentManager.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java b/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java
index 775bccb..8281b7f 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java
@@ -23,18 +23,13 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import com.google.common.base.Preconditions;
import org.apache.drill.common.config.DrillConfig;
-import org.apache.drill.common.util.TestTools;
import org.apache.drill.exec.ExecConstants;
import org.apache.drill.exec.ExecTest;
import org.apache.drill.exec.client.DrillClient;
-import org.apache.drill.exec.client.PrintingResultsListener;
import org.apache.drill.exec.client.QuerySubmitter;
-import org.apache.drill.exec.client.QuerySubmitter.Format;
import org.apache.drill.exec.exception.SchemaChangeException;
import org.apache.drill.exec.memory.BufferAllocator;
import org.apache.drill.exec.memory.TopLevelAllocator;
@@ -58,7 +53,7 @@ import org.junit.runner.Description;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
-public class BaseTestQuery extends ExecTest{
+public class BaseTestQuery extends ExecTest {
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BaseTestQuery.class);
/**
@@ -129,7 +124,7 @@ public class BaseTestQuery extends ExecTest{
}
@BeforeClass
- public static void openClient() throws Exception{
+ public static void openClient() throws Exception {
config = DrillConfig.create(TEST_CONFIGURATIONS);
allocator = new TopLevelAllocator(config);
if (config.hasPath(ENABLE_FULL_CACHE) && config.getBoolean(ENABLE_FULL_CACHE)) {
@@ -139,20 +134,15 @@ public class BaseTestQuery extends ExecTest{
}
bits = new Drillbit[drillbitCount];
- for(int i=0; i<drillbitCount; i++) {
+ for(int i = 0; i < drillbitCount; i++) {
bits[i] = new Drillbit(config, serviceSet);
bits[i].run();
}
- client = new DrillClient(config, serviceSet.getCoordinator());
- client.connect();
- List<QueryResultBatch> results = client.runQuery(QueryType.SQL, String.format("alter session set `%s` = 2", ExecConstants.MAX_WIDTH_PER_NODE_KEY));
- for (QueryResultBatch b : results) {
- b.release();
- }
+ client = QueryTestUtil.createClient(config, serviceSet, 2);
}
- protected BufferAllocator getAllocator() {
+ protected static BufferAllocator getAllocator() {
return allocator;
}
@@ -205,27 +195,23 @@ public class BaseTestQuery extends ExecTest{
}
public static List<QueryResultBatch> testRunAndReturn(QueryType type, String query) throws Exception{
- query = normalizeQuery(query);
+ query = QueryTestUtil.normalizeQuery(query);
return client.runQuery(type, query);
}
- public static int testRunAndPrint(QueryType type, String query) throws Exception{
- query = normalizeQuery(query);
- PrintingResultsListener resultListener = new PrintingResultsListener(client.getConfig(), Format.TSV, VectorUtil.DEFAULT_COLUMN_WIDTH);
- client.runQuery(type, query, resultListener);
- return resultListener.await();
+ public static int testRunAndPrint(final QueryType type, final String query) throws Exception {
+ return QueryTestUtil.testRunAndPrint(client, type, query);
}
protected static void testWithListener(QueryType type, String query, UserResultsListener resultListener) {
- query = normalizeQuery(query);
- client.runQuery(type, query, resultListener);
+ QueryTestUtil.testWithListener(client, type, query, resultListener);
}
- protected void testNoResult(String query, Object... args) throws Exception {
+ protected static void testNoResult(String query, Object... args) throws Exception {
testNoResult(1, query, args);
}
- protected void testNoResult(int interation, String query, Object... args) throws Exception {
+ protected static void testNoResult(int interation, String query, Object... args) throws Exception {
query = String.format(query, args);
logger.debug("Running query:\n--------------\n"+query);
for (int i = 0; i < interation; i++) {
@@ -237,27 +223,11 @@ public class BaseTestQuery extends ExecTest{
}
public static void test(String query, Object... args) throws Exception {
- test(String.format(query, args));
+ QueryTestUtil.test(client, String.format(query, args));
}
- public static void test(String query) throws Exception{
- query = normalizeQuery(query);
- String[] queries = query.split(";");
- for (String q : queries) {
- if (q.trim().isEmpty()) {
- continue;
- }
- testRunAndPrint(QueryType.SQL, q);
- }
- }
-
- public static String normalizeQuery(String query) {
- if (query.contains("${WORKING_PATH}")) {
- return query.replaceAll(Pattern.quote("${WORKING_PATH}"), Matcher.quoteReplacement(TestTools.getWorkingPath()));
- } else if (query.contains("[WORKING_PATH]")) {
- return query.replaceAll(Pattern.quote("[WORKING_PATH]"), Matcher.quoteReplacement(TestTools.getWorkingPath()));
- }
- return query;
+ public static void test(final String query) throws Exception {
+ QueryTestUtil.test(client, query);
}
protected static int testLogical(String query) throws Exception{
@@ -272,19 +242,19 @@ public class BaseTestQuery extends ExecTest{
return testRunAndPrint(QueryType.SQL, query);
}
- protected void testPhysicalFromFile(String file) throws Exception{
+ protected static void testPhysicalFromFile(String file) throws Exception{
testPhysical(getFile(file));
}
- protected List<QueryResultBatch> testPhysicalFromFileWithResults(String file) throws Exception {
+ protected static List<QueryResultBatch> testPhysicalFromFileWithResults(String file) throws Exception {
return testRunAndReturn(QueryType.PHYSICAL, getFile(file));
}
- protected void testLogicalFromFile(String file) throws Exception{
+ protected static void testLogicalFromFile(String file) throws Exception{
testLogical(getFile(file));
}
- protected void testSqlFromFile(String file) throws Exception{
+ protected static void testSqlFromFile(String file) throws Exception{
test(getFile(file));
}
@@ -358,7 +328,8 @@ public class BaseTestQuery extends ExecTest{
return rowCount;
}
- protected String getResultString(List<QueryResultBatch> results, String delimiter) throws SchemaChangeException {
+ protected static String getResultString(List<QueryResultBatch> results, String delimiter)
+ throws SchemaChangeException {
StringBuilder formattedResults = new StringBuilder();
boolean includeHeader = true;
RecordBatchLoader loader = new RecordBatchLoader(getAllocator());
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java
index 36091af..80b4d13 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java
@@ -18,8 +18,6 @@
package org.apache.drill;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.List;
@@ -28,7 +26,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.drill.common.expression.SchemaPath;
-import org.apache.drill.common.util.TestTools;
import org.apache.drill.exec.record.RecordBatchLoader;
import org.apache.drill.exec.record.VectorWrapper;
import org.apache.drill.exec.rpc.user.QueryResultBatch;
@@ -38,7 +35,6 @@ import org.eigenbase.sql.SqlExplain.Depth;
import org.eigenbase.sql.SqlExplainLevel;
import com.google.common.base.Strings;
-import org.junit.Test;
public class PlanTestBase extends BaseTestQuery {
@@ -54,9 +50,9 @@ public class PlanTestBase extends BaseTestQuery {
* format. Then check the physical plan against the list expected substrs.
* Verify all the expected strings are contained in the physical plan string.
*/
- public void testPhysicalPlan(String sql, String... expectedSubstrs)
+ public static void testPhysicalPlan(String sql, String... expectedSubstrs)
throws Exception {
- sql = "EXPLAIN PLAN for " + normalizeQuery(sql);
+ sql = "EXPLAIN PLAN for " + QueryTestUtil.normalizeQuery(sql);
String planStr = getPlanInString(sql, JSON_FORMAT);
@@ -79,8 +75,9 @@ public class PlanTestBase extends BaseTestQuery {
* @throws Exception - if an inclusion or exclusion check fails, or the
* planning process throws an exception
*/
- public void testPlanMatchingPatterns(String query, String[] expectedPatterns, String[] excludedPatterns) throws Exception {
- String plan = getPlanInString("EXPLAIN PLAN for " + normalizeQuery(query), OPTIQ_FORMAT);
+ public static void testPlanMatchingPatterns(String query, String[] expectedPatterns, String[] excludedPatterns)
+ throws Exception {
+ String plan = getPlanInString("EXPLAIN PLAN for " + QueryTestUtil.normalizeQuery(query), OPTIQ_FORMAT);
Pattern p;
Matcher m;
@@ -121,8 +118,9 @@ public class PlanTestBase extends BaseTestQuery {
* @throws Exception - if an inclusion or exclusion check fails, or the
* planning process throws an exception
*/
- public void testPlanSubstrPatterns(String query, String[] expectedPatterns, String[] excludedPatterns) throws Exception {
- String plan = getPlanInString("EXPLAIN PLAN for " + normalizeQuery(query), OPTIQ_FORMAT);
+ public static void testPlanSubstrPatterns(String query, String[] expectedPatterns, String[] excludedPatterns)
+ throws Exception {
+ final String plan = getPlanInString("EXPLAIN PLAN for " + QueryTestUtil.normalizeQuery(query), OPTIQ_FORMAT);
// Check and make sure all expected patterns are in the plan
if (expectedPatterns != null) {
@@ -139,15 +137,15 @@ public class PlanTestBase extends BaseTestQuery {
}
}
- public void testPlanOneExpectedPatternOneExcluded(String query, String expectedPattern, String excludedPattern) throws Exception {
+ public static void testPlanOneExpectedPatternOneExcluded(String query, String expectedPattern, String excludedPattern) throws Exception {
testPlanMatchingPatterns(query, new String[]{expectedPattern}, new String[]{excludedPattern});
}
- public void testPlanOneExpectedPattern(String query, String expectedPattern) throws Exception {
+ public static void testPlanOneExpectedPattern(String query, String expectedPattern) throws Exception {
testPlanMatchingPatterns(query, new String[]{expectedPattern}, new String[]{});
}
- public void testPlanOneExcludedPattern(String query, String excludedPattern) throws Exception {
+ public static void testPlanOneExcludedPattern(String query, String excludedPattern) throws Exception {
testPlanMatchingPatterns(query, new String[]{}, new String[]{excludedPattern});
}
@@ -157,7 +155,7 @@ public class PlanTestBase extends BaseTestQuery {
* substrs. Verify all the expected strings are contained in the physical plan
* string.
*/
- public void testRelLogicalJoinOrder(String sql, String... expectedSubstrs) throws Exception {
+ public static void testRelLogicalJoinOrder(String sql, String... expectedSubstrs) throws Exception {
String planStr = getDrillRelPlanInString(sql, SqlExplainLevel.EXPPLAN_ATTRIBUTES, Depth.LOGICAL);
String prefixJoinOrder = getLogicalPrefixJoinOrderFromPlan(planStr);
@@ -173,7 +171,7 @@ public class PlanTestBase extends BaseTestQuery {
* substrs. Verify all the expected strings are contained in the physical plan
* string.
*/
- public void testRelPhysicalJoinOrder(String sql, String... expectedSubstrs) throws Exception {
+ public static void testRelPhysicalJoinOrder(String sql, String... expectedSubstrs) throws Exception {
String planStr = getDrillRelPlanInString(sql, SqlExplainLevel.EXPPLAN_ATTRIBUTES, Depth.PHYSICAL);
String prefixJoinOrder = getPhysicalPrefixJoinOrderFromPlan(planStr);
@@ -189,9 +187,9 @@ public class PlanTestBase extends BaseTestQuery {
* expected substrs. Verify all the expected strings are contained in the
* physical plan string.
*/
- public void testRelPhysicalPlanLevDigest(String sql, String... expectedSubstrs)
+ public static void testRelPhysicalPlanLevDigest(String sql, String... expectedSubstrs)
throws Exception {
- String planStr = getDrillRelPlanInString(sql, SqlExplainLevel.DIGEST_ATTRIBUTES, Depth.PHYSICAL);
+ final String planStr = getDrillRelPlanInString(sql, SqlExplainLevel.DIGEST_ATTRIBUTES, Depth.PHYSICAL);
for (String substr : expectedSubstrs) {
assertTrue(planStr.contains(substr));
@@ -204,9 +202,9 @@ public class PlanTestBase extends BaseTestQuery {
* substrs. Verify all the expected strings are contained in the physical plan
* string.
*/
- public void testRelLogicalPlanLevDigest(String sql, String... expectedSubstrs)
+ public static void testRelLogicalPlanLevDigest(String sql, String... expectedSubstrs)
throws Exception {
- String planStr = getDrillRelPlanInString(sql,
+ final String planStr = getDrillRelPlanInString(sql,
SqlExplainLevel.DIGEST_ATTRIBUTES, Depth.LOGICAL);
for (String substr : expectedSubstrs) {
@@ -220,8 +218,8 @@ public class PlanTestBase extends BaseTestQuery {
* expected substrs. Verify all the expected strings are contained in the
* physical plan string.
*/
- public void testRelPhysicalPlanLevExplain(String sql, String... expectedSubstrs) throws Exception {
- String planStr = getDrillRelPlanInString(sql, SqlExplainLevel.EXPPLAN_ATTRIBUTES, Depth.PHYSICAL);
+ public static void testRelPhysicalPlanLevExplain(String sql, String... expectedSubstrs) throws Exception {
+ final String planStr = getDrillRelPlanInString(sql, SqlExplainLevel.EXPPLAN_ATTRIBUTES, Depth.PHYSICAL);
for (String substr : expectedSubstrs) {
assertTrue(planStr.contains(substr));
@@ -234,8 +232,8 @@ public class PlanTestBase extends BaseTestQuery {
* substrs. Verify all the expected strings are contained in the physical plan
* string.
*/
- public void testRelLogicalPlanLevExplain(String sql, String... expectedSubstrs) throws Exception {
- String planStr = getDrillRelPlanInString(sql, SqlExplainLevel.EXPPLAN_ATTRIBUTES, Depth.LOGICAL);
+ public static void testRelLogicalPlanLevExplain(String sql, String... expectedSubstrs) throws Exception {
+ final String planStr = getDrillRelPlanInString(sql, SqlExplainLevel.EXPPLAN_ATTRIBUTES, Depth.LOGICAL);
for (String substr : expectedSubstrs) {
assertTrue(planStr.contains(substr));
@@ -246,7 +244,7 @@ public class PlanTestBase extends BaseTestQuery {
* This will get the plan (either logical or physical) in Optiq RelNode
* format, based on SqlExplainLevel and Depth.
*/
- private String getDrillRelPlanInString(String sql, SqlExplainLevel level,
+ private static String getDrillRelPlanInString(String sql, SqlExplainLevel level,
Depth depth) throws Exception {
String levelStr = " ", depthStr = " ";
@@ -279,7 +277,7 @@ public class PlanTestBase extends BaseTestQuery {
}
sql = "EXPLAIN PLAN " + levelStr + " " + depthStr + " for "
- + normalizeQuery(sql);
+ + QueryTestUtil.normalizeQuery(sql);
return getPlanInString(sql, OPTIQ_FORMAT);
}
@@ -326,22 +324,21 @@ public class PlanTestBase extends BaseTestQuery {
return builder.toString();
}
- private String getLogicalPrefixJoinOrderFromPlan(String plan) {
+ private static String getLogicalPrefixJoinOrderFromPlan(String plan) {
return getPrefixJoinOrderFromPlan(plan, "DrillJoinRel", "DrillScanRel");
-
}
- private String getPhysicalPrefixJoinOrderFromPlan(String plan) {
+ private static String getPhysicalPrefixJoinOrderFromPlan(String plan) {
return getPrefixJoinOrderFromPlan(plan, "JoinPrel", "ScanPrel");
}
- private String getPrefixJoinOrderFromPlan(String plan, String joinKeyWord, String scanKeyWord) {
+ private static String getPrefixJoinOrderFromPlan(String plan, String joinKeyWord, String scanKeyWord) {
StringBuilder builder = new StringBuilder();
- String[] planLines = plan.split("\n");
+ final String[] planLines = plan.split("\n");
int cnt = 0;
- Stack<Integer> s = new Stack<Integer>();
+ final Stack<Integer> s = new Stack<>();
for (String line : planLines) {
if (line.trim().isEmpty()) {
@@ -369,5 +366,4 @@ public class PlanTestBase extends BaseTestQuery {
return builder.toString();
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/QueryTestUtil.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/QueryTestUtil.java b/exec/java-exec/src/test/java/org/apache/drill/QueryTestUtil.java
new file mode 100644
index 0000000..3d19229
--- /dev/null
+++ b/exec/java-exec/src/test/java/org/apache/drill/QueryTestUtil.java
@@ -0,0 +1,154 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.drill.common.config.DrillConfig;
+import org.apache.drill.common.util.TestTools;
+import org.apache.drill.exec.ExecConstants;
+import org.apache.drill.exec.client.DrillClient;
+import org.apache.drill.exec.client.PrintingResultsListener;
+import org.apache.drill.exec.client.QuerySubmitter.Format;
+import org.apache.drill.exec.proto.UserBitShared.QueryType;
+import org.apache.drill.exec.rpc.RpcException;
+import org.apache.drill.exec.rpc.user.QueryResultBatch;
+import org.apache.drill.exec.rpc.user.UserResultsListener;
+import org.apache.drill.exec.server.RemoteServiceSet;
+import org.apache.drill.exec.util.VectorUtil;
+
+/**
+ * Utilities useful for tests that issue SQL queries.
+ */
+public class QueryTestUtil {
+ /**
+ * Constructor. All methods are static.
+ */
+ private QueryTestUtil() {
+ }
+
+ /**
+ * Create a DrillClient that can be used to query a drill cluster.
+ *
+ * @param drillConfig
+ * @param remoteServiceSet remote service set
+ * @param maxWidth maximum width per node
+ * @return the newly created client
+ * @throws RpcException if there is a problem setting up the client
+ */
+ public static DrillClient createClient(
+ final DrillConfig drillConfig, final RemoteServiceSet remoteServiceSet, final int maxWidth)
+ throws RpcException {
+ final DrillClient drillClient = new DrillClient(drillConfig, remoteServiceSet.getCoordinator());
+ drillClient.connect();
+
+ final List<QueryResultBatch> results = drillClient.runQuery(
+ QueryType.SQL, String.format("alter session set `%s` = %d",
+ ExecConstants.MAX_WIDTH_PER_NODE_KEY, maxWidth));
+ for (QueryResultBatch queryResultBatch : results) {
+ queryResultBatch.release();
+ }
+
+ return drillClient;
+ }
+
+ /**
+ * Normalize the query relative to the test environment.
+ *
+ * <p>Looks for "${WORKING_PATH}" in the query string, and replaces it the current
+ * working patch obtained from {@link org.apache.drill.common.util.TestTools#getWorkingPath()}.
+ *
+ * @param query the query string
+ * @return the normalized query string
+ */
+ public static String normalizeQuery(final String query) {
+ if (query.contains("${WORKING_PATH}")) {
+ return query.replaceAll(Pattern.quote("${WORKING_PATH}"), Matcher.quoteReplacement(TestTools.getWorkingPath()));
+ } else if (query.contains("[WORKING_PATH]")) {
+ return query.replaceAll(Pattern.quote("[WORKING_PATH]"), Matcher.quoteReplacement(TestTools.getWorkingPath()));
+ }
+ return query;
+ }
+
+ /**
+ * Execute a SQL query, and print the results.
+ *
+ * @param drillClient drill client to use
+ * @param type type of the query
+ * @param queryString query string
+ * @return number of rows returned
+ * @throws Exception
+ */
+ public static int testRunAndPrint(
+ final DrillClient drillClient, final QueryType type, final String queryString) throws Exception {
+ final String query = normalizeQuery(queryString);
+ PrintingResultsListener resultListener =
+ new PrintingResultsListener(drillClient.getConfig(), Format.TSV, VectorUtil.DEFAULT_COLUMN_WIDTH);
+ drillClient.runQuery(type, query, resultListener);
+ return resultListener.await();
+ }
+
+ /**
+ * Execute one or more queries separated by semicolons, and print the results.
+ *
+ * @param drillClient drill client to use
+ * @param queryString the query string
+ * @throws Exception
+ */
+ public static void test(final DrillClient drillClient, final String queryString) throws Exception{
+ final String query = normalizeQuery(queryString);
+ String[] queries = query.split(";");
+ for (String q : queries) {
+ final String trimmedQuery = q.trim();
+ if (trimmedQuery.isEmpty()) {
+ continue;
+ }
+ testRunAndPrint(drillClient, QueryType.SQL, trimmedQuery);
+ }
+ }
+
+ /**
+ * Execute one or more queries separated by semicolons, and print the results, with the option to
+ * add formatted arguments to the query string.
+ *
+ * @param drillClient drill client to use
+ * @param query the query string; may contain formatting specifications to be used by
+ * {@link String#format(String, Object...)}.
+ * @param args optional args to use in the formatting call for the query string
+ * @throws Exception
+ */
+ public static void test(final DrillClient drillClient, final String query, Object... args) throws Exception {
+ test(drillClient, String.format(query, args));
+ }
+
+ /**
+ * Execute a single query with a user supplied result listener.
+ *
+ * @param drillClient drill client to use
+ * @param type type of query
+ * @param queryString the query string
+ * @param resultListener the result listener
+ */
+ public static void testWithListener(final DrillClient drillClient, final QueryType type,
+ final String queryString, final UserResultsListener resultListener) {
+ final String query = QueryTestUtil.normalizeQuery(queryString);
+ drillClient.runQuery(type, query, resultListener);
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/SingleRowListener.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/SingleRowListener.java b/exec/java-exec/src/test/java/org/apache/drill/SingleRowListener.java
new file mode 100644
index 0000000..07cb833
--- /dev/null
+++ b/exec/java-exec/src/test/java/org/apache/drill/SingleRowListener.java
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.drill.exec.proto.UserBitShared.QueryId;
+import org.apache.drill.exec.proto.UserBitShared.QueryResult;
+import org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState;
+import org.apache.drill.exec.proto.UserBitShared.DrillPBError;
+import org.apache.drill.exec.rpc.RpcException;
+import org.apache.drill.exec.rpc.user.ConnectionThrottle;
+import org.apache.drill.exec.rpc.user.QueryResultBatch;
+import org.apache.drill.exec.rpc.user.UserResultsListener;
+
+/**
+ * Result listener that is set up to receive a single row. Useful for queries
+ * such with a count(*) or limit 1. The abstract method {@link #rowArrived(QueryResultBatch)} provides
+ * the means for a derived class to get the expected record's data.
+ */
+public abstract class SingleRowListener implements UserResultsListener {
+ private final CountDownLatch latch = new CountDownLatch(1); // used to wait for completion
+ private final AtomicInteger nRows = new AtomicInteger(0); // counts rows received
+ private QueryState queryState = null; // last received QueryState, if any
+ private final List<DrillPBError> errorList = new LinkedList<>(); // all errors ever received
+ private Exception exception = null; // the exception captured from a submission failure
+
+ @Override
+ public void queryIdArrived(final QueryId queryId) {
+ }
+
+ @Override
+ public void submissionFailed(final RpcException ex) {
+ exception = ex;
+ latch.countDown();
+ }
+
+ @Override
+ public void resultArrived(final QueryResultBatch result, final ConnectionThrottle throttle) {
+ final QueryResult queryResult = result.getHeader();
+ if (result.hasData()) {
+ final int nRows = this.nRows.addAndGet(queryResult.getRowCount());
+ if (nRows > 1) {
+ throw new IllegalStateException("Expected exactly one row, but got " + nRows);
+ }
+
+ rowArrived(result);
+ }
+
+ // TODO this appears to never be set
+ if (queryResult.hasQueryState()) {
+ queryState = queryResult.getQueryState();
+ }
+
+ synchronized(errorList) {
+ errorList.addAll(queryResult.getErrorList());
+ }
+
+ final boolean isLastChunk = queryResult.getIsLastChunk();
+ result.release();
+
+ if (isLastChunk) {
+ cleanup();
+ latch.countDown();
+ }
+ }
+
+ /**
+ * Get the last known QueryState.
+ *
+ * @return the query state; may be null if no query state has been received
+ */
+ public QueryState getQueryState() {
+ return queryState;
+ }
+
+ /**
+ * Get an immutable copy of the list of all errors received so far.
+ *
+ * @return list of errors received
+ */
+ public List<DrillPBError> getErrorList() {
+ synchronized(errorList) {
+ return Collections.unmodifiableList(errorList);
+ }
+ }
+
+ /**
+ * A record has arrived and is ready for access.
+ *
+ * <p>Derived classes provide whatever implementation they require here to access
+ * the record's data.
+ *
+ * @param queryResultBatch result batch holding the row
+ */
+ protected abstract void rowArrived(QueryResultBatch queryResultBatch);
+
+ /**
+ * Wait for the completion of this query; receiving a record or an error will both cause the
+ * query to be considered complete
+ *
+ * @throws Exception if there was any kind of problem
+ */
+ public void waitForCompletion() throws Exception {
+ latch.await();
+ if (exception != null) {
+ throw new RuntimeException("Query submission failed", exception);
+ }
+ }
+
+ /**
+ * Clean up any resources used.
+ *
+ * <p>Derived classes may use this to free things like allocators or files that were used to
+ * record data received in resultArrived().
+ */
+ public void cleanup() {
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/TestBuilder.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/TestBuilder.java
index 978e565..13f958c 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestBuilder.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestBuilder.java
@@ -27,7 +27,6 @@ import org.apache.drill.common.expression.parser.ExprLexer;
import org.apache.drill.common.expression.parser.ExprParser;
import org.apache.drill.common.types.TypeProtos;
import org.apache.drill.common.types.Types;
-import org.apache.drill.common.util.TestTools;
import org.apache.drill.exec.memory.BufferAllocator;
import org.apache.drill.exec.proto.UserBitShared;
@@ -36,7 +35,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.regex.Pattern;
import static org.junit.Assert.assertEquals;
@@ -124,7 +122,7 @@ public class TestBuilder {
}
public TestBuilder sqlQuery(String query) {
- this.query = BaseTestQuery.normalizeQuery(query);
+ this.query = QueryTestUtil.normalizeQuery(query);
this.queryType = UserBitShared.QueryType.SQL;
return this;
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java
index e0f830d..b062b39 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java
@@ -23,8 +23,8 @@ import org.junit.Test;
public class TestTpchDistributed extends BaseTestQuery {
// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTpchDistributed.class);
- private static void testDistributed(String fileName) throws Exception {
- String query = getFile(fileName);
+ private static void testDistributed(final String fileName) throws Exception {
+ final String query = getFile(fileName);
test("alter session set `planner.slice_target` = 10; " + query);
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java
index 75ba3a9..e63f085 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java
@@ -21,7 +21,6 @@ import static com.google.common.base.Throwables.propagate;
import java.util.List;
-import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.exec.exception.DrillbitStartupException;
import org.apache.drill.exec.server.Drillbit;
import org.slf4j.Logger;
@@ -33,8 +32,7 @@ import com.google.common.collect.ImmutableList;
* Starts one or more Drillbits, an embedded ZooKeeper cluster and provides a configured client for testing.
*/
public class DrillSystemTestBase extends TestWithZookeeper {
-
- static final Logger logger = org.slf4j.LoggerFactory.getLogger(DrillConfig.class);
+ private static final Logger logger = org.slf4j.LoggerFactory.getLogger(DrillSystemTestBase.class);
private List<Drillbit> servers;
@@ -62,9 +60,7 @@ public class DrillSystemTestBase extends TestWithZookeeper {
}
}
-
public Drillbit getABit(){
return this.servers.iterator().next();
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java
index bb69c9a..f65c638 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java
@@ -17,65 +17,27 @@
*/
package org.apache.drill.exec;
-import static com.google.common.base.Throwables.propagate;
-
-import java.io.File;
-import java.io.IOException;
-
import org.apache.drill.common.config.DrillConfig;
-import org.apache.drill.exec.util.MiniZooKeeperCluster;
import org.junit.AfterClass;
import org.junit.BeforeClass;
public class TestWithZookeeper extends ExecTest {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestWithZookeeper.class);
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestWithZookeeper.class);
- private static File testDir = new File("target/test-data");
- private static DrillConfig config;
- private static String zkUrl;
- private static MiniZooKeeperCluster zkCluster;
+ private static ZookeeperHelper zkHelper;
@BeforeClass
public static void setUp() throws Exception {
- config = DrillConfig.create();
- zkUrl = config.getString(ExecConstants.ZK_CONNECTION);
- setupTestDir();
- startZookeeper(1);
+ zkHelper = new ZookeeperHelper();
+ zkHelper.startZookeeper(1);
}
@AfterClass
public static void tearDown() throws Exception {
- stopZookeeper();
+ zkHelper.stopZookeeper();
}
- private static void setupTestDir() {
- if (!testDir.exists()) {
- testDir.mkdirs();
- }
+ public static DrillConfig getConfig() {
+ return zkHelper.getConfig();
}
-
- private static void startZookeeper(int numServers) {
- try {
- zkCluster = new MiniZooKeeperCluster();
- zkCluster.setDefaultClientPort(Integer.parseInt(zkUrl.split(":")[1]));
- zkCluster.startup(testDir, numServers);
- } catch (IOException e) {
- propagate(e);
- } catch (InterruptedException e) {
- propagate(e);
- }
- }
-
- private static void stopZookeeper() {
- try {
- zkCluster.shutdown();
- } catch (IOException e) {
- propagate(e);
- }
- }
-
- public static DrillConfig getConfig(){
- return config;
- }
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperHelper.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperHelper.java b/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperHelper.java
new file mode 100644
index 0000000..7fcf4cb
--- /dev/null
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperHelper.java
@@ -0,0 +1,102 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec;
+
+import static com.google.common.base.Throwables.propagate;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.drill.common.config.DrillConfig;
+import org.apache.drill.exec.util.MiniZooKeeperCluster;
+
+/**
+ * Test utility for managing a Zookeeper instance.
+ *
+ * <p>Tests that need a Zookeeper instance can initialize a static instance of this class in
+ * their {@link org.junit.BeforeClass} section to set up Zookeeper.
+ */
+public class ZookeeperHelper {
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZookeeperHelper.class);
+
+ private final File testDir = new File("target/test-data");
+ private final DrillConfig config;
+ private final String zkUrl;
+ private MiniZooKeeperCluster zkCluster;
+
+ /**
+ * Constructor.
+ *
+ * <p>Will create a "test-data" directory for Zookeeper's use if one doesn't already exist.
+ */
+ public ZookeeperHelper() {
+ config = DrillConfig.create();
+ zkUrl = config.getString(ExecConstants.ZK_CONNECTION);
+
+ if (!testDir.exists()) {
+ testDir.mkdirs();
+ }
+ }
+
+ /**
+ * Start the Zookeeper instance.
+ *
+ * <p>This must be used before any operations that depend on the Zookeeper instance being up.
+ *
+ * @param numServers how many servers the Zookeeper instance should have
+ */
+ public void startZookeeper(final int numServers) {
+ if (zkCluster != null) {
+ throw new IllegalStateException("Zookeeper cluster already running");
+ }
+
+ try {
+ zkCluster = new MiniZooKeeperCluster();
+ zkCluster.setDefaultClientPort(Integer.parseInt(zkUrl.split(":")[1]));
+ zkCluster.startup(testDir, numServers);
+ } catch (IOException | InterruptedException e) {
+ propagate(e);
+ }
+ }
+
+ /**
+ * Shut down the Zookeeper instance.
+ *
+ * <p>This must be used before the program exits.
+ */
+ public void stopZookeeper() {
+ try {
+ zkCluster.shutdown();
+ zkCluster = null;
+ } catch (IOException e) {
+ // since this is meant to be used in a test's cleanup, we don't propagate the exception
+ final String message = "Unable to shutdown Zookeeper";
+ System.err.println(message + '.');
+ logger.warn(message, e);
+ }
+ }
+
+ /**
+ * Get the DrillConfig used for the Zookeeper instance.
+ *
+ * @return the DrillConfig used.
+ */
+ public DrillConfig getConfig() {
+ return config;
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java
index 0277876..933417e 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.drill.common.expression.SchemaPath;
-import org.apache.drill.exec.exception.SchemaChangeException;
import org.apache.drill.exec.ops.FragmentContext;
import org.apache.drill.exec.physical.impl.ScreenCreator.ScreenRoot;
import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
@@ -35,11 +34,12 @@ import org.apache.drill.exec.vector.ValueVector;
import com.google.common.collect.Lists;
@Deprecated
-public class SimpleRootExec implements RootExec, Iterable<ValueVector>{
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SimpleRootExec.class);
+public class SimpleRootExec implements RootExec, Iterable<ValueVector> {
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SimpleRootExec.class);
+
+ private final RecordBatch incoming;
+ private final ScreenRoot screenRoot;
- private RecordBatch incoming;
- private ScreenRoot screenRoot;
public SimpleRootExec(RootExec e) {
if (e instanceof ScreenRoot) {
incoming = ((ScreenRoot)e).getIncoming();
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java
index 609bc14..0f6fd43 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java
@@ -42,13 +42,12 @@ import com.google.common.base.Charsets;
import com.google.common.io.Resources;
public class TestComparisonFunctions extends ExecTest {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestComparisonFunctions.class);
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestComparisonFunctions.class);
- DrillConfig c = DrillConfig.create();
- String COMPARISON_TEST_PHYSICAL_PLAN = "functions/comparisonTest.json";
- PhysicalPlanReader reader;
- FunctionImplementationRegistry registry;
- FragmentContext context;
+ private final DrillConfig c = DrillConfig.create();
+ private final String COMPARISON_TEST_PHYSICAL_PLAN = "functions/comparisonTest.json";
+ private PhysicalPlanReader reader;
+ private FunctionImplementationRegistry registry;
public void runTest(@Injectable final DrillbitContext bitContext,
@Injectable UserServer.UserClientConnection connection, String expression, int expectedResults) throws Throwable {
@@ -68,21 +67,20 @@ public class TestComparisonFunctions extends ExecTest {
if (registry == null) {
registry = new FunctionImplementationRegistry(c);
}
- if(context == null) {
- context = new FragmentContext(bitContext, PlanFragment.getDefaultInstance(), connection, registry);
- }
+ final FragmentContext context =
+ new FragmentContext(bitContext, PlanFragment.getDefaultInstance(), connection, registry);
PhysicalPlan plan = reader.readPhysicalPlan(planString);
SimpleRootExec exec = new SimpleRootExec(ImplCreator.getExec(context, (FragmentRoot) plan.getSortedOperators(false).iterator().next()));
while(exec.next()) {
- assertEquals(String.format("Expression: %s;", expression), expectedResults, exec.getSelectionVector2().getCount());
+ assertEquals(String.format("Expression: %s;", expression), expectedResults,
+ exec.getSelectionVector2().getCount());
// for (ValueVector vv: exec) {
// vv.close();
// }
}
exec.stop();
-
context.close();
if (context.getFailureCause() != null) {
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java
index 2a0aedc..6bf23ec 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java
@@ -40,7 +40,6 @@ import org.apache.drill.exec.planner.PhysicalPlanReader;
import org.apache.drill.exec.proto.BitControl.PlanFragment;
import org.apache.drill.exec.proto.CoordinationProtos;
import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
-import org.apache.drill.exec.proto.UserBitShared.QueryId;
import org.apache.drill.exec.record.RecordBatchLoader;
import org.apache.drill.exec.record.VectorWrapper;
import org.apache.drill.exec.rpc.control.Controller;
@@ -104,11 +103,13 @@ public class TestOptiqPlans extends ExecTest {
}
};
RemoteServiceSet lss = RemoteServiceSet.getLocalServiceSet();
- DrillbitContext bitContext = new DrillbitContext(DrillbitEndpoint.getDefaultInstance(), context, coord, controller, com, workBus, new LocalPStoreProvider(DrillConfig.create()), null);
- QueryContext qc = new QueryContext(UserSession.Builder.newBuilder().setSupportComplexTypes(true).build(), QueryId.getDefaultInstance(), bitContext);
+ DrillbitContext bitContext = new DrillbitContext(DrillbitEndpoint.getDefaultInstance(), context, coord, controller,
+ com, workBus, new LocalPStoreProvider(DrillConfig.create()), null);
+ QueryContext qc = new QueryContext(UserSession.Builder.newBuilder().setSupportComplexTypes(true).build(),
+ bitContext);
PhysicalPlanReader reader = bitContext.getPlanReader();
LogicalPlan plan = reader.readLogicalPlan(Files.toString(FileUtils.getResourceAsFile(file), Charsets.UTF_8));
- PhysicalPlan pp = new BasicOptimizer(DrillConfig.create(), qc, connection).optimize(new BasicOptimizer.BasicOptimizationContext(qc), plan);
+ PhysicalPlan pp = new BasicOptimizer(qc).optimize(new BasicOptimizer.BasicOptimizationContext(qc), plan);
FunctionImplementationRegistry registry = new FunctionImplementationRegistry(c);
[9/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.
Posted by ja...@apache.org.
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.
I did my best to keep these clean when I split them up, but this core commit
may depend on some minor changes in the hygiene commit that is also
associated with this bug, so either both should be applied, or neither.
The core commit should be applied first.
protocol/pom.xml
- updated protocol buffer compiler version to 2.6
- this made slight modifications to the formats of a few committed protobuf
files
AutoCloseables
- created org.apache.drill.common.AutoCloseables to handle closing these
quietly
BaseTestQuery, and derivatives
- factored out pieces into QueryTestUtil so they can be reused
DeferredException:
- created this so we can collect exceptions during the shutdown process
Drillbit
- uses AutoCloseables for the WorkManager and for the storeProvider
- allow start() to take a RemoteServiceSet
- private, final, formatting
Foreman
- added new state CANCELLATION_REQUESTED (via UserBitShared.proto) to represent
the time between request of a cancellation, and acknowledgement from all
remote endpoints running fragments on a query's behalf
- created ForemanResult to manage interleaving cleanup effects/failure with
query result state
- does not need to implement Comparable
- does not need to implement Closeable
- thread blocking fixes
- add resultSent flag
- add code to log plan fragments with endpoint assignments
- added finals, cleaned up formatting
- do queue management in acquireQuerySemaphore; local tests pass
- rename getContext() to getQueryContext()
- retain DrillbitContext
- a couple of exception injections for testing
- minor formatting
- TODOs
FragmentContext
- added a DeferredException to collect errors during startup/shutdown sequences
FragmentExecutor
- eliminated CancelableQuery
- use the FragmentContext's DeferredException for errors
- common subexpression elimination
- cleaned up
QueryContext
- removed unnecessary functions (with some outside classes tweaked for this)
- finals, formatting
QueryManager
- merge in QueryStatus
- affects Foreman, ../batch/ControlHandlerImpl,
and ../../server/rest/ProfileResources
- made some methods private
- removed unused imports
- add finals and formatting
- variable renaming to improve readability
- formatting
- comments
- TODOs
QueryStatus
- getAsInfo() private
- member renaming
- member access changes
- formatting
- TODOs
QueryTestUtil, BaseTestQuery, TestDrillbitResilience
- make maxWidth a parameter to server startup
SelfCleaningRunnable
- created org.apache.drill.common.SelfCleaningRunnable
SingleRowListener
- created org.apache.drill.SingleRowListener results listener
- use in TestDrillbitResilience
TestComparisonFunctions
- fix not to close the FragmentContext multiple times
TestDrillbitResilience
- created org.apache.drill.exec.server.TestDrillbitResilience to test drillbit
resilience in the face of exceptions and failures during queries
TestWithZookeeper
- factor out work into ZookeeperHelper so that it can be reused by
TestDrillbitResilience
UserBitShared
- get rid of unused UNKNOWN_QUERY
WorkEventBus
- rename methods, affects Foreman and ControlHandlerImpl
- remove unused WorkerBee reference
- most members final
- formatting
WorkManager
- Closeable to AutoCloseable
- removed unused incomingFragments Set
- eliminated unnecessary eventThread and pendingTasks by posting Runnables
directly to executor
- use SelfCleaningRunnable for Foreman management
- FragmentExecutor management uses SelfCleaningRunnable
- runningFragments to be a ConcurrentHashMap; TestTpchDistributed passes
- other improvements due to bee no longer needed in various places
- most members final
- minor formatting
- comments
- TODOs
(*) Created exception injection classes to simulate exceptions for testing
- ExceptionInjection
- ExceptionInjector
- ExceptionInjectionUtil
- TestExceptionInjection
DRILL-2245-hygiene: General code cleanup encountered while working on the rest
of this commit. This includes
- making members final whenever possible
- making members private whenever possible
- making loggers private
- removing unused imports
- removing unused private functions
- removing unused public functions
- removing unused local variables
- removing unused private members
- deleting unused files
- cleaning up formatting
- adding spaces before braces in conditionals and loop bodies
- breaking up overly long lines
- removing extra blank lines
While I tried to keep this clean, this commit may have minor dependencies on
DRILL-2245-core that I missed. The intention is just to break this up for
review purposes. Either both commits should be applied, or neither.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/2da618cd
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/2da618cd
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/2da618cd
Branch: refs/heads/master
Commit: 2da618cd4da33ad55021935933bc28a18a658b74
Parents: ff9882b
Author: Chris Westin <cw...@yahoo.com>
Authored: Wed Feb 25 10:59:36 2015 -0800
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Thu Mar 19 14:06:55 2015 -0700
----------------------------------------------------------------------
.../org/apache/drill/common/AutoCloseables.java | 45 +
.../apache/drill/common/DeferredException.java | 121 ++
.../drill/common/SelfCleaningRunnable.java | 52 +
.../apache/drill/common/config/DrillConfig.java | 7 +-
.../org/apache/drill/exec/ExecConstants.java | 4 +
.../apache/drill/exec/client/DrillClient.java | 19 +-
.../drill/exec/compile/ClassTransformer.java | 7 +-
.../coord/local/LocalClusterCoordinator.java | 63 +-
.../apache/drill/exec/ops/FragmentContext.java | 144 +-
.../org/apache/drill/exec/ops/QueryContext.java | 108 +-
.../apache/drill/exec/opt/BasicOptimizer.java | 172 +--
.../drill/exec/opt/IdentityOptimizer.java | 10 +-
.../org/apache/drill/exec/opt/Optimizer.java | 17 +-
.../drill/exec/physical/impl/BaseRootExec.java | 1 +
.../drill/exec/physical/impl/RootExec.java | 5 -
.../drill/exec/physical/impl/ScreenCreator.java | 7 +-
.../exec/physical/impl/SendingAccountor.java | 1 +
.../impl/materialize/QueryWritableBatch.java | 14 +-
.../OrderedPartitionRecordBatch.java | 1 +
.../impl/producer/ProducerConsumerBatch.java | 5 +
.../drill/exec/planner/fragment/Fragment.java | 1 +
.../planner/fragment/SimpleParallelizer.java | 3 +-
.../planner/sql/handlers/SetOptionHandler.java | 21 +-
.../org/apache/drill/exec/rpc/BasicClient.java | 4 +-
.../org/apache/drill/exec/rpc/BasicServer.java | 3 +-
.../drill/exec/rpc/NamedThreadFactory.java | 56 +-
.../drill/exec/rpc/ReconnectingConnection.java | 1 +
.../apache/drill/exec/rpc/RemoteConnection.java | 2 +
.../java/org/apache/drill/exec/rpc/RpcBus.java | 1 -
.../drill/exec/rpc/control/Controller.java | 2 +-
.../drill/exec/rpc/control/ControllerImpl.java | 2 +-
.../drill/exec/rpc/control/WorkEventBus.java | 49 +-
.../exec/rpc/data/DataConnectionCreator.java | 2 +-
.../exec/rpc/data/DataResponseHandlerImpl.java | 33 +-
.../apache/drill/exec/rpc/data/DataTunnel.java | 2 +
.../apache/drill/exec/rpc/user/UserClient.java | 2 +-
.../apache/drill/exec/rpc/user/UserServer.java | 1 -
.../org/apache/drill/exec/server/Drillbit.java | 158 +--
.../drill/exec/server/DrillbitContext.java | 37 +-
.../server/options/DrillConfigIterator.java | 4 -
.../server/options/SessionOptionManager.java | 5 +-
.../server/options/SystemOptionManager.java | 1 +
.../server/rest/profile/ProfileResources.java | 18 +-
.../drill/exec/service/ServiceEngine.java | 2 +-
.../drill/exec/store/sys/local/FilePStore.java | 23 +-
.../drill/exec/testing/ExceptionInjection.java | 133 ++
.../drill/exec/testing/ExceptionInjector.java | 112 ++
.../drill/exec/testing/InjectionSite.java | 72 +
.../drill/exec/testing/SimulatedExceptions.java | 164 +++
.../apache/drill/exec/work/CancelableQuery.java | 22 -
.../apache/drill/exec/work/QueryWorkUnit.java | 14 +-
.../apache/drill/exec/work/StatusProvider.java | 29 -
.../org/apache/drill/exec/work/WorkManager.java | 255 ++--
.../exec/work/batch/ControlHandlerImpl.java | 101 +-
.../exec/work/batch/SpoolingRawBatchBuffer.java | 1 +
.../work/batch/UnlimitedRawBatchBuffer.java | 1 +
.../work/foreman/DrillbitStatusListener.java | 2 +-
.../apache/drill/exec/work/foreman/Foreman.java | 1004 +++++++++-----
.../drill/exec/work/foreman/FragmentData.java | 29 +-
.../work/foreman/FragmentStatusListener.java | 2 -
.../drill/exec/work/foreman/QueryManager.java | 323 ++++-
.../drill/exec/work/foreman/QueryStatus.java | 255 ----
.../exec/work/fragment/FragmentExecutor.java | 199 +--
.../work/fragment/NonRootFragmentManager.java | 12 +-
.../exec/work/fragment/RootFragmentManager.java | 1 +
.../java/org/apache/drill/BaseTestQuery.java | 69 +-
.../java/org/apache/drill/PlanTestBase.java | 60 +-
.../java/org/apache/drill/QueryTestUtil.java | 154 +++
.../org/apache/drill/SingleRowListener.java | 138 ++
.../test/java/org/apache/drill/TestBuilder.java | 4 +-
.../org/apache/drill/TestTpchDistributed.java | 4 +-
.../apache/drill/exec/DrillSystemTestBase.java | 6 +-
.../apache/drill/exec/TestWithZookeeper.java | 52 +-
.../org/apache/drill/exec/ZookeeperHelper.java | 102 ++
.../exec/physical/impl/SimpleRootExec.java | 10 +-
.../physical/impl/TestComparisonFunctions.java | 20 +-
.../exec/physical/impl/TestOptiqPlans.java | 9 +-
.../exec/server/TestDrillbitResilience.java | 398 ++++++
.../exec/testing/ExceptionInjectionUtil.java | 82 ++
.../exec/testing/TestExceptionInjection.java | 192 +++
.../apache/drill/jdbc/DrillConnectionImpl.java | 1 +
.../org/apache/drill/jdbc/test/JdbcAssert.java | 10 +-
protocol/pom.xml | 20 +-
.../apache/drill/common/types/TypeProtos.java | 64 +-
.../org/apache/drill/exec/proto/BitControl.java | 372 +++---
.../org/apache/drill/exec/proto/BitData.java | 153 +--
.../drill/exec/proto/CoordinationProtos.java | 177 ++-
.../org/apache/drill/exec/proto/ExecProtos.java | 59 +-
.../drill/exec/proto/GeneralRPCProtos.java | 134 +-
.../drill/exec/proto/SchemaDefProtos.java | 15 +-
.../apache/drill/exec/proto/UserBitShared.java | 1232 ++++++++----------
.../org/apache/drill/exec/proto/UserProtos.java | 298 +++--
.../drill/exec/proto/beans/QueryResult.java | 4 +-
protocol/src/main/protobuf/UserBitShared.proto | 6 +-
94 files changed, 4667 insertions(+), 3145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/common/src/main/java/org/apache/drill/common/AutoCloseables.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/AutoCloseables.java b/common/src/main/java/org/apache/drill/common/AutoCloseables.java
new file mode 100644
index 0000000..39c5d78
--- /dev/null
+++ b/common/src/main/java/org/apache/drill/common/AutoCloseables.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.common;
+
+import org.slf4j.Logger;
+
+/**
+ * Utilities for AutoCloseable classes.
+ */
+public class AutoCloseables {
+ /**
+ * Close an {@link AutoCloseable}, catching and logging any exceptions at
+ * INFO level.
+ *
+ * <p>This can be dangerous if there is any possibility of recovery. See
+ * the <a href="https://code.google.com/p/guava-libraries/issues/detail?id=1118">
+ * notes regarding the deprecation of Guava's
+ * {@link com.google.common.io.Closeables#closeQuietly}</a>.
+ *
+ * @param ac the AutoCloseable to close
+ * @param logger the logger to use to record the exception if there was one
+ */
+ public static void close(final AutoCloseable ac, final Logger logger) {
+ try {
+ ac.close();
+ } catch(Exception e) {
+ logger.info("Failure on close(): " + e);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/common/src/main/java/org/apache/drill/common/DeferredException.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/DeferredException.java b/common/src/main/java/org/apache/drill/common/DeferredException.java
new file mode 100644
index 0000000..99f18f1
--- /dev/null
+++ b/common/src/main/java/org/apache/drill/common/DeferredException.java
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.common;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * Collects one or more exceptions that may occur, using
+ * <a href="http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html#suppressed-exceptions">
+ * suppressed exceptions</a>.
+ * When this AutoCloseable is closed, if there was an exception added, it will be thrown. If more than one
+ * exception was added, then all but the first will be added to the first as suppressed
+ * exceptions.
+ *
+ * <p>This class is thread safe.
+ */
+public class DeferredException implements AutoCloseable {
+ private Exception exception = null;
+ private boolean isClosed = false;
+
+ /**
+ * Add an exception. If this is the first exception added, it will be the one
+ * that is thrown when this is closed. If not the first exception, then it will
+ * be added to the suppressed exceptions on the first exception.
+ *
+ * @param exception the exception to add
+ */
+ public void addException(final Exception exception) {
+ Preconditions.checkNotNull(exception);
+
+ synchronized(this) {
+ Preconditions.checkState(!isClosed);
+
+ if (this.exception == null) {
+ this.exception = exception;
+ } else {
+ this.exception.addSuppressed(exception);
+ }
+ }
+ }
+
+ public void addThrowable(final Throwable throwable) {
+ Preconditions.checkNotNull(throwable);
+
+ if (throwable instanceof Exception) {
+ addException((Exception) throwable);
+ return;
+ }
+
+ addException(new RuntimeException(throwable));
+ }
+
+ /**
+ * Get the deferred exception, if there is one. Note that if this returns null,
+ * the result could change at any time.
+ *
+ * @return the deferred exception, or null
+ */
+ public Exception getException() {
+ synchronized(this) {
+ return exception;
+ }
+ }
+
+ /**
+ * Close the given AutoCloseable, suppressing any exceptions that are thrown.
+ * If an exception is thrown, the rules for {@link #addException(Exception)}
+ * are followed.
+ *
+ * @param autoCloseable the AutoCloseable to close; may be null
+ */
+ public void suppressingClose(final AutoCloseable autoCloseable) {
+ synchronized(this) {
+ /*
+ * For the sake of detecting code that doesn't follow the conventions,
+ * we want this to complain whether the closeable exists or not.
+ */
+ Preconditions.checkState(!isClosed);
+
+ if (autoCloseable == null) {
+ return;
+ }
+
+ try {
+ autoCloseable.close();
+ } catch(Exception e) {
+ addException(e);
+ }
+ }
+ }
+
+ @Override
+ public void close() throws Exception {
+ synchronized(this) {
+ Preconditions.checkState(!isClosed);
+
+ try {
+ if (exception != null) {
+ throw exception;
+ }
+ } finally {
+ isClosed = true;
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java b/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java
new file mode 100644
index 0000000..6a69721
--- /dev/null
+++ b/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.common;
+
+/**
+ * A wrapper for Runnables that provides a hook to do cleanup.
+ */
+public abstract class SelfCleaningRunnable implements Runnable {
+ private final Runnable runnable;
+
+ /**
+ * Constructor.
+ *
+ * @param runnable the Runnable to wrap
+ */
+ public SelfCleaningRunnable(final Runnable runnable) {
+ this.runnable = runnable;
+ }
+
+ @Override
+ public void run() {
+ try {
+ runnable.run();
+ } finally {
+ cleanup();
+ }
+ }
+
+ /**
+ * Cleanup.
+ *
+ * <p>Derived classes should put any necessary cleanup in here. This
+ * is guaranteed to be called, even if the wrapped Runnable throws an
+ * exception.
+ */
+ protected abstract void cleanup();
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
index e8b2478..2b9b740 100644
--- a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
+++ b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
@@ -46,8 +46,7 @@ import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
public final class DrillConfig extends NestedConfig{
-
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillConfig.class);
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillConfig.class);
private final ObjectMapper mapper;
private final ImmutableList<String> startupArguments;
@SuppressWarnings("restriction") private static final long MAX_DIRECT_MEMORY = sun.misc.VM.maxDirectMemory();
@@ -219,14 +218,12 @@ public final class DrillConfig extends NestedConfig{
return this.root().render();
}
- public static void main(String[] args) throws Exception{
+ public static void main(String[] args) throws Exception {
//"-XX:MaxDirectMemorySize"
DrillConfig config = DrillConfig.create();
-
}
public static long getMaxDirectMemory() {
return MAX_DIRECT_MEMORY;
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java
index 93d06f0..cd0a0a2 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java
@@ -202,4 +202,8 @@ public interface ExecConstants {
public static final String ENABLE_WINDOW_FUNCTIONS = "window.enable";
public static final OptionValidator ENABLE_WINDOW_FUNCTIONS_VALIDATOR = new BooleanValidator(ENABLE_WINDOW_FUNCTIONS, false);
+
+ public static final String DRILLBIT_EXCEPTION_INJECTIONS = "drill.exec.testing.exception-injections";
+ public static final OptionValidator DRILLBIT_EXCEPTION_INJECTIONS_VALIDATOR =
+ new StringValidator(DRILLBIT_EXCEPTION_INJECTIONS, "");
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
index 04b955b..c3a873c 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
@@ -98,7 +98,7 @@ public class DrillClient implements Closeable, ConnectionThrottle{
public DrillClient(DrillConfig config, ClusterCoordinator coordinator, BufferAllocator allocator) {
this.ownsZkConnection = coordinator == null;
this.ownsAllocator = allocator == null;
- this.allocator = allocator == null ? new TopLevelAllocator(config) : allocator;
+ this.allocator = ownsAllocator ? new TopLevelAllocator(config) : allocator;
this.config = config;
this.clusterCoordinator = coordinator;
this.reconnectTimes = config.getInt(ExecConstants.BIT_RETRY_TIMES);
@@ -131,7 +131,7 @@ public class DrillClient implements Closeable, ConnectionThrottle{
/**
* Connects the client to a Drillbit server
*
- * @throws IOException
+ * @throws RpcException
*/
public void connect() throws RpcException {
connect(null, new Properties());
@@ -176,7 +176,7 @@ public class DrillClient implements Closeable, ConnectionThrottle{
connected = true;
}
- protected EventLoopGroup createEventLoop(int size, String prefix) {
+ protected static EventLoopGroup createEventLoop(int size, String prefix) {
return TransportCheck.createEventLoopGroup(size, prefix);
}
@@ -204,12 +204,8 @@ public class DrillClient implements Closeable, ConnectionThrottle{
private void connect(DrillbitEndpoint endpoint) throws RpcException {
FutureHandler f = new FutureHandler();
- try {
- client.connect(f, endpoint, props, getUserCredentials());
- f.checkedGet();
- } catch (InterruptedException e) {
- throw new RpcException(e);
- }
+ client.connect(f, endpoint, props, getUserCredentials());
+ f.checkedGet();
}
public BufferAllocator getAllocator() {
@@ -219,6 +215,7 @@ public class DrillClient implements Closeable, ConnectionThrottle{
/**
* Closes this client's connection to the server
*/
+ @Override
public void close() {
if (this.client != null) {
this.client.close();
@@ -286,15 +283,13 @@ public class DrillClient implements Closeable, ConnectionThrottle{
* Submits a Logical plan for direct execution (bypasses parsing)
*
* @param plan the plan to execute
- * @return a handle for the query result
- * @throws RpcException
*/
public void runQuery(QueryType type, String plan, UserResultsListener resultsListener) {
client.submitQuery(resultsListener, newBuilder().setResultsMode(STREAM_FULL).setType(type).setPlan(plan).build());
}
private class ListHoldingResultsListener implements UserResultsListener {
- private Vector<QueryResultBatch> results = new Vector<QueryResultBatch>();
+ private Vector<QueryResultBatch> results = new Vector<>();
private SettableFuture<List<QueryResultBatch>> future = SettableFuture.create();
private UserProtos.RunQuery query ;
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java
index 5c65724..493f6ce 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java
@@ -294,14 +294,11 @@ public class ClassTransformer {
if (templateDefinition.getExternalInterface().isAssignableFrom(c)) {
logger.debug("Done compiling (bytecode size={}, time:{} millis).", DrillStringUtils.readable(totalBytecodeSize), (System.nanoTime() - t1) / 1000000);
return c;
- } else {
- throw new ClassTransformationException("The requested class did not implement the expected interface.");
}
+
+ throw new ClassTransformationException("The requested class did not implement the expected interface.");
} catch (CompileException | IOException | ClassNotFoundException e) {
throw new ClassTransformationException(String.format("Failure generating transformation classes for value: \n %s", entireClass), e);
}
-
}
-
}
-
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java
index 035c1aa..27868f0 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Map;
import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -32,10 +33,15 @@ import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
import com.google.common.collect.Maps;
public class LocalClusterCoordinator extends ClusterCoordinator {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LocalClusterCoordinator.class);
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LocalClusterCoordinator.class);
- private volatile Map<RegistrationHandle, DrillbitEndpoint> endpoints = Maps.newConcurrentMap();
- private volatile ConcurrentMap<String, DistributedSemaphore> semaphores = Maps.newConcurrentMap();
+ /*
+ * Since we hand out the endpoints list in {@see #getAvailableEndpoints()}, we use a
+ * {@see java.util.concurrent.ConcurrentHashMap} because those guarantee not to throw
+ * ConcurrentModificationException.
+ */
+ private final Map<RegistrationHandle, DrillbitEndpoint> endpoints = new ConcurrentHashMap<>();
+ private final ConcurrentMap<String, DistributedSemaphore> semaphores = Maps.newConcurrentMap();
@Override
public void close() throws IOException {
@@ -43,21 +49,21 @@ public class LocalClusterCoordinator extends ClusterCoordinator {
}
@Override
- public void start(long millis) throws Exception {
+ public void start(final long millis) throws Exception {
logger.debug("Local Cluster Coordinator started.");
}
@Override
- public RegistrationHandle register(DrillbitEndpoint data) {
+ public RegistrationHandle register(final DrillbitEndpoint data) {
logger.debug("Endpoint registered {}.", data);
- Handle h = new Handle();
+ final Handle h = new Handle();
endpoints.put(h, data);
return h;
}
@Override
- public void unregister(RegistrationHandle handle) {
- if(handle == null) {
+ public void unregister(final RegistrationHandle handle) {
+ if (handle == null) {
return;
}
@@ -69,8 +75,8 @@ public class LocalClusterCoordinator extends ClusterCoordinator {
return endpoints.values();
}
- private class Handle implements RegistrationHandle{
- UUID id = UUID.randomUUID();
+ private class Handle implements RegistrationHandle {
+ private final UUID id = UUID.randomUUID();
@Override
public int hashCode() {
@@ -82,7 +88,7 @@ public class LocalClusterCoordinator extends ClusterCoordinator {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -92,7 +98,7 @@ public class LocalClusterCoordinator extends ClusterCoordinator {
if (getClass() != obj.getClass()) {
return false;
}
- Handle other = (Handle) obj;
+ final Handle other = (Handle) obj;
if (!getOuterType().equals(other.getOuterType())) {
return false;
}
@@ -109,41 +115,38 @@ public class LocalClusterCoordinator extends ClusterCoordinator {
private LocalClusterCoordinator getOuterType() {
return LocalClusterCoordinator.this;
}
-
}
@Override
- public DistributedSemaphore getSemaphore(String name, int maximumLeases) {
- semaphores.putIfAbsent(name, new LocalSemaphore(maximumLeases));
+ public DistributedSemaphore getSemaphore(final String name, final int maximumLeases) {
+ if (!semaphores.containsKey(name)) {
+ semaphores.putIfAbsent(name, new LocalSemaphore(maximumLeases));
+ }
return semaphores.get(name);
}
- public class LocalSemaphore implements DistributedSemaphore{
-
- private final Semaphore inner;
- private final LocalLease lease = new LocalLease();
+ public class LocalSemaphore implements DistributedSemaphore {
+ private final Semaphore semaphore;
+ private final LocalLease localLease = new LocalLease();
- public LocalSemaphore(int size) {
- inner = new Semaphore(size);
+ public LocalSemaphore(final int size) {
+ semaphore = new Semaphore(size);
}
@Override
- public DistributedLease acquire(long timeout, TimeUnit unit) throws Exception {
- if(!inner.tryAcquire(timeout, unit)) {
+ public DistributedLease acquire(final long timeout, final TimeUnit timeUnit) throws Exception {
+ if (!semaphore.tryAcquire(timeout, timeUnit)) {
return null;
- }else{
- return lease;
+ } else {
+ return localLease;
}
}
- private class LocalLease implements DistributedLease{
-
+ private class LocalLease implements DistributedLease {
@Override
public void close() throws Exception {
- inner.release();
+ semaphore.release();
}
-
}
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java
index 2a6660e..5e31e5c 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java
@@ -19,7 +19,6 @@ package org.apache.drill.exec.ops;
import io.netty.buffer.DrillBuf;
-import java.io.Closeable;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -27,9 +26,9 @@ import java.util.Map;
import net.hydromatic.optiq.SchemaPlus;
import net.hydromatic.optiq.jdbc.SimpleOptiqSchema;
+import org.apache.drill.common.DeferredException;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.exceptions.ExecutionSetupException;
-import org.apache.drill.exec.compile.QueryClassLoader;
import org.apache.drill.exec.exception.ClassTransformationException;
import org.apache.drill.exec.expr.ClassGenerator;
import org.apache.drill.exec.expr.CodeGenerator;
@@ -39,7 +38,6 @@ import org.apache.drill.exec.memory.OutOfMemoryException;
import org.apache.drill.exec.proto.BitControl.PlanFragment;
import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
-import org.apache.drill.exec.proto.UserBitShared.UserCredentials;
import org.apache.drill.exec.rpc.control.ControlTunnel;
import org.apache.drill.exec.rpc.data.DataTunnel;
import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection;
@@ -49,53 +47,52 @@ import org.apache.drill.exec.server.options.OptionList;
import org.apache.drill.exec.server.options.OptionManager;
import org.apache.drill.exec.work.batch.IncomingBuffers;
-import com.carrotsearch.hppc.LongObjectOpenHashMap;
-import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
* Contextual objects required for execution of a particular fragment.
*/
public class FragmentContext implements AutoCloseable, UdfUtilities {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentContext.class);
-
-
- private Map<DrillbitEndpoint, DataTunnel> tunnels = Maps.newHashMap();
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentContext.class);
+ private final Map<DrillbitEndpoint, DataTunnel> tunnels = Maps.newHashMap();
private final DrillbitContext context;
private final UserClientConnection connection;
private final FragmentStats stats;
private final FunctionImplementationRegistry funcRegistry;
- private final QueryClassLoader loader;
private final BufferAllocator allocator;
private final PlanFragment fragment;
- private List<Thread> daemonThreads = Lists.newLinkedList();
- private QueryDateTimeInfo queryDateTimeInfo;
+ private final QueryDateTimeInfo queryDateTimeInfo;
private IncomingBuffers buffers;
private final OptionManager fragmentOptions;
- private final UserCredentials credentials;
private final BufferManager bufferManager;
- private volatile Throwable failureCause;
+ private final DeferredException deferredException = new DeferredException();
private volatile FragmentContextState state = FragmentContextState.OK;
+ /*
+ * TODO we need a state that indicates that cancellation has been requested and
+ * is in progress. Early termination (such as from limit queries) could also use
+ * this, as the cleanup steps should be exactly the same.
+ */
private static enum FragmentContextState {
OK,
FAILED,
CANCELED
}
- public FragmentContext(DrillbitContext dbContext, PlanFragment fragment, UserClientConnection connection,
- FunctionImplementationRegistry funcRegistry) throws OutOfMemoryException, ExecutionSetupException {
-
+ public FragmentContext(final DrillbitContext dbContext, final PlanFragment fragment,
+ final UserClientConnection connection, final FunctionImplementationRegistry funcRegistry)
+ throws ExecutionSetupException {
this.context = dbContext;
this.connection = connection;
this.fragment = fragment;
this.funcRegistry = funcRegistry;
- this.credentials = fragment.getCredentials();
- this.queryDateTimeInfo = new QueryDateTimeInfo(fragment.getQueryStartTime(), fragment.getTimeZone());
+ queryDateTimeInfo = new QueryDateTimeInfo(fragment.getQueryStartTime(), fragment.getTimeZone());
+
logger.debug("Getting initial memory allocation of {}", fragment.getMemInitial());
logger.debug("Fragment max allocation: {}", fragment.getMemMax());
+
try {
OptionList list;
if (!fragment.hasOptionsJson() || fragment.getOptionsJson().isEmpty()) {
@@ -103,7 +100,7 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
} else {
list = dbContext.getConfig().getMapper().readValue(fragment.getOptionsJson(), OptionList.class);
}
- this.fragmentOptions = new FragmentOptionManager(context.getOptionManager(), list);
+ fragmentOptions = new FragmentOptionManager(context.getOptionManager(), list);
} catch (Exception e) {
throw new ExecutionSetupException("Failure while reading plan options.", e);
}
@@ -111,15 +108,15 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
// Add the fragment context to the root allocator.
// The QueryManager will call the root allocator to recalculate all the memory limits for all the fragments
try {
- this.allocator = dbContext.getAllocator().getChildAllocator(this, fragment.getMemInitial(), fragment.getMemMax(), true);
+ allocator = context.getAllocator().getChildAllocator(
+ this, fragment.getMemInitial(), fragment.getMemMax(), true);
assert (allocator != null);
- }catch(Throwable e){
+ } catch(Throwable e) {
throw new ExecutionSetupException("Failure while getting memory allocator for fragment.", e);
}
- this.stats = new FragmentStats(allocator, dbContext.getMetrics(), fragment.getAssignment());
- this.bufferManager = new BufferManager(this.allocator, this);
- this.loader = new QueryClassLoader(dbContext.getConfig(), fragmentOptions);
+ stats = new FragmentStats(allocator, dbContext.getMetrics(), fragment.getAssignment());
+ bufferManager = new BufferManager(this.allocator, this);
}
public OptionManager getOptions() {
@@ -133,7 +130,7 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
public void fail(Throwable cause) {
logger.error("Fragment Context received failure.", cause);
setState(FragmentContextState.FAILED);
- failureCause = cause;
+ deferredException.addThrowable(cause);
}
public void cancel() {
@@ -161,11 +158,11 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
fail(new UnsupportedOperationException("Schema tree can only be created in root fragment. " +
"This is a non-root fragment."));
return null;
- } else {
- SchemaPlus root = SimpleOptiqSchema.createRootSchema(false);
- context.getStorage().getSchemaFactory().registerSchemas(connection.getSession(), root);
- return root;
}
+
+ final SchemaPlus root = SimpleOptiqSchema.createRootSchema(false);
+ context.getStorage().getSchemaFactory().registerSchemas(connection.getSession(), root);
+ return root;
}
/**
@@ -177,14 +174,17 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
}
public FragmentStats getStats() {
- return this.stats;
+ return stats;
}
+ @Override
public QueryDateTimeInfo getQueryDateTimeInfo(){
return this.queryDateTimeInfo;
}
- public DrillbitEndpoint getForemanEndpoint() {return fragment.getForeman();}
+ public DrillbitEndpoint getForemanEndpoint() {
+ return fragment.getForeman();
+ }
/**
* The FragmentHandle for this Fragment
@@ -194,31 +194,37 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
return fragment.getHandle();
}
+ private String getFragIdString() {
+ final FragmentHandle handle = getHandle();
+ final String frag = handle != null ? handle.getMajorFragmentId() + ":" + handle.getMinorFragmentId() : "0:0";
+ return frag;
+ }
+
/**
* Get this fragment's allocator.
- * @return
+ * @return the allocator
*/
@Deprecated
public BufferAllocator getAllocator() {
- if(allocator == null){
- FragmentHandle handle=getHandle();
- String frag=handle!=null?handle.getMajorFragmentId()+":"+handle.getMinorFragmentId():"0:0";
- logger.debug("Fragment:"+frag+" Allocator is NULL");
+ if (allocator == null) {
+ logger.debug("Fragment: " + getFragIdString() + " Allocator is NULL");
}
return allocator;
}
- public BufferAllocator getNewChildAllocator(long initialReservation,
- long maximumReservation,
- boolean applyFragmentLimit) throws OutOfMemoryException {
+ public BufferAllocator getNewChildAllocator(final long initialReservation,
+ final long maximumReservation,
+ final boolean applyFragmentLimit) throws OutOfMemoryException {
return allocator.getChildAllocator(this, initialReservation, maximumReservation, applyFragmentLimit);
}
- public <T> T getImplementationClass(ClassGenerator<T> cg) throws ClassTransformationException, IOException {
+ public <T> T getImplementationClass(final ClassGenerator<T> cg)
+ throws ClassTransformationException, IOException {
return getImplementationClass(cg.getCodeGenerator());
}
- public <T> T getImplementationClass(CodeGenerator<T> cg) throws ClassTransformationException, IOException {
+ public <T> T getImplementationClass(final CodeGenerator<T> cg)
+ throws ClassTransformationException, IOException {
return context.getCompiler().getImplementationClass(cg);
}
@@ -238,7 +244,7 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
return connection;
}
- public ControlTunnel getControlTunnel(DrillbitEndpoint endpoint) {
+ public ControlTunnel getControlTunnel(final DrillbitEndpoint endpoint) {
return context.getController().getTunnel(endpoint);
}
@@ -251,24 +257,12 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
return tunnel;
}
- /**
- * Add a new thread to this fragment's context. This thread will likely run for the life of the fragment but should be
- * terminated when the fragment completes. When the fragment completes, the threads will be interrupted.
- *
- * @param thread
- */
- public void addDaemonThread(Thread thread) {
- daemonThreads.add(thread);
- thread.start();
-
- }
-
public IncomingBuffers getBuffers() {
return buffers;
}
public Throwable getFailureCause() {
- return failureCause;
+ return deferredException.getException();
}
public boolean isFailed() {
@@ -283,43 +277,36 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
return funcRegistry;
}
- public UserCredentials getCredentials() {
- return credentials;
- }
-
- public QueryClassLoader getClassLoader() {
- return loader;
- }
-
public DrillConfig getConfig() {
return context.getConfig();
}
- public void setFragmentLimit(long limit) {
- this.allocator.setFragmentLimit(limit);
+ public void setFragmentLimit(final long limit) {
+ allocator.setFragmentLimit(limit);
+ }
+
+ public DeferredException getDeferredException() {
+ return deferredException;
}
@Override
public void close() throws Exception {
- for (Thread thread: daemonThreads) {
- thread.interrupt();
- }
- bufferManager.close();
-
- if (buffers != null) {
- buffers.close();
- }
+ /*
+ * TODO wait for threads working on this Fragment to terminate (or at least stop working
+ * on this Fragment's query)
+ */
+ deferredException.suppressingClose(bufferManager);
+ deferredException.suppressingClose(buffers);
+ deferredException.suppressingClose(allocator);
- FragmentHandle handle=getHandle();
- String frag=handle!=null?handle.getMajorFragmentId()+":"+handle.getMinorFragmentId():"0:0";
- allocator.close();
- logger.debug("Fragment:"+frag+" After close allocator is: "+allocator!=null?"OK":"NULL");
+ deferredException.close(); // must be last, as this may throw
}
public DrillBuf replace(DrillBuf old, int newSize) {
return bufferManager.replace(old, newSize);
}
+ @Override
public DrillBuf getManagedBuffer() {
return bufferManager.getManagedBuffer();
}
@@ -327,5 +314,4 @@ public class FragmentContext implements AutoCloseable, UdfUtilities {
public DrillBuf getManagedBuffer(int size) {
return bufferManager.getManagedBuffer(size);
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java
index fb6b4aa..3b51a69 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java
@@ -24,35 +24,30 @@ import net.hydromatic.optiq.SchemaPlus;
import net.hydromatic.optiq.jdbc.SimpleOptiqSchema;
import org.apache.drill.common.config.DrillConfig;
-import org.apache.drill.exec.coord.ClusterCoordinator;
import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry;
import org.apache.drill.exec.expr.fn.impl.DateUtility;
-import org.apache.drill.exec.planner.PhysicalPlanReader;
import org.apache.drill.common.exceptions.DrillRuntimeException;
import org.apache.drill.exec.memory.BufferAllocator;
import org.apache.drill.exec.memory.OutOfMemoryException;
import org.apache.drill.exec.planner.physical.PlannerSettings;
import org.apache.drill.exec.planner.sql.DrillOperatorTable;
import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
-import org.apache.drill.exec.proto.UserBitShared.QueryId;
-import org.apache.drill.exec.rpc.control.WorkEventBus;
-import org.apache.drill.exec.rpc.data.DataConnectionCreator;
import org.apache.drill.exec.rpc.user.UserSession;
import org.apache.drill.exec.server.DrillbitContext;
import org.apache.drill.exec.server.options.OptionManager;
import org.apache.drill.exec.server.options.QueryOptionManager;
import org.apache.drill.exec.store.StoragePluginRegistry;
+// TODO except for a couple of tests, this is only created by Foreman
+// TODO the many methods that just return drillbitContext.getXxx() should be replaced with getDrillbitContext()
// TODO - consider re-name to PlanningContext, as the query execution context actually appears
// in fragment contexts
-public class QueryContext implements AutoCloseable, UdfUtilities{
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryContext.class);
+public class QueryContext implements AutoCloseable, UdfUtilities {
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryContext.class);
- private final QueryId queryId;
private final DrillbitContext drillbitContext;
- private final WorkEventBus workBus;
- private UserSession session;
- private OptionManager queryOptions;
+ private final UserSession session;
+ private final OptionManager queryOptions;
private final PlannerSettings plannerSettings;
private final DrillOperatorTable table;
@@ -62,32 +57,32 @@ public class QueryContext implements AutoCloseable, UdfUtilities{
private static final int INITIAL_OFF_HEAP_ALLOCATION_IN_BYTES = 1024 * 1024;
private static final int MAX_OFF_HEAP_ALLOCATION_IN_BYTES = 16 * 1024 * 1024;
- // flag to indicate if close has been called, after calling close the first
- // time this is set to true and the close method becomes a no-op
+ /*
+ * Flag to indicate if close has been called, after calling close the first
+ * time this is set to true and the close method becomes a no-op.
+ */
private boolean closed = false;
- public QueryContext(final UserSession session, QueryId queryId, final DrillbitContext drllbitContext) {
- super();
- this.queryId = queryId;
+ public QueryContext(final UserSession session, final DrillbitContext drllbitContext) {
this.drillbitContext = drllbitContext;
- this.workBus = drllbitContext.getWorkBus();
this.session = session;
- this.queryOptions = new QueryOptionManager(session.getOptions());
- this.plannerSettings = new PlannerSettings(queryOptions, getFunctionRegistry());
+ queryOptions = new QueryOptionManager(session.getOptions());
+ plannerSettings = new PlannerSettings(queryOptions, getFunctionRegistry());
plannerSettings.setNumEndPoints(drillbitContext.getBits().size());
- this.table = new DrillOperatorTable(getFunctionRegistry());
+ table = new DrillOperatorTable(getFunctionRegistry());
- long queryStartTime = System.currentTimeMillis();
- int timeZone = DateUtility.getIndex(System.getProperty("user.timezone"));
- this.queryDateTimeInfo = new QueryDateTimeInfo(queryStartTime, timeZone);
+ final long queryStartTime = System.currentTimeMillis();
+ final int timeZone = DateUtility.getIndex(System.getProperty("user.timezone"));
+ queryDateTimeInfo = new QueryDateTimeInfo(queryStartTime, timeZone);
try {
- this.allocator = drllbitContext.getAllocator().getChildAllocator(null, INITIAL_OFF_HEAP_ALLOCATION_IN_BYTES, MAX_OFF_HEAP_ALLOCATION_IN_BYTES, false);
+ allocator = drllbitContext.getAllocator().getChildAllocator(null, INITIAL_OFF_HEAP_ALLOCATION_IN_BYTES,
+ MAX_OFF_HEAP_ALLOCATION_IN_BYTES, false);
} catch (OutOfMemoryException e) {
throw new DrillRuntimeException("Error creating off-heap allocator for planning context.",e);
}
// TODO(DRILL-1942) the new allocator has this capability built-in, so this can be removed once that is available
- this.bufferManager = new BufferManager(this.allocator, null);
+ bufferManager = new BufferManager(this.allocator, null);
}
@@ -95,7 +90,7 @@ public class QueryContext implements AutoCloseable, UdfUtilities{
return plannerSettings;
}
- public UserSession getSession(){
+ public UserSession getSession() {
return session;
}
@@ -103,18 +98,18 @@ public class QueryContext implements AutoCloseable, UdfUtilities{
return allocator;
}
- public SchemaPlus getNewDefaultSchema(){
- SchemaPlus rootSchema = getRootSchema();
- SchemaPlus defaultSchema = session.getDefaultSchema(rootSchema);
- if(defaultSchema == null){
+ public SchemaPlus getNewDefaultSchema() {
+ final SchemaPlus rootSchema = getRootSchema();
+ final SchemaPlus defaultSchema = session.getDefaultSchema(rootSchema);
+ if (defaultSchema == null) {
return rootSchema;
- }else{
- return defaultSchema;
}
+
+ return defaultSchema;
}
- public SchemaPlus getRootSchema(){
- SchemaPlus rootSchema = SimpleOptiqSchema.createRootSchema(false);
+ public SchemaPlus getRootSchema() {
+ final SchemaPlus rootSchema = SimpleOptiqSchema.createRootSchema(false);
drillbitContext.getSchemaFactory().registerSchemas(session, rootSchema);
return rootSchema;
}
@@ -123,43 +118,23 @@ public class QueryContext implements AutoCloseable, UdfUtilities{
return queryOptions;
}
- public OptionManager getSessionOptions() {
- return session.getOptions();
- }
-
- public DrillbitEndpoint getCurrentEndpoint(){
+ public DrillbitEndpoint getCurrentEndpoint() {
return drillbitContext.getEndpoint();
}
- public QueryId getQueryId() {
- return queryId;
- }
-
- public StoragePluginRegistry getStorage(){
+ public StoragePluginRegistry getStorage() {
return drillbitContext.getStorage();
}
- public Collection<DrillbitEndpoint> getActiveEndpoints(){
+ public Collection<DrillbitEndpoint> getActiveEndpoints() {
return drillbitContext.getBits();
}
- public PhysicalPlanReader getPlanReader(){
- return drillbitContext.getPlanReader();
- }
-
- public DataConnectionCreator getDataConnectionsPool(){
- return drillbitContext.getDataConnectionsPool();
- }
-
- public DrillConfig getConfig(){
+ public DrillConfig getConfig() {
return drillbitContext.getConfig();
}
- public WorkEventBus getWorkBus(){
- return workBus;
- }
-
- public FunctionImplementationRegistry getFunctionRegistry(){
+ public FunctionImplementationRegistry getFunctionRegistry() {
return drillbitContext.getFunctionImplementationRegistry();
}
@@ -167,10 +142,6 @@ public class QueryContext implements AutoCloseable, UdfUtilities{
return table;
}
- public ClusterCoordinator getClusterCoordinator() {
- return drillbitContext.getClusterCoordinator();
- }
-
@Override
public QueryDateTimeInfo getQueryDateTimeInfo() {
return queryDateTimeInfo;
@@ -183,10 +154,13 @@ public class QueryContext implements AutoCloseable, UdfUtilities{
@Override
public void close() throws Exception {
- if (!closed) {
- // TODO(DRILL-1942) the new allocator has this capability built-in, so this can be removed once that is available
- bufferManager.close();
- allocator.close();
+ try {
+ if (!closed) {
+ // TODO(DRILL-1942) the new allocator has this capability built-in, so this can be removed once that is available
+ bufferManager.close();
+ allocator.close();
+ }
+ } finally {
closed = true;
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java
index 9f89f24..b1a71a5 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java
@@ -29,6 +29,7 @@ import org.apache.drill.common.logical.data.Filter;
import org.apache.drill.common.logical.data.GroupingAggregate;
import org.apache.drill.common.logical.data.Join;
import org.apache.drill.common.logical.data.JoinCondition;
+import org.apache.drill.common.logical.data.LogicalOperator;
import org.apache.drill.common.logical.data.NamedExpression;
import org.apache.drill.common.logical.data.Order;
import org.apache.drill.common.logical.data.Order.Ordering;
@@ -52,10 +53,8 @@ import org.apache.drill.exec.physical.config.SelectionVectorRemover;
import org.apache.drill.exec.physical.config.Sort;
import org.apache.drill.exec.physical.config.StreamingAggregate;
import org.apache.drill.exec.physical.config.WindowPOP;
-import org.apache.drill.exec.rpc.user.UserServer;
import org.apache.drill.exec.server.options.OptionManager;
import org.apache.drill.exec.store.StoragePlugin;
-import org.apache.drill.exec.work.foreman.ForemanException;
import org.eigenbase.rel.RelFieldCollation.Direction;
import org.eigenbase.rel.RelFieldCollation.NullDirection;
@@ -63,87 +62,49 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
-public class BasicOptimizer extends Optimizer{
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BasicOptimizer.class);
+public class BasicOptimizer extends Optimizer {
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BasicOptimizer.class);
- private DrillConfig config;
- private QueryContext context;
- private UserServer.UserClientConnection userSession;
+ private final QueryContext queryContext;
- public BasicOptimizer(DrillConfig config, QueryContext context, UserServer.UserClientConnection userSession){
- this.config = config;
- this.context = context;
- this.userSession = userSession;
- logCurrentOptionValues();
- }
-
- private void logCurrentOptionValues(){
-// Iterator<DrillOptionValue> optionVals = userSession.getSessionOptionIterator();
-// DrillOptionValue val = null;
-// String output = "";
-// output += "SessionOptions: {\n";
-// for ( ;optionVals.hasNext(); val = optionVals.next()){
-// if (val != null) {
-// output += val.getOptionName() + ":" + val.getValue() + ",\n";
-// }
-// }
-// output += "}";
-// logger.debug(output);
- }
-
- /**
- * Get the current value of an option. Session options override global options.
- *
- * @param name - the name of the option
- * @return - value of the option
- */
- private Object getOptionValue(String name) {
-// Object val = userSession.getSessionLevelOption(name);
-// if (val == null) {
-// context.getOptionValue(name);
-// }
-// return val;
- return null;
+ public BasicOptimizer(final QueryContext queryContext) {
+ this.queryContext = queryContext;
}
@Override
- public void init(DrillConfig config) {
-
+ public void init(final DrillConfig config) {
}
@Override
- public PhysicalPlan optimize(OptimizationContext context, LogicalPlan plan) throws OptimizerException{
- Object obj = new Object();
- Collection<SinkOperator> roots = plan.getGraph().getRoots();
- List<PhysicalOperator> physOps = new ArrayList<PhysicalOperator>(roots.size());
- LogicalConverter converter = new LogicalConverter(plan);
- for ( SinkOperator op : roots){
- PhysicalOperator pop = op.accept(converter, obj);
+ public PhysicalPlan optimize(final OptimizationContext context, final LogicalPlan plan)
+ throws OptimizerException {
+ final Object obj = new Object();
+ final Collection<SinkOperator> roots = plan.getGraph().getRoots();
+ final List<PhysicalOperator> physOps = new ArrayList<>(roots.size());
+ final LogicalConverter converter = new LogicalConverter(plan);
+
+ for (SinkOperator op : roots) {
+ final PhysicalOperator pop = op.accept(converter, obj);
physOps.add(pop);
}
- PlanProperties props = PlanProperties.builder()
+ final PlanProperties logicalProperties = plan.getProperties();
+ final PlanProperties props = PlanProperties.builder()
.type(PlanProperties.PlanType.APACHE_DRILL_PHYSICAL)
- .version(plan.getProperties().version)
- .generator(plan.getProperties().generator)
+ .version(logicalProperties.version)
+ .generator(logicalProperties.generator)
.options(new JSONOptions(context.getOptions().getOptionList())).build();
- PhysicalPlan p = new PhysicalPlan(props, physOps);
+ final PhysicalPlan p = new PhysicalPlan(props, physOps);
return p;
- //return new PhysicalPlan(props, physOps);
- }
-
- @Override
- public void close() {
-
}
public static class BasicOptimizationContext implements OptimizationContext {
-
- private OptionManager ops;
- public BasicOptimizationContext(QueryContext c){
- this.ops = c.getOptions();
+ private final OptionManager ops;
+ public BasicOptimizationContext(final QueryContext c) {
+ ops = c.getOptions();
}
@Override
@@ -159,64 +120,65 @@ public class BasicOptimizer extends Optimizer{
private class LogicalConverter extends AbstractLogicalVisitor<PhysicalOperator, Object, OptimizerException> {
- // storing a reference to the plan for access to other elements outside of the query graph
- // such as the storage engine configs
- LogicalPlan logicalPlan;
+ /*
+ * Store a reference to the plan for access to other elements outside of the query graph
+ * such as the storage engine configs.
+ */
+ private final LogicalPlan logicalPlan;
- public LogicalConverter(LogicalPlan logicalPlan){
+ public LogicalConverter(final LogicalPlan logicalPlan) {
this.logicalPlan = logicalPlan;
}
@Override
public PhysicalOperator visitGroupingAggregate(GroupingAggregate groupBy, Object value) throws OptimizerException {
-
- List<Ordering> orderDefs = Lists.newArrayList();
-
-
+ final List<Ordering> orderDefs = Lists.newArrayList();
PhysicalOperator input = groupBy.getInput().accept(this, value);
- if(groupBy.getKeys().length > 0){
- for(NamedExpression e : groupBy.getKeys()){
+ if (groupBy.getKeys().length > 0) {
+ for(NamedExpression e : groupBy.getKeys()) {
orderDefs.add(new Ordering(Direction.ASCENDING, e.getExpr(), NullDirection.FIRST));
}
input = new Sort(input, orderDefs, false);
}
- StreamingAggregate sa = new StreamingAggregate(input, groupBy.getKeys(), groupBy.getExprs(), 1.0f);
+ final StreamingAggregate sa = new StreamingAggregate(input, groupBy.getKeys(), groupBy.getExprs(), 1.0f);
return sa;
}
@Override
- public PhysicalOperator visitWindow(Window window, Object value) throws OptimizerException {
+ public PhysicalOperator visitWindow(final Window window, final Object value) throws OptimizerException {
PhysicalOperator input = window.getInput().accept(this, value);
-
- List<Ordering> ods = Lists.newArrayList();
+ final List<Ordering> ods = Lists.newArrayList();
input = new Sort(input, ods, false);
- return new WindowPOP(input, window.getWithins(), window.getAggregations(), window.getOrderings(), window.getStart(), window.getEnd());
+ return new WindowPOP(input, window.getWithins(), window.getAggregations(),
+ window.getOrderings(), window.getStart(), window.getEnd());
}
@Override
- public PhysicalOperator visitOrder(Order order, Object value) throws OptimizerException {
- PhysicalOperator input = order.getInput().accept(this, value);
- List<Ordering> ods = Lists.newArrayList();
+ public PhysicalOperator visitOrder(final Order order, final Object value) throws OptimizerException {
+ final PhysicalOperator input = order.getInput().accept(this, value);
+ final List<Ordering> ods = Lists.newArrayList();
for (Ordering o : order.getOrderings()){
ods.add(o);
}
+
return new SelectionVectorRemover(new Sort(input, ods, false));
}
@Override
- public PhysicalOperator visitLimit(org.apache.drill.common.logical.data.Limit limit, Object value) throws OptimizerException {
- PhysicalOperator input = limit.getInput().accept(this, value);
+ public PhysicalOperator visitLimit(final org.apache.drill.common.logical.data.Limit limit,
+ final Object value) throws OptimizerException {
+ final PhysicalOperator input = limit.getInput().accept(this, value);
return new SelectionVectorRemover(new Limit(input, limit.getFirst(), limit.getLast()));
}
@Override
- public PhysicalOperator visitJoin(Join join, Object value) throws OptimizerException {
+ public PhysicalOperator visitJoin(final Join join, final Object value) throws OptimizerException {
PhysicalOperator leftOp = join.getLeft().accept(this, value);
- List<Ordering> leftOrderDefs = Lists.newArrayList();
+ final List<Ordering> leftOrderDefs = Lists.newArrayList();
for(JoinCondition jc : join.getConditions()){
leftOrderDefs.add(new Ordering(Direction.ASCENDING, jc.getLeft()));
}
@@ -224,28 +186,28 @@ public class BasicOptimizer extends Optimizer{
leftOp = new SelectionVectorRemover(leftOp);
PhysicalOperator rightOp = join.getRight().accept(this, value);
- List<Ordering> rightOrderDefs = Lists.newArrayList();
+ final List<Ordering> rightOrderDefs = Lists.newArrayList();
for(JoinCondition jc : join.getConditions()){
rightOrderDefs.add(new Ordering(Direction.ASCENDING, jc.getRight()));
}
rightOp = new Sort(rightOp, rightOrderDefs, false);
rightOp = new SelectionVectorRemover(rightOp);
- MergeJoinPOP mjp = new MergeJoinPOP(leftOp, rightOp, Arrays.asList(join.getConditions()), join.getJoinType());
+ final MergeJoinPOP mjp = new MergeJoinPOP(leftOp, rightOp, Arrays.asList(join.getConditions()),
+ join.getJoinType());
return new SelectionVectorRemover(mjp);
}
-
-
@Override
- public PhysicalOperator visitScan(Scan scan, Object obj) throws OptimizerException {
- StoragePluginConfig config = logicalPlan.getStorageEngineConfig(scan.getStorageEngine());
+ public PhysicalOperator visitScan(final Scan scan, final Object obj) throws OptimizerException {
+ final StoragePluginConfig config = logicalPlan.getStorageEngineConfig(scan.getStorageEngine());
if(config == null) {
- throw new OptimizerException(String.format("Logical plan referenced the storage engine config %s but the logical plan didn't have that available as a config.", scan.getStorageEngine()));
+ throw new OptimizerException(
+ String.format("Logical plan referenced the storage engine config %s but the logical plan didn't have that available as a config.",
+ scan.getStorageEngine()));
}
- StoragePlugin storagePlugin;
try {
- storagePlugin = context.getStorage().getPlugin(config);
+ final StoragePlugin storagePlugin = queryContext.getStorage().getPlugin(config);
return storagePlugin.getPhysicalScan(scan.getSelection());
} catch (IOException | ExecutionSetupException e) {
throw new OptimizerException("Failure while attempting to retrieve storage engine.", e);
@@ -253,27 +215,27 @@ public class BasicOptimizer extends Optimizer{
}
@Override
- public PhysicalOperator visitStore(Store store, Object obj) throws OptimizerException {
- if (!store.iterator().hasNext()) {
+ public PhysicalOperator visitStore(final Store store, final Object obj) throws OptimizerException {
+ final Iterator<LogicalOperator> iterator = store.iterator();
+ if (!iterator.hasNext()) {
throw new OptimizerException("Store node in logical plan does not have a child.");
}
- return new Screen(store.iterator().next().accept(this, obj), context.getCurrentEndpoint());
+ return new Screen(iterator.next().accept(this, obj), queryContext.getCurrentEndpoint());
}
@Override
- public PhysicalOperator visitProject(Project project, Object obj) throws OptimizerException {
- return new org.apache.drill.exec.physical.config.Project(Arrays.asList(project.getSelections()), project.iterator().next().accept(this, obj));
+ public PhysicalOperator visitProject(final Project project, final Object obj) throws OptimizerException {
+ return new org.apache.drill.exec.physical.config.Project(
+ Arrays.asList(project.getSelections()), project.iterator().next().accept(this, obj));
}
@Override
- public PhysicalOperator visitFilter(Filter filter, Object obj) throws OptimizerException {
- TypeProtos.MajorType.Builder b = TypeProtos.MajorType.getDefaultInstance().newBuilderForType();
+ public PhysicalOperator visitFilter(final Filter filter, final Object obj) throws OptimizerException {
+ final TypeProtos.MajorType.Builder b = TypeProtos.MajorType.getDefaultInstance().newBuilderForType();
b.setMode(DataMode.REQUIRED);
b.setMinorType(MinorType.BIGINT);
- PhysicalOperator child = filter.iterator().next().accept(this, obj);
+ final PhysicalOperator child = filter.iterator().next().accept(this, obj);
return new SelectionVectorRemover(new org.apache.drill.exec.physical.config.Filter(child, filter.getExpr(), 1.0f));
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java
index 979c5e2..9e650b0 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java
@@ -22,18 +22,14 @@ import org.apache.drill.common.logical.LogicalPlan;
import org.apache.drill.exec.physical.PhysicalPlan;
public class IdentityOptimizer extends Optimizer {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IdentityOptimizer.class);
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IdentityOptimizer.class);
@Override
- public void init(DrillConfig config) {
+ public void init(final DrillConfig config) {
}
@Override
- public PhysicalPlan optimize(OptimizationContext context, LogicalPlan plan) {
+ public PhysicalPlan optimize(final OptimizationContext context, final LogicalPlan plan) {
return null;
}
-
- @Override
- public void close() {
- }
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java
index 34d0622..aed6299 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java
@@ -17,8 +17,6 @@
*/
package org.apache.drill.exec.opt;
-import java.io.Closeable;
-
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.exceptions.DrillConfigurationException;
import org.apache.drill.common.logical.LogicalPlan;
@@ -26,22 +24,19 @@ import org.apache.drill.exec.exception.OptimizerException;
import org.apache.drill.exec.physical.PhysicalPlan;
import org.apache.drill.exec.server.options.OptionManager;
-public abstract class Optimizer implements Closeable{
-
+public abstract class Optimizer {
public static String OPTIMIZER_IMPL_KEY = "drill.exec.optimizer.implementation";
public abstract void init(DrillConfig config);
-
public abstract PhysicalPlan optimize(OptimizationContext context, LogicalPlan plan) throws OptimizerException;
- public abstract void close();
- public static Optimizer getOptimizer(DrillConfig config) throws DrillConfigurationException{
- Optimizer o = config.getInstanceOf(OPTIMIZER_IMPL_KEY, Optimizer.class);
- o.init(config);
- return o;
+ public static Optimizer getOptimizer(final DrillConfig config) throws DrillConfigurationException {
+ final Optimizer optimizer = config.getInstanceOf(OPTIMIZER_IMPL_KEY, Optimizer.class);
+ optimizer.init(config);
+ return optimizer;
}
- public interface OptimizationContext{
+ public interface OptimizationContext {
public int getPriority();
public OptionManager getOptions();
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java
index 412da85..a00df9d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java
@@ -28,6 +28,7 @@ import org.apache.drill.exec.record.RecordBatch;
import org.apache.drill.exec.record.RecordBatch.IterOutcome;
public abstract class BaseRootExec implements RootExec {
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BaseRootExec.class);
protected OperatorStats stats = null;
protected OperatorContext oContext = null;
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java
index a644c34..8fd68b2 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java
@@ -17,8 +17,6 @@
*/
package org.apache.drill.exec.physical.impl;
-
-import org.apache.drill.exec.exception.SchemaChangeException;
import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
/**
@@ -26,8 +24,6 @@ import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
* output nodes and storage nodes. They are there driving force behind the completion of a query.
*/
public interface RootExec {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(RootExec.class);
-
/**
* Do the next batch of work.
* @return Whether or not additional batches of work are necessary. False means that this fragment is done.
@@ -44,5 +40,4 @@ public interface RootExec {
* @param handle
*/
public void receivingFragmentFinished(FragmentHandle handle);
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java
index d884200..2d1a136 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.drill.common.exceptions.ExecutionSetupException;
import org.apache.drill.exec.ExecConstants;
-import org.apache.drill.exec.exception.SchemaChangeException;
import org.apache.drill.exec.memory.OutOfMemoryException;
import org.apache.drill.exec.ops.FragmentContext;
import org.apache.drill.exec.ops.MetricDef;
@@ -58,7 +57,7 @@ public class ScreenCreator implements RootCreator<Screen>{
static class ScreenRoot extends BaseRootExec {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ScreenRoot.class);
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ScreenRoot.class);
volatile boolean ok = true;
private final SendingAccountor sendCount = new SendingAccountor();
@@ -67,7 +66,6 @@ public class ScreenCreator implements RootCreator<Screen>{
final FragmentContext context;
final UserClientConnection connection;
private RecordMaterializer materializer;
- private boolean first = true;
public enum Metric implements MetricDef {
BYTES_SENT;
@@ -146,7 +144,7 @@ public class ScreenCreator implements RootCreator<Screen>{
}
case OK_NEW_SCHEMA:
materializer = new VectorRecordMaterializer(context, incoming);
- // fall through.
+ //$FALL-THROUGH$
case OK:
// context.getStats().batchesCompleted.inc(1);
// context.getStats().recordsCompleted.inc(incoming.getRecordCount());
@@ -160,7 +158,6 @@ public class ScreenCreator implements RootCreator<Screen>{
}
sendCount.increment();
- first = false;
return true;
default:
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SendingAccountor.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SendingAccountor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SendingAccountor.java
index 3920f9c..8794188 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SendingAccountor.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SendingAccountor.java
@@ -46,6 +46,7 @@ public class SendingAccountor {
batchesSent.set(0);
} catch (InterruptedException e) {
logger.warn("Failure while waiting for send complete.", e);
+ // TODO InterruptedException
}
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java
index e6c3fba..2a59e22 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java
@@ -20,31 +20,21 @@ package org.apache.drill.exec.physical.impl.materialize;
import io.netty.buffer.ByteBuf;
import java.util.Arrays;
-import java.util.List;
-import org.apache.drill.exec.proto.UserBitShared.QueryId;
import org.apache.drill.exec.proto.UserBitShared.QueryResult;
-import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef;
-import org.apache.drill.exec.proto.UserBitShared.SerializedField;
-import org.apache.drill.exec.record.BatchSchema;
-import org.apache.drill.exec.record.MaterializedField;
-
-import com.google.common.collect.Lists;
public class QueryWritableBatch {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryWritableBatch.class);
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryWritableBatch.class);
private final QueryResult header;
private final ByteBuf[] buffers;
-
public QueryWritableBatch(QueryResult header, ByteBuf... buffers) {
- super();
this.header = header;
this.buffers = buffers;
}
- public ByteBuf[] getBuffers(){
+ public ByteBuf[] getBuffers() {
return buffers;
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java
index 352e7ae..42b1080 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java
@@ -307,6 +307,7 @@ public class OrderedPartitionRecordBatch extends AbstractRecordBatch<OrderedPart
logger.error("Failure while building final partition table.", ex);
context.fail(ex);
return false;
+ // TODO InterruptedException
}
return true;
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatch.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatch.java
index 4c9b33b..c50cb8a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatch.java
@@ -73,6 +73,7 @@ public class ProducerConsumerBatch extends AbstractRecordBatch {
context.fail(e);
}
return IterOutcome.STOP;
+ // TODO InterruptedException
} finally {
stats.stopWait();
}
@@ -147,6 +148,7 @@ public class ProducerConsumerBatch extends AbstractRecordBatch {
}
} catch (InterruptedException e) {
logger.warn("Producer thread is interrupted.", e);
+ // TODO InterruptedException
} finally {
if (stop) {
try {
@@ -154,6 +156,7 @@ public class ProducerConsumerBatch extends AbstractRecordBatch {
queue.put(new RecordBatchDataWrapper(null, true, false));
} catch (InterruptedException e) {
logger.error("Unable to enqueue the last batch indicator. Something is broken.", e);
+ // TODO InterruptedException
}
}
if (wrapper!=null) {
@@ -181,6 +184,7 @@ public class ProducerConsumerBatch extends AbstractRecordBatch {
producer.join();
} catch (InterruptedException e) {
logger.warn("Interrupted while waiting for producer thread");
+ // TODO InterruptedException
}
}
@@ -191,6 +195,7 @@ public class ProducerConsumerBatch extends AbstractRecordBatch {
cleanUpLatch.await();
} catch (InterruptedException e) {
logger.warn("Interrupted while waiting for producer to clean up first. I will try to clean up now...", e);
+ // TODO InterruptedException
} finally {
super.cleanup();
clearQueue();
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java
index 2436a0e..bc9ed74 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java
@@ -42,6 +42,7 @@ public class Fragment implements Iterable<Fragment.ExchangeFragmentPair> {
if (root == null) {
root = o;
}
+ // TODO should complain otherwise
}
public void addSendExchange(Exchange e, Fragment sendingToFragment) throws ForemanSetupException{
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java
index eebd40e..12043ce 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java
@@ -33,7 +33,6 @@ import com.google.common.collect.Ordering;
import org.apache.drill.common.exceptions.ExecutionSetupException;
import org.apache.drill.common.util.DrillStringUtils;
import org.apache.drill.exec.ExecConstants;
-import org.apache.drill.exec.expr.fn.impl.DateUtility;
import org.apache.drill.exec.ops.QueryContext;
import org.apache.drill.exec.ops.QueryDateTimeInfo;
import org.apache.drill.exec.physical.EndpointAffinity;
@@ -145,7 +144,7 @@ public class SimpleParallelizer {
* @param planningSet
* @return Returns a list of leaf fragments in fragment dependency graph.
*/
- private Set<Wrapper> constructFragmentDependencyGraph(PlanningSet planningSet) {
+ private static Set<Wrapper> constructFragmentDependencyGraph(PlanningSet planningSet) {
// Set up dependency of fragments based on the affinity of exchange that separates the fragments.
for(Wrapper currentFragmentWrapper : planningSet) {
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java
index b5d3f4a..dc63ef9 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java
@@ -31,24 +31,21 @@ import org.eigenbase.sql.SqlLiteral;
import org.eigenbase.sql.SqlNode;
import org.eigenbase.sql.SqlSetOption;
-public class SetOptionHandler extends AbstractSqlHandler{
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SetOptionHandler.class);
-
- QueryContext context;
+public class SetOptionHandler extends AbstractSqlHandler {
+// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SetOptionHandler.class);
+ private final QueryContext context;
public SetOptionHandler(QueryContext context) {
- super();
this.context = context;
}
-
@Override
public PhysicalPlan getPlan(SqlNode sqlNode) throws ValidationException, RelConversionException, IOException, ForemanSetupException {
- SqlSetOption option = unwrap(sqlNode, SqlSetOption.class);
- String scope = option.getScope();
- String name = option.getName();
- SqlNode value = option.getValue();
+ final SqlSetOption option = unwrap(sqlNode, SqlSetOption.class);
+ final String scope = option.getScope();
+ final String name = option.getName();
+ final SqlNode value = option.getValue();
OptionValue.OptionType type;
if (value instanceof SqlLiteral) {
switch (scope.toLowerCase()) {
@@ -70,9 +67,5 @@ public class SetOptionHandler extends AbstractSqlHandler{
}
return DirectPlan.createDirectPlan(context, true, String.format("%s updated.", name));
-
}
-
-
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicClient.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicClient.java
index f358097..72ae130 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicClient.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BasicClient.java
@@ -43,7 +43,6 @@ public abstract class BasicClient<T extends EnumLite, R extends RemoteConnection
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BasicClient.class);
private final Bootstrap b;
- private volatile boolean connect = false;
protected R connection;
private final T handshakeType;
private final Class<HANDSHAKE_RESPONSE> responseClass;
@@ -81,7 +80,6 @@ public abstract class BasicClient<T extends EnumLite, R extends RemoteConnection
new InboundHandler(connection), //
new RpcExceptionHandler() //
);
- connect = true;
}
}); //
@@ -180,7 +178,6 @@ public abstract class BasicClient<T extends EnumLite, R extends RemoteConnection
try {
BasicClient.this.validateHandshake(value);
BasicClient.this.finalizeConnection(value, connection);
- BasicClient.this.connect = true;
l.connectionSucceeded(connection);
// logger.debug("Handshake completed succesfully.");
} catch (RpcException ex) {
@@ -218,6 +215,7 @@ public abstract class BasicClient<T extends EnumLite, R extends RemoteConnection
connection.getChannel().close().get();
} catch (InterruptedException | ExecutionException e) {
logger.warn("Failure whiel shutting {}", this.getClass().getName(), e);
+ // TODO InterruptedException
}
}
[3/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.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java
index 177e560..45321ea 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java
@@ -25,10 +25,10 @@ public final class CoordinationProtos {
public static void registerAllExtensions(
com.google.protobuf.ExtensionRegistry registry) {
}
- public interface DrillbitEndpointOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface DrillbitEndpointOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.DrillbitEndpoint)
+ com.google.protobuf.MessageOrBuilder {
- // optional string address = 1;
/**
* <code>optional string address = 1;</code>
*/
@@ -43,7 +43,6 @@ public final class CoordinationProtos {
com.google.protobuf.ByteString
getAddressBytes();
- // optional int32 user_port = 2;
/**
* <code>optional int32 user_port = 2;</code>
*/
@@ -53,7 +52,6 @@ public final class CoordinationProtos {
*/
int getUserPort();
- // optional int32 control_port = 3;
/**
* <code>optional int32 control_port = 3;</code>
*/
@@ -63,7 +61,6 @@ public final class CoordinationProtos {
*/
int getControlPort();
- // optional int32 data_port = 4;
/**
* <code>optional int32 data_port = 4;</code>
*/
@@ -73,7 +70,6 @@ public final class CoordinationProtos {
*/
int getDataPort();
- // optional .exec.Roles roles = 5;
/**
* <code>optional .exec.Roles roles = 5;</code>
*/
@@ -91,8 +87,9 @@ public final class CoordinationProtos {
* Protobuf type {@code exec.DrillbitEndpoint}
*/
public static final class DrillbitEndpoint extends
- com.google.protobuf.GeneratedMessage
- implements DrillbitEndpointOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.DrillbitEndpoint)
+ DrillbitEndpointOrBuilder {
// Use DrillbitEndpoint.newBuilder() to construct.
private DrillbitEndpoint(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -139,8 +136,9 @@ public final class CoordinationProtos {
break;
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- address_ = input.readBytes();
+ address_ = bs;
break;
}
case 16: {
@@ -211,7 +209,6 @@ public final class CoordinationProtos {
}
private int bitField0_;
- // optional string address = 1;
public static final int ADDRESS_FIELD_NUMBER = 1;
private java.lang.Object address_;
/**
@@ -254,7 +251,6 @@ public final class CoordinationProtos {
}
}
- // optional int32 user_port = 2;
public static final int USER_PORT_FIELD_NUMBER = 2;
private int userPort_;
/**
@@ -270,7 +266,6 @@ public final class CoordinationProtos {
return userPort_;
}
- // optional int32 control_port = 3;
public static final int CONTROL_PORT_FIELD_NUMBER = 3;
private int controlPort_;
/**
@@ -286,7 +281,6 @@ public final class CoordinationProtos {
return controlPort_;
}
- // optional int32 data_port = 4;
public static final int DATA_PORT_FIELD_NUMBER = 4;
private int dataPort_;
/**
@@ -302,7 +296,6 @@ public final class CoordinationProtos {
return dataPort_;
}
- // optional .exec.Roles roles = 5;
public static final int ROLES_FIELD_NUMBER = 5;
private org.apache.drill.exec.proto.CoordinationProtos.Roles roles_;
/**
@@ -334,7 +327,8 @@ public final class CoordinationProtos {
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;
@@ -469,8 +463,9 @@ public final class CoordinationProtos {
* Protobuf type {@code exec.DrillbitEndpoint}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.DrillbitEndpoint)
+ org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.CoordinationProtos.internal_static_exec_DrillbitEndpoint_descriptor;
@@ -630,7 +625,6 @@ public final class CoordinationProtos {
}
private int bitField0_;
- // optional string address = 1;
private java.lang.Object address_ = "";
/**
* <code>optional string address = 1;</code>
@@ -644,9 +638,12 @@ public final class CoordinationProtos {
public java.lang.String getAddress() {
java.lang.Object ref = address_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- address_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ address_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -704,7 +701,6 @@ public final class CoordinationProtos {
return this;
}
- // optional int32 user_port = 2;
private int userPort_ ;
/**
* <code>optional int32 user_port = 2;</code>
@@ -737,7 +733,6 @@ public final class CoordinationProtos {
return this;
}
- // optional int32 control_port = 3;
private int controlPort_ ;
/**
* <code>optional int32 control_port = 3;</code>
@@ -770,7 +765,6 @@ public final class CoordinationProtos {
return this;
}
- // optional int32 data_port = 4;
private int dataPort_ ;
/**
* <code>optional int32 data_port = 4;</code>
@@ -803,7 +797,6 @@ public final class CoordinationProtos {
return this;
}
- // optional .exec.Roles roles = 5;
private org.apache.drill.exec.proto.CoordinationProtos.Roles roles_ = org.apache.drill.exec.proto.CoordinationProtos.Roles.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.CoordinationProtos.Roles, org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder, org.apache.drill.exec.proto.CoordinationProtos.RolesOrBuilder> rolesBuilder_;
@@ -912,7 +905,7 @@ public final class CoordinationProtos {
if (rolesBuilder_ == null) {
rolesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.CoordinationProtos.Roles, org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder, org.apache.drill.exec.proto.CoordinationProtos.RolesOrBuilder>(
- roles_,
+ getRoles(),
getParentForChildren(),
isClean());
roles_ = null;
@@ -931,10 +924,10 @@ public final class CoordinationProtos {
// @@protoc_insertion_point(class_scope:exec.DrillbitEndpoint)
}
- public interface DrillServiceInstanceOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface DrillServiceInstanceOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.DrillServiceInstance)
+ com.google.protobuf.MessageOrBuilder {
- // optional string id = 1;
/**
* <code>optional string id = 1;</code>
*/
@@ -949,7 +942,6 @@ public final class CoordinationProtos {
com.google.protobuf.ByteString
getIdBytes();
- // optional int64 registrationTimeUTC = 2;
/**
* <code>optional int64 registrationTimeUTC = 2;</code>
*/
@@ -959,7 +951,6 @@ public final class CoordinationProtos {
*/
long getRegistrationTimeUTC();
- // optional .exec.DrillbitEndpoint endpoint = 3;
/**
* <code>optional .exec.DrillbitEndpoint endpoint = 3;</code>
*/
@@ -977,8 +968,9 @@ public final class CoordinationProtos {
* Protobuf type {@code exec.DrillServiceInstance}
*/
public static final class DrillServiceInstance extends
- com.google.protobuf.GeneratedMessage
- implements DrillServiceInstanceOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.DrillServiceInstance)
+ DrillServiceInstanceOrBuilder {
// Use DrillServiceInstance.newBuilder() to construct.
private DrillServiceInstance(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1025,8 +1017,9 @@ public final class CoordinationProtos {
break;
}
case 10: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- id_ = input.readBytes();
+ id_ = bs;
break;
}
case 16: {
@@ -1087,7 +1080,6 @@ public final class CoordinationProtos {
}
private int bitField0_;
- // optional string id = 1;
public static final int ID_FIELD_NUMBER = 1;
private java.lang.Object id_;
/**
@@ -1130,7 +1122,6 @@ public final class CoordinationProtos {
}
}
- // optional int64 registrationTimeUTC = 2;
public static final int REGISTRATIONTIMEUTC_FIELD_NUMBER = 2;
private long registrationTimeUTC_;
/**
@@ -1146,7 +1137,6 @@ public final class CoordinationProtos {
return registrationTimeUTC_;
}
- // optional .exec.DrillbitEndpoint endpoint = 3;
public static final int ENDPOINT_FIELD_NUMBER = 3;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_;
/**
@@ -1176,7 +1166,8 @@ public final class CoordinationProtos {
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;
@@ -1297,8 +1288,9 @@ public final class CoordinationProtos {
* Protobuf type {@code exec.DrillServiceInstance}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstanceOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.DrillServiceInstance)
+ org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstanceOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.CoordinationProtos.internal_static_exec_DrillServiceInstance_descriptor;
@@ -1440,7 +1432,6 @@ public final class CoordinationProtos {
}
private int bitField0_;
- // optional string id = 1;
private java.lang.Object id_ = "";
/**
* <code>optional string id = 1;</code>
@@ -1454,9 +1445,12 @@ public final class CoordinationProtos {
public java.lang.String getId() {
java.lang.Object ref = id_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- id_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ id_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -1514,7 +1508,6 @@ public final class CoordinationProtos {
return this;
}
- // optional int64 registrationTimeUTC = 2;
private long registrationTimeUTC_ ;
/**
* <code>optional int64 registrationTimeUTC = 2;</code>
@@ -1547,7 +1540,6 @@ public final class CoordinationProtos {
return this;
}
- // optional .exec.DrillbitEndpoint endpoint = 3;
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_;
@@ -1656,7 +1648,7 @@ public final class CoordinationProtos {
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;
@@ -1675,10 +1667,10 @@ public final class CoordinationProtos {
// @@protoc_insertion_point(class_scope:exec.DrillServiceInstance)
}
- public interface RolesOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface RolesOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.Roles)
+ com.google.protobuf.MessageOrBuilder {
- // optional bool sql_query = 1 [default = true];
/**
* <code>optional bool sql_query = 1 [default = true];</code>
*/
@@ -1688,7 +1680,6 @@ public final class CoordinationProtos {
*/
boolean getSqlQuery();
- // optional bool logical_plan = 2 [default = true];
/**
* <code>optional bool logical_plan = 2 [default = true];</code>
*/
@@ -1698,7 +1689,6 @@ public final class CoordinationProtos {
*/
boolean getLogicalPlan();
- // optional bool physical_plan = 3 [default = true];
/**
* <code>optional bool physical_plan = 3 [default = true];</code>
*/
@@ -1708,7 +1698,6 @@ public final class CoordinationProtos {
*/
boolean getPhysicalPlan();
- // optional bool java_executor = 4 [default = true];
/**
* <code>optional bool java_executor = 4 [default = true];</code>
*/
@@ -1718,7 +1707,6 @@ public final class CoordinationProtos {
*/
boolean getJavaExecutor();
- // optional bool distributed_cache = 5 [default = true];
/**
* <code>optional bool distributed_cache = 5 [default = true];</code>
*/
@@ -1732,8 +1720,9 @@ public final class CoordinationProtos {
* Protobuf type {@code exec.Roles}
*/
public static final class Roles extends
- com.google.protobuf.GeneratedMessage
- implements RolesOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.Roles)
+ RolesOrBuilder {
// Use Roles.newBuilder() to construct.
private Roles(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1844,7 +1833,6 @@ public final class CoordinationProtos {
}
private int bitField0_;
- // optional bool sql_query = 1 [default = true];
public static final int SQL_QUERY_FIELD_NUMBER = 1;
private boolean sqlQuery_;
/**
@@ -1860,7 +1848,6 @@ public final class CoordinationProtos {
return sqlQuery_;
}
- // optional bool logical_plan = 2 [default = true];
public static final int LOGICAL_PLAN_FIELD_NUMBER = 2;
private boolean logicalPlan_;
/**
@@ -1876,7 +1863,6 @@ public final class CoordinationProtos {
return logicalPlan_;
}
- // optional bool physical_plan = 3 [default = true];
public static final int PHYSICAL_PLAN_FIELD_NUMBER = 3;
private boolean physicalPlan_;
/**
@@ -1892,7 +1878,6 @@ public final class CoordinationProtos {
return physicalPlan_;
}
- // optional bool java_executor = 4 [default = true];
public static final int JAVA_EXECUTOR_FIELD_NUMBER = 4;
private boolean javaExecutor_;
/**
@@ -1908,7 +1893,6 @@ public final class CoordinationProtos {
return javaExecutor_;
}
- // optional bool distributed_cache = 5 [default = true];
public static final int DISTRIBUTED_CACHE_FIELD_NUMBER = 5;
private boolean distributedCache_;
/**
@@ -1934,7 +1918,8 @@ public final class CoordinationProtos {
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;
@@ -2069,8 +2054,9 @@ public final class CoordinationProtos {
* Protobuf type {@code exec.Roles}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.CoordinationProtos.RolesOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.Roles)
+ org.apache.drill.exec.proto.CoordinationProtos.RolesOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.CoordinationProtos.internal_static_exec_Roles_descriptor;
@@ -2219,7 +2205,6 @@ public final class CoordinationProtos {
}
private int bitField0_;
- // optional bool sql_query = 1 [default = true];
private boolean sqlQuery_ = true;
/**
* <code>optional bool sql_query = 1 [default = true];</code>
@@ -2252,7 +2237,6 @@ public final class CoordinationProtos {
return this;
}
- // optional bool logical_plan = 2 [default = true];
private boolean logicalPlan_ = true;
/**
* <code>optional bool logical_plan = 2 [default = true];</code>
@@ -2285,7 +2269,6 @@ public final class CoordinationProtos {
return this;
}
- // optional bool physical_plan = 3 [default = true];
private boolean physicalPlan_ = true;
/**
* <code>optional bool physical_plan = 3 [default = true];</code>
@@ -2318,7 +2301,6 @@ public final class CoordinationProtos {
return this;
}
- // optional bool java_executor = 4 [default = true];
private boolean javaExecutor_ = true;
/**
* <code>optional bool java_executor = 4 [default = true];</code>
@@ -2351,7 +2333,6 @@ public final class CoordinationProtos {
return this;
}
- // optional bool distributed_cache = 5 [default = true];
private boolean distributedCache_ = true;
/**
* <code>optional bool distributed_cache = 5 [default = true];</code>
@@ -2395,17 +2376,17 @@ public final class CoordinationProtos {
// @@protoc_insertion_point(class_scope:exec.Roles)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_DrillbitEndpoint_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_DrillbitEndpoint_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_DrillServiceInstance_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_DrillServiceInstance_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_Roles_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -2433,35 +2414,35 @@ public final class CoordinationProtos {
"otoB\022CoordinationProtosH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_exec_DrillbitEndpoint_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_exec_DrillbitEndpoint_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_DrillbitEndpoint_descriptor,
- new java.lang.String[] { "Address", "UserPort", "ControlPort", "DataPort", "Roles", });
- internal_static_exec_DrillServiceInstance_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_exec_DrillServiceInstance_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_DrillServiceInstance_descriptor,
- new java.lang.String[] { "Id", "RegistrationTimeUTC", "Endpoint", });
- internal_static_exec_Roles_descriptor =
- getDescriptor().getMessageTypes().get(2);
- internal_static_exec_Roles_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_Roles_descriptor,
- new java.lang.String[] { "SqlQuery", "LogicalPlan", "PhysicalPlan", "JavaExecutor", "DistributedCache", });
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
}, assigner);
+ internal_static_exec_DrillbitEndpoint_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_exec_DrillbitEndpoint_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_DrillbitEndpoint_descriptor,
+ new java.lang.String[] { "Address", "UserPort", "ControlPort", "DataPort", "Roles", });
+ internal_static_exec_DrillServiceInstance_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_exec_DrillServiceInstance_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_DrillServiceInstance_descriptor,
+ new java.lang.String[] { "Id", "RegistrationTimeUTC", "Endpoint", });
+ internal_static_exec_Roles_descriptor =
+ getDescriptor().getMessageTypes().get(2);
+ internal_static_exec_Roles_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_Roles_descriptor,
+ new java.lang.String[] { "SqlQuery", "LogicalPlan", "PhysicalPlan", "JavaExecutor", "DistributedCache", });
}
// @@protoc_insertion_point(outer_class_scope)
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java
index 7ca17f1..ca4f294 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java
@@ -25,10 +25,10 @@ public final class ExecProtos {
public static void registerAllExtensions(
com.google.protobuf.ExtensionRegistry registry) {
}
- public interface FragmentHandleOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface FragmentHandleOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.FragmentHandle)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.shared.QueryId query_id = 1;
/**
* <code>optional .exec.shared.QueryId query_id = 1;</code>
*/
@@ -42,7 +42,6 @@ public final class ExecProtos {
*/
org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder getQueryIdOrBuilder();
- // optional int32 major_fragment_id = 2;
/**
* <code>optional int32 major_fragment_id = 2;</code>
*/
@@ -52,7 +51,6 @@ public final class ExecProtos {
*/
int getMajorFragmentId();
- // optional int32 minor_fragment_id = 3;
/**
* <code>optional int32 minor_fragment_id = 3;</code>
*/
@@ -66,8 +64,9 @@ public final class ExecProtos {
* Protobuf type {@code exec.bit.FragmentHandle}
*/
public static final class FragmentHandle extends
- com.google.protobuf.GeneratedMessage
- implements FragmentHandleOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.FragmentHandle)
+ FragmentHandleOrBuilder {
// Use FragmentHandle.newBuilder() to construct.
private FragmentHandle(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -176,7 +175,6 @@ public final class ExecProtos {
}
private int bitField0_;
- // optional .exec.shared.QueryId query_id = 1;
public static final int QUERY_ID_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.UserBitShared.QueryId queryId_;
/**
@@ -198,7 +196,6 @@ public final class ExecProtos {
return queryId_;
}
- // optional int32 major_fragment_id = 2;
public static final int MAJOR_FRAGMENT_ID_FIELD_NUMBER = 2;
private int majorFragmentId_;
/**
@@ -214,7 +211,6 @@ public final class ExecProtos {
return majorFragmentId_;
}
- // optional int32 minor_fragment_id = 3;
public static final int MINOR_FRAGMENT_ID_FIELD_NUMBER = 3;
private int minorFragmentId_;
/**
@@ -238,7 +234,8 @@ public final class ExecProtos {
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;
@@ -359,8 +356,9 @@ public final class ExecProtos {
* Protobuf type {@code exec.bit.FragmentHandle}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.FragmentHandle)
+ org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.ExecProtos.internal_static_exec_bit_FragmentHandle_descriptor;
@@ -500,7 +498,6 @@ public final class ExecProtos {
}
private int bitField0_;
- // optional .exec.shared.QueryId query_id = 1;
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_;
@@ -609,7 +606,7 @@ public final class ExecProtos {
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;
@@ -617,7 +614,6 @@ public final class ExecProtos {
return queryIdBuilder_;
}
- // optional int32 major_fragment_id = 2;
private int majorFragmentId_ ;
/**
* <code>optional int32 major_fragment_id = 2;</code>
@@ -650,7 +646,6 @@ public final class ExecProtos {
return this;
}
- // optional int32 minor_fragment_id = 3;
private int minorFragmentId_ ;
/**
* <code>optional int32 minor_fragment_id = 3;</code>
@@ -694,7 +689,7 @@ public final class ExecProtos {
// @@protoc_insertion_point(class_scope:exec.bit.FragmentHandle)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_FragmentHandle_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -716,25 +711,27 @@ public final class ExecProtos {
".drill.exec.protoB\nExecProtosH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_exec_bit_FragmentHandle_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_exec_bit_FragmentHandle_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_FragmentHandle_descriptor,
- new java.lang.String[] { "QueryId", "MajorFragmentId", "MinorFragmentId", });
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
org.apache.drill.exec.proto.CoordinationProtos.getDescriptor(),
org.apache.drill.exec.proto.UserBitShared.getDescriptor(),
}, assigner);
+ internal_static_exec_bit_FragmentHandle_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_exec_bit_FragmentHandle_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_FragmentHandle_descriptor,
+ new java.lang.String[] { "QueryId", "MajorFragmentId", "MinorFragmentId", });
+ org.apache.drill.exec.proto.CoordinationProtos.getDescriptor();
+ org.apache.drill.exec.proto.UserBitShared.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java
index f47e719..32a63e5 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java
@@ -116,10 +116,10 @@ public final class GeneralRPCProtos {
// @@protoc_insertion_point(enum_scope:exec.rpc.RpcMode)
}
- public interface AckOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface AckOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.rpc.Ack)
+ com.google.protobuf.MessageOrBuilder {
- // optional bool ok = 1;
/**
* <code>optional bool ok = 1;</code>
*/
@@ -133,8 +133,9 @@ public final class GeneralRPCProtos {
* Protobuf type {@code exec.rpc.Ack}
*/
public static final class Ack extends
- com.google.protobuf.GeneratedMessage
- implements AckOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.rpc.Ack)
+ AckOrBuilder {
// Use Ack.newBuilder() to construct.
private Ack(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -225,7 +226,6 @@ public final class GeneralRPCProtos {
}
private int bitField0_;
- // optional bool ok = 1;
public static final int OK_FIELD_NUMBER = 1;
private boolean ok_;
/**
@@ -247,7 +247,8 @@ public final class GeneralRPCProtos {
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;
@@ -354,8 +355,9 @@ public final class GeneralRPCProtos {
* Protobuf type {@code exec.rpc.Ack}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.GeneralRPCProtos.AckOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.rpc.Ack)
+ org.apache.drill.exec.proto.GeneralRPCProtos.AckOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.GeneralRPCProtos.internal_static_exec_rpc_Ack_descriptor;
@@ -468,7 +470,6 @@ public final class GeneralRPCProtos {
}
private int bitField0_;
- // optional bool ok = 1;
private boolean ok_ ;
/**
* <code>optional bool ok = 1;</code>
@@ -512,10 +513,10 @@ public final class GeneralRPCProtos {
// @@protoc_insertion_point(class_scope:exec.rpc.Ack)
}
- public interface RpcHeaderOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface RpcHeaderOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.rpc.RpcHeader)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.rpc.RpcMode mode = 1;
/**
* <code>optional .exec.rpc.RpcMode mode = 1;</code>
*/
@@ -525,7 +526,6 @@ public final class GeneralRPCProtos {
*/
org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode getMode();
- // optional int32 coordination_id = 2;
/**
* <code>optional int32 coordination_id = 2;</code>
*
@@ -543,7 +543,6 @@ public final class GeneralRPCProtos {
*/
int getCoordinationId();
- // optional int32 rpc_type = 3;
/**
* <code>optional int32 rpc_type = 3;</code>
*
@@ -565,8 +564,9 @@ public final class GeneralRPCProtos {
* Protobuf type {@code exec.rpc.RpcHeader}
*/
public static final class RpcHeader extends
- com.google.protobuf.GeneratedMessage
- implements RpcHeaderOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.rpc.RpcHeader)
+ RpcHeaderOrBuilder {
// Use RpcHeader.newBuilder() to construct.
private RpcHeader(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -673,7 +673,6 @@ public final class GeneralRPCProtos {
}
private int bitField0_;
- // optional .exec.rpc.RpcMode mode = 1;
public static final int MODE_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode mode_;
/**
@@ -689,7 +688,6 @@ public final class GeneralRPCProtos {
return mode_;
}
- // optional int32 coordination_id = 2;
public static final int COORDINATION_ID_FIELD_NUMBER = 2;
private int coordinationId_;
/**
@@ -713,7 +711,6 @@ public final class GeneralRPCProtos {
return coordinationId_;
}
- // optional int32 rpc_type = 3;
public static final int RPC_TYPE_FIELD_NUMBER = 3;
private int rpcType_;
/**
@@ -745,7 +742,8 @@ public final class GeneralRPCProtos {
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;
@@ -866,8 +864,9 @@ public final class GeneralRPCProtos {
* Protobuf type {@code exec.rpc.RpcHeader}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.rpc.RpcHeader)
+ org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.GeneralRPCProtos.internal_static_exec_rpc_RpcHeader_descriptor;
@@ -998,7 +997,6 @@ public final class GeneralRPCProtos {
}
private int bitField0_;
- // optional .exec.rpc.RpcMode mode = 1;
private org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode mode_ = org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode.REQUEST;
/**
* <code>optional .exec.rpc.RpcMode mode = 1;</code>
@@ -1034,7 +1032,6 @@ public final class GeneralRPCProtos {
return this;
}
- // optional int32 coordination_id = 2;
private int coordinationId_ ;
/**
* <code>optional int32 coordination_id = 2;</code>
@@ -1083,7 +1080,6 @@ public final class GeneralRPCProtos {
return this;
}
- // optional int32 rpc_type = 3;
private int rpcType_ ;
/**
* <code>optional int32 rpc_type = 3;</code>
@@ -1143,10 +1139,10 @@ public final class GeneralRPCProtos {
// @@protoc_insertion_point(class_scope:exec.rpc.RpcHeader)
}
- public interface CompleteRpcMessageOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface CompleteRpcMessageOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.rpc.CompleteRpcMessage)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.rpc.RpcHeader header = 1;
/**
* <code>optional .exec.rpc.RpcHeader header = 1;</code>
*
@@ -1172,7 +1168,6 @@ public final class GeneralRPCProtos {
*/
org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder getHeaderOrBuilder();
- // optional bytes protobuf_body = 2;
/**
* <code>optional bytes protobuf_body = 2;</code>
*
@@ -1190,7 +1185,6 @@ public final class GeneralRPCProtos {
*/
com.google.protobuf.ByteString getProtobufBody();
- // optional bytes raw_body = 3;
/**
* <code>optional bytes raw_body = 3;</code>
*
@@ -1212,8 +1206,9 @@ public final class GeneralRPCProtos {
* Protobuf type {@code exec.rpc.CompleteRpcMessage}
*/
public static final class CompleteRpcMessage extends
- com.google.protobuf.GeneratedMessage
- implements CompleteRpcMessageOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.rpc.CompleteRpcMessage)
+ CompleteRpcMessageOrBuilder {
// Use CompleteRpcMessage.newBuilder() to construct.
private CompleteRpcMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1322,7 +1317,6 @@ public final class GeneralRPCProtos {
}
private int bitField0_;
- // optional .exec.rpc.RpcHeader header = 1;
public static final int HEADER_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader header_;
/**
@@ -1356,7 +1350,6 @@ public final class GeneralRPCProtos {
return header_;
}
- // optional bytes protobuf_body = 2;
public static final int PROTOBUF_BODY_FIELD_NUMBER = 2;
private com.google.protobuf.ByteString protobufBody_;
/**
@@ -1380,7 +1373,6 @@ public final class GeneralRPCProtos {
return protobufBody_;
}
- // optional bytes raw_body = 3;
public static final int RAW_BODY_FIELD_NUMBER = 3;
private com.google.protobuf.ByteString rawBody_;
/**
@@ -1412,7 +1404,8 @@ public final class GeneralRPCProtos {
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;
@@ -1533,8 +1526,9 @@ public final class GeneralRPCProtos {
* Protobuf type {@code exec.rpc.CompleteRpcMessage}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessageOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.rpc.CompleteRpcMessage)
+ org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessageOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.GeneralRPCProtos.internal_static_exec_rpc_CompleteRpcMessage_descriptor;
@@ -1674,7 +1668,6 @@ public final class GeneralRPCProtos {
}
private int bitField0_;
- // optional .exec.rpc.RpcHeader header = 1;
private org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader header_ = org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder> headerBuilder_;
@@ -1819,7 +1812,7 @@ public final class GeneralRPCProtos {
if (headerBuilder_ == null) {
headerBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder>(
- header_,
+ getHeader(),
getParentForChildren(),
isClean());
header_ = null;
@@ -1827,7 +1820,6 @@ public final class GeneralRPCProtos {
return headerBuilder_;
}
- // optional bytes protobuf_body = 2;
private com.google.protobuf.ByteString protobufBody_ = com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes protobuf_body = 2;</code>
@@ -1879,7 +1871,6 @@ public final class GeneralRPCProtos {
return this;
}
- // optional bytes raw_body = 3;
private com.google.protobuf.ByteString rawBody_ = com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes raw_body = 3;</code>
@@ -1942,17 +1933,17 @@ public final class GeneralRPCProtos {
// @@protoc_insertion_point(class_scope:exec.rpc.CompleteRpcMessage)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_rpc_Ack_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_rpc_Ack_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_rpc_RpcHeader_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_rpc_RpcHeader_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_rpc_CompleteRpcMessage_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1978,36 +1969,37 @@ public final class GeneralRPCProtos {
"rotosH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_exec_rpc_Ack_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_exec_rpc_Ack_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_rpc_Ack_descriptor,
- new java.lang.String[] { "Ok", });
- internal_static_exec_rpc_RpcHeader_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_exec_rpc_RpcHeader_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_rpc_RpcHeader_descriptor,
- new java.lang.String[] { "Mode", "CoordinationId", "RpcType", });
- internal_static_exec_rpc_CompleteRpcMessage_descriptor =
- getDescriptor().getMessageTypes().get(2);
- internal_static_exec_rpc_CompleteRpcMessage_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_rpc_CompleteRpcMessage_descriptor,
- new java.lang.String[] { "Header", "ProtobufBody", "RawBody", });
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
org.apache.drill.exec.proto.CoordinationProtos.getDescriptor(),
}, assigner);
+ internal_static_exec_rpc_Ack_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_exec_rpc_Ack_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_rpc_Ack_descriptor,
+ new java.lang.String[] { "Ok", });
+ internal_static_exec_rpc_RpcHeader_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_exec_rpc_RpcHeader_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_rpc_RpcHeader_descriptor,
+ new java.lang.String[] { "Mode", "CoordinationId", "RpcType", });
+ internal_static_exec_rpc_CompleteRpcMessage_descriptor =
+ getDescriptor().getMessageTypes().get(2);
+ internal_static_exec_rpc_CompleteRpcMessage_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_rpc_CompleteRpcMessage_descriptor,
+ new java.lang.String[] { "Header", "ProtobufBody", "RawBody", });
+ org.apache.drill.exec.proto.CoordinationProtos.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java
index d7f3536..024774a 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java
@@ -131,18 +131,19 @@ public final class SchemaDefProtos {
"chemaDefProtosH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
org.apache.drill.common.types.TypeProtos.getDescriptor(),
}, assigner);
+ org.apache.drill.common.types.TypeProtos.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
[5/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.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
new file mode 100644
index 0000000..9bc0552
--- /dev/null
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
@@ -0,0 +1,398 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.server;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.drill.QueryTestUtil;
+import org.apache.drill.SingleRowListener;
+import org.apache.drill.common.AutoCloseables;
+import org.apache.drill.common.config.DrillConfig;
+import org.apache.drill.common.types.TypeProtos.MinorType;
+import org.apache.drill.exec.ExecConstants;
+import org.apache.drill.exec.ExecTest;
+import org.apache.drill.exec.ZookeeperHelper;
+import org.apache.drill.exec.client.DrillClient;
+import org.apache.drill.exec.exception.DrillbitStartupException;
+import org.apache.drill.exec.exception.SchemaChangeException;
+import org.apache.drill.exec.memory.BufferAllocator;
+import org.apache.drill.exec.memory.TopLevelAllocator;
+import org.apache.drill.exec.proto.UserBitShared.DrillPBError;
+import org.apache.drill.exec.proto.UserBitShared.QueryResult;
+import org.apache.drill.exec.proto.UserBitShared.QueryType;
+import org.apache.drill.exec.record.BatchSchema;
+import org.apache.drill.exec.record.MaterializedField;
+import org.apache.drill.exec.record.RecordBatchLoader;
+import org.apache.drill.exec.record.VectorWrapper;
+import org.apache.drill.exec.rpc.RpcException;
+import org.apache.drill.exec.rpc.user.QueryResultBatch;
+import org.apache.drill.exec.testing.ExceptionInjectionUtil;
+import org.apache.drill.exec.testing.SimulatedExceptions.InjectionOption;
+import org.apache.drill.exec.testing.SimulatedExceptions.InjectionOptions;
+import org.apache.drill.exec.work.foreman.Foreman;
+import org.apache.drill.exec.work.foreman.ForemanException;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Test how resilient drillbits are to throwing exceptions during various phases of query
+ * execution by injecting exceptions at various points.
+ */
+public class TestDrillbitResilience extends ExecTest {
+ private static final Logger logger = org.slf4j.LoggerFactory.getLogger(TestDrillbitResilience.class);
+
+ private static ZookeeperHelper zkHelper;
+ private static RemoteServiceSet remoteServiceSet;
+ private static final Map<String, Drillbit> drillbits = new HashMap<>();
+ private static DrillClient drillClient;
+
+ private static void startDrillbit(final String name, final RemoteServiceSet remoteServiceSet) {
+ if (drillbits.containsKey(name)) {
+ throw new IllegalStateException("Drillbit named \"" + name + "\" already exists");
+ }
+
+ try {
+ @SuppressWarnings("resource")
+ final Drillbit drillbit = Drillbit.start(zkHelper.getConfig(), remoteServiceSet);
+ drillbits.put(name, drillbit);
+ } catch(DrillbitStartupException e) {
+ throw new RuntimeException("Failed to start Drillbit \"" + name + "\"", e);
+ }
+ }
+
+ /**
+ * Shutdown the specified drillbit.
+ *
+ * @param name
+ */
+ private static void stopDrillbit(final String name) {
+ @SuppressWarnings("resource")
+ final Drillbit drillbit = drillbits.get(name);
+ if (drillbit == null) {
+ throw new IllegalStateException("No Drillbit named \"" + name + "\" found");
+ }
+
+ try {
+ drillbit.close();
+ } catch(Exception e) {
+ final String message = "Error shutting down Drillbit \"" + name + "\"";
+ System.err.println(message + '.');
+ logger.warn(message, e);
+ }
+ }
+
+ /**
+ * Shutdown all the drillbits.
+ */
+ private static void stopAllDrillbits() {
+ for(String name : drillbits.keySet()) {
+ stopDrillbit(name);
+ }
+ }
+
+ /*
+ * Canned drillbit names.
+ */
+ private final static String DRILLBIT_ALPHA = "alpha";
+ private final static String DRILLBIT_BETA = "beta";
+ private final static String DRILLBIT_GAMMA = "gamma";
+
+ @BeforeClass
+ public static void startSomeDrillbits() throws Exception {
+ // turn off the HTTP server to avoid port conflicts between the drill bits
+ System.setProperty(ExecConstants.HTTP_ENABLE, "false");
+
+ zkHelper = new ZookeeperHelper();
+ zkHelper.startZookeeper(1);
+
+ // use a non-null service set so that the drillbits can use port hunting
+ remoteServiceSet = RemoteServiceSet.getLocalServiceSet();
+
+ // create name-addressable drillbits
+ startDrillbit(DRILLBIT_ALPHA, remoteServiceSet);
+ startDrillbit(DRILLBIT_BETA, remoteServiceSet);
+ startDrillbit(DRILLBIT_GAMMA, remoteServiceSet);
+ clearAllInjections();
+
+ // create a client
+ final DrillConfig drillConfig = zkHelper.getConfig();
+ drillClient = QueryTestUtil.createClient(drillConfig, remoteServiceSet, 1);
+ }
+
+ @AfterClass
+ public static void shutdownAllDrillbits() {
+ if (drillClient != null) {
+ drillClient.close();
+ drillClient = null;
+ }
+
+ stopAllDrillbits();
+
+ if (remoteServiceSet != null) {
+ AutoCloseables.close(remoteServiceSet, logger);
+ remoteServiceSet = null;
+ }
+
+ zkHelper.stopZookeeper();
+ }
+
+ /**
+ * Clear all injections from all drillbits.
+ */
+ private static void clearAllInjections() {
+ for(Drillbit drillbit : drillbits.values()) {
+ ExceptionInjectionUtil.clearInjections(drillbit);
+ }
+ }
+
+ /**
+ * Check that all the drillbits are ok.
+ *
+ * <p>The current implementation does this by counting the number of drillbits using a
+ * query.
+ */
+ private static void assertDrillbitsOk() {
+ final SingleRowListener listener = new SingleRowListener() {
+ private final BufferAllocator bufferAllocator = new TopLevelAllocator(zkHelper.getConfig());
+ private final RecordBatchLoader loader = new RecordBatchLoader(bufferAllocator);
+
+ @Override
+ public void rowArrived(final QueryResultBatch queryResultBatch) {
+ // load the single record
+ final QueryResult queryResult = queryResultBatch.getHeader();
+ try {
+ loader.load(queryResult.getDef(), queryResultBatch.getData());
+ } catch(SchemaChangeException e) {
+ fail(e.toString());
+ }
+ assertEquals(1, loader.getRecordCount());
+
+ // there should only be one column
+ final BatchSchema batchSchema = loader.getSchema();
+ assertEquals(1, batchSchema.getFieldCount());
+
+ // the column should be an integer
+ final MaterializedField countField = batchSchema.getColumn(0);
+ final MinorType fieldType = countField.getType().getMinorType();
+ assertEquals(MinorType.BIGINT, fieldType);
+
+ // get the column value
+ final VectorWrapper<?> vw = loader.iterator().next();
+ final Object obj = vw.getValueVector().getAccessor().getObject(0);
+ assertTrue(obj instanceof Long);
+ final Long countValue = (Long) obj;
+
+ // assume this means all the drillbits are still ok
+ assertEquals(drillbits.size(), countValue.intValue());
+
+ loader.clear();
+ }
+
+ @Override
+ public void cleanup() {
+ bufferAllocator.close();
+ }
+ };
+
+ try {
+ QueryTestUtil.testWithListener(
+ drillClient, QueryType.SQL, "select count(*) from sys.drillbits", listener);
+ listener.waitForCompletion();
+ } catch(Exception e) {
+ throw new RuntimeException("Couldn't query active drillbits", e);
+ }
+
+ final List<DrillPBError> errorList = listener.getErrorList();
+ assertTrue(errorList.isEmpty());
+ }
+
+ @SuppressWarnings("static-method")
+ @After
+ public void checkDrillbits() {
+ clearAllInjections(); // so that the drillbit check itself doesn't trigger anything
+ assertDrillbitsOk(); // TODO we need a way to do this without using a query
+ }
+
+ /**
+ * Set the given injections on a single named drillbit.
+ *
+ * @param bitName
+ * @param injectionOptions the injections
+ */
+ private static void setInjections(final String bitName, final InjectionOptions injectionOptions) {
+ @SuppressWarnings("resource")
+ final Drillbit drillbit = drillbits.get(bitName);
+ if (drillbit == null) {
+ throw new IllegalStateException("No Drillbit named \"" + bitName + "\" found");
+ }
+
+ ExceptionInjectionUtil.setInjections(drillbit, injectionOptions);
+ }
+
+ /**
+ * Set the given injections on all drillbits.
+ *
+ * @param injectionOptions the injections
+ */
+ private static void setInjectionsAll(final InjectionOptions injectionOptions) {
+ for(Drillbit drillbit : drillbits.values()) {
+ ExceptionInjectionUtil.setInjections(drillbit, injectionOptions);
+ }
+ }
+
+ /**
+ * Create a single exception injection.
+ *
+ * @param siteClassName the name of the injection site class
+ * @param desc the injection site description
+ * @param exceptionClassName the name of the exception to throw
+ * @return the created injection options POJO
+ */
+ private static InjectionOptions createSingleInjection(
+ final String siteClassName, final String desc, final String exceptionClassName) {
+ final InjectionOption injectionOption = new InjectionOption();
+ injectionOption.nFire = 1;
+ injectionOption.siteClass = siteClassName;
+ injectionOption.desc = desc;
+ injectionOption.exceptionClass = exceptionClassName;
+
+ final InjectionOptions injectionOptions = new InjectionOptions();
+ injectionOptions.injections = new InjectionOption[1];
+ injectionOptions.injections[0] = injectionOption;
+
+ return injectionOptions;
+ }
+
+ /**
+ * Create a single exception injection.
+ *
+ * @param siteClass the injection site class
+ * @param desc the injection site description
+ * @param exceptionClass the class of the exception to throw
+ * @return the created injection options POJO
+ */
+ private static InjectionOptions createSingleInjection(
+ final Class<?> siteClass, final String desc, final Class<? extends Throwable> exceptionClass) {
+ return createSingleInjection(siteClass.getName(), desc, exceptionClass.getName());
+ }
+
+ /**
+ * Check that the injected exception is what we were expecting.
+ *
+ * @param caught the exception that was caught (by the test)
+ * @param exceptionClass the expected exception class
+ * @param desc the expected exception site description
+ */
+ private static void assertInjected(
+ final Throwable caught, final Class<? extends Throwable> exceptionClass, final String desc) {
+ final String cause = caught.getMessage();
+ final String[] causeParts = cause.split(":");
+ final String causeShortName = causeParts[0].trim();
+ final String causeDesc = causeParts[1].trim();
+ assertTrue(exceptionClass.getName().endsWith(causeShortName));
+ assertEquals(desc, causeDesc);
+ }
+
+ @Test
+ public void testSettingNoopInjectionsAndQuery() throws Exception {
+ final InjectionOptions injectionOptions =
+ createSingleInjection(getClass(), "noop", RuntimeException.class);
+ setInjections(DRILLBIT_BETA, injectionOptions);
+ QueryTestUtil.test(drillClient, "select * from sys.drillbits");
+ }
+
+ /**
+ * Test throwing exceptions from sites within the Foreman class, as specified by the site
+ * description
+ *
+ * @param desc site description
+ * @throws Exception
+ */
+ private static void testForeman(final String desc) throws Exception {
+ final InjectionOptions injectionOptions = createSingleInjection(Foreman.class, desc, ForemanException.class);
+ setInjectionsAll(injectionOptions);
+ try {
+ QueryTestUtil.test(drillClient, "select * from sys.drillbits");
+ fail();
+ } catch(RpcException rpce) {
+ assertInjected(rpce, ForemanException.class, desc);
+ }
+ }
+
+ @SuppressWarnings("static-method")
+ @Test
+ public void testForeman_runTryBeginning() throws Exception {
+ testForeman("run-try-beginning");
+ }
+
+ @SuppressWarnings("static-method")
+ @Test
+ public void testForeman_setInjectionViaAlterSystem() throws Exception {
+ final String exceptionDesc = "run-try-beginning";
+ final InjectionOptions injectionOptions =
+ createSingleInjection(Foreman.class, exceptionDesc, ForemanException.class);
+ final ObjectMapper objectMapper = new ObjectMapper();
+ final String jsonString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(injectionOptions);
+ final String alterSession = String.format(
+ "alter system set `%s`='%s'",
+ ExecConstants.DRILLBIT_EXCEPTION_INJECTIONS, jsonString);
+ QueryTestUtil.test(drillClient, alterSession);
+ try {
+ QueryTestUtil.test(drillClient, "select * from sys.drillbits");
+ fail();
+ } catch(RpcException rpce) {
+ assertInjected(rpce, ForemanException.class, exceptionDesc);
+ }
+ }
+
+ /*
+ * This test doesn't work because worker threads have returned the result to the client before
+ * Foreman.run() has even finished executing. This might not happen if the results are larger.
+ * This brings up the question of how we detect failed queries, because here a failure is happening
+ * after the query starts running, yet apparently the query still succeeds.
+ *
+ * TODO I'm beginning to think that Foreman needs to gate output to its client in a similar way
+ * that it gates input via stateListener. That could be tricky, since some results could be
+ * queued up before Foreman has gotten through it's run(), and they would all have to be sent
+ * before the gate is opened. There's also the question of what to do in case we detect failure
+ * there after some data has been sent. Right now, this test doesn't work because that's
+ * exactly what happens, and the client believes that the query succeeded, even though an exception
+ * was thrown after setup completed, but data was asynchronously sent to the client before that.
+ * This test also revealed that the QueryState never seems to make it to the client, so we can't
+ * detect the failure that way (see SingleRowListener's getQueryState(), which I originally tried
+ * to use here to detect query completion).
+ */
+ @SuppressWarnings("static-method")
+ @Test
+ @Ignore
+ public void testForeman_runTryEnd() throws Exception {
+ testForeman("run-try-end");
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/testing/ExceptionInjectionUtil.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/ExceptionInjectionUtil.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/ExceptionInjectionUtil.java
new file mode 100644
index 0000000..bf93dee
--- /dev/null
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/ExceptionInjectionUtil.java
@@ -0,0 +1,82 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.testing;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import org.apache.drill.exec.ExecConstants;
+import org.apache.drill.exec.server.Drillbit;
+import org.apache.drill.exec.server.DrillbitContext;
+import org.apache.drill.exec.server.options.OptionManager;
+import org.apache.drill.exec.server.options.OptionValue;
+import org.apache.drill.exec.testing.SimulatedExceptions.InjectionOptions;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Static methods for constructing exception injections for testing purposes.
+ */
+public class ExceptionInjectionUtil {
+ /**
+ * Constructor. Prevent instantiation of static utility class.
+ */
+ private ExceptionInjectionUtil() {
+ }
+
+ /**
+ * Add a set of injections to a drillbit.
+ *
+ * @param drillbit the drillbit
+ * @param injections the JSON-specified injections
+ */
+ public static void setInjections(final Drillbit drillbit, final String injections) {
+ final DrillbitContext drillbitContext = drillbit.getContext();
+ final OptionValue stringValue = OptionValue.createString(
+ OptionValue.OptionType.SYSTEM, ExecConstants.DRILLBIT_EXCEPTION_INJECTIONS, injections);
+ final OptionManager optionManager = drillbitContext.getOptionManager();
+ optionManager.setOption(stringValue);
+ }
+
+ /**
+ * Add a set of injections to a drillbit.
+ *
+ * @param drillbit the drillbit
+ * @param injectionOptions the injections, specified using the parsing POJOs
+ */
+ public static void setInjections(final Drillbit drillbit, final InjectionOptions injectionOptions) {
+ final ObjectMapper objectMapper = new ObjectMapper();
+ final StringWriter stringWriter = new StringWriter();
+ try {
+ objectMapper.writeValue(stringWriter, injectionOptions);
+ } catch(IOException e) {
+ throw new RuntimeException("Couldn't serialize injectionOptions to JSON", e);
+ }
+
+ setInjections(drillbit, stringWriter.toString());
+ }
+
+ /**
+ * Clear all injections on a drillbit.
+ *
+ * @param drillbit the drillbit
+ */
+ public static void clearInjections(final Drillbit drillbit) {
+ setInjections(drillbit, "");
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestExceptionInjection.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestExceptionInjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestExceptionInjection.java
new file mode 100644
index 0000000..d0c0279
--- /dev/null
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestExceptionInjection.java
@@ -0,0 +1,192 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.testing;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+import org.apache.drill.BaseTestQuery;
+import org.apache.drill.exec.server.Drillbit;
+import org.apache.drill.exec.server.DrillbitContext;
+import org.apache.drill.exec.testing.SimulatedExceptions.InjectionOption;
+import org.apache.drill.exec.testing.SimulatedExceptions.InjectionOptions;
+import org.junit.Test;
+
+public class TestExceptionInjection extends BaseTestQuery {
+ private final static String NO_THROW_FAIL = "Didn't throw expected exception";
+
+ /**
+ * Class whose methods we want to simulate exceptions at run-time for testing
+ * purposes.
+ */
+ public static class DummyClass {
+ private final static ExceptionInjector injector = ExceptionInjector.getInjector(DummyClass.class);
+ private final DrillbitContext drillbitContext;
+
+ public DummyClass(final DrillbitContext drillbitContext) {
+ this.drillbitContext = drillbitContext;
+ }
+
+ /**
+ * Method that injects an unchecked exception with the given site description.
+ *
+ * @param desc the injection site description
+ */
+ public void descPassthroughMethod(final String desc) {
+ // ... code ...
+
+ // simulated unchecked exception
+ injector.injectUnchecked(drillbitContext, desc);
+
+ // ... code ...
+ }
+
+ public final static String THROWS_IOEXCEPTION = "<<throwsIOException>>";
+
+ /**
+ * Method that injects an IOException with a site description of THROWS_IOEXCEPTION.
+ *
+ * @throws IOException
+ */
+ public void throwsIOException() throws IOException {
+ // ... code ...
+
+ // simulated IOException
+ injector.injectChecked(drillbitContext, THROWS_IOEXCEPTION, IOException.class);
+
+ // ... code ...
+ }
+ }
+
+ @SuppressWarnings("static-method")
+ @Test
+ public void testNoInjection() throws Exception {
+ test("select * from sys.drillbits");
+ }
+
+ private static void setInjections(final String jsonInjections) {
+ for(Drillbit bit : bits) {
+ ExceptionInjectionUtil.setInjections(bit, jsonInjections);
+ }
+ }
+
+ @SuppressWarnings("static-method")
+ @Test
+ public void testEmptyInjection() throws Exception {
+ setInjections("{\"injections\":[]}");
+ test("select * from sys.drillbits");
+ }
+
+ /**
+ * Assert that DummyClass.descPassThroughMethod does indeed throw the expected exception.
+ *
+ * @param dummyClass the instance of DummyClass
+ * @param exceptionClassName the expected exception
+ * @param exceptionDesc the expected exception site description
+ */
+ private static void assertPassthroughThrows(
+ final DummyClass dummyClass, final String exceptionClassName, final String exceptionDesc) {
+ try {
+ dummyClass.descPassthroughMethod(exceptionDesc);
+ fail(NO_THROW_FAIL);
+ } catch(Exception e) {
+ assertEquals(exceptionClassName, e.getClass().getName());
+ assertEquals(exceptionDesc, e.getMessage());
+ }
+ }
+
+ @SuppressWarnings("static-method")
+ @Test
+ public void testUncheckedStringInjection() {
+ // set injections via a string
+ final String exceptionDesc = "<<injected from descPassthroughMethod()>>";
+ final String exceptionClassName = "java.lang.RuntimeException";
+ final String jsonString = "{\"injections\":[{"
+ + "\"siteClass\":\"org.apache.drill.exec.testing.TestExceptionInjection$DummyClass\","
+ + "\"desc\":\"" + exceptionDesc + "\","
+ + "\"nSkip\":0,"
+ + "\"nFire\":1,"
+ + "\"exceptionClass\":\"" + exceptionClassName + "\""
+ + "}]}";
+ setInjections(jsonString);
+
+ // test that the exception gets thrown
+ final DummyClass dummyClass = new DummyClass(bits[0].getContext());
+ assertPassthroughThrows(dummyClass, exceptionClassName, exceptionDesc);
+ }
+
+ private static InjectionOptions buildDefaultJson() {
+ final InjectionOption injectionOption = new InjectionOption();
+ injectionOption.siteClass = "org.apache.drill.exec.testing.TestExceptionInjection$DummyClass";
+ injectionOption.desc = DummyClass.THROWS_IOEXCEPTION;
+ injectionOption.nSkip = 0;
+ injectionOption.nFire = 1;
+ injectionOption.exceptionClass = "java.io.IOException";
+ final InjectionOptions injectionOptions = new InjectionOptions();
+ injectionOptions.injections = new InjectionOption[1];
+ injectionOptions.injections[0] = injectionOption;
+ return injectionOptions;
+ }
+
+ @SuppressWarnings("static-method")
+ @Test
+ public void testCheckedJsonInjection() {
+ // set the injection via the parsing POJOs
+ final InjectionOptions injectionOptions = buildDefaultJson();
+ ExceptionInjectionUtil.setInjections(bits[0], injectionOptions);
+
+ // test that the expected exception (checked) gets thrown
+ final DummyClass dummyClass = new DummyClass(bits[0].getContext());
+ try {
+ dummyClass.throwsIOException();
+ fail(NO_THROW_FAIL);
+ } catch(IOException e) {
+ assertEquals(DummyClass.THROWS_IOEXCEPTION, e.getMessage());
+ }
+ }
+
+ @SuppressWarnings("static-method")
+ @Test
+ public void testSkipAndLimit() {
+ final String passthroughDesc = "<<injected from descPassthrough>>";
+ final InjectionOptions injectionOptions = buildDefaultJson();
+ final InjectionOption injectionOption = injectionOptions.injections[0];
+ injectionOption.desc = passthroughDesc;
+ injectionOption.nSkip = 7;
+ injectionOption.nFire = 3;
+ injectionOption.exceptionClass = RuntimeException.class.getName();
+ ExceptionInjectionUtil.setInjections(bits[0], injectionOptions);
+
+ final DummyClass dummyClass = new DummyClass(bits[0].getContext());
+
+ // these shouldn't throw
+ for(int i = 0; i < injectionOption.nSkip; ++i) {
+ dummyClass.descPassthroughMethod(passthroughDesc);
+ }
+
+ // these should throw
+ for(int i = 0; i < injectionOption.nFire; ++i) {
+ assertPassthroughThrows(dummyClass, injectionOption.exceptionClass, passthroughDesc);
+ }
+
+ // this shouldn't throw
+ dummyClass.descPassthroughMethod(passthroughDesc);
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
index 2c51ec0..f19aab0 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
@@ -115,6 +115,7 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
return allocator;
}
+ @Override
public DrillClient getClient() {
return client;
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
index b88d880..f7ecf0a 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
@@ -19,6 +19,7 @@ package org.apache.drill.jdbc.test;
import java.sql.Connection;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
@@ -85,15 +86,14 @@ public class JdbcAssert {
}
static String toString(ResultSet resultSet, int expectedRecordCount) throws SQLException {
- StringBuilder buf = new StringBuilder();
- int total = 0, n;
+ final StringBuilder buf = new StringBuilder();
while (resultSet.next()) {
- n = resultSet.getMetaData().getColumnCount();
- total++;
+ final ResultSetMetaData metaData = resultSet.getMetaData();
+ final int n = metaData.getColumnCount();
String sep = "";
for (int i = 1; i <= n; i++) {
buf.append(sep)
- .append(resultSet.getMetaData().getColumnLabel(i))
+ .append(metaData.getColumnLabel(i))
.append("=")
.append(resultSet.getObject(i));
sep = "; ";
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 8c3e9b0..d5ca70d 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
@@ -28,7 +28,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0</version>
</dependency>
<dependency>
<groupId>com.dyuproject.protostuff</groupId>
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java b/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java
index 74ac444..67beed1 100644
--- a/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java
+++ b/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java
@@ -815,10 +815,10 @@ public final class TypeProtos {
// @@protoc_insertion_point(enum_scope:common.DataMode)
}
- public interface MajorTypeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface MajorTypeOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:common.MajorType)
+ com.google.protobuf.MessageOrBuilder {
- // optional .common.MinorType minor_type = 1;
/**
* <code>optional .common.MinorType minor_type = 1;</code>
*/
@@ -828,7 +828,6 @@ public final class TypeProtos {
*/
org.apache.drill.common.types.TypeProtos.MinorType getMinorType();
- // optional .common.DataMode mode = 2;
/**
* <code>optional .common.DataMode mode = 2;</code>
*/
@@ -838,7 +837,6 @@ public final class TypeProtos {
*/
org.apache.drill.common.types.TypeProtos.DataMode getMode();
- // optional int32 width = 3;
/**
* <code>optional int32 width = 3;</code>
*
@@ -856,7 +854,6 @@ public final class TypeProtos {
*/
int getWidth();
- // optional int32 precision = 4;
/**
* <code>optional int32 precision = 4;</code>
*
@@ -874,7 +871,6 @@ public final class TypeProtos {
*/
int getPrecision();
- // optional int32 scale = 5;
/**
* <code>optional int32 scale = 5;</code>
*
@@ -892,7 +888,6 @@ public final class TypeProtos {
*/
int getScale();
- // optional int32 timeZone = 6;
/**
* <code>optional int32 timeZone = 6;</code>
*
@@ -914,8 +909,9 @@ public final class TypeProtos {
* Protobuf type {@code common.MajorType}
*/
public static final class MajorType extends
- com.google.protobuf.GeneratedMessage
- implements MajorTypeOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:common.MajorType)
+ MajorTypeOrBuilder {
// Use MajorType.newBuilder() to construct.
private MajorType(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1043,7 +1039,6 @@ public final class TypeProtos {
}
private int bitField0_;
- // optional .common.MinorType minor_type = 1;
public static final int MINOR_TYPE_FIELD_NUMBER = 1;
private org.apache.drill.common.types.TypeProtos.MinorType minorType_;
/**
@@ -1059,7 +1054,6 @@ public final class TypeProtos {
return minorType_;
}
- // optional .common.DataMode mode = 2;
public static final int MODE_FIELD_NUMBER = 2;
private org.apache.drill.common.types.TypeProtos.DataMode mode_;
/**
@@ -1075,7 +1069,6 @@ public final class TypeProtos {
return mode_;
}
- // optional int32 width = 3;
public static final int WIDTH_FIELD_NUMBER = 3;
private int width_;
/**
@@ -1099,7 +1092,6 @@ public final class TypeProtos {
return width_;
}
- // optional int32 precision = 4;
public static final int PRECISION_FIELD_NUMBER = 4;
private int precision_;
/**
@@ -1123,7 +1115,6 @@ public final class TypeProtos {
return precision_;
}
- // optional int32 scale = 5;
public static final int SCALE_FIELD_NUMBER = 5;
private int scale_;
/**
@@ -1147,7 +1138,6 @@ public final class TypeProtos {
return scale_;
}
- // optional int32 timeZone = 6;
public static final int TIMEZONE_FIELD_NUMBER = 6;
private int timeZone_;
/**
@@ -1182,7 +1172,8 @@ public final class TypeProtos {
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;
@@ -1324,8 +1315,9 @@ public final class TypeProtos {
* Protobuf type {@code common.MajorType}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.common.types.TypeProtos.MajorTypeOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:common.MajorType)
+ org.apache.drill.common.types.TypeProtos.MajorTypeOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.common.types.TypeProtos.internal_static_common_MajorType_descriptor;
@@ -1483,7 +1475,6 @@ public final class TypeProtos {
}
private int bitField0_;
- // optional .common.MinorType minor_type = 1;
private org.apache.drill.common.types.TypeProtos.MinorType minorType_ = org.apache.drill.common.types.TypeProtos.MinorType.LATE;
/**
* <code>optional .common.MinorType minor_type = 1;</code>
@@ -1519,7 +1510,6 @@ public final class TypeProtos {
return this;
}
- // optional .common.DataMode mode = 2;
private org.apache.drill.common.types.TypeProtos.DataMode mode_ = org.apache.drill.common.types.TypeProtos.DataMode.OPTIONAL;
/**
* <code>optional .common.DataMode mode = 2;</code>
@@ -1555,7 +1545,6 @@ public final class TypeProtos {
return this;
}
- // optional int32 width = 3;
private int width_ ;
/**
* <code>optional int32 width = 3;</code>
@@ -1604,7 +1593,6 @@ public final class TypeProtos {
return this;
}
- // optional int32 precision = 4;
private int precision_ ;
/**
* <code>optional int32 precision = 4;</code>
@@ -1653,7 +1641,6 @@ public final class TypeProtos {
return this;
}
- // optional int32 scale = 5;
private int scale_ ;
/**
* <code>optional int32 scale = 5;</code>
@@ -1702,7 +1689,6 @@ public final class TypeProtos {
return this;
}
- // optional int32 timeZone = 6;
private int timeZone_ ;
/**
* <code>optional int32 timeZone = 6;</code>
@@ -1762,7 +1748,7 @@ public final class TypeProtos {
// @@protoc_insertion_point(class_scope:common.MajorType)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_common_MajorType_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1798,23 +1784,23 @@ public final class TypeProtos {
"apache.drill.common.typesB\nTypeProtosH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_common_MajorType_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_common_MajorType_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_common_MajorType_descriptor,
- new java.lang.String[] { "MinorType", "Mode", "Width", "Precision", "Scale", "TimeZone", });
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
}, assigner);
+ internal_static_common_MajorType_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_common_MajorType_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_common_MajorType_descriptor,
+ new java.lang.String[] { "MinorType", "Mode", "Width", "Precision", "Scale", "TimeZone", });
}
// @@protoc_insertion_point(outer_class_scope)
[4/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.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java b/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
index 813d961..2502701 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
@@ -259,10 +259,10 @@ public final class BitControl {
// @@protoc_insertion_point(enum_scope:exec.bit.control.RpcType)
}
- public interface BitControlHandshakeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface BitControlHandshakeOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.control.BitControlHandshake)
+ com.google.protobuf.MessageOrBuilder {
- // optional int32 rpc_version = 1;
/**
* <code>optional int32 rpc_version = 1;</code>
*/
@@ -272,7 +272,6 @@ public final class BitControl {
*/
int getRpcVersion();
- // optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];
/**
* <code>optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];</code>
*/
@@ -282,7 +281,6 @@ public final class BitControl {
*/
org.apache.drill.exec.proto.UserBitShared.RpcChannel getChannel();
- // optional .exec.DrillbitEndpoint endpoint = 3;
/**
* <code>optional .exec.DrillbitEndpoint endpoint = 3;</code>
*/
@@ -300,8 +298,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.BitControlHandshake}
*/
public static final class BitControlHandshake extends
- com.google.protobuf.GeneratedMessage
- implements BitControlHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.control.BitControlHandshake)
+ BitControlHandshakeOrBuilder {
// Use BitControlHandshake.newBuilder() to construct.
private BitControlHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -416,7 +415,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional int32 rpc_version = 1;
public static final int RPC_VERSION_FIELD_NUMBER = 1;
private int rpcVersion_;
/**
@@ -432,7 +430,6 @@ public final class BitControl {
return rpcVersion_;
}
- // optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];
public static final int CHANNEL_FIELD_NUMBER = 2;
private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_;
/**
@@ -448,7 +445,6 @@ public final class BitControl {
return channel_;
}
- // optional .exec.DrillbitEndpoint endpoint = 3;
public static final int ENDPOINT_FIELD_NUMBER = 3;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_;
/**
@@ -478,7 +474,8 @@ public final class BitControl {
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;
@@ -599,8 +596,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.BitControlHandshake}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitControl.BitControlHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.control.BitControlHandshake)
+ org.apache.drill.exec.proto.BitControl.BitControlHandshakeOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_BitControlHandshake_descriptor;
@@ -740,7 +738,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional int32 rpc_version = 1;
private int rpcVersion_ ;
/**
* <code>optional int32 rpc_version = 1;</code>
@@ -773,7 +770,6 @@ public final class BitControl {
return this;
}
- // optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];
private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_ = org.apache.drill.exec.proto.UserBitShared.RpcChannel.BIT_CONTROL;
/**
* <code>optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];</code>
@@ -809,7 +805,6 @@ public final class BitControl {
return this;
}
- // optional .exec.DrillbitEndpoint endpoint = 3;
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_;
@@ -918,7 +913,7 @@ public final class BitControl {
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;
@@ -937,10 +932,10 @@ public final class BitControl {
// @@protoc_insertion_point(class_scope:exec.bit.control.BitControlHandshake)
}
- public interface BitStatusOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface BitStatusOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.control.BitStatus)
+ com.google.protobuf.MessageOrBuilder {
- // repeated .exec.bit.control.FragmentStatus fragment_status = 1;
/**
* <code>repeated .exec.bit.control.FragmentStatus fragment_status = 1;</code>
*/
@@ -969,8 +964,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.BitStatus}
*/
public static final class BitStatus extends
- com.google.protobuf.GeneratedMessage
- implements BitStatusOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.control.BitStatus)
+ BitStatusOrBuilder {
// Use BitStatus.newBuilder() to construct.
private BitStatus(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1066,7 +1062,6 @@ public final class BitControl {
return PARSER;
}
- // repeated .exec.bit.control.FragmentStatus fragment_status = 1;
public static final int FRAGMENT_STATUS_FIELD_NUMBER = 1;
private java.util.List<org.apache.drill.exec.proto.BitControl.FragmentStatus> fragmentStatus_;
/**
@@ -1108,7 +1103,8 @@ public final class BitControl {
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;
@@ -1215,8 +1211,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.BitStatus}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitControl.BitStatusOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.control.BitStatus)
+ org.apache.drill.exec.proto.BitControl.BitStatusOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_BitStatus_descriptor;
@@ -1360,7 +1357,6 @@ public final class BitControl {
}
private int bitField0_;
- // repeated .exec.bit.control.FragmentStatus fragment_status = 1;
private java.util.List<org.apache.drill.exec.proto.BitControl.FragmentStatus> fragmentStatus_ =
java.util.Collections.emptyList();
private void ensureFragmentStatusIsMutable() {
@@ -1502,7 +1498,8 @@ public final class BitControl {
java.lang.Iterable<? extends org.apache.drill.exec.proto.BitControl.FragmentStatus> values) {
if (fragmentStatusBuilder_ == null) {
ensureFragmentStatusIsMutable();
- super.addAll(values, fragmentStatus_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, fragmentStatus_);
onChanged();
} else {
fragmentStatusBuilder_.addAllMessages(values);
@@ -1611,10 +1608,10 @@ public final class BitControl {
// @@protoc_insertion_point(class_scope:exec.bit.control.BitStatus)
}
- public interface FragmentStatusOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface FragmentStatusOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.control.FragmentStatus)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.shared.MinorFragmentProfile profile = 1;
/**
* <code>optional .exec.shared.MinorFragmentProfile profile = 1;</code>
*/
@@ -1628,7 +1625,6 @@ public final class BitControl {
*/
org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfileOrBuilder getProfileOrBuilder();
- // optional .exec.bit.FragmentHandle handle = 2;
/**
* <code>optional .exec.bit.FragmentHandle handle = 2;</code>
*/
@@ -1646,8 +1642,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.FragmentStatus}
*/
public static final class FragmentStatus extends
- com.google.protobuf.GeneratedMessage
- implements FragmentStatusOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.control.FragmentStatus)
+ FragmentStatusOrBuilder {
// Use FragmentStatus.newBuilder() to construct.
private FragmentStatus(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1759,7 +1756,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional .exec.shared.MinorFragmentProfile profile = 1;
public static final int PROFILE_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile profile_;
/**
@@ -1781,7 +1777,6 @@ public final class BitControl {
return profile_;
}
- // optional .exec.bit.FragmentHandle handle = 2;
public static final int HANDLE_FIELD_NUMBER = 2;
private org.apache.drill.exec.proto.ExecProtos.FragmentHandle handle_;
/**
@@ -1810,7 +1805,8 @@ public final class BitControl {
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;
@@ -1924,8 +1920,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.FragmentStatus}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitControl.FragmentStatusOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.control.FragmentStatus)
+ org.apache.drill.exec.proto.BitControl.FragmentStatusOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_FragmentStatus_descriptor;
@@ -2065,7 +2062,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional .exec.shared.MinorFragmentProfile profile = 1;
private org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile profile_ = org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfileOrBuilder> profileBuilder_;
@@ -2174,7 +2170,7 @@ public final class BitControl {
if (profileBuilder_ == null) {
profileBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfileOrBuilder>(
- profile_,
+ getProfile(),
getParentForChildren(),
isClean());
profile_ = null;
@@ -2182,7 +2178,6 @@ public final class BitControl {
return profileBuilder_;
}
- // optional .exec.bit.FragmentHandle handle = 2;
private org.apache.drill.exec.proto.ExecProtos.FragmentHandle handle_ = org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder> handleBuilder_;
@@ -2291,7 +2286,7 @@ public final class BitControl {
if (handleBuilder_ == null) {
handleBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder>(
- handle_,
+ getHandle(),
getParentForChildren(),
isClean());
handle_ = null;
@@ -2310,10 +2305,10 @@ public final class BitControl {
// @@protoc_insertion_point(class_scope:exec.bit.control.FragmentStatus)
}
- public interface InitializeFragmentsOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface InitializeFragmentsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.control.InitializeFragments)
+ com.google.protobuf.MessageOrBuilder {
- // repeated .exec.bit.control.PlanFragment fragment = 1;
/**
* <code>repeated .exec.bit.control.PlanFragment fragment = 1;</code>
*/
@@ -2342,8 +2337,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.InitializeFragments}
*/
public static final class InitializeFragments extends
- com.google.protobuf.GeneratedMessage
- implements InitializeFragmentsOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.control.InitializeFragments)
+ InitializeFragmentsOrBuilder {
// Use InitializeFragments.newBuilder() to construct.
private InitializeFragments(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -2439,7 +2435,6 @@ public final class BitControl {
return PARSER;
}
- // repeated .exec.bit.control.PlanFragment fragment = 1;
public static final int FRAGMENT_FIELD_NUMBER = 1;
private java.util.List<org.apache.drill.exec.proto.BitControl.PlanFragment> fragment_;
/**
@@ -2481,7 +2476,8 @@ public final class BitControl {
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;
@@ -2588,8 +2584,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.InitializeFragments}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitControl.InitializeFragmentsOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.control.InitializeFragments)
+ org.apache.drill.exec.proto.BitControl.InitializeFragmentsOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_InitializeFragments_descriptor;
@@ -2733,7 +2730,6 @@ public final class BitControl {
}
private int bitField0_;
- // repeated .exec.bit.control.PlanFragment fragment = 1;
private java.util.List<org.apache.drill.exec.proto.BitControl.PlanFragment> fragment_ =
java.util.Collections.emptyList();
private void ensureFragmentIsMutable() {
@@ -2875,7 +2871,8 @@ public final class BitControl {
java.lang.Iterable<? extends org.apache.drill.exec.proto.BitControl.PlanFragment> values) {
if (fragmentBuilder_ == null) {
ensureFragmentIsMutable();
- super.addAll(values, fragment_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, fragment_);
onChanged();
} else {
fragmentBuilder_.addAllMessages(values);
@@ -2984,10 +2981,10 @@ public final class BitControl {
// @@protoc_insertion_point(class_scope:exec.bit.control.InitializeFragments)
}
- public interface PlanFragmentOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface PlanFragmentOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.control.PlanFragment)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.bit.FragmentHandle handle = 1;
/**
* <code>optional .exec.bit.FragmentHandle handle = 1;</code>
*/
@@ -3001,7 +2998,6 @@ public final class BitControl {
*/
org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder getHandleOrBuilder();
- // optional float network_cost = 4;
/**
* <code>optional float network_cost = 4;</code>
*/
@@ -3011,7 +3007,6 @@ public final class BitControl {
*/
float getNetworkCost();
- // optional float cpu_cost = 5;
/**
* <code>optional float cpu_cost = 5;</code>
*/
@@ -3021,7 +3016,6 @@ public final class BitControl {
*/
float getCpuCost();
- // optional float disk_cost = 6;
/**
* <code>optional float disk_cost = 6;</code>
*/
@@ -3031,7 +3025,6 @@ public final class BitControl {
*/
float getDiskCost();
- // optional float memory_cost = 7;
/**
* <code>optional float memory_cost = 7;</code>
*/
@@ -3041,7 +3034,6 @@ public final class BitControl {
*/
float getMemoryCost();
- // optional string fragment_json = 8;
/**
* <code>optional string fragment_json = 8;</code>
*/
@@ -3056,7 +3048,6 @@ public final class BitControl {
com.google.protobuf.ByteString
getFragmentJsonBytes();
- // optional .exec.DrillbitEndpoint assignment = 10;
/**
* <code>optional .exec.DrillbitEndpoint assignment = 10;</code>
*/
@@ -3070,7 +3061,6 @@ public final class BitControl {
*/
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getAssignmentOrBuilder();
- // optional bool leaf_fragment = 9;
/**
* <code>optional bool leaf_fragment = 9;</code>
*/
@@ -3080,7 +3070,6 @@ public final class BitControl {
*/
boolean getLeafFragment();
- // optional .exec.DrillbitEndpoint foreman = 11;
/**
* <code>optional .exec.DrillbitEndpoint foreman = 11;</code>
*/
@@ -3094,7 +3083,6 @@ public final class BitControl {
*/
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getForemanOrBuilder();
- // optional int64 mem_initial = 12 [default = 20000000];
/**
* <code>optional int64 mem_initial = 12 [default = 20000000];</code>
*
@@ -3112,7 +3100,6 @@ public final class BitControl {
*/
long getMemInitial();
- // optional int64 mem_max = 13 [default = 2000000000];
/**
* <code>optional int64 mem_max = 13 [default = 2000000000];</code>
*
@@ -3130,7 +3117,6 @@ public final class BitControl {
*/
long getMemMax();
- // optional int64 query_start_time = 14;
/**
* <code>optional int64 query_start_time = 14;</code>
*
@@ -3148,7 +3134,6 @@ public final class BitControl {
*/
long getQueryStartTime();
- // optional .exec.shared.UserCredentials credentials = 15;
/**
* <code>optional .exec.shared.UserCredentials credentials = 15;</code>
*/
@@ -3162,7 +3147,6 @@ public final class BitControl {
*/
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder getCredentialsOrBuilder();
- // optional int32 time_zone = 16;
/**
* <code>optional int32 time_zone = 16;</code>
*/
@@ -3172,7 +3156,6 @@ public final class BitControl {
*/
int getTimeZone();
- // optional string options_json = 17;
/**
* <code>optional string options_json = 17;</code>
*/
@@ -3191,8 +3174,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.PlanFragment}
*/
public static final class PlanFragment extends
- com.google.protobuf.GeneratedMessage
- implements PlanFragmentOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.control.PlanFragment)
+ PlanFragmentOrBuilder {
// Use PlanFragment.newBuilder() to construct.
private PlanFragment(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -3272,8 +3256,9 @@ public final class BitControl {
break;
}
case 66: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000020;
- fragmentJson_ = input.readBytes();
+ fragmentJson_ = bs;
break;
}
case 72: {
@@ -3341,8 +3326,9 @@ public final class BitControl {
break;
}
case 138: {
+ com.google.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00004000;
- optionsJson_ = input.readBytes();
+ optionsJson_ = bs;
break;
}
}
@@ -3385,7 +3371,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional .exec.bit.FragmentHandle handle = 1;
public static final int HANDLE_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.ExecProtos.FragmentHandle handle_;
/**
@@ -3407,7 +3392,6 @@ public final class BitControl {
return handle_;
}
- // optional float network_cost = 4;
public static final int NETWORK_COST_FIELD_NUMBER = 4;
private float networkCost_;
/**
@@ -3423,7 +3407,6 @@ public final class BitControl {
return networkCost_;
}
- // optional float cpu_cost = 5;
public static final int CPU_COST_FIELD_NUMBER = 5;
private float cpuCost_;
/**
@@ -3439,7 +3422,6 @@ public final class BitControl {
return cpuCost_;
}
- // optional float disk_cost = 6;
public static final int DISK_COST_FIELD_NUMBER = 6;
private float diskCost_;
/**
@@ -3455,7 +3437,6 @@ public final class BitControl {
return diskCost_;
}
- // optional float memory_cost = 7;
public static final int MEMORY_COST_FIELD_NUMBER = 7;
private float memoryCost_;
/**
@@ -3471,7 +3452,6 @@ public final class BitControl {
return memoryCost_;
}
- // optional string fragment_json = 8;
public static final int FRAGMENT_JSON_FIELD_NUMBER = 8;
private java.lang.Object fragmentJson_;
/**
@@ -3514,7 +3494,6 @@ public final class BitControl {
}
}
- // optional .exec.DrillbitEndpoint assignment = 10;
public static final int ASSIGNMENT_FIELD_NUMBER = 10;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint assignment_;
/**
@@ -3536,7 +3515,6 @@ public final class BitControl {
return assignment_;
}
- // optional bool leaf_fragment = 9;
public static final int LEAF_FRAGMENT_FIELD_NUMBER = 9;
private boolean leafFragment_;
/**
@@ -3552,7 +3530,6 @@ public final class BitControl {
return leafFragment_;
}
- // optional .exec.DrillbitEndpoint foreman = 11;
public static final int FOREMAN_FIELD_NUMBER = 11;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint foreman_;
/**
@@ -3574,7 +3551,6 @@ public final class BitControl {
return foreman_;
}
- // optional int64 mem_initial = 12 [default = 20000000];
public static final int MEM_INITIAL_FIELD_NUMBER = 12;
private long memInitial_;
/**
@@ -3598,7 +3574,6 @@ public final class BitControl {
return memInitial_;
}
- // optional int64 mem_max = 13 [default = 2000000000];
public static final int MEM_MAX_FIELD_NUMBER = 13;
private long memMax_;
/**
@@ -3622,7 +3597,6 @@ public final class BitControl {
return memMax_;
}
- // optional int64 query_start_time = 14;
public static final int QUERY_START_TIME_FIELD_NUMBER = 14;
private long queryStartTime_;
/**
@@ -3646,7 +3620,6 @@ public final class BitControl {
return queryStartTime_;
}
- // optional .exec.shared.UserCredentials credentials = 15;
public static final int CREDENTIALS_FIELD_NUMBER = 15;
private org.apache.drill.exec.proto.UserBitShared.UserCredentials credentials_;
/**
@@ -3668,7 +3641,6 @@ public final class BitControl {
return credentials_;
}
- // optional int32 time_zone = 16;
public static final int TIME_ZONE_FIELD_NUMBER = 16;
private int timeZone_;
/**
@@ -3684,7 +3656,6 @@ public final class BitControl {
return timeZone_;
}
- // optional string options_json = 17;
public static final int OPTIONS_JSON_FIELD_NUMBER = 17;
private java.lang.Object optionsJson_;
/**
@@ -3747,7 +3718,8 @@ public final class BitControl {
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;
@@ -3952,8 +3924,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.PlanFragment}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitControl.PlanFragmentOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.control.PlanFragment)
+ org.apache.drill.exec.proto.BitControl.PlanFragmentOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_PlanFragment_descriptor;
@@ -4232,7 +4205,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional .exec.bit.FragmentHandle handle = 1;
private org.apache.drill.exec.proto.ExecProtos.FragmentHandle handle_ = org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder> handleBuilder_;
@@ -4341,7 +4313,7 @@ public final class BitControl {
if (handleBuilder_ == null) {
handleBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder>(
- handle_,
+ getHandle(),
getParentForChildren(),
isClean());
handle_ = null;
@@ -4349,7 +4321,6 @@ public final class BitControl {
return handleBuilder_;
}
- // optional float network_cost = 4;
private float networkCost_ ;
/**
* <code>optional float network_cost = 4;</code>
@@ -4382,7 +4353,6 @@ public final class BitControl {
return this;
}
- // optional float cpu_cost = 5;
private float cpuCost_ ;
/**
* <code>optional float cpu_cost = 5;</code>
@@ -4415,7 +4385,6 @@ public final class BitControl {
return this;
}
- // optional float disk_cost = 6;
private float diskCost_ ;
/**
* <code>optional float disk_cost = 6;</code>
@@ -4448,7 +4417,6 @@ public final class BitControl {
return this;
}
- // optional float memory_cost = 7;
private float memoryCost_ ;
/**
* <code>optional float memory_cost = 7;</code>
@@ -4481,7 +4449,6 @@ public final class BitControl {
return this;
}
- // optional string fragment_json = 8;
private java.lang.Object fragmentJson_ = "";
/**
* <code>optional string fragment_json = 8;</code>
@@ -4495,9 +4462,12 @@ public final class BitControl {
public java.lang.String getFragmentJson() {
java.lang.Object ref = fragmentJson_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- fragmentJson_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ fragmentJson_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -4555,7 +4525,6 @@ public final class BitControl {
return this;
}
- // optional .exec.DrillbitEndpoint assignment = 10;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint assignment_ = 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> assignmentBuilder_;
@@ -4664,7 +4633,7 @@ public final class BitControl {
if (assignmentBuilder_ == null) {
assignmentBuilder_ = 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>(
- assignment_,
+ getAssignment(),
getParentForChildren(),
isClean());
assignment_ = null;
@@ -4672,7 +4641,6 @@ public final class BitControl {
return assignmentBuilder_;
}
- // optional bool leaf_fragment = 9;
private boolean leafFragment_ ;
/**
* <code>optional bool leaf_fragment = 9;</code>
@@ -4705,7 +4673,6 @@ public final class BitControl {
return this;
}
- // optional .exec.DrillbitEndpoint foreman = 11;
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_;
@@ -4814,7 +4781,7 @@ public final class BitControl {
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;
@@ -4822,7 +4789,6 @@ public final class BitControl {
return foremanBuilder_;
}
- // optional int64 mem_initial = 12 [default = 20000000];
private long memInitial_ = 20000000L;
/**
* <code>optional int64 mem_initial = 12 [default = 20000000];</code>
@@ -4871,7 +4837,6 @@ public final class BitControl {
return this;
}
- // optional int64 mem_max = 13 [default = 2000000000];
private long memMax_ = 2000000000L;
/**
* <code>optional int64 mem_max = 13 [default = 2000000000];</code>
@@ -4920,7 +4885,6 @@ public final class BitControl {
return this;
}
- // optional int64 query_start_time = 14;
private long queryStartTime_ ;
/**
* <code>optional int64 query_start_time = 14;</code>
@@ -4969,7 +4933,6 @@ public final class BitControl {
return this;
}
- // optional .exec.shared.UserCredentials credentials = 15;
private org.apache.drill.exec.proto.UserBitShared.UserCredentials credentials_ = org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.UserCredentials, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder> credentialsBuilder_;
@@ -5078,7 +5041,7 @@ public final class BitControl {
if (credentialsBuilder_ == null) {
credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.UserBitShared.UserCredentials, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder>(
- credentials_,
+ getCredentials(),
getParentForChildren(),
isClean());
credentials_ = null;
@@ -5086,7 +5049,6 @@ public final class BitControl {
return credentialsBuilder_;
}
- // optional int32 time_zone = 16;
private int timeZone_ ;
/**
* <code>optional int32 time_zone = 16;</code>
@@ -5119,7 +5081,6 @@ public final class BitControl {
return this;
}
- // optional string options_json = 17;
private java.lang.Object optionsJson_ = "";
/**
* <code>optional string options_json = 17;</code>
@@ -5133,9 +5094,12 @@ public final class BitControl {
public java.lang.String getOptionsJson() {
java.lang.Object ref = optionsJson_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
- .toStringUtf8();
- optionsJson_ = s;
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ optionsJson_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -5204,10 +5168,10 @@ public final class BitControl {
// @@protoc_insertion_point(class_scope:exec.bit.control.PlanFragment)
}
- public interface WorkQueueStatusOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface WorkQueueStatusOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.control.WorkQueueStatus)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.DrillbitEndpoint endpoint = 1;
/**
* <code>optional .exec.DrillbitEndpoint endpoint = 1;</code>
*/
@@ -5221,7 +5185,6 @@ public final class BitControl {
*/
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getEndpointOrBuilder();
- // optional int32 queue_length = 2;
/**
* <code>optional int32 queue_length = 2;</code>
*/
@@ -5231,7 +5194,6 @@ public final class BitControl {
*/
int getQueueLength();
- // optional int64 report_time = 3;
/**
* <code>optional int64 report_time = 3;</code>
*/
@@ -5245,8 +5207,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.WorkQueueStatus}
*/
public static final class WorkQueueStatus extends
- com.google.protobuf.GeneratedMessage
- implements WorkQueueStatusOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.control.WorkQueueStatus)
+ WorkQueueStatusOrBuilder {
// Use WorkQueueStatus.newBuilder() to construct.
private WorkQueueStatus(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -5355,7 +5318,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional .exec.DrillbitEndpoint endpoint = 1;
public static final int ENDPOINT_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_;
/**
@@ -5377,7 +5339,6 @@ public final class BitControl {
return endpoint_;
}
- // optional int32 queue_length = 2;
public static final int QUEUE_LENGTH_FIELD_NUMBER = 2;
private int queueLength_;
/**
@@ -5393,7 +5354,6 @@ public final class BitControl {
return queueLength_;
}
- // optional int64 report_time = 3;
public static final int REPORT_TIME_FIELD_NUMBER = 3;
private long reportTime_;
/**
@@ -5417,7 +5377,8 @@ public final class BitControl {
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;
@@ -5538,8 +5499,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.WorkQueueStatus}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitControl.WorkQueueStatusOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.control.WorkQueueStatus)
+ org.apache.drill.exec.proto.BitControl.WorkQueueStatusOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_WorkQueueStatus_descriptor;
@@ -5679,7 +5641,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional .exec.DrillbitEndpoint endpoint = 1;
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_;
@@ -5788,7 +5749,7 @@ public final class BitControl {
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;
@@ -5796,7 +5757,6 @@ public final class BitControl {
return endpointBuilder_;
}
- // optional int32 queue_length = 2;
private int queueLength_ ;
/**
* <code>optional int32 queue_length = 2;</code>
@@ -5829,7 +5789,6 @@ public final class BitControl {
return this;
}
- // optional int64 report_time = 3;
private long reportTime_ ;
/**
* <code>optional int64 report_time = 3;</code>
@@ -5873,10 +5832,10 @@ public final class BitControl {
// @@protoc_insertion_point(class_scope:exec.bit.control.WorkQueueStatus)
}
- public interface FinishedReceiverOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface FinishedReceiverOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.control.FinishedReceiver)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.bit.FragmentHandle receiver = 1;
/**
* <code>optional .exec.bit.FragmentHandle receiver = 1;</code>
*/
@@ -5890,7 +5849,6 @@ public final class BitControl {
*/
org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder getReceiverOrBuilder();
- // optional .exec.bit.FragmentHandle sender = 2;
/**
* <code>optional .exec.bit.FragmentHandle sender = 2;</code>
*/
@@ -5908,8 +5866,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.FinishedReceiver}
*/
public static final class FinishedReceiver extends
- com.google.protobuf.GeneratedMessage
- implements FinishedReceiverOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.control.FinishedReceiver)
+ FinishedReceiverOrBuilder {
// Use FinishedReceiver.newBuilder() to construct.
private FinishedReceiver(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -6021,7 +5980,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional .exec.bit.FragmentHandle receiver = 1;
public static final int RECEIVER_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.ExecProtos.FragmentHandle receiver_;
/**
@@ -6043,7 +6001,6 @@ public final class BitControl {
return receiver_;
}
- // optional .exec.bit.FragmentHandle sender = 2;
public static final int SENDER_FIELD_NUMBER = 2;
private org.apache.drill.exec.proto.ExecProtos.FragmentHandle sender_;
/**
@@ -6072,7 +6029,8 @@ public final class BitControl {
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;
@@ -6186,8 +6144,9 @@ public final class BitControl {
* Protobuf type {@code exec.bit.control.FinishedReceiver}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitControl.FinishedReceiverOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.control.FinishedReceiver)
+ org.apache.drill.exec.proto.BitControl.FinishedReceiverOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_FinishedReceiver_descriptor;
@@ -6327,7 +6286,6 @@ public final class BitControl {
}
private int bitField0_;
- // optional .exec.bit.FragmentHandle receiver = 1;
private org.apache.drill.exec.proto.ExecProtos.FragmentHandle receiver_ = org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder> receiverBuilder_;
@@ -6436,7 +6394,7 @@ public final class BitControl {
if (receiverBuilder_ == null) {
receiverBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder>(
- receiver_,
+ getReceiver(),
getParentForChildren(),
isClean());
receiver_ = null;
@@ -6444,7 +6402,6 @@ public final class BitControl {
return receiverBuilder_;
}
- // optional .exec.bit.FragmentHandle sender = 2;
private org.apache.drill.exec.proto.ExecProtos.FragmentHandle sender_ = org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder> senderBuilder_;
@@ -6553,7 +6510,7 @@ public final class BitControl {
if (senderBuilder_ == null) {
senderBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder>(
- sender_,
+ getSender(),
getParentForChildren(),
isClean());
sender_ = null;
@@ -6572,37 +6529,37 @@ public final class BitControl {
// @@protoc_insertion_point(class_scope:exec.bit.control.FinishedReceiver)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_control_BitControlHandshake_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_bit_control_BitControlHandshake_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_control_BitStatus_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_bit_control_BitStatus_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_control_FragmentStatus_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_bit_control_FragmentStatus_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_control_InitializeFragments_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_bit_control_InitializeFragments_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_control_PlanFragment_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_bit_control_PlanFragment_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_control_WorkQueueStatus_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_bit_control_WorkQueueStatus_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_control_FinishedReceiver_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -6656,55 +6613,13 @@ public final class BitControl {
".apache.drill.exec.protoB\nBitControlH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_exec_bit_control_BitControlHandshake_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_exec_bit_control_BitControlHandshake_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_control_BitControlHandshake_descriptor,
- new java.lang.String[] { "RpcVersion", "Channel", "Endpoint", });
- internal_static_exec_bit_control_BitStatus_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_exec_bit_control_BitStatus_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_control_BitStatus_descriptor,
- new java.lang.String[] { "FragmentStatus", });
- internal_static_exec_bit_control_FragmentStatus_descriptor =
- getDescriptor().getMessageTypes().get(2);
- internal_static_exec_bit_control_FragmentStatus_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_control_FragmentStatus_descriptor,
- new java.lang.String[] { "Profile", "Handle", });
- internal_static_exec_bit_control_InitializeFragments_descriptor =
- getDescriptor().getMessageTypes().get(3);
- internal_static_exec_bit_control_InitializeFragments_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_control_InitializeFragments_descriptor,
- new java.lang.String[] { "Fragment", });
- internal_static_exec_bit_control_PlanFragment_descriptor =
- getDescriptor().getMessageTypes().get(4);
- internal_static_exec_bit_control_PlanFragment_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_control_PlanFragment_descriptor,
- new java.lang.String[] { "Handle", "NetworkCost", "CpuCost", "DiskCost", "MemoryCost", "FragmentJson", "Assignment", "LeafFragment", "Foreman", "MemInitial", "MemMax", "QueryStartTime", "Credentials", "TimeZone", "OptionsJson", });
- internal_static_exec_bit_control_WorkQueueStatus_descriptor =
- getDescriptor().getMessageTypes().get(5);
- internal_static_exec_bit_control_WorkQueueStatus_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_control_WorkQueueStatus_descriptor,
- new java.lang.String[] { "Endpoint", "QueueLength", "ReportTime", });
- internal_static_exec_bit_control_FinishedReceiver_descriptor =
- getDescriptor().getMessageTypes().get(6);
- internal_static_exec_bit_control_FinishedReceiver_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_control_FinishedReceiver_descriptor,
- new java.lang.String[] { "Receiver", "Sender", });
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
@@ -6712,6 +6627,51 @@ public final class BitControl {
org.apache.drill.exec.proto.CoordinationProtos.getDescriptor(),
org.apache.drill.exec.proto.UserBitShared.getDescriptor(),
}, assigner);
+ internal_static_exec_bit_control_BitControlHandshake_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_exec_bit_control_BitControlHandshake_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_control_BitControlHandshake_descriptor,
+ new java.lang.String[] { "RpcVersion", "Channel", "Endpoint", });
+ internal_static_exec_bit_control_BitStatus_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_exec_bit_control_BitStatus_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_control_BitStatus_descriptor,
+ new java.lang.String[] { "FragmentStatus", });
+ internal_static_exec_bit_control_FragmentStatus_descriptor =
+ getDescriptor().getMessageTypes().get(2);
+ internal_static_exec_bit_control_FragmentStatus_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_control_FragmentStatus_descriptor,
+ new java.lang.String[] { "Profile", "Handle", });
+ internal_static_exec_bit_control_InitializeFragments_descriptor =
+ getDescriptor().getMessageTypes().get(3);
+ internal_static_exec_bit_control_InitializeFragments_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_control_InitializeFragments_descriptor,
+ new java.lang.String[] { "Fragment", });
+ internal_static_exec_bit_control_PlanFragment_descriptor =
+ getDescriptor().getMessageTypes().get(4);
+ internal_static_exec_bit_control_PlanFragment_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_control_PlanFragment_descriptor,
+ new java.lang.String[] { "Handle", "NetworkCost", "CpuCost", "DiskCost", "MemoryCost", "FragmentJson", "Assignment", "LeafFragment", "Foreman", "MemInitial", "MemMax", "QueryStartTime", "Credentials", "TimeZone", "OptionsJson", });
+ internal_static_exec_bit_control_WorkQueueStatus_descriptor =
+ getDescriptor().getMessageTypes().get(5);
+ internal_static_exec_bit_control_WorkQueueStatus_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_control_WorkQueueStatus_descriptor,
+ new java.lang.String[] { "Endpoint", "QueueLength", "ReportTime", });
+ internal_static_exec_bit_control_FinishedReceiver_descriptor =
+ getDescriptor().getMessageTypes().get(6);
+ internal_static_exec_bit_control_FinishedReceiver_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_control_FinishedReceiver_descriptor,
+ new java.lang.String[] { "Receiver", "Sender", });
+ org.apache.drill.exec.proto.ExecProtos.getDescriptor();
+ org.apache.drill.exec.proto.CoordinationProtos.getDescriptor();
+ org.apache.drill.exec.proto.UserBitShared.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java b/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java
index 5de0a07..b4a2f19 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java
@@ -133,10 +133,10 @@ public final class BitData {
// @@protoc_insertion_point(enum_scope:exec.bit.data.RpcType)
}
- public interface BitClientHandshakeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface BitClientHandshakeOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.data.BitClientHandshake)
+ com.google.protobuf.MessageOrBuilder {
- // optional int32 rpc_version = 1;
/**
* <code>optional int32 rpc_version = 1;</code>
*/
@@ -146,7 +146,6 @@ public final class BitData {
*/
int getRpcVersion();
- // optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];
/**
* <code>optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];</code>
*/
@@ -160,8 +159,9 @@ public final class BitData {
* Protobuf type {@code exec.bit.data.BitClientHandshake}
*/
public static final class BitClientHandshake extends
- com.google.protobuf.GeneratedMessage
- implements BitClientHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.data.BitClientHandshake)
+ BitClientHandshakeOrBuilder {
// Use BitClientHandshake.newBuilder() to construct.
private BitClientHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -263,7 +263,6 @@ public final class BitData {
}
private int bitField0_;
- // optional int32 rpc_version = 1;
public static final int RPC_VERSION_FIELD_NUMBER = 1;
private int rpcVersion_;
/**
@@ -279,7 +278,6 @@ public final class BitData {
return rpcVersion_;
}
- // optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];
public static final int CHANNEL_FIELD_NUMBER = 2;
private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_;
/**
@@ -302,7 +300,8 @@ public final class BitData {
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;
@@ -416,8 +415,9 @@ public final class BitData {
* Protobuf type {@code exec.bit.data.BitClientHandshake}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitData.BitClientHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.data.BitClientHandshake)
+ org.apache.drill.exec.proto.BitData.BitClientHandshakeOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitData.internal_static_exec_bit_data_BitClientHandshake_descriptor;
@@ -539,7 +539,6 @@ public final class BitData {
}
private int bitField0_;
- // optional int32 rpc_version = 1;
private int rpcVersion_ ;
/**
* <code>optional int32 rpc_version = 1;</code>
@@ -572,7 +571,6 @@ public final class BitData {
return this;
}
- // optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];
private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_ = org.apache.drill.exec.proto.UserBitShared.RpcChannel.BIT_DATA;
/**
* <code>optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];</code>
@@ -619,10 +617,10 @@ public final class BitData {
// @@protoc_insertion_point(class_scope:exec.bit.data.BitClientHandshake)
}
- public interface BitServerHandshakeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface BitServerHandshakeOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.data.BitServerHandshake)
+ com.google.protobuf.MessageOrBuilder {
- // optional int32 rpc_version = 1;
/**
* <code>optional int32 rpc_version = 1;</code>
*/
@@ -636,8 +634,9 @@ public final class BitData {
* Protobuf type {@code exec.bit.data.BitServerHandshake}
*/
public static final class BitServerHandshake extends
- com.google.protobuf.GeneratedMessage
- implements BitServerHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.data.BitServerHandshake)
+ BitServerHandshakeOrBuilder {
// Use BitServerHandshake.newBuilder() to construct.
private BitServerHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -728,7 +727,6 @@ public final class BitData {
}
private int bitField0_;
- // optional int32 rpc_version = 1;
public static final int RPC_VERSION_FIELD_NUMBER = 1;
private int rpcVersion_;
/**
@@ -750,7 +748,8 @@ public final class BitData {
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;
@@ -857,8 +856,9 @@ public final class BitData {
* Protobuf type {@code exec.bit.data.BitServerHandshake}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitData.BitServerHandshakeOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.data.BitServerHandshake)
+ org.apache.drill.exec.proto.BitData.BitServerHandshakeOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitData.internal_static_exec_bit_data_BitServerHandshake_descriptor;
@@ -971,7 +971,6 @@ public final class BitData {
}
private int bitField0_;
- // optional int32 rpc_version = 1;
private int rpcVersion_ ;
/**
* <code>optional int32 rpc_version = 1;</code>
@@ -1015,10 +1014,10 @@ public final class BitData {
// @@protoc_insertion_point(class_scope:exec.bit.data.BitServerHandshake)
}
- public interface FragmentRecordBatchOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface FragmentRecordBatchOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:exec.bit.data.FragmentRecordBatch)
+ com.google.protobuf.MessageOrBuilder {
- // optional .exec.shared.QueryId query_id = 1;
/**
* <code>optional .exec.shared.QueryId query_id = 1;</code>
*/
@@ -1032,7 +1031,6 @@ public final class BitData {
*/
org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder getQueryIdOrBuilder();
- // optional int32 receiving_major_fragment_id = 2;
/**
* <code>optional int32 receiving_major_fragment_id = 2;</code>
*/
@@ -1042,7 +1040,6 @@ public final class BitData {
*/
int getReceivingMajorFragmentId();
- // repeated int32 receiving_minor_fragment_id = 3;
/**
* <code>repeated int32 receiving_minor_fragment_id = 3;</code>
*/
@@ -1056,7 +1053,6 @@ public final class BitData {
*/
int getReceivingMinorFragmentId(int index);
- // optional int32 sending_major_fragment_id = 4;
/**
* <code>optional int32 sending_major_fragment_id = 4;</code>
*/
@@ -1066,7 +1062,6 @@ public final class BitData {
*/
int getSendingMajorFragmentId();
- // optional int32 sending_minor_fragment_id = 5;
/**
* <code>optional int32 sending_minor_fragment_id = 5;</code>
*/
@@ -1076,7 +1071,6 @@ public final class BitData {
*/
int getSendingMinorFragmentId();
- // optional .exec.shared.RecordBatchDef def = 6;
/**
* <code>optional .exec.shared.RecordBatchDef def = 6;</code>
*/
@@ -1090,7 +1084,6 @@ public final class BitData {
*/
org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder getDefOrBuilder();
- // optional bool isLastBatch = 7;
/**
* <code>optional bool isLastBatch = 7;</code>
*/
@@ -1100,7 +1093,6 @@ public final class BitData {
*/
boolean getIsLastBatch();
- // optional bool isOutOfMemory = 8 [default = false];
/**
* <code>optional bool isOutOfMemory = 8 [default = false];</code>
*/
@@ -1114,8 +1106,9 @@ public final class BitData {
* Protobuf type {@code exec.bit.data.FragmentRecordBatch}
*/
public static final class FragmentRecordBatch extends
- com.google.protobuf.GeneratedMessage
- implements FragmentRecordBatchOrBuilder {
+ com.google.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:exec.bit.data.FragmentRecordBatch)
+ FragmentRecordBatchOrBuilder {
// Use FragmentRecordBatch.newBuilder() to construct.
private FragmentRecordBatch(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
@@ -1276,7 +1269,6 @@ public final class BitData {
}
private int bitField0_;
- // optional .exec.shared.QueryId query_id = 1;
public static final int QUERY_ID_FIELD_NUMBER = 1;
private org.apache.drill.exec.proto.UserBitShared.QueryId queryId_;
/**
@@ -1298,7 +1290,6 @@ public final class BitData {
return queryId_;
}
- // optional int32 receiving_major_fragment_id = 2;
public static final int RECEIVING_MAJOR_FRAGMENT_ID_FIELD_NUMBER = 2;
private int receivingMajorFragmentId_;
/**
@@ -1314,7 +1305,6 @@ public final class BitData {
return receivingMajorFragmentId_;
}
- // repeated int32 receiving_minor_fragment_id = 3;
public static final int RECEIVING_MINOR_FRAGMENT_ID_FIELD_NUMBER = 3;
private java.util.List<java.lang.Integer> receivingMinorFragmentId_;
/**
@@ -1337,7 +1327,6 @@ public final class BitData {
return receivingMinorFragmentId_.get(index);
}
- // optional int32 sending_major_fragment_id = 4;
public static final int SENDING_MAJOR_FRAGMENT_ID_FIELD_NUMBER = 4;
private int sendingMajorFragmentId_;
/**
@@ -1353,7 +1342,6 @@ public final class BitData {
return sendingMajorFragmentId_;
}
- // optional int32 sending_minor_fragment_id = 5;
public static final int SENDING_MINOR_FRAGMENT_ID_FIELD_NUMBER = 5;
private int sendingMinorFragmentId_;
/**
@@ -1369,7 +1357,6 @@ public final class BitData {
return sendingMinorFragmentId_;
}
- // optional .exec.shared.RecordBatchDef def = 6;
public static final int DEF_FIELD_NUMBER = 6;
private org.apache.drill.exec.proto.UserBitShared.RecordBatchDef def_;
/**
@@ -1391,7 +1378,6 @@ public final class BitData {
return def_;
}
- // optional bool isLastBatch = 7;
public static final int ISLASTBATCH_FIELD_NUMBER = 7;
private boolean isLastBatch_;
/**
@@ -1407,7 +1393,6 @@ public final class BitData {
return isLastBatch_;
}
- // optional bool isOutOfMemory = 8 [default = false];
public static final int ISOUTOFMEMORY_FIELD_NUMBER = 8;
private boolean isOutOfMemory_;
/**
@@ -1436,7 +1421,8 @@ public final class BitData {
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;
@@ -1597,8 +1583,9 @@ public final class BitData {
* Protobuf type {@code exec.bit.data.FragmentRecordBatch}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.drill.exec.proto.BitData.FragmentRecordBatchOrBuilder {
+ com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:exec.bit.data.FragmentRecordBatch)
+ org.apache.drill.exec.proto.BitData.FragmentRecordBatchOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.drill.exec.proto.BitData.internal_static_exec_bit_data_FragmentRecordBatch_descriptor;
@@ -1800,7 +1787,6 @@ public final class BitData {
}
private int bitField0_;
- // optional .exec.shared.QueryId query_id = 1;
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_;
@@ -1909,7 +1895,7 @@ public final class BitData {
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;
@@ -1917,7 +1903,6 @@ public final class BitData {
return queryIdBuilder_;
}
- // optional int32 receiving_major_fragment_id = 2;
private int receivingMajorFragmentId_ ;
/**
* <code>optional int32 receiving_major_fragment_id = 2;</code>
@@ -1950,7 +1935,6 @@ public final class BitData {
return this;
}
- // repeated int32 receiving_minor_fragment_id = 3;
private java.util.List<java.lang.Integer> receivingMinorFragmentId_ = java.util.Collections.emptyList();
private void ensureReceivingMinorFragmentIdIsMutable() {
if (!((bitField0_ & 0x00000004) == 0x00000004)) {
@@ -2002,7 +1986,8 @@ public final class BitData {
public Builder addAllReceivingMinorFragmentId(
java.lang.Iterable<? extends java.lang.Integer> values) {
ensureReceivingMinorFragmentIdIsMutable();
- super.addAll(values, receivingMinorFragmentId_);
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, receivingMinorFragmentId_);
onChanged();
return this;
}
@@ -2016,7 +2001,6 @@ public final class BitData {
return this;
}
- // optional int32 sending_major_fragment_id = 4;
private int sendingMajorFragmentId_ ;
/**
* <code>optional int32 sending_major_fragment_id = 4;</code>
@@ -2049,7 +2033,6 @@ public final class BitData {
return this;
}
- // optional int32 sending_minor_fragment_id = 5;
private int sendingMinorFragmentId_ ;
/**
* <code>optional int32 sending_minor_fragment_id = 5;</code>
@@ -2082,7 +2065,6 @@ public final class BitData {
return this;
}
- // optional .exec.shared.RecordBatchDef def = 6;
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_;
@@ -2191,7 +2173,7 @@ public final class BitData {
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;
@@ -2199,7 +2181,6 @@ public final class BitData {
return defBuilder_;
}
- // optional bool isLastBatch = 7;
private boolean isLastBatch_ ;
/**
* <code>optional bool isLastBatch = 7;</code>
@@ -2232,7 +2213,6 @@ public final class BitData {
return this;
}
- // optional bool isOutOfMemory = 8 [default = false];
private boolean isOutOfMemory_ ;
/**
* <code>optional bool isOutOfMemory = 8 [default = false];</code>
@@ -2276,17 +2256,17 @@ public final class BitData {
// @@protoc_insertion_point(class_scope:exec.bit.data.FragmentRecordBatch)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_data_BitClientHandshake_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_bit_data_BitClientHandshake_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_data_BitServerHandshake_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_exec_bit_data_BitServerHandshake_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_exec_bit_data_FragmentRecordBatch_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -2319,31 +2299,13 @@ public final class BitData {
"ataH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_exec_bit_data_BitClientHandshake_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_exec_bit_data_BitClientHandshake_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_data_BitClientHandshake_descriptor,
- new java.lang.String[] { "RpcVersion", "Channel", });
- internal_static_exec_bit_data_BitServerHandshake_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_exec_bit_data_BitServerHandshake_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_data_BitServerHandshake_descriptor,
- new java.lang.String[] { "RpcVersion", });
- internal_static_exec_bit_data_FragmentRecordBatch_descriptor =
- getDescriptor().getMessageTypes().get(2);
- internal_static_exec_bit_data_FragmentRecordBatch_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_exec_bit_data_FragmentRecordBatch_descriptor,
- new java.lang.String[] { "QueryId", "ReceivingMajorFragmentId", "ReceivingMinorFragmentId", "SendingMajorFragmentId", "SendingMinorFragmentId", "Def", "IsLastBatch", "IsOutOfMemory", });
- return null;
- }
- };
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
@@ -2351,6 +2313,27 @@ public final class BitData {
org.apache.drill.exec.proto.CoordinationProtos.getDescriptor(),
org.apache.drill.exec.proto.UserBitShared.getDescriptor(),
}, assigner);
+ internal_static_exec_bit_data_BitClientHandshake_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_exec_bit_data_BitClientHandshake_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_data_BitClientHandshake_descriptor,
+ new java.lang.String[] { "RpcVersion", "Channel", });
+ internal_static_exec_bit_data_BitServerHandshake_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_exec_bit_data_BitServerHandshake_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_data_BitServerHandshake_descriptor,
+ new java.lang.String[] { "RpcVersion", });
+ internal_static_exec_bit_data_FragmentRecordBatch_descriptor =
+ getDescriptor().getMessageTypes().get(2);
+ internal_static_exec_bit_data_FragmentRecordBatch_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_exec_bit_data_FragmentRecordBatch_descriptor,
+ new java.lang.String[] { "QueryId", "ReceivingMajorFragmentId", "ReceivingMinorFragmentId", "SendingMajorFragmentId", "SendingMinorFragmentId", "Def", "IsLastBatch", "IsOutOfMemory", });
+ org.apache.drill.exec.proto.ExecProtos.getDescriptor();
+ org.apache.drill.exec.proto.CoordinationProtos.getDescriptor();
+ org.apache.drill.exec.proto.UserBitShared.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
[7/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.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ControlHandlerImpl.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ControlHandlerImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ControlHandlerImpl.java
index 3228da9..3a7123d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ControlHandlerImpl.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ControlHandlerImpl.java
@@ -20,8 +20,6 @@ package org.apache.drill.exec.work.batch;
import static org.apache.drill.exec.rpc.RpcBus.get;
import io.netty.buffer.ByteBuf;
-import java.io.IOException;
-
import org.apache.drill.exec.ops.FragmentContext;
import org.apache.drill.exec.physical.base.FragmentRoot;
import org.apache.drill.exec.proto.BitControl.FinishedReceiver;
@@ -33,7 +31,6 @@ import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
import org.apache.drill.exec.proto.GeneralRPCProtos.Ack;
import org.apache.drill.exec.proto.UserBitShared.QueryId;
import org.apache.drill.exec.proto.UserBitShared.QueryProfile;
-import org.apache.drill.exec.proto.helper.QueryIdHelper;
import org.apache.drill.exec.rpc.Acks;
import org.apache.drill.exec.rpc.Response;
import org.apache.drill.exec.rpc.RpcConstants;
@@ -42,123 +39,129 @@ import org.apache.drill.exec.rpc.UserRpcException;
import org.apache.drill.exec.rpc.control.ControlConnection;
import org.apache.drill.exec.rpc.control.ControlTunnel;
import org.apache.drill.exec.rpc.data.DataRpcConfig;
+import org.apache.drill.exec.server.DrillbitContext;
import org.apache.drill.exec.work.WorkManager.WorkerBee;
import org.apache.drill.exec.work.foreman.Foreman;
-import org.apache.drill.exec.work.foreman.QueryStatus;
import org.apache.drill.exec.work.fragment.FragmentExecutor;
import org.apache.drill.exec.work.fragment.FragmentManager;
import org.apache.drill.exec.work.fragment.NonRootFragmentManager;
import org.apache.drill.exec.work.fragment.NonRootStatusReporter;
public class ControlHandlerImpl implements ControlMessageHandler {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ControlHandlerImpl.class);
-
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ControlHandlerImpl.class);
private final WorkerBee bee;
- public ControlHandlerImpl(WorkerBee bee) {
- super();
+ public ControlHandlerImpl(final WorkerBee bee) {
this.bee = bee;
}
@Override
- public Response handle(ControlConnection connection, int rpcType, ByteBuf pBody, ByteBuf dBody) throws RpcException {
+ public Response handle(final ControlConnection connection, final int rpcType,
+ final ByteBuf pBody, final ByteBuf dBody) throws RpcException {
if (RpcConstants.EXTRA_DEBUGGING) {
logger.debug("Received bit com message of type {}", rpcType);
}
switch (rpcType) {
- case RpcType.REQ_CANCEL_FRAGMENT_VALUE:
- FragmentHandle handle = get(pBody, FragmentHandle.PARSER);
+ case RpcType.REQ_CANCEL_FRAGMENT_VALUE: {
+ final FragmentHandle handle = get(pBody, FragmentHandle.PARSER);
cancelFragment(handle);
return DataRpcConfig.OK;
+ }
- case RpcType.REQ_RECEIVER_FINISHED_VALUE:
- FinishedReceiver finishedReceiver = get(pBody, FinishedReceiver.PARSER);
+ case RpcType.REQ_RECEIVER_FINISHED_VALUE: {
+ final FinishedReceiver finishedReceiver = get(pBody, FinishedReceiver.PARSER);
receivingFragmentFinished(finishedReceiver);
return DataRpcConfig.OK;
+ }
case RpcType.REQ_FRAGMENT_STATUS_VALUE:
- bee.getContext().getWorkBus().status( get(pBody, FragmentStatus.PARSER));
+ bee.getContext().getWorkBus().statusUpdate( get(pBody, FragmentStatus.PARSER));
// TODO: Support a type of message that has no response.
return DataRpcConfig.OK;
- case RpcType.REQ_QUERY_CANCEL_VALUE:
- QueryId id = get(pBody, QueryId.PARSER);
- Foreman f = bee.getForemanForQueryId(id);
- if(f != null){
- f.cancel();
+ case RpcType.REQ_QUERY_CANCEL_VALUE: {
+ final QueryId queryId = get(pBody, QueryId.PARSER);
+ final Foreman foreman = bee.getForemanForQueryId(queryId);
+ if (foreman != null) {
+ foreman.cancel();
return DataRpcConfig.OK;
- }else{
+ } else {
return DataRpcConfig.FAIL;
}
+ }
- case RpcType.REQ_INIATILIZE_FRAGMENTS_VALUE:
- InitializeFragments fragments = get(pBody, InitializeFragments.PARSER);
- for(int i =0; i < fragments.getFragmentCount(); i++){
+ case RpcType.REQ_INIATILIZE_FRAGMENTS_VALUE: {
+ final InitializeFragments fragments = get(pBody, InitializeFragments.PARSER);
+ for(int i = 0; i < fragments.getFragmentCount(); i++) {
startNewRemoteFragment(fragments.getFragment(i));
}
return DataRpcConfig.OK;
+ }
- case RpcType.REQ_QUERY_STATUS_VALUE:
- QueryId queryId = get(pBody, QueryId.PARSER);
- Foreman foreman = bee.getForemanForQueryId(queryId);
- QueryProfile profile;
+ case RpcType.REQ_QUERY_STATUS_VALUE: {
+ final QueryId queryId = get(pBody, QueryId.PARSER);
+ final Foreman foreman = bee.getForemanForQueryId(queryId);
if (foreman == null) {
throw new RpcException("Query not running on node.");
- } else {
- profile = bee.getForemanForQueryId(queryId).getQueryStatus().getAsProfile();
}
+ final QueryProfile profile = foreman.getQueryManager().getQueryProfile();
return new Response(RpcType.RESP_QUERY_STATUS, profile);
+ }
default:
throw new RpcException("Not yet supported.");
}
-
}
@Override
- public void startNewRemoteFragment(PlanFragment fragment) throws UserRpcException {
+ public void startNewRemoteFragment(final PlanFragment fragment) throws UserRpcException {
logger.debug("Received remote fragment start instruction", fragment);
+ final DrillbitContext drillbitContext = bee.getContext();
try {
// we either need to start the fragment if it is a leaf fragment, or set up a fragment manager if it is non leaf.
- if(fragment.getLeafFragment()){
- FragmentContext context = new FragmentContext(bee.getContext(), fragment, null, bee.getContext().getFunctionImplementationRegistry());
- ControlTunnel tunnel = bee.getContext().getController().getTunnel(fragment.getForeman());
- NonRootStatusReporter listener = new NonRootStatusReporter(context, tunnel);
- FragmentRoot rootOperator = bee.getContext().getPlanReader().readFragmentOperator(fragment.getFragmentJson());
- FragmentExecutor fr = new FragmentExecutor(context, bee, rootOperator, listener);
+ if (fragment.getLeafFragment()) {
+ final FragmentContext context = new FragmentContext(drillbitContext, fragment, null,
+ drillbitContext.getFunctionImplementationRegistry());
+ final ControlTunnel tunnel = drillbitContext.getController().getTunnel(fragment.getForeman());
+ final NonRootStatusReporter listener = new NonRootStatusReporter(context, tunnel);
+ final FragmentRoot rootOperator = drillbitContext.getPlanReader().readFragmentOperator(
+ fragment.getFragmentJson());
+ final FragmentExecutor fr = new FragmentExecutor(context, rootOperator, listener);
bee.addFragmentRunner(fr);
- }else{ // isIntermediate, store for incoming data.
- NonRootFragmentManager manager = new NonRootFragmentManager(fragment, bee);
- bee.getContext().getWorkBus().setFragmentManager(manager);
+ } else {
+ // isIntermediate, store for incoming data.
+ final NonRootFragmentManager manager = new NonRootFragmentManager(fragment, drillbitContext);
+ drillbitContext.getWorkBus().addFragmentManager(manager);
}
} catch (Exception e) {
- throw new UserRpcException(bee.getContext().getEndpoint(), "Failure while trying to start remote fragment", e);
+ throw new UserRpcException(drillbitContext.getEndpoint(),
+ "Failure while trying to start remote fragment", e);
} catch (OutOfMemoryError t) {
if (t.getMessage().startsWith("Direct buffer")) {
- throw new UserRpcException(bee.getContext().getEndpoint(), "Out of direct memory while trying to start remote fragment", t);
+ throw new UserRpcException(drillbitContext.getEndpoint(),
+ "Out of direct memory while trying to start remote fragment", t);
} else {
throw t;
}
}
-
}
/* (non-Javadoc)
* @see org.apache.drill.exec.work.batch.BitComHandler#cancelFragment(org.apache.drill.exec.proto.ExecProtos.FragmentHandle)
*/
@Override
- public Ack cancelFragment(FragmentHandle handle) {
- FragmentManager manager = bee.getContext().getWorkBus().getFragmentManagerIfExists(handle);
+ public Ack cancelFragment(final FragmentHandle handle) {
+ final FragmentManager manager = bee.getContext().getWorkBus().getFragmentManagerIfExists(handle);
if (manager != null) {
// try remote fragment cancel.
manager.cancel();
} else {
// then try local cancel.
- FragmentExecutor runner = bee.getFragmentRunner(handle);
+ final FragmentExecutor runner = bee.getFragmentRunner(handle);
if (runner != null) {
runner.cancel();
}
@@ -167,8 +170,9 @@ public class ControlHandlerImpl implements ControlMessageHandler {
return Acks.OK;
}
- public Ack receivingFragmentFinished(FinishedReceiver finishedReceiver) {
- FragmentManager manager = bee.getContext().getWorkBus().getFragmentManagerIfExists(finishedReceiver.getSender());
+ private Ack receivingFragmentFinished(final FinishedReceiver finishedReceiver) {
+ final FragmentManager manager =
+ bee.getContext().getWorkBus().getFragmentManagerIfExists(finishedReceiver.getSender());
FragmentExecutor executor;
if (manager != null) {
@@ -184,5 +188,4 @@ public class ControlHandlerImpl implements ControlMessageHandler {
return Acks.OK;
}
-
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java
index f0b4983..2a79e42 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java
@@ -162,6 +162,7 @@ public class SpoolingRawBatchBuffer implements RawBatchBuffer {
return batch;
} catch (InterruptedException e) {
return null;
+ // TODO InterruptedException
}
}
if (w == null) {
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java
index 3d5b948..2430e64 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java
@@ -162,6 +162,7 @@ public class UnlimitedRawBatchBuffer implements RawBatchBuffer{
b = buffer.take();
} catch (InterruptedException e) {
return null;
+ // TODO InterruptedException
}
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java
index ca52f0c..80f2ca1 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java
@@ -26,7 +26,7 @@ import java.util.Set;
* Interface to define the listener to take actions when the set of active drillbits is changed.
*/
public interface DrillbitStatusListener {
-
+ // TODO this doesn't belong here
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillbitStatusListener.class);
/**
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java
index 8e0780b..9650ee5 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java
@@ -19,27 +19,27 @@ package org.apache.drill.exec.work.foreman;
import io.netty.buffer.ByteBuf;
-import java.io.Closeable;
import java.io.IOException;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Preconditions;
+
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.drill.common.config.DrillConfig;
import org.apache.drill.common.exceptions.ExecutionSetupException;
import org.apache.drill.common.logical.LogicalPlan;
import org.apache.drill.common.logical.PlanProperties.Generator.ResultMode;
import org.apache.drill.exec.ExecConstants;
+import org.apache.drill.exec.coord.ClusterCoordinator;
import org.apache.drill.exec.coord.DistributedSemaphore;
import org.apache.drill.exec.coord.DistributedSemaphore.DistributedLease;
import org.apache.drill.exec.exception.OptimizerException;
import org.apache.drill.exec.ops.FragmentContext;
import org.apache.drill.exec.ops.QueryContext;
-import org.apache.drill.exec.ops.QueryDateTimeInfo;
import org.apache.drill.exec.opt.BasicOptimizer;
import org.apache.drill.exec.physical.PhysicalPlan;
import org.apache.drill.exec.physical.base.FragmentRoot;
@@ -64,10 +64,11 @@ import org.apache.drill.exec.proto.UserProtos.RunQuery;
import org.apache.drill.exec.proto.helper.QueryIdHelper;
import org.apache.drill.exec.rpc.BaseRpcOutcomeListener;
import org.apache.drill.exec.rpc.RpcException;
-import org.apache.drill.exec.rpc.RpcOutcomeListener;
import org.apache.drill.exec.rpc.control.Controller;
import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection;
import org.apache.drill.exec.server.DrillbitContext;
+import org.apache.drill.exec.server.options.OptionManager;
+import org.apache.drill.exec.testing.ExceptionInjector;
import org.apache.drill.exec.util.Pointer;
import org.apache.drill.exec.work.EndpointListener;
import org.apache.drill.exec.work.ErrorHelper;
@@ -76,117 +77,120 @@ import org.apache.drill.exec.work.WorkManager.WorkerBee;
import org.apache.drill.exec.work.batch.IncomingBuffers;
import org.apache.drill.exec.work.fragment.FragmentExecutor;
import org.apache.drill.exec.work.fragment.RootFragmentManager;
+import org.codehaus.jackson.map.ObjectMapper;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
/**
- * Foreman manages all queries where this is the driving/root node.
+ * Foreman manages all the fragments (local and remote) for a single query where this
+ * is the driving/root node.
*
* The flow is as follows:
- * - Foreman is submitted as a runnable.
- * - Runnable does query planning.
- * - PENDING > RUNNING
- * - Runnable sends out starting fragments
- * - Status listener are activated
- * - Foreman listens for state move messages.
- *
+ * - Foreman is submitted as a runnable.
+ * - Runnable does query planning.
+ * - state changes from PENDING to RUNNING
+ * - Runnable sends out starting fragments
+ * - Status listener are activated
+ * - The Runnable's run() completes, but the Foreman stays around
+ * - Foreman listens for state change messages.
+ * - state change messages can drive the state to FAILED or CANCELED, in which case
+ * messages are sent to running fragments to terminate
+ * - when all fragments complete, state change messages drive the state to COMPLETED
*/
-public class Foreman implements Runnable, Closeable, Comparable<Object> {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Foreman.class);
-
- private QueryId queryId;
- private RunQuery queryRequest;
- private QueryContext context;
- private QueryManager queryManager;
- private WorkerBee bee;
- private UserClientConnection initiatingClient;
+public class Foreman implements Runnable {
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Foreman.class);
+ private final static ExceptionInjector injector = ExceptionInjector.getInjector(Foreman.class);
+
+ private final QueryId queryId;
+ private final RunQuery queryRequest;
+ private final QueryContext queryContext;
+ private final QueryManager queryManager; // handles lower-level details of query execution
+ private final WorkerBee bee; // provides an interface to submit tasks
+ private final DrillbitContext drillbitContext;
+ private final UserClientConnection initiatingClient; // used to send responses
private volatile QueryState state;
- private final DistributedSemaphore smallSemaphore;
- private final DistributedSemaphore largeSemaphore;
- private final long queueThreshold;
- private final long queueTimeout;
- private volatile DistributedLease lease;
- private final boolean queuingEnabled;
+ private volatile DistributedLease lease; // used to limit the number of concurrent queries
+
+ private FragmentExecutor rootRunner; // root Fragment
- private FragmentExecutor rootRunner;
- private final CountDownLatch acceptExternalEvents = new CountDownLatch(1);
- private final StateListener stateListener = new StateListener();
+ private final CountDownLatch acceptExternalEvents = new CountDownLatch(1); // gates acceptance of external events
+ private final StateListener stateListener = new StateListener(); // source of external events
private final ResponseSendListener responseListener = new ResponseSendListener();
+ private final ForemanResult foremanResult = new ForemanResult();
- public Foreman(WorkerBee bee, DrillbitContext dContext, UserClientConnection connection, QueryId queryId,
- RunQuery queryRequest) {
+ /**
+ * Constructor. Sets up the Foreman, but does not initiate any execution.
+ *
+ * @param bee used to submit additional work
+ * @param drillbitContext
+ * @param connection
+ * @param queryId the id for the query
+ * @param queryRequest the query to execute
+ */
+ public Foreman(final WorkerBee bee, final DrillbitContext drillbitContext,
+ final UserClientConnection connection, final QueryId queryId, final RunQuery queryRequest) {
+ this.bee = bee;
this.queryId = queryId;
this.queryRequest = queryRequest;
- this.context = new QueryContext(connection.getSession(), queryId, dContext);
+ this.drillbitContext = drillbitContext;
- // set up queuing
- this.queuingEnabled = context.getOptions().getOption(ExecConstants.ENABLE_QUEUE_KEY).bool_val;
- if (queuingEnabled) {
- int smallQueue = context.getOptions().getOption(ExecConstants.SMALL_QUEUE_KEY).num_val.intValue();
- int largeQueue = context.getOptions().getOption(ExecConstants.LARGE_QUEUE_KEY).num_val.intValue();
- this.largeSemaphore = dContext.getClusterCoordinator().getSemaphore("query.large", largeQueue);
- this.smallSemaphore = dContext.getClusterCoordinator().getSemaphore("query.small", smallQueue);
- this.queueThreshold = context.getOptions().getOption(ExecConstants.QUEUE_THRESHOLD_KEY).num_val;
- this.queueTimeout = context.getOptions().getOption(ExecConstants.QUEUE_TIMEOUT_KEY).num_val;
- } else {
- this.largeSemaphore = null;
- this.smallSemaphore = null;
- this.queueThreshold = 0;
- this.queueTimeout = 0;
- }
- // end queuing setup.
-
- this.initiatingClient = connection;
- this.queryManager = new QueryManager(queryId, queryRequest, bee.getContext().getPersistentStoreProvider(),
- stateListener, this);
- this.bee = bee;
+ initiatingClient = connection;
+ queryContext = new QueryContext(connection.getSession(), drillbitContext);
+ queryManager = new QueryManager(queryId, queryRequest, drillbitContext.getPersistentStoreProvider(),
+ stateListener, this); // TODO reference escapes before ctor is complete via stateListener, this
recordNewState(QueryState.PENDING);
}
- public QueryContext getContext() {
- return context;
+ /**
+ * Get the QueryContext created for the query.
+ *
+ * @return the QueryContext
+ */
+ public QueryContext getQueryContext() {
+ return queryContext;
}
- public void cancel() {
- stateListener.moveToState(QueryState.CANCELED, null);
+ /**
+ * Get the QueryManager created for the query.
+ *
+ * @return the QueryManager
+ */
+ public QueryManager getQueryManager() {
+ return queryManager;
}
- private void cleanup(QueryResult result) {
- logger.info("foreman cleaning up - status: {}", queryManager.getStatus());
-
- bee.retireForeman(this);
- context.getWorkBus().removeFragmentStatusListener(queryId);
- context.getClusterCoordinator().removeDrillbitStatusListener(queryManager);
-
- try {
- try {
- context.close();
- } catch (Exception e) {
- moveToState(QueryState.FAILED, e);
- return;
- }
-
- if (result != null) {
- initiatingClient.sendResult(responseListener, new QueryWritableBatch(result), true);
- }
- } finally {
- releaseLease();
- }
+ /**
+ * Cancel the query. Asynchronous -- it may take some time for all remote fragments to be
+ * terminated.
+ */
+ public void cancel() {
+ // Note this can be called from outside of run() on another thread, or after run() completes
+ stateListener.moveToState(QueryState.CANCELLATION_REQUESTED, null);
}
/**
- * Called by execution pool to do foreman setup. Actual query execution is a separate phase (and can be scheduled).
+ * Called by execution pool to do query setup, and kick off remote execution.
+ *
+ * <p>Note that completion of this function is not the end of the Foreman's role
+ * in the query's lifecycle.
*/
+ @Override
public void run() {
+ // rename the thread we're using for debugging purposes
+ final Thread currentThread = Thread.currentThread();
+ final String originalName = currentThread.getName();
+ currentThread.setName(QueryIdHelper.getQueryId(queryId) + ":foreman");
+
+ // track how long the query takes
+ queryManager.markStartTime();
- final String originalThread = Thread.currentThread().getName();
- Thread.currentThread().setName(QueryIdHelper.getQueryId(queryId) + ":foreman");
- getStatus().markStart();
- // convert a run query request into action
try {
+ injector.injectChecked(drillbitContext, "run-try-beginning", ForemanException.class);
+
+ // convert a run query request into action
switch (queryRequest.getType()) {
case LOGICAL:
parseAndRunLogicalPlan(queryRequest.getPlan());
@@ -200,39 +204,71 @@ public class Foreman implements Runnable, Closeable, Comparable<Object> {
default:
throw new IllegalStateException();
}
+ injector.injectChecked(drillbitContext, "run-try-end", ForemanException.class);
} catch (ForemanException e) {
moveToState(QueryState.FAILED, e);
-
} catch (AssertionError | Exception ex) {
- moveToState(QueryState.FAILED, new ForemanException("Unexpected exception during fragment initialization: " + ex.getMessage(), ex));
-
+ moveToState(QueryState.FAILED,
+ new ForemanException("Unexpected exception during fragment initialization: " + ex.getMessage(), ex));
} catch (OutOfMemoryError e) {
+ /*
+ * FragmentExecutors use a DrillbitStatusListener to watch out for the death of their query's Foreman.
+ * So, if we die here, they should get notified about that, and cancel themselves; we don't have to
+ * attempt to notify them, which might not work under these conditions.
+ */
+ /*
+ * TODO this will kill everything in this JVM; why can't we just free all allocation
+ * associated with this Foreman and allow others to continue?
+ */
System.out.println("Out of memory, exiting.");
e.printStackTrace();
System.out.flush();
System.exit(-1);
-
} finally {
- Thread.currentThread().setName(originalThread);
+ /*
+ * Begin accepting external events.
+ *
+ * Doing this here in the finally clause will guarantee that it occurs. Otherwise, if there
+ * is an exception anywhere during setup, it wouldn't occur, and any events that are generated
+ * as a result of any partial setup that was done (such as the FragmentSubmitListener,
+ * the ResponseSendListener, or an external call to cancel()), will hang the thread that makes the
+ * event delivery call.
+ *
+ * If we do throw an exception during setup, and have already moved to QueryState.FAILED, we just need to
+ * make sure that we can't make things any worse as those events are delivered, but allow
+ * any necessary remaining cleanup to proceed.
+ */
+ acceptExternalEvents.countDown();
+
+ // restore the thread's original name
+ currentThread.setName(originalName);
}
+
+ /*
+ * Note that despite the run() completing, the Foreman continues to exist, and receives
+ * events (indirectly, through the QueryManager's use of stateListener), about fragment
+ * completions. It won't go away until everything is completed, failed, or cancelled.
+ */
}
private void releaseLease() {
- if (lease != null) {
+ while (lease != null) {
try {
lease.close();
+ lease = null;
+ } catch (InterruptedException e) {
+ // if we end up here, the while loop will try again
} catch (Exception e) {
logger.warn("Failure while releasing lease.", e);
+ break;
}
- ;
}
-
}
- private void parseAndRunLogicalPlan(String json) throws ExecutionSetupException {
+ private void parseAndRunLogicalPlan(final String json) throws ExecutionSetupException {
LogicalPlan logicalPlan;
try {
- logicalPlan = context.getPlanReader().readLogicalPlan(json);
+ logicalPlan = drillbitContext.getPlanReader().readLogicalPlan(json);
} catch (IOException e) {
throw new ForemanException("Failure parsing logical plan.", e);
}
@@ -244,7 +280,7 @@ public class Foreman implements Runnable, Closeable, Comparable<Object> {
log(logicalPlan);
- PhysicalPlan physicalPlan = convert(logicalPlan);
+ final PhysicalPlan physicalPlan = convert(logicalPlan);
if (logicalPlan.getProperties().resultMode == ResultMode.PHYSICAL) {
returnPhysical(physicalPlan);
@@ -252,20 +288,19 @@ public class Foreman implements Runnable, Closeable, Comparable<Object> {
}
log(physicalPlan);
-
runPhysicalPlan(physicalPlan);
}
- private void log(LogicalPlan plan) {
+ private void log(final LogicalPlan plan) {
if (logger.isDebugEnabled()) {
- logger.debug("Logical {}", plan.unparse(context.getConfig()));
+ logger.debug("Logical {}", plan.unparse(queryContext.getConfig()));
}
}
- private void log(PhysicalPlan plan) {
+ private void log(final PhysicalPlan plan) {
if (logger.isDebugEnabled()) {
try {
- String planText = context.getConfig().getMapper().writeValueAsString(plan);
+ String planText = queryContext.getConfig().getMapper().writeValueAsString(plan);
logger.debug("Physical {}", planText);
} catch (IOException e) {
logger.warn("Error while attempting to log physical plan.", e);
@@ -273,60 +308,54 @@ public class Foreman implements Runnable, Closeable, Comparable<Object> {
}
}
- private void returnPhysical(PhysicalPlan plan) throws ExecutionSetupException {
- String jsonPlan = plan.unparse(context.getConfig().getMapper().writer());
- runPhysicalPlan(DirectPlan.createDirectPlan(context, new PhysicalFromLogicalExplain(jsonPlan)));
+ private void returnPhysical(final PhysicalPlan plan) throws ExecutionSetupException {
+ final String jsonPlan = plan.unparse(queryContext.getConfig().getMapper().writer());
+ runPhysicalPlan(DirectPlan.createDirectPlan(queryContext, new PhysicalFromLogicalExplain(jsonPlan)));
}
public static class PhysicalFromLogicalExplain {
- public String json;
+ public final String json;
- public PhysicalFromLogicalExplain(String json) {
- super();
+ public PhysicalFromLogicalExplain(final String json) {
this.json = json;
}
-
}
- private void parseAndRunPhysicalPlan(String json) throws ExecutionSetupException {
+ private void parseAndRunPhysicalPlan(final String json) throws ExecutionSetupException {
try {
- PhysicalPlan plan = context.getPlanReader().readPhysicalPlan(json);
+ final PhysicalPlan plan = drillbitContext.getPlanReader().readPhysicalPlan(json);
runPhysicalPlan(plan);
} catch (IOException e) {
throw new ForemanSetupException("Failure while parsing physical plan.", e);
}
}
- private void runPhysicalPlan(PhysicalPlan plan) throws ExecutionSetupException {
-
+ private void runPhysicalPlan(final PhysicalPlan plan) throws ExecutionSetupException {
validatePlan(plan);
setupSortMemoryAllocations(plan);
acquireQuerySemaphore(plan);
final QueryWorkUnit work = getQueryWorkUnit(plan);
-
- this.context.getWorkBus().setFragmentStatusListener(work.getRootFragment().getHandle().getQueryId(), queryManager);
- this.context.getClusterCoordinator().addDrillbitStatusListener(queryManager);
-
- logger.debug("Submitting fragments to run.");
-
+ final List<PlanFragment> planFragments = work.getFragments();
final PlanFragment rootPlanFragment = work.getRootFragment();
assert queryId == rootPlanFragment.getHandle().getQueryId();
- queryManager.setup(rootPlanFragment.getHandle(), context.getCurrentEndpoint(), work.getFragments().size());
+ drillbitContext.getWorkBus().addFragmentStatusListener(queryId, queryManager);
+ drillbitContext.getClusterCoordinator().addDrillbitStatusListener(queryManager);
+
+ logger.debug("Submitting fragments to run.");
// set up the root fragment first so we'll have incoming buffers available.
setupRootFragment(rootPlanFragment, initiatingClient, work.getRootOperator());
- setupNonRootFragments(work.getFragments());
- bee.getContext().getAllocator().resetFragmentLimits();
+ setupNonRootFragments(planFragments);
+ drillbitContext.getAllocator().resetFragmentLimits(); // TODO a global effect for this query?!?
moveToState(QueryState.RUNNING, null);
logger.debug("Fragments running.");
-
}
- private void validatePlan(PhysicalPlan plan) throws ForemanSetupException{
+ private static void validatePlan(final PhysicalPlan plan) throws ForemanSetupException {
if (plan.getProperties().resultMode != ResultMode.EXEC) {
throw new ForemanSetupException(String.format(
"Failure running plan. You requested a result mode of %s and a physical plan can only be output as EXEC",
@@ -334,369 +363,632 @@ public class Foreman implements Runnable, Closeable, Comparable<Object> {
}
}
- private void setupSortMemoryAllocations(PhysicalPlan plan){
- int sortCount = 0;
+ private void setupSortMemoryAllocations(final PhysicalPlan plan) {
+ // look for external sorts
+ final List<ExternalSort> sortList = new LinkedList<>();
for (PhysicalOperator op : plan.getSortedOperators()) {
if (op instanceof ExternalSort) {
- sortCount++;
+ sortList.add((ExternalSort) op);
}
}
- if (sortCount > 0) {
- long maxWidthPerNode = context.getOptions().getOption(ExecConstants.MAX_WIDTH_PER_NODE_KEY).num_val;
+ // if there are any sorts, compute the maximum allocation, and set it on them
+ if (sortList.size() > 0) {
+ final OptionManager optionManager = queryContext.getOptions();
+ final long maxWidthPerNode = optionManager.getOption(ExecConstants.MAX_WIDTH_PER_NODE_KEY).num_val;
long maxAllocPerNode = Math.min(DrillConfig.getMaxDirectMemory(),
- context.getConfig().getLong(ExecConstants.TOP_LEVEL_MAX_ALLOC));
+ queryContext.getConfig().getLong(ExecConstants.TOP_LEVEL_MAX_ALLOC));
maxAllocPerNode = Math.min(maxAllocPerNode,
- context.getOptions().getOption(ExecConstants.MAX_QUERY_MEMORY_PER_NODE_KEY).num_val);
- long maxSortAlloc = maxAllocPerNode / (sortCount * maxWidthPerNode);
+ optionManager.getOption(ExecConstants.MAX_QUERY_MEMORY_PER_NODE_KEY).num_val);
+ final long maxSortAlloc = maxAllocPerNode / (sortList.size() * maxWidthPerNode);
logger.debug("Max sort alloc: {}", maxSortAlloc);
- for (PhysicalOperator op : plan.getSortedOperators()) {
- if (op instanceof ExternalSort) {
- ((ExternalSort) op).setMaxAllocation(maxSortAlloc);
- }
+
+ for(ExternalSort externalSort : sortList) {
+ externalSort.setMaxAllocation(maxSortAlloc);
}
}
}
- private void acquireQuerySemaphore(PhysicalPlan plan) throws ForemanSetupException {
-
- double size = 0;
- for (PhysicalOperator ops : plan.getSortedOperators()) {
- size += ops.getCost();
- }
-
+ /**
+ * This limits the number of "small" and "large" queries that a Drill cluster will run
+ * simultaneously, if queueing is enabled. If the query is unable to run, this will block
+ * until it can. Beware that this is called under run(), and so will consume a Thread
+ * while it waits for the required distributed semaphore.
+ *
+ * @param plan the query plan
+ * @throws ForemanSetupException
+ */
+ private void acquireQuerySemaphore(final PhysicalPlan plan) throws ForemanSetupException {
+ final OptionManager optionManager = queryContext.getOptions();
+ final boolean queuingEnabled = optionManager.getOption(ExecConstants.ENABLE_QUEUE_KEY).bool_val;
if (queuingEnabled) {
+ final long queueThreshold = optionManager.getOption(ExecConstants.QUEUE_THRESHOLD_KEY).num_val;
+ double totalCost = 0;
+ for (PhysicalOperator ops : plan.getSortedOperators()) {
+ totalCost += ops.getCost();
+ }
+
try {
- if (size > this.queueThreshold) {
- this.lease = largeSemaphore.acquire(this.queueTimeout, TimeUnit.MILLISECONDS);
+ @SuppressWarnings("resource")
+ final ClusterCoordinator clusterCoordinator = drillbitContext.getClusterCoordinator();
+ DistributedSemaphore distributedSemaphore;
+
+ // get the appropriate semaphore
+ if (totalCost > queueThreshold) {
+ final int largeQueue = optionManager.getOption(ExecConstants.LARGE_QUEUE_KEY).num_val.intValue();
+ distributedSemaphore = clusterCoordinator.getSemaphore("query.large", largeQueue);
} else {
- this.lease = smallSemaphore.acquire(this.queueTimeout, TimeUnit.MILLISECONDS);
+ final int smallQueue = optionManager.getOption(ExecConstants.SMALL_QUEUE_KEY).num_val.intValue();
+ distributedSemaphore = clusterCoordinator.getSemaphore("query.small", smallQueue);
}
+
+ final long queueTimeout = optionManager.getOption(ExecConstants.QUEUE_TIMEOUT_KEY).num_val;
+ lease = distributedSemaphore.acquire(queueTimeout, TimeUnit.MILLISECONDS);
} catch (Exception e) {
throw new ForemanSetupException("Unable to acquire slot for query.", e);
}
}
}
- private QueryWorkUnit getQueryWorkUnit(PhysicalPlan plan) throws ExecutionSetupException {
- PhysicalOperator rootOperator = plan.getSortedOperators(false).iterator().next();
- Fragment rootFragment = rootOperator.accept(MakeFragmentsVisitor.INSTANCE, null);
+ private QueryWorkUnit getQueryWorkUnit(final PhysicalPlan plan) throws ExecutionSetupException {
+ final PhysicalOperator rootOperator = plan.getSortedOperators(false).iterator().next();
+ final Fragment rootFragment = rootOperator.accept(MakeFragmentsVisitor.INSTANCE, null);
+ final SimpleParallelizer parallelizer = new SimpleParallelizer(queryContext);
+ final QueryWorkUnit queryWorkUnit = parallelizer.getFragments(
+ queryContext.getOptions().getOptionList(), queryContext.getCurrentEndpoint(),
+ queryId, queryContext.getActiveEndpoints(), drillbitContext.getPlanReader(), rootFragment,
+ initiatingClient.getSession(), queryContext.getQueryDateTimeInfo());
+
+ if (logger.isInfoEnabled()) {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("PlanFragments for query ");
+ sb.append(queryId);
+ sb.append('\n');
+
+ final List<PlanFragment> planFragments = queryWorkUnit.getFragments();
+ final int fragmentCount = planFragments.size();
+ int fragmentIndex = 0;
+ for(PlanFragment planFragment : planFragments) {
+ final FragmentHandle fragmentHandle = planFragment.getHandle();
+ sb.append("PlanFragment(");
+ sb.append(++fragmentIndex);
+ sb.append('/');
+ sb.append(fragmentCount);
+ sb.append(") major_fragment_id ");
+ sb.append(fragmentHandle.getMajorFragmentId());
+ sb.append(" minor_fragment_id ");
+ sb.append(fragmentHandle.getMinorFragmentId());
+ sb.append('\n');
+
+ final DrillbitEndpoint endpointAssignment = planFragment.getAssignment();
+ sb.append(" DrillbitEndpoint address ");
+ sb.append(endpointAssignment.getAddress());
+ sb.append('\n');
+
+ String jsonString = "<<malformed JSON>>";
+ sb.append(" fragment_json: ");
+ final ObjectMapper objectMapper = new ObjectMapper();
+ try
+ {
+ final Object json = objectMapper.readValue(planFragment.getFragmentJson(), Object.class);
+ jsonString = objectMapper.defaultPrettyPrintingWriter().writeValueAsString(json);
+ } catch(Exception e) {
+ // we've already set jsonString to a fallback value
+ }
+ sb.append(jsonString);
- SimpleParallelizer parallelizer = new SimpleParallelizer(context);
- return parallelizer.getFragments(context.getOptions().getOptionList(), context.getCurrentEndpoint(),
- queryId, context.getActiveEndpoints(), context.getPlanReader(), rootFragment, initiatingClient.getSession(),
- context.getQueryDateTimeInfo());
+ logger.info(sb.toString());
+ }
+ }
+
+ return queryWorkUnit;
}
/**
- * Tells the foreman to move to a new state. Note that
- * @param state
- * @return
+ * Manages the end-state processing for Foreman.
+ *
+ * End-state processing is tricky, because even if a query appears to succeed, but
+ * we then encounter a problem during cleanup, we still want to mark the query as
+ * failed. So we have to construct the successful result we would send, and then
+ * clean up before we send that result, possibly changing that result if we encounter
+ * a problem during cleanup. We only send the result when there is nothing left to
+ * do, so it will account for any possible problems.
+ *
+ * The idea here is to make close()ing the ForemanResult do the final cleanup and
+ * sending. Closing the result must be the last thing that is done by Foreman.
*/
- private synchronized boolean moveToState(QueryState newState, Exception exception){
- logger.info("State change requested. {} --> {}", state, newState, exception);
- outside: switch(state) {
+ private class ForemanResult implements AutoCloseable {
+ private QueryState resultState = null;
+ private Exception resultException = null;
+ private boolean isClosed = false;
+
+ /**
+ * Set up the result for a COMPLETED or CANCELED state.
+ *
+ * <p>Note that before sending this result, we execute cleanup steps that could
+ * result in this result still being changed to a FAILED state.
+ *
+ * @param queryState one of COMPLETED or CANCELED
+ */
+ public void setCompleted(final QueryState queryState) {
+ Preconditions.checkArgument((queryState == QueryState.COMPLETED) || (queryState == QueryState.CANCELED));
+ Preconditions.checkState(!isClosed);
+ Preconditions.checkState(resultState == null);
+
+ resultState = queryState;
+ }
+
+ /**
+ * Set up the result for a FAILED state.
+ *
+ * <p>Failures that occur during cleanup processing will be added as suppressed
+ * exceptions.
+ *
+ * @param exception the exception that led to the FAILED state
+ */
+ public void setFailed(final Exception exception) {
+ Preconditions.checkArgument(exception != null);
+ Preconditions.checkState(!isClosed);
+ Preconditions.checkState(resultState == null);
+
+ resultState = QueryState.FAILED;
+ resultException = exception;
+ }
+
+ /**
+ * Add an exception to the result. All exceptions after the first become suppressed
+ * exceptions hanging off the first.
+ *
+ * @param exception the exception to add
+ */
+ private void addException(final Exception exception) {
+ Preconditions.checkNotNull(exception);
+
+ if (resultException == null) {
+ resultException = exception;
+ } else {
+ resultException.addSuppressed(exception);
+ }
+ }
- case PENDING:
- // since we're moving out of pending, we can now start accepting other changes in state.
- // This guarantees that the first state change is driven by the original thread.
- acceptExternalEvents.countDown();
+ /**
+ * Close the given resource, catching and adding any caught exceptions via
+ * {@link #addException(Exception)}. If an exception is caught, it will change
+ * the result state to FAILED, regardless of what its current value.
+ *
+ * @param autoCloseable the resource to close
+ */
+ private void suppressingClose(final AutoCloseable autoCloseable) {
+ Preconditions.checkState(!isClosed);
+ Preconditions.checkState(resultState != null);
- if(newState == QueryState.RUNNING){
- recordNewState(QueryState.RUNNING);
- return true;
+ if (autoCloseable == null) {
+ return;
}
- // fall through to running behavior.
- //
- case RUNNING: {
+ try {
+ autoCloseable.close();
+ } catch(Exception e) {
+ /*
+ * Even if the query completed successfully, we'll still report failure if we have
+ * problems cleaning up.
+ */
+ resultState = QueryState.FAILED;
+ addException(e);
+ }
+ }
+
+ @Override
+ public void close() {
+ Preconditions.checkState(!isClosed);
+ Preconditions.checkState(resultState != null);
+
+ logger.info("foreman cleaning up - status: {}", queryManager.getFragmentStatesAsString());
+
+ // These are straight forward removals from maps, so they won't throw.
+ drillbitContext.getWorkBus().removeFragmentStatusListener(queryId);
+ drillbitContext.getClusterCoordinator().removeDrillbitStatusListener(queryManager);
+
+ suppressingClose(queryContext);
+
+ /*
+ * We do our best to write the latest state, but even that could fail. If it does, we can't write
+ * the (possibly newly failing) state, so we continue on anyway.
+ *
+ * We only need to do this if the resultState differs from the last recorded state
+ */
+ if (resultState != state) {
+ suppressingClose(new AutoCloseable() {
+ @Override
+ public void close() throws Exception {
+ recordNewState(resultState);
+ }
+ });
+ }
+
+ /*
+ * Construct the response based on the latest resultState. The builder shouldn't fail.
+ */
+ final QueryResult.Builder resultBuilder = QueryResult.newBuilder()
+ .setIsLastChunk(resultState != QueryState.COMPLETED) // TODO(DRILL-2498) temporary
+ .setQueryId(queryId)
+ .setQueryState(resultState);
+ if (resultException != null) {
+ final DrillPBError error = ErrorHelper.logAndConvertError(queryContext.getCurrentEndpoint(),
+ ExceptionUtils.getRootCauseMessage(resultException), resultException, logger);
+ resultBuilder.addError(error);
+ }
+
+ /*
+ * If sending the result fails, we don't really have any way to modify the result we tried to send;
+ * it is possible it got sent but the result came from a later part of the code path. It is also
+ * possible the connection has gone away, so this is irrelevant because there's nowhere to
+ * send anything to.
+ */
+ try {
+ // send whatever result we ended up with
+ initiatingClient.sendResult(responseListener, new QueryWritableBatch(resultBuilder.build()), true);
+ } catch(Exception e) {
+ addException(e);
+ logger.warn("Exception sending result to client", resultException);
+ }
+
+ try {
+ releaseLease();
+ } finally {
+ isClosed = true;
+ }
+ }
+ }
+
+ /**
+ * Tells the foreman to move to a new state.
+ *
+ * @param newState the state to move to
+ * @param exception if not null, the exception that drove this state transition (usually a failure)
+ */
+ private synchronized void moveToState(final QueryState newState, final Exception exception) {
+ logger.info("State change requested. {} --> {}", state, newState, exception);
+ switch(state) {
+ case PENDING:
+ if (newState == QueryState.RUNNING) {
+ recordNewState(QueryState.RUNNING);
+ return;
+ }
- switch(newState){
+ //$FALL-THROUGH$
- case CANCELED: {
+ case RUNNING: {
+ /*
+ * For cases that cancel executing fragments, we have to record the new state first, because
+ * the cancellation of the local root fragment will cause this to be called recursively.
+ */
+ switch(newState) {
+ case CANCELLATION_REQUESTED: {
assert exception == null;
- recordNewState(QueryState.CANCELED);
- cancelExecutingFragments();
- QueryResult result = QueryResult.newBuilder() //
- .setQueryId(queryId) //
- .setQueryState(QueryState.CANCELED) //
- .setIsLastChunk(true) //
- .build();
-
- // immediately notify client that cancellation is taking place, final clean-up happens when foreman reaches to
- // a terminal state(completed, failed)
- initiatingClient.sendResult(responseListener, new QueryWritableBatch(result), true);
- return true;
+ queryManager.markEndTime();
+ recordNewState(QueryState.CANCELLATION_REQUESTED);
+ queryManager.cancelExecutingFragments(drillbitContext, rootRunner);
+ foremanResult.setCompleted(QueryState.CANCELED);
+ /*
+ * We don't close the foremanResult until we've gotten acknowledgements, which
+ * happens below in the case for current state == CANCELLATION_REQUESTED.
+ */
+ return;
}
case COMPLETED: {
assert exception == null;
+ queryManager.markEndTime();
recordNewState(QueryState.COMPLETED);
- QueryResult result = QueryResult //
- .newBuilder() //
- .setQueryState(QueryState.COMPLETED) //
- .setQueryId(queryId) //
- .build();
- cleanup(result);
- return true;
+ foremanResult.setCompleted(QueryState.COMPLETED);
+ foremanResult.close();
+ return;
}
-
- case FAILED:
+ case FAILED: {
assert exception != null;
+ queryManager.markEndTime();
recordNewState(QueryState.FAILED);
- cancelExecutingFragments();
- DrillPBError error = ErrorHelper.logAndConvertError(context.getCurrentEndpoint(),
- ExceptionUtils.getRootCauseMessage(exception), exception, logger);
- QueryResult result = QueryResult //
- .newBuilder() //
- .addError(error) //
- .setIsLastChunk(true) //
- .setQueryState(QueryState.FAILED) //
- .setQueryId(queryId) //
- .build();
- cleanup(result);
- return true;
- default:
- break outside;
+ queryManager.cancelExecutingFragments(drillbitContext, rootRunner);
+ foremanResult.setFailed(exception);
+ foremanResult.close();
+ return;
+ }
+ default:
+ throw new IllegalStateException("illegal transition from RUNNING to " + newState);
}
}
+ case CANCELLATION_REQUESTED:
+ if ((newState == QueryState.CANCELED) || (newState == QueryState.COMPLETED)
+ || (newState == QueryState.FAILED)) {
+ /*
+ * These amount to a completion of the cancellation requests' cleanup; now we
+ * can clean up and send the result.
+ */
+ foremanResult.close();
+ }
+ return;
+
case CANCELED:
case COMPLETED:
- case FAILED: {
- // no op.
- logger.warn("Dropping request to move to {} state as query is already at {} state (which is terminal).", newState, state, exception);
- return false;
- }
-
- }
-
- throw new IllegalStateException(String.format("Failure trying to change states: %s --> %s", state.name(), newState.name()));
- }
-
- private void cancelExecutingFragments(){
-
- // Stop all framgents with a currently active status.
- List<FragmentData> fragments = getStatus().getFragmentData();
- Collections.sort(fragments, new Comparator<FragmentData>() {
- @Override
- public int compare(FragmentData o1, FragmentData o2) {
- return o2.getHandle().getMajorFragmentId() - o1.getHandle().getMajorFragmentId();
- }
- });
- for(FragmentData data: fragments){
- FragmentHandle handle = data.getStatus().getHandle();
- switch(data.getStatus().getProfile().getState()){
- case SENDING:
- case AWAITING_ALLOCATION:
- case RUNNING:
- if(data.isLocal()){
- if(rootRunner != null){
- rootRunner.cancel();
- }
- }else{
- bee.getContext().getController().getTunnel(data.getEndpoint()).cancelFragment(new CancelListener(data.getEndpoint(), handle), handle);
- }
- break;
- default:
- break;
- }
+ case FAILED:
+ logger.warn("Dropping request to move to {} state as query is already at {} state (which is terminal).",
+ newState, state);
+ return;
}
+ throw new IllegalStateException(String.format("Failure trying to change states: %s --> %s",
+ state.name(), newState.name()));
}
- private QueryStatus getStatus(){
- return queryManager.getStatus();
- }
-
- private void recordNewState(QueryState newState){
- this.state = newState;
- getStatus().updateQueryStateInStore(newState);
+ private void recordNewState(final QueryState newState) {
+ state = newState;
+ queryManager.updateQueryStateInStore(newState);
}
- private void runSQL(String sql) throws ExecutionSetupException {
- DrillSqlWorker sqlWorker = new DrillSqlWorker(context);
- Pointer<String> textPlan = new Pointer<>();
- PhysicalPlan plan = sqlWorker.getPlan(sql, textPlan);
- getStatus().setPlanText(textPlan.value);
+ private void runSQL(final String sql) throws ExecutionSetupException {
+ final DrillSqlWorker sqlWorker = new DrillSqlWorker(queryContext);
+ final Pointer<String> textPlan = new Pointer<>();
+ final PhysicalPlan plan = sqlWorker.getPlan(sql, textPlan);
+ queryManager.setPlanText(textPlan.value);
runPhysicalPlan(plan);
}
- private PhysicalPlan convert(LogicalPlan plan) throws OptimizerException {
+ private PhysicalPlan convert(final LogicalPlan plan) throws OptimizerException {
if (logger.isDebugEnabled()) {
- logger.debug("Converting logical plan {}.", plan.toJsonStringSafe(context.getConfig()));
+ logger.debug("Converting logical plan {}.", plan.toJsonStringSafe(queryContext.getConfig()));
}
- return new BasicOptimizer(DrillConfig.create(), context, initiatingClient).optimize(
- new BasicOptimizer.BasicOptimizationContext(context), plan);
+ return new BasicOptimizer(queryContext).optimize(
+ new BasicOptimizer.BasicOptimizationContext(queryContext), plan);
}
public QueryId getQueryId() {
return queryId;
}
- @Override
- public void close() throws IOException {
- }
-
- public QueryStatus getQueryStatus() {
- return this.queryManager.getStatus();
- }
-
- private void setupRootFragment(PlanFragment rootFragment, UserClientConnection rootClient, FragmentRoot rootOperator) throws ExecutionSetupException {
- FragmentContext rootContext = new FragmentContext(bee.getContext(), rootFragment, rootClient, bee.getContext()
- .getFunctionImplementationRegistry());
-
- IncomingBuffers buffers = new IncomingBuffers(rootOperator, rootContext);
-
+ /**
+ * Set up the root fragment (which will run locally), and submit it for execution.
+ *
+ * @param rootFragment
+ * @param rootClient
+ * @param rootOperator
+ * @throws ExecutionSetupException
+ */
+ private void setupRootFragment(final PlanFragment rootFragment, final UserClientConnection rootClient,
+ final FragmentRoot rootOperator) throws ExecutionSetupException {
+ @SuppressWarnings("resource")
+ final FragmentContext rootContext = new FragmentContext(drillbitContext, rootFragment, rootClient,
+ drillbitContext.getFunctionImplementationRegistry());
+ @SuppressWarnings("resource")
+ final IncomingBuffers buffers = new IncomingBuffers(rootOperator, rootContext);
rootContext.setBuffers(buffers);
- // add fragment to local node.
queryManager.addFragmentStatusTracker(rootFragment, true);
- this.rootRunner = new FragmentExecutor(rootContext, bee, rootOperator, queryManager.getRootStatusHandler(rootContext, rootFragment));
- RootFragmentManager fragmentManager = new RootFragmentManager(rootFragment.getHandle(), buffers, rootRunner);
+ rootRunner = new FragmentExecutor(rootContext, rootOperator,
+ queryManager.getRootStatusHandler(rootContext));
+ final RootFragmentManager fragmentManager =
+ new RootFragmentManager(rootFragment.getHandle(), buffers, rootRunner);
if (buffers.isDone()) {
// if we don't have to wait for any incoming data, start the fragment runner.
bee.addFragmentRunner(fragmentManager.getRunnable());
} else {
// if we do, record the fragment manager in the workBus.
- bee.getContext().getWorkBus().setFragmentManager(fragmentManager);
+ // TODO aren't we managing our own work? What does this do? It looks like this will never get run
+ drillbitContext.getWorkBus().addFragmentManager(fragmentManager);
}
}
- private void setupNonRootFragments(Collection<PlanFragment> fragments) throws ForemanException{
- Multimap<DrillbitEndpoint, PlanFragment> leafFragmentMap = ArrayListMultimap.create();
- Multimap<DrillbitEndpoint, PlanFragment> intFragmentMap = ArrayListMultimap.create();
+ /**
+ * Set up the non-root fragments for execution. Some may be local, and some may be remote.
+ * Messages are sent immediately, so they may start returning data even before we complete this.
+ *
+ * @param fragments the fragments
+ * @throws ForemanException
+ */
+ private void setupNonRootFragments(final Collection<PlanFragment> fragments) throws ForemanException {
+ /*
+ * We will send a single message to each endpoint, regardless of how many fragments will be
+ * executed there. We need to start up the intermediate fragments first so that they will be
+ * ready once the leaf fragments start producing data. To satisfy both of these, we will
+ * make a pass through the fragments and put them into these two maps according to their
+ * leaf/intermediate state, as well as their target drillbit.
+ */
+ final Multimap<DrillbitEndpoint, PlanFragment> leafFragmentMap = ArrayListMultimap.create();
+ final Multimap<DrillbitEndpoint, PlanFragment> intFragmentMap = ArrayListMultimap.create();
// record all fragments for status purposes.
- for (PlanFragment f : fragments) {
+ for (PlanFragment planFragment : fragments) {
// logger.debug("Tracking intermediate remote node {} with data {}", f.getAssignment(), f.getFragmentJson());
- queryManager.addFragmentStatusTracker(f, false);
- if (f.getLeafFragment()) {
- leafFragmentMap.put(f.getAssignment(), f);
+ queryManager.addFragmentStatusTracker(planFragment, false);
+ if (planFragment.getLeafFragment()) {
+ leafFragmentMap.put(planFragment.getAssignment(), planFragment);
} else {
- intFragmentMap.put(f.getAssignment(), f);
+ intFragmentMap.put(planFragment.getAssignment(), planFragment);
}
}
- CountDownLatch latch = new CountDownLatch(intFragmentMap.keySet().size());
+ /*
+ * We need to wait for the intermediates to be sent so that they'll be set up by the time
+ * the leaves start producing data. We'll use this latch to wait for the responses.
+ *
+ * However, in order not to hang the process if any of the RPC requests fails, we always
+ * count down (see FragmentSubmitFailures), but we count the number of failures so that we'll
+ * know if any submissions did fail.
+ */
+ final CountDownLatch endpointLatch = new CountDownLatch(intFragmentMap.keySet().size());
+ final FragmentSubmitFailures fragmentSubmitFailures = new FragmentSubmitFailures();
// send remote intermediate fragments
for (DrillbitEndpoint ep : intFragmentMap.keySet()) {
- sendRemoteFragments(ep, intFragmentMap.get(ep), latch);
+ sendRemoteFragments(ep, intFragmentMap.get(ep), endpointLatch, fragmentSubmitFailures);
}
- // wait for send complete
- try {
- latch.await();
- } catch (InterruptedException e) {
- throw new ForemanException("Interrupted while waiting to complete send of remote fragments.", e);
+ // wait for the status of all requests sent above to be known
+ boolean ready = false;
+ while(!ready) {
+ try {
+ endpointLatch.await();
+ ready = true;
+ } catch (InterruptedException e) {
+ // if we weren't ready, the while loop will continue to wait
+ }
}
- // send remote (leaf) fragments.
- for (DrillbitEndpoint ep : leafFragmentMap.keySet()) {
- sendRemoteFragments(ep, leafFragmentMap.get(ep), null);
+ // if any of the intermediate fragment submissions failed, fail the query
+ final List<FragmentSubmitFailures.SubmissionException> submissionExceptions =
+ fragmentSubmitFailures.submissionExceptions;
+ if (submissionExceptions.size() > 0) {
+ throw new ForemanSetupException("Error setting up remote intermediate fragment execution",
+ submissionExceptions.get(0).rpcException);
+ // TODO indicate the failing drillbit?
+ // TODO report on all the failures?
}
- }
- public RpcOutcomeListener<Ack> getSubmitListener(DrillbitEndpoint endpoint, InitializeFragments value, CountDownLatch latch){
- return new FragmentSubmitListener(endpoint, value, latch);
+ /*
+ * Send the remote (leaf) fragments; we don't wait for these. Any problems will come in through
+ * the regular sendListener event delivery.
+ */
+ for (DrillbitEndpoint ep : leafFragmentMap.keySet()) {
+ sendRemoteFragments(ep, leafFragmentMap.get(ep), null, null);
+ }
}
- private void sendRemoteFragments(DrillbitEndpoint assignment, Collection<PlanFragment> fragments, CountDownLatch latch){
- Controller controller = bee.getContext().getController();
- InitializeFragments.Builder fb = InitializeFragments.newBuilder();
- for(PlanFragment f : fragments){
- fb.addFragment(f);
+ /**
+ * Send all the remote fragments belonging to a single target drillbit in one request.
+ *
+ * @param assignment the drillbit assigned to these fragments
+ * @param fragments the set of fragments
+ * @param latch the countdown latch used to track the requests to all endpoints
+ * @param fragmentSubmitFailures the submission failure counter used to track the requests to all endpoints
+ */
+ private void sendRemoteFragments(final DrillbitEndpoint assignment, final Collection<PlanFragment> fragments,
+ final CountDownLatch latch, final FragmentSubmitFailures fragmentSubmitFailures) {
+ @SuppressWarnings("resource")
+ final Controller controller = drillbitContext.getController();
+ final InitializeFragments.Builder fb = InitializeFragments.newBuilder();
+ for(PlanFragment planFragment : fragments) {
+ fb.addFragment(planFragment);
}
- InitializeFragments initFrags = fb.build();
+ final InitializeFragments initFrags = fb.build();
logger.debug("Sending remote fragments to node {} with data {}", assignment, initFrags);
- FragmentSubmitListener listener = new FragmentSubmitListener(assignment, initFrags, latch);
+ final FragmentSubmitListener listener =
+ new FragmentSubmitListener(assignment, initFrags, latch, fragmentSubmitFailures);
controller.getTunnel(assignment).sendFragments(listener, initFrags);
}
- public QueryState getState(){
+ public QueryState getState() {
return state;
}
- private class FragmentSubmitListener extends EndpointListener<Ack, InitializeFragments>{
+ /**
+ * Used by {@link FragmentSubmitListener} to track the number of submission failures.
+ */
+ private static class FragmentSubmitFailures {
+ static class SubmissionException {
+// final DrillbitEndpoint drillbitEndpoint;
+ final RpcException rpcException;
+
+ SubmissionException(@SuppressWarnings("unused") final DrillbitEndpoint drillbitEndpoint,
+ final RpcException rpcException) {
+// this.drillbitEndpoint = drillbitEndpoint;
+ this.rpcException = rpcException;
+ }
+ }
+
+ final List<SubmissionException> submissionExceptions = new LinkedList<>();
+
+ void addFailure(final DrillbitEndpoint drillbitEndpoint, final RpcException rpcException) {
+ submissionExceptions.add(new SubmissionException(drillbitEndpoint, rpcException));
+ }
+ }
- private CountDownLatch latch;
+ private class FragmentSubmitListener extends EndpointListener<Ack, InitializeFragments> {
+ private final CountDownLatch latch;
+ private final FragmentSubmitFailures fragmentSubmitFailures;
- public FragmentSubmitListener(DrillbitEndpoint endpoint, InitializeFragments value, CountDownLatch latch) {
+ /**
+ * Constructor.
+ *
+ * @param endpoint the endpoint for the submission
+ * @param value the initialize fragments message
+ * @param latch the latch to count down when the status is known; may be null
+ * @param fragmentSubmitFailures the counter to use for failures; must be non-null iff latch is non-null
+ */
+ public FragmentSubmitListener(final DrillbitEndpoint endpoint, final InitializeFragments value,
+ final CountDownLatch latch, final FragmentSubmitFailures fragmentSubmitFailures) {
super(endpoint, value);
+ Preconditions.checkState((latch == null) == (fragmentSubmitFailures == null));
this.latch = latch;
+ this.fragmentSubmitFailures = fragmentSubmitFailures;
}
@Override
- public void success(Ack ack, ByteBuf byteBuf) {
+ public void success(final Ack ack, final ByteBuf byteBuf) {
if (latch != null) {
latch.countDown();
}
}
@Override
- public void failed(RpcException ex) {
- logger.debug("Failure while sending fragment. Stopping query.", ex);
- moveToState(QueryState.FAILED, ex);
+ public void failed(final RpcException ex) {
+ if (latch != null) {
+ fragmentSubmitFailures.addFailure(endpoint, ex);
+ latch.countDown();
+ } else {
+ // since this won't be waited on, we can wait to deliver this event once the Foreman is ready
+ logger.debug("Failure while sending fragment. Stopping query.", ex);
+ stateListener.moveToState(QueryState.FAILED, ex);
+ }
}
-
}
-
+ /**
+ * Provides gated access to state transitions.
+ *
+ * <p>The StateListener waits on a latch before delivery state transitions to the Foreman. The
+ * latch will be tripped when the Foreman is sufficiently set up that it can receive and process
+ * external events from other threads.
+ */
public class StateListener {
- public boolean moveToState(QueryState newState, Exception ex){
- try {
- acceptExternalEvents.await();
- } catch(InterruptedException e){
- logger.warn("Interrupted while waiting to move state.", e);
- return false;
+ /**
+ * Move the Foreman to the specified new state.
+ *
+ * @param newState the state to move to
+ * @param ex if moving to a failure state, the exception that led to the failure; used for reporting
+ * to the user
+ */
+ public void moveToState(final QueryState newState, final Exception ex) {
+ boolean ready = false;
+ while(!ready) {
+ try {
+ acceptExternalEvents.await();
+ ready = true;
+ } catch(InterruptedException e) {
+ // if we're still not ready, the while loop will cause us to wait again
+ logger.warn("Interrupted while waiting to move state.", e);
+ }
}
- return Foreman.this.moveToState(newState, ex);
+ Foreman.this.moveToState(newState, ex);
}
}
-
- @Override
- public int compareTo(Object o) {
- return hashCode() - o.hashCode();
- }
-
+ /**
+ * Listens for the status of the RPC response sent to the user for the query.
+ */
private class ResponseSendListener extends BaseRpcOutcomeListener<Ack> {
@Override
- public void failed(RpcException ex) {
- logger
- .info(
- "Failure while trying communicate query result to initating client. This would happen if a client is disconnected before response notice can be sent.",
- ex);
- moveToState(QueryState.FAILED, ex);
+ public void failed(final RpcException ex) {
+ logger.info(
+ "Failure while trying communicate query result to initating client. This would happen if a client is disconnected before response notice can be sent.",
+ ex);
+ stateListener.moveToState(QueryState.FAILED, ex);
}
}
-
-
- private class CancelListener extends EndpointListener<Ack, FragmentHandle>{
-
- public CancelListener(DrillbitEndpoint endpoint, FragmentHandle handle) {
- super(endpoint, handle);
- }
-
- @Override
- public void failed(RpcException ex) {
- logger.error("Failure while attempting to cancel fragment {} on endpoint {}.", value, endpoint, ex);
- }
-
- @Override
- public void success(Ack value, ByteBuf buf) {
- if(!value.getOk()){
- logger.warn("Remote node {} responded negative on cancellation request for fragment {}.", endpoint, value);
- }
- // do nothing.
- }
-
- }
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java
index 52fd0a9..433ab26 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java
@@ -29,19 +29,21 @@ public class FragmentData {
private volatile long lastStatusUpdate = 0;
private final DrillbitEndpoint endpoint;
- public FragmentData(FragmentHandle handle, DrillbitEndpoint endpoint, boolean isLocal) {
- super();
- MinorFragmentProfile f = MinorFragmentProfile.newBuilder() //
- .setState(FragmentState.SENDING) //
- .setMinorFragmentId(handle.getMinorFragmentId()) //
- .setEndpoint(endpoint) //
- .build();
- this.status = FragmentStatus.newBuilder().setHandle(handle).setProfile(f).build();
+ public FragmentData(final FragmentHandle handle, final DrillbitEndpoint endpoint, final boolean isLocal) {
this.endpoint = endpoint;
this.isLocal = isLocal;
+ final MinorFragmentProfile f = MinorFragmentProfile.newBuilder()
+ .setState(FragmentState.SENDING)
+ .setMinorFragmentId(handle.getMinorFragmentId())
+ .setEndpoint(endpoint)
+ .build();
+ status = FragmentStatus.newBuilder()
+ .setHandle(handle)
+ .setProfile(f)
+ .build();
}
- public void setStatus(FragmentStatus status){
+ public void setStatus(final FragmentStatus status) {
this.status = status;
lastStatusUpdate = System.currentTimeMillis();
}
@@ -54,15 +56,11 @@ public class FragmentData {
return isLocal;
}
- public long getLastStatusUpdate() {
- return lastStatusUpdate;
- }
-
public DrillbitEndpoint getEndpoint() {
return endpoint;
}
- public FragmentHandle getHandle(){
+ public FragmentHandle getHandle() {
return status.getHandle();
}
@@ -71,7 +69,4 @@ public class FragmentData {
return "FragmentData [isLocal=" + isLocal + ", status=" + status + ", lastStatusUpdate=" + lastStatusUpdate
+ ", endpoint=" + endpoint + "]";
}
-
-
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java
index 6a719d2..b2a40ae 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java
@@ -20,7 +20,5 @@ package org.apache.drill.exec.work.foreman;
import org.apache.drill.exec.proto.BitControl.FragmentStatus;
public interface FragmentStatusListener {
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentStatusListener.class);
-
public void statusUpdate(FragmentStatus status);
}
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
index 2de3592..8626d5b 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java
@@ -17,144 +17,353 @@
*/
package org.apache.drill.exec.work.foreman;
+import io.netty.buffer.ByteBuf;
+
+import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import com.google.common.base.Preconditions;
+import org.apache.drill.common.exceptions.DrillRuntimeException;
import org.apache.drill.exec.ops.FragmentContext;
import org.apache.drill.exec.proto.BitControl.FragmentStatus;
import org.apache.drill.exec.proto.BitControl.PlanFragment;
import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
import org.apache.drill.exec.proto.ExecProtos.FragmentHandle;
-import org.apache.drill.exec.proto.UserBitShared;
+import org.apache.drill.exec.proto.GeneralRPCProtos.Ack;
+import org.apache.drill.exec.proto.SchemaUserBitShared;
+import org.apache.drill.exec.proto.UserBitShared.MajorFragmentProfile;
import org.apache.drill.exec.proto.UserBitShared.QueryId;
+import org.apache.drill.exec.proto.UserBitShared.QueryInfo;
+import org.apache.drill.exec.proto.UserBitShared.QueryProfile;
import org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState;
import org.apache.drill.exec.proto.UserProtos.RunQuery;
import org.apache.drill.exec.proto.helper.QueryIdHelper;
import org.apache.drill.exec.rpc.RemoteRpcException;
+import org.apache.drill.exec.rpc.RpcException;
+import org.apache.drill.exec.rpc.control.Controller;
+import org.apache.drill.exec.server.DrillbitContext;
+import org.apache.drill.exec.store.sys.PStore;
+import org.apache.drill.exec.store.sys.PStoreConfig;
import org.apache.drill.exec.store.sys.PStoreProvider;
+import org.apache.drill.exec.work.EndpointListener;
import org.apache.drill.exec.work.foreman.Foreman.StateListener;
import org.apache.drill.exec.work.fragment.AbstractStatusReporter;
+import org.apache.drill.exec.work.fragment.FragmentExecutor;
+import com.carrotsearch.hppc.IntObjectOpenHashMap;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
/**
* Each Foreman holds its own QueryManager. This manages the events associated with execution of a particular query across all fragments.
*/
-public class QueryManager implements FragmentStatusListener, DrillbitStatusListener{
- static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryManager.class);
- private final Set<DrillbitEndpoint> includedBits;
+public class QueryManager implements FragmentStatusListener, DrillbitStatusListener {
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryManager.class);
+
+ public static final PStoreConfig<QueryProfile> QUERY_PROFILE = PStoreConfig.
+ newProtoBuilder(SchemaUserBitShared.QueryProfile.WRITE, SchemaUserBitShared.QueryProfile.MERGE)
+ .name("profiles")
+ .blob()
+ .max(100)
+ .build();
- private final QueryStatus status;
+ public static final PStoreConfig<QueryInfo> RUNNING_QUERY_INFO = PStoreConfig.
+ newProtoBuilder(SchemaUserBitShared.QueryInfo.WRITE, SchemaUserBitShared.QueryInfo.MERGE)
+ .name("running")
+ .ephemeral()
+ .build();
+
+ private final Set<DrillbitEndpoint> includedBits;
private final StateListener stateListener;
- private final AtomicInteger remainingFragmentCount;
private final QueryId queryId;
+ private final String stringQueryId;
+ private final RunQuery runQuery;
+ private final Foreman foreman;
+
+ /*
+ * Doesn't need to be thread safe as fragmentDataMap is generated in a single thread and then
+ * accessed by multiple threads for reads only.
+ */
+ private final IntObjectOpenHashMap<IntObjectOpenHashMap<FragmentData>> fragmentDataMap =
+ new IntObjectOpenHashMap<>();
+ private final List<FragmentData> fragmentDataSet = Lists.newArrayList();
+
+ private final PStore<QueryProfile> profilePStore;
+ private final PStore<QueryInfo> profileEStore;
- public QueryManager(QueryId id, RunQuery query, PStoreProvider pStoreProvider, StateListener stateListener, Foreman foreman) {
+ // the following mutable variables are used to capture ongoing query status
+ private String planText;
+ private long startTime;
+ private long endTime;
+ private final AtomicInteger finishedFragments = new AtomicInteger(0);
+
+ public QueryManager(final QueryId queryId, final RunQuery runQuery, final PStoreProvider pStoreProvider,
+ final StateListener stateListener, final Foreman foreman) {
+ this.queryId = queryId;
+ this.runQuery = runQuery;
this.stateListener = stateListener;
- this.queryId = id;
- this.remainingFragmentCount = new AtomicInteger(0);
- this.status = new QueryStatus(query, id, pStoreProvider, foreman);
- this.includedBits = Sets.newHashSet();
- }
+ this.foreman = foreman;
+
+ stringQueryId = QueryIdHelper.getQueryId(queryId);
+ try {
+ profilePStore = pStoreProvider.getStore(QUERY_PROFILE);
+ profileEStore = pStoreProvider.getStore(RUNNING_QUERY_INFO);
+ } catch (IOException e) {
+ throw new DrillRuntimeException(e);
+ }
- public QueryStatus getStatus(){
- return status;
+ includedBits = Sets.newHashSet();
}
@Override
- public void drillbitRegistered(Set<DrillbitEndpoint> registeredDrillbits) {
+ public void drillbitRegistered(final Set<DrillbitEndpoint> registeredDrillbits) {
}
@Override
- public void drillbitUnregistered(Set<DrillbitEndpoint> unregisteredDrillbits) {
- for(DrillbitEndpoint ep : unregisteredDrillbits){
- if(this.includedBits.contains(ep)){
- logger.warn("Drillbit {} no longer registered in cluster. Canceling query {}", ep.getAddress() + ep.getControlPort(), QueryIdHelper.getQueryId(queryId));
- this.stateListener.moveToState(QueryState.FAILED, new ForemanException("One more more nodes lost connectivity during query. Identified node was " + ep.getAddress()));
+ public void drillbitUnregistered(final Set<DrillbitEndpoint> unregisteredDrillbits) {
+ for(DrillbitEndpoint ep : unregisteredDrillbits) {
+ if (includedBits.contains(ep)) {
+ logger.warn("Drillbit {} no longer registered in cluster. Canceling query {}",
+ ep.getAddress() + ep.getControlPort(), QueryIdHelper.getQueryId(queryId));
+ stateListener.moveToState(QueryState.FAILED,
+ new ForemanException("One more more nodes lost connectivity during query. Identified node was "
+ + ep.getAddress()));
}
}
}
-
@Override
- public void statusUpdate(FragmentStatus status) {
-
- logger.debug("New fragment status was provided to Foreman of {}", status);
- switch(status.getProfile().getState()){
+ public void statusUpdate(final FragmentStatus status) {
+ logger.debug("New fragment status was provided to QueryManager of {}", status);
+ switch(status.getProfile().getState()) {
case AWAITING_ALLOCATION:
+ case RUNNING:
updateFragmentStatus(status);
break;
+
+ case FINISHED:
+ fragmentDone(status);
+ break;
+
case CANCELLED:
- //TODO: define a new query state to distinguish the state of early termination from cancellation
+ /*
+ * TODO
+ * This doesn't seem right; shouldn't this be similar to FAILED?
+ * and this means once all are cancelled we'll get to COMPLETED, even though some weren't?
+ *
+ * So, we add it to the finishedFragments if we ourselves we receive a statusUpdate (from where),
+ * but not if our cancellation listener gets it?
+ */
+ // TODO(DRILL-2370) we might not get these, so we need to take extra care for cleanup
fragmentDone(status);
break;
+
case FAILED:
stateListener.moveToState(QueryState.FAILED, new RemoteRpcException(status.getProfile().getError()));
break;
- case FINISHED:
- fragmentDone(status);
- break;
- case RUNNING:
- updateFragmentStatus(status);
- break;
+
default:
throw new UnsupportedOperationException(String.format("Received status of %s", status));
}
}
- private void updateFragmentStatus(FragmentStatus status){
- this.status.updateFragmentStatus(status);
+ private void updateFragmentStatus(final FragmentStatus fragmentStatus) {
+ final FragmentHandle fragmentHandle = fragmentStatus.getHandle();
+ final int majorFragmentId = fragmentHandle.getMajorFragmentId();
+ final int minorFragmentId = fragmentHandle.getMinorFragmentId();
+ fragmentDataMap.get(majorFragmentId).get(minorFragmentId).setStatus(fragmentStatus);
}
- private void fragmentDone(FragmentStatus status){
- this.status.incrementFinishedFragments();
- int remaining = remainingFragmentCount.decrementAndGet();
+ private void fragmentDone(final FragmentStatus status) {
updateFragmentStatus(status);
+
+ final int finishedFragments = this.finishedFragments.incrementAndGet();
+ final int totalFragments = fragmentDataSet.size();
+ assert finishedFragments <= totalFragments : "The finished fragment count exceeds the total fragment count";
+ final int remaining = totalFragments - finishedFragments;
logger.debug("waiting for {} fragments", remaining);
- if(remaining == 0){
+ if (remaining == 0) {
+ // this target state may be adjusted in moveToState() based on current FAILURE/CANCELLATION_REQUESTED status
stateListener.moveToState(QueryState.COMPLETED, null);
}
}
- public void setup(FragmentHandle rootFragmentHandle, DrillbitEndpoint localIdentity, int countOfNonRootFragments){
- remainingFragmentCount.set(countOfNonRootFragments + 1);
- logger.debug("foreman is waiting for {} fragments to finish", countOfNonRootFragments + 1);
- status.add(new FragmentData(rootFragmentHandle, localIdentity, true));
- this.status.setTotalFragments(countOfNonRootFragments + 1);
+ private void addFragment(final FragmentData fragmentData) {
+ final FragmentHandle fragmentHandle = fragmentData.getHandle();
+ final int majorFragmentId = fragmentHandle.getMajorFragmentId();
+ final int minorFragmentId = fragmentHandle.getMinorFragmentId();
- List<FragmentData> fragments = status.getFragmentData();
- for (FragmentData fragment : fragments) {
- this.includedBits.add(fragment.getEndpoint());
+ IntObjectOpenHashMap<FragmentData> minorMap = fragmentDataMap.get(majorFragmentId);
+ if (minorMap == null) {
+ minorMap = new IntObjectOpenHashMap<>();
+ fragmentDataMap.put(majorFragmentId, minorMap);
}
+ minorMap.put(minorFragmentId, fragmentData);
+ fragmentDataSet.add(fragmentData);
+
+ // keep track of all the drill bits that are used by this query
+ includedBits.add(fragmentData.getEndpoint());
+ }
+
+ public String getFragmentStatesAsString() {
+ return fragmentDataMap.toString();
}
- public void addFragmentStatusTracker(PlanFragment fragment, boolean isRoot){
- addFragmentStatusTracker(fragment.getHandle(), fragment.getAssignment(), isRoot);
+ void addFragmentStatusTracker(final PlanFragment fragment, final boolean isRoot) {
+ addFragment(new FragmentData(fragment.getHandle(), fragment.getAssignment(), isRoot));
}
- public void addFragmentStatusTracker(FragmentHandle handle, DrillbitEndpoint node, boolean isRoot){
- status.add(new FragmentData(handle, node, isRoot));
+ /**
+ * Stop all fragments with a currently active status.
+ */
+ void cancelExecutingFragments(final DrillbitContext drillbitContext, final FragmentExecutor rootRunner) {
+ final Controller controller = drillbitContext.getController();
+ for(FragmentData data : fragmentDataSet) {
+ final FragmentStatus fragmentStatus = data.getStatus();
+ switch(fragmentStatus.getProfile().getState()) {
+ case SENDING:
+ case AWAITING_ALLOCATION:
+ case RUNNING:
+ if (rootRunner != null) {
+ rootRunner.cancel();
+ } else {
+ final DrillbitEndpoint endpoint = data.getEndpoint();
+ final FragmentHandle handle = fragmentStatus.getHandle();
+ // TODO is the CancelListener redundant? Does the FragmentStatusListener get notified of the same?
+ controller.getTunnel(endpoint).cancelFragment(new CancelListener(endpoint, handle), handle);
+ }
+ break;
+
+ case FINISHED:
+ case CANCELLED:
+ case FAILED:
+ // nothing to do
+ break;
+ }
+ }
}
- public RootStatusReporter getRootStatusHandler(FragmentContext context, PlanFragment fragment){
- return new RootStatusReporter(context, fragment);
+ /*
+ * This assumes that the FragmentStatusListener implementation takes action when it hears
+ * that the target fragment has been cancelled. As a result, this listener doesn't do anything
+ * but log messages.
+ */
+ private class CancelListener extends EndpointListener<Ack, FragmentHandle> {
+ public CancelListener(final DrillbitEndpoint endpoint, final FragmentHandle handle) {
+ super(endpoint, handle);
+ }
+
+ @Override
+ public void failed(final RpcException ex) {
+ logger.error("Failure while attempting to cancel fragment {} on endpoint {}.", value, endpoint, ex);
+ }
+
+ @Override
+ public void success(final Ack value, final ByteBuf buf) {
+ if (!value.getOk()) {
+ logger.warn("Remote node {} responded negative on cancellation request for fragment {}.", endpoint, value);
+ }
+ }
}
- class RootStatusReporter extends AbstractStatusReporter{
+ public RootStatusReporter getRootStatusHandler(final FragmentContext context) {
+ return new RootStatusReporter(context);
+ }
- private RootStatusReporter(FragmentContext context, PlanFragment fragment){
+ class RootStatusReporter extends AbstractStatusReporter {
+ private RootStatusReporter(final FragmentContext context) {
super(context);
}
@Override
- protected void statusChange(FragmentHandle handle, FragmentStatus status) {
+ protected void statusChange(final FragmentHandle handle, final FragmentStatus status) {
statusUpdate(status);
}
+ }
+
+ QueryState updateQueryStateInStore(final QueryState queryState) {
+ switch (queryState) {
+ case PENDING:
+ case RUNNING:
+ case CANCELLATION_REQUESTED:
+ profileEStore.put(stringQueryId, getQueryInfo()); // store as ephemeral query profile.
+ break;
+
+ case COMPLETED:
+ case CANCELED:
+ case FAILED:
+ try {
+ profileEStore.delete(stringQueryId);
+ } catch(Exception e) {
+ logger.warn("Failure while trying to delete the estore profile for this query.", e);
+ }
+
+ // TODO(DRILL-2362) when do these ever get deleted?
+ profilePStore.put(stringQueryId, getQueryProfile());
+ break;
+
+ default:
+ throw new IllegalStateException("unrecognized queryState " + queryState);
+ }
+
+ return queryState;
+ }
+
+ private QueryInfo getQueryInfo() {
+ return QueryInfo.newBuilder()
+ .setQuery(runQuery.getPlan())
+ .setState(foreman.getState())
+ .setForeman(foreman.getQueryContext().getCurrentEndpoint())
+ .setStart(startTime)
+ .build();
+ }
+
+ public QueryProfile getQueryProfile() {
+ final QueryProfile.Builder profileBuilder = QueryProfile.newBuilder()
+ .setQuery(runQuery.getPlan())
+ .setType(runQuery.getType())
+ .setId(queryId)
+ .setState(foreman.getState())
+ .setForeman(foreman.getQueryContext().getCurrentEndpoint())
+ .setStart(startTime)
+ .setEnd(endTime)
+ .setTotalFragments(fragmentDataSet.size())
+ .setFinishedFragments(finishedFragments.get());
+
+ if (planText != null) {
+ profileBuilder.setPlan(planText);
+ }
+
+ for (int i = 0; i < fragmentDataMap.allocated.length; i++) {
+ if (fragmentDataMap.allocated[i]) {
+ final int majorFragmentId = fragmentDataMap.keys[i];
+ final IntObjectOpenHashMap<FragmentData> minorMap =
+ (IntObjectOpenHashMap<FragmentData>) ((Object[]) fragmentDataMap.values)[i];
+ final MajorFragmentProfile.Builder fb = MajorFragmentProfile.newBuilder()
+ .setMajorFragmentId(majorFragmentId);
+ for (int v = 0; v < minorMap.allocated.length; v++) {
+ if (minorMap.allocated[v]) {
+ final FragmentData data = (FragmentData) ((Object[]) minorMap.values)[v];
+ fb.addMinorFragmentProfile(data.getStatus().getProfile());
+ }
+ }
+ profileBuilder.addFragmentProfile(fb);
+ }
+ }
+ return profileBuilder.build();
+ }
+
+ void setPlanText(final String planText) {
+ this.planText = planText;
+ }
+ void markStartTime() {
+ startTime = System.currentTimeMillis();
}
+ void markEndTime() {
+ endTime = System.currentTimeMillis();
+ }
}