accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [35/36] Merge branch '1.6.1-SNAPSHOT'
Date Thu, 19 Jun 2014 00:57:45 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
index 947862f,0000000..7219c04
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
@@@ -1,1121 -1,0 +1,1197 @@@
 +/*
 + * 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)
++ * Autogenerated by Thrift Compiler (0.9.1)
 + *
 + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 + *  @generated
 + */
 +package org.apache.accumulo.core.replication.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 org.apache.thrift.protocol.TProtocolException;
 +import org.apache.thrift.EncodingUtils;
 +import org.apache.thrift.TException;
++import org.apache.thrift.async.AsyncMethodCallback;
++import org.apache.thrift.server.AbstractNonblockingServer.*;
 +import java.util.List;
 +import java.util.ArrayList;
 +import java.util.Map;
 +import java.util.HashMap;
 +import java.util.EnumMap;
 +import java.util.Set;
 +import java.util.HashSet;
 +import java.util.EnumSet;
 +import java.util.Collections;
 +import java.util.BitSet;
 +import java.nio.ByteBuffer;
 +import java.util.Arrays;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +@SuppressWarnings("all") public class ReplicationCoordinator {
 +
 +  public interface Iface {
 +
 +    public String getServicerAddress(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ReplicationCoordinatorException, org.apache.thrift.TException;
 +
 +  }
 +
 +  public interface AsyncIface {
 +
-     public void getServicerAddress(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getServicerAddress_call> resultHandler) throws org.apache.thrift.TException;
++    public void getServicerAddress(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 +
 +  }
 +
 +  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
 +    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
 +      public Factory() {}
 +      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
 +        return new Client(prot);
 +      }
 +      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
 +        return new Client(iprot, oprot);
 +      }
 +    }
 +
 +    public Client(org.apache.thrift.protocol.TProtocol prot)
 +    {
 +      super(prot, prot);
 +    }
 +
 +    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
 +      super(iprot, oprot);
 +    }
 +
 +    public String getServicerAddress(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ReplicationCoordinatorException, org.apache.thrift.TException
 +    {
 +      send_getServicerAddress(remoteTableId, credentials);
 +      return recv_getServicerAddress();
 +    }
 +
 +    public void send_getServicerAddress(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
 +    {
 +      getServicerAddress_args args = new getServicerAddress_args();
 +      args.setRemoteTableId(remoteTableId);
 +      args.setCredentials(credentials);
 +      sendBase("getServicerAddress", args);
 +    }
 +
 +    public String recv_getServicerAddress() throws ReplicationCoordinatorException, org.apache.thrift.TException
 +    {
 +      getServicerAddress_result result = new getServicerAddress_result();
 +      receiveBase(result, "getServicerAddress");
 +      if (result.isSetSuccess()) {
 +        return result.success;
 +      }
 +      if (result.e != null) {
 +        throw result.e;
 +      }
 +      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getServicerAddress failed: unknown result");
 +    }
 +
 +  }
 +  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
 +    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
 +      private org.apache.thrift.async.TAsyncClientManager clientManager;
 +      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
 +      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
 +        this.clientManager = clientManager;
 +        this.protocolFactory = protocolFactory;
 +      }
 +      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
 +        return new AsyncClient(protocolFactory, clientManager, transport);
 +      }
 +    }
 +
 +    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
 +      super(protocolFactory, clientManager, transport);
 +    }
 +
-     public void getServicerAddress(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<getServicerAddress_call> resultHandler) throws org.apache.thrift.TException {
++    public void getServicerAddress(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
 +      checkReady();
 +      getServicerAddress_call method_call = new getServicerAddress_call(remoteTableId, credentials, resultHandler, this, ___protocolFactory, ___transport);
 +      this.___currentMethod = method_call;
 +      ___manager.call(method_call);
 +    }
 +
 +    public static class getServicerAddress_call extends org.apache.thrift.async.TAsyncMethodCall {
 +      private String remoteTableId;
 +      private org.apache.accumulo.core.security.thrift.TCredentials credentials;
-       public getServicerAddress_call(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<getServicerAddress_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
++      public getServicerAddress_call(String remoteTableId, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
 +        super(client, protocolFactory, transport, resultHandler, false);
 +        this.remoteTableId = remoteTableId;
 +        this.credentials = credentials;
 +      }
 +
 +      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
 +        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getServicerAddress", org.apache.thrift.protocol.TMessageType.CALL, 0));
 +        getServicerAddress_args args = new getServicerAddress_args();
 +        args.setRemoteTableId(remoteTableId);
 +        args.setCredentials(credentials);
 +        args.write(prot);
 +        prot.writeMessageEnd();
 +      }
 +
 +      public String getResult() throws ReplicationCoordinatorException, org.apache.thrift.TException {
 +        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
 +          throw new IllegalStateException("Method call not finished!");
 +        }
 +        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
 +        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
 +        return (new Client(prot)).recv_getServicerAddress();
 +      }
 +    }
 +
 +  }
 +
 +  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
 +    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
 +    public Processor(I iface) {
 +      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
 +    }
 +
 +    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
 +      super(iface, getProcessMap(processMap));
 +    }
 +
 +    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
 +      processMap.put("getServicerAddress", new getServicerAddress());
 +      return processMap;
 +    }
 +
 +    public static class getServicerAddress<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getServicerAddress_args> {
 +      public getServicerAddress() {
 +        super("getServicerAddress");
 +      }
 +
 +      public getServicerAddress_args getEmptyArgsInstance() {
 +        return new getServicerAddress_args();
 +      }
 +
 +      protected boolean isOneway() {
 +        return false;
 +      }
 +
 +      public getServicerAddress_result getResult(I iface, getServicerAddress_args args) throws org.apache.thrift.TException {
 +        getServicerAddress_result result = new getServicerAddress_result();
 +        try {
 +          result.success = iface.getServicerAddress(args.remoteTableId, args.credentials);
 +        } catch (ReplicationCoordinatorException e) {
 +          result.e = e;
 +        }
 +        return result;
 +      }
 +    }
 +
 +  }
 +
