http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/conf/Property.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java index fe313c1..025a233 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@ -330,7 +330,7 @@ public enum Property { + "the date shown on the 'Recent Logs' monitor page"), TRACE_PREFIX("trace.", null, PropertyType.PREFIX, "Properties in this category affect the behavior of distributed tracing."), - TRACE_SPAN_RECEIVERS("trace.span.receivers", "org.apache.accumulo.core.trace.ZooTraceClient", PropertyType.CLASSNAMELIST, "A list of span receiver classes to send trace spans"), + TRACE_SPAN_RECEIVERS("trace.span.receivers", "org.apache.accumulo.tracer.ZooTraceClient", PropertyType.CLASSNAMELIST, "A list of span receiver classes to send trace spans"), TRACE_SPAN_RECEIVER_PREFIX("trace.span.receiver.", null, PropertyType.PREFIX, "Prefix for span receiver configuration properties"), TRACE_ZK_PATH("trace.span.receiver.zookeeper.path", Constants.ZTRACERS, PropertyType.STRING, "The zookeeper node where tracers are registered"), TRACE_PORT("trace.port.client", "12234", PropertyType.PORT, "The listening port for the trace server"),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java index 9d7ba57..a744038 100644 --- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java +++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java @@ -52,13 +52,13 @@ import org.slf4j.LoggerFactory; public interface Iface { - public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException; + public GCStatus getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException; } public interface AsyncIface { - public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -82,13 +82,13 @@ import org.slf4j.LoggerFactory; super(iprot, oprot); } - public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException + public GCStatus getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException { send_getStatus(tinfo, credentials); return recv_getStatus(); } - public void send_getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException + public void send_getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException { getStatus_args args = new getStatus_args(); args.setTinfo(tinfo); @@ -127,7 +127,7 @@ import org.slf4j.LoggerFactory; super(protocolFactory, clientManager, transport); } - public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getStatus_call method_call = new getStatus_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -135,9 +135,9 @@ import org.slf4j.LoggerFactory; } public static class getStatus_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.accumulo.trace.thrift.TInfo tinfo; + private org.apache.accumulo.core.trace.thrift.TInfo tinfo; private org.apache.accumulo.core.security.thrift.TCredentials credentials; - public getStatus_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 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 { + public getStatus_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 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.tinfo = tinfo; this.credentials = credentials; @@ -291,7 +291,7 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new getStatus_argsTupleSchemeFactory()); } - public org.apache.accumulo.trace.thrift.TInfo tinfo; // required + public org.apache.accumulo.core.trace.thrift.TInfo tinfo; // 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. */ @@ -360,7 +360,7 @@ import org.slf4j.LoggerFactory; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.trace.thrift.TInfo.class))); 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); @@ -371,7 +371,7 @@ import org.slf4j.LoggerFactory; } public getStatus_args( - org.apache.accumulo.trace.thrift.TInfo tinfo, + org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) { this(); @@ -384,7 +384,7 @@ import org.slf4j.LoggerFactory; */ public getStatus_args(getStatus_args other) { if (other.isSetTinfo()) { - this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo); + this.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials); @@ -401,11 +401,11 @@ import org.slf4j.LoggerFactory; this.credentials = null; } - public org.apache.accumulo.trace.thrift.TInfo getTinfo() { + public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() { return this.tinfo; } - public getStatus_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) { + public getStatus_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -455,7 +455,7 @@ import org.slf4j.LoggerFactory; if (value == null) { unsetTinfo(); } else { - setTinfo((org.apache.accumulo.trace.thrift.TInfo)value); + setTinfo((org.apache.accumulo.core.trace.thrift.TInfo)value); } break; @@ -650,7 +650,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 2: // TINFO if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } else { @@ -729,7 +729,7 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java index 6b337b4..46ef8e1 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java @@ -52,25 +52,25 @@ import org.slf4j.LoggerFactory; public interface Iface { - public long beginFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException; + public long beginFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException; - public void executeFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException; + public void executeFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException; - public String waitForFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException; + public String waitForFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException; - public void finishFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException; + public void finishFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException; } public interface AsyncIface { - public void beginFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void beginFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void executeFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void executeFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void waitForFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void waitForFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void finishFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void finishFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -94,13 +94,13 @@ import org.slf4j.LoggerFactory; super(iprot, oprot); } - public long beginFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException + public long beginFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException { send_beginFateOperation(tinfo, credentials); return recv_beginFateOperation(); } - public void send_beginFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException + public void send_beginFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException { beginFateOperation_args args = new beginFateOperation_args(); args.setTinfo(tinfo); @@ -121,13 +121,13 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "beginFateOperation failed: unknown result"); } - public void executeFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException + public void executeFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException { send_executeFateOperation(tinfo, credentials, opid, op, arguments, options, autoClean); recv_executeFateOperation(); } - public void send_executeFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean) throws org.apache.thrift.TException + public void send_executeFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean) throws org.apache.thrift.TException { executeFateOperation_args args = new executeFateOperation_args(); args.setTinfo(tinfo); @@ -153,13 +153,13 @@ import org.slf4j.LoggerFactory; return; } - public String waitForFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException + public String waitForFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException { send_waitForFateOperation(tinfo, credentials, opid); return recv_waitForFateOperation(); } - public void send_waitForFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.thrift.TException + public void send_waitForFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.thrift.TException { waitForFateOperation_args args = new waitForFateOperation_args(); args.setTinfo(tinfo); @@ -184,13 +184,13 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "waitForFateOperation failed: unknown result"); } - public void finishFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException + public void finishFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException { send_finishFateOperation(tinfo, credentials, opid); recv_finishFateOperation(); } - public void send_finishFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.thrift.TException + public void send_finishFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) throws org.apache.thrift.TException { finishFateOperation_args args = new finishFateOperation_args(); args.setTinfo(tinfo); @@ -227,7 +227,7 @@ import org.slf4j.LoggerFactory; super(protocolFactory, clientManager, transport); } - public void beginFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void beginFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); beginFateOperation_call method_call = new beginFateOperation_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -235,9 +235,9 @@ import org.slf4j.LoggerFactory; } public static class beginFateOperation_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.accumulo.trace.thrift.TInfo tinfo; + private org.apache.accumulo.core.trace.thrift.TInfo tinfo; private org.apache.accumulo.core.security.thrift.TCredentials credentials; - public beginFateOperation_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 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 { + public beginFateOperation_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 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.tinfo = tinfo; this.credentials = credentials; @@ -262,7 +262,7 @@ import org.slf4j.LoggerFactory; } } - public void executeFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void executeFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); executeFateOperation_call method_call = new executeFateOperation_call(tinfo, credentials, opid, op, arguments, options, autoClean, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -270,14 +270,14 @@ import org.slf4j.LoggerFactory; } public static class executeFateOperation_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.accumulo.trace.thrift.TInfo tinfo; + private org.apache.accumulo.core.trace.thrift.TInfo tinfo; private org.apache.accumulo.core.security.thrift.TCredentials credentials; private long opid; private FateOperation op; private List<ByteBuffer> arguments; private Map<String,String> options; private boolean autoClean; - public executeFateOperation_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean, 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 { + public executeFateOperation_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, List<ByteBuffer> arguments, Map<String,String> options, boolean autoClean, 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.tinfo = tinfo; this.credentials = credentials; @@ -312,7 +312,7 @@ import org.slf4j.LoggerFactory; } } - public void waitForFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void waitForFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); waitForFateOperation_call method_call = new waitForFateOperation_call(tinfo, credentials, opid, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -320,10 +320,10 @@ import org.slf4j.LoggerFactory; } public static class waitForFateOperation_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.accumulo.trace.thrift.TInfo tinfo; + private org.apache.accumulo.core.trace.thrift.TInfo tinfo; private org.apache.accumulo.core.security.thrift.TCredentials credentials; private long opid; - public waitForFateOperation_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, 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 { + public waitForFateOperation_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, 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.tinfo = tinfo; this.credentials = credentials; @@ -350,7 +350,7 @@ import org.slf4j.LoggerFactory; } } - public void finishFateOperation(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void finishFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); finishFateOperation_call method_call = new finishFateOperation_call(tinfo, credentials, opid, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -358,10 +358,10 @@ import org.slf4j.LoggerFactory; } public static class finishFateOperation_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.accumulo.trace.thrift.TInfo tinfo; + private org.apache.accumulo.core.trace.thrift.TInfo tinfo; private org.apache.accumulo.core.security.thrift.TCredentials credentials; private long opid; - public finishFateOperation_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, 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 { + public finishFateOperation_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, 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.tinfo = tinfo; this.credentials = credentials; @@ -780,7 +780,7 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new beginFateOperation_argsTupleSchemeFactory()); } - public org.apache.accumulo.trace.thrift.TInfo tinfo; // required + public org.apache.accumulo.core.trace.thrift.TInfo tinfo; // 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. */ @@ -849,7 +849,7 @@ import org.slf4j.LoggerFactory; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.trace.thrift.TInfo.class))); 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); @@ -860,7 +860,7 @@ import org.slf4j.LoggerFactory; } public beginFateOperation_args( - org.apache.accumulo.trace.thrift.TInfo tinfo, + org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) { this(); @@ -873,7 +873,7 @@ import org.slf4j.LoggerFactory; */ public beginFateOperation_args(beginFateOperation_args other) { if (other.isSetTinfo()) { - this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo); + this.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials); @@ -890,11 +890,11 @@ import org.slf4j.LoggerFactory; this.credentials = null; } - public org.apache.accumulo.trace.thrift.TInfo getTinfo() { + public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() { return this.tinfo; } - public beginFateOperation_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) { + public beginFateOperation_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -944,7 +944,7 @@ import org.slf4j.LoggerFactory; if (value == null) { unsetTinfo(); } else { - setTinfo((org.apache.accumulo.trace.thrift.TInfo)value); + setTinfo((org.apache.accumulo.core.trace.thrift.TInfo)value); } break; @@ -1139,7 +1139,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 2: // TINFO if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } else { @@ -1218,7 +1218,7 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } @@ -1705,7 +1705,7 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new executeFateOperation_argsTupleSchemeFactory()); } - public org.apache.accumulo.trace.thrift.TInfo tinfo; // required + public org.apache.accumulo.core.trace.thrift.TInfo tinfo; // required public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required public long opid; // required /** @@ -1805,7 +1805,7 @@ import org.slf4j.LoggerFactory; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.trace.thrift.TInfo.class))); 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))); tmpMap.put(_Fields.OPID, new org.apache.thrift.meta_data.FieldMetaData("opid", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -1829,7 +1829,7 @@ import org.slf4j.LoggerFactory; } public executeFateOperation_args( - org.apache.accumulo.trace.thrift.TInfo tinfo, + org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, FateOperation op, @@ -1855,7 +1855,7 @@ import org.slf4j.LoggerFactory; public executeFateOperation_args(executeFateOperation_args other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { - this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo); + this.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials); @@ -1892,11 +1892,11 @@ import org.slf4j.LoggerFactory; this.autoClean = false; } - public org.apache.accumulo.trace.thrift.TInfo getTinfo() { + public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() { return this.tinfo; } - public executeFateOperation_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) { + public executeFateOperation_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -2098,7 +2098,7 @@ import org.slf4j.LoggerFactory; if (value == null) { unsetTinfo(); } else { - setTinfo((org.apache.accumulo.trace.thrift.TInfo)value); + setTinfo((org.apache.accumulo.core.trace.thrift.TInfo)value); } break; @@ -2487,7 +2487,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 7: // TINFO if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } else { @@ -2707,7 +2707,7 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } @@ -3232,7 +3232,7 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new waitForFateOperation_argsTupleSchemeFactory()); } - public org.apache.accumulo.trace.thrift.TInfo tinfo; // required + public org.apache.accumulo.core.trace.thrift.TInfo tinfo; // required public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required public long opid; // required @@ -3307,7 +3307,7 @@ import org.slf4j.LoggerFactory; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.trace.thrift.TInfo.class))); 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))); tmpMap.put(_Fields.OPID, new org.apache.thrift.meta_data.FieldMetaData("opid", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -3320,7 +3320,7 @@ import org.slf4j.LoggerFactory; } public waitForFateOperation_args( - org.apache.accumulo.trace.thrift.TInfo tinfo, + org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) { @@ -3337,7 +3337,7 @@ import org.slf4j.LoggerFactory; public waitForFateOperation_args(waitForFateOperation_args other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { - this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo); + this.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials); @@ -3357,11 +3357,11 @@ import org.slf4j.LoggerFactory; this.opid = 0; } - public org.apache.accumulo.trace.thrift.TInfo getTinfo() { + public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() { return this.tinfo; } - public waitForFateOperation_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) { + public waitForFateOperation_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -3434,7 +3434,7 @@ import org.slf4j.LoggerFactory; if (value == null) { unsetTinfo(); } else { - setTinfo((org.apache.accumulo.trace.thrift.TInfo)value); + setTinfo((org.apache.accumulo.core.trace.thrift.TInfo)value); } break; @@ -3667,7 +3667,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 3: // TINFO if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } else { @@ -3763,7 +3763,7 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } @@ -4352,7 +4352,7 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new finishFateOperation_argsTupleSchemeFactory()); } - public org.apache.accumulo.trace.thrift.TInfo tinfo; // required + public org.apache.accumulo.core.trace.thrift.TInfo tinfo; // required public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required public long opid; // required @@ -4427,7 +4427,7 @@ import org.slf4j.LoggerFactory; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.trace.thrift.TInfo.class))); 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))); tmpMap.put(_Fields.OPID, new org.apache.thrift.meta_data.FieldMetaData("opid", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -4440,7 +4440,7 @@ import org.slf4j.LoggerFactory; } public finishFateOperation_args( - org.apache.accumulo.trace.thrift.TInfo tinfo, + org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) { @@ -4457,7 +4457,7 @@ import org.slf4j.LoggerFactory; public finishFateOperation_args(finishFateOperation_args other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { - this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo); + this.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials); @@ -4477,11 +4477,11 @@ import org.slf4j.LoggerFactory; this.opid = 0; } - public org.apache.accumulo.trace.thrift.TInfo getTinfo() { + public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() { return this.tinfo; } - public finishFateOperation_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) { + public finishFateOperation_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -4554,7 +4554,7 @@ import org.slf4j.LoggerFactory; if (value == null) { unsetTinfo(); } else { - setTinfo((org.apache.accumulo.trace.thrift.TInfo)value); + setTinfo((org.apache.accumulo.core.trace.thrift.TInfo)value); } break; @@ -4787,7 +4787,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 3: // TINFO if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); } else { @@ -4883,7 +4883,7 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo(); + struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(); struct.tinfo.read(iprot); struct.setTinfoIsSet(true); }
