accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1189806 [6/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/j...
Date Thu, 27 Oct 2011 15:25:17 GMT
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java Thu Oct 27 15:24:51 2011
@@ -5,24 +5,22 @@
  */
 package org.apache.accumulo.core.data.thrift;
 
-
-
 import org.apache.thrift.*;
 import org.apache.thrift.meta_data.*;
 import org.apache.thrift.protocol.*;
 
 @SuppressWarnings("serial")
-public class MultiScanResult implements TBase<MultiScanResult, MultiScanResult._Fields>, java.io.Serializable, Cloneable {
+public class MultiScanResult implements TBase<MultiScanResult,MultiScanResult._Fields>, java.io.Serializable, Cloneable {
   private static final TStruct STRUCT_DESC = new TStruct("MultiScanResult");
-
-  private static final TField RESULTS_FIELD_DESC = new TField("results", TType.LIST, (short)1);
-  private static final TField FAILURES_FIELD_DESC = new TField("failures", TType.MAP, (short)2);
-  private static final TField FULL_SCANS_FIELD_DESC = new TField("fullScans", TType.LIST, (short)3);
-  private static final TField PART_SCAN_FIELD_DESC = new TField("partScan", TType.STRUCT, (short)4);
-  private static final TField PART_NEXT_KEY_FIELD_DESC = new TField("partNextKey", TType.STRUCT, (short)5);
-  private static final TField PART_NEXT_KEY_INCLUSIVE_FIELD_DESC = new TField("partNextKeyInclusive", TType.BOOL, (short)6);
-  private static final TField MORE_FIELD_DESC = new TField("more", TType.BOOL, (short)7);
-
+  
+  private static final TField RESULTS_FIELD_DESC = new TField("results", TType.LIST, (short) 1);
+  private static final TField FAILURES_FIELD_DESC = new TField("failures", TType.MAP, (short) 2);
+  private static final TField FULL_SCANS_FIELD_DESC = new TField("fullScans", TType.LIST, (short) 3);
+  private static final TField PART_SCAN_FIELD_DESC = new TField("partScan", TType.STRUCT, (short) 4);
+  private static final TField PART_NEXT_KEY_FIELD_DESC = new TField("partNextKey", TType.STRUCT, (short) 5);
+  private static final TField PART_NEXT_KEY_INCLUSIVE_FIELD_DESC = new TField("partNextKeyInclusive", TType.BOOL, (short) 6);
+  private static final TField MORE_FIELD_DESC = new TField("more", TType.BOOL, (short) 7);
+  
   public java.util.List<TKeyValue> results;
   public java.util.Map<TKeyExtent,java.util.List<TRange>> failures;
   public java.util.List<TKeyExtent> fullScans;
@@ -30,30 +28,25 @@ public class MultiScanResult implements 
   public TKey partNextKey;
   public boolean partNextKeyInclusive;
   public boolean more;
-
+  
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements TFieldIdEnum {
-    RESULTS((short)1, "results"),
-    FAILURES((short)2, "failures"),
-    FULL_SCANS((short)3, "fullScans"),
-    PART_SCAN((short)4, "partScan"),
-    PART_NEXT_KEY((short)5, "partNextKey"),
-    PART_NEXT_KEY_INCLUSIVE((short)6, "partNextKeyInclusive"),
-    MORE((short)7, "more");
-
-    private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+    RESULTS((short) 1, "results"), FAILURES((short) 2, "failures"), FULL_SCANS((short) 3, "fullScans"), PART_SCAN((short) 4, "partScan"), PART_NEXT_KEY(
+        (short) 5, "partNextKey"), PART_NEXT_KEY_INCLUSIVE((short) 6, "partNextKeyInclusive"), MORE((short) 7, "more");
+    
+    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: // RESULTS
           return RESULTS;
         case 2: // FAILURES
@@ -72,81 +65,66 @@ public class MultiScanResult implements 
           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 __PARTNEXTKEYINCLUSIVE_ISSET_ID = 0;
   private static final int __MORE_ISSET_ID = 1;
   private java.util.BitSet __isset_bit_vector = new java.util.BitSet(2);
-
-  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.RESULTS, new FieldMetaData("results", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, TKeyValue.class))));
-    tmpMap.put(_Fields.FAILURES, new FieldMetaData("failures", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.MAP        , "ScanBatch")));
-    tmpMap.put(_Fields.FULL_SCANS, new FieldMetaData("fullScans", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, TKeyExtent.class))));
-    tmpMap.put(_Fields.PART_SCAN, new FieldMetaData("partScan", TFieldRequirementType.DEFAULT, 
-        new StructMetaData(TType.STRUCT, TKeyExtent.class)));
-    tmpMap.put(_Fields.PART_NEXT_KEY, new FieldMetaData("partNextKey", TFieldRequirementType.DEFAULT, 
-        new StructMetaData(TType.STRUCT, TKey.class)));
-    tmpMap.put(_Fields.PART_NEXT_KEY_INCLUSIVE, new FieldMetaData("partNextKeyInclusive", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
-    tmpMap.put(_Fields.MORE, new FieldMetaData("more", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
+    java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.RESULTS, new FieldMetaData("results", TFieldRequirementType.DEFAULT, new ListMetaData(TType.LIST, new StructMetaData(TType.STRUCT,
+        TKeyValue.class))));
+    tmpMap.put(_Fields.FAILURES, new FieldMetaData("failures", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.MAP, "ScanBatch")));
+    tmpMap.put(_Fields.FULL_SCANS, new FieldMetaData("fullScans", TFieldRequirementType.DEFAULT, new ListMetaData(TType.LIST, new StructMetaData(TType.STRUCT,
+        TKeyExtent.class))));
+    tmpMap.put(_Fields.PART_SCAN, new FieldMetaData("partScan", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT, TKeyExtent.class)));
+    tmpMap.put(_Fields.PART_NEXT_KEY, new FieldMetaData("partNextKey", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT, TKey.class)));
+    tmpMap.put(_Fields.PART_NEXT_KEY_INCLUSIVE, new FieldMetaData("partNextKeyInclusive", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.BOOL)));
+    tmpMap.put(_Fields.MORE, new FieldMetaData("more", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.BOOL)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     FieldMetaData.addStructMetaDataMap(MultiScanResult.class, metaDataMap);
   }
