Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 D1DEE11087 for ; Fri, 2 May 2014 23:13:10 +0000 (UTC) Received: (qmail 19667 invoked by uid 500); 2 May 2014 23:13:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19479 invoked by uid 500); 2 May 2014 23:12:55 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 19054 invoked by uid 99); 2 May 2014 23:12:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2014 23:12:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AA0A182A93E; Fri, 2 May 2014 23:12:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 02 May 2014 23:12:54 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/16] ACCUMULO-2773 Regenerate sources for Thrift 0.9.1 http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java index 9b82965..0cf5f15 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java index 94843c0..bd37d3e 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class MasterMonitorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class MasterMonitorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MasterMonitorInfo"); private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("tableMap", org.apache.thrift.protocol.TType.MAP, (short)1); @@ -232,7 +234,7 @@ import org.slf4j.LoggerFactory; public MasterMonitorInfo(MasterMonitorInfo other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTableMap()) { - Map __this__tableMap = new HashMap(); + Map __this__tableMap = new HashMap(other.tableMap.size()); for (Map.Entry other_element : other.tableMap.entrySet()) { String other_element_key = other_element.getKey(); @@ -247,25 +249,14 @@ import org.slf4j.LoggerFactory; this.tableMap = __this__tableMap; } if (other.isSetTServerInfo()) { - List __this__tServerInfo = new ArrayList(); + List __this__tServerInfo = new ArrayList(other.tServerInfo.size()); for (TabletServerStatus other_element : other.tServerInfo) { __this__tServerInfo.add(new TabletServerStatus(other_element)); } this.tServerInfo = __this__tServerInfo; } if (other.isSetBadTServers()) { - Map __this__badTServers = new HashMap(); - for (Map.Entry other_element : other.badTServers.entrySet()) { - - String other_element_key = other_element.getKey(); - Byte other_element_value = other_element.getValue(); - - String __this__badTServers_copy_key = other_element_key; - - Byte __this__badTServers_copy_value = other_element_value; - - __this__badTServers.put(__this__badTServers_copy_key, __this__badTServers_copy_value); - } + Map __this__badTServers = new HashMap(other.badTServers); this.badTServers = __this__badTServers; } if (other.isSetState()) { @@ -276,14 +267,11 @@ import org.slf4j.LoggerFactory; } this.unassignedTablets = other.unassignedTablets; if (other.isSetServersShuttingDown()) { - Set __this__serversShuttingDown = new HashSet(); - for (String other_element : other.serversShuttingDown) { - __this__serversShuttingDown.add(other_element); - } + Set __this__serversShuttingDown = new HashSet(other.serversShuttingDown); this.serversShuttingDown = __this__serversShuttingDown; } if (other.isSetDeadTabletServers()) { - List __this__deadTabletServers = new ArrayList(); + List __this__deadTabletServers = new ArrayList(other.deadTabletServers.size()); for (DeadServer other_element : other.deadTabletServers) { __this__deadTabletServers.add(new DeadServer(other_element)); } @@ -801,90 +789,90 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(MasterMonitorInfo other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - MasterMonitorInfo typedOther = (MasterMonitorInfo)other; - lastComparison = Boolean.valueOf(isSetTableMap()).compareTo(typedOther.isSetTableMap()); + lastComparison = Boolean.valueOf(isSetTableMap()).compareTo(other.isSetTableMap()); if (lastComparison != 0) { return lastComparison; } if (isSetTableMap()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableMap, typedOther.tableMap); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableMap, other.tableMap); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTServerInfo()).compareTo(typedOther.isSetTServerInfo()); + lastComparison = Boolean.valueOf(isSetTServerInfo()).compareTo(other.isSetTServerInfo()); if (lastComparison != 0) { return lastComparison; } if (isSetTServerInfo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tServerInfo, typedOther.tServerInfo); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tServerInfo, other.tServerInfo); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetBadTServers()).compareTo(typedOther.isSetBadTServers()); + lastComparison = Boolean.valueOf(isSetBadTServers()).compareTo(other.isSetBadTServers()); if (lastComparison != 0) { return lastComparison; } if (isSetBadTServers()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.badTServers, typedOther.badTServers); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.badTServers, other.badTServers); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetState()).compareTo(typedOther.isSetState()); + lastComparison = Boolean.valueOf(isSetState()).compareTo(other.isSetState()); if (lastComparison != 0) { return lastComparison; } if (isSetState()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, typedOther.state); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, other.state); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetGoalState()).compareTo(typedOther.isSetGoalState()); + lastComparison = Boolean.valueOf(isSetGoalState()).compareTo(other.isSetGoalState()); if (lastComparison != 0) { return lastComparison; } if (isSetGoalState()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.goalState, typedOther.goalState); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.goalState, other.goalState); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUnassignedTablets()).compareTo(typedOther.isSetUnassignedTablets()); + lastComparison = Boolean.valueOf(isSetUnassignedTablets()).compareTo(other.isSetUnassignedTablets()); if (lastComparison != 0) { return lastComparison; } if (isSetUnassignedTablets()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unassignedTablets, typedOther.unassignedTablets); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unassignedTablets, other.unassignedTablets); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServersShuttingDown()).compareTo(typedOther.isSetServersShuttingDown()); + lastComparison = Boolean.valueOf(isSetServersShuttingDown()).compareTo(other.isSetServersShuttingDown()); if (lastComparison != 0) { return lastComparison; } if (isSetServersShuttingDown()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serversShuttingDown, typedOther.serversShuttingDown); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serversShuttingDown, other.serversShuttingDown); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDeadTabletServers()).compareTo(typedOther.isSetDeadTabletServers()); + lastComparison = Boolean.valueOf(isSetDeadTabletServers()).compareTo(other.isSetDeadTabletServers()); if (lastComparison != 0) { return lastComparison; } if (isSetDeadTabletServers()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deadTabletServers, typedOther.deadTabletServers); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deadTabletServers, other.deadTabletServers); if (lastComparison != 0) { return lastComparison; } @@ -1020,8 +1008,8 @@ import org.slf4j.LoggerFactory; struct.tableMap = new HashMap(2*_map18.size); for (int _i19 = 0; _i19 < _map18.size; ++_i19) { - String _key20; // required - TableInfo _val21; // required + String _key20; + TableInfo _val21; _key20 = iprot.readString(); _val21 = new TableInfo(); _val21.read(iprot); @@ -1041,7 +1029,7 @@ import org.slf4j.LoggerFactory; struct.tServerInfo = new ArrayList(_list22.size); for (int _i23 = 0; _i23 < _list22.size; ++_i23) { - TabletServerStatus _elem24; // required + TabletServerStatus _elem24; _elem24 = new TabletServerStatus(); _elem24.read(iprot); struct.tServerInfo.add(_elem24); @@ -1060,8 +1048,8 @@ import org.slf4j.LoggerFactory; struct.badTServers = new HashMap(2*_map25.size); for (int _i26 = 0; _i26 < _map25.size; ++_i26) { - String _key27; // required - byte _val28; // required + String _key27; + byte _val28; _key27 = iprot.readString(); _val28 = iprot.readByte(); struct.badTServers.put(_key27, _val28); @@ -1104,7 +1092,7 @@ import org.slf4j.LoggerFactory; struct.serversShuttingDown = new HashSet(2*_set29.size); for (int _i30 = 0; _i30 < _set29.size; ++_i30) { - String _elem31; // required + String _elem31; _elem31 = iprot.readString(); struct.serversShuttingDown.add(_elem31); } @@ -1122,7 +1110,7 @@ import org.slf4j.LoggerFactory; struct.deadTabletServers = new ArrayList(_list32.size); for (int _i33 = 0; _i33 < _list32.size; ++_i33) { - DeadServer _elem34; // required + DeadServer _elem34; _elem34 = new DeadServer(); _elem34.read(iprot); struct.deadTabletServers.add(_elem34); @@ -1335,8 +1323,8 @@ import org.slf4j.LoggerFactory; struct.tableMap = new HashMap(2*_map45.size); for (int _i46 = 0; _i46 < _map45.size; ++_i46) { - String _key47; // required - TableInfo _val48; // required + String _key47; + TableInfo _val48; _key47 = iprot.readString(); _val48 = new TableInfo(); _val48.read(iprot); @@ -1351,7 +1339,7 @@ import org.slf4j.LoggerFactory; struct.tServerInfo = new ArrayList(_list49.size); for (int _i50 = 0; _i50 < _list49.size; ++_i50) { - TabletServerStatus _elem51; // required + TabletServerStatus _elem51; _elem51 = new TabletServerStatus(); _elem51.read(iprot); struct.tServerInfo.add(_elem51); @@ -1365,8 +1353,8 @@ import org.slf4j.LoggerFactory; struct.badTServers = new HashMap(2*_map52.size); for (int _i53 = 0; _i53 < _map52.size; ++_i53) { - String _key54; // required - byte _val55; // required + String _key54; + byte _val55; _key54 = iprot.readString(); _val55 = iprot.readByte(); struct.badTServers.put(_key54, _val55); @@ -1392,7 +1380,7 @@ import org.slf4j.LoggerFactory; struct.serversShuttingDown = new HashSet(2*_set56.size); for (int _i57 = 0; _i57 < _set56.size; ++_i57) { - String _elem58; // required + String _elem58; _elem58 = iprot.readString(); struct.serversShuttingDown.add(_elem58); } @@ -1405,7 +1393,7 @@ import org.slf4j.LoggerFactory; struct.deadTabletServers = new ArrayList(_list59.size); for (int _i60 = 0; _i60 < _list59.size; ++_i60) { - DeadServer _elem61; // required + DeadServer _elem61; _elem61 = new DeadServer(); _elem61.read(iprot); struct.deadTabletServers.add(_elem61); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java index e6c33ca..f479fb5 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java index 3a5a57e..afb7422 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class RecoveryException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class RecoveryException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RecoveryException"); private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -244,20 +246,20 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(RecoveryException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - RecoveryException typedOther = (RecoveryException)other; - lastComparison = Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy()); + lastComparison = Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy()); if (lastComparison != 0) { return lastComparison; } if (isSetWhy()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, typedOther.why); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java index 7c3a331..0d14d31 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class RecoveryStatus implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class RecoveryStatus implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RecoveryStatus"); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2); @@ -364,40 +366,40 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(RecoveryStatus other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - RecoveryStatus typedOther = (RecoveryStatus)other; - lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName()); + lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); if (lastComparison != 0) { return lastComparison; } if (isSetName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRuntime()).compareTo(typedOther.isSetRuntime()); + lastComparison = Boolean.valueOf(isSetRuntime()).compareTo(other.isSetRuntime()); if (lastComparison != 0) { return lastComparison; } if (isSetRuntime()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.runtime, typedOther.runtime); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.runtime, other.runtime); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetProgress()).compareTo(typedOther.isSetProgress()); + lastComparison = Boolean.valueOf(isSetProgress()).compareTo(other.isSetProgress()); if (lastComparison != 0) { return lastComparison; } if (isSetProgress()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.progress, typedOther.progress); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.progress, other.progress); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java index 1cdea9a..a40df23 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class TableInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TableInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableInfo"); private static final org.apache.thrift.protocol.TField RECS_FIELD_DESC = new org.apache.thrift.protocol.TField("recs", org.apache.thrift.protocol.TType.I64, (short)1); @@ -895,130 +897,130 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TableInfo other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TableInfo typedOther = (TableInfo)other; - lastComparison = Boolean.valueOf(isSetRecs()).compareTo(typedOther.isSetRecs()); + lastComparison = Boolean.valueOf(isSetRecs()).compareTo(other.isSetRecs()); if (lastComparison != 0) { return lastComparison; } if (isSetRecs()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.recs, typedOther.recs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.recs, other.recs); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRecsInMemory()).compareTo(typedOther.isSetRecsInMemory()); + lastComparison = Boolean.valueOf(isSetRecsInMemory()).compareTo(other.isSetRecsInMemory()); if (lastComparison != 0) { return lastComparison; } if (isSetRecsInMemory()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.recsInMemory, typedOther.recsInMemory); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.recsInMemory, other.recsInMemory); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTablets()).compareTo(typedOther.isSetTablets()); + lastComparison = Boolean.valueOf(isSetTablets()).compareTo(other.isSetTablets()); if (lastComparison != 0) { return lastComparison; } if (isSetTablets()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tablets, typedOther.tablets); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tablets, other.tablets); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOnlineTablets()).compareTo(typedOther.isSetOnlineTablets()); + lastComparison = Boolean.valueOf(isSetOnlineTablets()).compareTo(other.isSetOnlineTablets()); if (lastComparison != 0) { return lastComparison; } if (isSetOnlineTablets()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.onlineTablets, typedOther.onlineTablets); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.onlineTablets, other.onlineTablets); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIngestRate()).compareTo(typedOther.isSetIngestRate()); + lastComparison = Boolean.valueOf(isSetIngestRate()).compareTo(other.isSetIngestRate()); if (lastComparison != 0) { return lastComparison; } if (isSetIngestRate()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ingestRate, typedOther.ingestRate); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ingestRate, other.ingestRate); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIngestByteRate()).compareTo(typedOther.isSetIngestByteRate()); + lastComparison = Boolean.valueOf(isSetIngestByteRate()).compareTo(other.isSetIngestByteRate()); if (lastComparison != 0) { return lastComparison; } if (isSetIngestByteRate()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ingestByteRate, typedOther.ingestByteRate); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ingestByteRate, other.ingestByteRate); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetQueryRate()).compareTo(typedOther.isSetQueryRate()); + lastComparison = Boolean.valueOf(isSetQueryRate()).compareTo(other.isSetQueryRate()); if (lastComparison != 0) { return lastComparison; } if (isSetQueryRate()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryRate, typedOther.queryRate); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryRate, other.queryRate); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetQueryByteRate()).compareTo(typedOther.isSetQueryByteRate()); + lastComparison = Boolean.valueOf(isSetQueryByteRate()).compareTo(other.isSetQueryByteRate()); if (lastComparison != 0) { return lastComparison; } if (isSetQueryByteRate()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryByteRate, typedOther.queryByteRate); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryByteRate, other.queryByteRate); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMinors()).compareTo(typedOther.isSetMinors()); + lastComparison = Boolean.valueOf(isSetMinors()).compareTo(other.isSetMinors()); if (lastComparison != 0) { return lastComparison; } if (isSetMinors()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minors, typedOther.minors); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minors, other.minors); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMajors()).compareTo(typedOther.isSetMajors()); + lastComparison = Boolean.valueOf(isSetMajors()).compareTo(other.isSetMajors()); if (lastComparison != 0) { return lastComparison; } if (isSetMajors()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.majors, typedOther.majors); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.majors, other.majors); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetScans()).compareTo(typedOther.isSetScans()); + lastComparison = Boolean.valueOf(isSetScans()).compareTo(other.isSetScans()); if (lastComparison != 0) { return lastComparison; } if (isSetScans()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scans, typedOther.scans); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scans, other.scans); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetScanRate()).compareTo(typedOther.isSetScanRate()); + lastComparison = Boolean.valueOf(isSetScanRate()).compareTo(other.isSetScanRate()); if (lastComparison != 0) { return lastComparison; } if (isSetScanRate()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scanRate, typedOther.scanRate); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scanRate, other.scanRate); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java index 27288e5..f951c72 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java index a7e29d6..6348537 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class TabletServerStatus implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TabletServerStatus implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletServerStatus"); private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("tableMap", org.apache.thrift.protocol.TType.MAP, (short)1); @@ -253,7 +255,7 @@ import org.slf4j.LoggerFactory; public TabletServerStatus(TabletServerStatus other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTableMap()) { - Map __this__tableMap = new HashMap(); + Map __this__tableMap = new HashMap(other.tableMap.size()); for (Map.Entry other_element : other.tableMap.entrySet()) { String other_element_key = other_element.getKey(); @@ -279,7 +281,7 @@ import org.slf4j.LoggerFactory; this.dataCacheHits = other.dataCacheHits; this.dataCacheRequest = other.dataCacheRequest; if (other.isSetLogSorts()) { - List __this__logSorts = new ArrayList(); + List __this__logSorts = new ArrayList(other.logSorts.size()); for (RecoveryStatus other_element : other.logSorts) { __this__logSorts.add(new RecoveryStatus(other_element)); } @@ -881,120 +883,120 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TabletServerStatus other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TabletServerStatus typedOther = (TabletServerStatus)other; - lastComparison = Boolean.valueOf(isSetTableMap()).compareTo(typedOther.isSetTableMap()); + lastComparison = Boolean.valueOf(isSetTableMap()).compareTo(other.isSetTableMap()); if (lastComparison != 0) { return lastComparison; } if (isSetTableMap()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableMap, typedOther.tableMap); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableMap, other.tableMap); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLastContact()).compareTo(typedOther.isSetLastContact()); + lastComparison = Boolean.valueOf(isSetLastContact()).compareTo(other.isSetLastContact()); if (lastComparison != 0) { return lastComparison; } if (isSetLastContact()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastContact, typedOther.lastContact); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastContact, other.lastContact); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName()); + lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); if (lastComparison != 0) { return lastComparison; } if (isSetName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOsLoad()).compareTo(typedOther.isSetOsLoad()); + lastComparison = Boolean.valueOf(isSetOsLoad()).compareTo(other.isSetOsLoad()); if (lastComparison != 0) { return lastComparison; } if (isSetOsLoad()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.osLoad, typedOther.osLoad); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.osLoad, other.osLoad); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetHoldTime()).compareTo(typedOther.isSetHoldTime()); + lastComparison = Boolean.valueOf(isSetHoldTime()).compareTo(other.isSetHoldTime()); if (lastComparison != 0) { return lastComparison; } if (isSetHoldTime()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.holdTime, typedOther.holdTime); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.holdTime, other.holdTime); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLookups()).compareTo(typedOther.isSetLookups()); + lastComparison = Boolean.valueOf(isSetLookups()).compareTo(other.isSetLookups()); if (lastComparison != 0) { return lastComparison; } if (isSetLookups()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lookups, typedOther.lookups); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lookups, other.lookups); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIndexCacheHits()).compareTo(typedOther.isSetIndexCacheHits()); + lastComparison = Boolean.valueOf(isSetIndexCacheHits()).compareTo(other.isSetIndexCacheHits()); if (lastComparison != 0) { return lastComparison; } if (isSetIndexCacheHits()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.indexCacheHits, typedOther.indexCacheHits); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.indexCacheHits, other.indexCacheHits); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIndexCacheRequest()).compareTo(typedOther.isSetIndexCacheRequest()); + lastComparison = Boolean.valueOf(isSetIndexCacheRequest()).compareTo(other.isSetIndexCacheRequest()); if (lastComparison != 0) { return lastComparison; } if (isSetIndexCacheRequest()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.indexCacheRequest, typedOther.indexCacheRequest); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.indexCacheRequest, other.indexCacheRequest); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDataCacheHits()).compareTo(typedOther.isSetDataCacheHits()); + lastComparison = Boolean.valueOf(isSetDataCacheHits()).compareTo(other.isSetDataCacheHits()); if (lastComparison != 0) { return lastComparison; } if (isSetDataCacheHits()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataCacheHits, typedOther.dataCacheHits); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataCacheHits, other.dataCacheHits); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDataCacheRequest()).compareTo(typedOther.isSetDataCacheRequest()); + lastComparison = Boolean.valueOf(isSetDataCacheRequest()).compareTo(other.isSetDataCacheRequest()); if (lastComparison != 0) { return lastComparison; } if (isSetDataCacheRequest()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataCacheRequest, typedOther.dataCacheRequest); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataCacheRequest, other.dataCacheRequest); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLogSorts()).compareTo(typedOther.isSetLogSorts()); + lastComparison = Boolean.valueOf(isSetLogSorts()).compareTo(other.isSetLogSorts()); if (lastComparison != 0) { return lastComparison; } if (isSetLogSorts()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.logSorts, typedOther.logSorts); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.logSorts, other.logSorts); if (lastComparison != 0) { return lastComparison; } @@ -1126,8 +1128,8 @@ import org.slf4j.LoggerFactory; struct.tableMap = new HashMap(2*_map0.size); for (int _i1 = 0; _i1 < _map0.size; ++_i1) { - String _key2; // required - TableInfo _val3; // required + String _key2; + TableInfo _val3; _key2 = iprot.readString(); _val3 = new TableInfo(); _val3.read(iprot); @@ -1219,7 +1221,7 @@ import org.slf4j.LoggerFactory; struct.logSorts = new ArrayList(_list4.size); for (int _i5 = 0; _i5 < _list4.size; ++_i5) { - RecoveryStatus _elem6; // required + RecoveryStatus _elem6; _elem6 = new RecoveryStatus(); _elem6.read(iprot); struct.logSorts.add(_elem6); @@ -1410,8 +1412,8 @@ import org.slf4j.LoggerFactory; struct.tableMap = new HashMap(2*_map11.size); for (int _i12 = 0; _i12 < _map11.size; ++_i12) { - String _key13; // required - TableInfo _val14; // required + String _key13; + TableInfo _val14; _key13 = iprot.readString(); _val14 = new TableInfo(); _val14.read(iprot); @@ -1462,7 +1464,7 @@ import org.slf4j.LoggerFactory; struct.logSorts = new ArrayList(_list15.size); for (int _i16 = 0; _i16 < _list15.size; ++_i16) { - RecoveryStatus _elem17; // required + RecoveryStatus _elem17; _elem17 = new RecoveryStatus(); _elem17.read(iprot); struct.logSorts.add(_elem17); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java index 6102792..2eb671c 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class TabletSplit implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TabletSplit implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletSplit"); private static final org.apache.thrift.protocol.TField OLD_TABLET_FIELD_DESC = new org.apache.thrift.protocol.TField("oldTablet", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -155,7 +157,7 @@ import org.slf4j.LoggerFactory; this.oldTablet = new org.apache.accumulo.core.data.thrift.TKeyExtent(other.oldTablet); } if (other.isSetNewTablets()) { - List __this__newTablets = new ArrayList(); + List __this__newTablets = new ArrayList(other.newTablets.size()); for (org.apache.accumulo.core.data.thrift.TKeyExtent other_element : other.newTablets) { __this__newTablets.add(new org.apache.accumulo.core.data.thrift.TKeyExtent(other_element)); } @@ -323,30 +325,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TabletSplit other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TabletSplit typedOther = (TabletSplit)other; - lastComparison = Boolean.valueOf(isSetOldTablet()).compareTo(typedOther.isSetOldTablet()); + lastComparison = Boolean.valueOf(isSetOldTablet()).compareTo(other.isSetOldTablet()); if (lastComparison != 0) { return lastComparison; } if (isSetOldTablet()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.oldTablet, typedOther.oldTablet); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.oldTablet, other.oldTablet); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetNewTablets()).compareTo(typedOther.isSetNewTablets()); + lastComparison = Boolean.valueOf(isSetNewTablets()).compareTo(other.isSetNewTablets()); if (lastComparison != 0) { return lastComparison; } if (isSetNewTablets()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.newTablets, typedOther.newTablets); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.newTablets, other.newTablets); if (lastComparison != 0) { return lastComparison; } @@ -448,7 +450,7 @@ import org.slf4j.LoggerFactory; struct.newTablets = new ArrayList(_list62.size); for (int _i63 = 0; _i63 < _list62.size; ++_i63) { - org.apache.accumulo.core.data.thrift.TKeyExtent _elem64; // required + org.apache.accumulo.core.data.thrift.TKeyExtent _elem64; _elem64 = new org.apache.accumulo.core.data.thrift.TKeyExtent(); _elem64.read(iprot); struct.newTablets.add(_elem64); @@ -546,7 +548,7 @@ import org.slf4j.LoggerFactory; struct.newTablets = new ArrayList(_list67.size); for (int _i68 = 0; _i68 < _list67.size; ++_i68) { - org.apache.accumulo.core.data.thrift.TKeyExtent _elem69; // required + org.apache.accumulo.core.data.thrift.TKeyExtent _elem69; _elem69 = new org.apache.accumulo.core.data.thrift.TKeyExtent(); _elem69.read(iprot); struct.newTablets.add(_elem69); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java index cdef4ca..8d3a3e2 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java +++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class TCredentials implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TCredentials implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCredentials"); private static final org.apache.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.thrift.protocol.TField("principal", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -432,50 +434,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TCredentials other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TCredentials typedOther = (TCredentials)other; - lastComparison = Boolean.valueOf(isSetPrincipal()).compareTo(typedOther.isSetPrincipal()); + lastComparison = Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal()); if (lastComparison != 0) { return lastComparison; } if (isSetPrincipal()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal, typedOther.principal); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal, other.principal); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTokenClassName()).compareTo(typedOther.isSetTokenClassName()); + lastComparison = Boolean.valueOf(isSetTokenClassName()).compareTo(other.isSetTokenClassName()); if (lastComparison != 0) { return lastComparison; } if (isSetTokenClassName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tokenClassName, typedOther.tokenClassName); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tokenClassName, other.tokenClassName); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } if (isSetToken()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetInstanceId()).compareTo(typedOther.isSetInstanceId()); + lastComparison = Boolean.valueOf(isSetInstanceId()).compareTo(other.isSetInstanceId()); if (lastComparison != 0) { return lastComparison; } if (isSetInstanceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.instanceId, typedOther.instanceId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.instanceId, other.instanceId); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java index 50c325e..0cb5c08 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class ActionStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ActionStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActionStats"); private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.I32, (short)1); @@ -659,90 +661,90 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ActionStats other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ActionStats typedOther = (ActionStats)other; - lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus()); + lastComparison = Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus()); if (lastComparison != 0) { return lastComparison; } if (isSetStatus()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetElapsed()).compareTo(typedOther.isSetElapsed()); + lastComparison = Boolean.valueOf(isSetElapsed()).compareTo(other.isSetElapsed()); if (lastComparison != 0) { return lastComparison; } if (isSetElapsed()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.elapsed, typedOther.elapsed); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.elapsed, other.elapsed); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetNum()).compareTo(typedOther.isSetNum()); + lastComparison = Boolean.valueOf(isSetNum()).compareTo(other.isSetNum()); if (lastComparison != 0) { return lastComparison; } if (isSetNum()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num, typedOther.num); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num, other.num); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount()); + lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount()); if (lastComparison != 0) { return lastComparison; } if (isSetCount()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSumDev()).compareTo(typedOther.isSetSumDev()); + lastComparison = Boolean.valueOf(isSetSumDev()).compareTo(other.isSetSumDev()); if (lastComparison != 0) { return lastComparison; } if (isSetSumDev()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sumDev, typedOther.sumDev); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sumDev, other.sumDev); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFail()).compareTo(typedOther.isSetFail()); + lastComparison = Boolean.valueOf(isSetFail()).compareTo(other.isSetFail()); if (lastComparison != 0) { return lastComparison; } if (isSetFail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fail, typedOther.fail); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fail, other.fail); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetQueueTime()).compareTo(typedOther.isSetQueueTime()); + lastComparison = Boolean.valueOf(isSetQueueTime()).compareTo(other.isSetQueueTime()); if (lastComparison != 0) { return lastComparison; } if (isSetQueueTime()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queueTime, typedOther.queueTime); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queueTime, other.queueTime); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetQueueSumDev()).compareTo(typedOther.isSetQueueSumDev()); + lastComparison = Boolean.valueOf(isSetQueueSumDev()).compareTo(other.isSetQueueSumDev()); if (lastComparison != 0) { return lastComparison; } if (isSetQueueSumDev()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queueSumDev, typedOther.queueSumDev); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queueSumDev, other.queueSumDev); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java index 2509bd9..c2eddd1 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -46,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class ActiveCompaction implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ActiveCompaction implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveCompaction"); private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -266,10 +268,7 @@ import org.slf4j.LoggerFactory; } this.age = other.age; if (other.isSetInputFiles()) { - List __this__inputFiles = new ArrayList(); - for (String other_element : other.inputFiles) { - __this__inputFiles.add(other_element); - } + List __this__inputFiles = new ArrayList(other.inputFiles); this.inputFiles = __this__inputFiles; } if (other.isSetOutputFile()) { @@ -287,14 +286,14 @@ import org.slf4j.LoggerFactory; this.entriesRead = other.entriesRead; this.entriesWritten = other.entriesWritten; if (other.isSetSsiList()) { - List __this__ssiList = new ArrayList(); + List __this__ssiList = new ArrayList(other.ssiList.size()); for (org.apache.accumulo.core.data.thrift.IterInfo other_element : other.ssiList) { __this__ssiList.add(new org.apache.accumulo.core.data.thrift.IterInfo(other_element)); } this.ssiList = __this__ssiList; } if (other.isSetSsio()) { - Map> __this__ssio = new HashMap>(); + Map> __this__ssio = new HashMap>(other.ssio.size()); for (Map.Entry> other_element : other.ssio.entrySet()) { String other_element_key = other_element.getKey(); @@ -302,18 +301,7 @@ import org.slf4j.LoggerFactory; String __this__ssio_copy_key = other_element_key; - Map __this__ssio_copy_value = new HashMap(); - for (Map.Entry other_element_value_element : other_element_value.entrySet()) { - - String other_element_value_element_key = other_element_value_element.getKey(); - String other_element_value_element_value = other_element_value_element.getValue(); - - String __this__ssio_copy_value_copy_key = other_element_value_element_key; - - String __this__ssio_copy_value_copy_value = other_element_value_element_value; - - __this__ssio_copy_value.put(__this__ssio_copy_value_copy_key, __this__ssio_copy_value_copy_value); - } + Map __this__ssio_copy_value = new HashMap(other_element_value); __this__ssio.put(__this__ssio_copy_key, __this__ssio_copy_value); } @@ -946,120 +934,120 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ActiveCompaction other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ActiveCompaction typedOther = (ActiveCompaction)other; - lastComparison = Boolean.valueOf(isSetExtent()).compareTo(typedOther.isSetExtent()); + lastComparison = Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent()); if (lastComparison != 0) { return lastComparison; } if (isSetExtent()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.extent, typedOther.extent); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.extent, other.extent); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAge()).compareTo(typedOther.isSetAge()); + lastComparison = Boolean.valueOf(isSetAge()).compareTo(other.isSetAge()); if (lastComparison != 0) { return lastComparison; } if (isSetAge()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.age, typedOther.age); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.age, other.age); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetInputFiles()).compareTo(typedOther.isSetInputFiles()); + lastComparison = Boolean.valueOf(isSetInputFiles()).compareTo(other.isSetInputFiles()); if (lastComparison != 0) { return lastComparison; } if (isSetInputFiles()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputFiles, typedOther.inputFiles); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputFiles, other.inputFiles); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOutputFile()).compareTo(typedOther.isSetOutputFile()); + lastComparison = Boolean.valueOf(isSetOutputFile()).compareTo(other.isSetOutputFile()); if (lastComparison != 0) { return lastComparison; } if (isSetOutputFile()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.outputFile, typedOther.outputFile); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.outputFile, other.outputFile); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType()); + lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType()); if (lastComparison != 0) { return lastComparison; } if (isSetType()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetReason()).compareTo(typedOther.isSetReason()); + lastComparison = Boolean.valueOf(isSetReason()).compareTo(other.isSetReason()); if (lastComparison != 0) { return lastComparison; } if (isSetReason()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reason, typedOther.reason); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reason, other.reason); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLocalityGroup()).compareTo(typedOther.isSetLocalityGroup()); + lastComparison = Boolean.valueOf(isSetLocalityGroup()).compareTo(other.isSetLocalityGroup()); if (lastComparison != 0) { return lastComparison; } if (isSetLocalityGroup()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.localityGroup, typedOther.localityGroup); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.localityGroup, other.localityGroup); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEntriesRead()).compareTo(typedOther.isSetEntriesRead()); + lastComparison = Boolean.valueOf(isSetEntriesRead()).compareTo(other.isSetEntriesRead()); if (lastComparison != 0) { return lastComparison; } if (isSetEntriesRead()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.entriesRead, typedOther.entriesRead); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.entriesRead, other.entriesRead); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEntriesWritten()).compareTo(typedOther.isSetEntriesWritten()); + lastComparison = Boolean.valueOf(isSetEntriesWritten()).compareTo(other.isSetEntriesWritten()); if (lastComparison != 0) { return lastComparison; } if (isSetEntriesWritten()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.entriesWritten, typedOther.entriesWritten); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.entriesWritten, other.entriesWritten); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSsiList()).compareTo(typedOther.isSetSsiList()); + lastComparison = Boolean.valueOf(isSetSsiList()).compareTo(other.isSetSsiList()); if (lastComparison != 0) { return lastComparison; } if (isSetSsiList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ssiList, typedOther.ssiList); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ssiList, other.ssiList); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSsio()).compareTo(typedOther.isSetSsio()); + lastComparison = Boolean.valueOf(isSetSsio()).compareTo(other.isSetSsio()); if (lastComparison != 0) { return lastComparison; } if (isSetSsio()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ssio, typedOther.ssio); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ssio, other.ssio); if (lastComparison != 0) { return lastComparison; } @@ -1231,7 +1219,7 @@ import org.slf4j.LoggerFactory; struct.inputFiles = new ArrayList(_list52.size); for (int _i53 = 0; _i53 < _list52.size; ++_i53) { - String _elem54; // required + String _elem54; _elem54 = iprot.readString(); struct.inputFiles.add(_elem54); } @@ -1297,7 +1285,7 @@ import org.slf4j.LoggerFactory; struct.ssiList = new ArrayList(_list55.size); for (int _i56 = 0; _i56 < _list55.size; ++_i56) { - org.apache.accumulo.core.data.thrift.IterInfo _elem57; // required + org.apache.accumulo.core.data.thrift.IterInfo _elem57; _elem57 = new org.apache.accumulo.core.data.thrift.IterInfo(); _elem57.read(iprot); struct.ssiList.add(_elem57); @@ -1316,16 +1304,16 @@ import org.slf4j.LoggerFactory; struct.ssio = new HashMap>(2*_map58.size); for (int _i59 = 0; _i59 < _map58.size; ++_i59) { - String _key60; // required - Map _val61; // required + String _key60; + Map _val61; _key60 = iprot.readString(); { org.apache.thrift.protocol.TMap _map62 = iprot.readMapBegin(); _val61 = new HashMap(2*_map62.size); for (int _i63 = 0; _i63 < _map62.size; ++_i63) { - String _key64; // required - String _val65; // required + String _key64; + String _val65; _key64 = iprot.readString(); _val65 = iprot.readString(); _val61.put(_key64, _val65); @@ -1567,7 +1555,7 @@ import org.slf4j.LoggerFactory; struct.inputFiles = new ArrayList(_list74.size); for (int _i75 = 0; _i75 < _list74.size; ++_i75) { - String _elem76; // required + String _elem76; _elem76 = iprot.readString(); struct.inputFiles.add(_elem76); } @@ -1604,7 +1592,7 @@ import org.slf4j.LoggerFactory; struct.ssiList = new ArrayList(_list77.size); for (int _i78 = 0; _i78 < _list77.size; ++_i78) { - org.apache.accumulo.core.data.thrift.IterInfo _elem79; // required + org.apache.accumulo.core.data.thrift.IterInfo _elem79; _elem79 = new org.apache.accumulo.core.data.thrift.IterInfo(); _elem79.read(iprot); struct.ssiList.add(_elem79); @@ -1618,16 +1606,16 @@ import org.slf4j.LoggerFactory; struct.ssio = new HashMap>(2*_map80.size); for (int _i81 = 0; _i81 < _map80.size; ++_i81) { - String _key82; // required - Map _val83; // required + String _key82; + Map _val83; _key82 = iprot.readString(); { org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); _val83 = new HashMap(2*_map84.size); for (int _i85 = 0; _i85 < _map84.size; ++_i85) { - String _key86; // required - String _val87; // required + String _key86; + String _val87; _key86 = iprot.readString(); _val87 = iprot.readString(); _val83.put(_key86, _val87);