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:13 UTC
[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.
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)