You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/07/13 22:34:49 UTC
svn commit: r1361382 [8/16] - in /accumulo/branches/ACCUMULO-259: ./ bin/
conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/
conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/
conf/examples/3GB/native-standalone/ conf/ex...
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java?rev=1361382&r1=1361381&r2=1361382&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java Fri Jul 13 20:34:44 2012
@@ -1,7 +1,8 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.accumulo.core.master.thrift;
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=1361382&r1=1361381&r2=1361382&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 Fri Jul 13 20:34:44 2012
@@ -1,10 +1,17 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.accumulo.core.master.thrift;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -32,22 +39,28 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField SERVERS_SHUTTING_DOWN_FIELD_DESC = new org.apache.thrift.protocol.TField("serversShuttingDown", org.apache.thrift.protocol.TType.SET, (short)9);
private static final org.apache.thrift.protocol.TField DEAD_TABLET_SERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("deadTabletServers", org.apache.thrift.protocol.TType.LIST, (short)10);
- public Map<String,TableInfo> tableMap;
- public List<TabletServerStatus> tServerInfo;
- public Map<String,Byte> badTServers;
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new MasterMonitorInfoStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new MasterMonitorInfoTupleSchemeFactory());
+ }
+
+ public Map<String,TableInfo> tableMap; // required
+ public List<TabletServerStatus> tServerInfo; // required
+ public Map<String,Byte> badTServers; // required
/**
*
* @see MasterState
*/
- public MasterState state;
+ public MasterState state; // required
/**
*
* @see MasterGoalState
*/
- public MasterGoalState goalState;
- public int unassignedTablets;
- public Set<String> serversShuttingDown;
- public List<DeadServer> deadTabletServers;
+ public MasterGoalState goalState; // required
+ public int unassignedTablets; // required
+ public Set<String> serversShuttingDown; // required
+ public List<DeadServer> deadTabletServers; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -139,7 +152,6 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __UNASSIGNEDTABLETS_ISSET_ID = 0;
private BitSet __isset_bit_vector = new BitSet(1);
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -639,7 +651,7 @@ import org.slf4j.LoggerFactory;
return getGoalState();
case UNASSIGNED_TABLETS:
- return new Integer(getUnassignedTablets());
+ return Integer.valueOf(getUnassignedTablets());
case SERVERS_SHUTTING_DOWN:
return getServersShuttingDown();
@@ -867,221 +879,11 @@ import org.slf4j.LoggerFactory;
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // TABLE_MAP
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map9 = iprot.readMapBegin();
- this.tableMap = new HashMap<String,TableInfo>(2*_map9.size);
- for (int _i10 = 0; _i10 < _map9.size; ++_i10)
- {
- String _key11;
- TableInfo _val12;
- _key11 = iprot.readString();
- _val12 = new TableInfo();
- _val12.read(iprot);
- this.tableMap.put(_key11, _val12);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // T_SERVER_INFO
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list13 = iprot.readListBegin();
- this.tServerInfo = new ArrayList<TabletServerStatus>(_list13.size);
- for (int _i14 = 0; _i14 < _list13.size; ++_i14)
- {
- TabletServerStatus _elem15;
- _elem15 = new TabletServerStatus();
- _elem15.read(iprot);
- this.tServerInfo.add(_elem15);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // BAD_TSERVERS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
- this.badTServers = new HashMap<String,Byte>(2*_map16.size);
- for (int _i17 = 0; _i17 < _map16.size; ++_i17)
- {
- String _key18;
- byte _val19;
- _key18 = iprot.readString();
- _val19 = iprot.readByte();
- this.badTServers.put(_key18, _val19);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 6: // STATE
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.state = MasterState.findByValue(iprot.readI32());
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 8: // GOAL_STATE
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.goalState = MasterGoalState.findByValue(iprot.readI32());
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 7: // UNASSIGNED_TABLETS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.unassignedTablets = iprot.readI32();
- setUnassignedTabletsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 9: // SERVERS_SHUTTING_DOWN
- if (field.type == org.apache.thrift.protocol.TType.SET) {
- {
- org.apache.thrift.protocol.TSet _set20 = iprot.readSetBegin();
- this.serversShuttingDown = new HashSet<String>(2*_set20.size);
- for (int _i21 = 0; _i21 < _set20.size; ++_i21)
- {
- String _elem22;
- _elem22 = iprot.readString();
- this.serversShuttingDown.add(_elem22);
- }
- iprot.readSetEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 10: // DEAD_TABLET_SERVERS
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
- this.deadTabletServers = new ArrayList<DeadServer>(_list23.size);
- for (int _i24 = 0; _i24 < _list23.size; ++_i24)
- {
- DeadServer _elem25;
- _elem25 = new DeadServer();
- _elem25.read(iprot);
- this.deadTabletServers.add(_elem25);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.tableMap != null) {
- oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.tableMap.size()));
- for (Map.Entry<String, TableInfo> _iter26 : this.tableMap.entrySet())
- {
- oprot.writeString(_iter26.getKey());
- _iter26.getValue().write(oprot);
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.tServerInfo != null) {
- oprot.writeFieldBegin(T_SERVER_INFO_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.tServerInfo.size()));
- for (TabletServerStatus _iter27 : this.tServerInfo)
- {
- _iter27.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.badTServers != null) {
- oprot.writeFieldBegin(BAD_TSERVERS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE, this.badTServers.size()));
- for (Map.Entry<String, Byte> _iter28 : this.badTServers.entrySet())
- {
- oprot.writeString(_iter28.getKey());
- oprot.writeByte(_iter28.getValue());
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.state != null) {
- oprot.writeFieldBegin(STATE_FIELD_DESC);
- oprot.writeI32(this.state.getValue());
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(UNASSIGNED_TABLETS_FIELD_DESC);
- oprot.writeI32(this.unassignedTablets);
- oprot.writeFieldEnd();
- if (this.goalState != null) {
- oprot.writeFieldBegin(GOAL_STATE_FIELD_DESC);
- oprot.writeI32(this.goalState.getValue());
- oprot.writeFieldEnd();
- }
- if (this.serversShuttingDown != null) {
- oprot.writeFieldBegin(SERVERS_SHUTTING_DOWN_FIELD_DESC);
- {
- oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, this.serversShuttingDown.size()));
- for (String _iter29 : this.serversShuttingDown)
- {
- oprot.writeString(_iter29);
- }
- oprot.writeSetEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.deadTabletServers != null) {
- oprot.writeFieldBegin(DEAD_TABLET_SERVERS_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.deadTabletServers.size()));
- for (DeadServer _iter30 : this.deadTabletServers)
- {
- _iter30.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -1174,5 +976,426 @@ import org.slf4j.LoggerFactory;
}
}
+ private static class MasterMonitorInfoStandardSchemeFactory implements SchemeFactory {
+ public MasterMonitorInfoStandardScheme getScheme() {
+ return new MasterMonitorInfoStandardScheme();
+ }
+ }
+
+ private static class MasterMonitorInfoStandardScheme extends StandardScheme<MasterMonitorInfo> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, MasterMonitorInfo struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // TABLE_MAP
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map18 = iprot.readMapBegin();
+ struct.tableMap = new HashMap<String,TableInfo>(2*_map18.size);
+ for (int _i19 = 0; _i19 < _map18.size; ++_i19)
+ {
+ String _key20; // required
+ TableInfo _val21; // required
+ _key20 = iprot.readString();
+ _val21 = new TableInfo();
+ _val21.read(iprot);
+ struct.tableMap.put(_key20, _val21);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setTableMapIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // T_SERVER_INFO
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
+ struct.tServerInfo = new ArrayList<TabletServerStatus>(_list22.size);
+ for (int _i23 = 0; _i23 < _list22.size; ++_i23)
+ {
+ TabletServerStatus _elem24; // required
+ _elem24 = new TabletServerStatus();
+ _elem24.read(iprot);
+ struct.tServerInfo.add(_elem24);
+ }
+ iprot.readListEnd();
+ }
+ struct.setTServerInfoIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // BAD_TSERVERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map25 = iprot.readMapBegin();
+ struct.badTServers = new HashMap<String,Byte>(2*_map25.size);
+ for (int _i26 = 0; _i26 < _map25.size; ++_i26)
+ {
+ String _key27; // required
+ byte _val28; // required
+ _key27 = iprot.readString();
+ _val28 = iprot.readByte();
+ struct.badTServers.put(_key27, _val28);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setBadTServersIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // STATE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.state = MasterState.findByValue(iprot.readI32());
+ struct.setStateIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // GOAL_STATE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.goalState = MasterGoalState.findByValue(iprot.readI32());
+ struct.setGoalStateIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 7: // UNASSIGNED_TABLETS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.unassignedTablets = iprot.readI32();
+ struct.setUnassignedTabletsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 9: // SERVERS_SHUTTING_DOWN
+ if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ {
+ org.apache.thrift.protocol.TSet _set29 = iprot.readSetBegin();
+ struct.serversShuttingDown = new HashSet<String>(2*_set29.size);
+ for (int _i30 = 0; _i30 < _set29.size; ++_i30)
+ {
+ String _elem31; // required
+ _elem31 = iprot.readString();
+ struct.serversShuttingDown.add(_elem31);
+ }
+ iprot.readSetEnd();
+ }
+ struct.setServersShuttingDownIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 10: // DEAD_TABLET_SERVERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
+ struct.deadTabletServers = new ArrayList<DeadServer>(_list32.size);
+ for (int _i33 = 0; _i33 < _list32.size; ++_i33)
+ {
+ DeadServer _elem34; // required
+ _elem34 = new DeadServer();
+ _elem34.read(iprot);
+ struct.deadTabletServers.add(_elem34);
+ }
+ iprot.readListEnd();
+ }
+ struct.setDeadTabletServersIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, MasterMonitorInfo struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.tableMap != null) {
+ oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.tableMap.size()));
+ for (Map.Entry<String, TableInfo> _iter35 : struct.tableMap.entrySet())
+ {
+ oprot.writeString(_iter35.getKey());
+ _iter35.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.tServerInfo != null) {
+ oprot.writeFieldBegin(T_SERVER_INFO_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.tServerInfo.size()));
+ for (TabletServerStatus _iter36 : struct.tServerInfo)
+ {
+ _iter36.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.badTServers != null) {
+ oprot.writeFieldBegin(BAD_TSERVERS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE, struct.badTServers.size()));
+ for (Map.Entry<String, Byte> _iter37 : struct.badTServers.entrySet())
+ {
+ oprot.writeString(_iter37.getKey());
+ oprot.writeByte(_iter37.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.state != null) {
+ oprot.writeFieldBegin(STATE_FIELD_DESC);
+ oprot.writeI32(struct.state.getValue());
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(UNASSIGNED_TABLETS_FIELD_DESC);
+ oprot.writeI32(struct.unassignedTablets);
+ oprot.writeFieldEnd();
+ if (struct.goalState != null) {
+ oprot.writeFieldBegin(GOAL_STATE_FIELD_DESC);
+ oprot.writeI32(struct.goalState.getValue());
+ oprot.writeFieldEnd();
+ }
+ if (struct.serversShuttingDown != null) {
+ oprot.writeFieldBegin(SERVERS_SHUTTING_DOWN_FIELD_DESC);
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.serversShuttingDown.size()));
+ for (String _iter38 : struct.serversShuttingDown)
+ {
+ oprot.writeString(_iter38);
+ }
+ oprot.writeSetEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.deadTabletServers != null) {
+ oprot.writeFieldBegin(DEAD_TABLET_SERVERS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.deadTabletServers.size()));
+ for (DeadServer _iter39 : struct.deadTabletServers)
+ {
+ _iter39.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class MasterMonitorInfoTupleSchemeFactory implements SchemeFactory {
+ public MasterMonitorInfoTupleScheme getScheme() {
+ return new MasterMonitorInfoTupleScheme();
+ }
+ }
+
+ private static class MasterMonitorInfoTupleScheme extends TupleScheme<MasterMonitorInfo> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, MasterMonitorInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetTableMap()) {
+ optionals.set(0);
+ }
+ if (struct.isSetTServerInfo()) {
+ optionals.set(1);
+ }
+ if (struct.isSetBadTServers()) {
+ optionals.set(2);
+ }
+ if (struct.isSetState()) {
+ optionals.set(3);
+ }
+ if (struct.isSetGoalState()) {
+ optionals.set(4);
+ }
+ if (struct.isSetUnassignedTablets()) {
+ optionals.set(5);
+ }
+ if (struct.isSetServersShuttingDown()) {
+ optionals.set(6);
+ }
+ if (struct.isSetDeadTabletServers()) {
+ optionals.set(7);
+ }
+ oprot.writeBitSet(optionals, 8);
+ if (struct.isSetTableMap()) {
+ {
+ oprot.writeI32(struct.tableMap.size());
+ for (Map.Entry<String, TableInfo> _iter40 : struct.tableMap.entrySet())
+ {
+ oprot.writeString(_iter40.getKey());
+ _iter40.getValue().write(oprot);
+ }
+ }
+ }
+ if (struct.isSetTServerInfo()) {
+ {
+ oprot.writeI32(struct.tServerInfo.size());
+ for (TabletServerStatus _iter41 : struct.tServerInfo)
+ {
+ _iter41.write(oprot);
+ }
+ }
+ }
+ if (struct.isSetBadTServers()) {
+ {
+ oprot.writeI32(struct.badTServers.size());
+ for (Map.Entry<String, Byte> _iter42 : struct.badTServers.entrySet())
+ {
+ oprot.writeString(_iter42.getKey());
+ oprot.writeByte(_iter42.getValue());
+ }
+ }
+ }
+ if (struct.isSetState()) {
+ oprot.writeI32(struct.state.getValue());
+ }
+ if (struct.isSetGoalState()) {
+ oprot.writeI32(struct.goalState.getValue());
+ }
+ if (struct.isSetUnassignedTablets()) {
+ oprot.writeI32(struct.unassignedTablets);
+ }
+ if (struct.isSetServersShuttingDown()) {
+ {
+ oprot.writeI32(struct.serversShuttingDown.size());
+ for (String _iter43 : struct.serversShuttingDown)
+ {
+ oprot.writeString(_iter43);
+ }
+ }
+ }
+ if (struct.isSetDeadTabletServers()) {
+ {
+ oprot.writeI32(struct.deadTabletServers.size());
+ for (DeadServer _iter44 : struct.deadTabletServers)
+ {
+ _iter44.write(oprot);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, MasterMonitorInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(8);
+ if (incoming.get(0)) {
+ {
+ org.apache.thrift.protocol.TMap _map45 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.tableMap = new HashMap<String,TableInfo>(2*_map45.size);
+ for (int _i46 = 0; _i46 < _map45.size; ++_i46)
+ {
+ String _key47; // required
+ TableInfo _val48; // required
+ _key47 = iprot.readString();
+ _val48 = new TableInfo();
+ _val48.read(iprot);
+ struct.tableMap.put(_key47, _val48);
+ }
+ }
+ struct.setTableMapIsSet(true);
+ }
+ if (incoming.get(1)) {
+ {
+ org.apache.thrift.protocol.TList _list49 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.tServerInfo = new ArrayList<TabletServerStatus>(_list49.size);
+ for (int _i50 = 0; _i50 < _list49.size; ++_i50)
+ {
+ TabletServerStatus _elem51; // required
+ _elem51 = new TabletServerStatus();
+ _elem51.read(iprot);
+ struct.tServerInfo.add(_elem51);
+ }
+ }
+ struct.setTServerInfoIsSet(true);
+ }
+ if (incoming.get(2)) {
+ {
+ org.apache.thrift.protocol.TMap _map52 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE, iprot.readI32());
+ struct.badTServers = new HashMap<String,Byte>(2*_map52.size);
+ for (int _i53 = 0; _i53 < _map52.size; ++_i53)
+ {
+ String _key54; // required
+ byte _val55; // required
+ _key54 = iprot.readString();
+ _val55 = iprot.readByte();
+ struct.badTServers.put(_key54, _val55);
+ }
+ }
+ struct.setBadTServersIsSet(true);
+ }
+ if (incoming.get(3)) {
+ struct.state = MasterState.findByValue(iprot.readI32());
+ struct.setStateIsSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.goalState = MasterGoalState.findByValue(iprot.readI32());
+ struct.setGoalStateIsSet(true);
+ }
+ if (incoming.get(5)) {
+ struct.unassignedTablets = iprot.readI32();
+ struct.setUnassignedTabletsIsSet(true);
+ }
+ if (incoming.get(6)) {
+ {
+ org.apache.thrift.protocol.TSet _set56 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.serversShuttingDown = new HashSet<String>(2*_set56.size);
+ for (int _i57 = 0; _i57 < _set56.size; ++_i57)
+ {
+ String _elem58; // required
+ _elem58 = iprot.readString();
+ struct.serversShuttingDown.add(_elem58);
+ }
+ }
+ struct.setServersShuttingDownIsSet(true);
+ }
+ if (incoming.get(7)) {
+ {
+ org.apache.thrift.protocol.TList _list59 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.deadTabletServers = new ArrayList<DeadServer>(_list59.size);
+ for (int _i60 = 0; _i60 < _list59.size; ++_i60)
+ {
+ DeadServer _elem61; // required
+ _elem61 = new DeadServer();
+ _elem61.read(iprot);
+ struct.deadTabletServers.add(_elem61);
+ }
+ }
+ struct.setDeadTabletServersIsSet(true);
+ }
+ }
+ }
+
}
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=1361382&r1=1361381&r2=1361382&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 Fri Jul 13 20:34:44 2012
@@ -1,7 +1,8 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.accumulo.core.master.thrift;
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=1361382&r1=1361381&r2=1361382&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 Fri Jul 13 20:34:44 2012
@@ -1,10 +1,17 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.accumulo.core.master.thrift;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -25,7 +32,13 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
- public String why;
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new RecoveryExceptionStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new RecoveryExceptionTupleSchemeFactory());
+ }
+
+ public String why; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -86,7 +99,6 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -239,44 +251,11 @@ import org.slf4j.LoggerFactory;
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // WHY
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.why = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.why != null) {
- oprot.writeFieldBegin(WHY_FIELD_DESC);
- oprot.writeString(this.why);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -315,5 +294,89 @@ import org.slf4j.LoggerFactory;
}
}
+ private static class RecoveryExceptionStandardSchemeFactory implements SchemeFactory {
+ public RecoveryExceptionStandardScheme getScheme() {
+ return new RecoveryExceptionStandardScheme();
+ }
+ }
+
+ private static class RecoveryExceptionStandardScheme extends StandardScheme<RecoveryException> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, RecoveryException struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // WHY
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.why = iprot.readString();
+ struct.setWhyIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, RecoveryException struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.why != null) {
+ oprot.writeFieldBegin(WHY_FIELD_DESC);
+ oprot.writeString(struct.why);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class RecoveryExceptionTupleSchemeFactory implements SchemeFactory {
+ public RecoveryExceptionTupleScheme getScheme() {
+ return new RecoveryExceptionTupleScheme();
+ }
+ }
+
+ private static class RecoveryExceptionTupleScheme extends TupleScheme<RecoveryException> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, RecoveryException struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetWhy()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetWhy()) {
+ oprot.writeString(struct.why);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, RecoveryException struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.why = iprot.readString();
+ struct.setWhyIsSet(true);
+ }
+ }
+ }
+
}
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=1361382&r1=1361381&r2=1361382&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 Fri Jul 13 20:34:44 2012
@@ -1,10 +1,17 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.accumulo.core.master.thrift;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -27,9 +34,15 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField RUNTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("runtime", org.apache.thrift.protocol.TType.I32, (short)5);
private static final org.apache.thrift.protocol.TField PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("progress", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
- public String name;
- public int runtime;
- public double progress;
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new RecoveryStatusStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new RecoveryStatusTupleSchemeFactory());
+ }
+
+ public String name; // required
+ public int runtime; // required
+ public double progress; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -99,7 +112,6 @@ import org.slf4j.LoggerFactory;
private static final int __RUNTIME_ISSET_ID = 0;
private static final int __PROGRESS_ISSET_ID = 1;
private BitSet __isset_bit_vector = new BitSet(2);
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -260,10 +272,10 @@ import org.slf4j.LoggerFactory;
return getName();
case RUNTIME:
- return new Integer(getRuntime());
+ return Integer.valueOf(getRuntime());
case PROGRESS:
- return new Double(getProgress());
+ return Double.valueOf(getProgress());
}
throw new IllegalStateException();
@@ -380,66 +392,11 @@ import org.slf4j.LoggerFactory;
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 2: // NAME
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.name = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // RUNTIME
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.runtime = iprot.readI32();
- setRuntimeIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 6: // PROGRESS
- if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
- this.progress = iprot.readDouble();
- setProgressIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.name != null) {
- oprot.writeFieldBegin(NAME_FIELD_DESC);
- oprot.writeString(this.name);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(RUNTIME_FIELD_DESC);
- oprot.writeI32(this.runtime);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(PROGRESS_FIELD_DESC);
- oprot.writeDouble(this.progress);
- oprot.writeFieldEnd();
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -488,5 +445,131 @@ import org.slf4j.LoggerFactory;
}
}
+ private static class RecoveryStatusStandardSchemeFactory implements SchemeFactory {
+ public RecoveryStatusStandardScheme getScheme() {
+ return new RecoveryStatusStandardScheme();
+ }
+ }
+
+ private static class RecoveryStatusStandardScheme extends StandardScheme<RecoveryStatus> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, RecoveryStatus struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 2: // NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.name = iprot.readString();
+ struct.setNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // RUNTIME
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.runtime = iprot.readI32();
+ struct.setRuntimeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // PROGRESS
+ if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+ struct.progress = iprot.readDouble();
+ struct.setProgressIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, RecoveryStatus struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.name != null) {
+ oprot.writeFieldBegin(NAME_FIELD_DESC);
+ oprot.writeString(struct.name);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(RUNTIME_FIELD_DESC);
+ oprot.writeI32(struct.runtime);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(PROGRESS_FIELD_DESC);
+ oprot.writeDouble(struct.progress);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class RecoveryStatusTupleSchemeFactory implements SchemeFactory {
+ public RecoveryStatusTupleScheme getScheme() {
+ return new RecoveryStatusTupleScheme();
+ }
+ }
+
+ private static class RecoveryStatusTupleScheme extends TupleScheme<RecoveryStatus> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, RecoveryStatus struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetName()) {
+ optionals.set(0);
+ }
+ if (struct.isSetRuntime()) {
+ optionals.set(1);
+ }
+ if (struct.isSetProgress()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.isSetName()) {
+ oprot.writeString(struct.name);
+ }
+ if (struct.isSetRuntime()) {
+ oprot.writeI32(struct.runtime);
+ }
+ if (struct.isSetProgress()) {
+ oprot.writeDouble(struct.progress);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, RecoveryStatus struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(3);
+ if (incoming.get(0)) {
+ struct.name = iprot.readString();
+ struct.setNameIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.runtime = iprot.readI32();
+ struct.setRuntimeIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.progress = iprot.readDouble();
+ struct.setProgressIsSet(true);
+ }
+ }
+ }
+
}
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=1361382&r1=1361381&r2=1361382&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 Fri Jul 13 20:34:44 2012
@@ -1,10 +1,17 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.accumulo.core.master.thrift;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -36,18 +43,24 @@ import org.slf4j.LoggerFactory;
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);
- public long recs;
- public long recsInMemory;
- public int tablets;
- public int onlineTablets;
- public double ingestRate;
- public double ingestByteRate;
- public double queryRate;
- public double queryByteRate;
- public Compacting minor;
- public Compacting major;
- public Compacting scans;
- public double scanRate;
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new TableInfoStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new TableInfoTupleSchemeFactory());
+ }
+
+ public long recs; // required
+ public long recsInMemory; // required
+ public int tablets; // required
+ public int onlineTablets; // required
+ public double ingestRate; // required
+ public double ingestByteRate; // required
+ public double queryRate; // required
+ public double queryByteRate; // required
+ public Compacting minor; // required
+ public Compacting major; // required
+ public Compacting scans; // required
+ public double scanRate; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -151,7 +164,6 @@ import org.slf4j.LoggerFactory;
private static final int __QUERYBYTERATE_ISSET_ID = 7;
private static final int __SCANRATE_ISSET_ID = 8;
private BitSet __isset_bit_vector = new BitSet(9);
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -662,28 +674,28 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
case RECS:
- return new Long(getRecs());
+ return Long.valueOf(getRecs());
case RECS_IN_MEMORY:
- return new Long(getRecsInMemory());
+ return Long.valueOf(getRecsInMemory());
case TABLETS:
- return new Integer(getTablets());
+ return Integer.valueOf(getTablets());
case ONLINE_TABLETS:
- return new Integer(getOnlineTablets());
+ return Integer.valueOf(getOnlineTablets());
case INGEST_RATE:
- return new Double(getIngestRate());
+ return Double.valueOf(getIngestRate());
case INGEST_BYTE_RATE:
- return new Double(getIngestByteRate());
+ return Double.valueOf(getIngestByteRate());
case QUERY_RATE:
- return new Double(getQueryRate());
+ return Double.valueOf(getQueryRate());
case QUERY_BYTE_RATE:
- return new Double(getQueryByteRate());
+ return Double.valueOf(getQueryByteRate());
case MINOR:
return getMinor();
@@ -695,7 +707,7 @@ import org.slf4j.LoggerFactory;
return getScans();
case SCAN_RATE:
- return new Double(getScanRate());
+ return Double.valueOf(getScanRate());
}
throw new IllegalStateException();
@@ -1001,170 +1013,11 @@ import org.slf4j.LoggerFactory;
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // RECS
- if (field.type == org.apache.thrift.protocol.TType.I64) {
- this.recs = iprot.readI64();
- setRecsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // RECS_IN_MEMORY
- if (field.type == org.apache.thrift.protocol.TType.I64) {
- this.recsInMemory = iprot.readI64();
- setRecsInMemoryIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // TABLETS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.tablets = iprot.readI32();
- setTabletsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // ONLINE_TABLETS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.onlineTablets = iprot.readI32();
- setOnlineTabletsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // INGEST_RATE
- if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
- this.ingestRate = iprot.readDouble();
- setIngestRateIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 6: // INGEST_BYTE_RATE
- if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
- this.ingestByteRate = iprot.readDouble();
- setIngestByteRateIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 7: // QUERY_RATE
- if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
- this.queryRate = iprot.readDouble();
- setQueryRateIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 8: // QUERY_BYTE_RATE
- if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
- this.queryByteRate = iprot.readDouble();
- setQueryByteRateIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 9: // MINOR
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.minor = new Compacting();
- this.minor.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 10: // MAJOR
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.major = new Compacting();
- this.major.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 11: // SCANS
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.scans = new Compacting();
- this.scans.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 12: // SCAN_RATE
- if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
- this.scanRate = iprot.readDouble();
- setScanRateIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(RECS_FIELD_DESC);
- oprot.writeI64(this.recs);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(RECS_IN_MEMORY_FIELD_DESC);
- oprot.writeI64(this.recsInMemory);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(TABLETS_FIELD_DESC);
- oprot.writeI32(this.tablets);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(ONLINE_TABLETS_FIELD_DESC);
- oprot.writeI32(this.onlineTablets);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(INGEST_RATE_FIELD_DESC);
- oprot.writeDouble(this.ingestRate);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(INGEST_BYTE_RATE_FIELD_DESC);
- oprot.writeDouble(this.ingestByteRate);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(QUERY_RATE_FIELD_DESC);
- oprot.writeDouble(this.queryRate);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(QUERY_BYTE_RATE_FIELD_DESC);
- oprot.writeDouble(this.queryByteRate);
- oprot.writeFieldEnd();
- if (this.minor != null) {
- oprot.writeFieldBegin(MINOR_FIELD_DESC);
- this.minor.write(oprot);
- oprot.writeFieldEnd();
- }
- if (this.major != null) {
- oprot.writeFieldBegin(MAJOR_FIELD_DESC);
- this.major.write(oprot);
- oprot.writeFieldEnd();
- }
- if (this.scans != null) {
- oprot.writeFieldBegin(SCANS_FIELD_DESC);
- this.scans.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(SCAN_RATE_FIELD_DESC);
- oprot.writeDouble(this.scanRate);
- oprot.writeFieldEnd();
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -1257,5 +1110,330 @@ import org.slf4j.LoggerFactory;
}
}
+ private static class TableInfoStandardSchemeFactory implements SchemeFactory {
+ public TableInfoStandardScheme getScheme() {
+ return new TableInfoStandardScheme();
+ }
+ }
+
+ private static class TableInfoStandardScheme extends StandardScheme<TableInfo> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, TableInfo struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // RECS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.recs = iprot.readI64();
+ struct.setRecsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // RECS_IN_MEMORY
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.recsInMemory = iprot.readI64();
+ struct.setRecsInMemoryIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // TABLETS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.tablets = iprot.readI32();
+ struct.setTabletsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // ONLINE_TABLETS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.onlineTablets = iprot.readI32();
+ struct.setOnlineTabletsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // INGEST_RATE
+ if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+ struct.ingestRate = iprot.readDouble();
+ struct.setIngestRateIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // INGEST_BYTE_RATE
+ if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+ struct.ingestByteRate = iprot.readDouble();
+ struct.setIngestByteRateIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 7: // QUERY_RATE
+ if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+ struct.queryRate = iprot.readDouble();
+ struct.setQueryRateIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // QUERY_BYTE_RATE
+ if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+ struct.queryByteRate = iprot.readDouble();
+ struct.setQueryByteRateIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 9: // MINOR
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.minor = new Compacting();
+ struct.minor.read(iprot);
+ struct.setMinorIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 10: // MAJOR
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.major = new Compacting();
+ struct.major.read(iprot);
+ struct.setMajorIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 11: // SCANS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.scans = new Compacting();
+ struct.scans.read(iprot);
+ struct.setScansIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 12: // SCAN_RATE
+ if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+ struct.scanRate = iprot.readDouble();
+ struct.setScanRateIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, TableInfo struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldBegin(RECS_FIELD_DESC);
+ oprot.writeI64(struct.recs);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(RECS_IN_MEMORY_FIELD_DESC);
+ oprot.writeI64(struct.recsInMemory);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(TABLETS_FIELD_DESC);
+ oprot.writeI32(struct.tablets);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(ONLINE_TABLETS_FIELD_DESC);
+ oprot.writeI32(struct.onlineTablets);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(INGEST_RATE_FIELD_DESC);
+ oprot.writeDouble(struct.ingestRate);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(INGEST_BYTE_RATE_FIELD_DESC);
+ oprot.writeDouble(struct.ingestByteRate);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(QUERY_RATE_FIELD_DESC);
+ oprot.writeDouble(struct.queryRate);
+ oprot.writeFieldEnd();
+ 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);
+ oprot.writeFieldEnd();
+ }
+ if (struct.major != null) {
+ oprot.writeFieldBegin(MAJOR_FIELD_DESC);
+ struct.major.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.scans != null) {
+ oprot.writeFieldBegin(SCANS_FIELD_DESC);
+ struct.scans.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(SCAN_RATE_FIELD_DESC);
+ oprot.writeDouble(struct.scanRate);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class TableInfoTupleSchemeFactory implements SchemeFactory {
+ public TableInfoTupleScheme getScheme() {
+ return new TableInfoTupleScheme();
+ }
+ }
+
+ private static class TableInfoTupleScheme extends TupleScheme<TableInfo> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, TableInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetRecs()) {
+ optionals.set(0);
+ }
+ if (struct.isSetRecsInMemory()) {
+ optionals.set(1);
+ }
+ if (struct.isSetTablets()) {
+ optionals.set(2);
+ }
+ if (struct.isSetOnlineTablets()) {
+ optionals.set(3);
+ }
+ if (struct.isSetIngestRate()) {
+ optionals.set(4);
+ }
+ if (struct.isSetIngestByteRate()) {
+ optionals.set(5);
+ }
+ if (struct.isSetQueryRate()) {
+ optionals.set(6);
+ }
+ if (struct.isSetQueryByteRate()) {
+ optionals.set(7);
+ }
+ if (struct.isSetMinor()) {
+ optionals.set(8);
+ }
+ if (struct.isSetMajor()) {
+ optionals.set(9);
+ }
+ if (struct.isSetScans()) {
+ optionals.set(10);
+ }
+ if (struct.isSetScanRate()) {
+ optionals.set(11);
+ }
+ oprot.writeBitSet(optionals, 12);
+ if (struct.isSetRecs()) {
+ oprot.writeI64(struct.recs);
+ }
+ if (struct.isSetRecsInMemory()) {
+ oprot.writeI64(struct.recsInMemory);
+ }
+ if (struct.isSetTablets()) {
+ oprot.writeI32(struct.tablets);
+ }
+ if (struct.isSetOnlineTablets()) {
+ oprot.writeI32(struct.onlineTablets);
+ }
+ if (struct.isSetIngestRate()) {
+ oprot.writeDouble(struct.ingestRate);
+ }
+ if (struct.isSetIngestByteRate()) {
+ oprot.writeDouble(struct.ingestByteRate);
+ }
+ if (struct.isSetQueryRate()) {
+ oprot.writeDouble(struct.queryRate);
+ }
+ if (struct.isSetQueryByteRate()) {
+ oprot.writeDouble(struct.queryByteRate);
+ }
+ if (struct.isSetMinor()) {
+ struct.minor.write(oprot);
+ }
+ if (struct.isSetMajor()) {
+ struct.major.write(oprot);
+ }
+ if (struct.isSetScans()) {
+ struct.scans.write(oprot);
+ }
+ if (struct.isSetScanRate()) {
+ oprot.writeDouble(struct.scanRate);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, TableInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(12);
+ if (incoming.get(0)) {
+ struct.recs = iprot.readI64();
+ struct.setRecsIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.recsInMemory = iprot.readI64();
+ struct.setRecsInMemoryIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.tablets = iprot.readI32();
+ struct.setTabletsIsSet(true);
+ }
+ if (incoming.get(3)) {
+ struct.onlineTablets = iprot.readI32();
+ struct.setOnlineTabletsIsSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.ingestRate = iprot.readDouble();
+ struct.setIngestRateIsSet(true);
+ }
+ if (incoming.get(5)) {
+ struct.ingestByteRate = iprot.readDouble();
+ struct.setIngestByteRateIsSet(true);
+ }
+ if (incoming.get(6)) {
+ struct.queryRate = iprot.readDouble();
+ struct.setQueryRateIsSet(true);
+ }
+ if (incoming.get(7)) {
+ struct.queryByteRate = iprot.readDouble();
+ struct.setQueryByteRateIsSet(true);
+ }
+ if (incoming.get(8)) {
+ struct.minor = new Compacting();
+ struct.minor.read(iprot);
+ struct.setMinorIsSet(true);
+ }
+ if (incoming.get(9)) {
+ struct.major = new Compacting();
+ struct.major.read(iprot);
+ struct.setMajorIsSet(true);
+ }
+ if (incoming.get(10)) {
+ struct.scans = new Compacting();
+ struct.scans.read(iprot);
+ struct.setScansIsSet(true);
+ }
+ if (incoming.get(11)) {
+ struct.scanRate = iprot.readDouble();
+ struct.setScanRateIsSet(true);
+ }
+ }
+ }
+
}
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=1361382&r1=1361381&r2=1361382&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 Fri Jul 13 20:34:44 2012
@@ -1,7 +1,8 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.accumulo.core.master.thrift;
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=1361382&r1=1361381&r2=1361382&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 Fri Jul 13 20:34:44 2012
@@ -1,7 +1,8 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.8.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.accumulo.core.master.thrift;