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 88D0E11082 for ; Fri, 2 May 2014 23:13:10 +0000 (UTC) Received: (qmail 19233 invoked by uid 500); 2 May 2014 23:12:50 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19084 invoked by uid 500); 2 May 2014 23:12:48 -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 19034 invoked by uid 99); 2 May 2014 23:12:46 -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:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8469982A934; 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:49 -0000 Message-Id: <8f5ca8e47a08452c8fe90c527c08cb95@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/16] ACCUMULO-2773 Regenerate sources for Thrift 0.9.1 http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java index f92ea06..55e074b 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.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 AccumuloSecurityException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class AccumuloSecurityException 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("AccumuloSecurityException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -244,20 +246,20 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(AccumuloSecurityException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - AccumuloSecurityException typedOther = (AccumuloSecurityException)other; - lastComparison = Boolean.valueOf(isSetMsg()).compareTo(typedOther.isSetMsg()); + lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); if (lastComparison != 0) { return lastComparison; } if (isSetMsg()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java index cc53871..05de413 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/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); @@ -253,10 +255,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()) { @@ -274,7 +273,7 @@ import org.slf4j.LoggerFactory; this.entriesRead = other.entriesRead; this.entriesWritten = other.entriesWritten; if (other.isSetIterators()) { - List __this__iterators = new ArrayList(); + List __this__iterators = new ArrayList(other.iterators.size()); for (IteratorSetting other_element : other.iterators) { __this__iterators.add(new IteratorSetting(other_element)); } @@ -849,110 +848,110 @@ 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(isSetIterators()).compareTo(typedOther.isSetIterators()); + lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); if (lastComparison != 0) { return lastComparison; } if (isSetIterators()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, typedOther.iterators); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, other.iterators); if (lastComparison != 0) { return lastComparison; } @@ -1116,7 +1115,7 @@ import org.slf4j.LoggerFactory; struct.inputFiles = new ArrayList(_list138.size); for (int _i139 = 0; _i139 < _list138.size; ++_i139) { - String _elem140; // required + String _elem140; _elem140 = iprot.readString(); struct.inputFiles.add(_elem140); } @@ -1182,7 +1181,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList(_list141.size); for (int _i142 = 0; _i142 < _list141.size; ++_i142) { - IteratorSetting _elem143; // required + IteratorSetting _elem143; _elem143 = new IteratorSetting(); _elem143.read(iprot); struct.iterators.add(_elem143); @@ -1379,7 +1378,7 @@ import org.slf4j.LoggerFactory; struct.inputFiles = new ArrayList(_list148.size); for (int _i149 = 0; _i149 < _list148.size; ++_i149) { - String _elem150; // required + String _elem150; _elem150 = iprot.readString(); struct.inputFiles.add(_elem150); } @@ -1416,7 +1415,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList(_list151.size); for (int _i152 = 0; _i152 < _list151.size; ++_i152) { - IteratorSetting _elem153; // required + IteratorSetting _elem153; _elem153 = new IteratorSetting(); _elem153.read(iprot); struct.iterators.add(_elem153); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java index 48adb7c..a34e57f 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.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 ActiveScan implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ActiveScan 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("ActiveScan"); private static final org.apache.thrift.protocol.TField CLIENT_FIELD_DESC = new org.apache.thrift.protocol.TField("client", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -277,26 +279,21 @@ import org.slf4j.LoggerFactory; this.extent = new KeyExtent(other.extent); } if (other.isSetColumns()) { - List __this__columns = new ArrayList(); + List __this__columns = new ArrayList(other.columns.size()); for (Column other_element : other.columns) { __this__columns.add(new Column(other_element)); } this.columns = __this__columns; } if (other.isSetIterators()) { - List __this__iterators = new ArrayList(); + List __this__iterators = new ArrayList(other.iterators.size()); for (IteratorSetting other_element : other.iterators) { __this__iterators.add(new IteratorSetting(other_element)); } this.iterators = __this__iterators; } if (other.isSetAuthorizations()) { - List __this__authorizations = new ArrayList(); - for (ByteBuffer other_element : other.authorizations) { - ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element); -; - __this__authorizations.add(temp_binary_element); - } + List __this__authorizations = new ArrayList(other.authorizations); this.authorizations = __this__authorizations; } } @@ -930,120 +927,120 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ActiveScan other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ActiveScan typedOther = (ActiveScan)other; - lastComparison = Boolean.valueOf(isSetClient()).compareTo(typedOther.isSetClient()); + lastComparison = Boolean.valueOf(isSetClient()).compareTo(other.isSetClient()); if (lastComparison != 0) { return lastComparison; } if (isSetClient()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.client, typedOther.client); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.client, other.client); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUser()).compareTo(typedOther.isSetUser()); + lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); if (lastComparison != 0) { return lastComparison; } if (isSetUser()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, typedOther.user); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user); if (lastComparison != 0) { return lastComparison; } } - 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(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(isSetIdleTime()).compareTo(typedOther.isSetIdleTime()); + lastComparison = Boolean.valueOf(isSetIdleTime()).compareTo(other.isSetIdleTime()); if (lastComparison != 0) { return lastComparison; } if (isSetIdleTime()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.idleTime, typedOther.idleTime); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.idleTime, other.idleTime); 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(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(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(isSetColumns()).compareTo(typedOther.isSetColumns()); + lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); if (lastComparison != 0) { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIterators()).compareTo(typedOther.isSetIterators()); + lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); if (lastComparison != 0) { return lastComparison; } if (isSetIterators()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, typedOther.iterators); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, other.iterators); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations()); + lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations()); if (lastComparison != 0) { return lastComparison; } if (isSetAuthorizations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations); if (lastComparison != 0) { return lastComparison; } @@ -1267,7 +1264,7 @@ import org.slf4j.LoggerFactory; struct.columns = new ArrayList(_list114.size); for (int _i115 = 0; _i115 < _list114.size; ++_i115) { - Column _elem116; // required + Column _elem116; _elem116 = new Column(); _elem116.read(iprot); struct.columns.add(_elem116); @@ -1286,7 +1283,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList(_list117.size); for (int _i118 = 0; _i118 < _list117.size; ++_i118) { - IteratorSetting _elem119; // required + IteratorSetting _elem119; _elem119 = new IteratorSetting(); _elem119.read(iprot); struct.iterators.add(_elem119); @@ -1305,7 +1302,7 @@ import org.slf4j.LoggerFactory; struct.authorizations = new ArrayList(_list120.size); for (int _i121 = 0; _i121 < _list120.size; ++_i121) { - ByteBuffer _elem122; // required + ByteBuffer _elem122; _elem122 = iprot.readBinary(); struct.authorizations.add(_elem122); } @@ -1551,7 +1548,7 @@ import org.slf4j.LoggerFactory; struct.columns = new ArrayList(_list129.size); for (int _i130 = 0; _i130 < _list129.size; ++_i130) { - Column _elem131; // required + Column _elem131; _elem131 = new Column(); _elem131.read(iprot); struct.columns.add(_elem131); @@ -1565,7 +1562,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList(_list132.size); for (int _i133 = 0; _i133 < _list132.size; ++_i133) { - IteratorSetting _elem134; // required + IteratorSetting _elem134; _elem134 = new IteratorSetting(); _elem134.read(iprot); struct.iterators.add(_elem134); @@ -1579,7 +1576,7 @@ import org.slf4j.LoggerFactory; struct.authorizations = new ArrayList(_list135.size); for (int _i136 = 0; _i136 < _list135.size; ++_i136) { - ByteBuffer _elem137; // required + ByteBuffer _elem137; _elem137 = iprot.readBinary(); struct.authorizations.add(_elem137); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java index d09a290..e749ac4 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.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 BatchScanOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class BatchScanOptions 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("BatchScanOptions"); private static final org.apache.thrift.protocol.TField AUTHORIZATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("authorizations", org.apache.thrift.protocol.TType.SET, (short)1); @@ -171,30 +173,25 @@ import org.slf4j.LoggerFactory; public BatchScanOptions(BatchScanOptions other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetAuthorizations()) { - Set __this__authorizations = new HashSet(); - for (ByteBuffer other_element : other.authorizations) { - ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element); -; - __this__authorizations.add(temp_binary_element); - } + Set __this__authorizations = new HashSet(other.authorizations); this.authorizations = __this__authorizations; } if (other.isSetRanges()) { - List __this__ranges = new ArrayList(); + List __this__ranges = new ArrayList(other.ranges.size()); for (Range other_element : other.ranges) { __this__ranges.add(new Range(other_element)); } this.ranges = __this__ranges; } if (other.isSetColumns()) { - List __this__columns = new ArrayList(); + List __this__columns = new ArrayList(other.columns.size()); for (ScanColumn other_element : other.columns) { __this__columns.add(new ScanColumn(other_element)); } this.columns = __this__columns; } if (other.isSetIterators()) { - List __this__iterators = new ArrayList(); + List __this__iterators = new ArrayList(other.iterators.size()); for (IteratorSetting other_element : other.iterators) { __this__iterators.add(new IteratorSetting(other_element)); } @@ -549,60 +546,60 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(BatchScanOptions other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - BatchScanOptions typedOther = (BatchScanOptions)other; - lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations()); + lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations()); if (lastComparison != 0) { return lastComparison; } if (isSetAuthorizations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRanges()).compareTo(typedOther.isSetRanges()); + lastComparison = Boolean.valueOf(isSetRanges()).compareTo(other.isSetRanges()); if (lastComparison != 0) { return lastComparison; } if (isSetRanges()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ranges, typedOther.ranges); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ranges, other.ranges); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); + lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); if (lastComparison != 0) { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIterators()).compareTo(typedOther.isSetIterators()); + lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); if (lastComparison != 0) { return lastComparison; } if (isSetIterators()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, typedOther.iterators); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, other.iterators); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetThreads()).compareTo(typedOther.isSetThreads()); + lastComparison = Boolean.valueOf(isSetThreads()).compareTo(other.isSetThreads()); if (lastComparison != 0) { return lastComparison; } if (isSetThreads()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.threads, typedOther.threads); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.threads, other.threads); if (lastComparison != 0) { return lastComparison; } @@ -724,7 +721,7 @@ import org.slf4j.LoggerFactory; struct.authorizations = new HashSet(2*_set50.size); for (int _i51 = 0; _i51 < _set50.size; ++_i51) { - ByteBuffer _elem52; // required + ByteBuffer _elem52; _elem52 = iprot.readBinary(); struct.authorizations.add(_elem52); } @@ -742,7 +739,7 @@ import org.slf4j.LoggerFactory; struct.ranges = new ArrayList(_list53.size); for (int _i54 = 0; _i54 < _list53.size; ++_i54) { - Range _elem55; // required + Range _elem55; _elem55 = new Range(); _elem55.read(iprot); struct.ranges.add(_elem55); @@ -761,7 +758,7 @@ import org.slf4j.LoggerFactory; struct.columns = new ArrayList(_list56.size); for (int _i57 = 0; _i57 < _list56.size; ++_i57) { - ScanColumn _elem58; // required + ScanColumn _elem58; _elem58 = new ScanColumn(); _elem58.read(iprot); struct.columns.add(_elem58); @@ -780,7 +777,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList(_list59.size); for (int _i60 = 0; _i60 < _list59.size; ++_i60) { - IteratorSetting _elem61; // required + IteratorSetting _elem61; _elem61 = new IteratorSetting(); _elem61.read(iprot); struct.iterators.add(_elem61); @@ -961,7 +958,7 @@ import org.slf4j.LoggerFactory; struct.authorizations = new HashSet(2*_set70.size); for (int _i71 = 0; _i71 < _set70.size; ++_i71) { - ByteBuffer _elem72; // required + ByteBuffer _elem72; _elem72 = iprot.readBinary(); struct.authorizations.add(_elem72); } @@ -974,7 +971,7 @@ import org.slf4j.LoggerFactory; struct.ranges = new ArrayList(_list73.size); for (int _i74 = 0; _i74 < _list73.size; ++_i74) { - Range _elem75; // required + Range _elem75; _elem75 = new Range(); _elem75.read(iprot); struct.ranges.add(_elem75); @@ -988,7 +985,7 @@ import org.slf4j.LoggerFactory; struct.columns = new ArrayList(_list76.size); for (int _i77 = 0; _i77 < _list76.size; ++_i77) { - ScanColumn _elem78; // required + ScanColumn _elem78; _elem78 = new ScanColumn(); _elem78.read(iprot); struct.columns.add(_elem78); @@ -1002,7 +999,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList(_list79.size); for (int _i80 = 0; _i80 < _list79.size; ++_i80) { - IteratorSetting _elem81; // required + IteratorSetting _elem81; _elem81 = new IteratorSetting(); _elem81.read(iprot); struct.iterators.add(_elem81); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java index 7dfbaa5..3c20017 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.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 Column implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class Column 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("Column"); private static final org.apache.thrift.protocol.TField COL_FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("colFamily", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -395,40 +397,40 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(Column other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - Column typedOther = (Column)other; - 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; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java index 523a8bd..a3b040e 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.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 ColumnUpdate implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ColumnUpdate 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("ColumnUpdate"); private static final org.apache.thrift.protocol.TField COL_FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("colFamily", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -576,70 +578,70 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ColumnUpdate other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ColumnUpdate typedOther = (ColumnUpdate)other; - 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; } } - 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; } } - lastComparison = Boolean.valueOf(isSetDeleteCell()).compareTo(typedOther.isSetDeleteCell()); + lastComparison = Boolean.valueOf(isSetDeleteCell()).compareTo(other.isSetDeleteCell()); if (lastComparison != 0) { return lastComparison; } if (isSetDeleteCell()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deleteCell, typedOther.deleteCell); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deleteCell, other.deleteCell); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java index 3e08d68..36bc32a 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java index 615720b..c0a5171 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java index 6dec4b3..8dd28cf 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.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 Condition implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class Condition 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("Condition"); private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -176,7 +178,7 @@ import org.slf4j.LoggerFactory; ; } if (other.isSetIterators()) { - List __this__iterators = new ArrayList(); + List __this__iterators = new ArrayList(other.iterators.size()); for (IteratorSetting other_element : other.iterators) { __this__iterators.add(new IteratorSetting(other_element)); } @@ -448,50 +450,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(Condition other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - Condition typedOther = (Condition)other; - lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn()); + lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn()); if (lastComparison != 0) { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column); 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; } } - 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; } } - lastComparison = Boolean.valueOf(isSetIterators()).compareTo(typedOther.isSetIterators()); + lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); if (lastComparison != 0) { return lastComparison; } if (isSetIterators()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, typedOther.iterators); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, other.iterators); if (lastComparison != 0) { return lastComparison; } @@ -629,7 +631,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList(_list82.size); for (int _i83 = 0; _i83 < _list82.size; ++_i83) { - IteratorSetting _elem84; // required + IteratorSetting _elem84; _elem84 = new IteratorSetting(); _elem84.read(iprot); struct.iterators.add(_elem84); @@ -761,7 +763,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList(_list87.size); for (int _i88 = 0; _i88 < _list87.size; ++_i88) { - IteratorSetting _elem89; // required + IteratorSetting _elem89; _elem89 = new IteratorSetting(); _elem89.read(iprot); struct.iterators.add(_elem89); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java index 74e2d71..55f0e62 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java index 13e88de..71806fe 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.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 ConditionalUpdates implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ConditionalUpdates 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("ConditionalUpdates"); private static final org.apache.thrift.protocol.TField CONDITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("conditions", org.apache.thrift.protocol.TType.LIST, (short)2); @@ -153,14 +155,14 @@ import org.slf4j.LoggerFactory; */ public ConditionalUpdates(ConditionalUpdates other) { if (other.isSetConditions()) { - List __this__conditions = new ArrayList(); + List __this__conditions = new ArrayList(other.conditions.size()); for (Condition other_element : other.conditions) { __this__conditions.add(new Condition(other_element)); } this.conditions = __this__conditions; } if (other.isSetUpdates()) { - List __this__updates = new ArrayList(); + List __this__updates = new ArrayList(other.updates.size()); for (ColumnUpdate other_element : other.updates) { __this__updates.add(new ColumnUpdate(other_element)); } @@ -343,30 +345,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ConditionalUpdates other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ConditionalUpdates typedOther = (ConditionalUpdates)other; - lastComparison = Boolean.valueOf(isSetConditions()).compareTo(typedOther.isSetConditions()); + lastComparison = Boolean.valueOf(isSetConditions()).compareTo(other.isSetConditions()); if (lastComparison != 0) { return lastComparison; } if (isSetConditions()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.conditions, typedOther.conditions); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.conditions, other.conditions); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUpdates()).compareTo(typedOther.isSetUpdates()); + lastComparison = Boolean.valueOf(isSetUpdates()).compareTo(other.isSetUpdates()); if (lastComparison != 0) { return lastComparison; } if (isSetUpdates()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updates, typedOther.updates); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updates, other.updates); if (lastComparison != 0) { return lastComparison; } @@ -456,7 +458,7 @@ import org.slf4j.LoggerFactory; struct.conditions = new ArrayList(_list90.size); for (int _i91 = 0; _i91 < _list90.size; ++_i91) { - Condition _elem92; // required + Condition _elem92; _elem92 = new Condition(); _elem92.read(iprot); struct.conditions.add(_elem92); @@ -475,7 +477,7 @@ import org.slf4j.LoggerFactory; struct.updates = new ArrayList(_list93.size); for (int _i94 = 0; _i94 < _list93.size; ++_i94) { - ColumnUpdate _elem95; // required + ColumnUpdate _elem95; _elem95 = new ColumnUpdate(); _elem95.read(iprot); struct.updates.add(_elem95); @@ -581,7 +583,7 @@ import org.slf4j.LoggerFactory; struct.conditions = new ArrayList(_list100.size); for (int _i101 = 0; _i101 < _list100.size; ++_i101) { - Condition _elem102; // required + Condition _elem102; _elem102 = new Condition(); _elem102.read(iprot); struct.conditions.add(_elem102); @@ -595,7 +597,7 @@ import org.slf4j.LoggerFactory; struct.updates = new ArrayList(_list103.size); for (int _i104 = 0; _i104 < _list103.size; ++_i104) { - ColumnUpdate _elem105; // required + ColumnUpdate _elem105; _elem105 = new ColumnUpdate(); _elem105.read(iprot); struct.updates.add(_elem105); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java index 8a045f1..bb4ad51 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.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 ConditionalWriterOptions implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ConditionalWriterOptions 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("ConditionalWriterOptions"); private static final org.apache.thrift.protocol.TField MAX_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("maxMemory", org.apache.thrift.protocol.TType.I64, (short)1); @@ -166,12 +168,7 @@ import org.slf4j.LoggerFactory; this.timeoutMs = other.timeoutMs; this.threads = other.threads; if (other.isSetAuthorizations()) { - Set __this__authorizations = new HashSet(); - for (ByteBuffer other_element : other.authorizations) { - ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element); -; - __this__authorizations.add(temp_binary_element); - } + Set __this__authorizations = new HashSet(other.authorizations); this.authorizations = __this__authorizations; } } @@ -430,50 +427,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ConditionalWriterOptions other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ConditionalWriterOptions typedOther = (ConditionalWriterOptions)other; - lastComparison = Boolean.valueOf(isSetMaxMemory()).compareTo(typedOther.isSetMaxMemory()); + lastComparison = Boolean.valueOf(isSetMaxMemory()).compareTo(other.isSetMaxMemory()); if (lastComparison != 0) { return lastComparison; } if (isSetMaxMemory()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxMemory, typedOther.maxMemory); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxMemory, other.maxMemory); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTimeoutMs()).compareTo(typedOther.isSetTimeoutMs()); + lastComparison = Boolean.valueOf(isSetTimeoutMs()).compareTo(other.isSetTimeoutMs()); if (lastComparison != 0) { return lastComparison; } if (isSetTimeoutMs()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeoutMs, typedOther.timeoutMs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeoutMs, other.timeoutMs); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetThreads()).compareTo(typedOther.isSetThreads()); + lastComparison = Boolean.valueOf(isSetThreads()).compareTo(other.isSetThreads()); if (lastComparison != 0) { return lastComparison; } if (isSetThreads()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.threads, typedOther.threads); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.threads, other.threads); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations()); + lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations()); if (lastComparison != 0) { return lastComparison; } if (isSetAuthorizations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations); if (lastComparison != 0) { return lastComparison; } @@ -601,7 +598,7 @@ import org.slf4j.LoggerFactory; struct.authorizations = new HashSet(2*_set106.size); for (int _i107 = 0; _i107 < _set106.size; ++_i107) { - ByteBuffer _elem108; // required + ByteBuffer _elem108; _elem108 = iprot.readBinary(); struct.authorizations.add(_elem108); } @@ -729,7 +726,7 @@ import org.slf4j.LoggerFactory; struct.authorizations = new HashSet(2*_set111.size); for (int _i112 = 0; _i112 < _set111.size; ++_i112) { - ByteBuffer _elem113; // required + ByteBuffer _elem113; _elem113 = iprot.readBinary(); struct.authorizations.add(_elem113); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java index b82d185..36080ed 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.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 DiskUsage implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class DiskUsage 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("DiskUsage"); private static final org.apache.thrift.protocol.TField TABLES_FIELD_DESC = new org.apache.thrift.protocol.TField("tables", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -156,10 +158,7 @@ import org.slf4j.LoggerFactory; public DiskUsage(DiskUsage other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTables()) { - List __this__tables = new ArrayList(); - for (String other_element : other.tables) { - __this__tables.add(other_element); - } + List __this__tables = new ArrayList(other.tables); this.tables = __this__tables; } this.usage = other.usage; @@ -325,30 +324,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(DiskUsage other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - DiskUsage typedOther = (DiskUsage)other; - lastComparison = Boolean.valueOf(isSetTables()).compareTo(typedOther.isSetTables()); + lastComparison = Boolean.valueOf(isSetTables()).compareTo(other.isSetTables()); if (lastComparison != 0) { return lastComparison; } if (isSetTables()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tables, typedOther.tables); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tables, other.tables); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUsage()).compareTo(typedOther.isSetUsage()); + lastComparison = Boolean.valueOf(isSetUsage()).compareTo(other.isSetUsage()); if (lastComparison != 0) { return lastComparison; } if (isSetUsage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usage, typedOther.usage); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usage, other.usage); if (lastComparison != 0) { return lastComparison; } @@ -436,7 +435,7 @@ import org.slf4j.LoggerFactory; struct.tables = new ArrayList(_list0.size); for (int _i1 = 0; _i1 < _list0.size; ++_i1) { - String _elem2; // required + String _elem2; _elem2 = iprot.readString(); struct.tables.add(_elem2); } @@ -534,7 +533,7 @@ import org.slf4j.LoggerFactory; struct.tables = new ArrayList(_list5.size); for (int _i6 = 0; _i6 < _list5.size; ++_i6) { - String _elem7; // required + String _elem7; _elem7 = iprot.readString(); struct.tables.add(_elem7); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java index e3eaaef..bafd525 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java index c0342eb..1956b9a 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.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 IteratorSetting implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class IteratorSetting 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("IteratorSetting"); private static final org.apache.thrift.protocol.TField PRIORITY_FIELD_DESC = new org.apache.thrift.protocol.TField("priority", org.apache.thrift.protocol.TType.I32, (short)1); @@ -182,18 +184,7 @@ import org.slf4j.LoggerFactory; this.iteratorClass = other.iteratorClass; } if (other.isSetProperties()) { - Map __this__properties = new HashMap(); - for (Map.Entry other_element : other.properties.entrySet()) { - - String other_element_key = other_element.getKey(); - String other_element_value = other_element.getValue(); - - String __this__properties_copy_key = other_element_key; - - String __this__properties_copy_value = other_element_value; - - __this__properties.put(__this__properties_copy_key, __this__properties_copy_value); - } + Map __this__properties = new HashMap(other.properties); this.properties = __this__properties; } } @@ -448,50 +439,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(IteratorSetting other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - IteratorSetting typedOther = (IteratorSetting)other; - lastComparison = Boolean.valueOf(isSetPriority()).compareTo(typedOther.isSetPriority()); + lastComparison = Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority()); if (lastComparison != 0) { return lastComparison; } if (isSetPriority()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.priority, typedOther.priority); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.priority, other.priority); 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(isSetIteratorClass()).compareTo(typedOther.isSetIteratorClass()); + lastComparison = Boolean.valueOf(isSetIteratorClass()).compareTo(other.isSetIteratorClass()); if (lastComparison != 0) { return lastComparison; } if (isSetIteratorClass()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iteratorClass, typedOther.iteratorClass); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iteratorClass, other.iteratorClass); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetProperties()).compareTo(typedOther.isSetProperties()); + lastComparison = Boolean.valueOf(isSetProperties()).compareTo(other.isSetProperties()); if (lastComparison != 0) { return lastComparison; } if (isSetProperties()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.properties, typedOther.properties); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.properties, other.properties); if (lastComparison != 0) { return lastComparison; } @@ -619,8 +610,8 @@ import org.slf4j.LoggerFactory; struct.properties = new HashMap(2*_map16.size); for (int _i17 = 0; _i17 < _map16.size; ++_i17) { - String _key18; // required - String _val19; // required + String _key18; + String _val19; _key18 = iprot.readString(); _val19 = iprot.readString(); struct.properties.put(_key18, _val19); @@ -747,8 +738,8 @@ import org.slf4j.LoggerFactory; struct.properties = new HashMap(2*_map22.size); for (int _i23 = 0; _i23 < _map22.size; ++_i23) { - String _key24; // required - String _val25; // required + String _key24; + String _val25; _key24 = iprot.readString(); _val25 = iprot.readString(); struct.properties.put(_key24, _val25); http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java index 80f2ecd..ecba9d1 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.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 Key implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class Key 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("Key"); 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(Key other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - Key typedOther = (Key)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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java index 026f456..f9c9e4c 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.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 KeyExtent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class KeyExtent 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("KeyExtent"); private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -384,40 +386,40 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(KeyExtent other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - KeyExtent typedOther = (KeyExtent)other; - lastComparison = Boolean.valueOf(isSetTableId()).compareTo(typedOther.isSetTableId()); + lastComparison = Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId()); if (lastComparison != 0) { return lastComparison; } if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, typedOther.tableId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId); 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; }