-
-  public MultiScanResult() {
-  }
-
-  public MultiScanResult(
-    java.util.List<TKeyValue> results,
-    java.util.Map<TKeyExtent,java.util.List<TRange>> failures,
-    java.util.List<TKeyExtent> fullScans,
-    TKeyExtent partScan,
-    TKey partNextKey,
-    boolean partNextKeyInclusive,
-    boolean more)
-  {
+  
+  public MultiScanResult() {}
+  
+  public MultiScanResult(java.util.List<TKeyValue> results, java.util.Map<TKeyExtent,java.util.List<TRange>> failures, java.util.List<TKeyExtent> fullScans,
+      TKeyExtent partScan, TKey partNextKey, boolean partNextKeyInclusive, boolean more) {
     this();
     this.results = results;
     this.failures = failures;
@@ -158,7 +136,7 @@ public class MultiScanResult implements 
     this.more = more;
     setMoreIsSet(true);
   }
-
+  
   /**
    * Performs a deep copy on <i>other</i>.
    */
@@ -191,358 +169,358 @@ public class MultiScanResult implements 
     this.partNextKeyInclusive = other.partNextKeyInclusive;
     this.more = other.more;
   }
-
+  
   public MultiScanResult deepCopy() {
     return new MultiScanResult(this);
   }
-
+  
   @Deprecated
   public MultiScanResult clone() {
     return new MultiScanResult(this);
   }
-
+  
   public int getResultsSize() {
     return (this.results == null) ? 0 : this.results.size();
   }
-
+  
   public java.util.Iterator<TKeyValue> getResultsIterator() {
     return (this.results == null) ? null : this.results.iterator();
   }
-
+  
   public void addToResults(TKeyValue elem) {
     if (this.results == null) {
       this.results = new java.util.ArrayList<TKeyValue>();
     }
     this.results.add(elem);
   }
-
+  
   public java.util.List<TKeyValue> getResults() {
     return this.results;
   }
-
+  
   public MultiScanResult setResults(java.util.List<TKeyValue> results) {
     this.results = results;
     return this;
   }
-
+  
   public void unsetResults() {
     this.results = null;
   }
-
+  
   /** Returns true if field results is set (has been asigned a value) and false otherwise */
   public boolean isSetResults() {
     return this.results != null;
   }
-
+  
   public void setResultsIsSet(boolean value) {
     if (!value) {
       this.results = null;
     }
   }
-
+  
   public int getFailuresSize() {
     return (this.failures == null) ? 0 : this.failures.size();
   }
-
+  
   public void putToFailures(TKeyExtent key, java.util.List<TRange> val) {
     if (this.failures == null) {
       this.failures = new java.util.HashMap<TKeyExtent,java.util.List<TRange>>();
     }
     this.failures.put(key, val);
   }
-
+  
   public java.util.Map<TKeyExtent,java.util.List<TRange>> getFailures() {
     return this.failures;
   }
-
+  
   public MultiScanResult setFailures(java.util.Map<TKeyExtent,java.util.List<TRange>> failures) {
     this.failures = failures;
     return this;
   }
-
+  
   public void unsetFailures() {
     this.failures = null;
   }
-
+  
   /** Returns true if field failures is set (has been asigned a value) and false otherwise */
   public boolean isSetFailures() {
     return this.failures != null;
   }
-
+  
   public void setFailuresIsSet(boolean value) {
     if (!value) {
       this.failures = null;
     }
   }
-
+  
   public int getFullScansSize() {
     return (this.fullScans == null) ? 0 : this.fullScans.size();
   }
-
+  
   public java.util.Iterator<TKeyExtent> getFullScansIterator() {
     return (this.fullScans == null) ? null : this.fullScans.iterator();
   }
-
+  
   public void addToFullScans(TKeyExtent elem) {
     if (this.fullScans == null) {
       this.fullScans = new java.util.ArrayList<TKeyExtent>();
     }
     this.fullScans.add(elem);
   }
-
+  
   public java.util.List<TKeyExtent> getFullScans() {
     return this.fullScans;
   }
-
+  
   public MultiScanResult setFullScans(java.util.List<TKeyExtent> fullScans) {
     this.fullScans = fullScans;
     return this;
   }
-
+  
   public void unsetFullScans() {
     this.fullScans = null;
   }
-
+  
   /** Returns true if field fullScans is set (has been asigned a value) and false otherwise */
   public boolean isSetFullScans() {
     return this.fullScans != null;
   }
-
+  
   public void setFullScansIsSet(boolean value) {
     if (!value) {
       this.fullScans = null;
     }
   }
-
+  
   public TKeyExtent getPartScan() {
     return this.partScan;
   }
-
+  
   public MultiScanResult setPartScan(TKeyExtent partScan) {
     this.partScan = partScan;
     return this;
   }
-
+  
   public void unsetPartScan() {
     this.partScan = null;
   }
-
+  
   /** Returns true if field partScan is set (has been asigned a value) and false otherwise */
   public boolean isSetPartScan() {
     return this.partScan != null;
   }
-
+  
   public void setPartScanIsSet(boolean value) {
     if (!value) {
       this.partScan = null;
     }
   }
-
+  
   public TKey getPartNextKey() {
     return this.partNextKey;
   }
-
+  
   public MultiScanResult setPartNextKey(TKey partNextKey) {
     this.partNextKey = partNextKey;
     return this;
   }
-
+  
   public void unsetPartNextKey() {
     this.partNextKey = null;
   }
-
+  
   /** Returns true if field partNextKey is set (has been asigned a value) and false otherwise */
   public boolean isSetPartNextKey() {
     return this.partNextKey != null;
   }
-
+  
   public void setPartNextKeyIsSet(boolean value) {
     if (!value) {
       this.partNextKey = null;
     }
   }
-
+  
   public boolean isPartNextKeyInclusive() {
     return this.partNextKeyInclusive;
   }
-
+  
   public MultiScanResult setPartNextKeyInclusive(boolean partNextKeyInclusive) {
     this.partNextKeyInclusive = partNextKeyInclusive;
     setPartNextKeyInclusiveIsSet(true);
     return this;
   }
-
+  
   public void unsetPartNextKeyInclusive() {
     __isset_bit_vector.clear(__PARTNEXTKEYINCLUSIVE_ISSET_ID);
   }
-
+  
   /** Returns true if field partNextKeyInclusive is set (has been asigned a value) and false otherwise */
   public boolean isSetPartNextKeyInclusive() {
     return __isset_bit_vector.get(__PARTNEXTKEYINCLUSIVE_ISSET_ID);
   }
-
+  
   public void setPartNextKeyInclusiveIsSet(boolean value) {
     __isset_bit_vector.set(__PARTNEXTKEYINCLUSIVE_ISSET_ID, value);
   }
-
+  
   public boolean isMore() {
     return this.more;
   }
-
+  
   public MultiScanResult setMore(boolean more) {
     this.more = more;
     setMoreIsSet(true);
     return this;
   }