-   public static class getServicerAddress_args implements org.apache.thrift.TBase<getServicerAddress_args, getServicerAddress_args._Fields>, java.io.Serializable, Cloneable   {
++  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
++    private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
++    public AsyncProcessor(I iface) {
++      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
++    }
++
++    protected AsyncProcessor(I iface, Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
++      super(iface, getProcessMap(processMap));
++    }
++
++    private static <I extends AsyncIface> Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
++      processMap.put("getServicerAddress", new getServicerAddress());
++      return processMap;
++    }
++
++    public static class getServicerAddress<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getServicerAddress_args, String> {
++      public getServicerAddress() {
++        super("getServicerAddress");
++      }
++
++      public getServicerAddress_args getEmptyArgsInstance() {
++        return new getServicerAddress_args();
++      }
++
++      public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
++        final org.apache.thrift.AsyncProcessFunction fcall = this;
++        return new AsyncMethodCallback<String>() { 
++          public void onComplete(String o) {
++            getServicerAddress_result result = new getServicerAddress_result();
++            result.success = o;
++            try {
++              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
++              return;
++            } catch (Exception e) {
++              LOGGER.error("Exception writing to internal frame buffer", e);
++            }
++            fb.close();
++          }
++          public void onError(Exception e) {
++            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
++            org.apache.thrift.TBase msg;
++            getServicerAddress_result result = new getServicerAddress_result();
++            if (e instanceof ReplicationCoordinatorException) {
++                        result.e = (ReplicationCoordinatorException) e;
++                        result.setEIsSet(true);
++                        msg = result;
++            }
++             else 
++            {
++              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
++              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
++            }
++            try {
++              fcall.sendResponse(fb,msg,msgType,seqid);
++              return;
++            } catch (Exception ex) {
++              LOGGER.error("Exception writing to internal frame buffer", ex);
++            }
++            fb.close();
++          }
++        };
++      }
++
++      protected boolean isOneway() {
++        return false;
++      }
++
++      public void start(I iface, getServicerAddress_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
++        iface.getServicerAddress(args.remoteTableId, args.credentials,resultHandler);
++      }
++    }
++
++  }
++
++  public static class getServicerAddress_args implements org.apache.thrift.TBase<getServicerAddress_args, getServicerAddress_args._Fields>, java.io.Serializable, Cloneable, Comparable<getServicerAddress_args>   {
 +    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getServicerAddress_args");
 +
 +    private static final org.apache.thrift.protocol.TField REMOTE_TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("remoteTableId", org.apache.thrift.protocol.TType.STRING, (short)1);
 +    private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 +
 +    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
 +    static {
 +      schemes.put(StandardScheme.class, new getServicerAddress_argsStandardSchemeFactory());
 +      schemes.put(TupleScheme.class, new getServicerAddress_argsTupleSchemeFactory());
 +    }
 +
 +    public String remoteTableId; // required
 +    public org.apache.accumulo.core.security.thrift.TCredentials credentials; // 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 {
 +      REMOTE_TABLE_ID((short)1, "remoteTableId"),
 +      CREDENTIALS((short)2, "credentials");
 +
 +      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 +
 +      static {
 +        for (_Fields field : EnumSet.allOf(_Fields.class)) {
 +          byName.put(field.getFieldName(), field);
 +        }
 +      }
 +
 +      /**
 +       * Find the _Fields constant that matches fieldId, or null if its not found.
 +       */
 +      public static _Fields findByThriftId(int fieldId) {
 +        switch(fieldId) {
 +          case 1: // REMOTE_TABLE_ID
 +            return REMOTE_TABLE_ID;
 +          case 2: // CREDENTIALS
 +            return CREDENTIALS;
 +          default:
 +            return null;
 +        }
 +      }
 +
 +      /**
 +       * Find the _Fields constant that matches fieldId, throwing an exception
 +       * if it is not found.
 +       */
 +      public static _Fields findByThriftIdOrThrow(int fieldId) {
 +        _Fields fields = findByThriftId(fieldId);
 +        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
 +        return fields;
 +      }
 +
 +      /**
 +       * Find the _Fields constant that matches name, or null if its not found.
 +       */
 +      public static _Fields findByName(String name) {
 +        return byName.get(name);
 +      }
 +
 +      private final short _thriftId;
 +      private final String _fieldName;
 +
 +      _Fields(short thriftId, String fieldName) {
 +        _thriftId = thriftId;
 +        _fieldName = fieldName;
 +      }
 +
 +      public short getThriftFieldId() {
 +        return _thriftId;
 +      }
 +
 +      public String getFieldName() {
 +        return _fieldName;
 +      }
 +    }
 +
 +    // isset id assignments
 +    public static final 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);
 +      tmpMap.put(_Fields.REMOTE_TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("remoteTableId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
 +      tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.security.thrift.TCredentials.class)));
 +      metaDataMap = Collections.unmodifiableMap(tmpMap);
 +      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getServicerAddress_args.class, metaDataMap);
 +    }
 +
 +    public getServicerAddress_args() {
 +    }
 +
 +    public getServicerAddress_args(
 +      String remoteTableId,
 +      org.apache.accumulo.core.security.thrift.TCredentials credentials)
 +    {
 +      this();
 +      this.remoteTableId = remoteTableId;
 +      this.credentials = credentials;
 +    }
 +
 +    /**
 +     * Performs a deep copy on <i>other</i>.
 +     */
 +    public getServicerAddress_args(getServicerAddress_args other) {
 +      if (other.isSetRemoteTableId()) {
 +        this.remoteTableId = other.remoteTableId;
 +      }
 +      if (other.isSetCredentials()) {
 +        this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials);
 +      }
 +    }
 +
 +    public getServicerAddress_args deepCopy() {
 +      return new getServicerAddress_args(this);
 +    }
 +
 +    @Override
 +    public void clear() {
 +      this.remoteTableId = null;
 +      this.credentials = null;
 +    }
 +
 +    public String getRemoteTableId() {
 +      return this.remoteTableId;
 +    }
 +
 +    public getServicerAddress_args setRemoteTableId(String remoteTableId) {
 +      this.remoteTableId = remoteTableId;
 +      return this;
 +    }
 +
 +    public void unsetRemoteTableId() {
 +      this.remoteTableId = null;
 +    }
 +
 +    /** Returns true if field remoteTableId is set (has been assigned a value) and false otherwise */
 +    public boolean isSetRemoteTableId() {
 +      return this.remoteTableId != null;
 +    }
 +
 +    public void setRemoteTableIdIsSet(boolean value) {
 +      if (!value) {
 +        this.remoteTableId = null;
 +      }
 +    }
 +
 +    public org.apache.accumulo.core.security.thrift.TCredentials getCredentials() {
 +      return this.credentials;
 +    }
 +
 +    public getServicerAddress_args setCredentials(org.apache.accumulo.core.security.thrift.TCredentials credentials) {
 +      this.credentials = credentials;
 +      return this;
 +    }
 +
 +    public void unsetCredentials() {
 +      this.credentials = null;
 +    }
 +
 +    /** Returns true if field credentials is set (has been assigned a value) and false otherwise */
 +    public boolean isSetCredentials() {
 +      return this.credentials != null;
 +    }
 +
 +    public void setCredentialsIsSet(boolean value) {
 +      if (!value) {
 +        this.credentials = null;
 +      }
 +    }
 +
 +    public void setFieldValue(_Fields field, Object value) {
 +      switch (field) {
 +      case REMOTE_TABLE_ID:
 +        if (value == null) {
 +          unsetRemoteTableId();
 +        } else {
 +          setRemoteTableId((String)value);
 +        }
 +        break;
 +
 +      case CREDENTIALS:
 +        if (value == null) {
 +          unsetCredentials();
 +        } else {
 +          setCredentials((org.apache.accumulo.core.security.thrift.TCredentials)value);
 +        }
 +        break;
 +
 +      }
 +    }
 +
 +    public Object getFieldValue(_Fields field) {
 +      switch (field) {
 +      case REMOTE_TABLE_ID:
 +        return getRemoteTableId();
 +
 +      case CREDENTIALS:
 +        return getCredentials();
 +
 +      }
 +      throw new IllegalStateException();
 +    }
 +
 +    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
 +    public boolean isSet(_Fields field) {
 +      if (field == null) {
 +        throw new IllegalArgumentException();
 +      }
 +
 +      switch (field) {
 +      case REMOTE_TABLE_ID:
 +        return isSetRemoteTableId();
 +      case CREDENTIALS:
 +        return isSetCredentials();
 +      }
 +      throw new IllegalStateException();
 +    }
 +
 +    @Override
 +    public boolean equals(Object that) {
 +      if (that == null)
 +        return false;
 +      if (that instanceof getServicerAddress_args)
 +        return this.equals((getServicerAddress_args)that);
 +      return false;
 +    }
 +
 +    public boolean equals(getServicerAddress_args that) {
 +      if (that == null)
 +        return false;
 +
 +      boolean this_present_remoteTableId = true && this.isSetRemoteTableId();
 +      boolean that_present_remoteTableId = true && that.isSetRemoteTableId();
 +      if (this_present_remoteTableId || that_present_remoteTableId) {
 +        if (!(this_present_remoteTableId && that_present_remoteTableId))
 +          return false;
 +        if (!this.remoteTableId.equals(that.remoteTableId))
 +          return false;
 +      }
 +
 +      boolean this_present_credentials = true && this.isSetCredentials();
 +      boolean that_present_credentials = true && that.isSetCredentials();
 +      if (this_present_credentials || that_present_credentials) {
 +        if (!(this_present_credentials && that_present_credentials))
 +          return false;
 +        if (!this.credentials.equals(that.credentials))
 +          return false;
 +      }
 +
 +      return true;
 +    }
 +
 +    @Override
 +    public int hashCode() {
 +      return 0;
 +    }
 +
