You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/06/19 02:57:20 UTC
[10/36] ACCUMULO-2773 Regenerate sources for Thrift 0.9.1
http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
index dc56b44..9b349ab 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/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<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> {
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)2);
@@ -290,21 +292,21 @@ import org.slf4j.LoggerFactory;
this.extent = new org.apache.accumulo.core.data.thrift.TKeyExtent(other.extent);
}
if (other.isSetColumns()) {
- List<org.apache.accumulo.core.data.thrift.TColumn> __this__columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>();
+ List<org.apache.accumulo.core.data.thrift.TColumn> __this__columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(other.columns.size());
for (org.apache.accumulo.core.data.thrift.TColumn other_element : other.columns) {
__this__columns.add(new org.apache.accumulo.core.data.thrift.TColumn(other_element));
}
this.columns = __this__columns;
}
if (other.isSetSsiList()) {
- List<org.apache.accumulo.core.data.thrift.IterInfo> __this__ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>();
+ List<org.apache.accumulo.core.data.thrift.IterInfo> __this__ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(other.ssiList.size());
for (org.apache.accumulo.core.data.thrift.IterInfo other_element : other.ssiList) {
__this__ssiList.add(new org.apache.accumulo.core.data.thrift.IterInfo(other_element));
}
this.ssiList = __this__ssiList;
}
if (other.isSetSsio()) {
- Map<String,Map<String,String>> __this__ssio = new HashMap<String,Map<String,String>>();
+ Map<String,Map<String,String>> __this__ssio = new HashMap<String,Map<String,String>>(other.ssio.size());
for (Map.Entry<String, Map<String,String>> other_element : other.ssio.entrySet()) {
String other_element_key = other_element.getKey();
@@ -312,30 +314,14 @@ import org.slf4j.LoggerFactory;
String __this__ssio_copy_key = other_element_key;
- Map<String,String> __this__ssio_copy_value = new HashMap<String,String>();
- for (Map.Entry<String, String> other_element_value_element : other_element_value.entrySet()) {
-
- String other_element_value_element_key = other_element_value_element.getKey();
- String other_element_value_element_value = other_element_value_element.getValue();
-
- String __this__ssio_copy_value_copy_key = other_element_value_element_key;
-
- String __this__ssio_copy_value_copy_value = other_element_value_element_value;
-
- __this__ssio_copy_value.put(__this__ssio_copy_value_copy_key, __this__ssio_copy_value_copy_value);
- }
+ Map<String,String> __this__ssio_copy_value = new HashMap<String,String>(other_element_value);
__this__ssio.put(__this__ssio_copy_key, __this__ssio_copy_value);
}
this.ssio = __this__ssio;
}
if (other.isSetAuthorizations()) {
- List<ByteBuffer> __this__authorizations = new ArrayList<ByteBuffer>();
- for (ByteBuffer other_element : other.authorizations) {
- ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element);
-;
- __this__authorizations.add(temp_binary_element);
- }
+ List<ByteBuffer> __this__authorizations = new ArrayList<ByteBuffer>(other.authorizations);
this.authorizations = __this__authorizations;
}
}
@@ -1027,130 +1013,130 @@ 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(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(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(isSetSsiList()).compareTo(typedOther.isSetSsiList());
+ lastComparison = Boolean.valueOf(isSetSsiList()).compareTo(other.isSetSsiList());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSsiList()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ssiList, typedOther.ssiList);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ssiList, other.ssiList);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetSsio()).compareTo(typedOther.isSetSsio());
+ lastComparison = Boolean.valueOf(isSetSsio()).compareTo(other.isSetSsio());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSsio()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ssio, typedOther.ssio);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ssio, other.ssio);
if (lastComparison != 0) {
return lastComparison;
}
}
- 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;
}
@@ -1382,7 +1368,7 @@ import org.slf4j.LoggerFactory;
struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list8.size);
for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
- org.apache.accumulo.core.data.thrift.TColumn _elem10; // required
+ org.apache.accumulo.core.data.thrift.TColumn _elem10;
_elem10 = new org.apache.accumulo.core.data.thrift.TColumn();
_elem10.read(iprot);
struct.columns.add(_elem10);
@@ -1401,7 +1387,7 @@ import org.slf4j.LoggerFactory;
struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list11.size);
for (int _i12 = 0; _i12 < _list11.size; ++_i12)
{
- org.apache.accumulo.core.data.thrift.IterInfo _elem13; // required
+ org.apache.accumulo.core.data.thrift.IterInfo _elem13;
_elem13 = new org.apache.accumulo.core.data.thrift.IterInfo();
_elem13.read(iprot);
struct.ssiList.add(_elem13);
@@ -1420,16 +1406,16 @@ import org.slf4j.LoggerFactory;
struct.ssio = new HashMap<String,Map<String,String>>(2*_map14.size);
for (int _i15 = 0; _i15 < _map14.size; ++_i15)
{
- String _key16; // required
- Map<String,String> _val17; // required
+ String _key16;
+ Map<String,String> _val17;
_key16 = iprot.readString();
{
org.apache.thrift.protocol.TMap _map18 = iprot.readMapBegin();
_val17 = new HashMap<String,String>(2*_map18.size);
for (int _i19 = 0; _i19 < _map18.size; ++_i19)
{
- String _key20; // required
- String _val21; // required
+ String _key20;
+ String _val21;
_key20 = iprot.readString();
_val21 = iprot.readString();
_val17.put(_key20, _val21);
@@ -1452,7 +1438,7 @@ import org.slf4j.LoggerFactory;
struct.authorizations = new ArrayList<ByteBuffer>(_list22.size);
for (int _i23 = 0; _i23 < _list22.size; ++_i23)
{
- ByteBuffer _elem24; // required
+ ByteBuffer _elem24;
_elem24 = iprot.readBinary();
struct.authorizations.add(_elem24);
}
@@ -1739,7 +1725,7 @@ import org.slf4j.LoggerFactory;
struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list35.size);
for (int _i36 = 0; _i36 < _list35.size; ++_i36)
{
- org.apache.accumulo.core.data.thrift.TColumn _elem37; // required
+ org.apache.accumulo.core.data.thrift.TColumn _elem37;
_elem37 = new org.apache.accumulo.core.data.thrift.TColumn();
_elem37.read(iprot);
struct.columns.add(_elem37);
@@ -1753,7 +1739,7 @@ import org.slf4j.LoggerFactory;
struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list38.size);
for (int _i39 = 0; _i39 < _list38.size; ++_i39)
{
- org.apache.accumulo.core.data.thrift.IterInfo _elem40; // required
+ org.apache.accumulo.core.data.thrift.IterInfo _elem40;
_elem40 = new org.apache.accumulo.core.data.thrift.IterInfo();
_elem40.read(iprot);
struct.ssiList.add(_elem40);
@@ -1767,16 +1753,16 @@ import org.slf4j.LoggerFactory;
struct.ssio = new HashMap<String,Map<String,String>>(2*_map41.size);
for (int _i42 = 0; _i42 < _map41.size; ++_i42)
{
- String _key43; // required
- Map<String,String> _val44; // required
+ String _key43;
+ Map<String,String> _val44;
_key43 = iprot.readString();
{
org.apache.thrift.protocol.TMap _map45 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
_val44 = new HashMap<String,String>(2*_map45.size);
for (int _i46 = 0; _i46 < _map45.size; ++_i46)
{
- String _key47; // required
- String _val48; // required
+ String _key47;
+ String _val48;
_key47 = iprot.readString();
_val48 = iprot.readString();
_val44.put(_key47, _val48);
@@ -1793,7 +1779,7 @@ import org.slf4j.LoggerFactory;
struct.authorizations = new ArrayList<ByteBuffer>(_list49.size);
for (int _i50 = 0; _i50 < _list49.size; ++_i50)
{
- ByteBuffer _elem51; // required
+ ByteBuffer _elem51;
_elem51 = iprot.readBinary();
struct.authorizations.add(_elem51);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
index d8d3d6b..36cce96 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/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/011c1760/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
index 8ad54fc..b4fdf68 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/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/011c1760/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
index 98f6642..9515903 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.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 ConstraintViolationException extends TException implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class ConstraintViolationException extends TException implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable, Comparable<ConstraintViolationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConstraintViolationException");
private static final org.apache.thrift.protocol.TField VIOLATION_SUMMARIES_FIELD_DESC = new org.apache.thrift.protocol.TField("violationSummaries", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -143,7 +145,7 @@ import org.slf4j.LoggerFactory;
*/
public ConstraintViolationException(ConstraintViolationException other) {
if (other.isSetViolationSummaries()) {
- List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> __this__violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>();
+ List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> __this__violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(other.violationSummaries.size());
for (org.apache.accumulo.core.data.thrift.TConstraintViolationSummary other_element : other.violationSummaries) {
__this__violationSummaries.add(new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary(other_element));
}
@@ -264,20 +266,20 @@ import org.slf4j.LoggerFactory;
return 0;
}
+ @Override
public int compareTo(ConstraintViolationException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- ConstraintViolationException typedOther = (ConstraintViolationException)other;
- lastComparison = Boolean.valueOf(isSetViolationSummaries()).compareTo(typedOther.isSetViolationSummaries());
+ lastComparison = Boolean.valueOf(isSetViolationSummaries()).compareTo(other.isSetViolationSummaries());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetViolationSummaries()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.violationSummaries, typedOther.violationSummaries);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.violationSummaries, other.violationSummaries);
if (lastComparison != 0) {
return lastComparison;
}
@@ -359,7 +361,7 @@ import org.slf4j.LoggerFactory;
struct.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
- org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem2; // required
+ org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem2;
_elem2 = new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary();
_elem2.read(iprot);
struct.violationSummaries.add(_elem2);
@@ -441,7 +443,7 @@ import org.slf4j.LoggerFactory;
struct.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6)
{
- org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem7; // required
+ org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem7;
_elem7 = new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary();
_elem7.read(iprot);
struct.violationSummaries.add(_elem7);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
index 03722be..1a05071 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.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 IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, IteratorConfig._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, IteratorConfig._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorConfig> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IteratorConfig");
private static final org.apache.thrift.protocol.TField ITERATORS_FIELD_DESC = new org.apache.thrift.protocol.TField("iterators", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -143,7 +145,7 @@ import org.slf4j.LoggerFactory;
*/
public IteratorConfig(IteratorConfig other) {
if (other.isSetIterators()) {
- List<TIteratorSetting> __this__iterators = new ArrayList<TIteratorSetting>();
+ List<TIteratorSetting> __this__iterators = new ArrayList<TIteratorSetting>(other.iterators.size());
for (TIteratorSetting other_element : other.iterators) {
__this__iterators.add(new TIteratorSetting(other_element));
}
@@ -264,20 +266,20 @@ import org.slf4j.LoggerFactory;
return 0;
}
+ @Override
public int compareTo(IteratorConfig other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- IteratorConfig typedOther = (IteratorConfig)other;
- 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;
}
@@ -359,7 +361,7 @@ import org.slf4j.LoggerFactory;
struct.iterators = new ArrayList<TIteratorSetting>(_list98.size);
for (int _i99 = 0; _i99 < _list98.size; ++_i99)
{
- TIteratorSetting _elem100; // required
+ TIteratorSetting _elem100;
_elem100 = new TIteratorSetting();
_elem100.read(iprot);
struct.iterators.add(_elem100);
@@ -441,7 +443,7 @@ import org.slf4j.LoggerFactory;
struct.iterators = new ArrayList<TIteratorSetting>(_list103.size);
for (int _i104 = 0; _i104 < _list103.size; ++_i104)
{
- TIteratorSetting _elem105; // required
+ TIteratorSetting _elem105;
_elem105 = new TIteratorSetting();
_elem105.read(iprot);
struct.iterators.add(_elem105);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
index b840129..79f664f 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.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 NoSuchScanIDException extends TException implements org.apache.thrift.TBase<NoSuchScanIDException, NoSuchScanIDException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class NoSuchScanIDException extends TException implements org.apache.thrift.TBase<NoSuchScanIDException, NoSuchScanIDException._Fields>, java.io.Serializable, Cloneable, Comparable<NoSuchScanIDException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchScanIDException");
@@ -179,13 +181,13 @@ import org.slf4j.LoggerFactory;
return 0;
}
+ @Override
public int compareTo(NoSuchScanIDException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- NoSuchScanIDException typedOther = (NoSuchScanIDException)other;
return 0;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
index fa03414..c43b5c0 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.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 NotServingTabletException extends TException implements org.apache.thrift.TBase<NotServingTabletException, NotServingTabletException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class NotServingTabletException extends TException implements org.apache.thrift.TBase<NotServingTabletException, NotServingTabletException._Fields>, java.io.Serializable, Cloneable, Comparable<NotServingTabletException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotServingTabletException");
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);
@@ -244,20 +246,20 @@ import org.slf4j.LoggerFactory;
return 0;
}
+ @Override
public int compareTo(NotServingTabletException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- NotServingTabletException typedOther = (NotServingTabletException)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;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
index dd30c9a..c676599 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/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/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
index a5e06ac..cb333a5 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/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/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
index a23d9bb..f457311 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.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 TIteratorSetting implements org.apache.thrift.TBase<TIteratorSetting, TIteratorSetting._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSetting, TIteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<TIteratorSetting> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIteratorSetting");
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<String,String> __this__properties = new HashMap<String,String>();
- for (Map.Entry<String, String> 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<String,String> __this__properties = new HashMap<String,String>(other.properties);
this.properties = __this__properties;
}
}
@@ -448,50 +439,50 @@ import org.slf4j.LoggerFactory;
return 0;
}
+ @Override
public int compareTo(TIteratorSetting other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- TIteratorSetting typedOther = (TIteratorSetting)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<String,String>(2*_map88.size);
for (int _i89 = 0; _i89 < _map88.size; ++_i89)
{
- String _key90; // required
- String _val91; // required
+ String _key90;
+ String _val91;
_key90 = iprot.readString();
_val91 = iprot.readString();
struct.properties.put(_key90, _val91);
@@ -747,8 +738,8 @@ import org.slf4j.LoggerFactory;
struct.properties = new HashMap<String,String>(2*_map94.size);
for (int _i95 = 0; _i95 < _map94.size; ++_i95)
{
- String _key96; // required
- String _val97; // required
+ String _key96;
+ String _val97;
_key96 = iprot.readString();
_val97 = iprot.readString();
struct.properties.put(_key96, _val97);