-
+  
   public void unsetMore() {
     __isset_bit_vector.clear(__MORE_ISSET_ID);
   }
-
+  
   /** Returns true if field more is set (has been asigned a value) and false otherwise */
   public boolean isSetMore() {
     return __isset_bit_vector.get(__MORE_ISSET_ID);
   }
-
+  
   public void setMoreIsSet(boolean value) {
     __isset_bit_vector.set(__MORE_ISSET_ID, value);
   }
-
+  
   @SuppressWarnings("unchecked")
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case RESULTS:
-      if (value == null) {
-        unsetResults();
-      } else {
-        setResults((java.util.List<TKeyValue>)value);
-      }
-      break;
-
-    case FAILURES:
-      if (value == null) {
-        unsetFailures();
-      } else {
-        setFailures((java.util.Map<TKeyExtent,java.util.List<TRange>>)value);
-      }
-      break;
-
-    case FULL_SCANS:
-      if (value == null) {
-        unsetFullScans();
-      } else {
-        setFullScans((java.util.List<TKeyExtent>)value);
-      }
-      break;
-
-    case PART_SCAN:
-      if (value == null) {
-        unsetPartScan();
-      } else {
-        setPartScan((TKeyExtent)value);
-      }
-      break;
-
-    case PART_NEXT_KEY:
-      if (value == null) {
-        unsetPartNextKey();
-      } else {
-        setPartNextKey((TKey)value);
-      }
-      break;
-
-    case PART_NEXT_KEY_INCLUSIVE:
-      if (value == null) {
-        unsetPartNextKeyInclusive();
-      } else {
-        setPartNextKeyInclusive((Boolean)value);
-      }
-      break;
-
-    case MORE:
-      if (value == null) {
-        unsetMore();
-      } else {
-        setMore((Boolean)value);
-      }
-      break;
-
+      case RESULTS:
+        if (value == null) {
+          unsetResults();
+        } else {
+          setResults((java.util.List<TKeyValue>) value);
+        }
+        break;
+      
+      case FAILURES:
+        if (value == null) {
+          unsetFailures();
+        } else {
+          setFailures((java.util.Map<TKeyExtent,java.util.List<TRange>>) value);
+        }
+        break;
+      
+      case FULL_SCANS:
+        if (value == null) {
+          unsetFullScans();
+        } else {
+          setFullScans((java.util.List<TKeyExtent>) value);
+        }
+        break;
+      
+      case PART_SCAN:
+        if (value == null) {
+          unsetPartScan();
+        } else {
+          setPartScan((TKeyExtent) value);
+        }
+        break;
+      
+      case PART_NEXT_KEY:
+        if (value == null) {
+          unsetPartNextKey();
+        } else {
+          setPartNextKey((TKey) value);
+        }
+        break;
+      
+      case PART_NEXT_KEY_INCLUSIVE:
+        if (value == null) {
+          unsetPartNextKeyInclusive();
+        } else {
+          setPartNextKeyInclusive((Boolean) value);
+        }
+        break;
+      
+      case MORE:
+        if (value == null) {
+          unsetMore();
+        } else {
+          setMore((Boolean) value);
+        }
+        break;
+    
     }
   }
-
+  
   public void setFieldValue(int fieldID, Object value) {
     setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
   }
-
+  
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case RESULTS:
-      return getResults();
-
-    case FAILURES:
-      return getFailures();
-
-    case FULL_SCANS:
-      return getFullScans();
-
-    case PART_SCAN:
-      return getPartScan();
-
-    case PART_NEXT_KEY:
-      return getPartNextKey();
-
-    case PART_NEXT_KEY_INCLUSIVE:
-      return new Boolean(isPartNextKeyInclusive());
-
-    case MORE:
-      return new Boolean(isMore());
-
+      case RESULTS:
+        return getResults();
+        
+      case FAILURES:
+        return getFailures();
+        
+      case FULL_SCANS:
+        return getFullScans();
+        
+      case PART_SCAN:
+        return getPartScan();
+        
+      case PART_NEXT_KEY:
+        return getPartNextKey();
+        
+      case PART_NEXT_KEY_INCLUSIVE:
+        return new Boolean(isPartNextKeyInclusive());
+        
+      case MORE:
+        return new Boolean(isMore());
+        
     }
     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 RESULTS:
-      return isSetResults();
-    case FAILURES:
-      return isSetFailures();
-    case FULL_SCANS:
-      return isSetFullScans();
-    case PART_SCAN:
-      return isSetPartScan();
-    case PART_NEXT_KEY:
-      return isSetPartNextKey();
-    case PART_NEXT_KEY_INCLUSIVE:
-      return isSetPartNextKeyInclusive();
-    case MORE:
-      return isSetMore();
+      case RESULTS:
+        return isSetResults();
+      case FAILURES:
+        return isSetFailures();
+      case FULL_SCANS:
+        return isSetFullScans();
+      case PART_SCAN:
+        return isSetPartScan();
+      case PART_NEXT_KEY:
+        return isSetPartNextKey();
+      case PART_NEXT_KEY_INCLUSIVE:
+        return isSetPartNextKeyInclusive();
+      case MORE:
+        return isSetMore();
     }
     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 MultiScanResult)
-      return this.equals((MultiScanResult)that);
+      return this.equals((MultiScanResult) that);
     return false;
   }
-
+  
   public boolean equals(MultiScanResult that) {
     if (that == null)
       return false;
-
+    
     boolean this_present_results = true && this.isSetResults();
     boolean that_present_results = true && that.isSetResults();
     if (this_present_results || that_present_results) {
@@ -551,7 +529,7 @@ public class MultiScanResult implements 
       if (!this.results.equals(that.results))
         return false;
     }
-
+    
     boolean this_present_failures = true && this.isSetFailures();
     boolean that_present_failures = true && that.isSetFailures();
     if (this_present_failures || that_present_failures) {
@@ -560,7 +538,7 @@ public class MultiScanResult implements 
       if (!this.failures.equals(that.failures))
         return false;
     }
-
+    
     boolean this_present_fullScans = true && this.isSetFullScans();
     boolean that_present_fullScans = true && that.isSetFullScans();
     if (this_present_fullScans || that_present_fullScans) {
@@ -569,7 +547,7 @@ public class MultiScanResult implements 
       if (!this.fullScans.equals(that.fullScans))
         return false;
     }
-
+    
     boolean this_present_partScan = true && this.isSetPartScan();
     boolean that_present_partScan = true && that.isSetPartScan();
     if (this_present_partScan || that_present_partScan) {
@@ -578,7 +556,7 @@ public class MultiScanResult implements 
       if (!this.partScan.equals(that.partScan))
         return false;
     }
-
+    
     boolean this_present_partNextKey = true && this.isSetPartNextKey();
     boolean that_present_partNextKey = true && that.isSetPartNextKey();
     if (this_present_partNextKey || that_present_partNextKey) {
@@ -587,7 +565,7 @@ public class MultiScanResult implements 
       if (!this.partNextKey.equals(that.partNextKey))
         return false;
     }
-
+    
     boolean this_present_partNextKeyInclusive = true;
     boolean that_present_partNextKeyInclusive = true;
     if (this_present_partNextKeyInclusive || that_present_partNextKeyInclusive) {
@@ -596,7 +574,7 @@ public class MultiScanResult implements 
       if (this.partNextKeyInclusive != that.partNextKeyInclusive)
         return false;
     }
-
+    
     boolean this_present_more = true;
     boolean that_present_more = true;
     if (this_present_more || that_present_more) {
@@ -605,28 +583,29 @@ public class MultiScanResult implements 
       if (this.more != that.more)
         return false;
     }
-
+    
     return true;
   }