++    @Override
 +    public int compareTo(getServicerAddress_args other) {
 +      if (!getClass().equals(other.getClass())) {
 +        return getClass().getName().compareTo(other.getClass().getName());
 +      }
 +
 +      int lastComparison = 0;
-       getServicerAddress_args typedOther = (getServicerAddress_args)other;
 +
-       lastComparison = Boolean.valueOf(isSetRemoteTableId()).compareTo(typedOther.isSetRemoteTableId());
++      lastComparison = Boolean.valueOf(isSetRemoteTableId()).compareTo(other.isSetRemoteTableId());
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +      if (isSetRemoteTableId()) {
-         lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.remoteTableId, typedOther.remoteTableId);
++        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.remoteTableId, other.remoteTableId);
 +        if (lastComparison != 0) {
 +          return lastComparison;
 +        }
 +      }
-       lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials());
++      lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +      if (isSetCredentials()) {
-         lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials);
++        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, other.credentials);
 +        if (lastComparison != 0) {
 +          return lastComparison;
 +        }
 +      }
 +      return 0;
 +    }
 +
 +    public _Fields fieldForId(int fieldId) {
 +      return _Fields.findByThriftId(fieldId);
 +    }
 +
 +    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
 +      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
 +    }
 +
 +    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
 +      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
 +    }
 +
 +    @Override
 +    public String toString() {
 +      StringBuilder sb = new StringBuilder("getServicerAddress_args(");
 +      boolean first = true;
 +
 +      sb.append("remoteTableId:");
 +      if (this.remoteTableId == null) {
 +        sb.append("null");
 +      } else {
 +        sb.append(this.remoteTableId);
 +      }
 +      first = false;
 +      if (!first) sb.append(", ");
 +      sb.append("credentials:");
 +      if (this.credentials == null) {
 +        sb.append("null");
 +      } else {
 +        sb.append(this.credentials);
 +      }
 +      first = false;
 +      sb.append(")");
 +      return sb.toString();
 +    }
 +
 +    public void validate() throws org.apache.thrift.TException {
 +      // check for required fields
 +      // check for sub-struct validity
 +      if (credentials != null) {
 +        credentials.validate();
 +      }
 +    }
 +
 +    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
 +      try {
 +        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
 +      } catch (org.apache.thrift.TException te) {
 +        throw new java.io.IOException(te);
 +      }
 +    }
 +
 +    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
 +      try {
 +        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
 +      } catch (org.apache.thrift.TException te) {
 +        throw new java.io.IOException(te);
 +      }
 +    }
 +
 +    private static class getServicerAddress_argsStandardSchemeFactory implements SchemeFactory {
 +      public getServicerAddress_argsStandardScheme getScheme() {
 +        return new getServicerAddress_argsStandardScheme();
 +      }
 +    }
 +
 +    private static class getServicerAddress_argsStandardScheme extends StandardScheme<getServicerAddress_args> {
 +
 +      public void read(org.apache.thrift.protocol.TProtocol iprot, getServicerAddress_args 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: // REMOTE_TABLE_ID
 +              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
 +                struct.remoteTableId = iprot.readString();
 +                struct.setRemoteTableIdIsSet(true);
 +              } else { 
 +                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +              }
 +              break;
 +            case 2: // CREDENTIALS
 +              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
 +                struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
 +                struct.credentials.read(iprot);
 +                struct.setCredentialsIsSet(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, getServicerAddress_args struct) throws org.apache.thrift.TException {
 +        struct.validate();
 +
 +        oprot.writeStructBegin(STRUCT_DESC);
 +        if (struct.remoteTableId != null) {
 +          oprot.writeFieldBegin(REMOTE_TABLE_ID_FIELD_DESC);
 +          oprot.writeString(struct.remoteTableId);
 +          oprot.writeFieldEnd();
 +        }
 +        if (struct.credentials != null) {
 +          oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
 +          struct.credentials.write(oprot);
 +          oprot.writeFieldEnd();
 +        }
 +        oprot.writeFieldStop();
 +        oprot.writeStructEnd();
 +      }
 +
 +    }
 +
 +    private static class getServicerAddress_argsTupleSchemeFactory implements SchemeFactory {
 +      public getServicerAddress_argsTupleScheme getScheme() {
 +        return new getServicerAddress_argsTupleScheme();
 +      }
 +    }
 +
 +    private static class getServicerAddress_argsTupleScheme extends TupleScheme<getServicerAddress_args> {
 +
 +      @Override
 +      public void write(org.apache.thrift.protocol.TProtocol prot, getServicerAddress_args struct) throws org.apache.thrift.TException {
 +        TTupleProtocol oprot = (TTupleProtocol) prot;
 +        BitSet optionals = new BitSet();
 +        if (struct.isSetRemoteTableId()) {
 +          optionals.set(0);
 +        }
 +        if (struct.isSetCredentials()) {
 +          optionals.set(1);
 +        }
 +        oprot.writeBitSet(optionals, 2);
 +        if (struct.isSetRemoteTableId()) {
 +          oprot.writeString(struct.remoteTableId);
 +        }
 +        if (struct.isSetCredentials()) {
 +          struct.credentials.write(oprot);
 +        }
 +      }
 +
 +      @Override
 +      public void read(org.apache.thrift.protocol.TProtocol prot, getServicerAddress_args struct) throws org.apache.thrift.TException {
 +        TTupleProtocol iprot = (TTupleProtocol) prot;
 +        BitSet incoming = iprot.readBitSet(2);
 +        if (incoming.get(0)) {
 +          struct.remoteTableId = iprot.readString();
 +          struct.setRemoteTableIdIsSet(true);
 +        }
 +        if (incoming.get(1)) {
 +          struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
 +          struct.credentials.read(iprot);
 +          struct.setCredentialsIsSet(true);
 +        }
 +      }
 +    }
 +
 +  }
 +
