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 8C53711083 for ; Fri, 2 May 2014 23:13:10 +0000 (UTC) Received: (qmail 19392 invoked by uid 500); 2 May 2014 23:12:53 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19262 invoked by uid 500); 2 May 2014 23:12:50 -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 19057 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 C6ADF82A944; 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:57 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/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/data/thrift/TConditionalSession.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java index e7f8a08..646dbdb 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.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 TConditionalSession implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TConditionalSession 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("TConditionalSession"); private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.I64, (short)1); @@ -364,40 +366,40 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TConditionalSession other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TConditionalSession typedOther = (TConditionalSession)other; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId()); + lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTserverLock()).compareTo(typedOther.isSetTserverLock()); + lastComparison = Boolean.valueOf(isSetTserverLock()).compareTo(other.isSetTserverLock()); if (lastComparison != 0) { return lastComparison; } if (isSetTserverLock()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tserverLock, typedOther.tserverLock); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tserverLock, other.tserverLock); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTtl()).compareTo(typedOther.isSetTtl()); + lastComparison = Boolean.valueOf(isSetTtl()).compareTo(other.isSetTtl()); if (lastComparison != 0) { return lastComparison; } if (isSetTtl()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ttl, typedOther.ttl); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ttl, other.ttl); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java index 16c4d2c..d841eff 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.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 TConstraintViolationSummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TConstraintViolationSummary 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("TConstraintViolationSummary"); private static final org.apache.thrift.protocol.TField CONSTRAIN_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("constrainClass", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -423,50 +425,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TConstraintViolationSummary other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TConstraintViolationSummary typedOther = (TConstraintViolationSummary)other; - lastComparison = Boolean.valueOf(isSetConstrainClass()).compareTo(typedOther.isSetConstrainClass()); + lastComparison = Boolean.valueOf(isSetConstrainClass()).compareTo(other.isSetConstrainClass()); if (lastComparison != 0) { return lastComparison; } if (isSetConstrainClass()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.constrainClass, typedOther.constrainClass); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.constrainClass, other.constrainClass); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetViolationCode()).compareTo(typedOther.isSetViolationCode()); + lastComparison = Boolean.valueOf(isSetViolationCode()).compareTo(other.isSetViolationCode()); if (lastComparison != 0) { return lastComparison; } if (isSetViolationCode()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.violationCode, typedOther.violationCode); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.violationCode, other.violationCode); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetViolationDescription()).compareTo(typedOther.isSetViolationDescription()); + lastComparison = Boolean.valueOf(isSetViolationDescription()).compareTo(other.isSetViolationDescription()); if (lastComparison != 0) { return lastComparison; } if (isSetViolationDescription()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.violationDescription, typedOther.violationDescription); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.violationDescription, other.violationDescription); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetNumberOfViolatingMutations()).compareTo(typedOther.isSetNumberOfViolatingMutations()); + lastComparison = Boolean.valueOf(isSetNumberOfViolatingMutations()).compareTo(other.isSetNumberOfViolatingMutations()); if (lastComparison != 0) { return lastComparison; } if (isSetNumberOfViolatingMutations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numberOfViolatingMutations, typedOther.numberOfViolatingMutations); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numberOfViolatingMutations, other.numberOfViolatingMutations); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java index 3ee3cdf..4f05c66 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.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 TKey implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TKey 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("TKey"); private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -526,60 +528,60 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TKey other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TKey typedOther = (TKey)other; - lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); + lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow()); if (lastComparison != 0) { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColFamily()).compareTo(typedOther.isSetColFamily()); + lastComparison = Boolean.valueOf(isSetColFamily()).compareTo(other.isSetColFamily()); if (lastComparison != 0) { return lastComparison; } if (isSetColFamily()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colFamily, typedOther.colFamily); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colFamily, other.colFamily); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColQualifier()).compareTo(typedOther.isSetColQualifier()); + lastComparison = Boolean.valueOf(isSetColQualifier()).compareTo(other.isSetColQualifier()); if (lastComparison != 0) { return lastComparison; } if (isSetColQualifier()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colQualifier, typedOther.colQualifier); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colQualifier, other.colQualifier); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColVisibility()).compareTo(typedOther.isSetColVisibility()); + lastComparison = Boolean.valueOf(isSetColVisibility()).compareTo(other.isSetColVisibility()); if (lastComparison != 0) { return lastComparison; } if (isSetColVisibility()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colVisibility, typedOther.colVisibility); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colVisibility, other.colVisibility); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); + lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp()); if (lastComparison != 0) { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java index 84fd99c..b83fc1a 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.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 TKeyExtent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TKeyExtent 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("TKeyExtent"); private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -395,40 +397,40 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TKeyExtent other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TKeyExtent typedOther = (TKeyExtent)other; - lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable()); + lastComparison = Boolean.valueOf(isSetTable()).compareTo(other.isSetTable()); if (lastComparison != 0) { return lastComparison; } if (isSetTable()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, typedOther.table); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, other.table); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEndRow()).compareTo(typedOther.isSetEndRow()); + lastComparison = Boolean.valueOf(isSetEndRow()).compareTo(other.isSetEndRow()); if (lastComparison != 0) { return lastComparison; } if (isSetEndRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endRow, typedOther.endRow); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endRow, other.endRow); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPrevEndRow()).compareTo(typedOther.isSetPrevEndRow()); + lastComparison = Boolean.valueOf(isSetPrevEndRow()).compareTo(other.isSetPrevEndRow()); if (lastComparison != 0) { return lastComparison; } if (isSetPrevEndRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.prevEndRow, typedOther.prevEndRow); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.prevEndRow, other.prevEndRow); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java index f96faab..4c47c69 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.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 TKeyValue implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TKeyValue 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("TKeyValue"); private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -314,30 +316,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TKeyValue other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TKeyValue typedOther = (TKeyValue)other; - lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey()); + lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey()); if (lastComparison != 0) { return lastComparison; } if (isSetKey()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, typedOther.key); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue()); + lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue()); if (lastComparison != 0) { return lastComparison; } if (isSetValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java index f698892..1e00047 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.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 TMutation implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TMutation 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("TMutation"); private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -182,12 +184,7 @@ import org.slf4j.LoggerFactory; ; } if (other.isSetValues()) { - List __this__values = new ArrayList(); - for (ByteBuffer other_element : other.values) { - ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element); -; - __this__values.add(temp_binary_element); - } + List __this__values = new ArrayList(other.values); this.values = __this__values; } this.entries = other.entries; @@ -467,50 +464,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TMutation other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TMutation typedOther = (TMutation)other; - lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); + lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow()); if (lastComparison != 0) { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetData()).compareTo(typedOther.isSetData()); + lastComparison = Boolean.valueOf(isSetData()).compareTo(other.isSetData()); if (lastComparison != 0) { return lastComparison; } if (isSetData()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, typedOther.data); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, other.data); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetValues()).compareTo(typedOther.isSetValues()); + lastComparison = Boolean.valueOf(isSetValues()).compareTo(other.isSetValues()); if (lastComparison != 0) { return lastComparison; } if (isSetValues()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.values, typedOther.values); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.values, other.values); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEntries()).compareTo(typedOther.isSetEntries()); + lastComparison = Boolean.valueOf(isSetEntries()).compareTo(other.isSetEntries()); if (lastComparison != 0) { return lastComparison; } if (isSetEntries()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.entries, typedOther.entries); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.entries, other.entries); if (lastComparison != 0) { return lastComparison; } @@ -630,7 +627,7 @@ import org.slf4j.LoggerFactory; struct.values = new ArrayList(_list0.size); for (int _i1 = 0; _i1 < _list0.size; ++_i1) { - ByteBuffer _elem2; // required + ByteBuffer _elem2; _elem2 = iprot.readBinary(); struct.values.add(_elem2); } @@ -758,7 +755,7 @@ import org.slf4j.LoggerFactory; struct.values = new ArrayList(_list5.size); for (int _i6 = 0; _i6 < _list5.size; ++_i6) { - ByteBuffer _elem7; // required + ByteBuffer _elem7; _elem7 = iprot.readBinary(); struct.values.add(_elem7); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java index 5b56ca0..58e805f 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.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 TRange implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TRange 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("TRange"); private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -541,70 +543,70 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(TRange other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TRange typedOther = (TRange)other; - lastComparison = Boolean.valueOf(isSetStart()).compareTo(typedOther.isSetStart()); + lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart()); if (lastComparison != 0) { return lastComparison; } if (isSetStart()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, typedOther.start); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, other.start); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStop()).compareTo(typedOther.isSetStop()); + lastComparison = Boolean.valueOf(isSetStop()).compareTo(other.isSetStop()); if (lastComparison != 0) { return lastComparison; } if (isSetStop()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stop, typedOther.stop); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stop, other.stop); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStartKeyInclusive()).compareTo(typedOther.isSetStartKeyInclusive()); + lastComparison = Boolean.valueOf(isSetStartKeyInclusive()).compareTo(other.isSetStartKeyInclusive()); if (lastComparison != 0) { return lastComparison; } if (isSetStartKeyInclusive()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKeyInclusive, typedOther.startKeyInclusive); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKeyInclusive, other.startKeyInclusive); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStopKeyInclusive()).compareTo(typedOther.isSetStopKeyInclusive()); + lastComparison = Boolean.valueOf(isSetStopKeyInclusive()).compareTo(other.isSetStopKeyInclusive()); if (lastComparison != 0) { return lastComparison; } if (isSetStopKeyInclusive()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopKeyInclusive, typedOther.stopKeyInclusive); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopKeyInclusive, other.stopKeyInclusive); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetInfiniteStartKey()).compareTo(typedOther.isSetInfiniteStartKey()); + lastComparison = Boolean.valueOf(isSetInfiniteStartKey()).compareTo(other.isSetInfiniteStartKey()); if (lastComparison != 0) { return lastComparison; } if (isSetInfiniteStartKey()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.infiniteStartKey, typedOther.infiniteStartKey); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.infiniteStartKey, other.infiniteStartKey); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetInfiniteStopKey()).compareTo(typedOther.isSetInfiniteStopKey()); + lastComparison = Boolean.valueOf(isSetInfiniteStopKey()).compareTo(other.isSetInfiniteStopKey()); if (lastComparison != 0) { return lastComparison; } if (isSetInfiniteStopKey()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.infiniteStopKey, typedOther.infiniteStopKey); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.infiniteStopKey, other.infiniteStopKey); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java index 59ce5cb..55a0602 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.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 UpdateErrors implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class UpdateErrors 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("UpdateErrors"); private static final org.apache.thrift.protocol.TField FAILED_EXTENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("failedExtents", org.apache.thrift.protocol.TType.MAP, (short)1); @@ -165,7 +167,7 @@ import org.slf4j.LoggerFactory; */ public UpdateErrors(UpdateErrors other) { if (other.isSetFailedExtents()) { - Map __this__failedExtents = new HashMap(); + Map __this__failedExtents = new HashMap(other.failedExtents.size()); for (Map.Entry other_element : other.failedExtents.entrySet()) { TKeyExtent other_element_key = other_element.getKey(); @@ -180,14 +182,14 @@ import org.slf4j.LoggerFactory; this.failedExtents = __this__failedExtents; } if (other.isSetViolationSummaries()) { - List __this__violationSummaries = new ArrayList(); + List __this__violationSummaries = new ArrayList(other.violationSummaries.size()); for (TConstraintViolationSummary other_element : other.violationSummaries) { __this__violationSummaries.add(new TConstraintViolationSummary(other_element)); } this.violationSummaries = __this__violationSummaries; } if (other.isSetAuthorizationFailures()) { - Map __this__authorizationFailures = new HashMap(); + Map __this__authorizationFailures = new HashMap(other.authorizationFailures.size()); for (Map.Entry other_element : other.authorizationFailures.entrySet()) { TKeyExtent other_element_key = other_element.getKey(); @@ -432,40 +434,40 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(UpdateErrors other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - UpdateErrors typedOther = (UpdateErrors)other; - lastComparison = Boolean.valueOf(isSetFailedExtents()).compareTo(typedOther.isSetFailedExtents()); + lastComparison = Boolean.valueOf(isSetFailedExtents()).compareTo(other.isSetFailedExtents()); if (lastComparison != 0) { return lastComparison; } if (isSetFailedExtents()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failedExtents, typedOther.failedExtents); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failedExtents, other.failedExtents); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetViolationSummaries()).compareTo(typedOther.isSetViolationSummaries()); + lastComparison = Boolean.valueOf(isSetViolationSummaries()).compareTo(other.isSetViolationSummaries()); if (lastComparison != 0) { return lastComparison; } if (isSetViolationSummaries()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.violationSummaries, typedOther.violationSummaries); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.violationSummaries, other.violationSummaries); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthorizationFailures()).compareTo(typedOther.isSetAuthorizationFailures()); + lastComparison = Boolean.valueOf(isSetAuthorizationFailures()).compareTo(other.isSetAuthorizationFailures()); if (lastComparison != 0) { return lastComparison; } if (isSetAuthorizationFailures()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizationFailures, typedOther.authorizationFailures); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizationFailures, other.authorizationFailures); if (lastComparison != 0) { return lastComparison; } @@ -563,8 +565,8 @@ import org.slf4j.LoggerFactory; struct.failedExtents = new HashMap(2*_map50.size); for (int _i51 = 0; _i51 < _map50.size; ++_i51) { - TKeyExtent _key52; // required - long _val53; // required + TKeyExtent _key52; + long _val53; _key52 = new TKeyExtent(); _key52.read(iprot); _val53 = iprot.readI64(); @@ -584,7 +586,7 @@ import org.slf4j.LoggerFactory; struct.violationSummaries = new ArrayList(_list54.size); for (int _i55 = 0; _i55 < _list54.size; ++_i55) { - TConstraintViolationSummary _elem56; // required + TConstraintViolationSummary _elem56; _elem56 = new TConstraintViolationSummary(); _elem56.read(iprot); struct.violationSummaries.add(_elem56); @@ -603,8 +605,8 @@ import org.slf4j.LoggerFactory; struct.authorizationFailures = new HashMap(2*_map57.size); for (int _i58 = 0; _i58 < _map57.size; ++_i58) { - TKeyExtent _key59; // required - org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val60; // required + TKeyExtent _key59; + org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val60; _key59 = new TKeyExtent(); _key59.read(iprot); _val60 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32()); @@ -739,8 +741,8 @@ import org.slf4j.LoggerFactory; struct.failedExtents = new HashMap(2*_map67.size); for (int _i68 = 0; _i68 < _map67.size; ++_i68) { - TKeyExtent _key69; // required - long _val70; // required + TKeyExtent _key69; + long _val70; _key69 = new TKeyExtent(); _key69.read(iprot); _val70 = iprot.readI64(); @@ -755,7 +757,7 @@ import org.slf4j.LoggerFactory; struct.violationSummaries = new ArrayList(_list71.size); for (int _i72 = 0; _i72 < _list71.size; ++_i72) { - TConstraintViolationSummary _elem73; // required + TConstraintViolationSummary _elem73; _elem73 = new TConstraintViolationSummary(); _elem73.read(iprot); struct.violationSummaries.add(_elem73); @@ -769,8 +771,8 @@ import org.slf4j.LoggerFactory; struct.authorizationFailures = new HashMap(2*_map74.size); for (int _i75 = 0; _i75 < _map74.size; ++_i75) { - TKeyExtent _key76; // required - org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val77; // required + TKeyExtent _key76; + org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val77; _key76 = new TKeyExtent(); _key76.read(iprot); _val77 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java index 9bd8739..9d7ba57 100644 --- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java +++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.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; @@ -56,7 +58,7 @@ import org.slf4j.LoggerFactory; public interface AsyncIface { - public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -125,7 +127,7 @@ import org.slf4j.LoggerFactory; super(protocolFactory, clientManager, transport); } - public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getStatus_call method_call = new getStatus_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -135,7 +137,7 @@ import org.slf4j.LoggerFactory; public static class getStatus_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.accumulo.trace.thrift.TInfo tinfo; private org.apache.accumulo.core.security.thrift.TCredentials credentials; - public getStatus_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getStatus_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.tinfo = tinfo; this.credentials = credentials; @@ -203,7 +205,81 @@ import org.slf4j.LoggerFactory; } - public static class getStatus_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { + private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName()); + public AsyncProcessor(I iface) { + super(iface, getProcessMap(new HashMap>())); + } + + protected AsyncProcessor(I iface, Map> processMap) { + super(iface, getProcessMap(processMap)); + } + + private static Map> getProcessMap(Map> processMap) { + processMap.put("getStatus", new getStatus()); + return processMap; + } + + public static class getStatus extends org.apache.thrift.AsyncProcessFunction { + public getStatus() { + super("getStatus"); + } + + public getStatus_args getEmptyArgsInstance() { + return new getStatus_args(); + } + + public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { + public void onComplete(GCStatus o) { + getStatus_result result = new getStatus_result(); + result.success = o; + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + getStatus_result result = new getStatus_result(); + if (e instanceof org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException) { + result.sec = (org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException) e; + result.setSecIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, getStatus_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + iface.getStatus(args.tinfo, args.credentials,resultHandler); + } + } + + } + + public static class getStatus_args 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("getStatus_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)2); @@ -460,30 +536,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(getStatus_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getStatus_args typedOther = (getStatus_args)other; - lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(typedOther.isSetTinfo()); + lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo()); if (lastComparison != 0) { return lastComparison; } if (isSetTinfo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, typedOther.tinfo); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, other.tinfo); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials()); + lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials()); if (lastComparison != 0) { return lastComparison; } if (isSetCredentials()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, other.credentials); if (lastComparison != 0) { return lastComparison; } @@ -667,7 +743,7 @@ import org.slf4j.LoggerFactory; } - public static class getStatus_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + public static class getStatus_result 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("getStatus_result"); private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); @@ -924,30 +1000,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(getStatus_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getStatus_result typedOther = (getStatus_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSec()).compareTo(typedOther.isSetSec()); + lastComparison = Boolean.valueOf(isSetSec()).compareTo(other.isSetSec()); if (lastComparison != 0) { return lastComparison; } if (isSetSec()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, typedOther.sec); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, other.sec); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java index af655f7..7c90b7a 100644 --- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java +++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.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 GCStatus implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class GCStatus 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("GCStatus"); private static final org.apache.thrift.protocol.TField LAST_FIELD_DESC = new org.apache.thrift.protocol.TField("last", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -421,50 +423,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(GCStatus other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - GCStatus typedOther = (GCStatus)other; - lastComparison = Boolean.valueOf(isSetLast()).compareTo(typedOther.isSetLast()); + lastComparison = Boolean.valueOf(isSetLast()).compareTo(other.isSetLast()); if (lastComparison != 0) { return lastComparison; } if (isSetLast()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.last, typedOther.last); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.last, other.last); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLastLog()).compareTo(typedOther.isSetLastLog()); + lastComparison = Boolean.valueOf(isSetLastLog()).compareTo(other.isSetLastLog()); if (lastComparison != 0) { return lastComparison; } if (isSetLastLog()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastLog, typedOther.lastLog); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastLog, other.lastLog); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCurrent()).compareTo(typedOther.isSetCurrent()); + lastComparison = Boolean.valueOf(isSetCurrent()).compareTo(other.isSetCurrent()); if (lastComparison != 0) { return lastComparison; } if (isSetCurrent()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.current, typedOther.current); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.current, other.current); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCurrentLog()).compareTo(typedOther.isSetCurrentLog()); + lastComparison = Boolean.valueOf(isSetCurrentLog()).compareTo(other.isSetCurrentLog()); if (lastComparison != 0) { return lastComparison; } if (isSetCurrentLog()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.currentLog, typedOther.currentLog); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.currentLog, other.currentLog); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java index 15691bf..a76c14c 100644 --- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java +++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.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 GcCycleStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class GcCycleStats 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("GcCycleStats"); private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.I64, (short)1); @@ -541,70 +543,70 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(GcCycleStats other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - GcCycleStats typedOther = (GcCycleStats)other; - lastComparison = Boolean.valueOf(isSetStarted()).compareTo(typedOther.isSetStarted()); + lastComparison = Boolean.valueOf(isSetStarted()).compareTo(other.isSetStarted()); if (lastComparison != 0) { return lastComparison; } if (isSetStarted()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, other.started); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFinished()).compareTo(typedOther.isSetFinished()); + lastComparison = Boolean.valueOf(isSetFinished()).compareTo(other.isSetFinished()); if (lastComparison != 0) { return lastComparison; } if (isSetFinished()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finished, typedOther.finished); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finished, other.finished); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCandidates()).compareTo(typedOther.isSetCandidates()); + lastComparison = Boolean.valueOf(isSetCandidates()).compareTo(other.isSetCandidates()); if (lastComparison != 0) { return lastComparison; } if (isSetCandidates()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.candidates, typedOther.candidates); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.candidates, other.candidates); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetInUse()).compareTo(typedOther.isSetInUse()); + lastComparison = Boolean.valueOf(isSetInUse()).compareTo(other.isSetInUse()); if (lastComparison != 0) { return lastComparison; } if (isSetInUse()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inUse, typedOther.inUse); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inUse, other.inUse); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDeleted()).compareTo(typedOther.isSetDeleted()); + lastComparison = Boolean.valueOf(isSetDeleted()).compareTo(other.isSetDeleted()); if (lastComparison != 0) { return lastComparison; } if (isSetDeleted()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deleted, typedOther.deleted); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deleted, other.deleted); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetErrors()).compareTo(typedOther.isSetErrors()); + lastComparison = Boolean.valueOf(isSetErrors()).compareTo(other.isSetErrors()); if (lastComparison != 0) { return lastComparison; } if (isSetErrors()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, typedOther.errors); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, other.errors); 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/Compacting.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java index 64807b9..d99d41f 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.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 Compacting implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class Compacting 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("Compacting"); private static final org.apache.thrift.protocol.TField RUNNING_FIELD_DESC = new org.apache.thrift.protocol.TField("running", org.apache.thrift.protocol.TType.I32, (short)1); @@ -305,30 +307,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(Compacting other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - Compacting typedOther = (Compacting)other; - lastComparison = Boolean.valueOf(isSetRunning()).compareTo(typedOther.isSetRunning()); + lastComparison = Boolean.valueOf(isSetRunning()).compareTo(other.isSetRunning()); if (lastComparison != 0) { return lastComparison; } if (isSetRunning()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.running, typedOther.running); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.running, other.running); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetQueued()).compareTo(typedOther.isSetQueued()); + lastComparison = Boolean.valueOf(isSetQueued()).compareTo(other.isSetQueued()); if (lastComparison != 0) { return lastComparison; } if (isSetQueued()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queued, typedOther.queued); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queued, other.queued); 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/DeadServer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java index ec2e549..e428589 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.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 DeadServer implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class DeadServer 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("DeadServer"); private static final org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -364,40 +366,40 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(DeadServer other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - DeadServer typedOther = (DeadServer)other; - lastComparison = Boolean.valueOf(isSetServer()).compareTo(typedOther.isSetServer()); + lastComparison = Boolean.valueOf(isSetServer()).compareTo(other.isSetServer()); if (lastComparison != 0) { return lastComparison; } if (isSetServer()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.server, typedOther.server); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.server, other.server); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLastStatus()).compareTo(typedOther.isSetLastStatus()); + lastComparison = Boolean.valueOf(isSetLastStatus()).compareTo(other.isSetLastStatus()); if (lastComparison != 0) { return lastComparison; } if (isSetLastStatus()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastStatus, typedOther.lastStatus); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastStatus, other.lastStatus); if (lastComparison != 0) { return lastComparison; } } - 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; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java index 60cb63e..f65f552 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.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