-
+  
   @Override
   public int hashCode() {
     return 0;
   }
-
+  
   public int compareTo(MultiScanResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
-
+    
     int lastComparison = 0;
-    MultiScanResult typedOther = (MultiScanResult)other;
-
+    MultiScanResult typedOther = (MultiScanResult) other;
+    
     lastComparison = Boolean.valueOf(isSetResults()).compareTo(typedOther.isSetResults());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetResults()) {      lastComparison = TBaseHelper.compareTo(this.results, typedOther.results);
+    if (isSetResults()) {
+      lastComparison = TBaseHelper.compareTo(this.results, typedOther.results);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -635,7 +614,8 @@ public class MultiScanResult implements 
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetFailures()) {      lastComparison = TBaseHelper.compareTo(this.failures, typedOther.failures);
+    if (isSetFailures()) {
+      lastComparison = TBaseHelper.compareTo(this.failures, typedOther.failures);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -644,7 +624,8 @@ public class MultiScanResult implements 
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetFullScans()) {      lastComparison = TBaseHelper.compareTo(this.fullScans, typedOther.fullScans);
+    if (isSetFullScans()) {
+      lastComparison = TBaseHelper.compareTo(this.fullScans, typedOther.fullScans);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -653,7 +634,8 @@ public class MultiScanResult implements 
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetPartScan()) {      lastComparison = TBaseHelper.compareTo(this.partScan, typedOther.partScan);
+    if (isSetPartScan()) {
+      lastComparison = TBaseHelper.compareTo(this.partScan, typedOther.partScan);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -662,7 +644,8 @@ public class MultiScanResult implements 
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetPartNextKey()) {      lastComparison = TBaseHelper.compareTo(this.partNextKey, typedOther.partNextKey);
+    if (isSetPartNextKey()) {
+      lastComparison = TBaseHelper.compareTo(this.partNextKey, typedOther.partNextKey);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -671,7 +654,8 @@ public class MultiScanResult implements 
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetPartNextKeyInclusive()) {      lastComparison = TBaseHelper.compareTo(this.partNextKeyInclusive, typedOther.partNextKeyInclusive);
+    if (isSetPartNextKeyInclusive()) {
+      lastComparison = TBaseHelper.compareTo(this.partNextKeyInclusive, typedOther.partNextKeyInclusive);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -680,21 +664,21 @@ public class MultiScanResult implements 
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetMore()) {      lastComparison = TBaseHelper.compareTo(this.more, typedOther.more);
+    if (isSetMore()) {
+      lastComparison = TBaseHelper.compareTo(this.more, typedOther.more);
       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) {
@@ -703,8 +687,7 @@ public class MultiScanResult implements 
             {
               TList _list8 = iprot.readListBegin();
               this.results = new java.util.ArrayList<TKeyValue>(_list8.size);
-              for (int _i9 = 0; _i9 < _list8.size; ++_i9)
-              {
+              for (int _i9 = 0; _i9 < _list8.size; ++_i9) {
                 TKeyValue _elem10;
                 _elem10 = new TKeyValue();
                 _elem10.read(iprot);
@@ -712,7 +695,7 @@ public class MultiScanResult implements 
               }
               iprot.readListEnd();
             }
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -720,9 +703,8 @@ public class MultiScanResult implements 
           if (field.type == TType.MAP) {
             {
               TMap _map11 = iprot.readMapBegin();
-              this.failures = new java.util.HashMap<TKeyExtent,java.util.List<TRange>>(2*_map11.size);
-              for (int _i12 = 0; _i12 < _map11.size; ++_i12)
-              {
+              this.failures = new java.util.HashMap<TKeyExtent,java.util.List<TRange>>(2 * _map11.size);
+              for (int _i12 = 0; _i12 < _map11.size; ++_i12) {
                 TKeyExtent _key13;
                 java.util.List<TRange> _val14;
                 _key13 = new TKeyExtent();
@@ -730,8 +712,7 @@ public class MultiScanResult implements 
                 {
                   TList _list15 = iprot.readListBegin();
                   _val14 = new java.util.ArrayList<TRange>(_list15.size);
-                  for (int _i16 = 0; _i16 < _list15.size; ++_i16)
-                  {
+                  for (int _i16 = 0; _i16 < _list15.size; ++_i16) {
                     TRange _elem17;
                     _elem17 = new TRange();
                     _elem17.read(iprot);
@@ -743,7 +724,7 @@ public class MultiScanResult implements 
               }
               iprot.readMapEnd();
             }
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -752,8 +733,7 @@ public class MultiScanResult implements 
             {
               TList _list18 = iprot.readListBegin();
               this.fullScans = new java.util.ArrayList<TKeyExtent>(_list18.size);
-              for (int _i19 = 0; _i19 < _list18.size; ++_i19)
-              {
+              for (int _i19 = 0; _i19 < _list18.size; ++_i19) {
                 TKeyExtent _elem20;
                 _elem20 = new TKeyExtent();
                 _elem20.read(iprot);
@@ -761,7 +741,7 @@ public class MultiScanResult implements 
               }
               iprot.readListEnd();
             }
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -769,7 +749,7 @@ public class MultiScanResult implements 
           if (field.type == TType.STRUCT) {
             this.partScan = new TKeyExtent();
             this.partScan.read(iprot);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -777,7 +757,7 @@ public class MultiScanResult implements 
           if (field.type == TType.STRUCT) {
             this.partNextKey = new TKey();
             this.partNextKey.read(iprot);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -785,7 +765,7 @@ public class MultiScanResult implements 
           if (field.type == TType.BOOL) {
             this.partNextKeyInclusive = iprot.readBool();
             setPartNextKeyInclusiveIsSet(true);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -793,7 +773,7 @@ public class MultiScanResult implements 
           if (field.type == TType.BOOL) {
             this.more = iprot.readBool();
             setMoreIsSet(true);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -803,21 +783,20 @@ public class MultiScanResult implements 
       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.results != null) {
       oprot.writeFieldBegin(RESULTS_FIELD_DESC);
       {
         oprot.writeListBegin(new TList(TType.STRUCT, this.results.size()));
-        for (TKeyValue _iter21 : this.results)
-        {
+        for (TKeyValue _iter21 : this.results) {
           _iter21.write(oprot);
         }
         oprot.writeListEnd();
@@ -828,13 +807,11 @@ public class MultiScanResult implements 
       oprot.writeFieldBegin(FAILURES_FIELD_DESC);
       {
         oprot.writeMapBegin(new TMap(TType.STRUCT, TType.LIST, this.failures.size()));
-        for (java.util.Map.Entry<TKeyExtent, java.util.List<TRange>> _iter22 : this.failures.entrySet())
-        {
+        for (java.util.Map.Entry<TKeyExtent,java.util.List<TRange>> _iter22 : this.failures.entrySet()) {
           _iter22.getKey().write(oprot);
           {
             oprot.writeListBegin(new TList(TType.STRUCT, _iter22.getValue().size()));
-            for (TRange _iter23 : _iter22.getValue())
-            {
+            for (TRange _iter23 : _iter22.getValue()) {
               _iter23.write(oprot);
             }
             oprot.writeListEnd();
@@ -848,8 +825,7 @@ public class MultiScanResult implements 
       oprot.writeFieldBegin(FULL_SCANS_FIELD_DESC);
       {
         oprot.writeListBegin(new TList(TType.STRUCT, this.fullScans.size()));
-        for (TKeyExtent _iter24 : this.fullScans)
-        {
+        for (TKeyExtent _iter24 : this.fullScans) {
           _iter24.write(oprot);
         }
         oprot.writeListEnd();
@@ -875,7 +851,7 @@ public class MultiScanResult implements 
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
-
+  
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder("MultiScanResult(");
@@ -922,10 +898,9 @@ public class MultiScanResult implements 
     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/data/thrift/ScanResult.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java Thu Oct 27 15:24:51 2011
@@ -5,40 +5,37 @@
  */
 package org.apache.accumulo.core.data.thrift;
 
-
-
 import org.apache.thrift.*;
 import org.apache.thrift.meta_data.*;
 import org.apache.thrift.protocol.*;
 
 @SuppressWarnings("serial")
-public class ScanResult implements TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable {
+public class ScanResult implements TBase<ScanResult,ScanResult._Fields>, java.io.Serializable, Cloneable {
   private static final TStruct STRUCT_DESC = new TStruct("ScanResult");
-
-  private static final TField RESULTS_FIELD_DESC = new TField("results", TType.LIST, (short)1);
-  private static final TField MORE_FIELD_DESC = new TField("more", TType.BOOL, (short)2);
-
+  
+  private static final TField RESULTS_FIELD_DESC = new TField("results", TType.LIST, (short) 1);
+  private static final TField MORE_FIELD_DESC = new TField("more", TType.BOOL, (short) 2);
+  
   public java.util.List<TKeyValue> results;
   public boolean more;
-
+  
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements TFieldIdEnum {
-    RESULTS((short)1, "results"),
-    MORE((short)2, "more");
-
-    private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+    RESULTS((short) 1, "results"), MORE((short) 2, "more");
+    
+    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: // RESULTS
           return RESULTS;
         case 2: // MORE
@@ -47,70 +44,64 @@ public class ScanResult implements TBase
           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 __MORE_ISSET_ID = 0;
   private java.util.BitSet __isset_bit_vector = new java.util.BitSet(1);
-
-  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.RESULTS, new FieldMetaData("results", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, TKeyValue.class))));
-    tmpMap.put(_Fields.MORE, new FieldMetaData("more", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
+    java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.RESULTS, new FieldMetaData("results", TFieldRequirementType.DEFAULT, new ListMetaData(TType.LIST, new StructMetaData(TType.STRUCT,
+        TKeyValue.class))));
+    tmpMap.put(_Fields.MORE, new FieldMetaData("more", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.BOOL)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     FieldMetaData.addStructMetaDataMap(ScanResult.class, metaDataMap);
   }
-
-  public ScanResult() {
-  }
-
-  public ScanResult(
-    java.util.List<TKeyValue> results,
-    boolean more)
-  {
+  
+  public ScanResult() {}
+  
+  public ScanResult(java.util.List<TKeyValue> results, boolean more) {
     this();
     this.results = results;
     this.more = more;
     setMoreIsSet(true);
   }
-
+  
   /**
    * Performs a deep copy on <i>other</i>.
    */
@@ -126,148 +117,148 @@ public class ScanResult implements TBase
     }
     this.more = other.more;
   }
-
+  
   public ScanResult deepCopy() {
     return new ScanResult(this);
   }
-
+  
   @Deprecated
   public ScanResult clone() {
     return new ScanResult(this);
   }
-
+  
   public int getResultsSize() {
     return (this.results == null) ? 0 : this.results.size();
   }
-
+  
   public java.util.Iterator<TKeyValue> getResultsIterator() {
     return (this.results == null) ? null : this.results.iterator();
   }
-
+  
   public void addToResults(TKeyValue elem) {
     if (this.results == null) {
       this.results = new java.util.ArrayList<TKeyValue>();
     }
     this.results.add(elem);
   }
-
+  
   public java.util.List<TKeyValue> getResults() {
     return this.results;
   }
-
+  
   public ScanResult setResults(java.util.List<TKeyValue> results) {
     this.results = results;
     return this;
   }
-
+  
   public void unsetResults() {
     this.results = null;
   }
-
+  
   /** Returns true if field results is set (has been asigned a value) and false otherwise */
   public boolean isSetResults() {
     return this.results != null;
   }
-
+  
   public void setResultsIsSet(boolean value) {
     if (!value) {
       this.results = null;
     }
   }
-
+  
   public boolean isMore() {
     return this.more;
   }
-
+  
   public ScanResult setMore(boolean more) {
     this.more = more;
     setMoreIsSet(true);
     return this;
   }
-
+  
   public void unsetMore() {
     __isset_bit_vector.clear(__MORE_ISSET_ID);
   }
-
+  
   /** Returns true if field more is set (has been asigned a value) and false otherwise */
   public boolean isSetMore() {
     return __isset_bit_vector.get(__MORE_ISSET_ID);
   }
-
+  
   public void setMoreIsSet(boolean value) {
     __isset_bit_vector.set(__MORE_ISSET_ID, value);
   }
-
+  
   @SuppressWarnings("unchecked")
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case RESULTS:
-      if (value == null) {
-        unsetResults();
-      } else {
-        setResults((java.util.List<TKeyValue>)value);
-      }
-      break;
-
-    case MORE:
-      if (value == null) {
-        unsetMore();
-      } else {
-        setMore((Boolean)value);
-      }
-      break;
-
+      case RESULTS:
+        if (value == null) {
+          unsetResults();
+        } else {
+          setResults((java.util.List<TKeyValue>) value);
+        }
+        break;
+      
+      case MORE:
+        if (value == null) {
+          unsetMore();
+        } else {
+          setMore((Boolean) value);
+        }
+        break;
+    
     }
   }
-
+  
   public void setFieldValue(int fieldID, Object value) {
     setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
   }
-
+  
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case RESULTS:
-      return getResults();
-
-    case MORE:
-      return new Boolean(isMore());
-
+      case RESULTS:
+        return getResults();
+        
+      case MORE:
+        return new Boolean(isMore());
+        
     }
     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 RESULTS:
-      return isSetResults();
-    case MORE:
-      return isSetMore();
+      case RESULTS:
+        return isSetResults();
+      case MORE:
+        return isSetMore();
     }
     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 ScanResult)
-      return this.equals((ScanResult)that);
+      return this.equals((ScanResult) that);
     return false;
   }
-
+  
   public boolean equals(ScanResult that) {
     if (that == null)
       return false;
-
+    
     boolean this_present_results = true && this.isSetResults();
     boolean that_present_results = true && that.isSetResults();
     if (this_present_results || that_present_results) {
@@ -276,7 +267,7 @@ public class ScanResult implements TBase
       if (!this.results.equals(that.results))
         return false;
     }
-
+    
     boolean this_present_more = true;
     boolean that_present_more = true;
     if (this_present_more || that_present_more) {
@@ -285,28 +276,29 @@ public class ScanResult implements TBase
       if (this.more != that.more)
         return false;
     }
-
+    
     return true;
   }
-
+  
   @Override
   public int hashCode() {
     return 0;
   }
-
+  
   public int compareTo(ScanResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
-
+    
     int lastComparison = 0;
-    ScanResult typedOther = (ScanResult)other;
-
+    ScanResult typedOther = (ScanResult) other;
+    
     lastComparison = Boolean.valueOf(isSetResults()).compareTo(typedOther.isSetResults());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetResults()) {      lastComparison = TBaseHelper.compareTo(this.results, typedOther.results);
+    if (isSetResults()) {
+      lastComparison = TBaseHelper.compareTo(this.results, typedOther.results);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -315,21 +307,21 @@ public class ScanResult implements TBase
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetMore()) {      lastComparison = TBaseHelper.compareTo(this.more, typedOther.more);
+    if (isSetMore()) {
+      lastComparison = TBaseHelper.compareTo(this.more, typedOther.more);
       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) {
@@ -338,8 +330,7 @@ public class ScanResult implements TBase
             {
               TList _list4 = iprot.readListBegin();
               this.results = new java.util.ArrayList<TKeyValue>(_list4.size);
-              for (int _i5 = 0; _i5 < _list4.size; ++_i5)
-              {
+              for (int _i5 = 0; _i5 < _list4.size; ++_i5) {
                 TKeyValue _elem6;
                 _elem6 = new TKeyValue();
                 _elem6.read(iprot);
@@ -347,7 +338,7 @@ public class ScanResult implements TBase
               }
               iprot.readListEnd();
             }
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -355,7 +346,7 @@ public class ScanResult implements TBase
           if (field.type == TType.BOOL) {
             this.more = iprot.readBool();
             setMoreIsSet(true);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -365,21 +356,20 @@ public class ScanResult implements TBase
       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.results != null) {
       oprot.writeFieldBegin(RESULTS_FIELD_DESC);
       {
         oprot.writeListBegin(new TList(TType.STRUCT, this.results.size()));
-        for (TKeyValue _iter7 : this.results)
-        {
+        for (TKeyValue _iter7 : this.results) {
           _iter7.write(oprot);
         }
         oprot.writeListEnd();
@@ -392,7 +382,7 @@ public class ScanResult implements TBase
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
-
+  
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder("ScanResult(");
@@ -408,10 +398,9 @@ public class ScanResult implements TBase
     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/data/thrift/TColumn.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java Thu Oct 27 15:24:51 2011
@@ -5,43 +5,39 @@
  */
 package org.apache.accumulo.core.data.thrift;
 
-
-
 import org.apache.thrift.*;
 import org.apache.thrift.meta_data.*;
 import org.apache.thrift.protocol.*;
 
 @SuppressWarnings("serial")
-public class TColumn implements TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable {
+public class TColumn implements TBase<TColumn,TColumn._Fields>, java.io.Serializable, Cloneable {
   private static final TStruct STRUCT_DESC = new TStruct("TColumn");
-
-  private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("columnFamily", TType.STRING, (short)1);
-  private static final TField COLUMN_QUALIFIER_FIELD_DESC = new TField("columnQualifier", TType.STRING, (short)2);
-  private static final TField COLUMN_VISIBILITY_FIELD_DESC = new TField("columnVisibility", TType.STRING, (short)3);
-
+  
+  private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("columnFamily", TType.STRING, (short) 1);
+  private static final TField COLUMN_QUALIFIER_FIELD_DESC = new TField("columnQualifier", TType.STRING, (short) 2);
+  private static final TField COLUMN_VISIBILITY_FIELD_DESC = new TField("columnVisibility", TType.STRING, (short) 3);
+  
   public byte[] columnFamily;
   public byte[] columnQualifier;
   public byte[] columnVisibility;
-
+  
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements TFieldIdEnum {
-    COLUMN_FAMILY((short)1, "columnFamily"),
-    COLUMN_QUALIFIER((short)2, "columnQualifier"),
-    COLUMN_VISIBILITY((short)3, "columnVisibility");
-
-    private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+    COLUMN_FAMILY((short) 1, "columnFamily"), COLUMN_QUALIFIER((short) 2, "columnQualifier"), COLUMN_VISIBILITY((short) 3, "columnVisibility");
+    
+    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: // COLUMN_FAMILY
           return COLUMN_FAMILY;
         case 2: // COLUMN_QUALIFIER
@@ -52,70 +48,62 @@ public class TColumn implements TBase<TC
           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.COLUMN_FAMILY, new FieldMetaData("columnFamily", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.COLUMN_QUALIFIER, new FieldMetaData("columnQualifier", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.COLUMN_VISIBILITY, new FieldMetaData("columnVisibility", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
+    java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.COLUMN_FAMILY, new FieldMetaData("columnFamily", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.STRING)));
+    tmpMap.put(_Fields.COLUMN_QUALIFIER, new FieldMetaData("columnQualifier", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.STRING)));
+    tmpMap.put(_Fields.COLUMN_VISIBILITY, new FieldMetaData("columnVisibility", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     FieldMetaData.addStructMetaDataMap(TColumn.class, metaDataMap);
   }
-
-  public TColumn() {
-  }
-
-  public TColumn(
-    byte[] columnFamily,
-    byte[] columnQualifier,
-    byte[] columnVisibility)
-  {
+  
+  public TColumn() {}
+  
+  public TColumn(byte[] columnFamily, byte[] columnQualifier, byte[] columnVisibility) {
     this();
     this.columnFamily = columnFamily;
     this.columnQualifier = columnQualifier;
     this.columnVisibility = columnVisibility;
   }
-
+  
   /**
    * Performs a deep copy on <i>other</i>.
    */
@@ -133,170 +121,170 @@ public class TColumn implements TBase<TC
       System.arraycopy(other.columnVisibility, 0, columnVisibility, 0, other.columnVisibility.length);
     }
   }
-
+  
   public TColumn deepCopy() {
     return new TColumn(this);
   }
-
+  
   @Deprecated
   public TColumn clone() {
     return new TColumn(this);
   }
-
+  
   public byte[] getColumnFamily() {
     return this.columnFamily;
   }
-
+  
   public TColumn setColumnFamily(byte[] columnFamily) {
     this.columnFamily = columnFamily;
     return this;
   }
-
+  
   public void unsetColumnFamily() {
     this.columnFamily = null;
   }
-
+  
   /** Returns true if field columnFamily is set (has been asigned a value) and false otherwise */
   public boolean isSetColumnFamily() {
     return this.columnFamily != null;
   }
-
+  
   public void setColumnFamilyIsSet(boolean value) {
     if (!value) {
       this.columnFamily = null;
     }
   }
-
+  
   public byte[] getColumnQualifier() {
     return this.columnQualifier;
   }
-
+  
   public TColumn setColumnQualifier(byte[] columnQualifier) {
     this.columnQualifier = columnQualifier;
     return this;
   }
-
+  
   public void unsetColumnQualifier() {
     this.columnQualifier = null;
   }
-
+  
   /** Returns true if field columnQualifier is set (has been asigned a value) and false otherwise */
   public boolean isSetColumnQualifier() {
     return this.columnQualifier != null;
   }
-
+  
   public void setColumnQualifierIsSet(boolean value) {
     if (!value) {
       this.columnQualifier = null;
     }
   }
-
+  
   public byte[] getColumnVisibility() {
     return this.columnVisibility;
   }
-
+  
   public TColumn setColumnVisibility(byte[] columnVisibility) {
     this.columnVisibility = columnVisibility;
     return this;
   }
-
+  
   public void unsetColumnVisibility() {
     this.columnVisibility = null;
   }
-
+  
   /** Returns true if field columnVisibility is set (has been asigned a value) and false otherwise */
   public boolean isSetColumnVisibility() {
     return this.columnVisibility != null;
   }
-
+  
   public void setColumnVisibilityIsSet(boolean value) {
     if (!value) {
       this.columnVisibility = null;
     }
   }
-
+  
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case COLUMN_FAMILY:
-      if (value == null) {
-        unsetColumnFamily();
-      } else {
-        setColumnFamily((byte[])value);
-      }
-      break;
-
-    case COLUMN_QUALIFIER:
-      if (value == null) {
-        unsetColumnQualifier();
-      } else {
-        setColumnQualifier((byte[])value);
-      }
-      break;
-
-    case COLUMN_VISIBILITY:
-      if (value == null) {
-        unsetColumnVisibility();
-      } else {
-        setColumnVisibility((byte[])value);
-      }
-      break;
-
+      case COLUMN_FAMILY:
+        if (value == null) {
+          unsetColumnFamily();
+        } else {
+          setColumnFamily((byte[]) value);
+        }
+        break;
+      
+      case COLUMN_QUALIFIER:
+        if (value == null) {
+          unsetColumnQualifier();
+        } else {
+          setColumnQualifier((byte[]) value);
+        }
+        break;
+      
+      case COLUMN_VISIBILITY:
+        if (value == null) {
+          unsetColumnVisibility();
+        } else {
+          setColumnVisibility((byte[]) value);
+        }
+        break;
+    
     }
   }
-
+  
   public void setFieldValue(int fieldID, Object value) {
     setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
   }
-
+  
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case COLUMN_FAMILY:
-      return getColumnFamily();
-
-    case COLUMN_QUALIFIER:
-      return getColumnQualifier();
-
-    case COLUMN_VISIBILITY:
-      return getColumnVisibility();
-
+      case COLUMN_FAMILY:
+        return getColumnFamily();
+        
+      case COLUMN_QUALIFIER:
+        return getColumnQualifier();
+        
+      case COLUMN_VISIBILITY:
+        return getColumnVisibility();
+        
     }
     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 COLUMN_FAMILY:
-      return isSetColumnFamily();
-    case COLUMN_QUALIFIER:
-      return isSetColumnQualifier();
-    case COLUMN_VISIBILITY:
-      return isSetColumnVisibility();
+      case COLUMN_FAMILY:
+        return isSetColumnFamily();
+      case COLUMN_QUALIFIER:
+        return isSetColumnQualifier();
+      case COLUMN_VISIBILITY:
+        return isSetColumnVisibility();
     }
     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 TColumn)
-      return this.equals((TColumn)that);
+      return this.equals((TColumn) that);
     return false;
   }
-
+  
   public boolean equals(TColumn that) {
     if (that == null)
       return false;
-
+    
     boolean this_present_columnFamily = true && this.isSetColumnFamily();
     boolean that_present_columnFamily = true && that.isSetColumnFamily();
     if (this_present_columnFamily || that_present_columnFamily) {
@@ -305,7 +293,7 @@ public class TColumn implements TBase<TC
       if (!java.util.Arrays.equals(this.columnFamily, that.columnFamily))
         return false;
     }
-
+    
     boolean this_present_columnQualifier = true && this.isSetColumnQualifier();
     boolean that_present_columnQualifier = true && that.isSetColumnQualifier();
     if (this_present_columnQualifier || that_present_columnQualifier) {
@@ -314,7 +302,7 @@ public class TColumn implements TBase<TC
       if (!java.util.Arrays.equals(this.columnQualifier, that.columnQualifier))
         return false;
     }
-
+    
     boolean this_present_columnVisibility = true && this.isSetColumnVisibility();
     boolean that_present_columnVisibility = true && that.isSetColumnVisibility();
     if (this_present_columnVisibility || that_present_columnVisibility) {
@@ -323,28 +311,29 @@ public class TColumn implements TBase<TC
       if (!java.util.Arrays.equals(this.columnVisibility, that.columnVisibility))
         return false;
     }
-
+    
     return true;
   }
-
+  
   @Override
   public int hashCode() {
     return 0;
   }
-
+  
   public int compareTo(TColumn other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
-
+    
     int lastComparison = 0;
-    TColumn typedOther = (TColumn)other;
-
+    TColumn typedOther = (TColumn) other;
+    
     lastComparison = Boolean.valueOf(isSetColumnFamily()).compareTo(typedOther.isSetColumnFamily());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetColumnFamily()) {      lastComparison = TBaseHelper.compareTo(this.columnFamily, typedOther.columnFamily);
+    if (isSetColumnFamily()) {
+      lastComparison = TBaseHelper.compareTo(this.columnFamily, typedOther.columnFamily);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -353,7 +342,8 @@ public class TColumn implements TBase<TC
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetColumnQualifier()) {      lastComparison = TBaseHelper.compareTo(this.columnQualifier, typedOther.columnQualifier);
+    if (isSetColumnQualifier()) {
+      lastComparison = TBaseHelper.compareTo(this.columnQualifier, typedOther.columnQualifier);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -362,42 +352,42 @@ public class TColumn implements TBase<TC
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetColumnVisibility()) {      lastComparison = TBaseHelper.compareTo(this.columnVisibility, typedOther.columnVisibility);
+    if (isSetColumnVisibility()) {
+      lastComparison = TBaseHelper.compareTo(this.columnVisibility, typedOther.columnVisibility);
       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) {
         case 1: // COLUMN_FAMILY
           if (field.type == TType.STRING) {
             this.columnFamily = iprot.readBinary();
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // COLUMN_QUALIFIER
           if (field.type == TType.STRING) {
             this.columnQualifier = iprot.readBinary();
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // COLUMN_VISIBILITY
           if (field.type == TType.STRING) {
             this.columnVisibility = iprot.readBinary();
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -407,14 +397,14 @@ public class TColumn implements TBase<TC
       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.columnFamily != null) {
       oprot.writeFieldBegin(COLUMN_FAMILY_FIELD_DESC);
@@ -434,7 +424,7 @@ public class TColumn implements TBase<TC
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
-
+  
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder("TColumn(");
@@ -442,44 +432,54 @@ public class TColumn implements TBase<TC
     if (this.columnFamily == null) {
       sb.append("null");
     } else {
-        int __columnFamily_size = Math.min(this.columnFamily.length, 128);
-        for (int i = 0; i < __columnFamily_size; i++) {
-          if (i != 0) sb.append(" ");
-          sb.append(Integer.toHexString(this.columnFamily[i]).length() > 1 ? Integer.toHexString(this.columnFamily[i]).substring(Integer.toHexString(this.columnFamily[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.columnFamily[i]).toUpperCase());
-        }
-        if (this.columnFamily.length > 128) sb.append(" ...");
+      int __columnFamily_size = Math.min(this.columnFamily.length, 128);
+      for (int i = 0; i < __columnFamily_size; i++) {
+        if (i != 0)
+          sb.append(" ");
+        sb.append(Integer.toHexString(this.columnFamily[i]).length() > 1 ? Integer.toHexString(this.columnFamily[i])
+            .substring(Integer.toHexString(this.columnFamily[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.columnFamily[i]).toUpperCase());
+      }
+      if (this.columnFamily.length > 128)
+        sb.append(" ...");
     }
     sb.append(", ");
     sb.append("columnQualifier:");
     if (this.columnQualifier == null) {
       sb.append("null");
     } else {
-        int __columnQualifier_size = Math.min(this.columnQualifier.length, 128);
-        for (int i = 0; i < __columnQualifier_size; i++) {
-          if (i != 0) sb.append(" ");
-          sb.append(Integer.toHexString(this.columnQualifier[i]).length() > 1 ? Integer.toHexString(this.columnQualifier[i]).substring(Integer.toHexString(this.columnQualifier[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.columnQualifier[i]).toUpperCase());
-        }
-        if (this.columnQualifier.length > 128) sb.append(" ...");
+      int __columnQualifier_size = Math.min(this.columnQualifier.length, 128);
+      for (int i = 0; i < __columnQualifier_size; i++) {
+        if (i != 0)
+          sb.append(" ");
+        sb.append(Integer.toHexString(this.columnQualifier[i]).length() > 1 ? Integer.toHexString(this.columnQualifier[i])
+            .substring(Integer.toHexString(this.columnQualifier[i]).length() - 2).toUpperCase() : "0"
+            + Integer.toHexString(this.columnQualifier[i]).toUpperCase());
+      }
+      if (this.columnQualifier.length > 128)
+        sb.append(" ...");
     }
     sb.append(", ");
     sb.append("columnVisibility:");
     if (this.columnVisibility == null) {
       sb.append("null");
     } else {
-        int __columnVisibility_size = Math.min(this.columnVisibility.length, 128);
-        for (int i = 0; i < __columnVisibility_size; i++) {
-          if (i != 0) sb.append(" ");
-          sb.append(Integer.toHexString(this.columnVisibility[i]).length() > 1 ? Integer.toHexString(this.columnVisibility[i]).substring(Integer.toHexString(this.columnVisibility[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.columnVisibility[i]).toUpperCase());
-        }
-        if (this.columnVisibility.length > 128) sb.append(" ...");
+      int __columnVisibility_size = Math.min(this.columnVisibility.length, 128);
+      for (int i = 0; i < __columnVisibility_size; i++) {
+        if (i != 0)
+          sb.append(" ");
+        sb.append(Integer.toHexString(this.columnVisibility[i]).length() > 1 ? Integer.toHexString(this.columnVisibility[i])
+            .substring(Integer.toHexString(this.columnVisibility[i]).length() - 2).toUpperCase() : "0"
+            + Integer.toHexString(this.columnVisibility[i]).toUpperCase());
+      }
+      if (this.columnVisibility.length > 128)
+        sb.append(" ...");
     }
     sb.append(")");
     return sb.toString();
   }
-
+  
   public void validate() throws TException {
     // check for required fields
   }
-
+  
 }
-



Mime
View raw message