accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1433166 [6/20] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ assemble/platform/ assemble/scripts/ assemble/scripts/init.d/ bin/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ co...
Date Mon, 14 Jan 2013 22:03:34 GMT
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *
@@ -41,8 +57,8 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField INGEST_BYTE_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("ingestByteRate", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
   private static final org.apache.thrift.protocol.TField QUERY_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("queryRate", org.apache.thrift.protocol.TType.DOUBLE, (short)7);
   private static final org.apache.thrift.protocol.TField QUERY_BYTE_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("queryByteRate", org.apache.thrift.protocol.TType.DOUBLE, (short)8);
-  private static final org.apache.thrift.protocol.TField MINOR_FIELD_DESC = new org.apache.thrift.protocol.TField("minor", org.apache.thrift.protocol.TType.STRUCT, (short)9);
-  private static final org.apache.thrift.protocol.TField MAJOR_FIELD_DESC = new org.apache.thrift.protocol.TField("major", org.apache.thrift.protocol.TType.STRUCT, (short)10);
+  private static final org.apache.thrift.protocol.TField MINORS_FIELD_DESC = new org.apache.thrift.protocol.TField("minors", org.apache.thrift.protocol.TType.STRUCT, (short)9);
+  private static final org.apache.thrift.protocol.TField MAJORS_FIELD_DESC = new org.apache.thrift.protocol.TField("majors", org.apache.thrift.protocol.TType.STRUCT, (short)10);
   private static final org.apache.thrift.protocol.TField SCANS_FIELD_DESC = new org.apache.thrift.protocol.TField("scans", org.apache.thrift.protocol.TType.STRUCT, (short)11);
   private static final org.apache.thrift.protocol.TField SCAN_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("scanRate", org.apache.thrift.protocol.TType.DOUBLE, (short)12);
 
@@ -60,8 +76,8 @@ import org.slf4j.LoggerFactory;
   public double ingestByteRate; // required
   public double queryRate; // required
   public double queryByteRate; // required
-  public Compacting minor; // required
-  public Compacting major; // required
+  public Compacting minors; // required
+  public Compacting majors; // required
   public Compacting scans; // required
   public double scanRate; // required
 
@@ -75,8 +91,8 @@ import org.slf4j.LoggerFactory;
     INGEST_BYTE_RATE((short)6, "ingestByteRate"),
     QUERY_RATE((short)7, "queryRate"),
     QUERY_BYTE_RATE((short)8, "queryByteRate"),
-    MINOR((short)9, "minor"),
-    MAJOR((short)10, "major"),
+    MINORS((short)9, "minors"),
+    MAJORS((short)10, "majors"),
     SCANS((short)11, "scans"),
     SCAN_RATE((short)12, "scanRate");
 
@@ -109,10 +125,10 @@ import org.slf4j.LoggerFactory;
           return QUERY_RATE;
         case 8: // QUERY_BYTE_RATE
           return QUERY_BYTE_RATE;
-        case 9: // MINOR
-          return MINOR;
-        case 10: // MAJOR
-          return MAJOR;
+        case 9: // MINORS
+          return MINORS;
+        case 10: // MAJORS
+          return MAJORS;
         case 11: // SCANS
           return SCANS;
         case 12: // SCAN_RATE
@@ -186,9 +202,9 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.QUERY_BYTE_RATE, new org.apache.thrift.meta_data.FieldMetaData("queryByteRate", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.MINOR, new org.apache.thrift.meta_data.FieldMetaData("minor", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.MINORS, new org.apache.thrift.meta_data.FieldMetaData("minors", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Compacting.class)));
-    tmpMap.put(_Fields.MAJOR, new org.apache.thrift.meta_data.FieldMetaData("major", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.MAJORS, new org.apache.thrift.meta_data.FieldMetaData("majors", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Compacting.class)));
     tmpMap.put(_Fields.SCANS, new org.apache.thrift.meta_data.FieldMetaData("scans", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Compacting.class)));
@@ -210,8 +226,8 @@ import org.slf4j.LoggerFactory;
     double ingestByteRate,
     double queryRate,
     double queryByteRate,