-   public static class getServicerAddress_result implements org.apache.thrift.TBase<getServicerAddress_result, getServicerAddress_result._Fields>, java.io.Serializable, Cloneable   {
++  public static class getServicerAddress_result implements org.apache.thrift.TBase<getServicerAddress_result, getServicerAddress_result._Fields>, java.io.Serializable, Cloneable, Comparable<getServicerAddress_result>   {
 +    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getServicerAddress_result");
 +
 +    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
 +    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 +
 +    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
 +    static {
 +      schemes.put(StandardScheme.class, new getServicerAddress_resultStandardSchemeFactory());
 +      schemes.put(TupleScheme.class, new getServicerAddress_resultTupleSchemeFactory());
 +    }
 +
 +    public String success; // required
 +    public ReplicationCoordinatorException e; // 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 {
 +      SUCCESS((short)0, "success"),
 +      E((short)1, "e");
 +
 +      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 +
 +      static {
 +        for (_Fields field : EnumSet.allOf(_Fields.class)) {
 +          byName.put(field.getFieldName(), field);
 +        }
 +      }
 +
 +      /**
 +       * Find the _Fields constant that matches fieldId, or null if its not found.
 +       */
 +      public static _Fields findByThriftId(int fieldId) {
 +        switch(fieldId) {
 +          case 0: // SUCCESS
 +            return SUCCESS;
 +          case 1: // E
 +            return E;
 +          default:
 +            return null;
 +        }
 +      }
 +
 +      /**
 +       * Find the _Fields constant that matches fieldId, throwing an exception
 +       * if it is not found.
 +       */
 +      public static _Fields findByThriftIdOrThrow(int fieldId) {
 +        _Fields fields = findByThriftId(fieldId);
 +        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
 +        return fields;
 +      }
 +
 +      /**
 +       * Find the _Fields constant that matches name, or null if its not found.
 +       */
 +      public static _Fields findByName(String name) {
 +        return byName.get(name);
 +      }
 +
 +      private final short _thriftId;
 +      private final String _fieldName;
 +
 +      _Fields(short thriftId, String fieldName) {
 +        _thriftId = thriftId;
 +        _fieldName = fieldName;
 +      }
 +
 +      public short getThriftFieldId() {
 +        return _thriftId;
 +      }
 +
 +      public String getFieldName() {
 +        return _fieldName;
 +      }
 +    }
 +
 +    // isset id assignments
 +    public static final 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);
 +      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
 +      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
 +      metaDataMap = Collections.unmodifiableMap(tmpMap);
 +      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getServicerAddress_result.class, metaDataMap);
 +    }
 +
 +    public getServicerAddress_result() {
 +    }
 +
 +    public getServicerAddress_result(
 +      String success,
 +      ReplicationCoordinatorException e)
 +    {
 +      this();
 +      this.success = success;
 +      this.e = e;
 +    }
 +
 +    /**
 +     * Performs a deep copy on <i>other</i>.
 +     */
 +    public getServicerAddress_result(getServicerAddress_result other) {
 +      if (other.isSetSuccess()) {
 +        this.success = other.success;
 +      }
 +      if (other.isSetE()) {
 +        this.e = new ReplicationCoordinatorException(other.e);
 +      }
 +    }
 +
 +    public getServicerAddress_result deepCopy() {
 +      return new getServicerAddress_result(this);
 +    }
 +
 +    @Override
 +    public void clear() {
 +      this.success = null;
 +      this.e = null;
 +    }
 +
 +    public String getSuccess() {
 +      return this.success;
 +    }
 +
 +    public getServicerAddress_result setSuccess(String success) {
 +      this.success = success;
 +      return this;
 +    }
 +
 +    public void unsetSuccess() {
 +      this.success = null;
 +    }
 +
 +    /** Returns true if field success is set (has been assigned a value) and false otherwise */
 +    public boolean isSetSuccess() {
 +      return this.success != null;
 +    }
 +
 +    public void setSuccessIsSet(boolean value) {
 +      if (!value) {
 +        this.success = null;
 +      }
 +    }
 +
 +    public ReplicationCoordinatorException getE() {
 +      return this.e;
 +    }
 +
 +    public getServicerAddress_result setE(ReplicationCoordinatorException e) {
 +      this.e = e;
 +      return this;
 +    }
 +
 +    public void unsetE() {
 +      this.e = null;
 +    }
 +
 +    /** Returns true if field e is set (has been assigned a value) and false otherwise */
 +    public boolean isSetE() {
 +      return this.e != null;
 +    }
 +
 +    public void setEIsSet(boolean value) {
 +      if (!value) {
 +        this.e = null;
 +      }
 +    }
 +
 +    public void setFieldValue(_Fields field, Object value) {
 +      switch (field) {
 +      case SUCCESS:
 +        if (value == null) {
 +          unsetSuccess();
 +        } else {
 +          setSuccess((String)value);
 +        }
 +        break;
 +
 +      case E:
 +        if (value == null) {
 +          unsetE();
 +        } else {
 +          setE((ReplicationCoordinatorException)value);
 +        }
 +        break;
 +
 +      }
 +    }
 +
 +    public Object getFieldValue(_Fields field) {
 +      switch (field) {
 +      case SUCCESS:
 +        return getSuccess();
 +
 +      case E:
 +        return getE();
 +
 +      }
 +      throw new IllegalStateException();
 +    }
 +
 +    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
 +    public boolean isSet(_Fields field) {
 +      if (field == null) {
 +        throw new IllegalArgumentException();
 +      }
 +
 +      switch (field) {
 +      case SUCCESS:
 +        return isSetSuccess();
 +      case E:
 +        return isSetE();
 +      }
 +      throw new IllegalStateException();
 +    }
 +
 +    @Override
 +    public boolean equals(Object that) {
 +      if (that == null)
 +        return false;
 +      if (that instanceof getServicerAddress_result)
 +        return this.equals((getServicerAddress_result)that);
 +      return false;
 +    }
 +
 +    public boolean equals(getServicerAddress_result that) {
 +      if (that == null)
 +        return false;
 +
 +      boolean this_present_success = true && this.isSetSuccess();
 +      boolean that_present_success = true && that.isSetSuccess();
 +      if (this_present_success || that_present_success) {
 +        if (!(this_present_success && that_present_success))
 +          return false;
 +        if (!this.success.equals(that.success))
 +          return false;
 +      }
 +
 +      boolean this_present_e = true && this.isSetE();
 +      boolean that_present_e = true && that.isSetE();
 +      if (this_present_e || that_present_e) {
 +        if (!(this_present_e && that_present_e))
 +          return false;
 +        if (!this.e.equals(that.e))
 +          return false;
 +      }
 +
 +      return true;
 +    }
 +
 +    @Override
 +    public int hashCode() {
 +      return 0;
 +    }
 +
