Return-Path: X-Original-To: apmail-drill-commits-archive@www.apache.org Delivered-To: apmail-drill-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 554131822C for ; Thu, 18 Jun 2015 22:16:17 +0000 (UTC) Received: (qmail 67773 invoked by uid 500); 18 Jun 2015 22:16:17 -0000 Delivered-To: apmail-drill-commits-archive@drill.apache.org Received: (qmail 67738 invoked by uid 500); 18 Jun 2015 22:16:17 -0000 Mailing-List: contact commits-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@drill.apache.org Delivered-To: mailing list commits@drill.apache.org Received: (qmail 67729 invoked by uid 99); 18 Jun 2015 22:16:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2015 22:16:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1A17BE3CA6; Thu, 18 Jun 2015 22:16:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hg@apache.org To: commits@drill.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: drill git commit: DRILL-2997: (2) re-generate proto files that was missing from earlier DRILL-2997 patch Date: Thu, 18 Jun 2015 22:16:17 +0000 (UTC) Repository: drill Updated Branches: refs/heads/master a027f692b -> 4a7e5ce42 DRILL-2997: (2) re-generate proto files that was missing from earlier DRILL-2997 patch Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/4a7e5ce4 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/4a7e5ce4 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/4a7e5ce4 Branch: refs/heads/master Commit: 4a7e5ce42fb3f4a7614a6ab80fb80363dbd53cc6 Parents: a027f69 Author: Hanifi Gunes Authored: Thu Jun 18 15:19:26 2015 -0700 Committer: Hanifi Gunes Committed: Thu Jun 18 15:19:44 2015 -0700 ---------------------------------------------------------------------- .../drill/exec/proto/SchemaUserBitShared.java | 8 +-- .../apache/drill/exec/proto/UserBitShared.java | 64 +++++--------------- .../drill/exec/proto/beans/SerializedField.java | 8 +-- 3 files changed, 24 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/4a7e5ce4/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java ---------------------------------------------------------------------- diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java index 8c0b66a..58efae3 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java @@ -1091,7 +1091,7 @@ public final class SchemaUserBitShared if(message.hasVarByteLength()) output.writeInt32(5, message.getVarByteLength(), false); if(message.hasBufferLength()) - output.writeInt32(6, message.getBufferLength(), false); + output.writeInt32(7, message.getBufferLength(), false); } public boolean isInitialized(org.apache.drill.exec.proto.UserBitShared.SerializedField message) { @@ -1149,7 +1149,7 @@ public final class SchemaUserBitShared case 5: builder.setVarByteLength(input.readInt32()); break; - case 6: + case 7: builder.setBufferLength(input.readInt32()); break; default: @@ -1197,7 +1197,7 @@ public final class SchemaUserBitShared case 3: return "child"; case 4: return "valueCount"; case 5: return "varByteLength"; - case 6: return "bufferLength"; + case 7: return "bufferLength"; default: return null; } } @@ -1214,7 +1214,7 @@ public final class SchemaUserBitShared fieldMap.put("child", 3); fieldMap.put("valueCount", 4); fieldMap.put("varByteLength", 5); - fieldMap.put("bufferLength", 6); + fieldMap.put("bufferLength", 7); } } http://git-wip-us.apache.org/repos/asf/drill/blob/4a7e5ce4/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 b8acf05..e76d748 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 @@ -8136,21 +8136,13 @@ public final class UserBitShared { */ int getVarByteLength(); - // optional int32 buffer_length = 6; + // optional int32 buffer_length = 7; /** - * optional int32 buffer_length = 6; - * - * 
-     *optional int32 group_count = 6; // number of groups.  (number of repeated records)
-     *
+ * optional int32 buffer_length = 7; */ boolean hasBufferLength(); /** - * optional int32 buffer_length = 6; - * - * 
-     *optional int32 group_count = 6; // number of groups.  (number of repeated records)
-     *
+ * optional int32 buffer_length = 7; */ int getBufferLength(); } @@ -8249,7 +8241,7 @@ public final class UserBitShared { varByteLength_ = input.readInt32(); break; } - case 48: { + case 56: { bitField0_ |= 0x00000010; bufferLength_ = input.readInt32(); break; @@ -8441,25 +8433,17 @@ public final class UserBitShared { return varByteLength_; } - // optional int32 buffer_length = 6; - public static final int BUFFER_LENGTH_FIELD_NUMBER = 6; + // optional int32 buffer_length = 7; + public static final int BUFFER_LENGTH_FIELD_NUMBER = 7; private int bufferLength_; /** - * optional int32 buffer_length = 6; - * - * 
-     *optional int32 group_count = 6; // number of groups.  (number of repeated records)
-     *
+ * optional int32 buffer_length = 7; */ public boolean hasBufferLength() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional int32 buffer_length = 6; - * - * 
-     *optional int32 group_count = 6; // number of groups.  (number of repeated records)
-     *
+ * optional int32 buffer_length = 7; */ public int getBufferLength() { return bufferLength_; @@ -8501,7 +8485,7 @@ public final class UserBitShared { output.writeInt32(5, varByteLength_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeInt32(6, bufferLength_); + output.writeInt32(7, bufferLength_); } getUnknownFields().writeTo(output); } @@ -8534,7 +8518,7 @@ public final class UserBitShared { } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(6, bufferLength_); + .computeInt32Size(7, bufferLength_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -9476,34 +9460,22 @@ public final class UserBitShared { return this; } - // optional int32 buffer_length = 6; + // optional int32 buffer_length = 7; private int bufferLength_ ; /** - * optional int32 buffer_length = 6; - * - * 
-       *optional int32 group_count = 6; // number of groups.  (number of repeated records)
-       *
+ * optional int32 buffer_length = 7; */ public boolean hasBufferLength() { return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional int32 buffer_length = 6; - * - * 
-       *optional int32 group_count = 6; // number of groups.  (number of repeated records)
-       *
+ * optional int32 buffer_length = 7; */ public int getBufferLength() { return bufferLength_; } /** - * optional int32 buffer_length = 6; - * - * 
-       *optional int32 group_count = 6; // number of groups.  (number of repeated records)
-       *
+ * optional int32 buffer_length = 7; */ public Builder setBufferLength(int value) { bitField0_ |= 0x00000020; @@ -9512,11 +9484,7 @@ public final class UserBitShared { return this; } /** - * optional int32 buffer_length = 6; - * - * 
-       *optional int32 group_count = 6; // number of groups.  (number of repeated records)
-       *
+ * optional int32 buffer_length = 7; */ public Builder clearBufferLength() { bitField0_ = (bitField0_ & ~0x00000020); @@ -20818,7 +20786,7 @@ public final class UserBitShared { "\tname_part\030\002 \001(\0132\025.exec.shared.NamePart\022" + "+\n\005child\030\003 \003(\0132\034.exec.shared.SerializedF" + "ield\022\023\n\013value_count\030\004 \001(\005\022\027\n\017var_byte_le" + - "ngth\030\005 \001(\005\022\025\n\rbuffer_length\030\006 \001(\005\"7\n\nNod" + + "ngth\030\005 \001(\005\022\025\n\rbuffer_length\030\007 \001(\005\"7\n\nNod" + "eStatus\022\017\n\007node_id\030\001 \001(\005\022\030\n\020memory_footp" + "rint\030\002 \001(\003\"\206\002\n\013QueryResult\0228\n\013query_stat" + "e\030\001 \001(\0162#.exec.shared.QueryResult.QueryS", http://git-wip-us.apache.org/repos/asf/drill/blob/4a7e5ce4/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java ---------------------------------------------------------------------- diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java index 6d01a69..f496458 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java @@ -215,7 +215,7 @@ public final class SerializedField implements Externalizable, Message