-    Compacting minor,
-    Compacting major,
+    Compacting minors,
+    Compacting majors,
     Compacting scans,
     double scanRate)
   {
@@ -232,8 +248,8 @@ import org.slf4j.LoggerFactory;
     setQueryRateIsSet(true);
     this.queryByteRate = queryByteRate;
     setQueryByteRateIsSet(true);
-    this.minor = minor;
-    this.major = major;
+    this.minors = minors;
+    this.majors = majors;
     this.scans = scans;
     this.scanRate = scanRate;
     setScanRateIsSet(true);
@@ -252,11 +268,11 @@ import org.slf4j.LoggerFactory;
     this.ingestByteRate = other.ingestByteRate;
     this.queryRate = other.queryRate;
     this.queryByteRate = other.queryByteRate;
-    if (other.isSetMinor()) {
-      this.minor = new Compacting(other.minor);
+    if (other.isSetMinors()) {
+      this.minors = new Compacting(other.minors);
     }
-    if (other.isSetMajor()) {
-      this.major = new Compacting(other.major);
+    if (other.isSetMajors()) {
+      this.majors = new Compacting(other.majors);
     }
     if (other.isSetScans()) {
       this.scans = new Compacting(other.scans);
@@ -286,8 +302,8 @@ import org.slf4j.LoggerFactory;
     this.queryRate = 0.0;
     setQueryByteRateIsSet(false);
     this.queryByteRate = 0.0;
-    this.minor = null;
-    this.major = null;
+    this.minors = null;
+    this.majors = null;
     this.scans = null;
     setScanRateIsSet(false);
     this.scanRate = 0.0;
@@ -477,51 +493,51 @@ import org.slf4j.LoggerFactory;
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUERYBYTERATE_ISSET_ID, value);
   }
 
-  public Compacting getMinor() {
-    return this.minor;
+  public Compacting getMinors() {
+    return this.minors;
   }
 
-  public TableInfo setMinor(Compacting minor) {
-    this.minor = minor;
+  public TableInfo setMinors(Compacting minors) {
+    this.minors = minors;
     return this;
   }
 
-  public void unsetMinor() {
-    this.minor = null;
+  public void unsetMinors() {
+    this.minors = null;
   }
 
-  /** Returns true if field minor is set (has been assigned a value) and false otherwise */
-  public boolean isSetMinor() {
-    return this.minor != null;
+  /** Returns true if field minors is set (has been assigned a value) and false otherwise */
+  public boolean isSetMinors() {
+    return this.minors != null;
   }
 
-  public void setMinorIsSet(boolean value) {
+  public void setMinorsIsSet(boolean value) {
     if (!value) {
-      this.minor = null;
+      this.minors = null;
     }
   }
 
-  public Compacting getMajor() {
-    return this.major;
+  public Compacting getMajors() {
+    return this.majors;
   }
 
-  public TableInfo setMajor(Compacting major) {
-    this.major = major;
+  public TableInfo setMajors(Compacting majors) {
+    this.majors = majors;
     return this;
   }
 
-  public void unsetMajor() {
-    this.major = null;
+  public void unsetMajors() {
+    this.majors = null;
   }
 
-  /** Returns true if field major is set (has been assigned a value) and false otherwise */
-  public boolean isSetMajor() {
-    return this.major != null;
+  /** Returns true if field majors is set (has been assigned a value) and false otherwise */
+  public boolean isSetMajors() {
+    return this.majors != null;
   }
 
-  public void setMajorIsSet(boolean value) {
+  public void setMajorsIsSet(boolean value) {
     if (!value) {
-      this.major = null;
+      this.majors = null;
     }
   }
 
@@ -638,19 +654,19 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case MINOR:
+    case MINORS:
       if (value == null) {
-        unsetMinor();
+        unsetMinors();
       } else {
-        setMinor((Compacting)value);
+        setMinors((Compacting)value);
       }
       break;
 
-    case MAJOR:
+    case MAJORS:
       if (value == null) {
-        unsetMajor();
+        unsetMajors();
       } else {
-        setMajor((Compacting)value);
+        setMajors((Compacting)value);
       }
       break;
 
@@ -699,11 +715,11 @@ import org.slf4j.LoggerFactory;
     case QUERY_BYTE_RATE:
       return Double.valueOf(getQueryByteRate());
 
-    case MINOR:
-      return getMinor();
+    case MINORS:
+      return getMinors();
 
-    case MAJOR:
-      return getMajor();
+    case MAJORS:
+      return getMajors();
 
     case SCANS:
       return getScans();
@@ -738,10 +754,10 @@ import org.slf4j.LoggerFactory;
       return isSetQueryRate();
     case QUERY_BYTE_RATE:
       return isSetQueryByteRate();
-    case MINOR:
-      return isSetMinor();
-    case MAJOR:
-      return isSetMajor();
+    case MINORS:
+      return isSetMinors();
+    case MAJORS:
+      return isSetMajors();
     case SCANS:
       return isSetScans();
     case SCAN_RATE:
@@ -835,21 +851,21 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_minor = true && this.isSetMinor();
-    boolean that_present_minor = true && that.isSetMinor();
-    if (this_present_minor || that_present_minor) {
-      if (!(this_present_minor && that_present_minor))
+    boolean this_present_minors = true && this.isSetMinors();
+    boolean that_present_minors = true && that.isSetMinors();
+    if (this_present_minors || that_present_minors) {
+      if (!(this_present_minors && that_present_minors))
         return false;
-      if (!this.minor.equals(that.minor))
+      if (!this.minors.equals(that.minors))
         return false;
     }
 
-    boolean this_present_major = true && this.isSetMajor();
-    boolean that_present_major = true && that.isSetMajor();
-    if (this_present_major || that_present_major) {
-      if (!(this_present_major && that_present_major))
+    boolean this_present_majors = true && this.isSetMajors();
+    boolean that_present_majors = true && that.isSetMajors();
+    if (this_present_majors || that_present_majors) {
+      if (!(this_present_majors && that_present_majors))
         return false;
-      if (!this.major.equals(that.major))
+      if (!this.majors.equals(that.majors))
         return false;
     }
 
@@ -967,22 +983,22 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMinor()).compareTo(typedOther.isSetMinor());
+    lastComparison = Boolean.valueOf(isSetMinors()).compareTo(typedOther.isSetMinors());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetMinor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minor, typedOther.minor);
+    if (isSetMinors()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minors, typedOther.minors);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMajor()).compareTo(typedOther.isSetMajor());
+    lastComparison = Boolean.valueOf(isSetMajors()).compareTo(typedOther.isSetMajors());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetMajor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.major, typedOther.major);
+    if (isSetMajors()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.majors, typedOther.majors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1059,19 +1075,19 @@ import org.slf4j.LoggerFactory;
     sb.append(this.queryByteRate);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("minor:");
-    if (this.minor == null) {
+    sb.append("minors:");
+    if (this.minors == null) {
       sb.append("null");
     } else {
-      sb.append(this.minor);
+      sb.append(this.minors);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("major:");
-    if (this.major == null) {
+    sb.append("majors:");
+    if (this.majors == null) {
       sb.append("null");
     } else {
-      sb.append(this.major);
+      sb.append(this.majors);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -1093,11 +1109,11 @@ import org.slf4j.LoggerFactory;
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
     // check for sub-struct validity
-    if (minor != null) {
-      minor.validate();
+    if (minors != null) {
+      minors.validate();
     }
-    if (major != null) {
-      major.validate();
+    if (majors != null) {
+      majors.validate();
     }
     if (scans != null) {
       scans.validate();
@@ -1204,20 +1220,20 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 9: // MINOR
+          case 9: // MINORS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.minor = new Compacting();
-              struct.minor.read(iprot);
-              struct.setMinorIsSet(true);
+              struct.minors = new Compacting();
+              struct.minors.read(iprot);
+              struct.setMinorsIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 10: // MAJOR
+          case 10: // MAJORS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.major = new Compacting();
-              struct.major.read(iprot);
-              struct.setMajorIsSet(true);
+              struct.majors = new Compacting();
+              struct.majors.read(iprot);
+              struct.setMajorsIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1278,14 +1294,14 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(QUERY_BYTE_RATE_FIELD_DESC);
       oprot.writeDouble(struct.queryByteRate);
       oprot.writeFieldEnd();
-      if (struct.minor != null) {
-        oprot.writeFieldBegin(MINOR_FIELD_DESC);
-        struct.minor.write(oprot);
+      if (struct.minors != null) {
+        oprot.writeFieldBegin(MINORS_FIELD_DESC);
+        struct.minors.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (struct.major != null) {
-        oprot.writeFieldBegin(MAJOR_FIELD_DESC);
-        struct.major.write(oprot);
+      if (struct.majors != null) {
+        oprot.writeFieldBegin(MAJORS_FIELD_DESC);
+        struct.majors.write(oprot);
         oprot.writeFieldEnd();
       }
       if (struct.scans != null) {
@@ -1338,10 +1354,10 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetQueryByteRate()) {
         optionals.set(7);
       }
-      if (struct.isSetMinor()) {
+      if (struct.isSetMinors()) {
         optionals.set(8);
       }
-      if (struct.isSetMajor()) {
+      if (struct.isSetMajors()) {
         optionals.set(9);
       }
       if (struct.isSetScans()) {
@@ -1375,11 +1391,11 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetQueryByteRate()) {
         oprot.writeDouble(struct.queryByteRate);
       }
-      if (struct.isSetMinor()) {
-        struct.minor.write(oprot);
+      if (struct.isSetMinors()) {
+        struct.minors.write(oprot);
       }
-      if (struct.isSetMajor()) {
-        struct.major.write(oprot);
+      if (struct.isSetMajors()) {
+        struct.majors.write(oprot);
       }
       if (struct.isSetScans()) {
         struct.scans.write(oprot);
@@ -1426,14 +1442,14 @@ import org.slf4j.LoggerFactory;
         struct.setQueryByteRateIsSet(true);
       }
       if (incoming.get(8)) {
-        struct.minor = new Compacting();
-        struct.minor.read(iprot);
-        struct.setMinorIsSet(true);
+        struct.minors = new Compacting();
+        struct.minors.read(iprot);
+        struct.setMinorsIsSet(true);
       }
       if (incoming.get(9)) {
-        struct.major = new Compacting();
-        struct.major.read(iprot);
-        struct.setMajorIsSet(true);
+        struct.majors = new Compacting();
+        struct.majors.read(iprot);
+        struct.setMajorsIsSet(true);
       }
       if (incoming.get(10)) {
         struct.scans = new Compacting();

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableOperation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableOperation.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableOperation.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableOperation.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java Mon Jan 14 22:03:24 2013
@@ -40,8 +40,6 @@ public class Authorizations implements I
   private HashSet<ByteSequence> auths = new HashSet<ByteSequence>();
   private List<byte[]> authsList = new ArrayList<byte[]>();
   private List<byte[]> immutableList = Collections.unmodifiableList(authsList);
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   private static final boolean[] validAuthChars = new boolean[256];
   
@@ -116,7 +114,7 @@ public class Authorizations implements I
       authsString = authsString.substring(HEADER.length());
       if (authsString.length() > 0) {
         for (String encAuth : authsString.split(",")) {
-          byte[] auth = Base64.decodeBase64(encAuth.getBytes(utf8));
+          byte[] auth = Base64.decodeBase64(encAuth.getBytes());
           auths.add(new ArrayByteSequence(auth));
         }
         checkAuths();
@@ -167,7 +165,7 @@ public class Authorizations implements I
   }
   
   public byte[] getAuthorizationsArray() {
-    return serialize().getBytes(utf8);
+    return serialize().getBytes();
   }
   
   public List<byte[]> getAuthorizations() {

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java Mon Jan 14 22:03:24 2013
@@ -17,12 +17,12 @@
 package org.apache.accumulo.core.security;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.TreeSet;
 
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
@@ -39,8 +39,6 @@ public class ColumnVisibility {
   
   Node node = null;
   private byte[] expression;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   /**
    * Accessor for the underlying byte string.
@@ -140,31 +138,77 @@ public class ColumnVisibility {
       return 0;
     }
   }
-  
-  static private void flatten(Node root, byte[] expression, StringBuilder out) {
-    if (root.type == NodeType.TERM)
+
+  /* Convience method that delegates to normalize with a new
+   * NodeComparator constructed using the supplied expression.
+   */
+  private static Node normalize(Node root, byte[] expression) {
+    return normalize(root, expression, new NodeComparator(expression));
+  } 
+
+  /* Walks an expression's AST in order to:
+   *  1) roll up expressions with the same operant (`a&(b&c) becomes a&b&c`)
+   *  2) sorts labels lexicographically (permutations of `a&b&c` are re-ordered to appear as `a&b&c`)
+   *  3) dedupes labels (`a&b&a` becomes `a&b`)
+   */
+  private static Node normalize(Node root, byte[] expression, NodeComparator comparator) {
+    if(root.type != NodeType.TERM) {
+      TreeSet<Node> rolledUp = new TreeSet<Node>(comparator);
+      java.util.Iterator<Node> itr = root.children.iterator();
+      while(itr.hasNext()) { 
+        Node c = normalize(itr.next(), expression, comparator);
+        if(c.type == root.type) {
+          rolledUp.addAll(c.children);
+          itr.remove();
+        }
+      }
+      rolledUp.addAll(root.children);
+      root.children.clear();
+      root.children.addAll(rolledUp);
+      
+      //need to promote a child if it's an only child
+      if(root.children.size() == 1) {
+        return root.children.get(0);
+      }
+    }
+
+    return root;
+  }
+
+  /* Walks an expression's AST and appends a string representation to a supplied
+   * StringBuilder. This method adds parens where necessary.
+   */
+  private static void stringify(Node root, byte[] expression, StringBuilder out) {
+    if (root.type == NodeType.TERM) {
       out.append(new String(expression, root.start, root.end - root.start));
+    }
     else {
       String sep = "";
-      Collections.sort(root.children, new NodeComparator(expression));
       for (Node c : root.children) {
         out.append(sep);
         boolean parens = (c.type != NodeType.TERM && root.type != c.type);
         if (parens)
           out.append("(");
-        flatten(c, expression, out);
+        stringify(c, expression, out);
         if (parens)
           out.append(")");
         sep = root.type == NodeType.AND ? "&" : "|";
       }
     }
   }
-  
+
+  /**
+   * Generates a byte[] that represents a normalized, but logically equivalent,
+   * form of the supplied expression.
+   *
+   * @return normalized expression in byte[] form
+   */
   public byte[] flatten() {
-    StringBuilder builder = new StringBuilder();
-    flatten(node, expression, builder);
-    return builder.toString().getBytes(utf8);
-  }
+    Node normRoot = normalize(node, expression);
+    StringBuilder builder = new StringBuilder(expression.length);
+    stringify(normRoot, expression, builder);
+    return builder.toString().getBytes();
+  } 
   
   private static class ColumnVisibilityParser {
     private int index = 0;
@@ -325,7 +369,7 @@ public class ColumnVisibility {
    * @param expression
    */
   public ColumnVisibility(String expression) {
-    this(expression.getBytes(utf8));
+    this(expression.getBytes());
   }
   
   /**

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *
@@ -44,6 +60,7 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)10);
   private static final org.apache.thrift.protocol.TField SSI_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("ssiList", org.apache.thrift.protocol.TType.LIST, (short)11);
   private static final org.apache.thrift.protocol.TField SSIO_FIELD_DESC = new org.apache.thrift.protocol.TField("ssio", org.apache.thrift.protocol.TType.MAP, (short)12);
+  private static final org.apache.thrift.protocol.TField AUTHORIZATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("authorizations", org.apache.thrift.protocol.TType.LIST, (short)13);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -70,6 +87,7 @@ import org.slf4j.LoggerFactory;
   public List<org.apache.accumulo.core.data.thrift.TColumn> columns; // required
   public List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList; // required
   public Map<String,Map<String,String>> ssio; // required
+  public List<ByteBuffer> authorizations; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -91,7 +109,8 @@ import org.slf4j.LoggerFactory;
     EXTENT((short)9, "extent"),
     COLUMNS((short)10, "columns"),
     SSI_LIST((short)11, "ssiList"),
-    SSIO((short)12, "ssio");
+    SSIO((short)12, "ssio"),
+    AUTHORIZATIONS((short)13, "authorizations");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -128,6 +147,8 @@ import org.slf4j.LoggerFactory;
           return SSI_LIST;
         case 12: // SSIO
           return SSIO;
+        case 13: // AUTHORIZATIONS
+          return AUTHORIZATIONS;
         default:
           return null;
       }
@@ -202,6 +223,9 @@ import org.slf4j.LoggerFactory;
             new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
                 new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
                 new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))));
+    tmpMap.put(_Fields.AUTHORIZATIONS, new org.apache.thrift.meta_data.FieldMetaData("authorizations", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ActiveScan.class, metaDataMap);
   }
@@ -220,7 +244,8 @@ import org.slf4j.LoggerFactory;
     org.apache.accumulo.core.data.thrift.TKeyExtent extent,
     List<org.apache.accumulo.core.data.thrift.TColumn> columns,
     List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList,
-    Map<String,Map<String,String>> ssio)
+    Map<String,Map<String,String>> ssio,
+    List<ByteBuffer> authorizations)
   {
     this();
     this.client = client;
@@ -236,6 +261,7 @@ import org.slf4j.LoggerFactory;
     this.columns = columns;
     this.ssiList = ssiList;
     this.ssio = ssio;
+    this.authorizations = authorizations;
   }
 
   /**
@@ -303,6 +329,15 @@ import org.slf4j.LoggerFactory;
       }
       this.ssio = __this__ssio;
     }
+    if (other.isSetAuthorizations()) {
+      List<ByteBuffer> __this__authorizations = new ArrayList<ByteBuffer>();
+      for (ByteBuffer other_element : other.authorizations) {
+        ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element);
+;
+        __this__authorizations.add(temp_binary_element);
+      }
+      this.authorizations = __this__authorizations;
+    }
   }
 
   public ActiveScan deepCopy() {
@@ -324,6 +359,7 @@ import org.slf4j.LoggerFactory;
     this.columns = null;
     this.ssiList = null;
     this.ssio = null;
+    this.authorizations = null;
   }
 
   public String getClient() {
@@ -645,6 +681,45 @@ import org.slf4j.LoggerFactory;
     }
   }
 
+  public int getAuthorizationsSize() {
+    return (this.authorizations == null) ? 0 : this.authorizations.size();
+  }
+
+  public java.util.Iterator<ByteBuffer> getAuthorizationsIterator() {
+    return (this.authorizations == null) ? null : this.authorizations.iterator();
+  }
+
+  public void addToAuthorizations(ByteBuffer elem) {
+    if (this.authorizations == null) {
+      this.authorizations = new ArrayList<ByteBuffer>();
+    }
+    this.authorizations.add(elem);
+  }
+
+  public List<ByteBuffer> getAuthorizations() {
+    return this.authorizations;
+  }
+
+  public ActiveScan setAuthorizations(List<ByteBuffer> authorizations) {
+    this.authorizations = authorizations;
+    return this;
+  }
+
+  public void unsetAuthorizations() {
+    this.authorizations = null;
+  }
+
+  /** Returns true if field authorizations is set (has been assigned a value) and false otherwise */
+  public boolean isSetAuthorizations() {
+    return this.authorizations != null;
+  }
+
+  public void setAuthorizationsIsSet(boolean value) {
+    if (!value) {
+      this.authorizations = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case CLIENT:
@@ -735,6 +810,14 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
+    case AUTHORIZATIONS:
+      if (value == null) {
+        unsetAuthorizations();
+      } else {
+        setAuthorizations((List<ByteBuffer>)value);
+      }
+      break;
+
     }
   }
 
@@ -773,6 +856,9 @@ import org.slf4j.LoggerFactory;
     case SSIO:
       return getSsio();
 
+    case AUTHORIZATIONS:
+      return getAuthorizations();
+
     }
     throw new IllegalStateException();
   }
@@ -806,6 +892,8 @@ import org.slf4j.LoggerFactory;
       return isSetSsiList();
     case SSIO:
       return isSetSsio();
+    case AUTHORIZATIONS:
+      return isSetAuthorizations();
     }
     throw new IllegalStateException();
   }
@@ -922,6 +1010,15 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
+    boolean this_present_authorizations = true && this.isSetAuthorizations();
+    boolean that_present_authorizations = true && that.isSetAuthorizations();
+    if (this_present_authorizations || that_present_authorizations) {
+      if (!(this_present_authorizations && that_present_authorizations))
+        return false;
+      if (!this.authorizations.equals(that.authorizations))
+        return false;
+    }
+
     return true;
   }
 
@@ -1048,6 +1145,16 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetAuthorizations()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1147,6 +1254,14 @@ import org.slf4j.LoggerFactory;
       sb.append(this.ssio);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("authorizations:");
+    if (this.authorizations == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.authorizations);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -1330,6 +1445,24 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 13: // AUTHORIZATIONS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
+                struct.authorizations = new ArrayList<ByteBuffer>(_list22.size);
+                for (int _i23 = 0; _i23 < _list22.size; ++_i23)
+                {
+                  ByteBuffer _elem24; // required
+                  _elem24 = iprot.readBinary();
+                  struct.authorizations.add(_elem24);
+                }
+                iprot.readListEnd();
+              }
+              struct.setAuthorizationsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -1385,9 +1518,9 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
-          for (org.apache.accumulo.core.data.thrift.TColumn _iter22 : struct.columns)
+          for (org.apache.accumulo.core.data.thrift.TColumn _iter25 : struct.columns)
           {
-            _iter22.write(oprot);
+            _iter25.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -1397,9 +1530,9 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(SSI_LIST_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ssiList.size()));
-          for (org.apache.accumulo.core.data.thrift.IterInfo _iter23 : struct.ssiList)
+          for (org.apache.accumulo.core.data.thrift.IterInfo _iter26 : struct.ssiList)
           {
-            _iter23.write(oprot);
+            _iter26.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -1409,15 +1542,15 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(SSIO_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.ssio.size()));
-          for (Map.Entry<String, Map<String,String>> _iter24 : struct.ssio.entrySet())
+          for (Map.Entry<String, Map<String,String>> _iter27 : struct.ssio.entrySet())
           {
-            oprot.writeString(_iter24.getKey());
+            oprot.writeString(_iter27.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter24.getValue().size()));
-              for (Map.Entry<String, String> _iter25 : _iter24.getValue().entrySet())
+              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter27.getValue().size()));
+              for (Map.Entry<String, String> _iter28 : _iter27.getValue().entrySet())
               {
-                oprot.writeString(_iter25.getKey());
-                oprot.writeString(_iter25.getValue());
+                oprot.writeString(_iter28.getKey());
+                oprot.writeString(_iter28.getValue());
               }
               oprot.writeMapEnd();
             }
@@ -1426,6 +1559,18 @@ import org.slf4j.LoggerFactory;
         }
         oprot.writeFieldEnd();
       }
+      if (struct.authorizations != null) {
+        oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size()));
+          for (ByteBuffer _iter29 : struct.authorizations)
+          {
+            oprot.writeBinary(_iter29);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1477,7 +1622,10 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetSsio()) {
         optionals.set(10);
       }
-      oprot.writeBitSet(optionals, 11);
+      if (struct.isSetAuthorizations()) {
+        optionals.set(11);
+      }
+      oprot.writeBitSet(optionals, 12);
       if (struct.isSetClient()) {
         oprot.writeString(struct.client);
       }
@@ -1505,44 +1653,53 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetColumns()) {
         {
           oprot.writeI32(struct.columns.size());
-          for (org.apache.accumulo.core.data.thrift.TColumn _iter26 : struct.columns)
+          for (org.apache.accumulo.core.data.thrift.TColumn _iter30 : struct.columns)
           {
-            _iter26.write(oprot);
+            _iter30.write(oprot);
           }
         }
       }
       if (struct.isSetSsiList()) {
         {
           oprot.writeI32(struct.ssiList.size());
-          for (org.apache.accumulo.core.data.thrift.IterInfo _iter27 : struct.ssiList)
+          for (org.apache.accumulo.core.data.thrift.IterInfo _iter31 : struct.ssiList)
           {
-            _iter27.write(oprot);
+            _iter31.write(oprot);
           }
         }
       }
       if (struct.isSetSsio()) {
         {
           oprot.writeI32(struct.ssio.size());
-          for (Map.Entry<String, Map<String,String>> _iter28 : struct.ssio.entrySet())
+          for (Map.Entry<String, Map<String,String>> _iter32 : struct.ssio.entrySet())
           {
-            oprot.writeString(_iter28.getKey());
+            oprot.writeString(_iter32.getKey());
             {
-              oprot.writeI32(_iter28.getValue().size());
-              for (Map.Entry<String, String> _iter29 : _iter28.getValue().entrySet())
+              oprot.writeI32(_iter32.getValue().size());
+              for (Map.Entry<String, String> _iter33 : _iter32.getValue().entrySet())
               {
-                oprot.writeString(_iter29.getKey());
-                oprot.writeString(_iter29.getValue());
+                oprot.writeString(_iter33.getKey());
+                oprot.writeString(_iter33.getValue());
               }
             }
           }
         }
       }
+      if (struct.isSetAuthorizations()) {
+        {
+          oprot.writeI32(struct.authorizations.size());
+          for (ByteBuffer _iter34 : struct.authorizations)
+          {
+            oprot.writeBinary(_iter34);
+          }
+        }
+      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ActiveScan struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(11);
+      BitSet incoming = iprot.readBitSet(12);
       if (incoming.get(0)) {
         struct.client = iprot.readString();
         struct.setClientIsSet(true);
@@ -1578,58 +1735,71 @@ import org.slf4j.LoggerFactory;
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list30 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list30.size);
-          for (int _i31 = 0; _i31 < _list30.size; ++_i31)
+          org.apache.thrift.protocol.TList _list35 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list35.size);
+          for (int _i36 = 0; _i36 < _list35.size; ++_i36)
           {
-            org.apache.accumulo.core.data.thrift.TColumn _elem32; // required
-            _elem32 = new org.apache.accumulo.core.data.thrift.TColumn();
-            _elem32.read(iprot);
-            struct.columns.add(_elem32);
+            org.apache.accumulo.core.data.thrift.TColumn _elem37; // required
+            _elem37 = new org.apache.accumulo.core.data.thrift.TColumn();
+            _elem37.read(iprot);
+            struct.columns.add(_elem37);
           }
         }
         struct.setColumnsIsSet(true);
       }
       if (incoming.get(9)) {
         {
-          org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list33.size);
-          for (int _i34 = 0; _i34 < _list33.size; ++_i34)
+          org.apache.thrift.protocol.TList _list38 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list38.size);
+          for (int _i39 = 0; _i39 < _list38.size; ++_i39)
           {
-            org.apache.accumulo.core.data.thrift.IterInfo _elem35; // required
-            _elem35 = new org.apache.accumulo.core.data.thrift.IterInfo();
-            _elem35.read(iprot);
-            struct.ssiList.add(_elem35);
+            org.apache.accumulo.core.data.thrift.IterInfo _elem40; // required
+            _elem40 = new org.apache.accumulo.core.data.thrift.IterInfo();
+            _elem40.read(iprot);
+            struct.ssiList.add(_elem40);
           }
         }
         struct.setSsiListIsSet(true);
       }
       if (incoming.get(10)) {
         {
-          org.apache.thrift.protocol.TMap _map36 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
-          struct.ssio = new HashMap<String,Map<String,String>>(2*_map36.size);
-          for (int _i37 = 0; _i37 < _map36.size; ++_i37)
+          org.apache.thrift.protocol.TMap _map41 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+          struct.ssio = new HashMap<String,Map<String,String>>(2*_map41.size);
+          for (int _i42 = 0; _i42 < _map41.size; ++_i42)
           {
-            String _key38; // required
-            Map<String,String> _val39; // required
-            _key38 = iprot.readString();
+            String _key43; // required
+            Map<String,String> _val44; // required
+            _key43 = iprot.readString();
             {
-              org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-              _val39 = new HashMap<String,String>(2*_map40.size);
-              for (int _i41 = 0; _i41 < _map40.size; ++_i41)
+              org.apache.thrift.protocol.TMap _map45 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+              _val44 = new HashMap<String,String>(2*_map45.size);
+              for (int _i46 = 0; _i46 < _map45.size; ++_i46)
               {
-                String _key42; // required
-                String _val43; // required
-                _key42 = iprot.readString();
-                _val43 = iprot.readString();
-                _val39.put(_key42, _val43);
+                String _key47; // required
+                String _val48; // required
+                _key47 = iprot.readString();
+                _val48 = iprot.readString();
+                _val44.put(_key47, _val48);
               }
             }
-            struct.ssio.put(_key38, _val39);
+            struct.ssio.put(_key43, _val44);
           }
         }
         struct.setSsioIsSet(true);
       }
+      if (incoming.get(11)) {
+        {
+          org.apache.thrift.protocol.TList _list49 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.authorizations = new ArrayList<ByteBuffer>(_list49.size);
+          for (int _i50 = 0; _i50 < _list49.size; ++_i50)
+          {
+            ByteBuffer _elem51; // required
+            _elem51 = iprot.readBinary();
+            struct.authorizations.add(_elem51);
+          }
+        }
+        struct.setAuthorizationsIsSet(true);
+      }
     }
   }
 

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *
@@ -339,14 +355,14 @@ import org.slf4j.LoggerFactory;
           case 1: // ITERATORS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list54 = iprot.readListBegin();
-                struct.iterators = new ArrayList<TIteratorSetting>(_list54.size);
-                for (int _i55 = 0; _i55 < _list54.size; ++_i55)
+                org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
+                struct.iterators = new ArrayList<TIteratorSetting>(_list62.size);
+                for (int _i63 = 0; _i63 < _list62.size; ++_i63)
                 {
-                  TIteratorSetting _elem56; // required
-                  _elem56 = new TIteratorSetting();
-                  _elem56.read(iprot);
-                  struct.iterators.add(_elem56);
+                  TIteratorSetting _elem64; // required
+                  _elem64 = new TIteratorSetting();
+                  _elem64.read(iprot);
+                  struct.iterators.add(_elem64);
                 }
                 iprot.readListEnd();
               }
@@ -374,9 +390,9 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(ITERATORS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.iterators.size()));
-          for (TIteratorSetting _iter57 : struct.iterators)
+          for (TIteratorSetting _iter65 : struct.iterators)
           {
-            _iter57.write(oprot);
+            _iter65.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -407,9 +423,9 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetIterators()) {
         {
           oprot.writeI32(struct.iterators.size());
-          for (TIteratorSetting _iter58 : struct.iterators)
+          for (TIteratorSetting _iter66 : struct.iterators)
           {
-            _iter58.write(oprot);
+            _iter66.write(oprot);
           }
         }
       }
@@ -421,14 +437,14 @@ import org.slf4j.LoggerFactory;
       BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list59 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.iterators = new ArrayList<TIteratorSetting>(_list59.size);
-          for (int _i60 = 0; _i60 < _list59.size; ++_i60)
+          org.apache.thrift.protocol.TList _list67 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.iterators = new ArrayList<TIteratorSetting>(_list67.size);
+          for (int _i68 = 0; _i68 < _list67.size; ++_i68)
           {
-            TIteratorSetting _elem61; // required
-            _elem61 = new TIteratorSetting();
-            _elem61.read(iprot);
-            struct.iterators.add(_elem61);
+            TIteratorSetting _elem69; // required
+            _elem69 = new TIteratorSetting();
+            _elem69.read(iprot);
+            struct.iterators.add(_elem69);
           }
         }
         struct.setIteratorsIsSet(true);

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java Mon Jan 14 22:03:24 2013
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Autogenerated by Thrift Compiler (0.9.0)
  *
@@ -599,15 +615,15 @@ import org.slf4j.LoggerFactory;
           case 4: // PROPERTIES
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map44 = iprot.readMapBegin();
-                struct.properties = new HashMap<String,String>(2*_map44.size);
-                for (int _i45 = 0; _i45 < _map44.size; ++_i45)
+                org.apache.thrift.protocol.TMap _map52 = iprot.readMapBegin();
+                struct.properties = new HashMap<String,String>(2*_map52.size);
+                for (int _i53 = 0; _i53 < _map52.size; ++_i53)
                 {
-                  String _key46; // required
-                  String _val47; // required
-                  _key46 = iprot.readString();
-                  _val47 = iprot.readString();
-                  struct.properties.put(_key46, _val47);
+                  String _key54; // required
+                  String _val55; // required
+                  _key54 = iprot.readString();
+                  _val55 = iprot.readString();
+                  struct.properties.put(_key54, _val55);
                 }
                 iprot.readMapEnd();
               }
@@ -648,10 +664,10 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.properties.size()));
-          for (Map.Entry<String, String> _iter48 : struct.properties.entrySet())
+          for (Map.Entry<String, String> _iter56 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter48.getKey());
-            oprot.writeString(_iter48.getValue());
+            oprot.writeString(_iter56.getKey());
+            oprot.writeString(_iter56.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -700,10 +716,10 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetProperties()) {
         {
           oprot.writeI32(struct.properties.size());
-          for (Map.Entry<String, String> _iter49 : struct.properties.entrySet())
+          for (Map.Entry<String, String> _iter57 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter49.getKey());
-            oprot.writeString(_iter49.getValue());
+            oprot.writeString(_iter57.getKey());
+            oprot.writeString(_iter57.getValue());
           }
         }
       }
@@ -727,15 +743,15 @@ import org.slf4j.LoggerFactory;
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TMap _map50 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.properties = new HashMap<String,String>(2*_map50.size);
-          for (int _i51 = 0; _i51 < _map50.size; ++_i51)
+          org.apache.thrift.protocol.TMap _map58 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.properties = new HashMap<String,String>(2*_map58.size);
+          for (int _i59 = 0; _i59 < _map58.size; ++_i59)
           {
-            String _key52; // required
-            String _val53; // required
-            _key52 = iprot.readString();
-            _val53 = iprot.readString();
-            struct.properties.put(_key52, _val53);
+            String _key60; // required
+            String _val61; // required
+            _key60 = iprot.readString();
+            _val61 = iprot.readString();
+            struct.properties.put(_key60, _val61);
           }
         }
         struct.setPropertiesIsSet(true);



Mime
View raw message