Repository: incubator-drill Updated Branches: refs/heads/master fb2091ad7 -> 27a9c98a5
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/872d0abf/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java ---------------------------------------------------------------------- diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java new file mode 100644 index 0000000..5f0db24 --- /dev/null +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java @@ -0,0 +1,209 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT! +// Generated from protobuf + +package org.apache.drill.exec.proto.beans; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + +import com.dyuproject.protostuff.GraphIOUtil; +import com.dyuproject.protostuff.Input; +import com.dyuproject.protostuff.Message; +import com.dyuproject.protostuff.Output; +import com.dyuproject.protostuff.Schema; + +public final class WorkQueueStatus implements Externalizable, Message<WorkQueueStatus>, Schema<WorkQueueStatus> +{ + + public static Schema<WorkQueueStatus> getSchema() + { + return DEFAULT_INSTANCE; + } + + public static WorkQueueStatus getDefaultInstance() + { + return DEFAULT_INSTANCE; + } + + static final WorkQueueStatus DEFAULT_INSTANCE = new WorkQueueStatus(); + + + private DrillbitEndpoint endpoint; + private int queueLength; + private long reportTime; + + public WorkQueueStatus() + { + + } + + // getters and setters + + // endpoint + + public DrillbitEndpoint getEndpoint() + { + return endpoint; + } + + public WorkQueueStatus setEndpoint(DrillbitEndpoint endpoint) + { + this.endpoint = endpoint; + return this; + } + + // queueLength + + public int getQueueLength() + { + return queueLength; + } + + public WorkQueueStatus setQueueLength(int queueLength) + { + this.queueLength = queueLength; + return this; + } + + // reportTime + + public long getReportTime() + { + return reportTime; + } + + public WorkQueueStatus setReportTime(long reportTime) + { + this.reportTime = reportTime; + return this; + } + + // java serialization + + public void readExternal(ObjectInput in) throws IOException + { + GraphIOUtil.mergeDelimitedFrom(in, this, this); + } + + public void writeExternal(ObjectOutput out) throws IOException + { + GraphIOUtil.writeDelimitedTo(out, this, this); + } + + // message method + + public Schema<WorkQueueStatus> cachedSchema() + { + return DEFAULT_INSTANCE; + } + + // schema methods + + public WorkQueueStatus newMessage() + { + return new WorkQueueStatus(); + } + + public Class<WorkQueueStatus> typeClass() + { + return WorkQueueStatus.class; + } + + public String messageName() + { + return WorkQueueStatus.class.getSimpleName(); + } + + public String messageFullName() + { + return WorkQueueStatus.class.getName(); + } + + public boolean isInitialized(WorkQueueStatus message) + { + return true; + } + + public void mergeFrom(Input input, WorkQueueStatus message) throws IOException + { + for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this)) + { + switch(number) + { + case 0: + return; + case 1: + message.endpoint = input.mergeObject(message.endpoint, DrillbitEndpoint.getSchema()); + break; + + case 2: + message.queueLength = input.readInt32(); + break; + case 3: + message.reportTime = input.readInt64(); + break; + default: + input.handleUnknownField(number, this); + } + } + } + + + public void writeTo(Output output, WorkQueueStatus message) throws IOException + { + if(message.endpoint != null) + output.writeObject(1, message.endpoint, DrillbitEndpoint.getSchema(), false); + + + if(message.queueLength != 0) + output.writeInt32(2, message.queueLength, false); + + if(message.reportTime != 0) + output.writeInt64(3, message.reportTime, false); + } + + public String getFieldName(int number) + { + switch(number) + { + case 1: return "endpoint"; + case 2: return "queueLength"; + case 3: return "reportTime"; + default: return null; + } + } + + public int getFieldNumber(String name) + { + final Integer number = __fieldMap.get(name); + return number == null ? 0 : number.intValue(); + } + + private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>(); + static + { + __fieldMap.put("endpoint", 1); + __fieldMap.put("queueLength", 2); + __fieldMap.put("reportTime", 3); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/872d0abf/protocol/src/main/protobuf/BitControl.proto ---------------------------------------------------------------------- diff --git a/protocol/src/main/protobuf/BitControl.proto b/protocol/src/main/protobuf/BitControl.proto index 386f692..43037b9 100644 --- a/protocol/src/main/protobuf/BitControl.proto +++ b/protocol/src/main/protobuf/BitControl.proto @@ -55,7 +55,7 @@ message PlanFragment { optional bool leaf_fragment = 9; optional DrillbitEndpoint foreman = 11; optional int64 mem_initial = 12 [default = 20000000]; // 20 megs - optional int64 mem_max = 13 [default = 20000000000]; // 20 gigs + optional int64 mem_max = 13 [default = 2000000000]; // 20 gigs optional int64 query_start_time = 14; // start time of query in milliseconds optional exec.shared.UserCredentials credentials = 15; optional int32 time_zone = 16; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/872d0abf/protocol/src/main/protobuf/ExecutionProtos.proto ---------------------------------------------------------------------- diff --git a/protocol/src/main/protobuf/ExecutionProtos.proto b/protocol/src/main/protobuf/ExecutionProtos.proto index 8ad8c47..f7062c2 100644 --- a/protocol/src/main/protobuf/ExecutionProtos.proto +++ b/protocol/src/main/protobuf/ExecutionProtos.proto @@ -13,3 +13,9 @@ message FragmentHandle { optional int32 minor_fragment_id = 3; } +message ViewPointer { + optional string name = 1; + optional string path = 2; +} + + http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/872d0abf/protocol/src/main/protobuf/UserBitShared.proto ---------------------------------------------------------------------- diff --git a/protocol/src/main/protobuf/UserBitShared.proto b/protocol/src/main/protobuf/UserBitShared.proto index 9a3dd2a..a13587a 100644 --- a/protocol/src/main/protobuf/UserBitShared.proto +++ b/protocol/src/main/protobuf/UserBitShared.proto @@ -47,7 +47,7 @@ message ParsingError{ message RecordBatchDef { optional int32 record_count = 1; repeated SerializedField field = 2; - optional bool is_selection_vector_2 = 3; + optional bool carries_two_byte_selection_vector = 3; } message NamePart{