++    @Override
 +    public int compareTo(getServicerAddress_result other) {
 +      if (!getClass().equals(other.getClass())) {
 +        return getClass().getName().compareTo(other.getClass().getName());
 +      }
 +
 +      int lastComparison = 0;
-       getServicerAddress_result typedOther = (getServicerAddress_result)other;
 +
-       lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
++      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +      if (isSetSuccess()) {
-         lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
++        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
 +        if (lastComparison != 0) {
 +          return lastComparison;
 +        }
 +      }
-       lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
++      lastComparison = Boolean.valueOf(isSetE()).compareTo(other.isSetE());
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +      if (isSetE()) {
-         lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
++        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, other.e);
 +        if (lastComparison != 0) {
 +          return lastComparison;
 +        }
 +      }
 +      return 0;
 +    }
 +
 +    public _Fields fieldForId(int fieldId) {
 +      return _Fields.findByThriftId(fieldId);
 +    }
 +
 +    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
 +      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
 +    }
 +
 +    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
 +      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
 +      }
 +
 +    @Override
 +    public String toString() {
 +      StringBuilder sb = new StringBuilder("getServicerAddress_result(");
 +      boolean first = true;
 +
 +      sb.append("success:");
 +      if (this.success == null) {
 +        sb.append("null");
 +      } else {
 +        sb.append(this.success);
 +      }
 +      first = false;
 +      if (!first) sb.append(", ");
 +      sb.append("e:");
 +      if (this.e == null) {
 +        sb.append("null");
 +      } else {
 +        sb.append(this.e);
 +      }
 +      first = false;
 +      sb.append(")");
 +      return sb.toString();
 +    }
 +
 +    public void validate() throws org.apache.thrift.TException {
 +      // check for required fields
 +      // check for sub-struct validity
 +    }
 +
 +    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
 +      try {
 +        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
 +      } catch (org.apache.thrift.TException te) {
 +        throw new java.io.IOException(te);
 +      }
 +    }
 +
 +    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
 +      try {
 +        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
 +      } catch (org.apache.thrift.TException te) {
 +        throw new java.io.IOException(te);
 +      }
 +    }
 +
 +    private static class getServicerAddress_resultStandardSchemeFactory implements SchemeFactory {
 +      public getServicerAddress_resultStandardScheme getScheme() {
 +        return new getServicerAddress_resultStandardScheme();
 +      }
 +    }
 +
 +    private static class getServicerAddress_resultStandardScheme extends StandardScheme<getServicerAddress_result> {
 +
 +      public void read(org.apache.thrift.protocol.TProtocol iprot, getServicerAddress_result 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 0: // SUCCESS
 +              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
 +                struct.success = iprot.readString();
 +                struct.setSuccessIsSet(true);
 +              } else { 
 +                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +              }
 +              break;
 +            case 1: // E
 +              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
 +                struct.e = new ReplicationCoordinatorException();
 +                struct.e.read(iprot);
 +                struct.setEIsSet(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, getServicerAddress_result struct) throws org.apache.thrift.TException {
 +        struct.validate();
 +
 +        oprot.writeStructBegin(STRUCT_DESC);
 +        if (struct.success != null) {
 +          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
 +          oprot.writeString(struct.success);
 +          oprot.writeFieldEnd();
 +        }
 +        if (struct.e != null) {
 +          oprot.writeFieldBegin(E_FIELD_DESC);
 +          struct.e.write(oprot);
 +          oprot.writeFieldEnd();
 +        }
 +        oprot.writeFieldStop();
 +        oprot.writeStructEnd();
 +      }
 +
 +    }
 +
 +    private static class getServicerAddress_resultTupleSchemeFactory implements SchemeFactory {
 +      public getServicerAddress_resultTupleScheme getScheme() {
 +        return new getServicerAddress_resultTupleScheme();
 +      }
 +    }
 +
 +    private static class getServicerAddress_resultTupleScheme extends TupleScheme<getServicerAddress_result> {
 +
 +      @Override
 +      public void write(org.apache.thrift.protocol.TProtocol prot, getServicerAddress_result struct) throws org.apache.thrift.TException {
 +        TTupleProtocol oprot = (TTupleProtocol) prot;
 +        BitSet optionals = new BitSet();
 +        if (struct.isSetSuccess()) {
 +          optionals.set(0);
 +        }
 +        if (struct.isSetE()) {
 +          optionals.set(1);
 +        }
 +        oprot.writeBitSet(optionals, 2);
 +        if (struct.isSetSuccess()) {
 +          oprot.writeString(struct.success);
 +        }
 +        if (struct.isSetE()) {
 +          struct.e.write(oprot);
 +        }
 +      }
 +
 +      @Override
 +      public void read(org.apache.thrift.protocol.TProtocol prot, getServicerAddress_result struct) throws org.apache.thrift.TException {
 +        TTupleProtocol iprot = (TTupleProtocol) prot;
 +        BitSet incoming = iprot.readBitSet(2);
 +        if (incoming.get(0)) {
 +          struct.success = iprot.readString();
 +          struct.setSuccessIsSet(true);
 +        }
 +        if (incoming.get(1)) {
 +          struct.e = new ReplicationCoordinatorException();
 +          struct.e.read(iprot);
 +          struct.setEIsSet(true);
 +        }
 +      }
 +    }
 +
 +  }
 +
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
index fb71ce5,0000000..1fccbda
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
@@@ -1,64 -1,0 +1,64 @@@
 +/*
 + * 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)
++ * Autogenerated by Thrift Compiler (0.9.1)
 + *
 + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 + *  @generated
 + */
 +package org.apache.accumulo.core.replication.thrift;
 +
 +
 +import java.util.Map;
 +import java.util.HashMap;
 +import org.apache.thrift.TEnum;
 +
 +@SuppressWarnings("all") public enum ReplicationCoordinatorErrorCode implements org.apache.thrift.TEnum {
 +  NO_AVAILABLE_SERVERS(0),
 +  SERVICE_CONFIGURATION_UNAVAILABLE(1),
 +  CANNOT_AUTHENTICATE(2);
 +
 +  private final int value;
 +
 +  private ReplicationCoordinatorErrorCode(int value) {
 +    this.value = value;
 +  }
 +
 +  /**
 +   * Get the integer value of this enum value, as defined in the Thrift IDL.
 +   */
 +  public int getValue() {
 +    return value;
 +  }
 +
 +  /**
 +   * Find a the enum type by its integer value, as defined in the Thrift IDL.
 +   * @return null if the value is not found.
 +   */
 +  public static ReplicationCoordinatorErrorCode findByValue(int value) { 
 +    switch (value) {
 +      case 0:
 +        return NO_AVAILABLE_SERVERS;
 +      case 1:
 +        return SERVICE_CONFIGURATION_UNAVAILABLE;
 +      case 2:
 +        return CANNOT_AUTHENTICATE;
 +      default:
 +        return null;
 +    }
 +  }
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
index d7a74e8,0000000..c2df6e8
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
@@@ -1,518 -1,0 +1,520 @@@
 +/*
 + * 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)
++ * Autogenerated by Thrift Compiler (0.9.1)
 + *
 + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 + *  @generated
 + */
 +package org.apache.accumulo.core.replication.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 org.apache.thrift.protocol.TProtocolException;
 +import org.apache.thrift.EncodingUtils;
 +import org.apache.thrift.TException;
++import org.apache.thrift.async.AsyncMethodCallback;
++import org.apache.thrift.server.AbstractNonblockingServer.*;
 +import java.util.List;
 +import java.util.ArrayList;
 +import java.util.Map;
 +import java.util.HashMap;
 +import java.util.EnumMap;
 +import java.util.Set;
 +import java.util.HashSet;
 +import java.util.EnumSet;
 +import java.util.Collections;
 +import java.util.BitSet;
 +import java.nio.ByteBuffer;
 +import java.util.Arrays;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
- @SuppressWarnings("all") public class ReplicationCoordinatorException extends TException implements org.apache.thrift.TBase<ReplicationCoordinatorException, ReplicationCoordinatorException._Fields>, java.io.Serializable, Cloneable {
++@SuppressWarnings("all") public class ReplicationCoordinatorException extends TException implements org.apache.thrift.TBase<ReplicationCoordinatorException, ReplicationCoordinatorException._Fields>, java.io.Serializable, Cloneable, Comparable<ReplicationCoordinatorException> {
 +  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplicationCoordinatorException");
 +
 +  private static final org.apache.thrift.protocol.TField CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("code", org.apache.thrift.protocol.TType.I32, (short)1);
 +  private static final org.apache.thrift.protocol.TField REASON_FIELD_DESC = new org.apache.thrift.protocol.TField("reason", org.apache.thrift.protocol.TType.STRING, (short)2);
 +
 +  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
 +  static {
 +    schemes.put(StandardScheme.class, new ReplicationCoordinatorExceptionStandardSchemeFactory());
 +    schemes.put(TupleScheme.class, new ReplicationCoordinatorExceptionTupleSchemeFactory());
 +  }
 +
 +  /**
 +   * 
 +   * @see ReplicationCoordinatorErrorCode
 +   */
 +  public ReplicationCoordinatorErrorCode code; // required
 +  public String reason; // 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 {
 +    /**
 +     * 
 +     * @see ReplicationCoordinatorErrorCode
 +     */
 +    CODE((short)1, "code"),
 +    REASON((short)2, "reason");
 +
 +    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 +
 +    static {
 +      for (_Fields field : EnumSet.allOf(_Fields.class)) {
 +        byName.put(field.getFieldName(), field);
 +      }
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches fieldId, or null if its not found.
 +     */
 +    public static _Fields findByThriftId(int fieldId) {
 +      switch(fieldId) {
 +        case 1: // CODE
 +          return CODE;
 +        case 2: // REASON
 +          return REASON;
 +        default:
 +          return null;
 +      }
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches fieldId, throwing an exception
 +     * if it is not found.
 +     */
 +    public static _Fields findByThriftIdOrThrow(int fieldId) {
 +      _Fields fields = findByThriftId(fieldId);
 +      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
 +      return fields;
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches name, or null if its not found.
 +     */
 +    public static _Fields findByName(String name) {
 +      return byName.get(name);
 +    }
 +
 +    private final short _thriftId;
 +    private final String _fieldName;
 +
 +    _Fields(short thriftId, String fieldName) {
 +      _thriftId = thriftId;
 +      _fieldName = fieldName;
 +    }
 +
 +    public short getThriftFieldId() {
 +      return _thriftId;
 +    }
 +
 +    public String getFieldName() {
 +      return _fieldName;
 +    }
 +  }
 +
 +  // isset id assignments
 +  public static final 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);
 +    tmpMap.put(_Fields.CODE, new org.apache.thrift.meta_data.FieldMetaData("code", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ReplicationCoordinatorErrorCode.class)));
 +    tmpMap.put(_Fields.REASON, new org.apache.thrift.meta_data.FieldMetaData("reason", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
 +    metaDataMap = Collections.unmodifiableMap(tmpMap);
 +    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ReplicationCoordinatorException.class, metaDataMap);
 +  }
 +
 +  public ReplicationCoordinatorException() {
 +  }
 +
 +  public ReplicationCoordinatorException(
 +    ReplicationCoordinatorErrorCode code,
 +    String reason)
 +  {
 +    this();
 +    this.code = code;
 +    this.reason = reason;
 +  }
 +
 +  /**
 +   * Performs a deep copy on <i>other</i>.
 +   */
 +  public ReplicationCoordinatorException(ReplicationCoordinatorException other) {
 +    if (other.isSetCode()) {
 +      this.code = other.code;
 +    }
 +    if (other.isSetReason()) {
 +      this.reason = other.reason;
 +    }
 +  }
 +
 +  public ReplicationCoordinatorException deepCopy() {
 +    return new ReplicationCoordinatorException(this);
 +  }
 +
 +  @Override
 +  public void clear() {
 +    this.code = null;
 +    this.reason = null;
 +  }
 +
 +  /**
 +   * 
 +   * @see ReplicationCoordinatorErrorCode
 +   */
 +  public ReplicationCoordinatorErrorCode getCode() {
 +    return this.code;
 +  }
 +
 +  /**
 +   * 
 +   * @see ReplicationCoordinatorErrorCode
 +   */
 +  public ReplicationCoordinatorException setCode(ReplicationCoordinatorErrorCode code) {
 +    this.code = code;
 +    return this;
 +  }
 +
 +  public void unsetCode() {
 +    this.code = null;
 +  }
 +
 +  /** Returns true if field code is set (has been assigned a value) and false otherwise */
 +  public boolean isSetCode() {
 +    return this.code != null;
 +  }
 +
 +  public void setCodeIsSet(boolean value) {
 +    if (!value) {
 +      this.code = null;
 +    }
 +  }
 +
 +  public String getReason() {
 +    return this.reason;
 +  }
 +
 +  public ReplicationCoordinatorException setReason(String reason) {
 +    this.reason = reason;
 +    return this;
 +  }
 +
 +  public void unsetReason() {
 +    this.reason = null;
 +  }
 +
 +  /** Returns true if field reason is set (has been assigned a value) and false otherwise */
 +  public boolean isSetReason() {
 +    return this.reason != null;
 +  }
 +
 +  public void setReasonIsSet(boolean value) {
 +    if (!value) {
 +      this.reason = null;
 +    }
 +  }
 +
 +  public void setFieldValue(_Fields field, Object value) {
 +    switch (field) {
 +    case CODE:
 +      if (value == null) {
 +        unsetCode();
 +      } else {
 +        setCode((ReplicationCoordinatorErrorCode)value);
 +      }
 +      break;
 +
 +    case REASON:
 +      if (value == null) {
 +        unsetReason();
 +      } else {
 +        setReason((String)value);
 +      }
 +      break;
 +
 +    }
 +  }
 +
 +  public Object getFieldValue(_Fields field) {
 +    switch (field) {
 +    case CODE:
 +      return getCode();
 +
 +    case REASON:
 +      return getReason();
 +
 +    }
 +    throw new IllegalStateException();
 +  }
 +
 +  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
 +  public boolean isSet(_Fields field) {
 +    if (field == null) {
 +      throw new IllegalArgumentException();
 +    }
 +
 +    switch (field) {
 +    case CODE:
 +      return isSetCode();
 +    case REASON:
 +      return isSetReason();
 +    }
 +    throw new IllegalStateException();
 +  }
 +
 +  @Override
 +  public boolean equals(Object that) {
 +    if (that == null)
 +      return false;
 +    if (that instanceof ReplicationCoordinatorException)
 +      return this.equals((ReplicationCoordinatorException)that);
 +    return false;
 +  }
 +
 +  public boolean equals(ReplicationCoordinatorException that) {
 +    if (that == null)
 +      return false;
 +
 +    boolean this_present_code = true && this.isSetCode();
 +    boolean that_present_code = true && that.isSetCode();
 +    if (this_present_code || that_present_code) {
 +      if (!(this_present_code && that_present_code))
 +        return false;
 +      if (!this.code.equals(that.code))
 +        return false;
 +    }
 +
 +    boolean this_present_reason = true && this.isSetReason();
 +    boolean that_present_reason = true && that.isSetReason();
 +    if (this_present_reason || that_present_reason) {
 +      if (!(this_present_reason && that_present_reason))
 +        return false;
 +      if (!this.reason.equals(that.reason))
 +        return false;
 +    }
 +
 +    return true;
 +  }
 +
 +  @Override
 +  public int hashCode() {
 +    return 0;
 +  }
 +
++  @Override
 +  public int compareTo(ReplicationCoordinatorException other) {
 +    if (!getClass().equals(other.getClass())) {
 +      return getClass().getName().compareTo(other.getClass().getName());
 +    }
 +
 +    int lastComparison = 0;
-     ReplicationCoordinatorException typedOther = (ReplicationCoordinatorException)other;
 +
-     lastComparison = Boolean.valueOf(isSetCode()).compareTo(typedOther.isSetCode());
++    lastComparison = Boolean.valueOf(isSetCode()).compareTo(other.isSetCode());
 +    if (lastComparison != 0) {
 +      return lastComparison;
 +    }
 +    if (isSetCode()) {
-       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, typedOther.code);
++      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, other.code);
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +    }
-     lastComparison = Boolean.valueOf(isSetReason()).compareTo(typedOther.isSetReason());
++    lastComparison = Boolean.valueOf(isSetReason()).compareTo(other.isSetReason());
 +    if (lastComparison != 0) {
 +      return lastComparison;
 +    }
 +    if (isSetReason()) {
-       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reason, typedOther.reason);
++      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reason, other.reason);
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +    }
 +    return 0;
 +  }
 +
 +  public _Fields fieldForId(int fieldId) {
 +    return _Fields.findByThriftId(fieldId);
 +  }
 +
 +  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
 +    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
 +  }
 +
 +  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
 +    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
 +  }
 +
 +  @Override
 +  public String toString() {
 +    StringBuilder sb = new StringBuilder("ReplicationCoordinatorException(");
 +    boolean first = true;
 +
 +    sb.append("code:");
 +    if (this.code == null) {
 +      sb.append("null");
 +    } else {
 +      sb.append(this.code);
 +    }
 +    first = false;
 +    if (!first) sb.append(", ");
 +    sb.append("reason:");
 +    if (this.reason == null) {
 +      sb.append("null");
 +    } else {
 +      sb.append(this.reason);
 +    }
 +    first = false;
 +    sb.append(")");
 +    return sb.toString();
 +  }
 +
 +  public void validate() throws org.apache.thrift.TException {
 +    // check for required fields
 +    // check for sub-struct validity
 +  }
 +
 +  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
 +    try {
 +      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
 +    } catch (org.apache.thrift.TException te) {
 +      throw new java.io.IOException(te);
 +    }
 +  }
 +
 +  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
 +    try {
 +      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
 +    } catch (org.apache.thrift.TException te) {
 +      throw new java.io.IOException(te);
 +    }
 +  }
 +
 +  private static class ReplicationCoordinatorExceptionStandardSchemeFactory implements SchemeFactory {
 +    public ReplicationCoordinatorExceptionStandardScheme getScheme() {
 +      return new ReplicationCoordinatorExceptionStandardScheme();
 +    }
 +  }
 +
 +  private static class ReplicationCoordinatorExceptionStandardScheme extends StandardScheme<ReplicationCoordinatorException> {
 +
 +    public void read(org.apache.thrift.protocol.TProtocol iprot, ReplicationCoordinatorException 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: // CODE
 +            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
 +              struct.code = ReplicationCoordinatorErrorCode.findByValue(iprot.readI32());
 +              struct.setCodeIsSet(true);
 +            } else { 
 +              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +            }
 +            break;
 +          case 2: // REASON
 +            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
 +              struct.reason = iprot.readString();
 +              struct.setReasonIsSet(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, ReplicationCoordinatorException struct) throws org.apache.thrift.TException {
 +      struct.validate();
 +
 +      oprot.writeStructBegin(STRUCT_DESC);
 +      if (struct.code != null) {
 +        oprot.writeFieldBegin(CODE_FIELD_DESC);
 +        oprot.writeI32(struct.code.getValue());
 +        oprot.writeFieldEnd();
 +      }
 +      if (struct.reason != null) {
 +        oprot.writeFieldBegin(REASON_FIELD_DESC);
 +        oprot.writeString(struct.reason);
 +        oprot.writeFieldEnd();
 +      }
 +      oprot.writeFieldStop();
 +      oprot.writeStructEnd();
 +    }
 +
 +  }
 +
 +  private static class ReplicationCoordinatorExceptionTupleSchemeFactory implements SchemeFactory {
 +    public ReplicationCoordinatorExceptionTupleScheme getScheme() {
 +      return new ReplicationCoordinatorExceptionTupleScheme();
 +    }
 +  }
 +
 +  private static class ReplicationCoordinatorExceptionTupleScheme extends TupleScheme<ReplicationCoordinatorException> {
 +
 +    @Override
 +    public void write(org.apache.thrift.protocol.TProtocol prot, ReplicationCoordinatorException struct) throws org.apache.thrift.TException {
 +      TTupleProtocol oprot = (TTupleProtocol) prot;
 +      BitSet optionals = new BitSet();
 +      if (struct.isSetCode()) {
 +        optionals.set(0);
 +      }
 +      if (struct.isSetReason()) {
 +        optionals.set(1);
 +      }
 +      oprot.writeBitSet(optionals, 2);
 +      if (struct.isSetCode()) {
 +        oprot.writeI32(struct.code.getValue());
 +      }
 +      if (struct.isSetReason()) {
 +        oprot.writeString(struct.reason);
 +      }
 +    }
 +
 +    @Override
 +    public void read(org.apache.thrift.protocol.TProtocol prot, ReplicationCoordinatorException struct) throws org.apache.thrift.TException {
 +      TTupleProtocol iprot = (TTupleProtocol) prot;
 +      BitSet incoming = iprot.readBitSet(2);
 +      if (incoming.get(0)) {
 +        struct.code = ReplicationCoordinatorErrorCode.findByValue(iprot.readI32());
 +        struct.setCodeIsSet(true);
 +      }
 +      if (incoming.get(1)) {
 +        struct.reason = iprot.readString();
 +        struct.setReasonIsSet(true);
 +      }
 +    }
 +  }
 +
 +}
 +


Mime
View raw message