You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2011/10/27 17:25:17 UTC
svn commit: r1189806 [10/46] - in /incubator/accumulo: branches/1.3/contrib/
branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/
branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/admin/
branches/1.3/src/core/src/main/...
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java Thu Oct 27 15:24:51 2011
@@ -5,65 +5,61 @@
*/
package org.apache.accumulo.core.gc.thrift;
-
-
import org.apache.thrift.*;
import org.apache.thrift.meta_data.*;
import org.apache.thrift.protocol.*;
public class GCMonitorService {
-
+
public interface Iface {
-
- public GCStatus getStatus(cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, TException;
-
+
+ public GCStatus getStatus(cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials)
+ throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, TException;
+
}
-
+
public static class Client implements TServiceClient, Iface {
public static class Factory implements TServiceClientFactory<Client> {
public Factory() {}
+
public Client getClient(TProtocol prot) {
return new Client(prot);
}
+
public Client getClient(TProtocol iprot, TProtocol oprot) {
return new Client(iprot, oprot);
}
}
-
- public Client(TProtocol prot)
- {
+
+ public Client(TProtocol prot) {
this(prot, prot);
}
-
- public Client(TProtocol iprot, TProtocol oprot)
- {
+
+ public Client(TProtocol iprot, TProtocol oprot) {
iprot_ = iprot;
oprot_ = oprot;
}
-
+
protected TProtocol iprot_;
protected TProtocol oprot_;
-
+
protected int seqid_;
-
- public TProtocol getInputProtocol()
- {
+
+ public TProtocol getInputProtocol() {
return this.iprot_;
}
-
- public TProtocol getOutputProtocol()
- {
+
+ public TProtocol getOutputProtocol() {
return this.oprot_;
}
-
- public GCStatus getStatus(cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, TException
- {
+
+ public GCStatus getStatus(cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials)
+ throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, TException {
send_getStatus(tinfo, credentials);
return recv_getStatus();
}
-
- public void send_getStatus(cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials) throws TException
- {
+
+ public void send_getStatus(cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials) throws TException {
oprot_.writeMessageBegin(new TMessage("getStatus", TMessageType.CALL, ++seqid_));
getStatus_args args = new getStatus_args();
args.setTinfo(tinfo);
@@ -72,9 +68,8 @@ public class GCMonitorService {
oprot_.writeMessageEnd();
oprot_.getTransport().flush();
}
-
- public GCStatus recv_getStatus() throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, TException
- {
+
+ public GCStatus recv_getStatus() throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, TException {
TMessage msg = iprot_.readMessageBegin();
if (msg.type == TMessageType.EXCEPTION) {
TApplicationException x = TApplicationException.read(iprot_);
@@ -95,31 +90,31 @@ public class GCMonitorService {
}
throw new TApplicationException(TApplicationException.MISSING_RESULT, "getStatus failed: unknown result");
}
-
+
}
+
public static class Processor implements TProcessor {
private static final org.slf4j.Logger LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
- public Processor(Iface iface)
- {
+
+ public Processor(Iface iface) {
iface_ = iface;
processMap_.put("getStatus", new getStatus());
}
-
+
protected static interface ProcessFunction {
public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException;
}
-
+
private Iface iface_;
protected final java.util.HashMap<String,ProcessFunction> processMap_ = new java.util.HashMap<String,ProcessFunction>();
-
- public boolean process(TProtocol iprot, TProtocol oprot) throws TException
- {
+
+ public boolean process(TProtocol iprot, TProtocol oprot) throws TException {
TMessage msg = iprot.readMessageBegin();
ProcessFunction fn = processMap_.get(msg.name);
if (fn == null) {
TProtocolUtil.skip(iprot, TType.STRUCT);
iprot.readMessageEnd();
- TApplicationException x = new TApplicationException(TApplicationException.UNKNOWN_METHOD, "Invalid method name: '"+msg.name+"'");
+ TApplicationException x = new TApplicationException(TApplicationException.UNKNOWN_METHOD, "Invalid method name: '" + msg.name + "'");
oprot.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));
x.write(oprot);
oprot.writeMessageEnd();
@@ -129,10 +124,9 @@ public class GCMonitorService {
fn.process(msg.seqid, iprot, oprot);
return true;
}
-
+
private class getStatus implements ProcessFunction {
- public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
- {
+ public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException {
getStatus_args args = new getStatus_args();
try {
args.read(iprot);
@@ -165,39 +159,38 @@ public class GCMonitorService {
oprot.writeMessageEnd();
oprot.getTransport().flush();
}
-
+
}
-
+
}
-
+
@SuppressWarnings("serial")
- public static class getStatus_args implements TBase<getStatus_args, getStatus_args._Fields>, java.io.Serializable, Cloneable {
+ public static class getStatus_args implements TBase<getStatus_args,getStatus_args._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("getStatus_args");
-
- private static final TField TINFO_FIELD_DESC = new TField("tinfo", TType.STRUCT, (short)2);
- private static final TField CREDENTIALS_FIELD_DESC = new TField("credentials", TType.STRUCT, (short)1);
-
+
+ private static final TField TINFO_FIELD_DESC = new TField("tinfo", TType.STRUCT, (short) 2);
+ private static final TField CREDENTIALS_FIELD_DESC = new TField("credentials", TType.STRUCT, (short) 1);
+
public cloudtrace.thrift.TInfo tinfo;
public org.apache.accumulo.core.security.thrift.AuthInfo credentials;
-
+
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements TFieldIdEnum {
- TINFO((short)2, "tinfo"),
- CREDENTIALS((short)1, "credentials");
-
- private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+ TINFO((short) 2, "tinfo"), CREDENTIALS((short) 1, "credentials");
+
+ private static final java.util.Map<String,_Fields> byName = new java.util.HashMap<String,_Fields>();
+
static {
for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
-
+
/**
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
+ switch (fieldId) {
case 2: // TINFO
return TINFO;
case 1: // CREDENTIALS
@@ -206,66 +199,61 @@ public class GCMonitorService {
return null;
}
}
-
+
/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
+ * Find the _Fields constant that matches fieldId, throwing an exception if it is not found.
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null)
+ throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
-
+
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
public static _Fields findByName(String name) {
return byName.get(name);
}
-
+
private final short _thriftId;
private final String _fieldName;
-
+
_Fields(short thriftId, String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
-
+
public short getThriftFieldId() {
return _thriftId;
}
-
+
public String getFieldName() {
return _fieldName;
}
}
-
+
// isset id assignments
-
- public static final java.util.Map<_Fields, FieldMetaData> metaDataMap;
+
+ public static final java.util.Map<_Fields,FieldMetaData> metaDataMap;
static {
- java.util.Map<_Fields, FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.TINFO, new FieldMetaData("tinfo", TFieldRequirementType.DEFAULT,
- new StructMetaData(TType.STRUCT, cloudtrace.thrift.TInfo.class)));
- tmpMap.put(_Fields.CREDENTIALS, new FieldMetaData("credentials", TFieldRequirementType.DEFAULT,
- new StructMetaData(TType.STRUCT, org.apache.accumulo.core.security.thrift.AuthInfo.class)));
+ java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.TINFO, new FieldMetaData("tinfo", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT, cloudtrace.thrift.TInfo.class)));
+ tmpMap.put(_Fields.CREDENTIALS, new FieldMetaData("credentials", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT,
+ org.apache.accumulo.core.security.thrift.AuthInfo.class)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(getStatus_args.class, metaDataMap);
}
-
- public getStatus_args() {
- }
-
- public getStatus_args(
- cloudtrace.thrift.TInfo tinfo,
- org.apache.accumulo.core.security.thrift.AuthInfo credentials)
- {
+
+ public getStatus_args() {}
+
+ public getStatus_args(cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials) {
this();
this.tinfo = tinfo;
this.credentials = credentials;
}
-
+
/**
* Performs a deep copy on <i>other</i>.
*/
@@ -277,133 +265,133 @@ public class GCMonitorService {
this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo(other.credentials);
}
}
-
+
public getStatus_args deepCopy() {
return new getStatus_args(this);
}
-
+
@Deprecated
public getStatus_args clone() {
return new getStatus_args(this);
}
-
+
public cloudtrace.thrift.TInfo getTinfo() {
return this.tinfo;
}
-
+
public getStatus_args setTinfo(cloudtrace.thrift.TInfo tinfo) {
this.tinfo = tinfo;
return this;
}
-
+
public void unsetTinfo() {
this.tinfo = null;
}
-
+
/** Returns true if field tinfo is set (has been asigned a value) and false otherwise */
public boolean isSetTinfo() {
return this.tinfo != null;
}
-
+
public void setTinfoIsSet(boolean value) {
if (!value) {
this.tinfo = null;
}
}
-
+
public org.apache.accumulo.core.security.thrift.AuthInfo getCredentials() {
return this.credentials;
}
-
+
public getStatus_args setCredentials(org.apache.accumulo.core.security.thrift.AuthInfo credentials) {
this.credentials = credentials;
return this;
}
-
+
public void unsetCredentials() {
this.credentials = null;
}
-
+
/** Returns true if field credentials is set (has been asigned a value) and false otherwise */
public boolean isSetCredentials() {
return this.credentials != null;
}
-
+
public void setCredentialsIsSet(boolean value) {
if (!value) {
this.credentials = null;
}
}
-
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case TINFO:
- if (value == null) {
- unsetTinfo();
- } else {
- setTinfo((cloudtrace.thrift.TInfo)value);
- }
- break;
-
- case CREDENTIALS:
- if (value == null) {
- unsetCredentials();
- } else {
- setCredentials((org.apache.accumulo.core.security.thrift.AuthInfo)value);
- }
- break;
-
+ case TINFO:
+ if (value == null) {
+ unsetTinfo();
+ } else {
+ setTinfo((cloudtrace.thrift.TInfo) value);
+ }
+ break;
+
+ case CREDENTIALS:
+ if (value == null) {
+ unsetCredentials();
+ } else {
+ setCredentials((org.apache.accumulo.core.security.thrift.AuthInfo) value);
+ }
+ break;
+
}
}
-
+
public void setFieldValue(int fieldID, Object value) {
setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
}
-
+
public Object getFieldValue(_Fields field) {
switch (field) {
- case TINFO:
- return getTinfo();
-
- case CREDENTIALS:
- return getCredentials();
-
+ case TINFO:
+ return getTinfo();
+
+ case CREDENTIALS:
+ return getCredentials();
+
}
throw new IllegalStateException();
}
-
+
public Object getFieldValue(int fieldId) {
return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId));
}
-
+
/** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
public boolean isSet(_Fields field) {
switch (field) {
- case TINFO:
- return isSetTinfo();
- case CREDENTIALS:
- return isSetCredentials();
+ case TINFO:
+ return isSetTinfo();
+ case CREDENTIALS:
+ return isSetCredentials();
}
throw new IllegalStateException();
}
-
+
public boolean isSet(int fieldID) {
return isSet(_Fields.findByThriftIdOrThrow(fieldID));
}
-
+
@Override
public boolean equals(Object that) {
if (that == null)
return false;
if (that instanceof getStatus_args)
- return this.equals((getStatus_args)that);
+ return this.equals((getStatus_args) that);
return false;
}
-
+
public boolean equals(getStatus_args that) {
if (that == null)
return false;
-
+
boolean this_present_tinfo = true && this.isSetTinfo();
boolean that_present_tinfo = true && that.isSetTinfo();
if (this_present_tinfo || that_present_tinfo) {
@@ -412,7 +400,7 @@ public class GCMonitorService {
if (!this.tinfo.equals(that.tinfo))
return false;
}
-
+
boolean this_present_credentials = true && this.isSetCredentials();
boolean that_present_credentials = true && that.isSetCredentials();
if (this_present_credentials || that_present_credentials) {
@@ -421,28 +409,29 @@ public class GCMonitorService {
if (!this.credentials.equals(that.credentials))
return false;
}
-
+
return true;
}
-
+
@Override
public int hashCode() {
return 0;
}
-
+
public int compareTo(getStatus_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
-
+
int lastComparison = 0;
- getStatus_args typedOther = (getStatus_args)other;
-
+ getStatus_args typedOther = (getStatus_args) other;
+
lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(typedOther.isSetTinfo());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetTinfo()) { lastComparison = TBaseHelper.compareTo(this.tinfo, typedOther.tinfo);
+ if (isSetTinfo()) {
+ lastComparison = TBaseHelper.compareTo(this.tinfo, typedOther.tinfo);
if (lastComparison != 0) {
return lastComparison;
}
@@ -451,21 +440,21 @@ public class GCMonitorService {
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetCredentials()) { lastComparison = TBaseHelper.compareTo(this.credentials, typedOther.credentials);
+ if (isSetCredentials()) {
+ lastComparison = TBaseHelper.compareTo(this.credentials, typedOther.credentials);
if (lastComparison != 0) {
return lastComparison;
}
}
return 0;
}
-
+
public void read(TProtocol iprot) throws TException {
TField field;
iprot.readStructBegin();
- while (true)
- {
+ while (true) {
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == TType.STOP) {
break;
}
switch (field.id) {
@@ -473,7 +462,7 @@ public class GCMonitorService {
if (field.type == TType.STRUCT) {
this.tinfo = new cloudtrace.thrift.TInfo();
this.tinfo.read(iprot);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -481,7 +470,7 @@ public class GCMonitorService {
if (field.type == TType.STRUCT) {
this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo();
this.credentials.read(iprot);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -491,14 +480,14 @@ public class GCMonitorService {
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
+
// check for required fields of primitive type, which can't be checked in the validate method
validate();
}
-
+
public void write(TProtocol oprot) throws TException {
validate();
-
+
oprot.writeStructBegin(STRUCT_DESC);
if (this.credentials != null) {
oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
@@ -513,7 +502,7 @@ public class GCMonitorService {
oprot.writeFieldStop();
oprot.writeStructEnd();
}
-
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder("getStatus_args(");
@@ -533,41 +522,40 @@ public class GCMonitorService {
sb.append(")");
return sb.toString();
}
-
+
public void validate() throws TException {
// check for required fields
}
-
+
}
-
+
@SuppressWarnings("serial")
- public static class getStatus_result implements TBase<getStatus_result, getStatus_result._Fields>, java.io.Serializable, Cloneable {
+ public static class getStatus_result implements TBase<getStatus_result,getStatus_result._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("getStatus_result");
-
- private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short)0);
- private static final TField SEC_FIELD_DESC = new TField("sec", TType.STRUCT, (short)1);
-
+
+ private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short) 0);
+ private static final TField SEC_FIELD_DESC = new TField("sec", TType.STRUCT, (short) 1);
+
public GCStatus success;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec;
-
+
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements TFieldIdEnum {
- SUCCESS((short)0, "success"),
- SEC((short)1, "sec");
-
- private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+ SUCCESS((short) 0, "success"), SEC((short) 1, "sec");
+
+ private static final java.util.Map<String,_Fields> byName = new java.util.HashMap<String,_Fields>();
+
static {
for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
-
+
/**
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
+ switch (fieldId) {
case 0: // SUCCESS
return SUCCESS;
case 1: // SEC
@@ -576,66 +564,60 @@ public class GCMonitorService {
return null;
}
}
-
+
/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
+ * Find the _Fields constant that matches fieldId, throwing an exception if it is not found.
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null)
+ throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
-
+
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
public static _Fields findByName(String name) {
return byName.get(name);
}
-
+
private final short _thriftId;
private final String _fieldName;
-
+
_Fields(short thriftId, String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
-
+
public short getThriftFieldId() {
return _thriftId;
}
-
+
public String getFieldName() {
return _fieldName;
}
}
-
+
// isset id assignments
-
- public static final java.util.Map<_Fields, FieldMetaData> metaDataMap;
+
+ public static final java.util.Map<_Fields,FieldMetaData> metaDataMap;
static {
- java.util.Map<_Fields, FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT,
- new StructMetaData(TType.STRUCT, GCStatus.class)));
- tmpMap.put(_Fields.SEC, new FieldMetaData("sec", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.STRUCT)));
+ java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT, GCStatus.class)));
+ tmpMap.put(_Fields.SEC, new FieldMetaData("sec", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.STRUCT)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(getStatus_result.class, metaDataMap);
}
-
- public getStatus_result() {
- }
-
- public getStatus_result(
- GCStatus success,
- org.apache.accumulo.core.security.thrift.ThriftSecurityException sec)
- {
+
+ public getStatus_result() {}
+
+ public getStatus_result(GCStatus success, org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) {
this();
this.success = success;
this.sec = sec;
}
-
+
/**
* Performs a deep copy on <i>other</i>.
*/
@@ -647,133 +629,133 @@ public class GCMonitorService {
this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(other.sec);
}
}
-
+
public getStatus_result deepCopy() {
return new getStatus_result(this);
}
-
+
@Deprecated
public getStatus_result clone() {
return new getStatus_result(this);
}
-
+
public GCStatus getSuccess() {
return this.success;
}
-
+
public getStatus_result setSuccess(GCStatus success) {
this.success = success;
return this;
}
-
+
public void unsetSuccess() {
this.success = null;
}
-
+
/** Returns true if field success is set (has been asigned a value) and false otherwise */
public boolean isSetSuccess() {
return this.success != null;
}
-
+
public void setSuccessIsSet(boolean value) {
if (!value) {
this.success = null;
}
}
-
+
public org.apache.accumulo.core.security.thrift.ThriftSecurityException getSec() {
return this.sec;
}
-
+
public getStatus_result setSec(org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) {
this.sec = sec;
return this;
}
-
+
public void unsetSec() {
this.sec = null;
}
-
+
/** Returns true if field sec is set (has been asigned a value) and false otherwise */
public boolean isSetSec() {
return this.sec != null;
}
-
+
public void setSecIsSet(boolean value) {
if (!value) {
this.sec = null;
}
}
-
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case SUCCESS:
- if (value == null) {
- unsetSuccess();
- } else {
- setSuccess((GCStatus)value);
- }
- break;
-
- case SEC:
- if (value == null) {
- unsetSec();
- } else {
- setSec((org.apache.accumulo.core.security.thrift.ThriftSecurityException)value);
- }
- break;
-
+ case SUCCESS:
+ if (value == null) {
+ unsetSuccess();
+ } else {
+ setSuccess((GCStatus) value);
+ }
+ break;
+
+ case SEC:
+ if (value == null) {
+ unsetSec();
+ } else {
+ setSec((org.apache.accumulo.core.security.thrift.ThriftSecurityException) value);
+ }
+ break;
+
}
}
-
+
public void setFieldValue(int fieldID, Object value) {
setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
}
-
+
public Object getFieldValue(_Fields field) {
switch (field) {
- case SUCCESS:
- return getSuccess();
-
- case SEC:
- return getSec();
-
+ case SUCCESS:
+ return getSuccess();
+
+ case SEC:
+ return getSec();
+
}
throw new IllegalStateException();
}
-
+
public Object getFieldValue(int fieldId) {
return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId));
}
-
+
/** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
public boolean isSet(_Fields field) {
switch (field) {
- case SUCCESS:
- return isSetSuccess();
- case SEC:
- return isSetSec();
+ case SUCCESS:
+ return isSetSuccess();
+ case SEC:
+ return isSetSec();
}
throw new IllegalStateException();
}
-
+
public boolean isSet(int fieldID) {
return isSet(_Fields.findByThriftIdOrThrow(fieldID));
}
-
+
@Override
public boolean equals(Object that) {
if (that == null)
return false;
if (that instanceof getStatus_result)
- return this.equals((getStatus_result)that);
+ return this.equals((getStatus_result) that);
return false;
}
-
+
public boolean equals(getStatus_result that) {
if (that == null)
return false;
-
+
boolean this_present_success = true && this.isSetSuccess();
boolean that_present_success = true && that.isSetSuccess();
if (this_present_success || that_present_success) {
@@ -782,7 +764,7 @@ public class GCMonitorService {
if (!this.success.equals(that.success))
return false;
}
-
+
boolean this_present_sec = true && this.isSetSec();
boolean that_present_sec = true && that.isSetSec();
if (this_present_sec || that_present_sec) {
@@ -791,28 +773,29 @@ public class GCMonitorService {
if (!this.sec.equals(that.sec))
return false;
}
-
+
return true;
}
-
+
@Override
public int hashCode() {
return 0;
}
-
+
public int compareTo(getStatus_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
-
+
int lastComparison = 0;
- getStatus_result typedOther = (getStatus_result)other;
-
+ getStatus_result typedOther = (getStatus_result) other;
+
lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetSuccess()) { lastComparison = TBaseHelper.compareTo(this.success, typedOther.success);
+ if (isSetSuccess()) {
+ lastComparison = TBaseHelper.compareTo(this.success, typedOther.success);
if (lastComparison != 0) {
return lastComparison;
}
@@ -821,21 +804,21 @@ public class GCMonitorService {
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetSec()) { lastComparison = TBaseHelper.compareTo(this.sec, typedOther.sec);
+ if (isSetSec()) {
+ lastComparison = TBaseHelper.compareTo(this.sec, typedOther.sec);
if (lastComparison != 0) {
return lastComparison;
}
}
return 0;
}
-
+
public void read(TProtocol iprot) throws TException {
TField field;
iprot.readStructBegin();
- while (true)
- {
+ while (true) {
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == TType.STOP) {
break;
}
switch (field.id) {
@@ -843,7 +826,7 @@ public class GCMonitorService {
if (field.type == TType.STRUCT) {
this.success = new GCStatus();
this.success.read(iprot);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -851,7 +834,7 @@ public class GCMonitorService {
if (field.type == TType.STRUCT) {
this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException();
this.sec.read(iprot);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -861,14 +844,14 @@ public class GCMonitorService {
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
+
// check for required fields of primitive type, which can't be checked in the validate method
validate();
}
-
+
public void write(TProtocol oprot) throws TException {
oprot.writeStructBegin(STRUCT_DESC);
-
+
if (this.isSetSuccess()) {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
this.success.write(oprot);
@@ -881,7 +864,7 @@ public class GCMonitorService {
oprot.writeFieldStop();
oprot.writeStructEnd();
}
-
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder("getStatus_result(");
@@ -901,11 +884,11 @@ public class GCMonitorService {
sb.append(")");
return sb.toString();
}
-
+
public void validate() throws TException {
// check for required fields
}
-
+
}
-
+
}
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java Thu Oct 27 15:24:51 2011
@@ -5,46 +5,41 @@
*/
package org.apache.accumulo.core.gc.thrift;
-
-
import org.apache.thrift.*;
import org.apache.thrift.meta_data.*;
import org.apache.thrift.protocol.*;
@SuppressWarnings("serial")
-public class GCStatus implements TBase<GCStatus, GCStatus._Fields>, java.io.Serializable, Cloneable {
+public class GCStatus implements TBase<GCStatus,GCStatus._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("GCStatus");
-
- private static final TField LAST_FIELD_DESC = new TField("last", TType.STRUCT, (short)1);
- private static final TField LAST_LOG_FIELD_DESC = new TField("lastLog", TType.STRUCT, (short)2);
- private static final TField CURRENT_FIELD_DESC = new TField("current", TType.STRUCT, (short)3);
- private static final TField CURRENT_LOG_FIELD_DESC = new TField("currentLog", TType.STRUCT, (short)4);
-
+
+ private static final TField LAST_FIELD_DESC = new TField("last", TType.STRUCT, (short) 1);
+ private static final TField LAST_LOG_FIELD_DESC = new TField("lastLog", TType.STRUCT, (short) 2);
+ private static final TField CURRENT_FIELD_DESC = new TField("current", TType.STRUCT, (short) 3);
+ private static final TField CURRENT_LOG_FIELD_DESC = new TField("currentLog", TType.STRUCT, (short) 4);
+
public GcCycleStats last;
public GcCycleStats lastLog;
public GcCycleStats current;
public GcCycleStats currentLog;
-
+
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements TFieldIdEnum {
- LAST((short)1, "last"),
- LAST_LOG((short)2, "lastLog"),
- CURRENT((short)3, "current"),
- CURRENT_LOG((short)4, "currentLog");
-
- private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+ LAST((short) 1, "last"), LAST_LOG((short) 2, "lastLog"), CURRENT((short) 3, "current"), CURRENT_LOG((short) 4, "currentLog");
+
+ private static final java.util.Map<String,_Fields> byName = new java.util.HashMap<String,_Fields>();
+
static {
for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
-
+
/**
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
+ switch (fieldId) {
case 1: // LAST
return LAST;
case 2: // LAST_LOG
@@ -57,74 +52,64 @@ public class GCStatus implements TBase<G
return null;
}
}
-
+
/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
+ * Find the _Fields constant that matches fieldId, throwing an exception if it is not found.
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null)
+ throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
-
+
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
public static _Fields findByName(String name) {
return byName.get(name);
}
-
+
private final short _thriftId;
private final String _fieldName;
-
+
_Fields(short thriftId, String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
-
+
public short getThriftFieldId() {
return _thriftId;
}
-
+
public String getFieldName() {
return _fieldName;
}
}
-
+
// isset id assignments
-
- public static final java.util.Map<_Fields, FieldMetaData> metaDataMap;
+
+ public static final java.util.Map<_Fields,FieldMetaData> metaDataMap;
static {
- java.util.Map<_Fields, FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.LAST, new FieldMetaData("last", TFieldRequirementType.DEFAULT,
- new StructMetaData(TType.STRUCT, GcCycleStats.class)));
- tmpMap.put(_Fields.LAST_LOG, new FieldMetaData("lastLog", TFieldRequirementType.DEFAULT,
- new StructMetaData(TType.STRUCT, GcCycleStats.class)));
- tmpMap.put(_Fields.CURRENT, new FieldMetaData("current", TFieldRequirementType.DEFAULT,
- new StructMetaData(TType.STRUCT, GcCycleStats.class)));
- tmpMap.put(_Fields.CURRENT_LOG, new FieldMetaData("currentLog", TFieldRequirementType.DEFAULT,
- new StructMetaData(TType.STRUCT, GcCycleStats.class)));
+ java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.LAST, new FieldMetaData("last", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT, GcCycleStats.class)));
+ tmpMap.put(_Fields.LAST_LOG, new FieldMetaData("lastLog", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT, GcCycleStats.class)));
+ tmpMap.put(_Fields.CURRENT, new FieldMetaData("current", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT, GcCycleStats.class)));
+ tmpMap.put(_Fields.CURRENT_LOG, new FieldMetaData("currentLog", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT, GcCycleStats.class)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(GCStatus.class, metaDataMap);
}
-
- public GCStatus() {
- }
-
- public GCStatus(
- GcCycleStats last,
- GcCycleStats lastLog,
- GcCycleStats current,
- GcCycleStats currentLog)
- {
+
+ public GCStatus() {}
+
+ public GCStatus(GcCycleStats last, GcCycleStats lastLog, GcCycleStats current, GcCycleStats currentLog) {
this();
this.last = last;
this.lastLog = lastLog;
this.current = current;
this.currentLog = currentLog;
}
-
+
/**
* Performs a deep copy on <i>other</i>.
*/
@@ -142,207 +127,207 @@ public class GCStatus implements TBase<G
this.currentLog = new GcCycleStats(other.currentLog);
}
}
-
+
public GCStatus deepCopy() {
return new GCStatus(this);
}
-
+
@Deprecated
public GCStatus clone() {
return new GCStatus(this);
}
-
+
public GcCycleStats getLast() {
return this.last;
}
-
+
public GCStatus setLast(GcCycleStats last) {
this.last = last;
return this;
}
-
+
public void unsetLast() {
this.last = null;
}
-
+
/** Returns true if field last is set (has been asigned a value) and false otherwise */
public boolean isSetLast() {
return this.last != null;
}
-
+
public void setLastIsSet(boolean value) {
if (!value) {
this.last = null;
}
}
-
+
public GcCycleStats getLastLog() {
return this.lastLog;
}
-
+
public GCStatus setLastLog(GcCycleStats lastLog) {
this.lastLog = lastLog;
return this;
}
-
+
public void unsetLastLog() {
this.lastLog = null;
}
-
+
/** Returns true if field lastLog is set (has been asigned a value) and false otherwise */
public boolean isSetLastLog() {
return this.lastLog != null;
}
-
+
public void setLastLogIsSet(boolean value) {
if (!value) {
this.lastLog = null;
}
}
-
+
public GcCycleStats getCurrent() {
return this.current;
}
-
+
public GCStatus setCurrent(GcCycleStats current) {
this.current = current;
return this;
}
-
+
public void unsetCurrent() {
this.current = null;
}
-
+
/** Returns true if field current is set (has been asigned a value) and false otherwise */
public boolean isSetCurrent() {
return this.current != null;
}
-
+
public void setCurrentIsSet(boolean value) {
if (!value) {
this.current = null;
}
}
-
+
public GcCycleStats getCurrentLog() {
return this.currentLog;
}
-
+
public GCStatus setCurrentLog(GcCycleStats currentLog) {
this.currentLog = currentLog;
return this;
}
-
+
public void unsetCurrentLog() {
this.currentLog = null;
}
-
+
/** Returns true if field currentLog is set (has been asigned a value) and false otherwise */
public boolean isSetCurrentLog() {
return this.currentLog != null;
}
-
+
public void setCurrentLogIsSet(boolean value) {
if (!value) {
this.currentLog = null;
}
}
-
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case LAST:
- if (value == null) {
- unsetLast();
- } else {
- setLast((GcCycleStats)value);
- }
- break;
-
- case LAST_LOG:
- if (value == null) {
- unsetLastLog();
- } else {
- setLastLog((GcCycleStats)value);
- }
- break;
-
- case CURRENT:
- if (value == null) {
- unsetCurrent();
- } else {
- setCurrent((GcCycleStats)value);
- }
- break;
-
- case CURRENT_LOG:
- if (value == null) {
- unsetCurrentLog();
- } else {
- setCurrentLog((GcCycleStats)value);
- }
- break;
-
+ case LAST:
+ if (value == null) {
+ unsetLast();
+ } else {
+ setLast((GcCycleStats) value);
+ }
+ break;
+
+ case LAST_LOG:
+ if (value == null) {
+ unsetLastLog();
+ } else {
+ setLastLog((GcCycleStats) value);
+ }
+ break;
+
+ case CURRENT:
+ if (value == null) {
+ unsetCurrent();
+ } else {
+ setCurrent((GcCycleStats) value);
+ }
+ break;
+
+ case CURRENT_LOG:
+ if (value == null) {
+ unsetCurrentLog();
+ } else {
+ setCurrentLog((GcCycleStats) value);
+ }
+ break;
+
}
}
-
+
public void setFieldValue(int fieldID, Object value) {
setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
}
-
+
public Object getFieldValue(_Fields field) {
switch (field) {
- case LAST:
- return getLast();
-
- case LAST_LOG:
- return getLastLog();
-
- case CURRENT:
- return getCurrent();
-
- case CURRENT_LOG:
- return getCurrentLog();
-
+ case LAST:
+ return getLast();
+
+ case LAST_LOG:
+ return getLastLog();
+
+ case CURRENT:
+ return getCurrent();
+
+ case CURRENT_LOG:
+ return getCurrentLog();
+
}
throw new IllegalStateException();
}
-
+
public Object getFieldValue(int fieldId) {
return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId));
}
-
+
/** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
public boolean isSet(_Fields field) {
switch (field) {
- case LAST:
- return isSetLast();
- case LAST_LOG:
- return isSetLastLog();
- case CURRENT:
- return isSetCurrent();
- case CURRENT_LOG:
- return isSetCurrentLog();
+ case LAST:
+ return isSetLast();
+ case LAST_LOG:
+ return isSetLastLog();
+ case CURRENT:
+ return isSetCurrent();
+ case CURRENT_LOG:
+ return isSetCurrentLog();
}
throw new IllegalStateException();
}
-
+
public boolean isSet(int fieldID) {
return isSet(_Fields.findByThriftIdOrThrow(fieldID));
}
-
+
@Override
public boolean equals(Object that) {
if (that == null)
return false;
if (that instanceof GCStatus)
- return this.equals((GCStatus)that);
+ return this.equals((GCStatus) that);
return false;
}
-
+
public boolean equals(GCStatus that) {
if (that == null)
return false;
-
+
boolean this_present_last = true && this.isSetLast();
boolean that_present_last = true && that.isSetLast();
if (this_present_last || that_present_last) {
@@ -351,7 +336,7 @@ public class GCStatus implements TBase<G
if (!this.last.equals(that.last))
return false;
}
-
+
boolean this_present_lastLog = true && this.isSetLastLog();
boolean that_present_lastLog = true && that.isSetLastLog();
if (this_present_lastLog || that_present_lastLog) {
@@ -360,7 +345,7 @@ public class GCStatus implements TBase<G
if (!this.lastLog.equals(that.lastLog))
return false;
}
-
+
boolean this_present_current = true && this.isSetCurrent();
boolean that_present_current = true && that.isSetCurrent();
if (this_present_current || that_present_current) {
@@ -369,7 +354,7 @@ public class GCStatus implements TBase<G
if (!this.current.equals(that.current))
return false;
}
-
+
boolean this_present_currentLog = true && this.isSetCurrentLog();
boolean that_present_currentLog = true && that.isSetCurrentLog();
if (this_present_currentLog || that_present_currentLog) {
@@ -378,28 +363,29 @@ public class GCStatus implements TBase<G
if (!this.currentLog.equals(that.currentLog))
return false;
}
-
+
return true;
}
-
+
@Override
public int hashCode() {
return 0;
}
-
+
public int compareTo(GCStatus other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
-
+
int lastComparison = 0;
- GCStatus typedOther = (GCStatus)other;
-
+ GCStatus typedOther = (GCStatus) other;
+
lastComparison = Boolean.valueOf(isSetLast()).compareTo(typedOther.isSetLast());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetLast()) { lastComparison = TBaseHelper.compareTo(this.last, typedOther.last);
+ if (isSetLast()) {
+ lastComparison = TBaseHelper.compareTo(this.last, typedOther.last);
if (lastComparison != 0) {
return lastComparison;
}
@@ -408,7 +394,8 @@ public class GCStatus implements TBase<G
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetLastLog()) { lastComparison = TBaseHelper.compareTo(this.lastLog, typedOther.lastLog);
+ if (isSetLastLog()) {
+ lastComparison = TBaseHelper.compareTo(this.lastLog, typedOther.lastLog);
if (lastComparison != 0) {
return lastComparison;
}
@@ -417,7 +404,8 @@ public class GCStatus implements TBase<G
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetCurrent()) { lastComparison = TBaseHelper.compareTo(this.current, typedOther.current);
+ if (isSetCurrent()) {
+ lastComparison = TBaseHelper.compareTo(this.current, typedOther.current);
if (lastComparison != 0) {
return lastComparison;
}
@@ -426,21 +414,21 @@ public class GCStatus implements TBase<G
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetCurrentLog()) { lastComparison = TBaseHelper.compareTo(this.currentLog, typedOther.currentLog);
+ if (isSetCurrentLog()) {
+ lastComparison = TBaseHelper.compareTo(this.currentLog, typedOther.currentLog);
if (lastComparison != 0) {
return lastComparison;
}
}
return 0;
}
-
+
public void read(TProtocol iprot) throws TException {
TField field;
iprot.readStructBegin();
- while (true)
- {
+ while (true) {
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == TType.STOP) {
break;
}
switch (field.id) {
@@ -448,7 +436,7 @@ public class GCStatus implements TBase<G
if (field.type == TType.STRUCT) {
this.last = new GcCycleStats();
this.last.read(iprot);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -456,7 +444,7 @@ public class GCStatus implements TBase<G
if (field.type == TType.STRUCT) {
this.lastLog = new GcCycleStats();
this.lastLog.read(iprot);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -464,7 +452,7 @@ public class GCStatus implements TBase<G
if (field.type == TType.STRUCT) {
this.current = new GcCycleStats();
this.current.read(iprot);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -472,7 +460,7 @@ public class GCStatus implements TBase<G
if (field.type == TType.STRUCT) {
this.currentLog = new GcCycleStats();
this.currentLog.read(iprot);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -482,14 +470,14 @@ public class GCStatus implements TBase<G
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
+
// check for required fields of primitive type, which can't be checked in the validate method
validate();
}
-
+
public void write(TProtocol oprot) throws TException {
validate();
-
+
oprot.writeStructBegin(STRUCT_DESC);
if (this.last != null) {
oprot.writeFieldBegin(LAST_FIELD_DESC);
@@ -514,7 +502,7 @@ public class GCStatus implements TBase<G
oprot.writeFieldStop();
oprot.writeStructEnd();
}
-
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder("GCStatus(");
@@ -548,10 +536,9 @@ public class GCStatus implements TBase<G
sb.append(")");
return sb.toString();
}
-
+
public void validate() throws TException {
// check for required fields
}
-
+
}
-
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java Thu Oct 27 15:24:51 2011
@@ -5,52 +5,46 @@
*/
package org.apache.accumulo.core.gc.thrift;
-
-
import org.apache.thrift.*;
import org.apache.thrift.meta_data.*;
import org.apache.thrift.protocol.*;
@SuppressWarnings("serial")
-public class GcCycleStats implements TBase<GcCycleStats, GcCycleStats._Fields>, java.io.Serializable, Cloneable {
+public class GcCycleStats implements TBase<GcCycleStats,GcCycleStats._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("GcCycleStats");
-
- private static final TField STARTED_FIELD_DESC = new TField("started", TType.I64, (short)1);
- private static final TField FINISHED_FIELD_DESC = new TField("finished", TType.I64, (short)2);
- private static final TField CANDIDATES_FIELD_DESC = new TField("candidates", TType.I64, (short)3);
- private static final TField IN_USE_FIELD_DESC = new TField("inUse", TType.I64, (short)4);
- private static final TField DELETED_FIELD_DESC = new TField("deleted", TType.I64, (short)5);
- private static final TField ERRORS_FIELD_DESC = new TField("errors", TType.I64, (short)6);
-
+
+ private static final TField STARTED_FIELD_DESC = new TField("started", TType.I64, (short) 1);
+ private static final TField FINISHED_FIELD_DESC = new TField("finished", TType.I64, (short) 2);
+ private static final TField CANDIDATES_FIELD_DESC = new TField("candidates", TType.I64, (short) 3);
+ private static final TField IN_USE_FIELD_DESC = new TField("inUse", TType.I64, (short) 4);
+ private static final TField DELETED_FIELD_DESC = new TField("deleted", TType.I64, (short) 5);
+ private static final TField ERRORS_FIELD_DESC = new TField("errors", TType.I64, (short) 6);
+
public long started;
public long finished;
public long candidates;
public long inUse;
public long deleted;
public long errors;
-
+
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements TFieldIdEnum {
- STARTED((short)1, "started"),
- FINISHED((short)2, "finished"),
- CANDIDATES((short)3, "candidates"),
- IN_USE((short)4, "inUse"),
- DELETED((short)5, "deleted"),
- ERRORS((short)6, "errors");
-
- private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+ STARTED((short) 1, "started"), FINISHED((short) 2, "finished"), CANDIDATES((short) 3, "candidates"), IN_USE((short) 4, "inUse"), DELETED((short) 5,
+ "deleted"), ERRORS((short) 6, "errors");
+
+ private static final java.util.Map<String,_Fields> byName = new java.util.HashMap<String,_Fields>();
+
static {
for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
-
+
/**
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
+ switch (fieldId) {
case 1: // STARTED
return STARTED;
case 2: // FINISHED
@@ -67,41 +61,41 @@ public class GcCycleStats implements TBa
return null;
}
}
-
+
/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
+ * Find the _Fields constant that matches fieldId, throwing an exception if it is not found.
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null)
+ throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
-
+
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
public static _Fields findByName(String name) {
return byName.get(name);
}
-
+
private final short _thriftId;
private final String _fieldName;
-
+
_Fields(short thriftId, String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
-
+
public short getThriftFieldId() {
return _thriftId;
}
-
+
public String getFieldName() {
return _fieldName;
}
}
-
+
// isset id assignments
private static final int __STARTED_ISSET_ID = 0;
private static final int __FINISHED_ISSET_ID = 1;
@@ -110,37 +104,23 @@ public class GcCycleStats implements TBa
private static final int __DELETED_ISSET_ID = 4;
private static final int __ERRORS_ISSET_ID = 5;
private java.util.BitSet __isset_bit_vector = new java.util.BitSet(6);
-
- public static final java.util.Map<_Fields, FieldMetaData> metaDataMap;
+
+ public static final java.util.Map<_Fields,FieldMetaData> metaDataMap;
static {
- java.util.Map<_Fields, FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.STARTED, new FieldMetaData("started", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.I64)));
- tmpMap.put(_Fields.FINISHED, new FieldMetaData("finished", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.I64)));
- tmpMap.put(_Fields.CANDIDATES, new FieldMetaData("candidates", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.I64)));
- tmpMap.put(_Fields.IN_USE, new FieldMetaData("inUse", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.I64)));
- tmpMap.put(_Fields.DELETED, new FieldMetaData("deleted", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.I64)));
- tmpMap.put(_Fields.ERRORS, new FieldMetaData("errors", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.I64)));
+ java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.STARTED, new FieldMetaData("started", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
+ tmpMap.put(_Fields.FINISHED, new FieldMetaData("finished", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
+ tmpMap.put(_Fields.CANDIDATES, new FieldMetaData("candidates", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
+ tmpMap.put(_Fields.IN_USE, new FieldMetaData("inUse", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
+ tmpMap.put(_Fields.DELETED, new FieldMetaData("deleted", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
+ tmpMap.put(_Fields.ERRORS, new FieldMetaData("errors", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(GcCycleStats.class, metaDataMap);
}
-
- public GcCycleStats() {
- }
-
- public GcCycleStats(
- long started,
- long finished,
- long candidates,
- long inUse,
- long deleted,
- long errors)
- {
+
+ public GcCycleStats() {}
+
+ public GcCycleStats(long started, long finished, long candidates, long inUse, long deleted, long errors) {
this();
this.started = started;
setStartedIsSet(true);
@@ -155,7 +135,7 @@ public class GcCycleStats implements TBa
this.errors = errors;
setErrorsIsSet(true);
}
-
+
/**
* Performs a deep copy on <i>other</i>.
*/
@@ -169,275 +149,275 @@ public class GcCycleStats implements TBa
this.deleted = other.deleted;
this.errors = other.errors;
}
-
+
public GcCycleStats deepCopy() {
return new GcCycleStats(this);
}
-
+
@Deprecated
public GcCycleStats clone() {
return new GcCycleStats(this);
}
-
+
public long getStarted() {
return this.started;
}
-
+
public GcCycleStats setStarted(long started) {
this.started = started;
setStartedIsSet(true);
return this;
}
-
+
public void unsetStarted() {
__isset_bit_vector.clear(__STARTED_ISSET_ID);
}
-
+
/** Returns true if field started is set (has been asigned a value) and false otherwise */
public boolean isSetStarted() {
return __isset_bit_vector.get(__STARTED_ISSET_ID);
}
-
+
public void setStartedIsSet(boolean value) {
__isset_bit_vector.set(__STARTED_ISSET_ID, value);
}
-
+
public long getFinished() {
return this.finished;
}
-
+
public GcCycleStats setFinished(long finished) {
this.finished = finished;
setFinishedIsSet(true);
return this;
}
-
+
public void unsetFinished() {
__isset_bit_vector.clear(__FINISHED_ISSET_ID);
}
-
+
/** Returns true if field finished is set (has been asigned a value) and false otherwise */
public boolean isSetFinished() {
return __isset_bit_vector.get(__FINISHED_ISSET_ID);
}
-
+
public void setFinishedIsSet(boolean value) {
__isset_bit_vector.set(__FINISHED_ISSET_ID, value);
}
-
+
public long getCandidates() {
return this.candidates;
}
-
+
public GcCycleStats setCandidates(long candidates) {
this.candidates = candidates;
setCandidatesIsSet(true);
return this;
}
-
+
public void unsetCandidates() {
__isset_bit_vector.clear(__CANDIDATES_ISSET_ID);
}
-
+
/** Returns true if field candidates is set (has been asigned a value) and false otherwise */
public boolean isSetCandidates() {
return __isset_bit_vector.get(__CANDIDATES_ISSET_ID);
}
-
+
public void setCandidatesIsSet(boolean value) {
__isset_bit_vector.set(__CANDIDATES_ISSET_ID, value);
}
-
+
public long getInUse() {
return this.inUse;
}
-
+
public GcCycleStats setInUse(long inUse) {
this.inUse = inUse;
setInUseIsSet(true);
return this;
}
-
+
public void unsetInUse() {
__isset_bit_vector.clear(__INUSE_ISSET_ID);
}
-
+
/** Returns true if field inUse is set (has been asigned a value) and false otherwise */
public boolean isSetInUse() {
return __isset_bit_vector.get(__INUSE_ISSET_ID);
}
-
+
public void setInUseIsSet(boolean value) {
__isset_bit_vector.set(__INUSE_ISSET_ID, value);
}
-
+
public long getDeleted() {
return this.deleted;
}
-
+
public GcCycleStats setDeleted(long deleted) {
this.deleted = deleted;
setDeletedIsSet(true);
return this;
}
-
+
public void unsetDeleted() {
__isset_bit_vector.clear(__DELETED_ISSET_ID);
}
-
+
/** Returns true if field deleted is set (has been asigned a value) and false otherwise */
public boolean isSetDeleted() {
return __isset_bit_vector.get(__DELETED_ISSET_ID);
}
-
+
public void setDeletedIsSet(boolean value) {
__isset_bit_vector.set(__DELETED_ISSET_ID, value);
}
-
+
public long getErrors() {
return this.errors;
}
-
+
public GcCycleStats setErrors(long errors) {
this.errors = errors;
setErrorsIsSet(true);
return this;
}
-
+
public void unsetErrors() {
__isset_bit_vector.clear(__ERRORS_ISSET_ID);
}
-
+
/** Returns true if field errors is set (has been asigned a value) and false otherwise */
public boolean isSetErrors() {
return __isset_bit_vector.get(__ERRORS_ISSET_ID);
}
-
+
public void setErrorsIsSet(boolean value) {
__isset_bit_vector.set(__ERRORS_ISSET_ID, value);
}
-
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case STARTED:
- if (value == null) {
- unsetStarted();
- } else {
- setStarted((Long)value);
- }
- break;
-
- case FINISHED:
- if (value == null) {
- unsetFinished();
- } else {
- setFinished((Long)value);
- }
- break;
-
- case CANDIDATES:
- if (value == null) {
- unsetCandidates();
- } else {
- setCandidates((Long)value);
- }
- break;
-
- case IN_USE:
- if (value == null) {
- unsetInUse();
- } else {
- setInUse((Long)value);
- }
- break;
-
- case DELETED:
- if (value == null) {
- unsetDeleted();
- } else {
- setDeleted((Long)value);
- }
- break;
-
- case ERRORS:
- if (value == null) {
- unsetErrors();
- } else {
- setErrors((Long)value);
- }
- break;
-
+ case STARTED:
+ if (value == null) {
+ unsetStarted();
+ } else {
+ setStarted((Long) value);
+ }
+ break;
+
+ case FINISHED:
+ if (value == null) {
+ unsetFinished();
+ } else {
+ setFinished((Long) value);
+ }
+ break;
+
+ case CANDIDATES:
+ if (value == null) {
+ unsetCandidates();
+ } else {
+ setCandidates((Long) value);
+ }
+ break;
+
+ case IN_USE:
+ if (value == null) {
+ unsetInUse();
+ } else {
+ setInUse((Long) value);
+ }
+ break;
+
+ case DELETED:
+ if (value == null) {
+ unsetDeleted();
+ } else {
+ setDeleted((Long) value);
+ }
+ break;
+
+ case ERRORS:
+ if (value == null) {
+ unsetErrors();
+ } else {
+ setErrors((Long) value);
+ }
+ break;
+
}
}
-
+
public void setFieldValue(int fieldID, Object value) {
setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
}
-
+
public Object getFieldValue(_Fields field) {
switch (field) {
- case STARTED:
- return new Long(getStarted());
-
- case FINISHED:
- return new Long(getFinished());
-
- case CANDIDATES:
- return new Long(getCandidates());
-
- case IN_USE:
- return new Long(getInUse());
-
- case DELETED:
- return new Long(getDeleted());
-
- case ERRORS:
- return new Long(getErrors());
-
+ case STARTED:
+ return new Long(getStarted());
+
+ case FINISHED:
+ return new Long(getFinished());
+
+ case CANDIDATES:
+ return new Long(getCandidates());
+
+ case IN_USE:
+ return new Long(getInUse());
+
+ case DELETED:
+ return new Long(getDeleted());
+
+ case ERRORS:
+ return new Long(getErrors());
+
}
throw new IllegalStateException();
}
-
+
public Object getFieldValue(int fieldId) {
return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId));
}
-
+
/** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
public boolean isSet(_Fields field) {
switch (field) {
- case STARTED:
- return isSetStarted();
- case FINISHED:
- return isSetFinished();
- case CANDIDATES:
- return isSetCandidates();
- case IN_USE:
- return isSetInUse();
- case DELETED:
- return isSetDeleted();
- case ERRORS:
- return isSetErrors();
+ case STARTED:
+ return isSetStarted();
+ case FINISHED:
+ return isSetFinished();
+ case CANDIDATES:
+ return isSetCandidates();
+ case IN_USE:
+ return isSetInUse();
+ case DELETED:
+ return isSetDeleted();
+ case ERRORS:
+ return isSetErrors();
}
throw new IllegalStateException();
}
-
+
public boolean isSet(int fieldID) {
return isSet(_Fields.findByThriftIdOrThrow(fieldID));
}
-
+
@Override
public boolean equals(Object that) {
if (that == null)
return false;
if (that instanceof GcCycleStats)
- return this.equals((GcCycleStats)that);
+ return this.equals((GcCycleStats) that);
return false;
}
-
+
public boolean equals(GcCycleStats that) {
if (that == null)
return false;
-
+
boolean this_present_started = true;
boolean that_present_started = true;
if (this_present_started || that_present_started) {
@@ -446,7 +426,7 @@ public class GcCycleStats implements TBa
if (this.started != that.started)
return false;
}
-
+
boolean this_present_finished = true;
boolean that_present_finished = true;
if (this_present_finished || that_present_finished) {
@@ -455,7 +435,7 @@ public class GcCycleStats implements TBa
if (this.finished != that.finished)
return false;
}
-
+
boolean this_present_candidates = true;
boolean that_present_candidates = true;
if (this_present_candidates || that_present_candidates) {
@@ -464,7 +444,7 @@ public class GcCycleStats implements TBa
if (this.candidates != that.candidates)
return false;
}
-
+
boolean this_present_inUse = true;
boolean that_present_inUse = true;
if (this_present_inUse || that_present_inUse) {
@@ -473,7 +453,7 @@ public class GcCycleStats implements TBa
if (this.inUse != that.inUse)
return false;
}
-
+
boolean this_present_deleted = true;
boolean that_present_deleted = true;
if (this_present_deleted || that_present_deleted) {
@@ -482,7 +462,7 @@ public class GcCycleStats implements TBa
if (this.deleted != that.deleted)
return false;
}
-
+
boolean this_present_errors = true;
boolean that_present_errors = true;
if (this_present_errors || that_present_errors) {
@@ -491,28 +471,29 @@ public class GcCycleStats implements TBa
if (this.errors != that.errors)
return false;
}
-
+
return true;
}
-
+
@Override
public int hashCode() {
return 0;
}
-
+
public int compareTo(GcCycleStats other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
-
+
int lastComparison = 0;
- GcCycleStats typedOther = (GcCycleStats)other;
-
+ GcCycleStats typedOther = (GcCycleStats) other;
+
lastComparison = Boolean.valueOf(isSetStarted()).compareTo(typedOther.isSetStarted());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetStarted()) { lastComparison = TBaseHelper.compareTo(this.started, typedOther.started);
+ if (isSetStarted()) {
+ lastComparison = TBaseHelper.compareTo(this.started, typedOther.started);
if (lastComparison != 0) {
return lastComparison;
}
@@ -521,7 +502,8 @@ public class GcCycleStats implements TBa
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetFinished()) { lastComparison = TBaseHelper.compareTo(this.finished, typedOther.finished);
+ if (isSetFinished()) {
+ lastComparison = TBaseHelper.compareTo(this.finished, typedOther.finished);
if (lastComparison != 0) {
return lastComparison;
}
@@ -530,7 +512,8 @@ public class GcCycleStats implements TBa
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetCandidates()) { lastComparison = TBaseHelper.compareTo(this.candidates, typedOther.candidates);
+ if (isSetCandidates()) {
+ lastComparison = TBaseHelper.compareTo(this.candidates, typedOther.candidates);
if (lastComparison != 0) {
return lastComparison;
}
@@ -539,7 +522,8 @@ public class GcCycleStats implements TBa
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetInUse()) { lastComparison = TBaseHelper.compareTo(this.inUse, typedOther.inUse);
+ if (isSetInUse()) {
+ lastComparison = TBaseHelper.compareTo(this.inUse, typedOther.inUse);
if (lastComparison != 0) {
return lastComparison;
}
@@ -548,7 +532,8 @@ public class GcCycleStats implements TBa
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetDeleted()) { lastComparison = TBaseHelper.compareTo(this.deleted, typedOther.deleted);
+ if (isSetDeleted()) {
+ lastComparison = TBaseHelper.compareTo(this.deleted, typedOther.deleted);
if (lastComparison != 0) {
return lastComparison;
}
@@ -557,21 +542,21 @@ public class GcCycleStats implements TBa
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetErrors()) { lastComparison = TBaseHelper.compareTo(this.errors, typedOther.errors);
+ if (isSetErrors()) {
+ lastComparison = TBaseHelper.compareTo(this.errors, typedOther.errors);
if (lastComparison != 0) {
return lastComparison;
}
}
return 0;
}
-
+
public void read(TProtocol iprot) throws TException {
TField field;
iprot.readStructBegin();
- while (true)
- {
+ while (true) {
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == TType.STOP) {
break;
}
switch (field.id) {
@@ -579,7 +564,7 @@ public class GcCycleStats implements TBa
if (field.type == TType.I64) {
this.started = iprot.readI64();
setStartedIsSet(true);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -587,7 +572,7 @@ public class GcCycleStats implements TBa
if (field.type == TType.I64) {
this.finished = iprot.readI64();
setFinishedIsSet(true);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -595,7 +580,7 @@ public class GcCycleStats implements TBa
if (field.type == TType.I64) {
this.candidates = iprot.readI64();
setCandidatesIsSet(true);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -603,7 +588,7 @@ public class GcCycleStats implements TBa
if (field.type == TType.I64) {
this.inUse = iprot.readI64();
setInUseIsSet(true);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -611,7 +596,7 @@ public class GcCycleStats implements TBa
if (field.type == TType.I64) {
this.deleted = iprot.readI64();
setDeletedIsSet(true);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -619,7 +604,7 @@ public class GcCycleStats implements TBa
if (field.type == TType.I64) {
this.errors = iprot.readI64();
setErrorsIsSet(true);
- } else {
+ } else {
TProtocolUtil.skip(iprot, field.type);
}
break;
@@ -629,14 +614,14 @@ public class GcCycleStats implements TBa
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
+
// check for required fields of primitive type, which can't be checked in the validate method
validate();
}
-
+
public void write(TProtocol oprot) throws TException {
validate();
-
+
oprot.writeStructBegin(STRUCT_DESC);
oprot.writeFieldBegin(STARTED_FIELD_DESC);
oprot.writeI64(this.started);
@@ -659,7 +644,7 @@ public class GcCycleStats implements TBa
oprot.writeFieldStop();
oprot.writeStructEnd();
}
-
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder("GcCycleStats(");
@@ -683,10 +668,9 @@ public class GcCycleStats implements TBa
sb.append(")");
return sb.toString();
}
-
+
public void validate() throws TException {
// check for required fields
}
-
+
}
-
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java Thu Oct 27 15:24:51 2011
@@ -65,7 +65,8 @@ public class AggregatingIterator impleme
private void aggregateRowColumn(Aggregator aggr) throws IOException {
// this function assumes that first value is not delete
- if (iterator.getTopKey().isDeleted()) return;
+ if (iterator.getTopKey().isDeleted())
+ return;
workKey.set(iterator.getTopKey());
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilySkippingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilySkippingIterator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilySkippingIterator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilySkippingIterator.java Thu Oct 27 15:24:51 2011
@@ -53,35 +53,37 @@ public class ColumnFamilySkippingIterato
protected void consume() throws IOException {
int count = 0;
- if (inclusive) while (getSource().hasTop() && !colFamSet.contains(getSource().getTopKey().getColumnFamilyData())) {
- if (count < 10) {
- // it is quicker to call next if we are close, but we never know if we are close
- // so give next a try a few times
- getSource().next();
- count++;
- } else {
- ByteSequence higherCF = sortedColFams.higher(getSource().getTopKey().getColumnFamilyData());
- if (higherCF == null) {
- // seek to the next row
- reseek(getSource().getTopKey().followingKey(PartialKey.ROW));
+ if (inclusive)
+ while (getSource().hasTop() && !colFamSet.contains(getSource().getTopKey().getColumnFamilyData())) {
+ if (count < 10) {
+ // it is quicker to call next if we are close, but we never know if we are close
+ // so give next a try a few times
+ getSource().next();
+ count++;
} else {
- // seek to the next column family in the sorted list of column families
- reseek(new Key(getSource().getTopKey().getRowData().toArray(), higherCF.toArray(), new byte[0], new byte[0], Long.MAX_VALUE));
+ ByteSequence higherCF = sortedColFams.higher(getSource().getTopKey().getColumnFamilyData());
+ if (higherCF == null) {
+ // seek to the next row
+ reseek(getSource().getTopKey().followingKey(PartialKey.ROW));
+ } else {
+ // seek to the next column family in the sorted list of column families
+ reseek(new Key(getSource().getTopKey().getRowData().toArray(), higherCF.toArray(), new byte[0], new byte[0], Long.MAX_VALUE));
+ }
+
+ count = 0;
}
-
- count = 0;
}
- }
- else if (colFamSet != null && colFamSet.size() > 0) while (getSource().hasTop() && colFamSet.contains(getSource().getTopKey().getColumnFamilyData())) {
- if (count < 10) {
- getSource().next();
- count++;
- } else {
- // seek to the next column family in the data
- reseek(getSource().getTopKey().followingKey(PartialKey.ROW_COLFAM));
- count = 0;
+ else if (colFamSet != null && colFamSet.size() > 0)
+ while (getSource().hasTop() && colFamSet.contains(getSource().getTopKey().getColumnFamilyData())) {
+ if (count < 10) {
+ getSource().next();
+ count++;
+ } else {
+ // seek to the next column family in the data
+ reseek(getSource().getTopKey().followingKey(PartialKey.ROW_COLFAM));
+ count = 0;
+ }
}
- }
}
private void reseek(Key key) throws IOException {
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/DeletingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/DeletingIterator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/DeletingIterator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/DeletingIterator.java Thu Oct 27 15:24:51 2011
@@ -50,8 +50,10 @@ public class DeletingIterator extends Wr
@Override
public void next() throws IOException {
- if (getSource().getTopKey().isDeleted()) skipRowColumn();
- else getSource().next();
+ if (getSource().getTopKey().isDeleted())
+ skipRowColumn();
+ else
+ getSource().next();
findTop();
}
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java Thu Oct 27 15:24:51 2011
@@ -101,8 +101,10 @@ public class FamilyIntersectingIterator
@Override
public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
super.init(source, options, env);
- if (options.containsKey(indexFamilyOptionName)) indexColf = new Text(options.get(indexFamilyOptionName));
- if (options.containsKey(docFamilyOptionName)) docColf = new Text(options.get(docFamilyOptionName));
+ if (options.containsKey(indexFamilyOptionName))
+ indexColf = new Text(options.get(indexFamilyOptionName));
+ if (options.containsKey(docFamilyOptionName))
+ docColf = new Text(options.get(docFamilyOptionName));
docSource = source.deepCopy(env);
indexColfSet = Collections.singleton((ByteSequence) new ArrayByteSequence(indexColf.getBytes(), 0, indexColf.getLength()));
}
@@ -121,8 +123,10 @@ public class FamilyIntersectingIterator
@Override
protected void advanceToIntersection() throws IOException {
super.advanceToIntersection();
- if (topKey == null) return;
- if (log.isTraceEnabled()) log.trace("using top key to seek for doc: " + topKey.toString());
+ if (topKey == null)
+ return;
+ if (log.isTraceEnabled())
+ log.trace("using top key to seek for doc: " + topKey.toString());
Key docKey = buildDocKey();
docSource.seek(new Range(docKey, true, null, false), docColfSet, true);
log.debug("got doc key: " + docSource.getTopKey().toString());
@@ -133,18 +137,22 @@ public class FamilyIntersectingIterator
}
protected Key buildDocKey() {
- if (log.isTraceEnabled()) log.trace("building doc key for " + currentPartition + " " + currentDocID);
+ if (log.isTraceEnabled())
+ log.trace("building doc key for " + currentPartition + " " + currentDocID);
int zeroIndex = currentDocID.find("\0");
- if (zeroIndex < 0) throw new IllegalArgumentException("bad current docID");
+ if (zeroIndex < 0)
+ throw new IllegalArgumentException("bad current docID");
Text colf = new Text(docColf);
colf.append(nullByte, 0, 1);
colf.append(currentDocID.getBytes(), 0, zeroIndex);
docColfSet = Collections.singleton((ByteSequence) new ArrayByteSequence(colf.getBytes(), 0, colf.getLength()));
- if (log.isTraceEnabled()) log.trace(zeroIndex + " " + currentDocID.getLength());
+ if (log.isTraceEnabled())
+ log.trace(zeroIndex + " " + currentDocID.getLength());
Text colq = new Text();
colq.set(currentDocID.getBytes(), zeroIndex + 1, currentDocID.getLength() - zeroIndex - 2);
Key k = new Key(currentPartition, colf, colq);
- if (log.isTraceEnabled()) log.trace("built doc key for seek: " + k.toString());
+ if (log.isTraceEnabled())
+ log.trace("built doc key for seek: " + k.toString());
return k;
}
}
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java Thu Oct 27 15:24:51 2011
@@ -78,7 +78,8 @@ public class FilteringIterator extends W
break;
}
}
- if (goodKey == true) return;
+ if (goodKey == true)
+ return;
getSource().next();
}
}
@@ -137,10 +138,12 @@ public class FilteringIterator extends W
Collection<Entry<String,String>> entries = options.entrySet();
for (Entry<String,String> e : entries) {
name = e.getKey();
- if ((index = name.indexOf(".")) < 0) namesToClasses.put(name, e.getValue());
+ if ((index = name.indexOf(".")) < 0)
+ namesToClasses.put(name, e.getValue());
else {
subName = name.substring(0, index);
- if (!namesToOptions.containsKey(subName)) namesToOptions.put(subName, new HashMap<String,String>());
+ if (!namesToOptions.containsKey(subName))
+ namesToOptions.put(subName, new HashMap<String,String>());
namesToOptions.get(subName).put(name.substring(index + 1), e.getValue());
}
}
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java Thu Oct 27 15:24:51 2011
@@ -86,8 +86,8 @@ public class FirstEntryInRowIterator ext
// determine where to seek to, but don't go beyond the user-specified range
Key nextKey = getSource().getTopKey().followingKey(PartialKey.ROW);
- if (!latestRange.afterEndKey(nextKey)) getSource().seek(new Range(nextKey, true, latestRange.getEndKey(), latestRange.isEndKeyInclusive()),
- latestColumnFamilies, latestInclusive);
+ if (!latestRange.afterEndKey(nextKey))
+ getSource().seek(new Range(nextKey, true, latestRange.getEndKey(), latestRange.isEndKeyInclusive()), latestColumnFamilies, latestInclusive);
}
}
lastRowFound = getSource().hasTop() ? getSource().getTopKey().getRow(lastRowFound) : null;
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/HeapIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/HeapIterator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/HeapIterator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/iterators/HeapIterator.java Thu Oct 27 15:24:51 2011
@@ -47,7 +47,8 @@ public abstract class HeapIterator imple
}
protected void createHeap(int maxSize) {
- if (heap != null) throw new IllegalStateException("heap already exist");
+ if (heap != null)
+ throw new IllegalStateException("heap already exist");
heap = new PriorityBuffer(maxSize == 0 ? 1 : maxSize);
}
@@ -101,10 +102,13 @@ public abstract class HeapIterator imple
final protected void addSource(SortedKeyValueIterator<Key,Value> source) {
- if (source.hasTop()) heap.add(new Index(source));
+ if (source.hasTop())
+ heap.add(new Index(source));
- if (heap.size() > 0) currentIter = ((Index) heap.get()).iter;
- else currentIter = null;
+ if (heap.size() > 0)
+ currentIter = ((Index) heap.get()).iter;
+ else
+ currentIter = null;
}
}