http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java index 8f53983..52bfbd1 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.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 KeyValue implements org.apache.thrift.TBase<KeyValue, KeyValue._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class KeyValue implements org.apache.thrift.TBase<KeyValue, KeyValue._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValue> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyValue"); 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(KeyValue other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - KeyValue typedOther = (KeyValue)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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java index daea6d3..1993d01 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.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 KeyValueAndPeek implements org.apache.thrift.TBase<KeyValueAndPeek, KeyValueAndPeek._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class KeyValueAndPeek implements org.apache.thrift.TBase<KeyValueAndPeek, KeyValueAndPeek._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValueAndPeek> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyValueAndPeek"); private static final org.apache.thrift.protocol.TField KEY_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("keyValue", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -305,30 +307,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(KeyValueAndPeek other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - KeyValueAndPeek typedOther = (KeyValueAndPeek)other; - lastComparison = Boolean.valueOf(isSetKeyValue()).compareTo(typedOther.isSetKeyValue()); + lastComparison = Boolean.valueOf(isSetKeyValue()).compareTo(other.isSetKeyValue()); if (lastComparison != 0) { return lastComparison; } if (isSetKeyValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keyValue, typedOther.keyValue); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keyValue, other.keyValue); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetHasNext()).compareTo(typedOther.isSetHasNext()); + lastComparison = Boolean.valueOf(isSetHasNext()).compareTo(other.isSetHasNext()); if (lastComparison != 0) { return lastComparison; } if (isSetHasNext()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasNext, typedOther.hasNext); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasNext, other.hasNext); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java index c4fb010..c0f8740 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.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 MutationsRejectedException extends TException implements org.apache.thrift.TBase<MutationsRejectedException, MutationsRejectedException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class MutationsRejectedException extends TException implements org.apache.thrift.TBase<MutationsRejectedException, MutationsRejectedException._Fields>, java.io.Serializable, Cloneable, Comparable<MutationsRejectedException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MutationsRejectedException"); 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(MutationsRejectedException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - MutationsRejectedException typedOther = (MutationsRejectedException)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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java index 555d5f3..b0a543a 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.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 NoMoreEntriesException extends TException implements org.apache.thrift.TBase<NoMoreEntriesException, NoMoreEntriesException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class NoMoreEntriesException extends TException implements org.apache.thrift.TBase<NoMoreEntriesException, NoMoreEntriesException._Fields>, java.io.Serializable, Cloneable, Comparable<NoMoreEntriesException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoMoreEntriesException"); 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(NoMoreEntriesException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - NoMoreEntriesException typedOther = (NoMoreEntriesException)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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java index 0922a39..1c9bfc4 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java index 70b4a32..b1f505f 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.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 Range implements org.apache.thrift.TBase<Range, Range._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, java.io.Serializable, Cloneable, Comparable<Range> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Range"); 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); @@ -423,50 +425,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(Range other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - Range typedOther = (Range)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(isSetStartInclusive()).compareTo(typedOther.isSetStartInclusive()); + lastComparison = Boolean.valueOf(isSetStartInclusive()).compareTo(other.isSetStartInclusive()); if (lastComparison != 0) { return lastComparison; } if (isSetStartInclusive()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startInclusive, typedOther.startInclusive); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startInclusive, other.startInclusive); 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(isSetStopInclusive()).compareTo(typedOther.isSetStopInclusive()); + lastComparison = Boolean.valueOf(isSetStopInclusive()).compareTo(other.isSetStopInclusive()); if (lastComparison != 0) { return lastComparison; } if (isSetStopInclusive()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopInclusive, typedOther.stopInclusive); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopInclusive, other.stopInclusive); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java index 532414b..101d720 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.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 ScanColumn implements org.apache.thrift.TBase<ScanColumn, ScanColumn._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ScanColumn implements org.apache.thrift.TBase<ScanColumn, ScanColumn._Fields>, java.io.Serializable, Cloneable, Comparable<ScanColumn> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanColumn"); 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); @@ -324,30 +326,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ScanColumn other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ScanColumn typedOther = (ScanColumn)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; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java index 34ce213..1e025ba 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.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 ScanOptions implements org.apache.thrift.TBase<ScanOptions, ScanOptions._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ScanOptions implements org.apache.thrift.TBase<ScanOptions, ScanOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ScanOptions> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanOptions"); 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); @@ -170,26 +172,21 @@ import org.slf4j.LoggerFactory; public ScanOptions(ScanOptions other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetAuthorizations()) { - Set<ByteBuffer> __this__authorizations = new HashSet<ByteBuffer>(); - for (ByteBuffer other_element : other.authorizations) { - ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element); -; - __this__authorizations.add(temp_binary_element); - } + Set<ByteBuffer> __this__authorizations = new HashSet<ByteBuffer>(other.authorizations); this.authorizations = __this__authorizations; } if (other.isSetRange()) { this.range = new Range(other.range); } if (other.isSetColumns()) { - List<ScanColumn> __this__columns = new ArrayList<ScanColumn>(); + List<ScanColumn> __this__columns = new ArrayList<ScanColumn>(other.columns.size()); for (ScanColumn other_element : other.columns) { __this__columns.add(new ScanColumn(other_element)); } this.columns = __this__columns; } if (other.isSetIterators()) { - List<IteratorSetting> __this__iterators = new ArrayList<IteratorSetting>(); + List<IteratorSetting> __this__iterators = new ArrayList<IteratorSetting>(other.iterators.size()); for (IteratorSetting other_element : other.iterators) { __this__iterators.add(new IteratorSetting(other_element)); } @@ -529,60 +526,60 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ScanOptions other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ScanOptions typedOther = (ScanOptions)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(isSetRange()).compareTo(typedOther.isSetRange()); + lastComparison = Boolean.valueOf(isSetRange()).compareTo(other.isSetRange()); if (lastComparison != 0) { return lastComparison; } if (isSetRange()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.range, typedOther.range); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.range, other.range); 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(isSetBufferSize()).compareTo(typedOther.isSetBufferSize()); + lastComparison = Boolean.valueOf(isSetBufferSize()).compareTo(other.isSetBufferSize()); if (lastComparison != 0) { return lastComparison; } if (isSetBufferSize()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bufferSize, typedOther.bufferSize); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bufferSize, other.bufferSize); if (lastComparison != 0) { return lastComparison; } @@ -707,7 +704,7 @@ import org.slf4j.LoggerFactory; struct.authorizations = new HashSet<ByteBuffer>(2*_set26.size); for (int _i27 = 0; _i27 < _set26.size; ++_i27) { - ByteBuffer _elem28; // required + ByteBuffer _elem28; _elem28 = iprot.readBinary(); struct.authorizations.add(_elem28); } @@ -734,7 +731,7 @@ import org.slf4j.LoggerFactory; struct.columns = new ArrayList<ScanColumn>(_list29.size); for (int _i30 = 0; _i30 < _list29.size; ++_i30) { - ScanColumn _elem31; // required + ScanColumn _elem31; _elem31 = new ScanColumn(); _elem31.read(iprot); struct.columns.add(_elem31); @@ -753,7 +750,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList<IteratorSetting>(_list32.size); for (int _i33 = 0; _i33 < _list32.size; ++_i33) { - IteratorSetting _elem34; // required + IteratorSetting _elem34; _elem34 = new IteratorSetting(); _elem34.read(iprot); struct.iterators.add(_elem34); @@ -921,7 +918,7 @@ import org.slf4j.LoggerFactory; struct.authorizations = new HashSet<ByteBuffer>(2*_set41.size); for (int _i42 = 0; _i42 < _set41.size; ++_i42) { - ByteBuffer _elem43; // required + ByteBuffer _elem43; _elem43 = iprot.readBinary(); struct.authorizations.add(_elem43); } @@ -939,7 +936,7 @@ import org.slf4j.LoggerFactory; struct.columns = new ArrayList<ScanColumn>(_list44.size); for (int _i45 = 0; _i45 < _list44.size; ++_i45) { - ScanColumn _elem46; // required + ScanColumn _elem46; _elem46 = new ScanColumn(); _elem46.read(iprot); struct.columns.add(_elem46); @@ -953,7 +950,7 @@ import org.slf4j.LoggerFactory; struct.iterators = new ArrayList<IteratorSetting>(_list47.size); for (int _i48 = 0; _i48 < _list47.size; ++_i48) { - IteratorSetting _elem49; // required + IteratorSetting _elem49; _elem49 = new IteratorSetting(); _elem49.read(iprot); struct.iterators.add(_elem49); http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java index 4402910..02e1fe0 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.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 ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<ScanResult> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanResult"); private static final org.apache.thrift.protocol.TField RESULTS_FIELD_DESC = new org.apache.thrift.protocol.TField("results", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -156,7 +158,7 @@ import org.slf4j.LoggerFactory; public ScanResult(ScanResult other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetResults()) { - List<KeyValue> __this__results = new ArrayList<KeyValue>(); + List<KeyValue> __this__results = new ArrayList<KeyValue>(other.results.size()); for (KeyValue other_element : other.results) { __this__results.add(new KeyValue(other_element)); } @@ -325,30 +327,30 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(ScanResult other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ScanResult typedOther = (ScanResult)other; - lastComparison = Boolean.valueOf(isSetResults()).compareTo(typedOther.isSetResults()); + lastComparison = Boolean.valueOf(isSetResults()).compareTo(other.isSetResults()); if (lastComparison != 0) { return lastComparison; } if (isSetResults()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.results, typedOther.results); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.results, other.results); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMore()).compareTo(typedOther.isSetMore()); + lastComparison = Boolean.valueOf(isSetMore()).compareTo(other.isSetMore()); if (lastComparison != 0) { return lastComparison; } if (isSetMore()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.more, typedOther.more); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.more, other.more); if (lastComparison != 0) { return lastComparison; } @@ -436,7 +438,7 @@ import org.slf4j.LoggerFactory; struct.results = new ArrayList<KeyValue>(_list8.size); for (int _i9 = 0; _i9 < _list8.size; ++_i9) { - KeyValue _elem10; // required + KeyValue _elem10; _elem10 = new KeyValue(); _elem10.read(iprot); struct.results.add(_elem10); @@ -535,7 +537,7 @@ import org.slf4j.LoggerFactory; struct.results = new ArrayList<KeyValue>(_list13.size); for (int _i14 = 0; _i14 < _list13.size; ++_i14) { - KeyValue _elem15; // required + KeyValue _elem15; _elem15 = new KeyValue(); _elem15.read(iprot); struct.results.add(_elem15); http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java index add74bc..46608d1 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java index 4f2266f..e153997 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java index f03c781..40e61d0 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java index 1432b98..031de3a 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.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 TableExistsException extends TException implements org.apache.thrift.TBase<TableExistsException, TableExistsException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TableExistsException extends TException implements org.apache.thrift.TBase<TableExistsException, TableExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<TableExistsException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableExistsException"); 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(TableExistsException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TableExistsException typedOther = (TableExistsException)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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java index 36bc35a..6e8ec11 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.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 TableNotFoundException extends TException implements org.apache.thrift.TBase<TableNotFoundException, TableNotFoundException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TableNotFoundException extends TException implements org.apache.thrift.TBase<TableNotFoundException, TableNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<TableNotFoundException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableNotFoundException"); 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(TableNotFoundException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TableNotFoundException typedOther = (TableNotFoundException)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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java index 7c45d45..f36d933 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java index 2aaf9df..b497ecc 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java index a9958d7..a324af8 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.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 UnknownScanner extends TException implements org.apache.thrift.TBase<UnknownScanner, UnknownScanner._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class UnknownScanner extends TException implements org.apache.thrift.TBase<UnknownScanner, UnknownScanner._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownScanner> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownScanner"); 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(UnknownScanner other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - UnknownScanner typedOther = (UnknownScanner)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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java index 0c45a02..5b83ae5 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.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 UnknownWriter extends TException implements org.apache.thrift.TBase<UnknownWriter, UnknownWriter._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class UnknownWriter extends TException implements org.apache.thrift.TBase<UnknownWriter, UnknownWriter._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownWriter> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownWriter"); 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(UnknownWriter other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - UnknownWriter typedOther = (UnknownWriter)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/011c1760/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java index 4007ac9..5f000a8 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.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 WriterOptions implements org.apache.thrift.TBase<WriterOptions, WriterOptions._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class WriterOptions implements org.apache.thrift.TBase<WriterOptions, WriterOptions._Fields>, java.io.Serializable, Cloneable, Comparable<WriterOptions> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WriterOptions"); 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); @@ -423,50 +425,50 @@ import org.slf4j.LoggerFactory; return 0; } + @Override public int compareTo(WriterOptions other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - WriterOptions typedOther = (WriterOptions)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(isSetLatencyMs()).compareTo(typedOther.isSetLatencyMs()); + lastComparison = Boolean.valueOf(isSetLatencyMs()).compareTo(other.isSetLatencyMs()); if (lastComparison != 0) { return lastComparison; } if (isSetLatencyMs()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.latencyMs, typedOther.latencyMs); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.latencyMs, other.latencyMs); 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; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/proxy/src/main/python/AccumuloProxy-remote ---------------------------------------------------------------------- diff --git a/proxy/src/main/python/AccumuloProxy-remote b/proxy/src/main/python/AccumuloProxy-remote index b7056c8..b4292a2 100644 --- a/proxy/src/main/python/AccumuloProxy-remote +++ b/proxy/src/main/python/AccumuloProxy-remote @@ -14,7 +14,7 @@ # limitations under the License. #!/usr/bin/env python # -# 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 # @@ -29,8 +29,8 @@ from thrift.transport import TSocket from thrift.transport import THttpClient from thrift.protocol import TBinaryProtocol -import AccumuloProxy -from ttypes import * +from accumulo import AccumuloProxy +from accumulo.ttypes import * if len(sys.argv) <= 1 or sys.argv[1] == '--help': print ''