You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2014/11/08 00:05:19 UTC
[01/15] accumulo git commit: ACCUMULO-898 convert accumulo to use
htrace
Repository: accumulo
Updated Branches:
refs/heads/master 34ca056b3 -> 6b5f5ef47
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SpanReceiver.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SpanReceiver.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SpanReceiver.java
deleted file mode 100644
index b44e51e..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SpanReceiver.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.receivers;
-
-import java.util.Map;
-
-/**
- * The collector within a process that is the destination of Spans when a trace is running.
- */
-public interface SpanReceiver {
- void span(long traceId, long spanId, long parentId, long start, long stop, String description, Map<String,String> data);
-
- void flush();
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
deleted file mode 100644
index 84e3204..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.receivers;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import org.apache.log4j.Logger;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.ZooKeeper.States;
-
-/**
- * Find a Span collector via zookeeper and push spans there via Thrift RPC
- *
- */
-public class ZooSpanClient extends SendSpansViaThrift {
-
- private static final Logger log = Logger.getLogger(ZooSpanClient.class);
- private static final int TOTAL_TIME_WAIT_CONNECT_MS = 10 * 1000;
- private static final int TIME_WAIT_CONNECT_CHECK_MS = 100;
-
- ZooKeeper zoo = null;
- final String path;
- final Random random = new Random();
- final List<String> hosts = new ArrayList<String>();
-
- public ZooSpanClient(String keepers, final String path, String host, String service, long millis) throws IOException, KeeperException, InterruptedException {
- super(host, service, millis);
- this.path = path;
- zoo = new ZooKeeper(keepers, 30 * 1000, new Watcher() {
- @Override
- public void process(WatchedEvent event) {
- try {
- if (zoo != null) {
- updateHosts(path, zoo.getChildren(path, null));
- }
- } catch (Exception ex) {
- log.error("unable to get destination hosts in zookeeper", ex);
- }
- }
- });
- for (int i = 0; i < TOTAL_TIME_WAIT_CONNECT_MS; i += TIME_WAIT_CONNECT_CHECK_MS) {
- if (zoo.getState().equals(States.CONNECTED))
- break;
- try {
- Thread.sleep(TIME_WAIT_CONNECT_CHECK_MS);
- } catch (InterruptedException ex) {
- break;
- }
- }
- zoo.getChildren(path, true);
- }
-
- @Override
- public void flush() {
- if (!hosts.isEmpty())
- super.flush();
- }
-
- @Override
- void sendSpans() {
- if (hosts.isEmpty()) {
- if (!sendQueue.isEmpty()) {
- log.error("No hosts to send data to, dropping queued spans");
- synchronized (sendQueue) {
- sendQueue.clear();
- sendQueue.notifyAll();
- }
- }
- } else {
- super.sendSpans();
- }
- }
-
- synchronized private void updateHosts(String path, List<String> children) {
- log.debug("Scanning trace hosts in zookeeper: " + path);
- try {
- List<String> hosts = new ArrayList<String>();
- for (String child : children) {
- byte[] data = zoo.getData(path + "/" + child, null, null);
- hosts.add(new String(data, UTF_8));
- }
- this.hosts.clear();
- this.hosts.addAll(hosts);
- log.debug("Trace hosts: " + this.hosts);
- } catch (Exception ex) {
- log.error("unable to get destination hosts in zookeeper", ex);
- }
- }
-
- @Override
- synchronized protected String getSpanKey(Map<String,String> data) {
- if (hosts.size() > 0) {
- String host = hosts.get(random.nextInt(hosts.size()));
- log.debug("sending data to " + host);
- return host;
- }
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/thrift/Annotation.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/Annotation.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/Annotation.java
new file mode 100644
index 0000000..c00744e
--- /dev/null
+++ b/trace/src/main/java/org/apache/accumulo/trace/thrift/Annotation.java
@@ -0,0 +1,502 @@
+/*
+ * 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.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.trace.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 Annotation implements org.apache.thrift.TBase<Annotation, Annotation._Fields>, java.io.Serializable, Cloneable, Comparable<Annotation> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Annotation");
+
+ private static final org.apache.thrift.protocol.TField TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("time", org.apache.thrift.protocol.TType.I64, (short)1);
+ private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", 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 AnnotationStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new AnnotationTupleSchemeFactory());
+ }
+
+ public long time; // required
+ public String msg; // 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 {
+ TIME((short)1, "time"),
+ MSG((short)2, "msg");
+
+ 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: // TIME
+ return TIME;
+ case 2: // MSG
+ return MSG;
+ 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
+ private static final int __TIME_ISSET_ID = 0;
+ private byte __isset_bitfield = 0;
+ 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.TIME, new org.apache.thrift.meta_data.FieldMetaData("time", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", 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(Annotation.class, metaDataMap);
+ }
+
+ public Annotation() {
+ }
+
+ public Annotation(
+ long time,
+ String msg)
+ {
+ this();
+ this.time = time;
+ setTimeIsSet(true);
+ this.msg = msg;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public Annotation(Annotation other) {
+ __isset_bitfield = other.__isset_bitfield;
+ this.time = other.time;
+ if (other.isSetMsg()) {
+ this.msg = other.msg;
+ }
+ }
+
+ public Annotation deepCopy() {
+ return new Annotation(this);
+ }
+
+ @Override
+ public void clear() {
+ setTimeIsSet(false);
+ this.time = 0;
+ this.msg = null;
+ }
+
+ public long getTime() {
+ return this.time;
+ }
+
+ public Annotation setTime(long time) {
+ this.time = time;
+ setTimeIsSet(true);
+ return this;
+ }
+
+ public void unsetTime() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIME_ISSET_ID);
+ }
+
+ /** Returns true if field time is set (has been assigned a value) and false otherwise */
+ public boolean isSetTime() {
+ return EncodingUtils.testBit(__isset_bitfield, __TIME_ISSET_ID);
+ }
+
+ public void setTimeIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIME_ISSET_ID, value);
+ }
+
+ public String getMsg() {
+ return this.msg;
+ }
+
+ public Annotation setMsg(String msg) {
+ this.msg = msg;
+ return this;
+ }
+
+ public void unsetMsg() {
+ this.msg = null;
+ }
+
+ /** Returns true if field msg is set (has been assigned a value) and false otherwise */
+ public boolean isSetMsg() {
+ return this.msg != null;
+ }
+
+ public void setMsgIsSet(boolean value) {
+ if (!value) {
+ this.msg = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case TIME:
+ if (value == null) {
+ unsetTime();
+ } else {
+ setTime((Long)value);
+ }
+ break;
+
+ case MSG:
+ if (value == null) {
+ unsetMsg();
+ } else {
+ setMsg((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case TIME:
+ return Long.valueOf(getTime());
+
+ case MSG:
+ return getMsg();
+
+ }
+ 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 TIME:
+ return isSetTime();
+ case MSG:
+ return isSetMsg();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof Annotation)
+ return this.equals((Annotation)that);
+ return false;
+ }
+
+ public boolean equals(Annotation that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_time = true;
+ boolean that_present_time = true;
+ if (this_present_time || that_present_time) {
+ if (!(this_present_time && that_present_time))
+ return false;
+ if (this.time != that.time)
+ return false;
+ }
+
+ boolean this_present_msg = true && this.isSetMsg();
+ boolean that_present_msg = true && that.isSetMsg();
+ if (this_present_msg || that_present_msg) {
+ if (!(this_present_msg && that_present_msg))
+ return false;
+ if (!this.msg.equals(that.msg))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(Annotation other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetTime()).compareTo(other.isSetTime());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTime()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time, other.time);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetMsg()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+ 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("Annotation(");
+ boolean first = true;
+
+ sb.append("time:");
+ sb.append(this.time);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("msg:");
+ if (this.msg == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.msg);
+ }
+ 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 {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bitfield = 0;
+ 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 AnnotationStandardSchemeFactory implements SchemeFactory {
+ public AnnotationStandardScheme getScheme() {
+ return new AnnotationStandardScheme();
+ }
+ }
+
+ private static class AnnotationStandardScheme extends StandardScheme<Annotation> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Annotation 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: // TIME
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.time = iprot.readI64();
+ struct.setTimeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // MSG
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.msg = iprot.readString();
+ struct.setMsgIsSet(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, Annotation struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldBegin(TIME_FIELD_DESC);
+ oprot.writeI64(struct.time);
+ oprot.writeFieldEnd();
+ if (struct.msg != null) {
+ oprot.writeFieldBegin(MSG_FIELD_DESC);
+ oprot.writeString(struct.msg);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class AnnotationTupleSchemeFactory implements SchemeFactory {
+ public AnnotationTupleScheme getScheme() {
+ return new AnnotationTupleScheme();
+ }
+ }
+
+ private static class AnnotationTupleScheme extends TupleScheme<Annotation> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, Annotation struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetTime()) {
+ optionals.set(0);
+ }
+ if (struct.isSetMsg()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetTime()) {
+ oprot.writeI64(struct.time);
+ }
+ if (struct.isSetMsg()) {
+ oprot.writeString(struct.msg);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, Annotation struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.time = iprot.readI64();
+ struct.setTimeIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.msg = iprot.readString();
+ struct.setMsgIsSet(true);
+ }
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
index 416ae17..bfe183d 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
@@ -59,7 +59,8 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.I64, (short)6);
private static final org.apache.thrift.protocol.TField STOP_FIELD_DESC = new org.apache.thrift.protocol.TField("stop", org.apache.thrift.protocol.TType.I64, (short)7);
private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)8);
- private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("data", org.apache.thrift.protocol.TType.MAP, (short)9);
+ private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("data", org.apache.thrift.protocol.TType.MAP, (short)10);
+ private static final org.apache.thrift.protocol.TField ANNOTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("annotations", org.apache.thrift.protocol.TType.LIST, (short)11);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -75,7 +76,8 @@ import org.slf4j.LoggerFactory;
public long start; // required
public long stop; // required
public String description; // required
- public Map<String,String> data; // required
+ public Map<ByteBuffer,ByteBuffer> data; // required
+ public List<Annotation> annotations; // 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 {
@@ -87,7 +89,8 @@ import org.slf4j.LoggerFactory;
START((short)6, "start"),
STOP((short)7, "stop"),
DESCRIPTION((short)8, "description"),
- DATA((short)9, "data");
+ DATA((short)10, "data"),
+ ANNOTATIONS((short)11, "annotations");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -118,8 +121,10 @@ import org.slf4j.LoggerFactory;
return STOP;
case 8: // DESCRIPTION
return DESCRIPTION;
- case 9: // DATA
+ case 10: // DATA
return DATA;
+ case 11: // ANNOTATIONS
+ return ANNOTATIONS;
default:
return null;
}
@@ -187,8 +192,11 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.DATA, new org.apache.thrift.meta_data.FieldMetaData("data", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true),
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))));
+ tmpMap.put(_Fields.ANNOTATIONS, new org.apache.thrift.meta_data.FieldMetaData("annotations", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Annotation.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RemoteSpan.class, metaDataMap);
}
@@ -205,7 +213,8 @@ import org.slf4j.LoggerFactory;
long start,
long stop,
String description,
- Map<String,String> data)
+ Map<ByteBuffer,ByteBuffer> data,
+ List<Annotation> annotations)
{
this();
this.sender = sender;
@@ -222,6 +231,7 @@ import org.slf4j.LoggerFactory;
setStopIsSet(true);
this.description = description;
this.data = data;
+ this.annotations = annotations;
}
/**
@@ -244,9 +254,16 @@ import org.slf4j.LoggerFactory;
this.description = other.description;
}
if (other.isSetData()) {
- Map<String,String> __this__data = new HashMap<String,String>(other.data);
+ Map<ByteBuffer,ByteBuffer> __this__data = new HashMap<ByteBuffer,ByteBuffer>(other.data);
this.data = __this__data;
}
+ if (other.isSetAnnotations()) {
+ List<Annotation> __this__annotations = new ArrayList<Annotation>(other.annotations.size());
+ for (Annotation other_element : other.annotations) {
+ __this__annotations.add(new Annotation(other_element));
+ }
+ this.annotations = __this__annotations;
+ }
}
public RemoteSpan deepCopy() {
@@ -269,6 +286,7 @@ import org.slf4j.LoggerFactory;
this.stop = 0;
this.description = null;
this.data = null;
+ this.annotations = null;
}
public String getSender() {
@@ -462,18 +480,18 @@ import org.slf4j.LoggerFactory;
return (this.data == null) ? 0 : this.data.size();
}
- public void putToData(String key, String val) {
+ public void putToData(ByteBuffer key, ByteBuffer val) {
if (this.data == null) {
- this.data = new HashMap<String,String>();
+ this.data = new HashMap<ByteBuffer,ByteBuffer>();
}
this.data.put(key, val);
}
- public Map<String,String> getData() {
+ public Map<ByteBuffer,ByteBuffer> getData() {
return this.data;
}
- public RemoteSpan setData(Map<String,String> data) {
+ public RemoteSpan setData(Map<ByteBuffer,ByteBuffer> data) {
this.data = data;
return this;
}
@@ -493,6 +511,45 @@ import org.slf4j.LoggerFactory;
}
}
+ public int getAnnotationsSize() {
+ return (this.annotations == null) ? 0 : this.annotations.size();
+ }
+
+ public java.util.Iterator<Annotation> getAnnotationsIterator() {
+ return (this.annotations == null) ? null : this.annotations.iterator();
+ }
+
+ public void addToAnnotations(Annotation elem) {
+ if (this.annotations == null) {
+ this.annotations = new ArrayList<Annotation>();
+ }
+ this.annotations.add(elem);
+ }
+
+ public List<Annotation> getAnnotations() {
+ return this.annotations;
+ }
+
+ public RemoteSpan setAnnotations(List<Annotation> annotations) {
+ this.annotations = annotations;
+ return this;
+ }
+
+ public void unsetAnnotations() {
+ this.annotations = null;
+ }
+
+ /** Returns true if field annotations is set (has been assigned a value) and false otherwise */
+ public boolean isSetAnnotations() {
+ return this.annotations != null;
+ }
+
+ public void setAnnotationsIsSet(boolean value) {
+ if (!value) {
+ this.annotations = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case SENDER:
@@ -563,7 +620,15 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetData();
} else {
- setData((Map<String,String>)value);
+ setData((Map<ByteBuffer,ByteBuffer>)value);
+ }
+ break;
+
+ case ANNOTATIONS:
+ if (value == null) {
+ unsetAnnotations();
+ } else {
+ setAnnotations((List<Annotation>)value);
}
break;
@@ -599,6 +664,9 @@ import org.slf4j.LoggerFactory;
case DATA:
return getData();
+ case ANNOTATIONS:
+ return getAnnotations();
+
}
throw new IllegalStateException();
}
@@ -628,6 +696,8 @@ import org.slf4j.LoggerFactory;
return isSetDescription();
case DATA:
return isSetData();
+ case ANNOTATIONS:
+ return isSetAnnotations();
}
throw new IllegalStateException();
}
@@ -726,6 +796,15 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_annotations = true && this.isSetAnnotations();
+ boolean that_present_annotations = true && that.isSetAnnotations();
+ if (this_present_annotations || that_present_annotations) {
+ if (!(this_present_annotations && that_present_annotations))
+ return false;
+ if (!this.annotations.equals(that.annotations))
+ return false;
+ }
+
return true;
}
@@ -832,6 +911,16 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetAnnotations()).compareTo(other.isSetAnnotations());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAnnotations()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.annotations, other.annotations);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -903,6 +992,14 @@ import org.slf4j.LoggerFactory;
sb.append(this.data);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("annotations:");
+ if (this.annotations == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.annotations);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -1012,17 +1109,17 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // DATA
+ case 10: // DATA
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
- struct.data = new HashMap<String,String>(2*_map0.size);
+ struct.data = new HashMap<ByteBuffer,ByteBuffer>(2*_map0.size);
for (int _i1 = 0; _i1 < _map0.size; ++_i1)
{
- String _key2;
- String _val3;
- _key2 = iprot.readString();
- _val3 = iprot.readString();
+ ByteBuffer _key2;
+ ByteBuffer _val3;
+ _key2 = iprot.readBinary();
+ _val3 = iprot.readBinary();
struct.data.put(_key2, _val3);
}
iprot.readMapEnd();
@@ -1032,6 +1129,25 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 11: // ANNOTATIONS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
+ struct.annotations = new ArrayList<Annotation>(_list4.size);
+ for (int _i5 = 0; _i5 < _list4.size; ++_i5)
+ {
+ Annotation _elem6;
+ _elem6 = new Annotation();
+ _elem6.read(iprot);
+ struct.annotations.add(_elem6);
+ }
+ iprot.readListEnd();
+ }
+ struct.setAnnotationsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1081,15 +1197,27 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(DATA_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.data.size()));
- for (Map.Entry<String, String> _iter4 : struct.data.entrySet())
+ for (Map.Entry<ByteBuffer, ByteBuffer> _iter7 : struct.data.entrySet())
{
- oprot.writeString(_iter4.getKey());
- oprot.writeString(_iter4.getValue());
+ oprot.writeBinary(_iter7.getKey());
+ oprot.writeBinary(_iter7.getValue());
}
oprot.writeMapEnd();
}
oprot.writeFieldEnd();
}
+ if (struct.annotations != null) {
+ oprot.writeFieldBegin(ANNOTATIONS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.annotations.size()));
+ for (Annotation _iter8 : struct.annotations)
+ {
+ _iter8.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1135,7 +1263,10 @@ import org.slf4j.LoggerFactory;
if (struct.isSetData()) {
optionals.set(8);
}
- oprot.writeBitSet(optionals, 9);
+ if (struct.isSetAnnotations()) {
+ optionals.set(9);
+ }
+ oprot.writeBitSet(optionals, 10);
if (struct.isSetSender()) {
oprot.writeString(struct.sender);
}
@@ -1163,10 +1294,19 @@ import org.slf4j.LoggerFactory;
if (struct.isSetData()) {
{
oprot.writeI32(struct.data.size());
- for (Map.Entry<String, String> _iter5 : struct.data.entrySet())
+ for (Map.Entry<ByteBuffer, ByteBuffer> _iter9 : struct.data.entrySet())
{
- oprot.writeString(_iter5.getKey());
- oprot.writeString(_iter5.getValue());
+ oprot.writeBinary(_iter9.getKey());
+ oprot.writeBinary(_iter9.getValue());
+ }
+ }
+ }
+ if (struct.isSetAnnotations()) {
+ {
+ oprot.writeI32(struct.annotations.size());
+ for (Annotation _iter10 : struct.annotations)
+ {
+ _iter10.write(oprot);
}
}
}
@@ -1175,7 +1315,7 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, RemoteSpan struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(9);
+ BitSet incoming = iprot.readBitSet(10);
if (incoming.get(0)) {
struct.sender = iprot.readString();
struct.setSenderIsSet(true);
@@ -1210,19 +1350,33 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(8)) {
{
- org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.data = new HashMap<String,String>(2*_map6.size);
- for (int _i7 = 0; _i7 < _map6.size; ++_i7)
+ org.apache.thrift.protocol.TMap _map11 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.data = new HashMap<ByteBuffer,ByteBuffer>(2*_map11.size);
+ for (int _i12 = 0; _i12 < _map11.size; ++_i12)
{
- String _key8;
- String _val9;
- _key8 = iprot.readString();
- _val9 = iprot.readString();
- struct.data.put(_key8, _val9);
+ ByteBuffer _key13;
+ ByteBuffer _val14;
+ _key13 = iprot.readBinary();
+ _val14 = iprot.readBinary();
+ struct.data.put(_key13, _val14);
}
}
struct.setDataIsSet(true);
}
+ if (incoming.get(9)) {
+ {
+ org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.annotations = new ArrayList<Annotation>(_list15.size);
+ for (int _i16 = 0; _i16 < _list15.size; ++_i16)
+ {
+ Annotation _elem17;
+ _elem17 = new Annotation();
+ _elem17.read(iprot);
+ struct.annotations.add(_elem17);
+ }
+ }
+ struct.setAnnotationsIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/thrift/trace.thrift
----------------------------------------------------------------------
diff --git a/trace/src/main/thrift/trace.thrift b/trace/src/main/thrift/trace.thrift
index 76bcafe..b7e0abf 100644
--- a/trace/src/main/thrift/trace.thrift
+++ b/trace/src/main/thrift/trace.thrift
@@ -17,6 +17,11 @@
namespace java org.apache.accumulo.trace.thrift
namespace cpp org.apache.accumulo.trace.thrift
+struct Annotation {
+ 1:i64 time,
+ 2:string msg
+}
+
struct RemoteSpan {
1:string sender,
2:string svc,
@@ -26,7 +31,8 @@ struct RemoteSpan {
6:i64 start,
7:i64 stop,
8:string description,
- 9:map<string, string> data
+ 10:map<binary, binary> data,
+ 11:list<Annotation> annotations
}
struct TInfo {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
----------------------------------------------------------------------
diff --git a/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java b/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
index f338bd8..4afdebe 100644
--- a/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
+++ b/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.ArrayList;
@@ -30,7 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import org.apache.accumulo.trace.instrument.receivers.SpanReceiver;
import org.apache.accumulo.trace.instrument.thrift.TraceWrap;
import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.accumulo.trace.thrift.TestService;
@@ -43,13 +43,17 @@ import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
+import org.htrace.HTraceConfiguration;
+import org.htrace.Sampler;
+import org.htrace.SpanReceiver;
+import org.htrace.wrappers.TraceProxy;
import org.junit.Before;
import org.junit.Test;
public class TracerTest {
static class SpanStruct {
- public SpanStruct(long traceId, long spanId, long parentId, long start, long stop, String description, Map<String,String> data) {
+ public SpanStruct(long traceId, long spanId, long parentId, long start, long stop, String description, Map<byte[],byte[]> data) {
super();
this.traceId = traceId;
this.spanId = spanId;
@@ -66,7 +70,7 @@ public class TracerTest {
public long start;
public long stop;
public String description;
- public Map<String,String> data;
+ public Map<byte[],byte[]> data;
public long millis() {
return stop - start;
@@ -77,21 +81,29 @@ public class TracerTest {
public Map<Long,List<SpanStruct>> traces = new HashMap<Long,List<SpanStruct>>();
@Override
- public void span(long traceId, long spanId, long parentId, long start, long stop, String description, Map<String,String> data) {
- SpanStruct span = new SpanStruct(traceId, spanId, parentId, start, stop, description, data);
+ public void receiveSpan(org.htrace.Span s) {
+ long traceId = s.getTraceId();
+ SpanStruct span = new SpanStruct(traceId, s.getSpanId(), s.getParentId(), s.getStartTimeMillis(), s.getStopTimeMillis(), s.getDescription(),
+ s.getKVAnnotations());
if (!traces.containsKey(traceId))
traces.put(traceId, new ArrayList<SpanStruct>());
traces.get(traceId).add(span);
}
@Override
- public void flush() {}
+ public void configure(HTraceConfiguration conf) {
+ }
+
+ @Override
+ public void close() throws IOException {
+ }
}
+ @SuppressWarnings("deprecation")
@Test
public void testTrace() throws Exception {
TestReceiver tracer = new TestReceiver();
- Tracer.getInstance().addReceiver(tracer);
+ org.htrace.Trace.addReceiver(tracer);
assertFalse(Trace.isTracing());
Trace.start("nop").stop();
@@ -103,12 +115,12 @@ public class TracerTest {
assertFalse(Trace.isTracing());
Span start = Trace.on("testing");
- assertEquals(Trace.currentTrace(), start);
+ assertEquals(Trace.currentTrace().getSpan(), start.getScope().getSpan());
assertTrue(Trace.isTracing());
- Trace.start("shortest trace ever");
- Trace.currentTrace().stop();
- long traceId = Trace.currentTrace().traceId();
+ Span span = Trace.start("shortest trace ever");
+ span.stop();
+ long traceId = Trace.currentTraceId();
assertNotNull(tracer.traces.get(traceId));
assertTrue(tracer.traces.get(traceId).size() == 1);
assertEquals("shortest trace ever", tracer.traces.get(traceId).get(0).description);
@@ -149,7 +161,7 @@ public class TracerTest {
@Test
public void testThrift() throws Exception {
TestReceiver tracer = new TestReceiver();
- Tracer.getInstance().addReceiver(tracer);
+ org.htrace.Trace.addReceiver(tracer);
ServerSocket socket = new ServerSocket(0);
TServerSocket transport = new TServerSocket(socket);
@@ -195,25 +207,26 @@ public class TracerTest {
}
/**
- * Verify that exceptions propagate up through the trace wrapping with sampling enabled, instead of seeing the reflexive exceptions.
+ * Verify that exceptions propagate up through the trace wrapping with sampling enabled, as the cause of the reflexive exceptions.
*/
@Test(expected = IOException.class)
- public void testTracedException() throws Exception {
- TraceProxy.trace(callable).call();
+ public void testTracedException() throws Throwable {
+ try {
+ TraceProxy.trace(callable).call();
+ } catch (InvocationTargetException e) {
+ throw e.getCause();
+ }
}
/**
- * Verify that exceptions propagate up through the trace wrapping with sampling disabled, instead of seeing the reflexive exceptions.
+ * Verify that exceptions propagate up through the trace wrapping with sampling disabled, as the cause of the reflexive exceptions.
*/
@Test(expected = IOException.class)
- public void testUntracedException() throws Exception {
- Sampler never = new Sampler() {
- @Override
- public boolean next() {
- return false;
- }
- };
-
- TraceProxy.trace(callable, never).call();
+ public void testUntracedException() throws Throwable {
+ try {
+ TraceProxy.trace(callable, Sampler.NEVER).call();
+ } catch (InvocationTargetException e) {
+ throw e.getCause();
+ }
}
}
[15/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
ACCUMULO-898 refactoring and deprecation of old tracing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6b5f5ef4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b5f5ef4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6b5f5ef4
Branch: refs/heads/master
Commit: 6b5f5ef474f8df26414da46f7c385072a9f4dbce
Parents: db2dda1
Author: Billie Rinaldi <bi...@apache.org>
Authored: Thu Nov 6 14:55:32 2014 -0800
Committer: Billie Rinaldi <bi...@apache.org>
Committed: Fri Nov 7 14:36:57 2014 -0800
----------------------------------------------------------------------
assemble/pom.xml | 4 -
core/pom.xml | 4 -
.../apache/accumulo/core/cli/ClientOpts.java | 2 +-
.../core/client/impl/ConditionalWriterImpl.java | 6 +-
.../core/client/impl/ConnectorImpl.java | 2 +-
.../client/impl/InstanceOperationsImpl.java | 2 +-
.../client/impl/NamespaceOperationsImpl.java | 2 +-
.../client/impl/ReplicationOperationsImpl.java | 2 +-
.../client/impl/SecurityOperationsImpl.java | 2 +-
.../core/client/impl/TableOperationsImpl.java | 2 +-
.../impl/TabletServerBatchReaderIterator.java | 4 +-
.../client/impl/TabletServerBatchWriter.java | 8 +-
.../core/client/impl/ThriftScanner.java | 8 +-
.../accumulo/core/client/impl/Writer.java | 2 +-
.../core/client/impl/thrift/ClientService.java | 800 +++++-----
.../org/apache/accumulo/core/conf/Property.java | 2 +-
.../core/gc/thrift/GCMonitorService.java | 32 +-
.../core/master/thrift/FateService.java | 128 +-
.../core/master/thrift/MasterClientService.java | 480 +++---
.../thrift/TabletClientService.java | 960 ++++++------
.../accumulo/core/trace/AsyncSpanReceiver.java | 173 ---
.../accumulo/core/trace/CountSampler.java | 23 +
.../accumulo/core/trace/DistributedTrace.java | 1 -
.../accumulo/core/trace/SendSpansViaThrift.java | 97 --
.../org/apache/accumulo/core/trace/Span.java | 148 ++
.../apache/accumulo/core/trace/SpanTree.java | 77 -
.../accumulo/core/trace/SpanTreeVisitor.java | 26 -
.../org/apache/accumulo/core/trace/Trace.java | 135 ++
.../apache/accumulo/core/trace/TraceDump.java | 162 --
.../accumulo/core/trace/TraceFormatter.java | 126 --
.../org/apache/accumulo/core/trace/Tracer.java | 35 +
.../accumulo/core/trace/ZooTraceClient.java | 123 --
.../accumulo/core/trace/thrift/TInfo.java | 496 +++++++
.../wrappers/RpcClientInvocationHandler.java | 54 +
.../wrappers/RpcServerInvocationHandler.java | 53 +
.../core/trace/wrappers/TraceCallable.java | 69 +
.../trace/wrappers/TraceExecutorService.java | 123 ++
.../core/trace/wrappers/TraceRunnable.java | 79 +
.../accumulo/core/trace/wrappers/TraceWrap.java | 57 +
.../accumulo/core/util/NamingThreadFactory.java | 2 +-
.../apache/accumulo/core/util/ThriftUtil.java | 4 +-
core/src/main/scripts/generate-thrift.sh | 4 +-
core/src/main/thrift/trace.thrift | 23 +
.../accumulo/core/trace/PerformanceTest.java | 51 +
examples/simple/pom.xml | 2 +-
.../simple/client/TraceDumpExample.java | 4 +-
.../impl/MiniAccumuloClusterImpl.java | 2 +-
server/base/pom.xml | 4 -
.../accumulo/server/client/BulkImporter.java | 4 +-
.../server/client/ClientServiceHandler.java | 2 +-
.../accumulo/server/master/LiveTServerSet.java | 2 +-
.../server/master/balancer/TabletBalancer.java | 2 +-
.../org/apache/accumulo/server/util/Admin.java | 2 +-
.../apache/accumulo/server/util/RpcWrapper.java | 4 +-
.../server/util/VerifyTabletAssignments.java | 4 +-
server/gc/pom.xml | 4 -
.../gc/GarbageCollectWriteAheadLogs.java | 6 +-
.../accumulo/gc/GarbageCollectionAlgorithm.java | 4 +-
.../accumulo/gc/SimpleGarbageCollector.java | 8 +-
.../CloseWriteAheadLogReferences.java | 4 +-
.../accumulo/gc/SimpleGarbageCollectorTest.java | 2 +-
server/master/pom.xml | 4 -
.../accumulo/master/FateServiceHandler.java | 2 +-
.../java/org/apache/accumulo/master/Master.java | 2 +-
.../master/MasterClientServiceHandler.java | 2 +-
.../master/metrics/ReplicationMetrics.java | 2 +-
.../master/replication/ReplicationDriver.java | 4 +-
.../master/replication/StatusMaker.java | 4 +-
.../accumulo/master/replication/WorkMaker.java | 4 +-
.../accumulo/master/tableOps/BulkImport.java | 4 +-
.../accumulo/master/tableOps/TraceRepo.java | 8 +-
server/monitor/pom.xml | 2 +-
.../org/apache/accumulo/monitor/Monitor.java | 4 +-
.../monitor/servlets/TServersServlet.java | 2 +-
.../accumulo/monitor/servlets/trace/Basic.java | 2 +-
.../monitor/servlets/trace/ListType.java | 4 +-
.../monitor/servlets/trace/ShowTrace.java | 12 +-
.../servlets/trace/ShowTraceLinkType.java | 4 +-
.../monitor/servlets/trace/Summary.java | 4 +-
.../accumulo/monitor/ShowTraceLinkTypeTest.java | 4 +-
server/tracer/pom.xml | 50 +-
.../tracer/src/main/findbugs/exclude-filter.xml | 21 +
.../accumulo/tracer/AsyncSpanReceiver.java | 174 +++
.../accumulo/tracer/SendSpansViaThrift.java | 97 ++
.../org/apache/accumulo/tracer/SpanTree.java | 76 +
.../apache/accumulo/tracer/SpanTreeVisitor.java | 25 +
.../org/apache/accumulo/tracer/TraceDump.java | 162 ++
.../apache/accumulo/tracer/TraceFormatter.java | 126 ++
.../org/apache/accumulo/tracer/TraceServer.java | 9 +-
.../apache/accumulo/tracer/ZooTraceClient.java | 124 ++
.../accumulo/tracer/thrift/Annotation.java | 502 +++++++
.../accumulo/tracer/thrift/RemoteSpan.java | 1384 ++++++++++++++++++
.../accumulo/tracer/thrift/SpanReceiver.java | 588 ++++++++
.../accumulo/tracer/thrift/TestService.java | 1084 ++++++++++++++
.../tracer/src/main/scripts/generate-thrift.sh | 24 +
server/tracer/src/main/thrift/tracer.thrift | 47 +
.../org/apache/accumulo/tracer/TracerTest.java | 234 +++
server/tserver/pom.xml | 4 -
.../apache/accumulo/tserver/TabletServer.java | 6 +-
.../tserver/TabletServerResourceManager.java | 2 +-
.../mastermessage/SplitReportMessage.java | 2 +-
.../mastermessage/TabletStatusMessage.java | 2 +-
.../replication/AccumuloReplicaSystem.java | 4 +-
.../accumulo/tserver/tablet/Compactor.java | 4 +-
.../tserver/tablet/DatafileManager.java | 4 +-
.../tserver/tablet/MinorCompactionTask.java | 4 +-
.../apache/accumulo/tserver/tablet/Tablet.java | 4 +-
shell/pom.xml | 2 +-
.../accumulo/shell/commands/TraceCommand.java | 6 +-
.../apache/accumulo/test/GetMasterStats.java | 2 +-
.../org/apache/accumulo/test/VerifyIngest.java | 2 +-
.../apache/accumulo/test/WrongTabletTest.java | 2 +-
.../test/continuous/ContinuousIngest.java | 4 +-
.../continuous/ContinuousStatsCollector.java | 2 +-
.../test/continuous/ContinuousWalk.java | 4 +-
.../accumulo/test/functional/ZombieTServer.java | 4 +-
.../test/performance/thrift/NullTserver.java | 2 +-
.../test/randomwalk/concurrent/Shutdown.java | 2 +-
.../test/randomwalk/concurrent/StartAll.java | 2 +-
.../accumulo/test/ConditionalWriterIT.java | 8 +-
.../functional/BalanceAfterCommsFailureIT.java | 2 +-
.../test/functional/DynamicThreadPoolsIT.java | 2 +-
.../test/functional/MetadataMaxFiles.java | 2 +-
.../functional/SimpleBalancerFairnessIT.java | 2 +-
trace/pom.xml | 64 +-
trace/src/main/findbugs/exclude-filter.xml | 21 -
.../trace/instrument/CloudtraceSpan.java | 3 +-
.../accumulo/trace/instrument/CountSampler.java | 3 +-
.../accumulo/trace/instrument/Sampler.java | 3 +-
.../apache/accumulo/trace/instrument/Span.java | 122 +-
.../apache/accumulo/trace/instrument/Trace.java | 105 +-
.../trace/instrument/TraceCallable.java | 69 -
.../trace/instrument/TraceExecutorService.java | 123 --
.../trace/instrument/TraceRunnable.java | 79 -
.../accumulo/trace/instrument/Tracer.java | 35 -
.../thrift/RpcClientInvocationHandler.java | 54 -
.../thrift/RpcServerInvocationHandler.java | 53 -
.../trace/instrument/thrift/TraceWrap.java | 57 -
.../accumulo/trace/thrift/Annotation.java | 502 -------
.../accumulo/trace/thrift/RemoteSpan.java | 1384 ------------------
.../accumulo/trace/thrift/SpanReceiver.java | 588 --------
.../org/apache/accumulo/trace/thrift/TInfo.java | 481 +-----
.../accumulo/trace/thrift/TestService.java | 1084 --------------
trace/src/main/scripts/generate-thrift.sh | 24 -
trace/src/main/thrift/trace.thrift | 51 -
.../trace/instrument/CountSamplerTest.java | 39 -
.../trace/instrument/PerformanceTest.java | 51 -
.../accumulo/trace/instrument/TracerTest.java | 232 ---
148 files changed, 7440 insertions(+), 7327 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index c764091..0999555 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -114,10 +114,6 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1cbc6df..5fc7a6e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -79,10 +79,6 @@
<artifactId>accumulo-start</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index 10a5e08..a6a5e81 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -41,9 +41,9 @@ import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.volume.VolumeConfiguration;
import org.apache.accumulo.core.zookeeper.ZooUtil;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index a896be8..cb0b90e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -69,6 +69,9 @@ import org.apache.accumulo.core.security.VisibilityEvaluator;
import org.apache.accumulo.core.security.VisibilityParseException;
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.BadArgumentException;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.LoggingRunnable;
@@ -78,9 +81,6 @@ import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
import org.apache.accumulo.fate.zookeeper.ZooLock;
import org.apache.accumulo.fate.zookeeper.ZooUtil.LockID;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.commons.collections.map.LRUMap;
import org.apache.commons.lang.mutable.MutableLong;
import org.apache.hadoop.io.Text;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
index 62ab6a4..2d077d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
@@ -44,7 +44,7 @@ import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
import org.apache.accumulo.core.master.state.tables.TableState;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
-import org.apache.accumulo.trace.instrument.Tracer;
+import org.apache.accumulo.core.trace.Tracer;
public class ConnectorImpl extends Connector {
private final Instance instance;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
index 30c15ed..9848612 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
@@ -40,12 +40,12 @@ import org.apache.accumulo.core.master.thrift.MasterClientService;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooCache;
import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index 7087ac5..f756ef1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@ -48,8 +48,8 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.master.thrift.FateOperation;
import org.apache.accumulo.core.master.thrift.MasterClientService;
import org.apache.accumulo.core.security.Credentials;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.OpTimer;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
index cd57c2f..e45bcc9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
@@ -51,8 +51,8 @@ import org.apache.accumulo.core.replication.proto.Replication.Status;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java
index e9c057e..8a17a77 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java
@@ -36,8 +36,8 @@ import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.ByteBufferUtil;
-import org.apache.accumulo.trace.instrument.Tracer;
public class SecurityOperationsImpl implements SecurityOperations {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 9204965..3c450c3 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -95,6 +95,7 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.LocalityGroupUtil;
@@ -106,7 +107,6 @@ import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.volume.VolumeConfiguration;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
index e0aa30a..0cb9f7f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
@@ -60,11 +60,11 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.wrappers.TraceRunnable;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.OpTimer;
import org.apache.accumulo.core.util.ThriftUtil;
-import org.apache.accumulo.trace.instrument.TraceRunnable;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 475d04d..a73fdec 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -62,12 +62,12 @@ import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.SimpleThreadPool;
import org.apache.accumulo.core.util.ThriftUtil;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TApplicationException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
index c49330e..8e601d2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
@@ -55,12 +55,12 @@ import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.OpTimer;
import org.apache.accumulo.core.util.ThriftUtil;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
index a38822b..7b307d8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
@@ -33,9 +33,9 @@ import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TDurability;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
[09/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 60762be..c21a168 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -76,10 +76,6 @@
<artifactId>accumulo-start</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index 756d79b..a2ff172 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -54,6 +54,8 @@ import org.apache.accumulo.core.file.FileSKVIterator;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.wrappers.TraceRunnable;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.LoggingRunnable;
import org.apache.accumulo.core.util.NamingThreadFactory;
@@ -64,8 +66,6 @@ import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.util.FileUtil;
-import org.apache.accumulo.trace.instrument.TraceRunnable;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index 83d02db..d5349ba 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -54,6 +54,7 @@ import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
@@ -61,7 +62,6 @@ import org.apache.accumulo.server.security.SecurityOperation;
import org.apache.accumulo.server.util.TableDiskUsage;
import org.apache.accumulo.server.zookeeper.TransactionWatcher;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index e577153..3388b5b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -34,6 +34,7 @@ import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.ThriftUtil;
@@ -45,7 +46,6 @@ import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooCache;
import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
index 59d3e0b..30a2460 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
@@ -29,13 +29,13 @@ import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.master.state.TabletMigration;
import org.apache.accumulo.server.security.SystemCredentials;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransportException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index 23bb021..254b62c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -47,11 +47,11 @@ import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.accumulo.server.security.SystemCredentials;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java
index 02bd1ef..2464a15 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java
@@ -20,8 +20,8 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.apache.accumulo.trace.instrument.thrift.RpcServerInvocationHandler;
-import org.apache.accumulo.trace.instrument.thrift.TraceWrap;
+import org.apache.accumulo.core.trace.wrappers.RpcServerInvocationHandler;
+import org.apache.accumulo.core.trace.wrappers.TraceWrap;
import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
index 0fbeb6b..50d7014 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
@@ -48,11 +48,11 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.Tracer;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/gc/pom.xml
----------------------------------------------------------------------
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index 8194121..9602b95 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -52,10 +52,6 @@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 4c0a3a9..e96fee3 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -54,6 +54,9 @@ import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -63,9 +66,6 @@ import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 0f5cada..56fbefe 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -40,9 +40,9 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Da
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ScanFileColumnFamily;
import org.apache.accumulo.core.replication.StatusUtil;
import org.apache.accumulo.core.replication.proto.Replication.Status;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.server.ServerConstants;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 720d18b..d7ff148 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -69,7 +69,11 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.security.SecurityUtil;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.CountSampler;
import org.apache.accumulo.core.trace.DistributedTrace;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.NamingThreadFactory;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.ServerServices;
@@ -97,10 +101,6 @@ import org.apache.accumulo.server.util.RpcWrapper;
import org.apache.accumulo.server.util.TServerUtils;
import org.apache.accumulo.server.util.TabletIterator;
import org.apache.accumulo.server.zookeeper.ZooLock;
-import org.apache.accumulo.trace.instrument.CountSampler;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
index 1c94253..bfa53ae 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
@@ -44,8 +44,8 @@ import org.apache.accumulo.core.replication.proto.Replication.Status;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
index a72eb5d..6195f42 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
@@ -35,9 +35,9 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.gc.SimpleGarbageCollector.Opts;
import org.apache.accumulo.server.fs.VolumeManager;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.fs.Path;
import org.easymock.EasyMock;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/pom.xml
----------------------------------------------------------------------
diff --git a/server/master/pom.xml b/server/master/pom.xml
index 3b9684c..7e9ab1d 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -56,10 +56,6 @@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
index 891f267..bdb5e2f 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
@@ -47,6 +47,7 @@ import org.apache.accumulo.core.iterators.IteratorUtil;
import org.apache.accumulo.core.master.thrift.FateOperation;
import org.apache.accumulo.core.master.thrift.FateService;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.Validator;
import org.apache.accumulo.fate.ReadOnlyTStore.TStatus;
@@ -68,7 +69,6 @@ import org.apache.accumulo.master.tableOps.TraceRepo;
import org.apache.accumulo.server.client.ClientServiceHandler;
import org.apache.accumulo.server.master.state.MergeInfo;
import org.apache.accumulo.server.util.TablePropUtil;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index bbd2396..93691fb 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -70,6 +70,7 @@ import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SecurityUtil;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.trace.DistributedTrace;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.Daemon;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -129,7 +130,6 @@ import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
import org.apache.accumulo.start.classloader.vfs.ContextManager;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index a3eb70d..2007b36 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -59,6 +59,7 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -81,7 +82,6 @@ import org.apache.accumulo.server.util.TableInfoUtil;
import org.apache.accumulo.server.util.TablePropUtil;
import org.apache.accumulo.server.util.TabletIterator.TabletDeletedException;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java b/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java
index 1554f52..762b18d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java
@@ -30,11 +30,11 @@ import org.apache.accumulo.core.master.thrift.MasterClientService;
import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.accumulo.core.replication.ReplicationTarget;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.metrics.AbstractMetricsImpl;
import org.apache.accumulo.server.replication.ReplicationUtil;
import org.apache.accumulo.server.security.SystemCredentials;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java b/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
index e3bbafa..ea378f4 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
@@ -21,11 +21,11 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.trace.CountSampler;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.Daemon;
import org.apache.accumulo.fate.util.UtilWaitThread;
import org.apache.accumulo.master.Master;
-import org.apache.accumulo.trace.instrument.CountSampler;
-import org.apache.accumulo.trace.instrument.Trace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java b/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
index 3f831a8..c7f47e4 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
@@ -39,8 +39,8 @@ import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
import org.apache.accumulo.core.replication.proto.Replication.Status;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java
index f4fd676..e2ac08b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java
@@ -37,10 +37,10 @@ import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
import org.apache.accumulo.core.replication.ReplicationTarget;
import org.apache.accumulo.core.replication.StatusUtil;
import org.apache.accumulo.core.replication.proto.Replication.Status;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.accumulo.server.conf.TableConfiguration;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index ce25310..66c3fcc 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -60,6 +60,8 @@ import org.apache.accumulo.core.master.state.tables.TableState;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.trace.wrappers.TraceExecutorService;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.SimpleThreadPool;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -76,8 +78,6 @@ import org.apache.accumulo.server.tablets.UniqueNameAllocator;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.DistributedWorkQueue;
import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
-import org.apache.accumulo.trace.instrument.TraceExecutorService;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
index 9b1a735..2571030 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java
@@ -16,11 +16,11 @@
*/
package org.apache.accumulo.master.tableOps;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.trace.thrift.TInfo;
/**
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index a847183..ba61aeb 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
+ <artifactId>accumulo-tracer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 7fe1af7..8bc255d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -47,6 +47,8 @@ import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.security.SecurityUtil;
import org.apache.accumulo.core.tabletserver.thrift.ActiveScan;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
+import org.apache.accumulo.core.trace.DistributedTrace;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.Daemon;
import org.apache.accumulo.core.util.LoggingRunnable;
import org.apache.accumulo.core.util.Pair;
@@ -54,7 +56,6 @@ import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.ServerServices.Service;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -90,7 +91,6 @@ import org.apache.accumulo.server.util.Halt;
import org.apache.accumulo.server.util.TableInfoUtil;
import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.log4j.Logger;
import org.apache.zookeeper.KeeperException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
index 452f790..4409dff 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
@@ -34,6 +34,7 @@ import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.tabletserver.thrift.ActionStats;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.Base64;
import org.apache.accumulo.core.util.Duration;
import org.apache.accumulo.core.util.ThriftUtil;
@@ -52,7 +53,6 @@ import org.apache.accumulo.server.master.state.TabletServerState;
import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.server.util.ActionStatsUpdator;
import org.apache.accumulo.server.util.TableInfoUtil;
-import org.apache.accumulo.trace.instrument.Tracer;
import com.google.common.net.HostAndPort;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 475cae1..53cb172 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -34,10 +34,10 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.Prope
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.monitor.Monitor;
import org.apache.accumulo.monitor.servlets.BasicServlet;
import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.tracer.TraceFormatter;
abstract class Basic extends BasicServlet {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
index 1ba0590..5ab3b2a 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
@@ -25,11 +25,11 @@ import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.monitor.util.Table;
import org.apache.accumulo.monitor.util.celltypes.DurationType;
import org.apache.accumulo.monitor.util.celltypes.StringType;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
+import org.apache.accumulo.tracer.TraceFormatter;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
import org.apache.hadoop.io.Text;
public class ListType extends Basic {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
index 8968088..067f184 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
@@ -31,13 +31,13 @@ import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.trace.SpanTree;
-import org.apache.accumulo.core.trace.SpanTreeVisitor;
-import org.apache.accumulo.core.trace.TraceDump;
-import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.monitor.servlets.BasicServlet;
-import org.apache.accumulo.trace.thrift.Annotation;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
+import org.apache.accumulo.tracer.SpanTree;
+import org.apache.accumulo.tracer.SpanTreeVisitor;
+import org.apache.accumulo.tracer.TraceDump;
+import org.apache.accumulo.tracer.TraceFormatter;
+import org.apache.accumulo.tracer.thrift.Annotation;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
import org.apache.hadoop.io.Text;
public class ShowTrace extends Basic {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTraceLinkType.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTraceLinkType.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTraceLinkType.java
index 98b7d6e..d9de107 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTraceLinkType.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTraceLinkType.java
@@ -18,9 +18,9 @@ package org.apache.accumulo.monitor.servlets.trace;
import java.util.Date;
-import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.monitor.util.celltypes.StringType;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
+import org.apache.accumulo.tracer.TraceFormatter;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
/**
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
index f717af8..8cc451f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
@@ -27,13 +27,13 @@ import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.monitor.servlets.BasicServlet;
import org.apache.accumulo.monitor.util.Table;
import org.apache.accumulo.monitor.util.celltypes.DurationType;
import org.apache.accumulo.monitor.util.celltypes.NumberType;
import org.apache.accumulo.monitor.util.celltypes.StringType;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
+import org.apache.accumulo.tracer.TraceFormatter;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
import org.apache.hadoop.io.Text;
public class Summary extends Basic {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
index effb0e6..ef4107b 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
@@ -19,8 +19,8 @@ package org.apache.accumulo.monitor;
import java.util.ArrayList;
import java.util.Collections;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.accumulo.trace.thrift.Annotation;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
+import org.apache.accumulo.tracer.thrift.Annotation;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/pom.xml
----------------------------------------------------------------------
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index e1f61e6..859a471 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -48,10 +48,6 @@
<artifactId>accumulo-start</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
@@ -64,8 +60,16 @@
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
+ <groupId>org.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -74,4 +78,42 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <excludeFilterFile>src/main/findbugs/exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>thrift</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-thrift</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/findbugs/exclude-filter.xml
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/findbugs/exclude-filter.xml b/server/tracer/src/main/findbugs/exclude-filter.xml
new file mode 100644
index 0000000..593390e
--- /dev/null
+++ b/server/tracer/src/main/findbugs/exclude-filter.xml
@@ -0,0 +1,21 @@
+<!--
+ 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.
+-->
+<FindBugsFilter>
+ <Match>
+ <Class name="~org\.apache\.accumulo\.tracer\.thrift\..*" />
+ </Match>
+</FindBugsFilter>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
new file mode 100644
index 0000000..7c54b55
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
@@ -0,0 +1,174 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.tracer;
+
+import org.apache.accumulo.core.trace.DistributedTrace;
+import org.apache.accumulo.tracer.thrift.Annotation;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
+import org.apache.log4j.Logger;
+import org.htrace.HTraceConfiguration;
+import org.htrace.Span;
+import org.htrace.SpanReceiver;
+import org.htrace.TimelineAnnotation;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.AbstractQueue;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * Deliver Span information periodically to a destination.
+ * <ul>
+ * <li>Send host and service information with the span.
+ * <li>Cache Destination objects by some key that can be extracted from the span.
+ * <li>Can be used to queue spans up for delivery over RPC, or for saving into a file.
+ * </ul>
+ */
+public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanReceiver {
+
+ private static final Logger log = Logger.getLogger(AsyncSpanReceiver.class);
+
+ private final Map<SpanKey,Destination> clients = new HashMap<SpanKey,Destination>();
+
+ protected String host = null;
+ protected String service = null;
+
+ protected abstract Destination createDestination(SpanKey key) throws Exception;
+
+ protected abstract void send(Destination resource, RemoteSpan span) throws Exception;
+
+ protected abstract SpanKey getSpanKey(Map<ByteBuffer,ByteBuffer> data);
+
+ Timer timer = new Timer("SpanSender", true);
+ protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>();
+
+ public AsyncSpanReceiver() {
+ this(1000);
+ }
+
+ public AsyncSpanReceiver(long millis) {
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ try {
+ sendSpans();
+ } catch (Exception ex) {
+ log.warn("Exception sending spans to destination", ex);
+ }
+ }
+
+ }, millis, millis);
+ }
+
+ protected void sendSpans() {
+ while (!sendQueue.isEmpty()) {
+ boolean sent = false;
+ RemoteSpan s = sendQueue.peek();
+ SpanKey dest = getSpanKey(s.data);
+ Destination client = clients.get(dest);
+ if (client == null) {
+ try {
+ clients.put(dest, createDestination(dest));
+ } catch (Exception ex) {
+ log.warn("Exception creating connection to span receiver", ex);
+ }
+ }
+ if (client != null) {
+ try {
+ send(client, s);
+ synchronized (sendQueue) {
+ sendQueue.remove();
+ sendQueue.notifyAll();
+ }
+ sent = true;
+ } catch (Exception ex) {
+ log.warn("Got error sending to " + dest + ", refreshing client", ex);
+ clients.remove(dest);
+ }
+ }
+ if (!sent)
+ break;
+ }
+ }
+
+ public static Map<ByteBuffer, ByteBuffer> convertToByteBuffers(Map<byte[], byte[]> bytesMap) {
+ if (bytesMap == null)
+ return null;
+ Map<ByteBuffer, ByteBuffer> result = new HashMap<ByteBuffer, ByteBuffer>();
+ for (Entry<byte[], byte[]> bytes : bytesMap.entrySet()) {
+ result.put(ByteBuffer.wrap(bytes.getKey()), ByteBuffer.wrap(bytes.getValue()));
+ }
+ return result;
+ }
+
+ public static List<Annotation> convertToAnnotations(List<TimelineAnnotation> annotations) {
+ if (annotations == null)
+ return null;
+ List<Annotation> result = new ArrayList<Annotation>();
+ for (TimelineAnnotation annotation : annotations) {
+ result.add(new Annotation(annotation.getTime(), annotation.getMessage()));
+ }
+ return result;
+ }
+
+ @Override
+ public void receiveSpan(Span s) {
+ Map<ByteBuffer, ByteBuffer> data = convertToByteBuffers(s.getKVAnnotations());
+ SpanKey dest = getSpanKey(data);
+ if (dest != null) {
+ List<Annotation> annotations = convertToAnnotations(s.getTimelineAnnotations());
+ sendQueue.add(new RemoteSpan(host, service==null ? s.getProcessId() : service, s.getTraceId(), s.getSpanId(), s.getParentId(),
+ s.getStartTimeMillis(), s.getStopTimeMillis(), s.getDescription(), data, annotations));
+ }
+ }
+
+ @Override
+ public void close() {
+ synchronized (sendQueue) {
+ while (!sendQueue.isEmpty()) {
+ try {
+ sendQueue.wait();
+ } catch (InterruptedException e) {
+ log.warn("flush interrupted");
+ break;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void configure(HTraceConfiguration conf) {
+ host = conf.get(DistributedTrace.TRACE_HOST_PROPERTY, host);
+ if (host == null) {
+ try {
+ host = InetAddress.getLocalHost().getCanonicalHostName().toString();
+ } catch (UnknownHostException e) {
+ host = "unknown";
+ }
+ }
+ service = conf.get(DistributedTrace.TRACE_SERVICE_PROPERTY, service);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
new file mode 100644
index 0000000..2190570
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
@@ -0,0 +1,97 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.tracer;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
+import org.apache.accumulo.tracer.thrift.SpanReceiver.Client;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.util.Map;
+
+/**
+ * Send Span data to a destination using thrift.
+ */
+public class SendSpansViaThrift extends AsyncSpanReceiver<String,Client> {
+
+ private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SendSpansViaThrift.class);
+
+ private static final String THRIFT = "thrift://";
+
+ public SendSpansViaThrift() {
+ super();
+ }
+
+ public SendSpansViaThrift(long millis) {
+ super(millis);
+ }
+
+ @Override
+ protected Client createDestination(String destination) throws Exception {
+ if (destination == null)
+ return null;
+ try {
+ int portSeparatorIndex = destination.lastIndexOf(':');
+ String host = destination.substring(0, portSeparatorIndex);
+ int port = Integer.parseInt(destination.substring(portSeparatorIndex+1));
+ log.debug("Connecting to " + host + ":" + port);
+ InetSocketAddress addr = new InetSocketAddress(host, port);
+ Socket sock = new Socket();
+ sock.connect(addr);
+ TTransport transport = new TSocket(sock);
+ TProtocol prot = new TBinaryProtocol(transport);
+ return new Client(prot);
+ } catch (Exception ex) {
+ log.error(ex, ex);
+ return null;
+ }
+ }
+
+ @Override
+ protected void send(Client client, RemoteSpan s) throws Exception {
+ if (client != null) {
+ try {
+ client.span(s);
+ } catch (Exception ex) {
+ client.getInputProtocol().getTransport().close();
+ throw ex;
+ }
+ }
+ }
+
+ private static final ByteBuffer DEST = ByteBuffer.wrap("dest".getBytes(UTF_8));
+
+ protected String getSpanKey(Map<ByteBuffer,ByteBuffer> data) {
+ String dest = new String(data.get(DEST).array());
+ if (dest != null && dest.startsWith(THRIFT)) {
+ String hostAddress = dest.substring(THRIFT.length());
+ String[] hostAddr = hostAddress.split(":", 2);
+ if (hostAddr.length == 2) {
+ return hostAddress;
+ }
+ }
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
new file mode 100644
index 0000000..6337ee4
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTree.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.tracer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.htrace.Span;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
+
+public class SpanTree {
+ final Map<Long,List<Long>> parentChildren = new HashMap<Long,List<Long>>();
+ public final Map<Long,RemoteSpan> nodes = new HashMap<Long,RemoteSpan>();
+
+ public SpanTree() {}
+
+ public void addNode(RemoteSpan span) {
+ nodes.put(span.spanId, span);
+ if (parentChildren.get(span.parentId) == null)
+ parentChildren.put(span.parentId, new ArrayList<Long>());
+ parentChildren.get(span.parentId).add(span.spanId);
+ }
+
+ public Set<Long> visit(SpanTreeVisitor visitor) {
+ Set<Long> visited = new HashSet<Long>();
+ List<Long> root = parentChildren.get(Long.valueOf(Span.ROOT_SPAN_ID));
+ if (root == null || root.isEmpty())
+ return visited;
+ RemoteSpan rootSpan = nodes.get(root.iterator().next());
+ if (rootSpan == null)
+ return visited;
+ recurse(0, null, rootSpan, visitor, visited);
+ return visited;
+ }
+
+ private void recurse(int level, RemoteSpan parent, RemoteSpan node, SpanTreeVisitor visitor, Set<Long> visited) {
+ // improbable case: duplicate spanId in a trace tree: prevent
+ // infinite recursion
+ if (visited.contains(node.spanId))
+ return;
+ visited.add(node.spanId);
+ List<RemoteSpan> children = new ArrayList<RemoteSpan>();
+ List<Long> childrenIds = parentChildren.get(node.spanId);
+ if (childrenIds != null) {
+ for (Long childId : childrenIds) {
+ RemoteSpan child = nodes.get(childId);
+ if (child != null) {
+ children.add(child);
+ }
+ }
+ }
+ children = TraceDump.sortByStart(children);
+ visitor.visit(level, parent, node, children);
+ for (RemoteSpan child : children) {
+ recurse(level + 1, node, child, visitor, visited);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTreeVisitor.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTreeVisitor.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTreeVisitor.java
new file mode 100644
index 0000000..2ca1f3b
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SpanTreeVisitor.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.tracer;
+
+import java.util.Collection;
+
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
+
+public interface SpanTreeVisitor {
+ void visit(int level, RemoteSpan parent, RemoteSpan node, Collection<RemoteSpan> children);
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
new file mode 100644
index 0000000..c109fd8
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
@@ -0,0 +1,162 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.tracer;
+
+import static java.lang.Math.min;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
+import org.apache.accumulo.core.cli.ClientOnDefaultTable;
+import org.apache.accumulo.core.cli.ScannerOpts;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.hadoop.io.Text;
+import org.htrace.Span;
+
+import com.beust.jcommander.Parameter;
+
+
+public class TraceDump {
+ static final long DEFAULT_TIME_IN_MILLIS = 10 * 60 * 1000l;
+
+ static class Opts extends ClientOnDefaultTable {
+ @Parameter(names={"-l", "--list"}, description="List recent traces")
+ boolean list = false;
+ @Parameter(names={"-s", "--start"}, description="The start time of traces to display")
+ String start;
+ @Parameter(names={"-e", "--end"}, description="The end time of traces to display")
+ String end;
+ @Parameter(names={"-d", "--dump"}, description="Dump the traces")
+ boolean dump = false;
+ @Parameter(names={"-i", "--instance"}, description="URL to point to accumulo.")
+ String instance;
+ @Parameter(description=" <trace id> { <trace id> ... }")
+ List<String> traceIds = new ArrayList<String>();
+ Opts() { super("trace");}
+ }
+
+ public static void main(String[] args) throws Exception {
+ Opts opts = new Opts();
+ ScannerOpts scanOpts = new ScannerOpts();
+ opts.parseArgs(TraceDump.class.getName(), args, scanOpts);
+ int code = 0;
+ if (opts.list) {
+ code = listSpans(opts, scanOpts);
+ }
+ if (code == 0 && opts.dump) {
+ code = dumpTrace(opts, scanOpts);
+ }
+ System.exit(code);
+ }
+
+ public static List<RemoteSpan> sortByStart(Collection<RemoteSpan> spans) {
+ List<RemoteSpan> spanList = new ArrayList<RemoteSpan>(spans);
+ Collections.sort(spanList, new Comparator<RemoteSpan>() {
+ @Override
+ public int compare(RemoteSpan o1, RemoteSpan o2) {
+ return (int) (o1.start - o2.start);
+ }
+ });
+ return spanList;
+ }
+
+ private static int listSpans(Opts opts, ScannerOpts scanOpts) throws Exception {
+ PrintStream out = System.out;
+ long endTime = System.currentTimeMillis();
+ long startTime = endTime - DEFAULT_TIME_IN_MILLIS;
+ Connector conn = opts.getConnector();
+ Scanner scanner = conn.createScanner(opts.getTableName(), opts.auths);
+ scanner.setBatchSize(scanOpts.scanBatchSize);
+ Range range = new Range(new Text("start:" + Long.toHexString(startTime)), new Text("start:" + Long.toHexString(endTime)));
+ scanner.setRange(range);
+ out.println("Trace Day/Time (ms) Start");
+ for (Entry<Key,Value> entry : scanner) {
+ RemoteSpan span = TraceFormatter.getRemoteSpan(entry);
+ out.println(String.format("%016x %s %5d %s", span.traceId, TraceFormatter.formatDate(new Date(span.getStart())), span.stop - span.start, span.description));
+ }
+ return 0;
+ }
+
+ public interface Printer {
+ void print(String line);
+ }
+
+ private static int dumpTrace(Opts opts, ScannerOpts scanOpts) throws Exception {
+ final PrintStream out = System.out;
+ Connector conn = opts.getConnector();
+
+ int count = 0;
+ for (String traceId : opts.traceIds) {
+ Scanner scanner = conn.createScanner(opts.getTableName(), opts.auths);
+ scanner.setBatchSize(scanOpts.scanBatchSize);
+ Range range = new Range(new Text(traceId.toString()));
+ scanner.setRange(range);
+ count = printTrace(scanner, new Printer() {
+ @Override
+ public void print(String line) {
+ out.println(line);
+ }
+ });
+ }
+ return count > 0 ? 0 : 1;
+ }
+
+ public static int printTrace(Scanner scanner, final Printer out) {
+ int count = 0;
+ SpanTree tree = new SpanTree();
+ long start = Long.MAX_VALUE;
+ for (Entry<Key,Value> entry : scanner) {
+ RemoteSpan span = TraceFormatter.getRemoteSpan(entry);
+ tree.addNode(span);
+ start = min(start, span.start);
+ if (span.parentId == Span.ROOT_SPAN_ID)
+ count++;
+ }
+ out.print(String.format("Trace started at %s", TraceFormatter.formatDate(new Date(start))));
+ out.print("Time Start Service@Location Name");
+
+ final long finalStart = start;
+ Set<Long> visited = tree.visit(new SpanTreeVisitor() {
+ @Override
+ public void visit(int level, RemoteSpan parent, RemoteSpan node, Collection<RemoteSpan> children) {
+ String fmt = "%5d+%-5d %" + (level * 2 + 1) + "s%s@%s %s";
+ out.print(String.format(fmt, node.stop - node.start, node.start - finalStart, "", node.svc, node.sender, node.description));
+ }
+ });
+ tree.nodes.keySet().removeAll(visited);
+ if (!tree.nodes.isEmpty()) {
+ out.print("Warning: the following spans are not rooted!");
+ for (RemoteSpan span : sortByStart(tree.nodes.values())) {
+ out.print(String.format("%s %s %s", Long.toHexString(span.spanId), Long.toHexString(span.parentId), span.description));
+ }
+ return -1;
+ }
+ return count;
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceFormatter.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceFormatter.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceFormatter.java
new file mode 100644
index 0000000..4829eb2
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceFormatter.java
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.tracer;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.apache.accumulo.tracer.thrift.Annotation;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.util.format.DefaultFormatter;
+import org.apache.accumulo.core.util.format.Formatter;
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.hadoop.io.Text;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TCompactProtocol;
+import org.apache.thrift.transport.TMemoryInputTransport;
+
+
+/**
+ * A formatter than can be used in the shell to display trace information.
+ *
+ */
+public class TraceFormatter implements Formatter {
+ public static final String DATE_FORMAT = "yyyy/MM/dd HH:mm:ss.SSS";
+ // ugh... SimpleDataFormat is not thread safe
+ private static final ThreadLocal<SimpleDateFormat> formatter = new ThreadLocal<SimpleDateFormat>() {
+ @Override
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat(DATE_FORMAT);
+ }
+ };
+
+ public static String formatDate(final Date date) {
+ return formatter.get().format(date);
+ }
+
+ private final static Text SPAN_CF = new Text("span");
+
+ private Iterator<Entry<Key,Value>> scanner;
+ private boolean printTimeStamps;
+
+ public static RemoteSpan getRemoteSpan(Entry<Key,Value> entry) {
+ TMemoryInputTransport transport = new TMemoryInputTransport(entry.getValue().get());
+ TCompactProtocol protocol = new TCompactProtocol(transport);
+ RemoteSpan span = new RemoteSpan();
+ try {
+ span.read(protocol);
+ } catch (TException ex) {
+ throw new RuntimeException(ex);
+ }
+ return span;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return scanner.hasNext();
+ }
+
+ @Override
+ public String next() {
+ Entry<Key,Value> next = scanner.next();
+ if (next.getKey().getColumnFamily().equals(SPAN_CF)) {
+ StringBuilder result = new StringBuilder();
+ SimpleDateFormat dateFormatter = new SimpleDateFormat(DATE_FORMAT);
+ RemoteSpan span = getRemoteSpan(next);
+ result.append("----------------------\n");
+ result.append(String.format(" %12s:%s%n", "name", span.description));
+ result.append(String.format(" %12s:%s%n", "trace", Long.toHexString(span.traceId)));
+ result.append(String.format(" %12s:%s%n", "loc", span.svc + "@" + span.sender));
+ result.append(String.format(" %12s:%s%n", "span", Long.toHexString(span.spanId)));
+ result.append(String.format(" %12s:%s%n", "parent", Long.toHexString(span.parentId)));
+ result.append(String.format(" %12s:%s%n", "start", dateFormatter.format(span.start)));
+ result.append(String.format(" %12s:%s%n", "ms", span.stop - span.start));
+ if (span.data != null) {
+ for (Entry<ByteBuffer, ByteBuffer> entry : span.data.entrySet()) {
+ String key = new String(entry.getKey().array(), entry.getKey().arrayOffset(), entry.getKey().limit(), UTF_8);
+ String value = new String(entry.getValue().array(), entry.getValue().arrayOffset(), entry.getValue().limit(), UTF_8);
+ result.append(String.format(" %12s:%s%n", key, value));
+ }
+ }
+ if (span.annotations != null) {
+ for (Annotation annotation : span.annotations) {
+ result.append(String.format(" %12s:%s:%s%n", "annotation", annotation.getMsg(), dateFormatter.format(annotation.getTime())));
+ }
+ }
+
+ if (printTimeStamps) {
+ result.append(String.format(" %-12s:%d%n", "timestamp", next.getKey().getTimestamp()));
+ }
+ return result.toString();
+ }
+ return DefaultFormatter.formatEntry(next, printTimeStamps);
+ }
+
+ @Override
+ public void remove() {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public void initialize(Iterable<Entry<Key,Value>> scanner, boolean printTimestamps) {
+ this.scanner = scanner.iterator();
+ this.printTimeStamps = printTimestamps;
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index af1ec56..18fe47a 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -43,7 +43,6 @@ import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.user.AgeOffFilter;
import org.apache.accumulo.core.security.SecurityUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.server.Accumulo;
@@ -55,10 +54,10 @@ import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.accumulo.trace.thrift.SpanReceiver.Iface;
-import org.apache.accumulo.trace.thrift.SpanReceiver.Processor;
+import org.htrace.Span;
+import org.apache.accumulo.tracer.thrift.RemoteSpan;
+import org.apache.accumulo.tracer.thrift.SpanReceiver.Iface;
+import org.apache.accumulo.tracer.thrift.SpanReceiver.Processor;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TByteArrayOutputStream;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
new file mode 100644
index 0000000..866784d
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.tracer;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.trace.DistributedTrace;
+import org.apache.accumulo.fate.zookeeper.ZooReader;
+import org.apache.log4j.Logger;
+import org.apache.zookeeper.WatchedEvent;
+import org.apache.zookeeper.Watcher;
+import org.htrace.HTraceConfiguration;
+
+/**
+ * Find a Span collector via zookeeper and push spans there via Thrift RPC
+ */
+public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
+ private static final Logger log = Logger.getLogger(ZooTraceClient.class);
+
+ private static final int DEFAULT_TIMEOUT = 30 * 1000;
+
+ ZooReader zoo = null;
+ String path;
+ boolean pathExists = false;
+ final Random random = new Random();
+ final List<String> hosts = new ArrayList<String>();
+
+ public ZooTraceClient() {
+ super();
+ }
+
+ public ZooTraceClient(long millis) {
+ super(millis);
+ }
+
+ @Override
+ synchronized protected String getSpanKey(Map<ByteBuffer,ByteBuffer> data) {
+ if (hosts.size() > 0) {
+ String host = hosts.get(random.nextInt(hosts.size()));
+ log.debug("sending data to " + host);
+ return host;
+ }
+ return null;
+ }
+
+ @Override
+ public void configure(HTraceConfiguration conf) {
+ super.configure(conf);
+ String keepers = conf.get(DistributedTrace.TRACER_ZK_HOST);
+ if (keepers == null)
+ throw new IllegalArgumentException("Must configure " + DistributedTrace.TRACER_ZK_HOST);
+ int timeout = conf.getInt(DistributedTrace.TRACER_ZK_TIMEOUT, DEFAULT_TIMEOUT);
+ zoo = new ZooReader(keepers, timeout);
+ path = conf.get(DistributedTrace.TRACER_ZK_PATH, Constants.ZTRACERS);
+ process(null);
+ }
+
+ @Override
+ public void process(WatchedEvent event) {
+ log.debug("Processing event for trace server zk watch");
+ try {
+ if (pathExists || zoo.exists(path)) {
+ pathExists = true;
+ updateHosts(path, zoo.getChildren(path, this));
+ } else {
+ zoo.exists(path, this);
+ }
+ } catch (Exception ex) {
+ log.error("unable to get destination hosts in zookeeper", ex);
+ }
+ }
+
+ @Override
+ protected void sendSpans() {
+ if (hosts.isEmpty()) {
+ if (!sendQueue.isEmpty()) {
+ log.error("No hosts to send data to, dropping queued spans");
+ synchronized (sendQueue) {
+ sendQueue.clear();
+ sendQueue.notifyAll();
+ }
+ }
+ } else {
+ super.sendSpans();
+ }
+ }
+
+ synchronized private void updateHosts(String path, List<String> children) {
+ log.debug("Scanning trace hosts in zookeeper: " + path);
+ try {
+ List<String> hosts = new ArrayList<String>();
+ for (String child : children) {
+ byte[] data = zoo.getData(path + "/" + child, null);
+ hosts.add(new String(data, UTF_8));
+ }
+ this.hosts.clear();
+ this.hosts.addAll(hosts);
+ log.debug("Trace hosts: " + this.hosts);
+ } catch (Exception ex) {
+ log.error("unable to get destination hosts in zookeeper", ex);
+ }
+ }
+}
[10/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/AsyncSpanReceiver.java b/core/src/main/java/org/apache/accumulo/core/trace/AsyncSpanReceiver.java
deleted file mode 100644
index 379302e..0000000
--- a/core/src/main/java/org/apache/accumulo/core/trace/AsyncSpanReceiver.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.core.trace;
-
-import org.apache.accumulo.trace.thrift.Annotation;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.log4j.Logger;
-import org.htrace.HTraceConfiguration;
-import org.htrace.Span;
-import org.htrace.SpanReceiver;
-import org.htrace.TimelineAnnotation;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
-import java.util.AbstractQueue;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-/**
- * Deliver Span information periodically to a destination.
- * <ul>
- * <li>Send host and service information with the span.
- * <li>Cache Destination objects by some key that can be extracted from the span.
- * <li>Can be used to queue spans up for delivery over RPC, or for saving into a file.
- * </ul>
- */
-public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanReceiver {
-
- private static final Logger log = Logger.getLogger(AsyncSpanReceiver.class);
-
- private final Map<SpanKey,Destination> clients = new HashMap<SpanKey,Destination>();
-
- protected String host = null;
- protected String service = null;
-
- protected abstract Destination createDestination(SpanKey key) throws Exception;
-
- protected abstract void send(Destination resource, RemoteSpan span) throws Exception;
-
- protected abstract SpanKey getSpanKey(Map<ByteBuffer,ByteBuffer> data);
-
- Timer timer = new Timer("SpanSender", true);
- protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>();
-
- public AsyncSpanReceiver() {
- this(1000);
- }
-
- public AsyncSpanReceiver(long millis) {
- timer.schedule(new TimerTask() {
- @Override
- public void run() {
- try {
- sendSpans();
- } catch (Exception ex) {
- log.warn("Exception sending spans to destination", ex);
- }
- }
-
- }, millis, millis);
- }
-
- protected void sendSpans() {
- while (!sendQueue.isEmpty()) {
- boolean sent = false;
- RemoteSpan s = sendQueue.peek();
- SpanKey dest = getSpanKey(s.data);
- Destination client = clients.get(dest);
- if (client == null) {
- try {
- clients.put(dest, createDestination(dest));
- } catch (Exception ex) {
- log.warn("Exception creating connection to span receiver", ex);
- }
- }
- if (client != null) {
- try {
- send(client, s);
- synchronized (sendQueue) {
- sendQueue.remove();
- sendQueue.notifyAll();
- }
- sent = true;
- } catch (Exception ex) {
- log.warn("Got error sending to " + dest + ", refreshing client", ex);
- clients.remove(dest);
- }
- }
- if (!sent)
- break;
- }
- }
-
- public static Map<ByteBuffer, ByteBuffer> convertToByteBuffers(Map<byte[], byte[]> bytesMap) {
- if (bytesMap == null)
- return null;
- Map<ByteBuffer, ByteBuffer> result = new HashMap<ByteBuffer, ByteBuffer>();
- for (Entry<byte[], byte[]> bytes : bytesMap.entrySet()) {
- result.put(ByteBuffer.wrap(bytes.getKey()), ByteBuffer.wrap(bytes.getValue()));
- }
- return result;
- }
-
- public static List<Annotation> convertToAnnotations(List<TimelineAnnotation> annotations) {
- if (annotations == null)
- return null;
- List<Annotation> result = new ArrayList<Annotation>();
- for (TimelineAnnotation annotation : annotations) {
- result.add(new Annotation(annotation.getTime(), annotation.getMessage()));
- }
- return result;
- }
-
- @Override
- public void receiveSpan(Span s) {
- Map<ByteBuffer, ByteBuffer> data = convertToByteBuffers(s.getKVAnnotations());
- SpanKey dest = getSpanKey(data);
- if (dest != null) {
- List<Annotation> annotations = convertToAnnotations(s.getTimelineAnnotations());
- sendQueue.add(new RemoteSpan(host, service==null ? s.getProcessId() : service, s.getTraceId(), s.getSpanId(), s.getParentId(),
- s.getStartTimeMillis(), s.getStopTimeMillis(), s.getDescription(), data, annotations));
- }
- }
-
- @Override
- public void close() {
- synchronized (sendQueue) {
- while (!sendQueue.isEmpty()) {
- try {
- sendQueue.wait();
- } catch (InterruptedException e) {
- log.warn("flush interrupted");
- break;
- }
- }
- }
- }
-
- @Override
- public void configure(HTraceConfiguration conf) {
- host = conf.get(DistributedTrace.TRACE_HOST_PROPERTY, host);
- if (host == null) {
- try {
- host = InetAddress.getLocalHost().getCanonicalHostName().toString();
- } catch (UnknownHostException e) {
- host = "unknown";
- }
- }
- service = conf.get(DistributedTrace.TRACE_SERVICE_PROPERTY, service);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/CountSampler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/CountSampler.java b/core/src/main/java/org/apache/accumulo/core/trace/CountSampler.java
new file mode 100644
index 0000000..df1a02a
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/CountSampler.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace;
+
+public class CountSampler extends org.htrace.impl.CountSampler {
+ public CountSampler(long frequency) {
+ super(frequency);
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
index fe9377e..5aa026b 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.fate.zookeeper.ZooReader;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.ShutdownHookManager;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/SendSpansViaThrift.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/SendSpansViaThrift.java b/core/src/main/java/org/apache/accumulo/core/trace/SendSpansViaThrift.java
deleted file mode 100644
index 87a9378..0000000
--- a/core/src/main/java/org/apache/accumulo/core/trace/SendSpansViaThrift.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.core.trace;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.accumulo.trace.thrift.SpanReceiver.Client;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-import java.util.Map;
-
-/**
- * Send Span data to a destination using thrift.
- */
-public class SendSpansViaThrift extends AsyncSpanReceiver<String,Client> {
-
- private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SendSpansViaThrift.class);
-
- private static final String THRIFT = "thrift://";
-
- public SendSpansViaThrift() {
- super();
- }
-
- public SendSpansViaThrift(long millis) {
- super(millis);
- }
-
- @Override
- protected Client createDestination(String destination) throws Exception {
- if (destination == null)
- return null;
- try {
- int portSeparatorIndex = destination.lastIndexOf(':');
- String host = destination.substring(0, portSeparatorIndex);
- int port = Integer.parseInt(destination.substring(portSeparatorIndex+1));
- log.debug("Connecting to " + host + ":" + port);
- InetSocketAddress addr = new InetSocketAddress(host, port);
- Socket sock = new Socket();
- sock.connect(addr);
- TTransport transport = new TSocket(sock);
- TProtocol prot = new TBinaryProtocol(transport);
- return new Client(prot);
- } catch (Exception ex) {
- log.error(ex, ex);
- return null;
- }
- }
-
- @Override
- protected void send(Client client, RemoteSpan s) throws Exception {
- if (client != null) {
- try {
- client.span(s);
- } catch (Exception ex) {
- client.getInputProtocol().getTransport().close();
- throw ex;
- }
- }
- }
-
- private static final ByteBuffer DEST = ByteBuffer.wrap("dest".getBytes(UTF_8));
-
- protected String getSpanKey(Map<ByteBuffer,ByteBuffer> data) {
- String dest = new String(data.get(DEST).array());
- if (dest != null && dest.startsWith(THRIFT)) {
- String hostAddress = dest.substring(THRIFT.length());
- String[] hostAddr = hostAddress.split(":", 2);
- if (hostAddr.length == 2) {
- return hostAddress;
- }
- }
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/Span.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/Span.java b/core/src/main/java/org/apache/accumulo/core/trace/Span.java
new file mode 100644
index 0000000..3427a2e
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/Span.java
@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import org.htrace.NullScope;
+import org.htrace.TimelineAnnotation;
+import org.htrace.TraceScope;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This is a wrapper for a TraceScope object, which is a wrapper for a Span and its parent.
+ * Not recommended for client use.
+ */
+public class Span implements org.htrace.Span {
+ public static final Span NULL_SPAN = new Span(NullScope.INSTANCE);
+ private TraceScope scope = null;
+ protected org.htrace.Span span = null;
+
+ public Span(TraceScope scope) {
+ this.scope = scope;
+ this.span = scope.getSpan();
+ }
+
+ public Span(org.htrace.Span span) {
+ this.span = span;
+ }
+
+ public TraceScope getScope() {
+ return scope;
+ }
+
+ public org.htrace.Span getSpan() {
+ return span;
+ }
+
+ public long traceId() {
+ return span.getTraceId();
+ }
+
+ public void data(String k, String v) {
+ if (span != null)
+ span.addKVAnnotation(k.getBytes(UTF_8), v.getBytes(UTF_8));
+ }
+
+ @Override
+ public void stop() {
+ if (scope == null) {
+ if (span != null) {
+ span.stop();
+ }
+ } else {
+ scope.close();
+ }
+ }
+
+ @Override
+ public long getStartTimeMillis() {
+ return span.getStartTimeMillis();
+ }
+
+ @Override
+ public long getStopTimeMillis() {
+ return span.getStopTimeMillis();
+ }
+
+ @Override
+ public long getAccumulatedMillis() {
+ return span.getAccumulatedMillis();
+ }
+
+ @Override
+ public boolean isRunning() {
+ return span.isRunning();
+ }
+
+ @Override
+ public String getDescription() {
+ return span.getDescription();
+ }
+
+ @Override
+ public long getSpanId() {
+ return span.getSpanId();
+ }
+
+ @Override
+ public long getTraceId() {
+ return span.getTraceId();
+ }
+
+ @Override
+ public Span child(String s) {
+ return new Span(span.child(s));
+ }
+
+ @Override
+ public long getParentId() {
+ return span.getParentId();
+ }
+
+ @Override
+ public void addKVAnnotation(byte[] k, byte[] v) {
+ span.addKVAnnotation(k, v);
+ }
+
+ @Override
+ public void addTimelineAnnotation(String s) {
+ span.addTimelineAnnotation(s);
+ }
+
+ @Override
+ public Map<byte[], byte[]> getKVAnnotations() {
+ return span.getKVAnnotations();
+ }
+
+ @Override
+ public List<TimelineAnnotation> getTimelineAnnotations() {
+ return span.getTimelineAnnotations();
+ }
+
+ @Override
+ public String getProcessId() {
+ return span.getProcessId();
+ }
+
+ @Override
+ public String toString() {
+ return span.toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/SpanTree.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/SpanTree.java b/core/src/main/java/org/apache/accumulo/core/trace/SpanTree.java
deleted file mode 100644
index 772a133..0000000
--- a/core/src/main/java/org/apache/accumulo/core/trace/SpanTree.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.core.trace;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-
-
-public class SpanTree {
- final Map<Long,List<Long>> parentChildren = new HashMap<Long,List<Long>>();
- public final Map<Long,RemoteSpan> nodes = new HashMap<Long,RemoteSpan>();
-
- public SpanTree() {}
-
- public void addNode(RemoteSpan span) {
- nodes.put(span.spanId, span);
- if (parentChildren.get(span.parentId) == null)
- parentChildren.put(span.parentId, new ArrayList<Long>());
- parentChildren.get(span.parentId).add(span.spanId);
- }
-
- public Set<Long> visit(SpanTreeVisitor visitor) {
- Set<Long> visited = new HashSet<Long>();
- List<Long> root = parentChildren.get(Long.valueOf(Span.ROOT_SPAN_ID));
- if (root == null || root.isEmpty())
- return visited;
- RemoteSpan rootSpan = nodes.get(root.iterator().next());
- if (rootSpan == null)
- return visited;
- recurse(0, null, rootSpan, visitor, visited);
- return visited;
- }
-
- private void recurse(int level, RemoteSpan parent, RemoteSpan node, SpanTreeVisitor visitor, Set<Long> visited) {
- // improbable case: duplicate spanId in a trace tree: prevent
- // infinite recursion
- if (visited.contains(node.spanId))
- return;
- visited.add(node.spanId);
- List<RemoteSpan> children = new ArrayList<RemoteSpan>();
- List<Long> childrenIds = parentChildren.get(node.spanId);
- if (childrenIds != null) {
- for (Long childId : childrenIds) {
- RemoteSpan child = nodes.get(childId);
- if (child != null) {
- children.add(child);
- }
- }
- }
- children = TraceDump.sortByStart(children);
- visitor.visit(level, parent, node, children);
- for (RemoteSpan child : children) {
- recurse(level + 1, node, child, visitor, visited);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/SpanTreeVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/SpanTreeVisitor.java b/core/src/main/java/org/apache/accumulo/core/trace/SpanTreeVisitor.java
deleted file mode 100644
index 80826a0..0000000
--- a/core/src/main/java/org/apache/accumulo/core/trace/SpanTreeVisitor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.core.trace;
-
-import java.util.Collection;
-
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-
-
-public interface SpanTreeVisitor {
- void visit(int level, RemoteSpan parent, RemoteSpan node, Collection<RemoteSpan> children);
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/Trace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/Trace.java b/core/src/main/java/org/apache/accumulo/core/trace/Trace.java
new file mode 100644
index 0000000..fc2df17
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/Trace.java
@@ -0,0 +1,135 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace;
+
+import org.apache.accumulo.core.trace.thrift.TInfo;
+import org.apache.accumulo.core.trace.wrappers.TraceRunnable;
+import org.htrace.Sampler;
+import org.htrace.TraceInfo;
+import org.htrace.wrappers.TraceProxy;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+/**
+ * Utility class for tracing within Accumulo. Not intended for client use!
+ *
+ */
+public class Trace {
+ /**
+ * Start a trace span with a given description.
+ */
+ public static Span on(String description) {
+ return on(description, Sampler.ALWAYS);
+ }
+
+ /**
+ * Start a trace span with a given description with the given sampler.
+ */
+ public static <T> Span on(String description, Sampler<T> sampler) {
+ return new Span(org.htrace.Trace.startSpan(description, sampler));
+ }
+
+ /**
+ * Finish the current trace.
+ */
+ public static void off() {
+ org.htrace.Span span = org.htrace.Trace.currentSpan();
+ if (span != null) {
+ span.stop();
+ org.htrace.Tracer.getInstance().continueSpan(null);
+ }
+ }
+
+ /**
+ * @deprecated since 1.7, use {@link #off()} instead
+ */
+ @Deprecated
+ public static void offNoFlush() {
+ off();
+ }
+
+ /**
+ * Returns whether tracing is currently on.
+ */
+ public static boolean isTracing() {
+ return org.htrace.Trace.isTracing();
+ }
+
+ /**
+ * Return the current span.
+ * @deprecated since 1.7 -- it is better to save the span you create in a local variable and call its methods, rather than retrieving the current span
+ */
+ @Deprecated
+ public static Span currentTrace() {
+ return new Span(org.htrace.Trace.currentSpan());
+ }
+
+ /**
+ * Get the trace id of the current span.
+ */
+ public static long currentTraceId() {
+ return org.htrace.Trace.currentSpan().getTraceId();
+ }
+
+ /**
+ * Start a new span with a given name, if already tracing.
+ */
+ public static Span start(String description) {
+ return new Span(org.htrace.Trace.startSpan(description));
+ }
+
+ /**
+ * Continue a trace by starting a new span with a given parent and description.
+ */
+ public static Span trace(TInfo info, String description) {
+ if (info.traceId == 0) {
+ return Span.NULL_SPAN;
+ }
+ TraceInfo ti = new TraceInfo(info.traceId, info.parentId);
+ return new Span(org.htrace.Trace.startSpan(description, ti));
+ }
+
+ /**
+ * Add data to the current span.
+ */
+ public static void data(String k, String v) {
+ org.htrace.Span span = org.htrace.Trace.currentSpan();
+ if (span != null)
+ span.addKVAnnotation(k.getBytes(UTF_8), v.getBytes(UTF_8));
+ }
+
+ /**
+ * Wrap a runnable in a TraceRunnable, if tracing.
+ */
+ public static Runnable wrap(Runnable runnable) {
+ if (isTracing()) {
+ return new TraceRunnable(org.htrace.Trace.currentSpan(), runnable);
+ } else {
+ return runnable;
+ }
+ }
+
+ // Wrap all calls to the given object with spans
+ public static <T> T wrapAll(T instance) {
+ return TraceProxy.trace(instance);
+ }
+
+ // Sample trace all calls to the given object
+ public static <T, V> T wrapAll(T instance, Sampler<V> dist) {
+ return TraceProxy.trace(instance, dist);
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java b/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
deleted file mode 100644
index e3f9e5a..0000000
--- a/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.core.trace;
-
-import static java.lang.Math.min;
-
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.accumulo.core.cli.ClientOnDefaultTable;
-import org.apache.accumulo.core.cli.ScannerOpts;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.hadoop.io.Text;
-import org.htrace.Span;
-
-import com.beust.jcommander.Parameter;
-
-
-public class TraceDump {
- static final long DEFAULT_TIME_IN_MILLIS = 10 * 60 * 1000l;
-
- static class Opts extends ClientOnDefaultTable {
- @Parameter(names={"-l", "--list"}, description="List recent traces")
- boolean list = false;
- @Parameter(names={"-s", "--start"}, description="The start time of traces to display")
- String start;
- @Parameter(names={"-e", "--end"}, description="The end time of traces to display")
- String end;
- @Parameter(names={"-d", "--dump"}, description="Dump the traces")
- boolean dump = false;
- @Parameter(names={"-i", "--instance"}, description="URL to point to accumulo.")
- String instance;
- @Parameter(description=" <trace id> { <trace id> ... }")
- List<String> traceIds = new ArrayList<String>();
- Opts() { super("trace");}
- }
-
- public static void main(String[] args) throws Exception {
- Opts opts = new Opts();
- ScannerOpts scanOpts = new ScannerOpts();
- opts.parseArgs(TraceDump.class.getName(), args, scanOpts);
- int code = 0;
- if (opts.list) {
- code = listSpans(opts, scanOpts);
- }
- if (code == 0 && opts.dump) {
- code = dumpTrace(opts, scanOpts);
- }
- System.exit(code);
- }
-
- public static List<RemoteSpan> sortByStart(Collection<RemoteSpan> spans) {
- List<RemoteSpan> spanList = new ArrayList<RemoteSpan>(spans);
- Collections.sort(spanList, new Comparator<RemoteSpan>() {
- @Override
- public int compare(RemoteSpan o1, RemoteSpan o2) {
- return (int) (o1.start - o2.start);
- }
- });
- return spanList;
- }
-
- private static int listSpans(Opts opts, ScannerOpts scanOpts) throws Exception {
- PrintStream out = System.out;
- long endTime = System.currentTimeMillis();
- long startTime = endTime - DEFAULT_TIME_IN_MILLIS;
- Connector conn = opts.getConnector();
- Scanner scanner = conn.createScanner(opts.getTableName(), opts.auths);
- scanner.setBatchSize(scanOpts.scanBatchSize);
- Range range = new Range(new Text("start:" + Long.toHexString(startTime)), new Text("start:" + Long.toHexString(endTime)));
- scanner.setRange(range);
- out.println("Trace Day/Time (ms) Start");
- for (Entry<Key,Value> entry : scanner) {
- RemoteSpan span = TraceFormatter.getRemoteSpan(entry);
- out.println(String.format("%016x %s %5d %s", span.traceId, TraceFormatter.formatDate(new Date(span.getStart())), span.stop - span.start, span.description));
- }
- return 0;
- }
-
- public interface Printer {
- void print(String line);
- }
-
- private static int dumpTrace(Opts opts, ScannerOpts scanOpts) throws Exception {
- final PrintStream out = System.out;
- Connector conn = opts.getConnector();
-
- int count = 0;
- for (String traceId : opts.traceIds) {
- Scanner scanner = conn.createScanner(opts.getTableName(), opts.auths);
- scanner.setBatchSize(scanOpts.scanBatchSize);
- Range range = new Range(new Text(traceId.toString()));
- scanner.setRange(range);
- count = printTrace(scanner, new Printer() {
- @Override
- public void print(String line) {
- out.println(line);
- }
- });
- }
- return count > 0 ? 0 : 1;
- }
-
- public static int printTrace(Scanner scanner, final Printer out) {
- int count = 0;
- SpanTree tree = new SpanTree();
- long start = Long.MAX_VALUE;
- for (Entry<Key,Value> entry : scanner) {
- RemoteSpan span = TraceFormatter.getRemoteSpan(entry);
- tree.addNode(span);
- start = min(start, span.start);
- if (span.parentId == Span.ROOT_SPAN_ID)
- count++;
- }
- out.print(String.format("Trace started at %s", TraceFormatter.formatDate(new Date(start))));
- out.print("Time Start Service@Location Name");
-
- final long finalStart = start;
- Set<Long> visited = tree.visit(new SpanTreeVisitor() {
- @Override
- public void visit(int level, RemoteSpan parent, RemoteSpan node, Collection<RemoteSpan> children) {
- String fmt = "%5d+%-5d %" + (level * 2 + 1) + "s%s@%s %s";
- out.print(String.format(fmt, node.stop - node.start, node.start - finalStart, "", node.svc, node.sender, node.description));
- }
- });
- tree.nodes.keySet().removeAll(visited);
- if (!tree.nodes.isEmpty()) {
- out.print("Warning: the following spans are not rooted!");
- for (RemoteSpan span : sortByStart(tree.nodes.values())) {
- out.print(String.format("%s %s %s", Long.toHexString(span.spanId), Long.toHexString(span.parentId), span.description));
- }
- return -1;
- }
- return count;
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java b/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
deleted file mode 100644
index d6842df..0000000
--- a/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.core.trace;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.nio.ByteBuffer;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-import org.apache.accumulo.trace.thrift.Annotation;
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.util.format.DefaultFormatter;
-import org.apache.accumulo.core.util.format.Formatter;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.hadoop.io.Text;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TCompactProtocol;
-import org.apache.thrift.transport.TMemoryInputTransport;
-
-
-/**
- * A formatter than can be used in the shell to display trace information.
- *
- */
-public class TraceFormatter implements Formatter {
- public static final String DATE_FORMAT = "yyyy/MM/dd HH:mm:ss.SSS";
- // ugh... SimpleDataFormat is not thread safe
- private static final ThreadLocal<SimpleDateFormat> formatter = new ThreadLocal<SimpleDateFormat>() {
- @Override
- protected SimpleDateFormat initialValue() {
- return new SimpleDateFormat(DATE_FORMAT);
- }
- };
-
- public static String formatDate(final Date date) {
- return formatter.get().format(date);
- }
-
- private final static Text SPAN_CF = new Text("span");
-
- private Iterator<Entry<Key,Value>> scanner;
- private boolean printTimeStamps;
-
- public static RemoteSpan getRemoteSpan(Entry<Key,Value> entry) {
- TMemoryInputTransport transport = new TMemoryInputTransport(entry.getValue().get());
- TCompactProtocol protocol = new TCompactProtocol(transport);
- RemoteSpan span = new RemoteSpan();
- try {
- span.read(protocol);
- } catch (TException ex) {
- throw new RuntimeException(ex);
- }
- return span;
- }
-
- @Override
- public boolean hasNext() {
- return scanner.hasNext();
- }
-
- @Override
- public String next() {
- Entry<Key,Value> next = scanner.next();
- if (next.getKey().getColumnFamily().equals(SPAN_CF)) {
- StringBuilder result = new StringBuilder();
- SimpleDateFormat dateFormatter = new SimpleDateFormat(DATE_FORMAT);
- RemoteSpan span = getRemoteSpan(next);
- result.append("----------------------\n");
- result.append(String.format(" %12s:%s%n", "name", span.description));
- result.append(String.format(" %12s:%s%n", "trace", Long.toHexString(span.traceId)));
- result.append(String.format(" %12s:%s%n", "loc", span.svc + "@" + span.sender));
- result.append(String.format(" %12s:%s%n", "span", Long.toHexString(span.spanId)));
- result.append(String.format(" %12s:%s%n", "parent", Long.toHexString(span.parentId)));
- result.append(String.format(" %12s:%s%n", "start", dateFormatter.format(span.start)));
- result.append(String.format(" %12s:%s%n", "ms", span.stop - span.start));
- if (span.data != null) {
- for (Entry<ByteBuffer, ByteBuffer> entry : span.data.entrySet()) {
- String key = new String(entry.getKey().array(), entry.getKey().arrayOffset(), entry.getKey().limit(), UTF_8);
- String value = new String(entry.getValue().array(), entry.getValue().arrayOffset(), entry.getValue().limit(), UTF_8);
- result.append(String.format(" %12s:%s%n", key, value));
- }
- }
- if (span.annotations != null) {
- for (Annotation annotation : span.annotations) {
- result.append(String.format(" %12s:%s:%s%n", "annotation", annotation.getMsg(), dateFormatter.format(annotation.getTime())));
- }
- }
-
- if (printTimeStamps) {
- result.append(String.format(" %-12s:%d%n", "timestamp", next.getKey().getTimestamp()));
- }
- return result.toString();
- }
- return DefaultFormatter.formatEntry(next, printTimeStamps);
- }
-
- @Override
- public void remove() {
- throw new NotImplementedException();
- }
-
- @Override
- public void initialize(Iterable<Entry<Key,Value>> scanner, boolean printTimestamps) {
- this.scanner = scanner.iterator();
- this.printTimeStamps = printTimestamps;
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/Tracer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/Tracer.java b/core/src/main/java/org/apache/accumulo/core/trace/Tracer.java
new file mode 100644
index 0000000..1b42683
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/Tracer.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace;
+
+import org.apache.accumulo.core.trace.thrift.TInfo;
+import org.htrace.Span;
+
+public class Tracer {
+ private static final TInfo DONT_TRACE = new TInfo(0, 0);
+
+ /**
+ * Obtain {@link org.apache.accumulo.core.trace.thrift.TInfo} for the current span.
+ */
+ public static TInfo traceInfo() {
+ Span span = org.htrace.Trace.currentSpan();
+ if (span != null) {
+ return new TInfo(span.getTraceId(), span.getSpanId());
+ }
+ return DONT_TRACE;
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java b/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
deleted file mode 100644
index f53f133..0000000
--- a/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.core.trace;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.fate.zookeeper.ZooReader;
-import org.apache.log4j.Logger;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.htrace.HTraceConfiguration;
-
-/**
- * Find a Span collector via zookeeper and push spans there via Thrift RPC
- */
-public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
- private static final Logger log = Logger.getLogger(ZooTraceClient.class);
-
- private static final int DEFAULT_TIMEOUT = 30 * 1000;
-
- ZooReader zoo = null;
- String path;
- boolean pathExists = false;
- final Random random = new Random();
- final List<String> hosts = new ArrayList<String>();
-
- public ZooTraceClient() {
- super();
- }
-
- public ZooTraceClient(long millis) {
- super(millis);
- }
-
- @Override
- synchronized protected String getSpanKey(Map<ByteBuffer,ByteBuffer> data) {
- if (hosts.size() > 0) {
- String host = hosts.get(random.nextInt(hosts.size()));
- log.debug("sending data to " + host);
- return host;
- }
- return null;
- }
-
- @Override
- public void configure(HTraceConfiguration conf) {
- super.configure(conf);
- String keepers = conf.get(DistributedTrace.TRACER_ZK_HOST);
- if (keepers == null)
- throw new IllegalArgumentException("Must configure " + DistributedTrace.TRACER_ZK_HOST);
- int timeout = conf.getInt(DistributedTrace.TRACER_ZK_TIMEOUT, DEFAULT_TIMEOUT);
- zoo = new ZooReader(keepers, timeout);
- path = conf.get(DistributedTrace.TRACER_ZK_PATH, Constants.ZTRACERS);
- process(null);
- }
-
- @Override
- public void process(WatchedEvent event) {
- log.debug("Processing event for trace server zk watch");
- try {
- if (pathExists || zoo.exists(path)) {
- pathExists = true;
- updateHosts(path, zoo.getChildren(path, this));
- } else {
- zoo.exists(path, this);
- }
- } catch (Exception ex) {
- log.error("unable to get destination hosts in zookeeper", ex);
- }
- }
-
- @Override
- protected void sendSpans() {
- if (hosts.isEmpty()) {
- if (!sendQueue.isEmpty()) {
- log.error("No hosts to send data to, dropping queued spans");
- synchronized (sendQueue) {
- sendQueue.clear();
- sendQueue.notifyAll();
- }
- }
- } else {
- super.sendSpans();
- }
- }
-
- synchronized private void updateHosts(String path, List<String> children) {
- log.debug("Scanning trace hosts in zookeeper: " + path);
- try {
- List<String> hosts = new ArrayList<String>();
- for (String child : children) {
- byte[] data = zoo.getData(path + "/" + child, null);
- hosts.add(new String(data, UTF_8));
- }
- this.hosts.clear();
- this.hosts.addAll(hosts);
- log.debug("Trace hosts: " + this.hosts);
- } catch (Exception ex) {
- log.error("unable to get destination hosts in zookeeper", ex);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java b/core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java
new file mode 100644
index 0000000..75b0fd8
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java
@@ -0,0 +1,496 @@
+/*
+ * 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.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.core.trace.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 TInfo implements org.apache.thrift.TBase<TInfo, TInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TInfo> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInfo");
+
+ private static final org.apache.thrift.protocol.TField TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("traceId", org.apache.thrift.protocol.TType.I64, (short)1);
+ private static final org.apache.thrift.protocol.TField PARENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentId", org.apache.thrift.protocol.TType.I64, (short)2);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new TInfoStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new TInfoTupleSchemeFactory());
+ }
+
+ public long traceId; // required
+ public long parentId; // 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 {
+ TRACE_ID((short)1, "traceId"),
+ PARENT_ID((short)2, "parentId");
+
+ 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: // TRACE_ID
+ return TRACE_ID;
+ case 2: // PARENT_ID
+ return PARENT_ID;
+ 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
+ private static final int __TRACEID_ISSET_ID = 0;
+ private static final int __PARENTID_ISSET_ID = 1;
+ private byte __isset_bitfield = 0;
+ 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.TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("traceId", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.PARENT_ID, new org.apache.thrift.meta_data.FieldMetaData("parentId", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TInfo.class, metaDataMap);
+ }
+
+ public TInfo() {
+ }
+
+ public TInfo(
+ long traceId,
+ long parentId)
+ {
+ this();
+ this.traceId = traceId;
+ setTraceIdIsSet(true);
+ this.parentId = parentId;
+ setParentIdIsSet(true);
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public TInfo(TInfo other) {
+ __isset_bitfield = other.__isset_bitfield;
+ this.traceId = other.traceId;
+ this.parentId = other.parentId;
+ }
+
+ public TInfo deepCopy() {
+ return new TInfo(this);
+ }
+
+ @Override
+ public void clear() {
+ setTraceIdIsSet(false);
+ this.traceId = 0;
+ setParentIdIsSet(false);
+ this.parentId = 0;
+ }
+
+ public long getTraceId() {
+ return this.traceId;
+ }
+
+ public TInfo setTraceId(long traceId) {
+ this.traceId = traceId;
+ setTraceIdIsSet(true);
+ return this;
+ }
+
+ public void unsetTraceId() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TRACEID_ISSET_ID);
+ }
+
+ /** Returns true if field traceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetTraceId() {
+ return EncodingUtils.testBit(__isset_bitfield, __TRACEID_ISSET_ID);
+ }
+
+ public void setTraceIdIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TRACEID_ISSET_ID, value);
+ }
+
+ public long getParentId() {
+ return this.parentId;
+ }
+
+ public TInfo setParentId(long parentId) {
+ this.parentId = parentId;
+ setParentIdIsSet(true);
+ return this;
+ }
+
+ public void unsetParentId() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARENTID_ISSET_ID);
+ }
+
+ /** Returns true if field parentId is set (has been assigned a value) and false otherwise */
+ public boolean isSetParentId() {
+ return EncodingUtils.testBit(__isset_bitfield, __PARENTID_ISSET_ID);
+ }
+
+ public void setParentIdIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARENTID_ISSET_ID, value);
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case TRACE_ID:
+ if (value == null) {
+ unsetTraceId();
+ } else {
+ setTraceId((Long)value);
+ }
+ break;
+
+ case PARENT_ID:
+ if (value == null) {
+ unsetParentId();
+ } else {
+ setParentId((Long)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case TRACE_ID:
+ return Long.valueOf(getTraceId());
+
+ case PARENT_ID:
+ return Long.valueOf(getParentId());
+
+ }
+ 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 TRACE_ID:
+ return isSetTraceId();
+ case PARENT_ID:
+ return isSetParentId();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof TInfo)
+ return this.equals((TInfo)that);
+ return false;
+ }
+
+ public boolean equals(TInfo that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_traceId = true;
+ boolean that_present_traceId = true;
+ if (this_present_traceId || that_present_traceId) {
+ if (!(this_present_traceId && that_present_traceId))
+ return false;
+ if (this.traceId != that.traceId)
+ return false;
+ }
+
+ boolean this_present_parentId = true;
+ boolean that_present_parentId = true;
+ if (this_present_parentId || that_present_parentId) {
+ if (!(this_present_parentId && that_present_parentId))
+ return false;
+ if (this.parentId != that.parentId)
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(TInfo other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetTraceId()).compareTo(other.isSetTraceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTraceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.traceId, other.traceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetParentId()).compareTo(other.isSetParentId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetParentId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parentId, other.parentId);
+ 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("TInfo(");
+ boolean first = true;
+
+ sb.append("traceId:");
+ sb.append(this.traceId);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("parentId:");
+ sb.append(this.parentId);
+ 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 {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bitfield = 0;
+ 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 TInfoStandardSchemeFactory implements SchemeFactory {
+ public TInfoStandardScheme getScheme() {
+ return new TInfoStandardScheme();
+ }
+ }
+
+ private static class TInfoStandardScheme extends StandardScheme<TInfo> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, TInfo 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: // TRACE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.traceId = iprot.readI64();
+ struct.setTraceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // PARENT_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.parentId = iprot.readI64();
+ struct.setParentIdIsSet(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, TInfo struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldBegin(TRACE_ID_FIELD_DESC);
+ oprot.writeI64(struct.traceId);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(PARENT_ID_FIELD_DESC);
+ oprot.writeI64(struct.parentId);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class TInfoTupleSchemeFactory implements SchemeFactory {
+ public TInfoTupleScheme getScheme() {
+ return new TInfoTupleScheme();
+ }
+ }
+
+ private static class TInfoTupleScheme extends TupleScheme<TInfo> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, TInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetTraceId()) {
+ optionals.set(0);
+ }
+ if (struct.isSetParentId()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetTraceId()) {
+ oprot.writeI64(struct.traceId);
+ }
+ if (struct.isSetParentId()) {
+ oprot.writeI64(struct.parentId);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, TInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.traceId = iprot.readI64();
+ struct.setTraceIdIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.parentId = iprot.readI64();
+ struct.setParentIdIsSet(true);
+ }
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/wrappers/RpcClientInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/RpcClientInvocationHandler.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/RpcClientInvocationHandler.java
new file mode 100644
index 0000000..8b0156d
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/RpcClientInvocationHandler.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace.wrappers;
+
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
+import org.apache.accumulo.core.trace.thrift.TInfo;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class RpcClientInvocationHandler<I> implements InvocationHandler {
+
+ private final I instance;
+
+ protected RpcClientInvocationHandler(final I clientInstance) {
+ instance = clientInstance;
+ }
+
+ @Override
+ public Object invoke(Object obj, Method method, Object[] args) throws Throwable {
+ if (args == null || args.length < 1 || args[0] != null) {
+ return method.invoke(instance, args);
+ }
+ Class<?> klass = method.getParameterTypes()[0];
+ if (TInfo.class.isAssignableFrom(klass)) {
+ args[0] = Tracer.traceInfo();
+ }
+ Span span = Trace.start("client:" + method.getName());
+ try {
+ return method.invoke(instance, args);
+ } catch (InvocationTargetException ex) {
+ throw ex.getCause();
+ } finally {
+ span.stop();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/wrappers/RpcServerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/RpcServerInvocationHandler.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/RpcServerInvocationHandler.java
new file mode 100644
index 0000000..700e543
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/RpcServerInvocationHandler.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace.wrappers;
+
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.thrift.TInfo;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class RpcServerInvocationHandler<I> implements InvocationHandler {
+
+ private final I instance;
+
+ protected RpcServerInvocationHandler(final I serverInstance) {
+ instance = serverInstance;
+ }
+
+ @Override
+ public Object invoke(Object obj, Method method, Object[] args) throws Throwable {
+ if (args == null || args.length < 1 || args[0] == null || !(args[0] instanceof TInfo)) {
+ try {
+ return method.invoke(instance, args);
+ } catch (InvocationTargetException ex) {
+ throw ex.getCause();
+ }
+ }
+ Span span = Trace.trace((TInfo) args[0], method.getName());
+ try {
+ return method.invoke(instance, args);
+ } catch (InvocationTargetException ex) {
+ throw ex.getCause();
+ } finally {
+ span.stop();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceCallable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceCallable.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceCallable.java
new file mode 100644
index 0000000..0d0dc56
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceCallable.java
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace.wrappers;
+
+import org.htrace.Span;
+import org.htrace.Trace;
+import org.htrace.TraceScope;
+
+import java.util.concurrent.Callable;
+
+/**
+ * Wrap a Callable with a Span that survives a change in threads.
+ *
+ */
+public class TraceCallable<V> implements Callable<V> {
+ private final Callable<V> impl;
+ private final Span parent;
+ private final String description;
+
+ TraceCallable(Callable<V> impl) {
+ this(Trace.currentSpan(), impl);
+ }
+
+ TraceCallable(Span parent, Callable<V> impl) {
+ this(parent, impl, null);
+ }
+
+ TraceCallable(Span parent, Callable<V> impl, String description) {
+ this.impl = impl;
+ this.parent = parent;
+ this.description = description;
+ }
+
+ @Override
+ public V call() throws Exception {
+ if (parent != null) {
+ TraceScope chunk = Trace.startSpan(getDescription(), parent);
+ try {
+ return impl.call();
+ } finally {
+ TraceExecutorService.endThread(chunk.getSpan());
+ }
+ } else {
+ return impl.call();
+ }
+ }
+
+ public Callable<V> getImpl() {
+ return impl;
+ }
+
+ private String getDescription() {
+ return this.description == null ? Thread.currentThread().getName() : description;
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceExecutorService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceExecutorService.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceExecutorService.java
new file mode 100644
index 0000000..5ba61bf
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceExecutorService.java
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace.wrappers;
+
+import org.htrace.Span;
+import org.htrace.Tracer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class TraceExecutorService implements ExecutorService {
+
+ private final ExecutorService impl;
+
+ public TraceExecutorService(ExecutorService impl) {
+ this.impl = impl;
+ }
+
+ @Override
+ public void execute(Runnable command) {
+ impl.execute(new TraceRunnable(command));
+ }
+
+ @Override
+ public void shutdown() {
+ impl.shutdown();
+ }
+
+ @Override
+ public List<Runnable> shutdownNow() {
+ return impl.shutdownNow();
+ }
+
+ @Override
+ public boolean isShutdown() {
+ return impl.isShutdown();
+ }
+
+ @Override
+ public boolean isTerminated() {
+ return impl.isTerminated();
+ }
+
+ @Override
+ public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+ return impl.awaitTermination(timeout, unit);
+ }
+
+ @Override
+ public <T> Future<T> submit(Callable<T> task) {
+ return impl.submit(new TraceCallable<T>(task));
+ }
+
+ @Override
+ public <T> Future<T> submit(Runnable task, T result) {
+ return impl.submit(new TraceRunnable(task), result);
+ }
+
+ @Override
+ public Future<?> submit(Runnable task) {
+ return impl.submit(new TraceRunnable(task));
+ }
+
+ private <T> Collection<? extends Callable<T>> wrapCollection(Collection<? extends Callable<T>> tasks) {
+ List<Callable<T>> result = new ArrayList<Callable<T>>();
+ for (Callable<T> task : tasks) {
+ result.add(new TraceCallable<T>(task));
+ }
+ return result;
+ }
+
+ @Override
+ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
+ return impl.invokeAll(wrapCollection(tasks));
+ }
+
+ @Override
+ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
+ return impl.invokeAll(wrapCollection(tasks), timeout, unit);
+ }
+
+ @Override
+ public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
+ return impl.invokeAny(wrapCollection(tasks));
+ }
+
+ @Override
+ public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException,
+ TimeoutException {
+ return impl.invokeAny(wrapCollection(tasks), timeout, unit);
+ }
+
+ /**
+ * Finish a given trace and set the span for the current thread to null.
+ */
+ public static void endThread(Span span) {
+ if (span != null) {
+ span.stop();
+ Tracer.getInstance().continueSpan(null);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceRunnable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceRunnable.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceRunnable.java
new file mode 100644
index 0000000..5723b17
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceRunnable.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace.wrappers;
+
+import org.htrace.Span;
+import org.htrace.Trace;
+import org.htrace.TraceScope;
+
+/**
+ * Wrap a Runnable with a Span that survives a change in threads.
+ *
+ */
+public class TraceRunnable implements Runnable, Comparable<TraceRunnable> {
+
+ private final Span parent;
+ private final Runnable runnable;
+ private final String description;
+
+ public TraceRunnable(Runnable runnable) {
+ this(Trace.currentSpan(), runnable);
+ }
+
+ public TraceRunnable(Span parent, Runnable runnable) {
+ this(parent, runnable, null);
+ }
+
+ public TraceRunnable(Span parent, Runnable runnable, String description) {
+ this.parent = parent;
+ this.runnable = runnable;
+ this.description = description;
+ }
+
+ @Override
+ public void run() {
+ if (parent != null) {
+ TraceScope chunk = Trace.startSpan(getDescription(), parent);
+ try {
+ runnable.run();
+ } finally {
+ TraceExecutorService.endThread(chunk.getSpan());
+ }
+ } else {
+ runnable.run();
+ }
+ }
+
+ private String getDescription() {
+ return this.description == null ? Thread.currentThread().getName() : description;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof TraceRunnable) {
+ return 0 == this.compareTo((TraceRunnable) o);
+ }
+
+ return false;
+ }
+
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ @Override
+ public int compareTo(TraceRunnable o) {
+ return ((Comparable) this.runnable).compareTo(o.runnable);
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
new file mode 100644
index 0000000..f675c53
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/wrappers/TraceWrap.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace.wrappers;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+
+/**
+ * To move trace data from client to server, the RPC call must be annotated to take a TInfo object as its first argument. The user can simply pass null, so long
+ * as they wrap their Client and Service objects with these functions.
+ *
+ * <pre>
+ * Trace.on("remoteMethod");
+ * Iface c = new Client();
+ * c = TraceWrap.client(c);
+ * c.remoteMethod(null, arg2, arg3);
+ * Trace.off();
+ * </pre>
+ *
+ * The wrapper will see the annotated method and send or re-establish the trace information.
+ *
+ * Note that the result of these calls is a Proxy object that conforms to the basic interfaces, but is not your concrete instance.
+ *
+ */
+public class TraceWrap {
+
+ public static <T> T service(final T instance) {
+ InvocationHandler handler = new RpcServerInvocationHandler<T>(instance);
+ return wrappedInstance(handler, instance);
+ }
+
+ public static <T> T client(final T instance) {
+ InvocationHandler handler = new RpcClientInvocationHandler<T>(instance);
+ return wrappedInstance(handler, instance);
+ }
+
+ private static <T> T wrappedInstance(final InvocationHandler handler, final T instance) {
+ @SuppressWarnings("unchecked")
+ T proxiedInstance = (T) Proxy.newProxyInstance(instance.getClass().getClassLoader(), instance.getClass().getInterfaces(), handler);
+ return proxiedInstance;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java b/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
index cd14c63..f90065d 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.core.util;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.accumulo.trace.instrument.TraceRunnable;
+import org.apache.accumulo.core.trace.wrappers.TraceRunnable;
import org.apache.log4j.Logger;
public class NamingThreadFactory implements ThreadFactory {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java b/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
index 0edc884..34c2e63 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
@@ -30,8 +30,8 @@ import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.thrift.TServiceClient;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh
index 8c60cf3..050001e 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -27,9 +27,9 @@
# Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
# ========================================================================================================================
[[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.9.1'
-[[ -z $INCLUDED_MODULES ]] && INCLUDED_MODULES=(../trace)
+[[ -z $INCLUDED_MODULES ]] && INCLUDED_MODULES=(../server/tracer)
[[ -z $BASE_OUTPUT_PACKAGE ]] && BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
-[[ -z $PACKAGES_TO_GENERATE ]] && PACKAGES_TO_GENERATE=(gc master tabletserver security client.impl data replication)
+[[ -z $PACKAGES_TO_GENERATE ]] && PACKAGES_TO_GENERATE=(gc master tabletserver security client.impl data replication trace)
[[ -z $BUILD_DIR ]] && BUILD_DIR='target'
[[ -z $LANGUAGES_TO_GENERATE ]] && LANGUAGES_TO_GENERATE=(java)
[[ -z $FINAL_DIR ]] && FINAL_DIR='src/main'
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/thrift/trace.thrift
----------------------------------------------------------------------
diff --git a/core/src/main/thrift/trace.thrift b/core/src/main/thrift/trace.thrift
new file mode 100644
index 0000000..dc6c44d
--- /dev/null
+++ b/core/src/main/thrift/trace.thrift
@@ -0,0 +1,23 @@
+/*
+* 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.
+*/
+namespace java org.apache.accumulo.core.trace.thrift
+namespace cpp org.apache.accumulo.core.trace.thrift
+
+struct TInfo {
+ 1:i64 traceId,
+ 2:i64 parentId,
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java b/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java
new file mode 100644
index 0000000..7fe5233
--- /dev/null
+++ b/core/src/test/java/org/apache/accumulo/core/trace/PerformanceTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace;
+
+import org.junit.Test;
+
+public class PerformanceTest {
+
+ @Test
+ public void test() {
+
+ }
+
+ public static void main(String[] args) {
+
+ long now = System.currentTimeMillis();
+ for (long i = 0; i < 1000 * 1000; i++) {
+ @SuppressWarnings("unused")
+ Long x = new Long(i);
+ }
+ System.out.println(String.format("Trivial took %d millis", System.currentTimeMillis() - now));
+ now = System.currentTimeMillis();
+ for (long i = 0; i < 1000 * 1000; i++) {
+ Span s = Trace.start("perf");
+ s.stop();
+ }
+ System.out.println(String.format("Span Loop took %d millis", System.currentTimeMillis() - now));
+ now = System.currentTimeMillis();
+ Trace.on("test");
+ for (long i = 0; i < 1000 * 1000; i++) {
+ Span s = Trace.start("perf");
+ s.stop();
+ }
+ Trace.off();
+ System.out.println(String.format("Trace took %d millis", System.currentTimeMillis() - now));
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index 37adc00..a886c17 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
+ <artifactId>accumulo-tracer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TraceDumpExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TraceDumpExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TraceDumpExample.java
index 70a23e5..8fbf5e9 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TraceDumpExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TraceDumpExample.java
@@ -23,8 +23,8 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.trace.TraceDump;
-import org.apache.accumulo.core.trace.TraceDump.Printer;
+import org.apache.accumulo.tracer.TraceDump;
+import org.apache.accumulo.tracer.TraceDump.Printer;
import org.apache.hadoop.io.Text;
import com.beust.jcommander.Parameter;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 3982db5..4b03609 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -67,6 +67,7 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.master.thrift.MasterClientService;
import org.apache.accumulo.core.master.thrift.MasterGoalState;
import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.Daemon;
import org.apache.accumulo.core.util.Pair;
@@ -88,7 +89,6 @@ import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooReaderWriterFactory;
import org.apache.accumulo.start.Main;
import org.apache.accumulo.start.classloader.vfs.MiniDFSUtil;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.accumulo.tserver.TabletServer;
import org.apache.commons.configuration.MapConfiguration;
import org.apache.commons.io.FileUtils;
[03/15] accumulo git commit: ACCUMULO-898 convert accumulo to use
htrace
Posted by bi...@apache.org.
ACCUMULO-898 convert accumulo to use htrace
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db2dda1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db2dda1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/db2dda1b
Branch: refs/heads/master
Commit: db2dda1b7b6431a2ee57148db2de74c0432b9480
Parents: 34ca056
Author: Billie Rinaldi <bi...@apache.org>
Authored: Tue Nov 4 10:16:11 2014 -0800
Committer: Billie Rinaldi <bi...@apache.org>
Committed: Fri Nov 7 14:32:04 2014 -0800
----------------------------------------------------------------------
assemble/bin/stop-all.sh | 2 +-
assemble/pom.xml | 4 +
assemble/src/main/assemblies/component.xml | 1 +
core/pom.xml | 4 +
.../core/client/ClientConfiguration.java | 34 +-
.../org/apache/accumulo/core/conf/Property.java | 4 +
.../apache/accumulo/core/conf/PropertyType.java | 3 +
.../accumulo/core/trace/AsyncSpanReceiver.java | 173 ++++
.../accumulo/core/trace/DistributedTrace.java | 208 ++++-
.../accumulo/core/trace/SendSpansViaThrift.java | 97 +++
.../apache/accumulo/core/trace/TraceDump.java | 3 +-
.../accumulo/core/trace/TraceFormatter.java | 17 +-
.../accumulo/core/trace/ZooTraceClient.java | 78 +-
.../apache/accumulo/core/util/ThriftUtil.java | 7 +-
.../main/asciidoc/chapters/administration.txt | 106 ++-
docs/src/main/resources/distributedTracing.html | 13 +-
.../examples/simple/client/TracingExample.java | 29 +-
.../minicluster/MiniAccumuloInstance.java | 2 +-
pom.xml | 6 +
.../org/apache/accumulo/server/Accumulo.java | 9 -
.../apache/accumulo/server/init/Initialize.java | 1 -
.../server/trace/TraceFSDataInputStream.java | 90 --
.../accumulo/server/trace/TraceFileSystem.java | 818 -------------------
.../accumulo/server/util/AccumuloStatus.java | 3 +-
.../org/apache/accumulo/server/util/ZooZap.java | 7 +-
.../accumulo/gc/SimpleGarbageCollector.java | 17 +-
.../java/org/apache/accumulo/master/Master.java | 5 +-
.../master/replication/ReplicationDriver.java | 9 +-
.../org/apache/accumulo/monitor/Monitor.java | 9 +-
.../monitor/servlets/trace/ShowTrace.java | 26 +-
.../accumulo/monitor/ShowTraceLinkTypeTest.java | 60 +-
.../org/apache/accumulo/tracer/TraceServer.java | 21 +-
.../tserver/BulkFailedCopyProcessor.java | 7 +-
.../apache/accumulo/tserver/InMemoryMap.java | 5 +-
.../apache/accumulo/tserver/TabletServer.java | 5 +-
.../replication/AccumuloReplicaSystem.java | 2 +-
.../apache/accumulo/tserver/tablet/Tablet.java | 7 +-
.../java/org/apache/accumulo/shell/Shell.java | 5 +-
.../accumulo/shell/commands/TraceCommand.java | 2 +-
.../org/apache/accumulo/test/TestIngest.java | 12 +-
.../org/apache/accumulo/test/VerifyIngest.java | 9 +-
.../accumulo/test/ConditionalWriterIT.java | 3 +-
.../accumulo/test/functional/BulkFileIT.java | 3 +-
.../accumulo/test/functional/ExamplesIT.java | 2 +-
.../accumulo/test/functional/SimpleMacIT.java | 18 +-
trace/pom.xml | 4 +
.../trace/instrument/CloudtraceSpan.java | 71 ++
.../accumulo/trace/instrument/CountSampler.java | 18 +-
.../accumulo/trace/instrument/Sampler.java | 6 +-
.../apache/accumulo/trace/instrument/Span.java | 213 +++--
.../apache/accumulo/trace/instrument/Trace.java | 133 ++-
.../trace/instrument/TraceCallable.java | 24 +-
.../trace/instrument/TraceExecutorService.java | 12 +
.../accumulo/trace/instrument/TraceProxy.java | 72 --
.../trace/instrument/TraceRunnable.java | 20 +-
.../accumulo/trace/instrument/Tracer.java | 127 +--
.../trace/instrument/impl/MilliSpan.java | 141 ----
.../trace/instrument/impl/NullSpan.java | 102 ---
.../trace/instrument/impl/RootMilliSpan.java | 43 -
.../instrument/receivers/AsyncSpanReceiver.java | 132 ---
.../trace/instrument/receivers/LogSpans.java | 63 --
.../receivers/SendSpansViaThrift.java | 89 --
.../instrument/receivers/SpanReceiver.java | 28 -
.../instrument/receivers/ZooSpanClient.java | 122 ---
.../accumulo/trace/thrift/Annotation.java | 502 ++++++++++++
.../accumulo/trace/thrift/RemoteSpan.java | 224 ++++-
trace/src/main/thrift/trace.thrift | 8 +-
.../accumulo/trace/instrument/TracerTest.java | 63 +-
68 files changed, 1983 insertions(+), 2180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/assemble/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/assemble/bin/stop-all.sh b/assemble/bin/stop-all.sh
index 4bf06c0..0af0ee1 100755
--- a/assemble/bin/stop-all.sh
+++ b/assemble/bin/stop-all.sh
@@ -64,5 +64,5 @@ done
"${bin}/tdown.sh"
echo "Cleaning all server entries in ZooKeeper"
-"$ACCUMULO_HOME/bin/accumulo" org.apache.accumulo.server.util.ZooZap -master -tservers -tracers
+"$ACCUMULO_HOME/bin/accumulo" org.apache.accumulo.server.util.ZooZap -master -tservers -tracers --site-file "$ACCUMULO_CONF_DIR/accumulo-site.xml"
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 89a3747..c764091 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -161,6 +161,10 @@
<artifactId>jetty-util</artifactId>
</dependency>
<dependency>
+ <groupId>org.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 599d26c..3f18da3 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -42,6 +42,7 @@
<include>org.eclipse.jetty:jetty-server</include>
<include>org.eclipse.jetty:jetty-servlet</include>
<include>org.eclipse.jetty:jetty-util</include>
+ <include>org.htrace:htrace-core</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
</includes>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 10e7d71..1cbc6df 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -103,6 +103,10 @@
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
+ <groupId>org.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 39b460d..6fe61a5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -21,8 +21,11 @@ import java.io.File;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
import org.apache.accumulo.core.conf.Property;
@@ -56,7 +59,10 @@ public class ClientConfiguration extends CompositeConfiguration {
INSTANCE_ZK_HOST(Property.INSTANCE_ZK_HOST),
INSTANCE_ZK_TIMEOUT(Property.INSTANCE_ZK_TIMEOUT),
INSTANCE_NAME("instance.name", null, PropertyType.STRING, "Name of Accumulo instance to connect to"),
- INSTANCE_ID("instance.id", null, PropertyType.STRING, "UUID of Accumulo instance to connect to"), ;
+ INSTANCE_ID("instance.id", null, PropertyType.STRING, "UUID of Accumulo instance to connect to"),
+ TRACE_SPAN_RECEIVERS(Property.TRACE_SPAN_RECEIVERS),
+ TRACE_SPAN_RECEIVER_PREFIX(Property.TRACE_SPAN_RECEIVER_PREFIX),
+ TRACE_ZK_PATH(Property.TRACE_ZK_PATH);
private String key;
private String defaultValue;
@@ -208,6 +214,32 @@ public class ClientConfiguration extends CompositeConfiguration {
return prop.getDefaultValue();
}
+ private void checkType(ClientProperty property, PropertyType type) {
+ if (!property.getType().equals(type)) {
+ String msg = "Configuration method intended for type " + type + " called with a " + property.getType() + " argument (" + property.getKey() + ")";
+ throw new IllegalArgumentException(msg);
+ }
+ }
+
+ /**
+ * Gets all properties under the given prefix in this configuration.
+ *
+ * @param property prefix property, must be of type PropertyType.PREFIX
+ * @return a map of property keys to values
+ * @throws IllegalArgumentException if property is not a prefix
+ */
+ public Map<String,String> getAllPropertiesWithPrefix(ClientProperty property) {
+ checkType(property, PropertyType.PREFIX);
+
+ Map<String,String> propMap = new HashMap<String,String>();
+ Iterator<?> iter = this.getKeys(property.getKey());
+ while (iter.hasNext()) {
+ String p = (String)iter.next();
+ propMap.put(p, getString(p));
+ }
+ return propMap;
+ }
+
/**
* Sets the value of property to value
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/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 a558760..fe313c1 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
@@ -27,6 +27,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
+import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.file.rfile.RFile;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
@@ -329,6 +330,9 @@ 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_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"),
TRACE_TABLE("trace.table", "trace", PropertyType.STRING, "The name of the table to store distributed traces"),
TRACE_USER("trace.user", "root", PropertyType.STRING, "The name of the user to store distributed traces"),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index fc20535..bf39da9 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -68,6 +68,9 @@ public enum PropertyType {
CLASSNAME("java class", "[\\w$.]*", "A fully qualified java class name representing a class on the classpath.\n"
+ "An example is 'java.lang.String', rather than 'String'"),
+ CLASSNAMELIST("java class list", "[\\w$.,]*", "A list of fully qualified java class names representing classes on the classpath.\n"
+ + "An example is 'java.lang.String', rather than 'String'"),
+
DURABILITY("durability", "(?:none|log|flush|sync)", "One of 'none', 'log', 'flush' or 'sync'."),
STRING("string", ".*",
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/trace/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/AsyncSpanReceiver.java b/core/src/main/java/org/apache/accumulo/core/trace/AsyncSpanReceiver.java
new file mode 100644
index 0000000..379302e
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/AsyncSpanReceiver.java
@@ -0,0 +1,173 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace;
+
+import org.apache.accumulo.trace.thrift.Annotation;
+import org.apache.accumulo.trace.thrift.RemoteSpan;
+import org.apache.log4j.Logger;
+import org.htrace.HTraceConfiguration;
+import org.htrace.Span;
+import org.htrace.SpanReceiver;
+import org.htrace.TimelineAnnotation;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.AbstractQueue;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * Deliver Span information periodically to a destination.
+ * <ul>
+ * <li>Send host and service information with the span.
+ * <li>Cache Destination objects by some key that can be extracted from the span.
+ * <li>Can be used to queue spans up for delivery over RPC, or for saving into a file.
+ * </ul>
+ */
+public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanReceiver {
+
+ private static final Logger log = Logger.getLogger(AsyncSpanReceiver.class);
+
+ private final Map<SpanKey,Destination> clients = new HashMap<SpanKey,Destination>();
+
+ protected String host = null;
+ protected String service = null;
+
+ protected abstract Destination createDestination(SpanKey key) throws Exception;
+
+ protected abstract void send(Destination resource, RemoteSpan span) throws Exception;
+
+ protected abstract SpanKey getSpanKey(Map<ByteBuffer,ByteBuffer> data);
+
+ Timer timer = new Timer("SpanSender", true);
+ protected final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>();
+
+ public AsyncSpanReceiver() {
+ this(1000);
+ }
+
+ public AsyncSpanReceiver(long millis) {
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ try {
+ sendSpans();
+ } catch (Exception ex) {
+ log.warn("Exception sending spans to destination", ex);
+ }
+ }
+
+ }, millis, millis);
+ }
+
+ protected void sendSpans() {
+ while (!sendQueue.isEmpty()) {
+ boolean sent = false;
+ RemoteSpan s = sendQueue.peek();
+ SpanKey dest = getSpanKey(s.data);
+ Destination client = clients.get(dest);
+ if (client == null) {
+ try {
+ clients.put(dest, createDestination(dest));
+ } catch (Exception ex) {
+ log.warn("Exception creating connection to span receiver", ex);
+ }
+ }
+ if (client != null) {
+ try {
+ send(client, s);
+ synchronized (sendQueue) {
+ sendQueue.remove();
+ sendQueue.notifyAll();
+ }
+ sent = true;
+ } catch (Exception ex) {
+ log.warn("Got error sending to " + dest + ", refreshing client", ex);
+ clients.remove(dest);
+ }
+ }
+ if (!sent)
+ break;
+ }
+ }
+
+ public static Map<ByteBuffer, ByteBuffer> convertToByteBuffers(Map<byte[], byte[]> bytesMap) {
+ if (bytesMap == null)
+ return null;
+ Map<ByteBuffer, ByteBuffer> result = new HashMap<ByteBuffer, ByteBuffer>();
+ for (Entry<byte[], byte[]> bytes : bytesMap.entrySet()) {
+ result.put(ByteBuffer.wrap(bytes.getKey()), ByteBuffer.wrap(bytes.getValue()));
+ }
+ return result;
+ }
+
+ public static List<Annotation> convertToAnnotations(List<TimelineAnnotation> annotations) {
+ if (annotations == null)
+ return null;
+ List<Annotation> result = new ArrayList<Annotation>();
+ for (TimelineAnnotation annotation : annotations) {
+ result.add(new Annotation(annotation.getTime(), annotation.getMessage()));
+ }
+ return result;
+ }
+
+ @Override
+ public void receiveSpan(Span s) {
+ Map<ByteBuffer, ByteBuffer> data = convertToByteBuffers(s.getKVAnnotations());
+ SpanKey dest = getSpanKey(data);
+ if (dest != null) {
+ List<Annotation> annotations = convertToAnnotations(s.getTimelineAnnotations());
+ sendQueue.add(new RemoteSpan(host, service==null ? s.getProcessId() : service, s.getTraceId(), s.getSpanId(), s.getParentId(),
+ s.getStartTimeMillis(), s.getStopTimeMillis(), s.getDescription(), data, annotations));
+ }
+ }
+
+ @Override
+ public void close() {
+ synchronized (sendQueue) {
+ while (!sendQueue.isEmpty()) {
+ try {
+ sendQueue.wait();
+ } catch (InterruptedException e) {
+ log.warn("flush interrupted");
+ break;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void configure(HTraceConfiguration conf) {
+ host = conf.get(DistributedTrace.TRACE_HOST_PROPERTY, host);
+ if (host == null) {
+ try {
+ host = InetAddress.getLocalHost().getCanonicalHostName().toString();
+ } catch (UnknownHostException e) {
+ host = "unknown";
+ }
+ }
+ service = conf.get(DistributedTrace.TRACE_SERVICE_PROPERTY, service);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
index 83f5c26..fe9377e 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
@@ -17,27 +17,213 @@
package org.apache.accumulo.core.trace;
import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.ClientConfiguration;
+import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.fate.zookeeper.ZooReader;
+import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.ShutdownHookManager;
+import org.apache.log4j.Logger;
import org.apache.zookeeper.KeeperException;
+import org.htrace.HTraceConfiguration;
+import org.htrace.SpanReceiver;
+/**
+ * Utility class to enable tracing for Accumulo server processes.
+ *
+ */
public class DistributedTrace {
+ private static final Logger log = Logger.getLogger(DistributedTrace.class);
+
+ private static final String HTRACE_CONF_PREFIX = "hadoop.";
+
+ public static final String TRACE_HOST_PROPERTY = "trace.host";
+ public static final String TRACE_SERVICE_PROPERTY = "trace.service";
+
+ public static final String TRACER_ZK_HOST = "tracer.zookeeper.host";
+ public static final String TRACER_ZK_TIMEOUT = "tracer.zookeeper.timeout";
+ public static final String TRACER_ZK_PATH = "tracer.zookeeper.path";
+
+ private static final HashSet<SpanReceiver> receivers = new HashSet<SpanReceiver>();
+
+ /**
+ * @deprecated since 1.7, use {@link DistributedTrace#enable(String, String, org.apache.accumulo.core.client.ClientConfiguration)} instead
+ */
+ @Deprecated
public static void enable(Instance instance, ZooReader zoo, String application, String address) throws IOException, KeeperException, InterruptedException {
- String path = ZooUtil.getRoot(instance) + Constants.ZTRACERS;
- if (address == null) {
+ enable(address, application);
+ }
+
+ /**
+ * Enable tracing by setting up SpanReceivers for the current process.
+ */
+ public static void enable() {
+ enable(null, null);
+ }
+
+ /**
+ * Enable tracing by setting up SpanReceivers for the current process.
+ * If service name is null, the simple name of the class will be used.
+ */
+ public static void enable(String service) {
+ enable(null, service);
+ }
+
+ /**
+ * Enable tracing by setting up SpanReceivers for the current process.
+ * If host name is null, it will be determined.
+ * If service name is null, the simple name of the class will be used.
+ */
+ public static void enable(String hostname, String service) {
+ enable(hostname, service, ClientConfiguration.loadDefault());
+ }
+
+ /**
+ * Enable tracing by setting up SpanReceivers for the current process.
+ * If host name is null, it will be determined.
+ * If service name is null, the simple name of the class will be used.
+ * Properties required in the client configuration include {@link org.apache.accumulo.core.client.ClientConfiguration.ClientProperty#TRACE_SPAN_RECEIVERS} and any properties specific to the span receiver.
+ */
+ public static void enable(String hostname, String service, ClientConfiguration conf) {
+ String spanReceivers = conf.get(ClientProperty.TRACE_SPAN_RECEIVERS);
+ String zookeepers = conf.get(ClientProperty.INSTANCE_ZK_HOST);
+ long timeout = AccumuloConfiguration.getTimeInMillis(conf.get(ClientProperty.INSTANCE_ZK_TIMEOUT));
+ String zkPath = conf.get(ClientProperty.TRACE_ZK_PATH);
+ Map<String,String> properties = conf.getAllPropertiesWithPrefix(ClientProperty.TRACE_SPAN_RECEIVER_PREFIX);
+ enableTracing(hostname, service, spanReceivers, zookeepers, timeout, zkPath, properties);
+ }
+
+ /**
+ * Enable tracing by setting up SpanReceivers for the current process.
+ * If host name is null, it will be determined.
+ * If service name is null, the simple name of the class will be used.
+ */
+ public static void enable(String hostname, String service, AccumuloConfiguration conf) {
+ String spanReceivers = conf.get(Property.TRACE_SPAN_RECEIVERS);
+ String zookeepers = conf.get(Property.INSTANCE_ZK_HOST);
+ long timeout = conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
+ String zkPath = conf.get(Property.TRACE_ZK_PATH);
+ Map<String,String> properties = conf.getAllPropertiesWithPrefix(Property.TRACE_SPAN_RECEIVER_PREFIX);
+ enableTracing(hostname, service, spanReceivers, zookeepers, timeout, zkPath, properties);
+ }
+
+ private static void enableTracing(String hostname, String service, String spanReceivers, String zookeepers, long timeout, String zkPath,
+ Map<String,String> properties) {
+ Configuration conf = new Configuration(false);
+ conf.set(Property.TRACE_SPAN_RECEIVERS.toString(), spanReceivers);
+
+ // remaining properties will be parsed through an HTraceConfiguration by SpanReceivers
+ setProperty(conf, TRACER_ZK_HOST, zookeepers);
+ setProperty(conf, TRACER_ZK_TIMEOUT, (int) timeout);
+ setProperty(conf, TRACER_ZK_PATH, zkPath);
+ for (Entry<String,String> property : properties.entrySet()) {
+ setProperty(conf, property.getKey().substring(Property.TRACE_SPAN_RECEIVER_PREFIX.getKey().length()), property.getValue());
+ }
+ if (hostname != null) {
+ setProperty(conf, TRACE_HOST_PROPERTY, hostname);
+ }
+ if (service != null) {
+ setProperty(conf, TRACE_SERVICE_PROPERTY, service);
+ }
+ org.htrace.Trace.setProcessId(service);
+ ShutdownHookManager.get().addShutdownHook(new Runnable() {
+ public void run() {
+ Trace.off();
+ closeReceivers();
+ }
+ }, 0);
+ loadSpanReceivers(conf);
+ }
+
+ /**
+ * Disable tracing by closing SpanReceivers for the current process.
+ */
+ public static void disable() {
+ closeReceivers();
+ }
+
+ private static synchronized void loadSpanReceivers(Configuration conf) {
+ if (!receivers.isEmpty()) {
+ log.info("Already loaded span receivers, enable tracing does not need to be called again");
+ return;
+ }
+ Class<?> implClass = null;
+ String[] receiverNames = conf.getTrimmedStrings(Property.TRACE_SPAN_RECEIVERS.toString());
+ if (receiverNames == null || receiverNames.length == 0) {
+ return;
+ }
+ for (String className : receiverNames) {
+ try {
+ implClass = Class.forName(className);
+ receivers.add(loadInstance(implClass, conf));
+ log.info("SpanReceiver " + className + " was loaded successfully.");
+ } catch (ClassNotFoundException e) {
+ log.warn("Class " + className + " cannot be found.", e);
+ } catch (IOException e) {
+ log.warn("Load SpanReceiver " + className + " failed.", e);
+ }
+ }
+ for (SpanReceiver rcvr : receivers) {
+ org.htrace.Trace.addReceiver(rcvr);
+ }
+ }
+
+ private static SpanReceiver loadInstance(Class<?> implClass, Configuration conf) throws IOException {
+ SpanReceiver impl;
+ try {
+ Object o = ReflectionUtils.newInstance(implClass, conf);
+ impl = (SpanReceiver)o;
+ impl.configure(wrapHadoopConf(conf));
+ } catch (SecurityException e) {
+ throw new IOException(e);
+ } catch (IllegalArgumentException e) {
+ throw new IOException(e);
+ } catch (RuntimeException e) {
+ throw new IOException(e);
+ }
+
+ return impl;
+ }
+
+ private static void setProperty(Configuration conf, String key, String value) {
+ conf.set(HTRACE_CONF_PREFIX + key, value);
+ }
+
+ private static void setProperty(Configuration conf, String key, int value) {
+ conf.setInt(HTRACE_CONF_PREFIX + key, value);
+ }
+
+ private static HTraceConfiguration wrapHadoopConf(final Configuration conf) {
+ return new HTraceConfiguration() {
+ @Override
+ public String get(String key) {
+ return conf.get(HTRACE_CONF_PREFIX + key);
+ }
+
+ @Override
+ public String get(String key, String defaultValue) {
+ return conf.get(HTRACE_CONF_PREFIX + key, defaultValue);
+ }
+ };
+ }
+
+ private static synchronized void closeReceivers() {
+ for (SpanReceiver rcvr : receivers) {
try {
- address = InetAddress.getLocalHost().getHostAddress().toString();
- } catch (UnknownHostException e) {
- address = "unknown";
+ rcvr.close();
+ } catch (IOException e) {
+ log.warn("Unable to close SpanReceiver correctly: " + e.getMessage(), e);
}
}
- Tracer.getInstance().addReceiver(new ZooTraceClient(zoo, path, address, application, 1000));
+ receivers.clear();
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/trace/SendSpansViaThrift.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/SendSpansViaThrift.java b/core/src/main/java/org/apache/accumulo/core/trace/SendSpansViaThrift.java
new file mode 100644
index 0000000..87a9378
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/trace/SendSpansViaThrift.java
@@ -0,0 +1,97 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.trace;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import org.apache.accumulo.trace.thrift.RemoteSpan;
+import org.apache.accumulo.trace.thrift.SpanReceiver.Client;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.util.Map;
+
+/**
+ * Send Span data to a destination using thrift.
+ */
+public class SendSpansViaThrift extends AsyncSpanReceiver<String,Client> {
+
+ private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SendSpansViaThrift.class);
+
+ private static final String THRIFT = "thrift://";
+
+ public SendSpansViaThrift() {
+ super();
+ }
+
+ public SendSpansViaThrift(long millis) {
+ super(millis);
+ }
+
+ @Override
+ protected Client createDestination(String destination) throws Exception {
+ if (destination == null)
+ return null;
+ try {
+ int portSeparatorIndex = destination.lastIndexOf(':');
+ String host = destination.substring(0, portSeparatorIndex);
+ int port = Integer.parseInt(destination.substring(portSeparatorIndex+1));
+ log.debug("Connecting to " + host + ":" + port);
+ InetSocketAddress addr = new InetSocketAddress(host, port);
+ Socket sock = new Socket();
+ sock.connect(addr);
+ TTransport transport = new TSocket(sock);
+ TProtocol prot = new TBinaryProtocol(transport);
+ return new Client(prot);
+ } catch (Exception ex) {
+ log.error(ex, ex);
+ return null;
+ }
+ }
+
+ @Override
+ protected void send(Client client, RemoteSpan s) throws Exception {
+ if (client != null) {
+ try {
+ client.span(s);
+ } catch (Exception ex) {
+ client.getInputProtocol().getTransport().close();
+ throw ex;
+ }
+ }
+ }
+
+ private static final ByteBuffer DEST = ByteBuffer.wrap("dest".getBytes(UTF_8));
+
+ protected String getSpanKey(Map<ByteBuffer,ByteBuffer> data) {
+ String dest = new String(data.get(DEST).array());
+ if (dest != null && dest.startsWith(THRIFT)) {
+ String hostAddress = dest.substring(THRIFT.length());
+ String[] hostAddr = hostAddress.split(":", 2);
+ if (hostAddr.length == 2) {
+ return hostAddress;
+ }
+ }
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java b/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
index b44cc3e..e3f9e5a 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
@@ -37,6 +37,7 @@ import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.hadoop.io.Text;
+import org.htrace.Span;
import com.beust.jcommander.Parameter;
@@ -134,7 +135,7 @@ public class TraceDump {
RemoteSpan span = TraceFormatter.getRemoteSpan(entry);
tree.addNode(span);
start = min(start, span.start);
- if (span.parentId <= 0)
+ if (span.parentId == Span.ROOT_SPAN_ID)
count++;
}
out.print(String.format("Trace started at %s", TraceFormatter.formatDate(new Date(start))));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java b/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
index 9d860d9..d6842df 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
@@ -16,11 +16,15 @@
*/
package org.apache.accumulo.core.trace;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.nio.ByteBuffer;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.Map.Entry;
+import org.apache.accumulo.trace.thrift.Annotation;
import org.apache.accumulo.trace.thrift.RemoteSpan;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
@@ -88,8 +92,17 @@ public class TraceFormatter implements Formatter {
result.append(String.format(" %12s:%s%n", "parent", Long.toHexString(span.parentId)));
result.append(String.format(" %12s:%s%n", "start", dateFormatter.format(span.start)));
result.append(String.format(" %12s:%s%n", "ms", span.stop - span.start));
- for (Entry<String,String> entry : span.data.entrySet()) {
- result.append(String.format(" %12s:%s%n", entry.getKey(), entry.getValue()));
+ if (span.data != null) {
+ for (Entry<ByteBuffer, ByteBuffer> entry : span.data.entrySet()) {
+ String key = new String(entry.getKey().array(), entry.getKey().arrayOffset(), entry.getKey().limit(), UTF_8);
+ String value = new String(entry.getValue().array(), entry.getValue().arrayOffset(), entry.getValue().limit(), UTF_8);
+ result.append(String.format(" %12s:%s%n", key, value));
+ }
+ }
+ if (span.annotations != null) {
+ for (Annotation annotation : span.annotations) {
+ result.append(String.format(" %12s:%s:%s%n", "annotation", annotation.getMsg(), dateFormatter.format(annotation.getTime())));
+ }
}
if (printTimeStamps) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java b/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
index 9586eaa..f53f133 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
@@ -18,57 +18,93 @@ package org.apache.accumulo.core.trace;
import static java.nio.charset.StandardCharsets.UTF_8;
-import java.io.IOException;
+import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Random;
+import org.apache.accumulo.core.Constants;
import org.apache.accumulo.fate.zookeeper.ZooReader;
-import org.apache.accumulo.trace.instrument.receivers.SendSpansViaThrift;
import org.apache.log4j.Logger;
-import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
-
+import org.htrace.HTraceConfiguration;
/**
* Find a Span collector via zookeeper and push spans there via Thrift RPC
- *
*/
public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
-
private static final Logger log = Logger.getLogger(ZooTraceClient.class);
-
- final ZooReader zoo;
- final String path;
+
+ private static final int DEFAULT_TIMEOUT = 30 * 1000;
+
+ ZooReader zoo = null;
+ String path;
+ boolean pathExists = false;
final Random random = new Random();
final List<String> hosts = new ArrayList<String>();
-
- public ZooTraceClient(ZooReader zoo, String path, String host, String service, long millis) throws IOException, KeeperException, InterruptedException {
- super(host, service, millis);
- this.path = path;
- this.zoo = zoo;
- updateHosts(path, zoo.getChildren(path, this));
+
+ public ZooTraceClient() {
+ super();
}
-
+
+ public ZooTraceClient(long millis) {
+ super(millis);
+ }
+
@Override
- synchronized protected String getSpanKey(Map<String,String> data) {
+ synchronized protected String getSpanKey(Map<ByteBuffer,ByteBuffer> data) {
if (hosts.size() > 0) {
- return hosts.get(random.nextInt(hosts.size()));
+ String host = hosts.get(random.nextInt(hosts.size()));
+ log.debug("sending data to " + host);
+ return host;
}
return null;
}
-
+
+ @Override
+ public void configure(HTraceConfiguration conf) {
+ super.configure(conf);
+ String keepers = conf.get(DistributedTrace.TRACER_ZK_HOST);
+ if (keepers == null)
+ throw new IllegalArgumentException("Must configure " + DistributedTrace.TRACER_ZK_HOST);
+ int timeout = conf.getInt(DistributedTrace.TRACER_ZK_TIMEOUT, DEFAULT_TIMEOUT);
+ zoo = new ZooReader(keepers, timeout);
+ path = conf.get(DistributedTrace.TRACER_ZK_PATH, Constants.ZTRACERS);
+ process(null);
+ }
+
@Override
public void process(WatchedEvent event) {
+ log.debug("Processing event for trace server zk watch");
try {
- updateHosts(path, zoo.getChildren(path, null));
+ if (pathExists || zoo.exists(path)) {
+ pathExists = true;
+ updateHosts(path, zoo.getChildren(path, this));
+ } else {
+ zoo.exists(path, this);
+ }
} catch (Exception ex) {
log.error("unable to get destination hosts in zookeeper", ex);
}
}
-
+
+ @Override
+ protected void sendSpans() {
+ if (hosts.isEmpty()) {
+ if (!sendQueue.isEmpty()) {
+ log.error("No hosts to send data to, dropping queued spans");
+ synchronized (sendQueue) {
+ sendQueue.clear();
+ sendQueue.notifyAll();
+ }
+ }
+ } else {
+ super.sendSpans();
+ }
+ }
+
synchronized private void updateHosts(String path, List<String> children) {
log.debug("Scanning trace hosts in zookeeper: " + path);
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java b/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
index da4e567..0edc884 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
@@ -54,19 +54,18 @@ public class ThriftUtil {
private static final Logger log = Logger.getLogger(ThriftUtil.class);
public static class TraceProtocol extends TCompactProtocol {
+ private Span span = null;
@Override
public void writeMessageBegin(TMessage message) throws TException {
- Trace.start("client:" + message.name);
+ span = Trace.start("client:" + message.name);
super.writeMessageBegin(message);
}
@Override
public void writeMessageEnd() throws TException {
super.writeMessageEnd();
- Span currentTrace = Trace.currentTrace();
- if (currentTrace != null)
- currentTrace.stop();
+ span.stop();
}
public TraceProtocol(TTransport transport) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/docs/src/main/asciidoc/chapters/administration.txt
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/chapters/administration.txt b/docs/src/main/asciidoc/chapters/administration.txt
index d5e73f0..e9e0126 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -386,47 +386,115 @@ the following properties
trace.user
trace.token.property.password
+Other tracer configuration properties include
+
+ trace.port.client
+ trace.table
+
+==== Configuring Tracing
+Traces are collected via SpanReceivers. The default SpanReceiver
+configured is org.apache.accumulo.core.trace.ZooTraceClient, which
+sends spans to an Accumulo Tracer process, as discussed in the
+previous section. This default can be changed to a different span
+receiver, or additional span receivers can be added in a
+comma-separated list, by modifying the property
+
+ trace.span.receivers
+
+Individual span receivers may require their own configuration
+parameters, which are grouped under the trace.span.receiver.*
+prefix. The ZooTraceClient requires the following property that
+indicates where the tracer servers will register themselves in
+ZooKeeper.
+
+ trace.span.receiver.zookeeper.path
+
+This is configured to /tracers by default. If multiple Accumulo
+instances are sharing the same ZooKeeper quorum, take care to
+configure Accumulo with unique values for this property.
+
+Hadoop can also be configured to send traces to Accumulo, as of
+Hadoop 2.6.0, by setting the following properties in Hadoop's
+core-site.xml file (the path property is optional if left as the
+default).
+
+ <property>
+ <name>hadoop.htrace.spanreceiver.classes</name>
+ <value>org.apache.accumulo.core.trace.ZooTraceClient</value>
+ </property>
+ <property>
+ <name>hadoop.tracer.zookeeper.host</name>
+ <value>zookeeperHost:2181</value>
+ </property>
+ <property>
+ <name>hadoop.tracer.zookeeper.path</name>
+ <value>/tracers</value>
+ </property>
+
+The accumulo-core, accumulo-trace, and libthrift jars must also
+be placed on Hadoop's classpath.
+
==== Instrumenting a Client
Tracing can be used to measure a client operation, such as a scan, as
the operation traverses the distributed system. To enable tracing for
your application call
[source,java]
-DistributedTrace.enable(instance, new ZooReader(instance), hostname, "myApplication");
+import org.apache.accumulo.core.trace.DistributedTrace;
+...
+DistributedTrace.enable(hostname, "myApplication");
+// do some tracing
+...
+DistributedTrace.disable();
Once tracing has been enabled, a client can wrap an operation in a trace.
[source,java]
-Trace.on("Client Scan");
+import org.htrace.Sampler;
+import org.htrace.Trace;
+import org.htrace.TraceScope;
+...
+TraceScope scope = Trace.startSpan("Client Scan", Sampler.ALWAYS);
BatchScanner scanner = conn.createBatchScanner(...);
// Configure your scanner
for (Entry entry : scanner) {
}
-Trace.off();
+scope.close();
Additionally, the user can create additional Spans within a Trace.
+The sampler for the trace should only be specified with the first span, and subsequent spans will be collected depending on whether that first span was sampled.
[source,java]
-Trace.on("Client Update");
+TraceScope scope = Trace.startSpan("Client Update", Sampler.ALWAYS);
...
-Span readSpan = Trace.start("Read");
+TraceScope readScope = Trace.startSpan("Read");
...
-readSpan.stop();
+readScope.close();
...
-Span writeSpan = Trace.start("Write");
+TraceScope writeScope = Trace.startSpan("Write");
...
-writeSpan.stop();
-Trace.off();
+writeScope.close();
+scope.close();
Like Dapper, Accumulo tracing supports user defined annotations to associate additional data with a Trace.
+Checking whether currently tracing is necessary when using a sampler other than Sampler.ALWAYS.
[source,java]
...
int numberOfEntriesRead = 0;
-Span readSpan = Trace.start("Read");
+TraceScope readScope = Trace.startSpan("Read");
// Do the read, update the counter
...
-readSpan.data("Number of Entries Read", String.valueOf(numberOfEntriesRead));
+if (Trace.isTracing)
+ readScope.getSpan().addKVAnnotation("Number of Entries Read".getBytes(StandardCharsets.UTF_8),
+ String.valueOf(numberOfEntriesRead).getBytes(StandardCharsets.UTF_8));
+
+It is also possible to add timeline annotations to your spans.
+This associates a string with a given timestamp between the start and stop times for a span.
+
+[source,java]
+...
+writeScope.getSpan().addTimelineAnnotation("Initiating Flush");
Some client operations may have a high volume within your
application. As such, you may wish to only sample a percentage of
@@ -434,18 +502,18 @@ operations for tracing. As seen below, the CountSampler can be used to
help enable tracing for 1-in-1000 operations
[source,java]
+import org.htrace.impl.CountSampler;
+...
Sampler sampler = new CountSampler(1000);
...
-if (sampler.next()) {
- Trace.on("Read");
-}
+TraceScope readScope = Trace.startSpan("Read", sampler);
...
-Trace.offNoFlush();
+readScope.close();
+
+Remember to close all spans and disable tracing when finished.
-It should be noted that it is safe to turn off tracing even if it
-isn't currently active. The +Trace.offNoFlush()+ should be used if the
-user does not wish to have +Trace.off()+ block while flushing trace
-data.
+[source,java]
+DistributedTrace.disable();
==== Viewing Collected Traces
To view collected traces, use the "Recent Traces" link on the Monitor
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/docs/src/main/resources/distributedTracing.html
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/distributedTracing.html b/docs/src/main/resources/distributedTracing.html
index 54c9095..98438da 100644
--- a/docs/src/main/resources/distributedTracing.html
+++ b/docs/src/main/resources/distributedTracing.html
@@ -30,13 +30,20 @@ distributed, and the typical lookup is fast.</p>
<p>To provide insight into what accumulo is doing during your scan, you can turn on tracing before you do your operation:</p>
<pre>
- DistributedTrace.enable(instance, zooReader, hostname, "myApplication");
- Trace scanTrace = Trace.on("client:scan");
+ import org.apache.accumulo.core.trace.DistributedTrace;
+ import org.htrace.Sampler;
+ import org.htrace.Trace;
+ import org.htrace.TraceScope;
+ ...
+
+ DistributedTrace.enable(hostname, "myApplication");
+ TraceScope scanTrace = Trace.startSpan("client:scan", Sampler.ALWAYS);
BatchScanner scanner = conn.createBatchScanner(...);
// Configure your scanner
for (Entry<Key, Value> entry : scanner) {
}
- Trace.off();
+ scanTrace.close();
+ DistributedTrace.disableTracing();
</pre>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
index a542263..3a010a6 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.examples.simple.client;
+import static java.nio.charset.StandardCharsets.UTF_8;
import java.util.Map.Entry;
import org.apache.accumulo.core.cli.ClientOnDefaultTable;
@@ -33,9 +34,9 @@ import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.trace.DistributedTrace;
-import org.apache.accumulo.fate.zookeeper.ZooReader;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
+import org.htrace.Sampler;
+import org.htrace.Trace;
+import org.htrace.TraceScope;
import com.beust.jcommander.Parameter;
@@ -64,7 +65,7 @@ public class TracingExample {
}
public void enableTracing(Opts opts) throws Exception {
- DistributedTrace.enable(opts.getInstance(), new ZooReader(opts.getInstance().getZooKeepers(), 1000), "myHost", "myApp");
+ DistributedTrace.enable("myHost", "myApp");
}
public void execute(Opts opts) throws TableNotFoundException, InterruptedException, AccumuloException, AccumuloSecurityException, TableExistsException {
@@ -91,22 +92,21 @@ public class TracingExample {
// Trace the write operation. Note, unless you flush the BatchWriter, you will not capture
// the write operation as it is occurs asynchronously. You can optionally create additional Spans
// within a given Trace as seen below around the flush
- Trace.on("Client Write");
+ TraceScope scope = Trace.startSpan("Client Write", Sampler.ALWAYS);
- System.out.println("TraceID: " + Long.toHexString(Trace.currentTrace().traceId()));
+ System.out.println("TraceID: " + Long.toHexString(scope.getSpan().getTraceId()));
BatchWriter batchWriter = opts.getConnector().createBatchWriter(opts.getTableName(), new BatchWriterConfig());
Mutation m = new Mutation("row");
m.put("cf", "cq", "value");
batchWriter.addMutation(m);
- Span flushSpan = Trace.start("Client Flush");
+ // You can add timeline annotations to Spans which will be able to be viewed in the Monitor
+ scope.getSpan().addTimelineAnnotation("Initiating Flush");
batchWriter.flush();
- flushSpan.stop();
- // Use Trace.offNoFlush() if you don't want the operation to block.
batchWriter.close();
- Trace.off();
+ scope.close();
}
private void readEntries(Opts opts) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
@@ -114,8 +114,8 @@ public class TracingExample {
Scanner scanner = opts.getConnector().createScanner(opts.getTableName(), opts.auths);
// Trace the read operation.
- Span readSpan = Trace.on("Client Read");
- System.out.println("TraceID: " + Long.toHexString(Trace.currentTrace().traceId()));
+ TraceScope readScope = Trace.startSpan("Client Read", Sampler.ALWAYS);
+ System.out.println("TraceID: " + Long.toHexString(readScope.getSpan().getTraceId()));
int numberOfEntriesRead = 0;
for (Entry<Key,Value> entry : scanner) {
@@ -123,9 +123,10 @@ public class TracingExample {
++numberOfEntriesRead;
}
// You can add additional metadata (key, values) to Spans which will be able to be viewed in the Monitor
- readSpan.data("Number of Entries Read", String.valueOf(numberOfEntriesRead));
+ readScope.getSpan().addKVAnnotation("Number of Entries Read".getBytes(UTF_8),
+ String.valueOf(numberOfEntriesRead).getBytes(UTF_8));
- Trace.off();
+ readScope.close();
}
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
index 54897cb..e0c93a6 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
@@ -50,7 +50,7 @@ public class MiniAccumuloInstance extends ZooKeeperInstance {
}
}
- private static String getZooKeepersFromDir(File directory) throws FileNotFoundException {
+ public static String getZooKeepersFromDir(File directory) throws FileNotFoundException {
if (!directory.isDirectory())
throw new IllegalArgumentException("Not a directory " + directory.getPath());
File configFile = new File(new File(directory, "conf"), "accumulo-site.xml");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ebc2f2f..e9338f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,7 @@
<forkCount>1</forkCount>
<!-- overwritten in profiles hadoop-1 or hadoop-2 -->
<hadoop.version>2.2.0</hadoop.version>
+ <htrace.version>3.0.4</htrace.version>
<httpclient.version>3.1</httpclient.version>
<jetty.version>9.1.5.v20140505</jetty.version>
<!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
@@ -462,6 +463,11 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
+ <groupId>org.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ <version>${htrace.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.26</version>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 5c93a53..87c615e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -32,7 +32,6 @@ import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.Version;
@@ -107,14 +106,6 @@ public class Accumulo {
return ServerConstants.getInstanceIdLocation(v);
}
- public static void enableTracing(String address, String application) {
- try {
- DistributedTrace.enable(HdfsZooInstance.getInstance(), ZooReaderWriter.getInstance(), application, address);
- } catch (Exception ex) {
- log.error("creating remote sink for trace spans", ex);
- }
- }
-
/**
* Finds the best log4j configuration file. A generic file is used only if an
* application-specific file is not available. An XML file is preferred over
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 24ff637..a15e05e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -477,7 +477,6 @@ public class Initialize {
zoo.putPersistentData(zkInstanceRoot + RootTable.ZROOT_TABLET, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + RootTable.ZROOT_TABLET_WALOGS, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + RootTable.ZROOT_TABLET_PATH, rootTabletDir.getBytes(UTF_8), NodeExistsPolicy.FAIL);
- zoo.putPersistentData(zkInstanceRoot + Constants.ZTRACERS, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTERS, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTER_LOCK, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTER_GOAL_STATE, MasterGoalState.NORMAL.toString().getBytes(UTF_8), NodeExistsPolicy.FAIL);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/base/src/main/java/org/apache/accumulo/server/trace/TraceFSDataInputStream.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/trace/TraceFSDataInputStream.java b/server/base/src/main/java/org/apache/accumulo/server/trace/TraceFSDataInputStream.java
deleted file mode 100644
index 5162e01..0000000
--- a/server/base/src/main/java/org/apache/accumulo/server/trace/TraceFSDataInputStream.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.server.trace;
-
-import java.io.IOException;
-
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.hadoop.fs.FSDataInputStream;
-
-
-public class TraceFSDataInputStream extends FSDataInputStream {
- @Override
- public synchronized void seek(long desired) throws IOException {
- Span span = Trace.start("FSDataInputStream.seek");
- try {
- impl.seek(desired);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public int read(long position, byte[] buffer, int offset, int length) throws IOException {
- Span span = Trace.start("FSDataInputStream.read");
- if (Trace.isTracing())
- span.data("length", Integer.toString(length));
- try {
- return impl.read(position, buffer, offset, length);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void readFully(long position, byte[] buffer, int offset, int length) throws IOException {
- Span span = Trace.start("FSDataInputStream.readFully");
- if (Trace.isTracing())
- span.data("length", Integer.toString(length));
- try {
- impl.readFully(position, buffer, offset, length);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void readFully(long position, byte[] buffer) throws IOException {
- Span span = Trace.start("FSDataInputStream.readFully");
- if (Trace.isTracing())
- span.data("length", Integer.toString(buffer.length));
- try {
- impl.readFully(position, buffer);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean seekToNewSource(long targetPos) throws IOException {
- Span span = Trace.start("FSDataInputStream.seekToNewSource");
- try {
- return impl.seekToNewSource(targetPos);
- } finally {
- span.stop();
- }
- }
-
- private final FSDataInputStream impl;
-
- public TraceFSDataInputStream(FSDataInputStream in) throws IOException {
- super(in);
- impl = in;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/base/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java b/server/base/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java
deleted file mode 100644
index d3fbad7..0000000
--- a/server/base/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java
+++ /dev/null
@@ -1,818 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.server.trace;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import java.io.IOException;
-import java.net.URI;
-
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.BlockLocation;
-import org.apache.hadoop.fs.ContentSummary;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.FileChecksum;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.PathFilter;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.util.Progressable;
-
-// If FileSystem was an interface, we could use a Proxy, but it's not, so we have to override everything manually
-
-public class TraceFileSystem extends FileSystem {
-
- @Override
- public void setConf(Configuration conf) {
- Span span = Trace.start("setConf");
- try {
- if (impl != null)
- impl.setConf(conf);
- else
- super.setConf(conf);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public Configuration getConf() {
- Span span = Trace.start("getConf");
- try {
- return impl.getConf();
- } finally {
- span.stop();
- }
- }
-
- @Override
- public BlockLocation[] getFileBlockLocations(FileStatus file, long start, long len) throws IOException {
- Span span = Trace.start("getFileBlockLocations");
- try {
- return impl.getFileBlockLocations(file, start, len);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataInputStream open(Path f) throws IOException {
- Span span = Trace.start("open");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return new TraceFSDataInputStream(impl.open(f));
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.create(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, boolean overwrite) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.create(f, overwrite);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, Progressable progress) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
-
- return impl.create(f, progress);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, short replication) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.create(f, replication);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, short replication, Progressable progress) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.create(f, replication, progress);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, boolean overwrite, int bufferSize) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.create(f, overwrite, bufferSize);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, boolean overwrite, int bufferSize, Progressable progress) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.create(f, overwrite, bufferSize, progress);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, boolean overwrite, int bufferSize, short replication, long blockSize) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.create(f, overwrite, bufferSize, replication, blockSize);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, boolean overwrite, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException {
- Span span = Trace.start("create");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.create(f, overwrite, bufferSize, replication, blockSize, progress);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean createNewFile(Path f) throws IOException {
- Span span = Trace.start("createNewFile");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.createNewFile(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream append(Path f) throws IOException {
- Span span = Trace.start("append");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.append(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream append(Path f, int bufferSize) throws IOException {
- Span span = Trace.start("append");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.append(f, bufferSize);
- } finally {
- span.stop();
- }
- }
-
- @Deprecated
- @Override
- public short getReplication(Path src) throws IOException {
- Span span = Trace.start("getReplication");
- if (Trace.isTracing())
- span.data("path", src.toString());
- try {
- return impl.getFileStatus(src).getReplication();
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean setReplication(Path src, short replication) throws IOException {
- Span span = Trace.start("setReplication");
- if (Trace.isTracing())
- span.data("path", src.toString());
- try {
- return impl.setReplication(src, replication);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean exists(Path f) throws IOException {
- Span span = Trace.start("exists");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.exists(f);
- } finally {
- span.stop();
- }
- }
-
- @Deprecated
- @Override
- public boolean isDirectory(Path f) throws IOException {
- Span span = Trace.start("isDirectory");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.getFileStatus(f).isDir();
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean isFile(Path f) throws IOException {
- Span span = Trace.start("isFile");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.isFile(f);
- } finally {
- span.stop();
- }
- }
-
- @SuppressWarnings("deprecation")
- @Override
- public long getLength(Path f) throws IOException {
- Span span = Trace.start("getLength");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.getLength(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public ContentSummary getContentSummary(Path f) throws IOException {
- Span span = Trace.start("getContentSummary");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.getContentSummary(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FileStatus[] listStatus(Path f, PathFilter filter) throws IOException {
- Span span = Trace.start("listStatus");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.listStatus(f, filter);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FileStatus[] listStatus(Path[] files) throws IOException {
- Span span = Trace.start("listStatus");
- try {
- return impl.listStatus(files);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FileStatus[] listStatus(Path[] files, PathFilter filter) throws IOException {
- Span span = Trace.start("listStatus");
- try {
- return impl.listStatus(files, filter);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FileStatus[] globStatus(Path pathPattern) throws IOException {
- Span span = Trace.start("globStatus");
- if (Trace.isTracing())
- span.data("pattern", pathPattern.toString());
- try {
- return impl.globStatus(pathPattern);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FileStatus[] globStatus(Path pathPattern, PathFilter filter) throws IOException {
- Span span = Trace.start("globStatus");
- if (Trace.isTracing())
- span.data("pattern", pathPattern.toString());
- try {
- return impl.globStatus(pathPattern, filter);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public Path getHomeDirectory() {
- Span span = Trace.start("getHomeDirectory");
- try {
- return impl.getHomeDirectory();
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean mkdirs(Path f) throws IOException {
- Span span = Trace.start("mkdirs");
- if (Trace.isTracing())
- span.data("path", f.toString());
- try {
- return impl.mkdirs(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void copyFromLocalFile(Path src, Path dst) throws IOException {
- Span span = Trace.start("copyFromLocalFile");
- if (Trace.isTracing()) {
- span.data("src", src.toString());
- span.data("dst", dst.toString());
- }
- try {
- impl.copyFromLocalFile(src, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void moveFromLocalFile(Path[] srcs, Path dst) throws IOException {
- Span span = Trace.start("moveFromLocalFile");
- if (Trace.isTracing()) {
- span.data("dst", dst.toString());
- }
- try {
- impl.moveFromLocalFile(srcs, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void moveFromLocalFile(Path src, Path dst) throws IOException {
- Span span = Trace.start("moveFromLocalFile");
- if (Trace.isTracing()) {
- span.data("src", src.toString());
- span.data("dst", dst.toString());
- }
- try {
- impl.moveFromLocalFile(src, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void copyFromLocalFile(boolean delSrc, Path src, Path dst) throws IOException {
- Span span = Trace.start("copyFromLocalFile");
- if (Trace.isTracing()) {
- span.data("src", src.toString());
- span.data("dst", dst.toString());
- }
- try {
- impl.copyFromLocalFile(delSrc, src, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void copyFromLocalFile(boolean delSrc, boolean overwrite, Path[] srcs, Path dst) throws IOException {
- Span span = Trace.start("copyFromLocalFile");
- if (Trace.isTracing()) {
- span.data("dst", dst.toString());
- }
- try {
- impl.copyFromLocalFile(delSrc, overwrite, srcs, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void copyFromLocalFile(boolean delSrc, boolean overwrite, Path src, Path dst) throws IOException {
- Span span = Trace.start("copyFromLocalFile");
- if (Trace.isTracing()) {
- span.data("src", src.toString());
- span.data("dst", dst.toString());
- }
- try {
- impl.copyFromLocalFile(delSrc, overwrite, src, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void copyToLocalFile(Path src, Path dst) throws IOException {
- Span span = Trace.start("copyFromLocalFile");
- if (Trace.isTracing()) {
- span.data("src", src.toString());
- span.data("dst", dst.toString());
- }
- try {
- impl.copyToLocalFile(src, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void moveToLocalFile(Path src, Path dst) throws IOException {
- Span span = Trace.start("moveToLocalFile");
- if (Trace.isTracing()) {
- span.data("src", src.toString());
- span.data("dst", dst.toString());
- }
- try {
- impl.moveToLocalFile(src, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void copyToLocalFile(boolean delSrc, Path src, Path dst) throws IOException {
- Span span = Trace.start("copyToLocalFile");
- if (Trace.isTracing()) {
- span.data("src", src.toString());
- span.data("dst", dst.toString());
- }
- try {
- impl.copyToLocalFile(delSrc, src, dst);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile) throws IOException {
- Span span = Trace.start("startLocalOutput");
- if (Trace.isTracing()) {
- span.data("out", fsOutputFile.toString());
- span.data("local", tmpLocalFile.toString());
- }
- try {
- return impl.startLocalOutput(fsOutputFile, tmpLocalFile);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile) throws IOException {
- Span span = Trace.start("completeLocalOutput");
- if (Trace.isTracing()) {
- span.data("out", fsOutputFile.toString());
- span.data("local", tmpLocalFile.toString());
- }
- try {
- impl.completeLocalOutput(fsOutputFile, tmpLocalFile);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void close() throws IOException {
- Span span = Trace.start("close");
- try {
- impl.close();
- } finally {
- span.stop();
- }
- }
-
- @Override
- public long getUsed() throws IOException {
- Span span = Trace.start("getUsed");
- try {
- return impl.getUsed();
- } finally {
- span.stop();
- }
- }
-
- @SuppressWarnings("deprecation")
- @Override
- public long getBlockSize(Path f) throws IOException {
- Span span = Trace.start("getBlockSize");
- if (Trace.isTracing()) {
- span.data("path", f.toString());
- }
- try {
- return impl.getBlockSize(f);
- } finally {
- span.stop();
- }
- }
-
- @Deprecated
- @Override
- public long getDefaultBlockSize() {
- Span span = Trace.start("getDefaultBlockSize");
- try {
- return impl.getDefaultBlockSize();
- } finally {
- span.stop();
- }
- }
-
- @Deprecated
- @Override
- public short getDefaultReplication() {
- Span span = Trace.start("getDefaultReplication");
- try {
- return impl.getDefaultReplication();
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FileChecksum getFileChecksum(Path f) throws IOException {
- Span span = Trace.start("getFileChecksum");
- if (Trace.isTracing()) {
- span.data("path", f.toString());
- }
- try {
- return impl.getFileChecksum(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void setVerifyChecksum(boolean verifyChecksum) {
- Span span = Trace.start("setVerifyChecksum");
- try {
- impl.setVerifyChecksum(verifyChecksum);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void setPermission(Path p, FsPermission permission) throws IOException {
- Span span = Trace.start("setPermission");
- if (Trace.isTracing()) {
- span.data("path", p.toString());
- }
- try {
- impl.setPermission(p, permission);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void setOwner(Path p, String username, String groupname) throws IOException {
- Span span = Trace.start("setOwner");
- if (Trace.isTracing()) {
- span.data("path", p.toString());
- span.data("user", username);
- span.data("group", groupname);
- }
-
- try {
- impl.setOwner(p, username, groupname);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void setTimes(Path p, long mtime, long atime) throws IOException {
- Span span = Trace.start("setTimes");
- try {
- impl.setTimes(p, mtime, atime);
- } finally {
- span.stop();
- }
- }
-
- final FileSystem impl;
-
- TraceFileSystem(FileSystem impl) {
- checkArgument(impl != null, "impl is null");
- this.impl = impl;
- }
-
- public FileSystem getImplementation() {
- return impl;
- }
-
- @Override
- public URI getUri() {
- Span span = Trace.start("getUri");
- try {
- return impl.getUri();
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataInputStream open(Path f, int bufferSize) throws IOException {
- Span span = Trace.start("open");
- try {
- return new TraceFSDataInputStream(impl.open(f, bufferSize));
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream create(Path f, FsPermission permission, boolean overwrite, int bufferSize, short replication, long blockSize, Progressable progress)
- throws IOException {
- Span span = Trace.start("create");
- try {
- return impl.create(f, overwrite, bufferSize, replication, blockSize, progress);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void initialize(URI name, Configuration conf) throws IOException {
- Span span = Trace.start("initialize");
- try {
- impl.initialize(name, conf);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FSDataOutputStream append(Path f, int bufferSize, Progressable progress) throws IOException {
- Span span = Trace.start("append");
- try {
- return impl.append(f, bufferSize, progress);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean rename(Path src, Path dst) throws IOException {
- Span span = Trace.start("rename");
- try {
- return impl.rename(src, dst);
- } finally {
- span.stop();
- }
- }
-
- @SuppressWarnings("deprecation")
- @Override
- public boolean delete(Path f) throws IOException {
- Span span = Trace.start("delete");
- try {
- return impl.delete(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean delete(Path f, boolean recursive) throws IOException {
- Span span = Trace.start("delete");
- try {
- return impl.delete(f, recursive);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FileStatus[] listStatus(Path f) throws IOException {
- Span span = Trace.start("listStatus");
- try {
- return impl.listStatus(f);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public void setWorkingDirectory(Path new_dir) {
- Span span = Trace.start("setWorkingDirectory");
- try {
- impl.setWorkingDirectory(new_dir);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public Path getWorkingDirectory() {
- Span span = Trace.start("getWorkingDirectory");
- try {
- return impl.getWorkingDirectory();
- } finally {
- span.stop();
- }
- }
-
- @Override
- public boolean mkdirs(Path f, FsPermission permission) throws IOException {
- Span span = Trace.start("mkdirs");
- try {
- return impl.mkdirs(f, permission);
- } finally {
- span.stop();
- }
- }
-
- @Override
- public FileStatus getFileStatus(Path f) throws IOException {
- Span span = Trace.start("getFileStatus");
- try {
- return impl.getFileStatus(f);
- } finally {
- span.stop();
- }
- }
-
- public static FileSystem wrap(FileSystem fileSystem) {
- return new TraceFileSystem(fileSystem);
- }
-
- public static FileSystem getAndWrap(Configuration conf) throws IOException {
- return wrap(FileSystem.get(conf));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
index 6c7fd47..7bd5f6d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
@@ -50,7 +50,8 @@ public class AccumuloStatus {
if (!reader.getChildren(rootPath + Constants.ZTSERVERS + "/" + child).isEmpty())
return false;
}
- if (!reader.getChildren(rootPath + Constants.ZTRACERS).isEmpty())
+ // TODO: check configured tracers location instead of default
+ if (!reader.getChildren(Constants.ZTRACERS).isEmpty())
return false;
if (!reader.getChildren(rootPath + Constants.ZMASTER_LOCK).isEmpty())
return false;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index 1f59531..7fdbf13 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.server.util;
import java.util.List;
import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
@@ -48,6 +49,10 @@ public class ZooZap {
boolean zapTracers = false;
@Parameter(names="-verbose", description="print out messages about progress")
boolean verbose = false;
+
+ String getTraceZKPath() {
+ return super.getClientConfiguration().get(ClientProperty.TRACE_ZK_PATH);
+ }
}
public static void main(String[] args) {
@@ -93,7 +98,7 @@ public class ZooZap {
}
if (opts.zapTracers) {
- String path = Constants.ZROOT + "/" + iid + Constants.ZTRACERS;
+ String path = opts.getTraceZKPath();
zapDirectory(zoo, path);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 01fd2c8..720d18b 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -69,6 +69,7 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.security.SecurityUtil;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.util.NamingThreadFactory;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.ServerServices;
@@ -97,7 +98,6 @@ import org.apache.accumulo.server.util.TServerUtils;
import org.apache.accumulo.server.util.TabletIterator;
import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.trace.instrument.CountSampler;
-import org.apache.accumulo.trace.instrument.Sampler;
import org.apache.accumulo.trace.instrument.Span;
import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.trace.thrift.TInfo;
@@ -158,8 +158,12 @@ public class SimpleGarbageCollector implements Iface {
AccumuloConfiguration config = conf.getConfiguration();
gc.init(fs, instance, SystemCredentials.get(), config);
- Accumulo.enableTracing(opts.getAddress(), app);
- gc.run();
+ DistributedTrace.enable(opts.getAddress(), app, config);
+ try {
+ gc.run();
+ } finally {
+ DistributedTrace.disable();
+ }
}
/**
@@ -568,11 +572,10 @@ public class SimpleGarbageCollector implements Iface {
return;
}
- Sampler sampler = new CountSampler(100);
+ CountSampler sampler = new CountSampler(100);
while (true) {
- if (sampler.next())
- Trace.on("gc");
+ Trace.on("gc", sampler);
Span gcSpan = Trace.start("loop");
tStart = System.currentTimeMillis();
@@ -634,7 +637,7 @@ public class SimpleGarbageCollector implements Iface {
log.warn(e, e);
}
- Trace.offNoFlush();
+ Trace.off();
try {
long gcDelay = config.getTimeInMillis(Property.GC_CYCLE_DELAY);
log.debug("Sleeping for " + gcDelay + " milliseconds");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index b6b96a0..bbd2396 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -69,6 +69,7 @@ import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SecurityUtil;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.util.Daemon;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -1259,11 +1260,13 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
Master master = new Master(conf, fs, hostname);
- Accumulo.enableTracing(hostname, app);
+ DistributedTrace.enable(hostname, app, conf.getConfiguration());
master.run();
} catch (Exception ex) {
log.error("Unexpected exception, exiting", ex);
System.exit(1);
+ } finally {
+ DistributedTrace.disable();
}
}
[06/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
index d64e3cc..b4e4b7e 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -27,72 +27,12 @@
<description>A distributed tracing library for Apache Accumulo.</description>
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
<groupId>org.htrace</groupId>
<artifactId>htrace-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <excludeFilterFile>src/main/findbugs/exclude-filter.xml</excludeFilterFile>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <profiles>
- <profile>
- <id>thrift</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-thrift</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/findbugs/exclude-filter.xml
----------------------------------------------------------------------
diff --git a/trace/src/main/findbugs/exclude-filter.xml b/trace/src/main/findbugs/exclude-filter.xml
deleted file mode 100644
index 408a32c..0000000
--- a/trace/src/main/findbugs/exclude-filter.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- 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.
--->
-<FindBugsFilter>
- <Match>
- <Class name="~org\.apache\.accumulo\.trace\.thrift\..*" />
- </Match>
-</FindBugsFilter>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
index fb9744e..3d75917 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
@@ -19,8 +19,9 @@ package org.apache.accumulo.trace.instrument;
import java.util.Map;
/**
- * Base interface for gathering and reporting statistics about a block of execution.
+ * @deprecated only used for ensuring backwards compatibility
*/
+@Deprecated
public interface CloudtraceSpan {
static final long ROOT_SPAN_ID = 0;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
index b291ee9..56a3989 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
@@ -17,8 +17,9 @@
package org.apache.accumulo.trace.instrument;
/**
- * use org.htrace.impl.CountSampler instead
+ * @deprecated since 1.7, use org.htrace.impl.CountSampler instead
*/
+@Deprecated
public class CountSampler extends org.htrace.impl.CountSampler implements Sampler {
public CountSampler(long frequency) {
super(frequency);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
index 3813530..94e5e67 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
@@ -17,8 +17,9 @@
package org.apache.accumulo.trace.instrument;
/**
- * use org.htrace.Sampler instead
+ * @deprecated since 1.7, use org.htrace.Sampler instead
*/
+@Deprecated
public interface Sampler extends org.htrace.Sampler<Object> {
boolean next();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
index 84275ce..7c0e8bc 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
@@ -18,94 +18,27 @@ package org.apache.accumulo.trace.instrument;
import static java.nio.charset.StandardCharsets.UTF_8;
-import org.htrace.NullScope;
-import org.htrace.TimelineAnnotation;
-import org.htrace.TraceScope;
-
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
/**
- * This is a wrapper for a TraceScope object, which is a wrapper for a Span and its parent.
+ * @deprecated since 1.7, use {@link org.apache.accumulo.core.trace.Span} instead
*/
-public class Span implements org.htrace.Span, CloudtraceSpan {
+@Deprecated
+public class Span extends org.apache.accumulo.core.trace.Span implements CloudtraceSpan {
public static final long ROOT_SPAN_ID = org.htrace.Span.ROOT_SPAN_ID;
- public static final Span NULL_SPAN = new Span(NullScope.INSTANCE);
- private TraceScope scope = null;
- protected org.htrace.Span span = null;
-
- public Span(TraceScope scope) {
- this.scope = scope;
- this.span = scope.getSpan();
- }
-
- public Span(org.htrace.Span span) {
- this.span = span;
- }
-
- public TraceScope getScope() {
- return scope;
- }
-
- public org.htrace.Span getSpan() {
- return span;
- }
-
- public long traceId() {
- return span.getTraceId();
- }
-
- public void data(String k, String v) {
- if (span != null)
- span.addKVAnnotation(k.getBytes(UTF_8), v.getBytes(UTF_8));
- }
- @Override
- public void stop() {
- if (scope == null) {
- if (span != null) {
- span.stop();
- }
- } else {
- scope.close();
- }
- }
-
- @Override
- public long getStartTimeMillis() {
- return span.getStartTimeMillis();
- }
-
- @Override
- public long getStopTimeMillis() {
- return span.getStopTimeMillis();
+ public Span(org.apache.accumulo.core.trace.Span span) {
+ super(span.getScope());
}
- @Override
- public long getAccumulatedMillis() {
- return span.getAccumulatedMillis();
+ public Span(org.htrace.TraceScope scope) {
+ super(scope);
}
- @Override
- public boolean isRunning() {
- return span.isRunning();
- }
-
- @Override
- public String getDescription() {
- return span.getDescription();
- }
-
- @Override
- public long getSpanId() {
- return span.getSpanId();
- }
-
- @Override
- public long getTraceId() {
- return span.getTraceId();
+ public Span(org.htrace.Span span) {
+ super(span);
}
@Override
@@ -113,41 +46,6 @@ public class Span implements org.htrace.Span, CloudtraceSpan {
return new Span(span.child(s));
}
- @Override
- public long getParentId() {
- return span.getParentId();
- }
-
- @Override
- public void addKVAnnotation(byte[] k, byte[] v) {
- span.addKVAnnotation(k, v);
- }
-
- @Override
- public void addTimelineAnnotation(String s) {
- span.addTimelineAnnotation(s);
- }
-
- @Override
- public Map<byte[], byte[]> getKVAnnotations() {
- return span.getKVAnnotations();
- }
-
- @Override
- public List<TimelineAnnotation> getTimelineAnnotations() {
- return span.getTimelineAnnotations();
- }
-
- @Override
- public String getProcessId() {
- return span.getProcessId();
- }
-
- @Override
- public String toString() {
- return span.toString();
- }
-
public void start() {
throw new UnsupportedOperationException("can't start span");
}
@@ -177,7 +75,7 @@ public class Span implements org.htrace.Span, CloudtraceSpan {
}
@Override
- public Map<String,String> getData() {
+ public Map<String, String> getData() {
Map<byte[],byte[]> data = span.getKVAnnotations();
HashMap<String,String> stringData = new HashMap<>();
for (Entry<byte[],byte[]> d : data.entrySet()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
index 5ad52fb..ddf3d69 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
@@ -16,127 +16,70 @@
*/
package org.apache.accumulo.trace.instrument;
+import org.apache.accumulo.core.trace.wrappers.TraceExecutorService;
import org.apache.accumulo.trace.thrift.TInfo;
-import org.htrace.TraceInfo;
-import org.htrace.wrappers.TraceProxy;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
/**
- * Utility class for tracing within Accumulo. Not intended for client use!
- *
+ * @deprecated since 1.7, use {@link org.apache.accumulo.core.trace.Trace} instead
*/
-public class Trace {
- /**
- * Start a trace span with a given description.
- */
+@Deprecated
+public class Trace extends org.apache.accumulo.core.trace.Trace {
+ // Initiate tracing if it isn't already started
public static Span on(String description) {
- return on(description, Sampler.ALWAYS);
- }
-
- /**
- * Start a trace span with a given description with the given sampler.
- */
- public static <T> Span on(String description, org.htrace.Sampler<T> sampler) {
- return new Span(org.htrace.Trace.startSpan(description, sampler));
+ return new Span(org.apache.accumulo.core.trace.Trace.on(description));
}
- /**
- * Finish the current trace.
- */
+ // Turn tracing off:
public static void off() {
- org.htrace.Span span = org.htrace.Trace.currentSpan();
- if (span != null) {
- span.stop();
- org.htrace.Tracer.getInstance().continueSpan(null);
- }
+ org.apache.accumulo.core.trace.Trace.off();
}
- /**
- * @deprecated since 1.7, use {@link #off()} instead
- */
- @Deprecated
public static void offNoFlush() {
- off();
+ org.apache.accumulo.core.trace.Trace.offNoFlush();
}
- /**
- * Returns whether tracing is currently on.
- */
+ // Are we presently tracing?
public static boolean isTracing() {
- return org.htrace.Trace.isTracing();
+ return org.apache.accumulo.core.trace.Trace.isTracing();
}
- /**
- * Return the current span.
- * @deprecated since 1.7 -- it is better to save the span you create in a local variable and call its methods, rather than retrieving the current span
- */
- @Deprecated
+ // If we are tracing, return the current span, else null
public static Span currentTrace() {
return new Span(org.htrace.Trace.currentSpan());
}
- /**
- * Get the trace id of the current span.
- */
- public static long currentTraceId() {
- return org.htrace.Trace.currentSpan().getTraceId();
- }
-
- /**
- * Start a new span with a given description, if already tracing.
- */
+ // Create a new time span, if tracing is on
public static Span start(String description) {
- return new Span(org.htrace.Trace.startSpan(description));
+ return new Span(org.apache.accumulo.core.trace.Trace.start(description));
}
- /**
- * Continue a trace by starting a new span with a given parent and description.
- */
+ // Start a trace in the current thread from information passed via RPC
public static Span trace(TInfo info, String description) {
- if (info.traceId == 0) {
- return Span.NULL_SPAN;
- }
- TraceInfo ti = new TraceInfo(info.traceId, info.parentId);
- return new Span(org.htrace.Trace.startSpan(description, ti));
+ return new Span(org.apache.accumulo.core.trace.Trace.trace(info, description));
}
- /**
- * Start a new span with a given description and parent.
- * @deprecated since 1.7 -- use htrace API
- */
- @Deprecated
+ // Initiate a trace in this thread, starting now
public static Span startThread(Span parent, String description) {
return new Span(org.htrace.Trace.startSpan(description, parent.getSpan()));
}
- /**
- * Add data to the current span.
- */
- public static void data(String k, String v) {
- org.htrace.Span span = org.htrace.Trace.currentSpan();
- if (span != null)
- span.addKVAnnotation(k.getBytes(UTF_8), v.getBytes(UTF_8));
+ // Stop a trace in this thread, starting now
+ public static void endThread(Span span) {
+ TraceExecutorService.endThread(span.getSpan());
}
- /**
- * Wrap a runnable in a TraceRunnable, if tracing.
- */
+ // Wrap the runnable in a new span, if tracing
public static Runnable wrap(Runnable runnable) {
- if (isTracing()) {
- return new TraceRunnable(org.htrace.Trace.currentSpan(), runnable);
- } else {
- return runnable;
- }
+ return org.apache.accumulo.core.trace.Trace.wrap(runnable);
}
// Wrap all calls to the given object with spans
public static <T> T wrapAll(T instance) {
- return TraceProxy.trace(instance);
+ return org.apache.accumulo.core.trace.Trace.wrapAll(instance);
}
// Sample trace all calls to the given object
public static <T> T wrapAll(T instance, Sampler dist) {
- return TraceProxy.trace(instance, dist);
+ return org.apache.accumulo.core.trace.Trace.wrapAll(instance, dist);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java
deleted file mode 100644
index f682d61..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument;
-
-import org.htrace.Span;
-import org.htrace.Trace;
-import org.htrace.TraceScope;
-
-import java.util.concurrent.Callable;
-
-/**
- * Wrap a Callable with a Span that survives a change in threads.
- *
- */
-public class TraceCallable<V> implements Callable<V> {
- private final Callable<V> impl;
- private final Span parent;
- private final String description;
-
- TraceCallable(Callable<V> impl) {
- this(Trace.currentSpan(), impl);
- }
-
- TraceCallable(Span parent, Callable<V> impl) {
- this(parent, impl, null);
- }
-
- TraceCallable(Span parent, Callable<V> impl, String description) {
- this.impl = impl;
- this.parent = parent;
- this.description = description;
- }
-
- @Override
- public V call() throws Exception {
- if (parent != null) {
- TraceScope chunk = Trace.startSpan(getDescription(), parent);
- try {
- return impl.call();
- } finally {
- TraceExecutorService.endThread(chunk.getSpan());
- }
- } else {
- return impl.call();
- }
- }
-
- public Callable<V> getImpl() {
- return impl;
- }
-
- private String getDescription() {
- return this.description == null ? Thread.currentThread().getName() : description;
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java
deleted file mode 100644
index 36563d7..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument;
-
-import org.htrace.Span;
-import org.htrace.Tracer;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public class TraceExecutorService implements ExecutorService {
-
- private final ExecutorService impl;
-
- public TraceExecutorService(ExecutorService impl) {
- this.impl = impl;
- }
-
- @Override
- public void execute(Runnable command) {
- impl.execute(new TraceRunnable(command));
- }
-
- @Override
- public void shutdown() {
- impl.shutdown();
- }
-
- @Override
- public List<Runnable> shutdownNow() {
- return impl.shutdownNow();
- }
-
- @Override
- public boolean isShutdown() {
- return impl.isShutdown();
- }
-
- @Override
- public boolean isTerminated() {
- return impl.isTerminated();
- }
-
- @Override
- public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
- return impl.awaitTermination(timeout, unit);
- }
-
- @Override
- public <T> Future<T> submit(Callable<T> task) {
- return impl.submit(new TraceCallable<T>(task));
- }
-
- @Override
- public <T> Future<T> submit(Runnable task, T result) {
- return impl.submit(new TraceRunnable(task), result);
- }
-
- @Override
- public Future<?> submit(Runnable task) {
- return impl.submit(new TraceRunnable(task));
- }
-
- private <T> Collection<? extends Callable<T>> wrapCollection(Collection<? extends Callable<T>> tasks) {
- List<Callable<T>> result = new ArrayList<Callable<T>>();
- for (Callable<T> task : tasks) {
- result.add(new TraceCallable<T>(task));
- }
- return result;
- }
-
- @Override
- public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
- return impl.invokeAll(wrapCollection(tasks));
- }
-
- @Override
- public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
- return impl.invokeAll(wrapCollection(tasks), timeout, unit);
- }
-
- @Override
- public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
- return impl.invokeAny(wrapCollection(tasks));
- }
-
- @Override
- public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException,
- TimeoutException {
- return impl.invokeAny(wrapCollection(tasks), timeout, unit);
- }
-
- /**
- * Finish a given trace and set the span for the current thread to null.
- */
- public static void endThread(Span span) {
- if (span != null) {
- span.stop();
- Tracer.getInstance().continueSpan(null);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
deleted file mode 100644
index 0ddeb9e..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument;
-
-import org.htrace.Span;
-import org.htrace.Trace;
-import org.htrace.TraceScope;
-
-/**
- * Wrap a Runnable with a Span that survives a change in threads.
- *
- */
-public class TraceRunnable implements Runnable, Comparable<TraceRunnable> {
-
- private final Span parent;
- private final Runnable runnable;
- private final String description;
-
- public TraceRunnable(Runnable runnable) {
- this(Trace.currentSpan(), runnable);
- }
-
- public TraceRunnable(Span parent, Runnable runnable) {
- this(parent, runnable, null);
- }
-
- public TraceRunnable(Span parent, Runnable runnable, String description) {
- this.parent = parent;
- this.runnable = runnable;
- this.description = description;
- }
-
- @Override
- public void run() {
- if (parent != null) {
- TraceScope chunk = Trace.startSpan(getDescription(), parent);
- try {
- runnable.run();
- } finally {
- TraceExecutorService.endThread(chunk.getSpan());
- }
- } else {
- runnable.run();
- }
- }
-
- private String getDescription() {
- return this.description == null ? Thread.currentThread().getName() : description;
- }
-
- @Override
- public boolean equals(Object o) {
- if (o instanceof TraceRunnable) {
- return 0 == this.compareTo((TraceRunnable) o);
- }
-
- return false;
- }
-
- @SuppressWarnings({"rawtypes", "unchecked"})
- @Override
- public int compareTo(TraceRunnable o) {
- return ((Comparable) this.runnable).compareTo(o.runnable);
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
deleted file mode 100644
index 246d1eb..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument;
-
-import org.apache.accumulo.trace.thrift.TInfo;
-import org.htrace.Span;
-
-public class Tracer {
- private static final TInfo DONT_TRACE = new TInfo(0, 0);
-
- /**
- * Obtain {@link org.apache.accumulo.trace.thrift.TInfo} for the current span.
- */
- public static TInfo traceInfo() {
- Span span = org.htrace.Trace.currentSpan();
- if (span != null) {
- return new TInfo(span.getTraceId(), span.getSpanId());
- }
- return DONT_TRACE;
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/RpcClientInvocationHandler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/RpcClientInvocationHandler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/RpcClientInvocationHandler.java
deleted file mode 100644
index ea57fe7..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/RpcClientInvocationHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.thrift;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.trace.thrift.TInfo;
-
-public class RpcClientInvocationHandler<I> implements InvocationHandler {
-
- private final I instance;
-
- protected RpcClientInvocationHandler(final I clientInstance) {
- instance = clientInstance;
- }
-
- @Override
- public Object invoke(Object obj, Method method, Object[] args) throws Throwable {
- if (args == null || args.length < 1 || args[0] != null) {
- return method.invoke(instance, args);
- }
- Class<?> klass = method.getParameterTypes()[0];
- if (TInfo.class.isAssignableFrom(klass)) {
- args[0] = Tracer.traceInfo();
- }
- Span span = Trace.start("client:" + method.getName());
- try {
- return method.invoke(instance, args);
- } catch (InvocationTargetException ex) {
- throw ex.getCause();
- } finally {
- span.stop();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/RpcServerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/RpcServerInvocationHandler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/RpcServerInvocationHandler.java
deleted file mode 100644
index 4188bf4..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/RpcServerInvocationHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.thrift;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.thrift.TInfo;
-
-public class RpcServerInvocationHandler<I> implements InvocationHandler {
-
- private final I instance;
-
- protected RpcServerInvocationHandler(final I serverInstance) {
- instance = serverInstance;
- }
-
- @Override
- public Object invoke(Object obj, Method method, Object[] args) throws Throwable {
- if (args == null || args.length < 1 || args[0] == null || !(args[0] instanceof TInfo)) {
- try {
- return method.invoke(instance, args);
- } catch (InvocationTargetException ex) {
- throw ex.getCause();
- }
- }
- Span span = Trace.trace((TInfo) args[0], method.getName());
- try {
- return method.invoke(instance, args);
- } catch (InvocationTargetException ex) {
- throw ex.getCause();
- } finally {
- span.stop();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/TraceWrap.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/TraceWrap.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/TraceWrap.java
deleted file mode 100644
index ed91042..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/TraceWrap.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.thrift;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-
-/**
- * To move trace data from client to server, the RPC call must be annotated to take a TInfo object as its first argument. The user can simply pass null, so long
- * as they wrap their Client and Service objects with these functions.
- *
- * <pre>
- * Trace.on("remoteMethod");
- * Iface c = new Client();
- * c = TraceWrap.client(c);
- * c.remoteMethod(null, arg2, arg3);
- * Trace.off();
- * </pre>
- *
- * The wrapper will see the annotated method and send or re-establish the trace information.
- *
- * Note that the result of these calls is a Proxy object that conforms to the basic interfaces, but is not your concrete instance.
- *
- */
-public class TraceWrap {
-
- public static <T> T service(final T instance) {
- InvocationHandler handler = new RpcServerInvocationHandler<T>(instance);
- return wrappedInstance(handler, instance);
- }
-
- public static <T> T client(final T instance) {
- InvocationHandler handler = new RpcClientInvocationHandler<T>(instance);
- return wrappedInstance(handler, instance);
- }
-
- private static <T> T wrappedInstance(final InvocationHandler handler, final T instance) {
- @SuppressWarnings("unchecked")
- T proxiedInstance = (T) Proxy.newProxyInstance(instance.getClass().getClassLoader(), instance.getClass().getInterfaces(), handler);
- return proxiedInstance;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/thrift/Annotation.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/Annotation.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/Annotation.java
deleted file mode 100644
index c00744e..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/Annotation.java
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * 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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.accumulo.trace.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 Annotation implements org.apache.thrift.TBase<Annotation, Annotation._Fields>, java.io.Serializable, Cloneable, Comparable<Annotation> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Annotation");
-
- private static final org.apache.thrift.protocol.TField TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("time", org.apache.thrift.protocol.TType.I64, (short)1);
- private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", 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 AnnotationStandardSchemeFactory());
- schemes.put(TupleScheme.class, new AnnotationTupleSchemeFactory());
- }
-
- public long time; // required
- public String msg; // 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 {
- TIME((short)1, "time"),
- MSG((short)2, "msg");
-
- 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: // TIME
- return TIME;
- case 2: // MSG
- return MSG;
- 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
- private static final int __TIME_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
- 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.TIME, new org.apache.thrift.meta_data.FieldMetaData("time", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", 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(Annotation.class, metaDataMap);
- }
-
- public Annotation() {
- }
-
- public Annotation(
- long time,
- String msg)
- {
- this();
- this.time = time;
- setTimeIsSet(true);
- this.msg = msg;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public Annotation(Annotation other) {
- __isset_bitfield = other.__isset_bitfield;
- this.time = other.time;
- if (other.isSetMsg()) {
- this.msg = other.msg;
- }
- }
-
- public Annotation deepCopy() {
- return new Annotation(this);
- }
-
- @Override
- public void clear() {
- setTimeIsSet(false);
- this.time = 0;
- this.msg = null;
- }
-
- public long getTime() {
- return this.time;
- }
-
- public Annotation setTime(long time) {
- this.time = time;
- setTimeIsSet(true);
- return this;
- }
-
- public void unsetTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIME_ISSET_ID);
- }
-
- /** Returns true if field time is set (has been assigned a value) and false otherwise */
- public boolean isSetTime() {
- return EncodingUtils.testBit(__isset_bitfield, __TIME_ISSET_ID);
- }
-
- public void setTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIME_ISSET_ID, value);
- }
-
- public String getMsg() {
- return this.msg;
- }
-
- public Annotation setMsg(String msg) {
- this.msg = msg;
- return this;
- }
-
- public void unsetMsg() {
- this.msg = null;
- }
-
- /** Returns true if field msg is set (has been assigned a value) and false otherwise */
- public boolean isSetMsg() {
- return this.msg != null;
- }
-
- public void setMsgIsSet(boolean value) {
- if (!value) {
- this.msg = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case TIME:
- if (value == null) {
- unsetTime();
- } else {
- setTime((Long)value);
- }
- break;
-
- case MSG:
- if (value == null) {
- unsetMsg();
- } else {
- setMsg((String)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case TIME:
- return Long.valueOf(getTime());
-
- case MSG:
- return getMsg();
-
- }
- 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 TIME:
- return isSetTime();
- case MSG:
- return isSetMsg();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof Annotation)
- return this.equals((Annotation)that);
- return false;
- }
-
- public boolean equals(Annotation that) {
- if (that == null)
- return false;
-
- boolean this_present_time = true;
- boolean that_present_time = true;
- if (this_present_time || that_present_time) {
- if (!(this_present_time && that_present_time))
- return false;
- if (this.time != that.time)
- return false;
- }
-
- boolean this_present_msg = true && this.isSetMsg();
- boolean that_present_msg = true && that.isSetMsg();
- if (this_present_msg || that_present_msg) {
- if (!(this_present_msg && that_present_msg))
- return false;
- if (!this.msg.equals(that.msg))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
-
- @Override
- public int compareTo(Annotation other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetTime()).compareTo(other.isSetTime());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTime()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time, other.time);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetMsg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
- 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("Annotation(");
- boolean first = true;
-
- sb.append("time:");
- sb.append(this.time);
- first = false;
- if (!first) sb.append(", ");
- sb.append("msg:");
- if (this.msg == null) {
- sb.append("null");
- } else {
- sb.append(this.msg);
- }
- 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 {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
- 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 AnnotationStandardSchemeFactory implements SchemeFactory {
- public AnnotationStandardScheme getScheme() {
- return new AnnotationStandardScheme();
- }
- }
-
- private static class AnnotationStandardScheme extends StandardScheme<Annotation> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, Annotation 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: // TIME
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.time = iprot.readI64();
- struct.setTimeIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // MSG
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.msg = iprot.readString();
- struct.setMsgIsSet(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, Annotation struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(TIME_FIELD_DESC);
- oprot.writeI64(struct.time);
- oprot.writeFieldEnd();
- if (struct.msg != null) {
- oprot.writeFieldBegin(MSG_FIELD_DESC);
- oprot.writeString(struct.msg);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class AnnotationTupleSchemeFactory implements SchemeFactory {
- public AnnotationTupleScheme getScheme() {
- return new AnnotationTupleScheme();
- }
- }
-
- private static class AnnotationTupleScheme extends TupleScheme<Annotation> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, Annotation struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetTime()) {
- optionals.set(0);
- }
- if (struct.isSetMsg()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
- if (struct.isSetTime()) {
- oprot.writeI64(struct.time);
- }
- if (struct.isSetMsg()) {
- oprot.writeString(struct.msg);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, Annotation struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
- if (incoming.get(0)) {
- struct.time = iprot.readI64();
- struct.setTimeIsSet(true);
- }
- if (incoming.get(1)) {
- struct.msg = iprot.readString();
- struct.setMsgIsSet(true);
- }
- }
- }
-
-}
-
[02/15] accumulo git commit: ACCUMULO-898 convert accumulo to use
htrace
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java b/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
index a52f743..e3bbafa 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.util.Daemon;
import org.apache.accumulo.fate.util.UtilWaitThread;
import org.apache.accumulo.master.Master;
import org.apache.accumulo.trace.instrument.CountSampler;
-import org.apache.accumulo.trace.instrument.Sampler;
import org.apache.accumulo.trace.instrument.Trace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +53,7 @@ public class ReplicationDriver extends Daemon {
@Override
public void run() {
- Sampler sampler = new CountSampler(10);
+ CountSampler sampler = new CountSampler(10);
while (master.stillMaster()) {
if (null == workMaker) {
@@ -73,9 +72,7 @@ public class ReplicationDriver extends Daemon {
rcrr = new RemoveCompleteReplicationRecords(conn);
}
- if (sampler.next()) {
- Trace.on("masterReplicationDriver");
- }
+ Trace.on("masterReplicationDriver", sampler);
// Make status markers from replication records in metadata, removing entries in
// metadata which are no longer needed (closed records)
@@ -109,7 +106,7 @@ public class ReplicationDriver extends Daemon {
log.error("Caught Exception trying to remove finished Replication records", e);
}
- Trace.offNoFlush();
+ Trace.off();
// Sleep for a bit
long sleepMillis = conf.getTimeInMillis(Property.MASTER_REPLICATION_SCAN_INTERVAL);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 49bb56d..7fe1af7 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -54,6 +54,7 @@ import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.ServerServices.Service;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -413,8 +414,12 @@ public class Monitor {
config = new ServerConfigurationFactory(instance);
Accumulo.init(fs, config, app);
Monitor monitor = new Monitor();
- Accumulo.enableTracing(hostname, app);
- monitor.run(hostname);
+ DistributedTrace.enable(hostname, app, config.getConfiguration());
+ try {
+ monitor.run(hostname);
+ } finally {
+ DistributedTrace.disable();
+ }
}
private static long START_TIME;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
index a476201..8968088 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
@@ -17,7 +17,9 @@
package org.apache.accumulo.monitor.servlets.trace;
import static java.lang.Math.min;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Map.Entry;
import java.util.Set;
@@ -34,6 +36,7 @@ import org.apache.accumulo.core.trace.SpanTreeVisitor;
import org.apache.accumulo.core.trace.TraceDump;
import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.monitor.servlets.BasicServlet;
+import org.apache.accumulo.trace.thrift.Annotation;
import org.apache.accumulo.trace.thrift.RemoteSpan;
import org.apache.hadoop.io.Text;
@@ -115,7 +118,8 @@ public class ShowTrace extends Basic {
sb.append(String.format("<td style='text-indent: %dpx'>%s@%s</td>%n", level * 5, node.svc, node.sender));
sb.append("<td>" + node.description + "</td>");
boolean hasData = node.data != null && !node.data.isEmpty();
- if (hasData) {
+ boolean hasAnnotations = node.annotations != null && !node.annotations.isEmpty();
+ if (hasData || hasAnnotations) {
String hexSpanId = Long.toHexString(node.spanId);
sb.append("<td><input type='checkbox' id=\"");
sb.append(hexSpanId);
@@ -127,11 +131,23 @@ public class ShowTrace extends Basic {
sb.append("</tr>\n");
sb.append("<tr id='" + Long.toHexString(node.spanId) + "' style='display:none'>");
sb.append("<td colspan='5'>\n");
- if (hasData) {
+ if (hasData || hasAnnotations) {
sb.append(" <table class='indent,noborder'>\n");
- for (Entry<String,String> entry : node.data.entrySet()) {
- sb.append(" <tr><td>" + BasicServlet.sanitize(entry.getKey()) + "</td>");
- sb.append("<td>" + BasicServlet.sanitize(entry.getValue()) + "</td></tr>\n");
+ if (hasData) {
+ sb.append(" <tr><th>Key</th><th>Value</th></tr>\n");
+ for (Entry<ByteBuffer, ByteBuffer> entry : node.data.entrySet()) {
+ String key = new String(entry.getKey().array(), entry.getKey().arrayOffset(), entry.getKey().limit(), UTF_8);
+ String value = new String(entry.getValue().array(), entry.getValue().arrayOffset(), entry.getValue().limit(), UTF_8);
+ sb.append(" <tr><td>" + BasicServlet.sanitize(key) + "</td>");
+ sb.append("<td>" + BasicServlet.sanitize(value) + "</td></tr>\n");
+ }
+ }
+ if (hasAnnotations) {
+ sb.append(" <tr><th>Annotation</th><th>Time Offset</th></tr>\n");
+ for (Annotation entry : node.annotations) {
+ sb.append(" <tr><td>" + BasicServlet.sanitize(entry.getMsg()) + "</td>");
+ sb.append(String.format("<td>%d</td></tr>\n", entry.getTime() - finalStart));
+ }
}
sb.append(" </table>");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
index a630434..effb0e6 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
@@ -20,45 +20,47 @@ import java.util.ArrayList;
import java.util.Collections;
import org.apache.accumulo.trace.thrift.RemoteSpan;
+import org.apache.accumulo.trace.thrift.Annotation;
import org.junit.Assert;
import org.junit.Test;
+import java.nio.ByteBuffer;
+
public class ShowTraceLinkTypeTest {
-
+ private static RemoteSpan rs(long start, long stop, String description) {
+ return new RemoteSpan("sender", "svc", 0l, 0l, 0l, start, stop, description, Collections.<ByteBuffer, ByteBuffer>emptyMap(), Collections.<Annotation>emptyList());
+ }
+
@Test
public void testTraceSortingForMonitor() {
- /*
- * public RemoteSpan(String sender, String svc, long traceId, long spanId, long parentId, long start, long stop, String description, Map<String,String>
- * data)
- */
ArrayList<RemoteSpan> spans = new ArrayList<RemoteSpan>(10), expectedOrdering = new ArrayList<RemoteSpan>(10);
-
+
// "Random" ordering
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 55l, 75l, "desc5", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 25l, 30l, "desc2", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 85l, 90l, "desc8", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 45l, 60l, "desc4", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 35l, 55l, "desc3", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 95l, 110l, "desc9", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 65l, 80l, "desc6", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 100l, 120l, "desc10", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 15l, 25l, "desc1", Collections.<String,String> emptyMap()));
- spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 75l, 100l, "desc7", Collections.<String,String> emptyMap()));
-
+ spans.add(rs(55l, 75l, "desc5"));
+ spans.add(rs(25l, 30l, "desc2"));
+ spans.add(rs(85l, 90l, "desc8"));
+ spans.add(rs(45l, 60l, "desc4"));
+ spans.add(rs(35l, 55l, "desc3"));
+ spans.add(rs(95l, 110l, "desc9"));
+ spans.add(rs(65l, 80l, "desc6"));
+ spans.add(rs(100l, 120l, "desc10"));
+ spans.add(rs(15l, 25l, "desc1"));
+ spans.add(rs(75l, 100l, "desc7"));
+
// We expect them to be sorted by 'start'
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 15l, 25l, "desc1", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 25l, 30l, "desc2", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 35l, 55l, "desc3", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 45l, 60l, "desc4", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 55l, 75l, "desc5", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 65l, 80l, "desc6", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 75l, 100l, "desc7", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 85l, 90l, "desc8", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 95l, 110l, "desc9", Collections.<String,String> emptyMap()));
- expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 100l, 120l, "desc10", Collections.<String,String> emptyMap()));
-
+ expectedOrdering.add(rs(15l, 25l, "desc1"));
+ expectedOrdering.add(rs(25l, 30l, "desc2"));
+ expectedOrdering.add(rs(35l, 55l, "desc3"));
+ expectedOrdering.add(rs(45l, 60l, "desc4"));
+ expectedOrdering.add(rs(55l, 75l, "desc5"));
+ expectedOrdering.add(rs(65l, 80l, "desc6"));
+ expectedOrdering.add(rs(75l, 100l, "desc7"));
+ expectedOrdering.add(rs(85l, 90l, "desc8"));
+ expectedOrdering.add(rs(95l, 110l, "desc9"));
+ expectedOrdering.add(rs(100l, 120l, "desc10"));
+
Collections.sort(spans);
-
+
Assert.assertEquals(expectedOrdering, spans);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 4858b8a..af1ec56 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -26,7 +26,6 @@ import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
@@ -43,10 +42,10 @@ import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.user.AgeOffFilter;
import org.apache.accumulo.core.security.SecurityUtil;
-import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.core.trace.TraceFormatter;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.server.Accumulo;
import org.apache.accumulo.server.ServerOpts;
import org.apache.accumulo.server.client.HdfsZooInstance;
@@ -225,7 +224,7 @@ public class TraceServer implements Watcher {
TThreadPoolServer.Args options = new TThreadPoolServer.Args(transport);
options.processor(new Processor<Iface>(new Receiver()));
server = new TThreadPoolServer(options);
- registerInZooKeeper(sock.getInetAddress().getHostAddress() + ":" + sock.getLocalPort());
+ registerInZooKeeper(sock.getInetAddress().getHostAddress() + ":" + sock.getLocalPort(), conf.get(Property.TRACE_ZK_PATH));
writer = new AtomicReference<BatchWriter>(this.connector.createBatchWriter(table, new BatchWriterConfig().setMaxLatency(5, TimeUnit.SECONDS)));
}
@@ -278,9 +277,10 @@ public class TraceServer implements Watcher {
}
}
- private void registerInZooKeeper(String name) throws Exception {
- String root = ZooUtil.getRoot(serverConfiguration.getInstance()) + Constants.ZTRACERS;
+ private void registerInZooKeeper(String name, String root) throws Exception {
IZooReaderWriter zoo = ZooReaderWriter.getInstance();
+ zoo.putPersistentData(root, new byte[0], NodeExistsPolicy.SKIP);
+ log.info("Registering tracer " + name + " at " + root);
String path = zoo.putEphemeralSequential(root + "/trace-", name.getBytes(UTF_8));
zoo.exists(path, this);
}
@@ -297,9 +297,12 @@ public class TraceServer implements Watcher {
Accumulo.init(fs, conf, app);
String hostname = opts.getAddress();
TraceServer server = new TraceServer(conf, hostname);
- Accumulo.enableTracing(hostname, app);
- server.run();
- log.info("tracer stopping");
+ try {
+ server.run();
+ } finally {
+ log.info("tracer stopping");
+ ZooReaderWriter.getInstance().getZooKeeper().close();
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
index f7bda49..034becd 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
@@ -23,7 +23,6 @@ import org.apache.accumulo.core.conf.SiteConfiguration;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
-import org.apache.accumulo.server.trace.TraceFileSystem;
import org.apache.accumulo.server.zookeeper.DistributedWorkQueue.Processor;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileUtil;
@@ -53,8 +52,8 @@ public class BulkFailedCopyProcessor implements Processor {
try {
VolumeManager vm = VolumeManagerImpl.get(SiteConfiguration.getInstance());
- FileSystem origFs = TraceFileSystem.wrap(vm.getVolumeByPath(orig).getFileSystem());
- FileSystem destFs = TraceFileSystem.wrap(vm.getVolumeByPath(dest).getFileSystem());
+ FileSystem origFs = vm.getVolumeByPath(orig).getFileSystem();
+ FileSystem destFs = vm.getVolumeByPath(dest).getFileSystem();
FileUtil.copy(origFs, orig, destFs, tmp, false, true, CachedConfiguration.getInstance());
destFs.rename(tmp, dest);
@@ -62,7 +61,7 @@ public class BulkFailedCopyProcessor implements Processor {
} catch (IOException ex) {
try {
VolumeManager vm = VolumeManagerImpl.get(SiteConfiguration.getInstance());
- FileSystem destFs = TraceFileSystem.wrap(vm.getVolumeByPath(dest).getFileSystem());
+ FileSystem destFs = vm.getVolumeByPath(dest).getFileSystem();
destFs.create(dest).close();
log.warn(" marked " + dest + " failed", ex);
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
index 9a1117d..7378348 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
@@ -64,7 +64,6 @@ import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
import org.apache.accumulo.core.util.LocalityGroupUtil.Partitioner;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.server.trace.TraceFileSystem;
import org.apache.commons.lang.mutable.MutableLong;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -557,7 +556,7 @@ public class InMemoryMap {
private synchronized FileSKVIterator getReader() throws IOException {
if (reader == null) {
Configuration conf = CachedConfiguration.getInstance();
- FileSystem fs = TraceFileSystem.wrap(FileSystem.getLocal(conf));
+ FileSystem fs = FileSystem.getLocal(conf);
reader = new RFileOperations().openReader(memDumpFile, true, fs, conf, SiteConfiguration.getInstance());
if (iflag != null)
@@ -712,7 +711,7 @@ public class InMemoryMap {
// dump memmap exactly as is to a tmp file on disk, and switch scans to that temp file
try {
Configuration conf = CachedConfiguration.getInstance();
- FileSystem fs = TraceFileSystem.wrap(FileSystem.getLocal(conf));
+ FileSystem fs = FileSystem.getLocal(conf);
String tmpFile = memDumpDir + "/memDump" + UUID.randomUUID() + "." + RFile.EXTENSION;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 54c75f8..9fd255a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -122,6 +122,7 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Processor;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
+import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.ColumnFQ;
@@ -2876,11 +2877,13 @@ public class TabletServer implements Runnable {
Accumulo.init(fs, conf, app);
TabletServer server = new TabletServer(conf, fs);
server.config(hostname);
- Accumulo.enableTracing(hostname, app);
+ DistributedTrace.enable(hostname, app, conf.getConfiguration());
server.run();
} catch (Exception ex) {
log.error("Uncaught exception in TabletServer.main, exiting", ex);
System.exit(1);
+ } finally {
+ DistributedTrace.disable();
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 732907d..4a899ef 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -228,7 +228,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
// We made no status, punt on it for now, and let it re-queue itself for work
return status;
} finally {
- Trace.offNoFlush();
+ Trace.off();
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index ef3a0c9..9dd4323 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -2078,11 +2078,10 @@ public class Tablet implements TabletCommitter {
this.notifyAll();
}
- Span curr = Trace.currentTrace();
- curr.data("extent", "" + getExtent());
+ span.data("extent", "" + getExtent());
if (majCStats != null) {
- curr.data("read", "" + majCStats.getEntriesRead());
- curr.data("written", "" + majCStats.getEntriesWritten());
+ span.data("read", "" + majCStats.getEntriesRead());
+ span.data("written", "" + majCStats.getEntriesWritten());
}
}
} finally {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index a0ff17a..996b2af 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -78,7 +78,6 @@ import org.apache.accumulo.core.util.format.Formatter;
import org.apache.accumulo.core.util.format.FormatterFactory;
import org.apache.accumulo.core.volume.VolumeConfiguration;
import org.apache.accumulo.core.zookeeper.ZooUtil;
-import org.apache.accumulo.fate.zookeeper.ZooReader;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
import org.apache.accumulo.start.classloader.vfs.ContextManager;
import org.apache.accumulo.shell.commands.AboutCommand;
@@ -328,8 +327,7 @@ public class Shell extends ShellOptions {
}
if (!options.isFake()) {
- ZooReader zr = new ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
- DistributedTrace.enable(instance, zr, "shell", InetAddress.getLocalHost().getHostName());
+ DistributedTrace.enable(InetAddress.getLocalHost().getHostName(), "shell", options.getClientConfiguration());
}
this.setTableName("");
@@ -525,6 +523,7 @@ public class Shell extends ShellOptions {
System.exit(shell.start());
} finally {
shell.shutdown();
+ DistributedTrace.disable();
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
index 7f63570..819f61c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
@@ -40,7 +40,7 @@ public class TraceCommand extends DebugCommand {
Trace.on("shell:" + shellState.getPrincipal());
} else if (cl.getArgs()[0].equalsIgnoreCase("off")) {
if (Trace.isTracing()) {
- final long trace = Trace.currentTrace().traceId();
+ final long trace = Trace.currentTraceId();
Trace.off();
StringBuffer sb = new StringBuffer();
int traceCount = 0;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestIngest.java b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
index 7f6c514..47033f3 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
@@ -29,7 +29,6 @@ import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
@@ -49,9 +48,7 @@ import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.FastFormat;
-import org.apache.accumulo.fate.zookeeper.ZooReader;
import org.apache.accumulo.server.cli.ClientOnDefaultTable;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.io.Text;
@@ -181,11 +178,9 @@ public class TestIngest {
Opts opts = new Opts();
BatchWriterOpts bwOpts = new BatchWriterOpts();
opts.parseArgs(TestIngest.class.getName(), args, bwOpts);
-
- Instance instance = opts.getInstance();
-
+
String name = TestIngest.class.getSimpleName();
- DistributedTrace.enable(instance, new ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut()), name, null);
+ DistributedTrace.enable(name);
try {
opts.startTracing(name);
@@ -199,7 +194,8 @@ public class TestIngest {
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
- Trace.off();
+ opts.stopTracing();
+ DistributedTrace.disable();
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
index 74b03e4..902d49e 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.data.Key;
@@ -34,8 +33,8 @@ import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.trace.DistributedTrace;
-import org.apache.accumulo.fate.zookeeper.ZooReader;
import org.apache.accumulo.trace.instrument.Trace;
+
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
@@ -62,19 +61,19 @@ public class VerifyIngest {
Opts opts = new Opts();
ScannerOpts scanOpts = new ScannerOpts();
opts.parseArgs(VerifyIngest.class.getName(), args, scanOpts);
- Instance instance = opts.getInstance();
try {
if (opts.trace) {
String name = VerifyIngest.class.getSimpleName();
- DistributedTrace.enable(instance, new ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut()), name, null);
+ DistributedTrace.enable();
Trace.on(name);
- Trace.currentTrace().data("cmdLine", Arrays.asList(args).toString());
+ Trace.data("cmdLine", Arrays.asList(args).toString());
}
verifyIngest(opts.getConnector(), opts, scanOpts);
} finally {
Trace.off();
+ DistributedTrace.disable();
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index c85373d..81e519e 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -74,7 +74,6 @@ import org.apache.accumulo.core.trace.TraceDump.Printer;
import org.apache.accumulo.core.util.FastFormat;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint;
-import org.apache.accumulo.fate.zookeeper.ZooReader;
import org.apache.accumulo.test.functional.BadIterator;
import org.apache.accumulo.test.functional.SimpleMacIT;
import org.apache.accumulo.test.functional.SlowIterator;
@@ -1234,7 +1233,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
conn.tableOperations().create(tableName);
conn.tableOperations().deleteRows("trace", null, null);
- DistributedTrace.enable(conn.getInstance(), new ZooReader(conn.getInstance().getZooKeepers(), 30*1000), "testTrace", "localhost");
+ DistributedTrace.enable("localhost", "testTrace", getClientConfig());
Span root = Trace.on("traceTest");
ConditionalWriter cw = conn.createConditionalWriter(tableName, new ConditionalWriterConfig());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
index 80ee990..13bdc7e 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
@@ -34,7 +34,6 @@ import org.apache.accumulo.core.file.FileSKVWriter;
import org.apache.accumulo.core.file.rfile.RFile;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.volume.VolumeConfiguration;
-import org.apache.accumulo.server.trace.TraceFileSystem;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -59,7 +58,7 @@ public class BulkFileIT extends SimpleMacIT {
c.tableOperations().addSplits(tableName, splits);
Configuration conf = new Configuration();
AccumuloConfiguration aconf = DefaultConfiguration.getInstance();
- FileSystem fs = TraceFileSystem.wrap(VolumeConfiguration.getDefaultVolume(conf, aconf).getFileSystem());
+ FileSystem fs = VolumeConfiguration.getDefaultVolume(conf, aconf).getFileSystem();
String dir = rootPath() + "/bulk_test_diff_files_89723987592_" + getUniqueNames(1)[0];
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 210e057..5b03b17 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -146,7 +146,7 @@ public class ExamplesIT extends ConfigurableMacIT {
}
assertTrue(count > 0);
result = FunctionalTestUtils.readAll(cluster, TraceDumpExample.class, p);
- assertTrue(result.contains("myHost@myApp"));
+ assertTrue(result.contains("myApp@myHost"));
trace.destroy();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
index 03677f4..3f04b94 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
@@ -17,9 +17,11 @@
package org.apache.accumulo.test.functional;
import java.io.File;
+import java.io.FileNotFoundException;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.ClientConfiguration;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.conf.Property;
@@ -28,6 +30,8 @@ import org.apache.accumulo.minicluster.MiniAccumuloInstance;
import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.minicluster.impl.ZooKeeperBindException;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.AfterClass;
@@ -41,6 +45,8 @@ import org.junit.BeforeClass;
public class SimpleMacIT extends AbstractMacIT {
protected static final Logger log = Logger.getLogger(SimpleMacIT.class);
+ private static final String INSTANCE_NAME = "instance1";
+
private static File folder;
private static MiniAccumuloClusterImpl cluster = null;
@@ -124,7 +130,7 @@ public class SimpleMacIT extends AbstractMacIT {
*/
private static Connector getInstanceOneConnector() {
try {
- return new MiniAccumuloInstance("instance1", getInstanceOnePath()).getConnector("root", new PasswordToken(ROOT_PASSWORD));
+ return new MiniAccumuloInstance(INSTANCE_NAME, getInstanceOnePath()).getConnector("root", new PasswordToken(ROOT_PASSWORD));
} catch (Exception e) {
return null;
}
@@ -134,4 +140,14 @@ public class SimpleMacIT extends AbstractMacIT {
return new File(System.getProperty("user.dir") + "/accumulo-maven-plugin/instance1");
}
+ protected static ClientConfiguration getClientConfig() throws FileNotFoundException, ConfigurationException {
+ if (getInstanceOneConnector() == null) {
+ return new ClientConfiguration(new PropertiesConfiguration(cluster.getConfig().getClientConfFile()));
+ } else {
+ File directory = getInstanceOnePath();
+ return new ClientConfiguration(MiniAccumuloInstance.getConfigProperties(directory)).withInstance(INSTANCE_NAME)
+ .withZkHosts(MiniAccumuloInstance.getZooKeepersFromDir(directory));
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
index aacfb56..d64e3cc 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -39,6 +39,10 @@
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
+ <groupId>org.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
new file mode 100644
index 0000000..fb9744e
--- /dev/null
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.trace.instrument;
+
+import java.util.Map;
+
+/**
+ * Base interface for gathering and reporting statistics about a block of execution.
+ */
+public interface CloudtraceSpan {
+ static final long ROOT_SPAN_ID = 0;
+
+ /** Begin gathering timing information */
+ void start();
+
+ /** The block has completed, stop the clock */
+ void stop();
+
+ /** Get the start time, in milliseconds */
+ long getStartTimeMillis();
+
+ /** Get the stop time, in milliseconds */
+ long getStopTimeMillis();
+
+ /** Return the total amount of time elapsed since start was called, if running, or difference between stop and start */
+ long accumulatedMillis();
+
+ /** Has the span been started and not yet stopped? */
+ boolean running();
+
+ /** Return a textual description of this span */
+ String description();
+
+ /** A pseudo-unique (random) number assigned to this span instance */
+ long spanId();
+
+ /** The parent span: returns null if this is the root span */
+ Span parent();
+
+ /** A pseudo-unique (random) number assigned to the trace associated with this span */
+ long traceId();
+
+ /** Create a child span of this span with the given description */
+ Span child(String description);
+
+ @Override
+ String toString();
+
+ /** Return the pseudo-unique (random) number of the parent span, returns ROOT_SPAN_ID if this is the root span */
+ long parentId();
+
+ /** Add data associated with this span */
+ void data(String key, String value);
+
+ /** Get data associated with this span (read only) */
+ Map<String,String> getData();
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
index 9a5bdbb..b291ee9 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
@@ -16,26 +16,16 @@
*/
package org.apache.accumulo.trace.instrument;
-import java.util.Random;
-
/**
- * Sampler that returns true every N calls.
- *
+ * use org.htrace.impl.CountSampler instead
*/
-public class CountSampler implements Sampler {
-
- final static Random random = new Random();
-
- final long frequency;
- long count = random.nextLong();
-
+public class CountSampler extends org.htrace.impl.CountSampler implements Sampler {
public CountSampler(long frequency) {
- this.frequency = frequency;
+ super(frequency);
}
@Override
public boolean next() {
- return (count++ % frequency) == 0;
+ return super.next(null);
}
-
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
index 4abb40a..3813530 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
@@ -17,11 +17,9 @@
package org.apache.accumulo.trace.instrument;
/**
- * Extremely simple callback to determine the frequency that an action should be performed.
- *
- * @see Trace#wrapAll
+ * use org.htrace.Sampler instead
*/
-public interface Sampler {
+public interface Sampler extends org.htrace.Sampler<Object> {
boolean next();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
index 5267174..84275ce 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
@@ -16,56 +16,173 @@
*/
package org.apache.accumulo.trace.instrument;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import org.htrace.NullScope;
+import org.htrace.TimelineAnnotation;
+import org.htrace.TraceScope;
+
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
/**
- * Base interface for gathering and reporting statistics about a block of execution.
+ * This is a wrapper for a TraceScope object, which is a wrapper for a Span and its parent.
*/
-public interface Span {
- static final long ROOT_SPAN_ID = 0;
-
- /** Begin gathering timing information */
- void start();
-
- /** The block has completed, stop the clock */
- void stop();
-
- /** Get the start time, in milliseconds */
- long getStartTimeMillis();
-
- /** Get the stop time, in milliseconds */
- long getStopTimeMillis();
-
- /** Return the total amount of time elapsed since start was called, if running, or difference between stop and start */
- long accumulatedMillis();
-
- /** Has the span been started and not yet stopped? */
- boolean running();
-
- /** Return a textual description of this span */
- String description();
-
- /** A pseudo-unique (random) number assigned to this span instance */
- long spanId();
-
- /** The parent span: returns null if this is the root span */
- Span parent();
-
- /** A pseudo-unique (random) number assigned to the trace associated with this span */
- long traceId();
-
- /** Create a child span of this span with the given description */
- Span child(String description);
-
- @Override
- String toString();
-
- /** Return the pseudo-unique (random) number of the parent span, returns ROOT_SPAN_ID if this is the root span */
- long parentId();
-
- /** Add data associated with this span */
- void data(String key, String value);
-
- /** Get data associated with this span (read only) */
- Map<String,String> getData();
+public class Span implements org.htrace.Span, CloudtraceSpan {
+ public static final long ROOT_SPAN_ID = org.htrace.Span.ROOT_SPAN_ID;
+ public static final Span NULL_SPAN = new Span(NullScope.INSTANCE);
+ private TraceScope scope = null;
+ protected org.htrace.Span span = null;
+
+ public Span(TraceScope scope) {
+ this.scope = scope;
+ this.span = scope.getSpan();
+ }
+
+ public Span(org.htrace.Span span) {
+ this.span = span;
+ }
+
+ public TraceScope getScope() {
+ return scope;
+ }
+
+ public org.htrace.Span getSpan() {
+ return span;
+ }
+
+ public long traceId() {
+ return span.getTraceId();
+ }
+
+ public void data(String k, String v) {
+ if (span != null)
+ span.addKVAnnotation(k.getBytes(UTF_8), v.getBytes(UTF_8));
+ }
+
+ @Override
+ public void stop() {
+ if (scope == null) {
+ if (span != null) {
+ span.stop();
+ }
+ } else {
+ scope.close();
+ }
+ }
+
+ @Override
+ public long getStartTimeMillis() {
+ return span.getStartTimeMillis();
+ }
+
+ @Override
+ public long getStopTimeMillis() {
+ return span.getStopTimeMillis();
+ }
+
+ @Override
+ public long getAccumulatedMillis() {
+ return span.getAccumulatedMillis();
+ }
+
+ @Override
+ public boolean isRunning() {
+ return span.isRunning();
+ }
+
+ @Override
+ public String getDescription() {
+ return span.getDescription();
+ }
+
+ @Override
+ public long getSpanId() {
+ return span.getSpanId();
+ }
+
+ @Override
+ public long getTraceId() {
+ return span.getTraceId();
+ }
+
+ @Override
+ public Span child(String s) {
+ return new Span(span.child(s));
+ }
+
+ @Override
+ public long getParentId() {
+ return span.getParentId();
+ }
+
+ @Override
+ public void addKVAnnotation(byte[] k, byte[] v) {
+ span.addKVAnnotation(k, v);
+ }
+
+ @Override
+ public void addTimelineAnnotation(String s) {
+ span.addTimelineAnnotation(s);
+ }
+
+ @Override
+ public Map<byte[], byte[]> getKVAnnotations() {
+ return span.getKVAnnotations();
+ }
+
+ @Override
+ public List<TimelineAnnotation> getTimelineAnnotations() {
+ return span.getTimelineAnnotations();
+ }
+
+ @Override
+ public String getProcessId() {
+ return span.getProcessId();
+ }
+
+ @Override
+ public String toString() {
+ return span.toString();
+ }
+
+ public void start() {
+ throw new UnsupportedOperationException("can't start span");
+ }
+
+ public long accumulatedMillis() {
+ return getAccumulatedMillis();
+ }
+
+ public boolean running() {
+ return isRunning();
+ }
+
+ public String description() {
+ return getDescription();
+ }
+
+ public long spanId() {
+ return getSpanId();
+ }
+
+ public Span parent() {
+ throw new UnsupportedOperationException("can't get parent");
+ }
+
+ public long parentId() {
+ return getParentId();
+ }
+
+ @Override
+ public Map<String,String> getData() {
+ Map<byte[],byte[]> data = span.getKVAnnotations();
+ HashMap<String,String> stringData = new HashMap<>();
+ for (Entry<byte[],byte[]> d : data.entrySet()) {
+ stringData.put(new String(d.getKey(), UTF_8), new String(d.getValue(), UTF_8));
+ }
+ return stringData;
+ }
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
index 19171c4..5ad52fb 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
@@ -17,79 +17,124 @@
package org.apache.accumulo.trace.instrument;
import org.apache.accumulo.trace.thrift.TInfo;
+import org.htrace.TraceInfo;
+import org.htrace.wrappers.TraceProxy;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
/**
- * A Trace allows a user to gather global, distributed, detailed performance information while requesting a service. The general usage for a user is to do
- * something like this:
- *
- * Trace.on("doSomething"); try { doSomething(); } finally { Trace.off(); }
- *
- * This updates the environment for this thread, and data collection will occur whenever the thread encounters any Span notations in the code. The information
- * about the trace will also be carried over RPC calls as well. If the thread should hand off work to another thread, the environment can be carried with it, so
- * that the trace continues on the new thread.
+ * Utility class for tracing within Accumulo. Not intended for client use!
+ *
*/
public class Trace {
-
- // Initiate tracing if it isn't already started
+ /**
+ * Start a trace span with a given description.
+ */
public static Span on(String description) {
- return Tracer.getInstance().on(description);
+ return on(description, Sampler.ALWAYS);
}
-
- // Turn tracing off:
+
+ /**
+ * Start a trace span with a given description with the given sampler.
+ */
+ public static <T> Span on(String description, org.htrace.Sampler<T> sampler) {
+ return new Span(org.htrace.Trace.startSpan(description, sampler));
+ }
+
+ /**
+ * Finish the current trace.
+ */
public static void off() {
- Tracer.getInstance().stopTracing();
- Tracer.getInstance().flush();
+ org.htrace.Span span = org.htrace.Trace.currentSpan();
+ if (span != null) {
+ span.stop();
+ org.htrace.Tracer.getInstance().continueSpan(null);
+ }
}
-
+
+ /**
+ * @deprecated since 1.7, use {@link #off()} instead
+ */
+ @Deprecated
public static void offNoFlush() {
- Tracer.getInstance().stopTracing();
+ off();
}
-
- // Are we presently tracing?
+
+ /**
+ * Returns whether tracing is currently on.
+ */
public static boolean isTracing() {
- return Tracer.getInstance().isTracing();
+ return org.htrace.Trace.isTracing();
}
-
- // If we are tracing, return the current span, else null
+
+ /**
+ * Return the current span.
+ * @deprecated since 1.7 -- it is better to save the span you create in a local variable and call its methods, rather than retrieving the current span
+ */
+ @Deprecated
public static Span currentTrace() {
- return Tracer.getInstance().currentTrace();
+ return new Span(org.htrace.Trace.currentSpan());
}
-
- // Create a new time span, if tracing is on
+
+ /**
+ * Get the trace id of the current span.
+ */
+ public static long currentTraceId() {
+ return org.htrace.Trace.currentSpan().getTraceId();
+ }
+
+ /**
+ * Start a new span with a given description, if already tracing.
+ */
public static Span start(String description) {
- return Tracer.getInstance().start(description);
+ return new Span(org.htrace.Trace.startSpan(description));
}
-
- // Start a trace in the current thread from information passed via RPC
+
+ /**
+ * Continue a trace by starting a new span with a given parent and description.
+ */
public static Span trace(TInfo info, String description) {
if (info.traceId == 0) {
- return Tracer.NULL_SPAN;
+ return Span.NULL_SPAN;
}
- return Tracer.getInstance().continueTrace(description, info.traceId, info.parentId);
+ TraceInfo ti = new TraceInfo(info.traceId, info.parentId);
+ return new Span(org.htrace.Trace.startSpan(description, ti));
}
-
- // Initiate a trace in this thread, starting now
+
+ /**
+ * Start a new span with a given description and parent.
+ * @deprecated since 1.7 -- use htrace API
+ */
+ @Deprecated
public static Span startThread(Span parent, String description) {
- return Tracer.getInstance().startThread(parent, description);
+ return new Span(org.htrace.Trace.startSpan(description, parent.getSpan()));
}
-
- // Stop a trace in this thread, starting now
- public static void endThread(Span span) {
- Tracer.getInstance().endThread(span);
+
+ /**
+ * Add data to the current span.
+ */
+ public static void data(String k, String v) {
+ org.htrace.Span span = org.htrace.Trace.currentSpan();
+ if (span != null)
+ span.addKVAnnotation(k.getBytes(UTF_8), v.getBytes(UTF_8));
}
-
- // Wrap the runnable in a new span, if tracing
+
+ /**
+ * Wrap a runnable in a TraceRunnable, if tracing.
+ */
public static Runnable wrap(Runnable runnable) {
- if (isTracing())
- return new TraceRunnable(Trace.currentTrace(), runnable);
- return runnable;
+ if (isTracing()) {
+ return new TraceRunnable(org.htrace.Trace.currentSpan(), runnable);
+ } else {
+ return runnable;
+ }
}
-
+
// Wrap all calls to the given object with spans
public static <T> T wrapAll(T instance) {
return TraceProxy.trace(instance);
}
-
+
// Sample trace all calls to the given object
public static <T> T wrapAll(T instance, Sampler dist) {
return TraceProxy.trace(instance, dist);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java
index c3072b1..f682d61 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java
@@ -16,6 +16,10 @@
*/
package org.apache.accumulo.trace.instrument;
+import org.htrace.Span;
+import org.htrace.Trace;
+import org.htrace.TraceScope;
+
import java.util.concurrent.Callable;
/**
@@ -25,27 +29,41 @@ import java.util.concurrent.Callable;
public class TraceCallable<V> implements Callable<V> {
private final Callable<V> impl;
private final Span parent;
+ private final String description;
TraceCallable(Callable<V> impl) {
- this(Trace.currentTrace(), impl);
+ this(Trace.currentSpan(), impl);
}
TraceCallable(Span parent, Callable<V> impl) {
+ this(parent, impl, null);
+ }
+
+ TraceCallable(Span parent, Callable<V> impl, String description) {
this.impl = impl;
this.parent = parent;
+ this.description = description;
}
@Override
public V call() throws Exception {
if (parent != null) {
- Span chunk = Trace.startThread(parent, Thread.currentThread().getName());
+ TraceScope chunk = Trace.startSpan(getDescription(), parent);
try {
return impl.call();
} finally {
- Trace.endThread(chunk);
+ TraceExecutorService.endThread(chunk.getSpan());
}
} else {
return impl.call();
}
}
+
+ public Callable<V> getImpl() {
+ return impl;
+ }
+
+ private String getDescription() {
+ return this.description == null ? Thread.currentThread().getName() : description;
+ }
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java
index 04dcc39..36563d7 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java
@@ -16,6 +16,9 @@
*/
package org.apache.accumulo.trace.instrument;
+import org.htrace.Span;
+import org.htrace.Tracer;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -108,4 +111,13 @@ public class TraceExecutorService implements ExecutorService {
return impl.invokeAny(wrapCollection(tasks), timeout, unit);
}
+ /**
+ * Finish a given trace and set the span for the current thread to null.
+ */
+ public static void endThread(Span span) {
+ if (span != null) {
+ span.stop();
+ Tracer.getInstance().continueSpan(null);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceProxy.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceProxy.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceProxy.java
deleted file mode 100644
index cb93210..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceProxy.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.apache.log4j.Logger;
-
-public class TraceProxy {
- private static final Logger log = Logger.getLogger(TraceProxy.class);
-
- static final Sampler ALWAYS = new Sampler() {
- @Override
- public boolean next() {
- return true;
- }
- };
-
- public static <T> T trace(T instance) {
- return trace(instance, ALWAYS);
- }
-
- @SuppressWarnings("unchecked")
- public static <T> T trace(final T instance, final Sampler sampler) {
- InvocationHandler handler = new InvocationHandler() {
- @Override
- public Object invoke(Object obj, Method method, Object[] args) throws Throwable {
- Span span = null;
- if (sampler.next()) {
- span = Trace.on(method.getName());
- }
- try {
- return method.invoke(instance, args);
- // Can throw RuntimeException, Error, or any checked exceptions of the method.
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getCause();
- if (cause == null) {
- // This should never happen, but account for it anyway
- log.error("Invocation exception during trace with null cause: ", ite);
- throw new RuntimeException(ite);
- }
- throw cause;
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- } finally {
- if (span != null) {
- span.stop();
- }
- }
- }
- };
- return (T) Proxy.newProxyInstance(instance.getClass().getClassLoader(), instance.getClass().getInterfaces(), handler);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
index 41c765d..0ddeb9e 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
@@ -16,6 +16,10 @@
*/
package org.apache.accumulo.trace.instrument;
+import org.htrace.Span;
+import org.htrace.Trace;
+import org.htrace.TraceScope;
+
/**
* Wrap a Runnable with a Span that survives a change in threads.
*
@@ -24,29 +28,39 @@ public class TraceRunnable implements Runnable, Comparable<TraceRunnable> {
private final Span parent;
private final Runnable runnable;
+ private final String description;
public TraceRunnable(Runnable runnable) {
- this(Trace.currentTrace(), runnable);
+ this(Trace.currentSpan(), runnable);
}
public TraceRunnable(Span parent, Runnable runnable) {
+ this(parent, runnable, null);
+ }
+
+ public TraceRunnable(Span parent, Runnable runnable, String description) {
this.parent = parent;
this.runnable = runnable;
+ this.description = description;
}
@Override
public void run() {
if (parent != null) {
- Span chunk = Trace.startThread(parent, Thread.currentThread().getName());
+ TraceScope chunk = Trace.startSpan(getDescription(), parent);
try {
runnable.run();
} finally {
- Trace.endThread(chunk);
+ TraceExecutorService.endThread(chunk.getSpan());
}
} else {
runnable.run();
}
}
+
+ private String getDescription() {
+ return this.description == null ? Thread.currentThread().getName() : description;
+ }
@Override
public boolean equals(Object o) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
index d70aeea..246d1eb 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
@@ -16,129 +16,20 @@
*/
package org.apache.accumulo.trace.instrument;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import org.apache.accumulo.trace.instrument.impl.NullSpan;
-import org.apache.accumulo.trace.instrument.impl.RootMilliSpan;
-import org.apache.accumulo.trace.instrument.receivers.SpanReceiver;
import org.apache.accumulo.trace.thrift.TInfo;
+import org.htrace.Span;
-
-/**
- * A Tracer provides the implementation for collecting and distributing Spans within a process.
- */
public class Tracer {
- private final static Random random = new SecureRandom();
- private final List<SpanReceiver> receivers = new ArrayList<SpanReceiver>();
-
- private static final ThreadLocal<Span> currentTrace = new ThreadLocal<Span>();
- public static final NullSpan NULL_SPAN = new NullSpan();
- private static final TInfo dontTrace = new TInfo(0, 0);
-
- private static Tracer instance = null;
-
- synchronized public static void setInstance(Tracer tracer) {
- instance = tracer;
- }
-
- synchronized public static Tracer getInstance() {
- if (instance == null) {
- instance = new Tracer();
- }
- return instance;
- }
-
+ private static final TInfo DONT_TRACE = new TInfo(0, 0);
+
+ /**
+ * Obtain {@link org.apache.accumulo.trace.thrift.TInfo} for the current span.
+ */
public static TInfo traceInfo() {
- Span span = currentTrace.get();
+ Span span = org.htrace.Trace.currentSpan();
if (span != null) {
- return new TInfo(span.traceId(), span.spanId());
- }
- return dontTrace;
- }
-
- public Span start(String description) {
- Span parent = currentTrace.get();
- if (parent == null)
- return NULL_SPAN;
- return push(parent.child(description));
- }
-
- public Span on(String description) {
- Span parent = currentTrace.get();
- Span root;
- if (parent == null) {
- root = new RootMilliSpan(description, random.nextLong(), random.nextLong(), Span.ROOT_SPAN_ID);
- } else {
- root = parent.child(description);
- }
- return push(root);
- }
-
- public Span startThread(Span parent, String activity) {
- return push(parent.child(activity));
- }
-
- public void endThread(Span span) {
- if (span != null) {
- span.stop();
- currentTrace.set(null);
- }
- }
-
- public boolean isTracing() {
- return currentTrace.get() != null;
- }
-
- public Span currentTrace() {
- return currentTrace.get();
- }
-
- public void stopTracing() {
- endThread(currentTrace());
- }
-
- protected void deliver(Span span) {
- for (SpanReceiver receiver : receivers) {
- receiver.span(span.traceId(), span.spanId(), span.parentId(), span.getStartTimeMillis(), span.getStopTimeMillis(), span.description(), span.getData());
-
- }
- }
-
- public synchronized void addReceiver(SpanReceiver receiver) {
- receivers.add(receiver);
- }
-
- public synchronized void removeReceiver(SpanReceiver receiver) {
- receivers.remove(receiver);
- }
-
- public Span push(Span span) {
- if (span != null) {
- currentTrace.set(span);
- span.start();
- }
- return span;
- }
-
- public void pop(Span span) {
- if (span != null) {
- deliver(span);
- currentTrace.set(span.parent());
- } else
- currentTrace.set(null);
- }
-
- public Span continueTrace(String description, long traceId, long parentId) {
- return push(new RootMilliSpan(description, traceId, random.nextLong(), parentId));
- }
-
- public void flush() {
- for (SpanReceiver receiver : receivers) {
- receiver.flush();
+ return new TInfo(span.getTraceId(), span.getSpanId());
}
+ return DONT_TRACE;
}
-
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/MilliSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/MilliSpan.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/MilliSpan.java
deleted file mode 100644
index b641a2c..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/MilliSpan.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.impl;
-
-import java.security.SecureRandom;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Tracer;
-
-
-/**
- * A Span implementation that stores its information in milliseconds since the epoch.
- */
-public class MilliSpan implements Span {
-
- private static final Random next = new SecureRandom();
- private long start;
- private long stop;
- final private Span parent;
- final private String description;
- final private long spanId;
- final private long traceId;
- private Map<String,String> traceInfo = null;
-
- public Span child(String description) {
- return new MilliSpan(description, next.nextLong(), traceId, this);
- }
-
- public MilliSpan(String description, long id, long traceId, Span parent) {
- this.description = description;
- this.spanId = id;
- this.traceId = traceId;
- this.parent = parent;
- this.start = 0;
- this.stop = 0;
- }
-
- public synchronized void start() {
- if (start > 0)
- throw new IllegalStateException("Span for " + description + " has already been started");
- start = System.currentTimeMillis();
- }
-
- public synchronized void stop() {
- if (start == 0)
- throw new IllegalStateException("Span for " + description + " has not been started");
- stop = System.currentTimeMillis();
- Tracer.getInstance().pop(this);
- }
-
- protected long currentTimeMillis() {
- return System.currentTimeMillis();
- }
-
- public synchronized boolean running() {
- return start != 0 && stop == 0;
- }
-
- public synchronized long accumulatedMillis() {
- if (start == 0)
- return 0;
- if (stop > 0)
- return stop - start;
- return currentTimeMillis() - start;
- }
-
- public String toString() {
- long parentId = parentId();
- return ("\"" + description() + "\" trace:" + Long.toHexString(traceId()) + " span:" + spanId + (parentId > 0 ? " parent:" + parentId : "") + " start:"
- + start + " ms: " + Long.toString(accumulatedMillis()) + (running() ? "..." : ""));
-
- }
-
- public String description() {
- return description;
- }
-
- @Override
- public long spanId() {
- return spanId;
- }
-
- @Override
- public Span parent() {
- return parent;
- }
-
- @Override
- public long parentId() {
- if (parent == null)
- return -1;
- return parent.spanId();
- }
-
- @Override
- public long traceId() {
- return traceId;
- }
-
- @Override
- public long getStartTimeMillis() {
- return start;
- }
-
- @Override
- public long getStopTimeMillis() {
- return stop;
- }
-
- @Override
- public void data(String key, String value) {
- if (traceInfo == null)
- traceInfo = new HashMap<String,String>();
- traceInfo.put(key, value);
- }
-
- @Override
- public Map<String,String> getData() {
- if (traceInfo == null)
- return Collections.emptyMap();
- return Collections.unmodifiableMap(traceInfo);
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/NullSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/NullSpan.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/NullSpan.java
deleted file mode 100644
index 916b6cf..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/NullSpan.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.impl;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.accumulo.trace.instrument.Span;
-
-
-/**
- * A Span that does nothing. Used to avoid returning and checking for nulls when we are not tracing.
- *
- */
-public class NullSpan implements Span {
-
- public NullSpan() {}
-
- @Override
- public long accumulatedMillis() {
- return 0;
- }
-
- @Override
- public String description() {
- return "NullSpan";
- }
-
- @Override
- public long getStartTimeMillis() {
- return 0;
- }
-
- @Override
- public long getStopTimeMillis() {
- return 0;
- }
-
- @Override
- public Span parent() {
- return null;
- }
-
- @Override
- public long parentId() {
- return -1;
- }
-
- @Override
- public boolean running() {
- return false;
- }
-
- @Override
- public long spanId() {
- return -1;
- }
-
- @Override
- public void start() {}
-
- @Override
- public void stop() {}
-
- @Override
- public long traceId() {
- return -1;
- }
-
- @Override
- public Span child(String description) {
- return this;
- }
-
- @Override
- public void data(String key, String value) {}
-
- @Override
- public String toString() {
- return "Not Tracing";
- }
-
- @Override
- public Map<String,String> getData() {
- return Collections.emptyMap();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/RootMilliSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/RootMilliSpan.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/RootMilliSpan.java
deleted file mode 100644
index c25e644..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/RootMilliSpan.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.impl;
-
-/**
- * Span that roots the span tree in a process, but perhaps not the whole trace.
- *
- */
-public class RootMilliSpan extends MilliSpan {
-
- final long traceId;
- final long parentId;
-
- @Override
- public long traceId() {
- return traceId;
- }
-
- public RootMilliSpan(String description, long traceId, long spanId, long parentId) {
- super(description, spanId, traceId, null);
- this.traceId = traceId;
- this.parentId = parentId;
- }
-
- public long parentId() {
- return parentId;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java
deleted file mode 100644
index 4eebd69..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.receivers;
-
-import java.util.AbstractQueue;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.log4j.Logger;
-
-
-/**
- * Deliver Span information periodically to a destination.
- * <ul>
- * <li>Send host and service information with the span.
- * <li>Cache Destination objects by some key that can be extracted from the span.
- * <li>Can be used to queue spans up for delivery over RPC, or for saving into a file.
- * </ul>
- */
-public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanReceiver {
-
- private static final Logger log = Logger.getLogger(AsyncSpanReceiver.class);
-
- private final Map<SpanKey,Destination> clients = new HashMap<SpanKey,Destination>();
-
- protected final String host;
- protected final String service;
-
- protected abstract Destination createDestination(SpanKey key) throws Exception;
-
- protected abstract void send(Destination resource, RemoteSpan span) throws Exception;
-
- protected abstract SpanKey getSpanKey(Map<String,String> data);
-
- Timer timer = new Timer("SpanSender", true);
- final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>();
-
- public AsyncSpanReceiver(String host, String service, long millis) {
- this.host = host;
- this.service = service;
- timer.schedule(new TimerTask() {
- @Override
- public void run() {
- try {
- sendSpans();
- } catch (Exception ex) {
- log.warn("Exception sending spans to destination", ex);
- }
- }
-
- }, millis, millis);
- }
-
- void sendSpans() {
- while (!sendQueue.isEmpty()) {
- boolean sent = false;
- RemoteSpan s = sendQueue.peek();
- if (s.stop - s.start < 1) {
- synchronized (sendQueue) {
- sendQueue.remove();
- sendQueue.notifyAll();
- }
- continue;
- }
- SpanKey dest = getSpanKey(s.data);
- Destination client = clients.get(dest);
- if (client == null) {
- try {
- clients.put(dest, createDestination(dest));
- } catch (Exception ex) {
- log.warn("Exception creating connection to span receiver", ex);
- }
- }
- if (client != null) {
- try {
- send(client, s);
- synchronized (sendQueue) {
- sendQueue.remove();
- sendQueue.notifyAll();
- }
- sent = true;
- } catch (Exception ex) {
- log.error(ex, ex);
- }
- }
- if (!sent)
- break;
- }
- }
-
- @Override
- public void span(long traceId, long spanId, long parentId, long start, long stop, String description, Map<String,String> data) {
-
- SpanKey dest = getSpanKey(data);
- if (dest != null) {
- sendQueue.add(new RemoteSpan(host, service, traceId, spanId, parentId, start, stop, description, data));
- }
- }
-
- @Override
- public void flush() {
- synchronized (sendQueue) {
- while (!sendQueue.isEmpty()) {
- try {
- sendQueue.wait();
- } catch (InterruptedException e) {
- log.warn("flush interrupted");
- break;
- }
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/LogSpans.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/LogSpans.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/LogSpans.java
deleted file mode 100644
index dfed660..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/LogSpans.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.receivers;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
-import org.apache.log4j.Level;
-
-/**
- * A SpanReceiver that just logs the data using log4j.
- */
-public class LogSpans implements SpanReceiver {
- private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LogSpans.class);
-
- static public class SpanLevel extends Level {
-
- private static final long serialVersionUID = 1L;
-
- protected SpanLevel() {
- super(Level.DEBUG_INT + 150, "SPAN", Level.DEBUG_INT + 150);
- }
-
- static public Level toLevel(int val) {
- if (val == Level.DEBUG_INT + 150)
- return Level.DEBUG;
- return Level.toLevel(val);
- }
- }
-
- public final static Level SPAN = new SpanLevel();
-
- public static String format(long traceId, long spanId, long parentId, long start, long stop, String description, Map<String,String> data) {
- String parentStr = "";
- if (parentId > 0)
- parentStr = " parent:" + parentId;
- String startStr = new SimpleDateFormat("HH:mm:ss.SSS").format(new Date(start));
- return String.format("%20s:%x id:%d%s start:%s ms:%d", description, traceId, spanId, parentStr, startStr, stop - start);
- }
-
- @Override
- public void span(long traceId, long spanId, long parentId, long start, long stop, String description, Map<String,String> data) {
- log.log(SPAN, format(traceId, spanId, parentId, start, stop, description, data));
- }
-
- @Override
- public void flush() {}
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db2dda1b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SendSpansViaThrift.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SendSpansViaThrift.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SendSpansViaThrift.java
deleted file mode 100644
index 4967d97..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SendSpansViaThrift.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument.receivers;
-
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.Map;
-
-import org.apache.accumulo.trace.thrift.RemoteSpan;
-import org.apache.accumulo.trace.thrift.SpanReceiver.Client;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-
-
-/**
- * Send Span data to a destination using thrift.
- */
-public class SendSpansViaThrift extends AsyncSpanReceiver<String,Client> {
-
- private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SendSpansViaThrift.class);
-
- private static final String THRIFT = "thrift://";
-
- public SendSpansViaThrift(String host, String service, long millis) {
- super(host, service, millis);
- }
-
- @Override
- protected Client createDestination(String destination) throws Exception {
- if (destination == null)
- return null;
- try {
- int portSeparatorIndex = destination.lastIndexOf(':');
- String host = destination.substring(0, portSeparatorIndex);
- int port = Integer.parseInt(destination.substring(portSeparatorIndex+1));
- log.debug("Connecting to " + host + ":" + port);
- InetSocketAddress addr = new InetSocketAddress(host, port);
- Socket sock = new Socket();
- sock.connect(addr);
- TTransport transport = new TSocket(sock);
- TProtocol prot = new TBinaryProtocol(transport);
- return new Client(prot);
- } catch (Exception ex) {
- log.error(ex, ex);
- return null;
- }
- }
-
- @Override
- protected void send(Client client, RemoteSpan s) throws Exception {
- if (client != null) {
- try {
- client.span(s);
- } catch (Exception ex) {
- client.getInputProtocol().getTransport().close();
- client = null;
- }
- }
- }
-
- protected String getSpanKey(Map<String,String> data) {
- String dest = data.get("dest");
- if (dest != null && dest.startsWith(THRIFT)) {
- String hostAddress = dest.substring(THRIFT.length());
- String[] hostAddr = hostAddress.split(":", 2);
- if (hostAddr.length == 2) {
- return hostAddress;
- }
- }
- return null;
- }
-
-}
[07/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
new file mode 100644
index 0000000..ec1f293
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
@@ -0,0 +1,1084 @@
+/*
+ * 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.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.tracer.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 TestService {
+
+ public interface Iface {
+
+ public boolean checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, String message) throws org.apache.thrift.TException;
+
+ }
+
+ public interface AsyncIface {
+
+ public void checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, String message, 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 boolean checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, String message) throws org.apache.thrift.TException
+ {
+ send_checkTrace(tinfo, message);
+ return recv_checkTrace();
+ }
+
+ public void send_checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, String message) throws org.apache.thrift.TException
+ {
+ checkTrace_args args = new checkTrace_args();
+ args.setTinfo(tinfo);
+ args.setMessage(message);
+ sendBase("checkTrace", args);
+ }
+
+ public boolean recv_checkTrace() throws org.apache.thrift.TException
+ {
+ checkTrace_result result = new checkTrace_result();
+ receiveBase(result, "checkTrace");
+ if (result.isSetSuccess()) {
+ return result.success;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "checkTrace 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 checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, String message, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ checkTrace_call method_call = new checkTrace_call(tinfo, message, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class checkTrace_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
+ private String message;
+ public checkTrace_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, String message, 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.message = message;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("checkTrace", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ checkTrace_args args = new checkTrace_args();
+ args.setTinfo(tinfo);
+ args.setMessage(message);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public boolean getResult() throws 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_checkTrace();
+ }
+ }
+
+ }
+
+ 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("checkTrace", new checkTrace());
+ return processMap;
+ }
+
+ public static class checkTrace<I extends Iface> extends org.apache.thrift.ProcessFunction<I, checkTrace_args> {
+ public checkTrace() {
+ super("checkTrace");
+ }
+
+ public checkTrace_args getEmptyArgsInstance() {
+ return new checkTrace_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public checkTrace_result getResult(I iface, checkTrace_args args) throws org.apache.thrift.TException {
+ checkTrace_result result = new checkTrace_result();
+ result.success = iface.checkTrace(args.tinfo, args.message);
+ result.setSuccessIsSet(true);
+ return result;
+ }
+ }
+
+ }
+
+ 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("checkTrace", new checkTrace());
+ return processMap;
+ }
+
+ public static class checkTrace<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, checkTrace_args, Boolean> {
+ public checkTrace() {
+ super("checkTrace");
+ }
+
+ public checkTrace_args getEmptyArgsInstance() {
+ return new checkTrace_args();
+ }
+
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ checkTrace_result result = new checkTrace_result();
+ result.success = o;
+ result.setSuccessIsSet(true);
+ 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;
+ checkTrace_result result = new checkTrace_result();
+ {
+ 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, checkTrace_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.checkTrace(args.tinfo, args.message,resultHandler);
+ }
+ }
+
+ }
+
+ public static class checkTrace_args implements org.apache.thrift.TBase<checkTrace_args, checkTrace_args._Fields>, java.io.Serializable, Cloneable, Comparable<checkTrace_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("checkTrace_args");
+
+ private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", 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 checkTrace_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new checkTrace_argsTupleSchemeFactory());
+ }
+
+ public org.apache.accumulo.core.trace.thrift.TInfo tinfo; // required
+ public String message; // 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 {
+ TINFO((short)1, "tinfo"),
+ MESSAGE((short)2, "message");
+
+ 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: // TINFO
+ return TINFO;
+ case 2: // MESSAGE
+ return MESSAGE;
+ 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.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.core.trace.thrift.TInfo.class)));
+ tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", 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(checkTrace_args.class, metaDataMap);
+ }
+
+ public checkTrace_args() {
+ }
+
+ public checkTrace_args(
+ org.apache.accumulo.core.trace.thrift.TInfo tinfo,
+ String message)
+ {
+ this();
+ this.tinfo = tinfo;
+ this.message = message;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public checkTrace_args(checkTrace_args other) {
+ if (other.isSetTinfo()) {
+ this.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(other.tinfo);
+ }
+ if (other.isSetMessage()) {
+ this.message = other.message;
+ }
+ }
+
+ public checkTrace_args deepCopy() {
+ return new checkTrace_args(this);
+ }
+
+ @Override
+ public void clear() {
+ this.tinfo = null;
+ this.message = null;
+ }
+
+ public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() {
+ return this.tinfo;
+ }
+
+ public checkTrace_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
+ this.tinfo = tinfo;
+ return this;
+ }
+
+ public void unsetTinfo() {
+ this.tinfo = null;
+ }
+
+ /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */
+ public boolean isSetTinfo() {
+ return this.tinfo != null;
+ }
+
+ public void setTinfoIsSet(boolean value) {
+ if (!value) {
+ this.tinfo = null;
+ }
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
+
+ public checkTrace_args setMessage(String message) {
+ this.message = message;
+ return this;
+ }
+
+ public void unsetMessage() {
+ this.message = null;
+ }
+
+ /** Returns true if field message is set (has been assigned a value) and false otherwise */
+ public boolean isSetMessage() {
+ return this.message != null;
+ }
+
+ public void setMessageIsSet(boolean value) {
+ if (!value) {
+ this.message = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case TINFO:
+ if (value == null) {
+ unsetTinfo();
+ } else {
+ setTinfo((org.apache.accumulo.core.trace.thrift.TInfo)value);
+ }
+ break;
+
+ case MESSAGE:
+ if (value == null) {
+ unsetMessage();
+ } else {
+ setMessage((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case TINFO:
+ return getTinfo();
+
+ case MESSAGE:
+ return getMessage();
+
+ }
+ 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 TINFO:
+ return isSetTinfo();
+ case MESSAGE:
+ return isSetMessage();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof checkTrace_args)
+ return this.equals((checkTrace_args)that);
+ return false;
+ }
+
+ public boolean equals(checkTrace_args that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_tinfo = true && this.isSetTinfo();
+ boolean that_present_tinfo = true && that.isSetTinfo();
+ if (this_present_tinfo || that_present_tinfo) {
+ if (!(this_present_tinfo && that_present_tinfo))
+ return false;
+ if (!this.tinfo.equals(that.tinfo))
+ return false;
+ }
+
+ boolean this_present_message = true && this.isSetMessage();
+ boolean that_present_message = true && that.isSetMessage();
+ if (this_present_message || that_present_message) {
+ if (!(this_present_message && that_present_message))
+ return false;
+ if (!this.message.equals(that.message))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(checkTrace_args other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTinfo()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, other.tinfo);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetMessage()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
+ 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("checkTrace_args(");
+ boolean first = true;
+
+ sb.append("tinfo:");
+ if (this.tinfo == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.tinfo);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("message:");
+ if (this.message == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.message);
+ }
+ 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 (tinfo != null) {
+ tinfo.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 checkTrace_argsStandardSchemeFactory implements SchemeFactory {
+ public checkTrace_argsStandardScheme getScheme() {
+ return new checkTrace_argsStandardScheme();
+ }
+ }
+
+ private static class checkTrace_argsStandardScheme extends StandardScheme<checkTrace_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, checkTrace_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: // TINFO
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo();
+ struct.tinfo.read(iprot);
+ struct.setTinfoIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // MESSAGE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.message = iprot.readString();
+ struct.setMessageIsSet(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, checkTrace_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.tinfo != null) {
+ oprot.writeFieldBegin(TINFO_FIELD_DESC);
+ struct.tinfo.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.message != null) {
+ oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+ oprot.writeString(struct.message);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class checkTrace_argsTupleSchemeFactory implements SchemeFactory {
+ public checkTrace_argsTupleScheme getScheme() {
+ return new checkTrace_argsTupleScheme();
+ }
+ }
+
+ private static class checkTrace_argsTupleScheme extends TupleScheme<checkTrace_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, checkTrace_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetTinfo()) {
+ optionals.set(0);
+ }
+ if (struct.isSetMessage()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetTinfo()) {
+ struct.tinfo.write(oprot);
+ }
+ if (struct.isSetMessage()) {
+ oprot.writeString(struct.message);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, checkTrace_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo();
+ struct.tinfo.read(iprot);
+ struct.setTinfoIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.message = iprot.readString();
+ struct.setMessageIsSet(true);
+ }
+ }
+ }
+
+ }
+
+ public static class checkTrace_result implements org.apache.thrift.TBase<checkTrace_result, checkTrace_result._Fields>, java.io.Serializable, Cloneable, Comparable<checkTrace_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("checkTrace_result");
+
+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new checkTrace_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new checkTrace_resultTupleSchemeFactory());
+ }
+
+ public boolean success; // 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");
+
+ 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;
+ 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
+ private static final int __SUCCESS_ISSET_ID = 0;
+ private byte __isset_bitfield = 0;
+ 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.BOOL)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(checkTrace_result.class, metaDataMap);
+ }
+
+ public checkTrace_result() {
+ }
+
+ public checkTrace_result(
+ boolean success)
+ {
+ this();
+ this.success = success;
+ setSuccessIsSet(true);
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public checkTrace_result(checkTrace_result other) {
+ __isset_bitfield = other.__isset_bitfield;
+ this.success = other.success;
+ }
+
+ public checkTrace_result deepCopy() {
+ return new checkTrace_result(this);
+ }
+
+ @Override
+ public void clear() {
+ setSuccessIsSet(false);
+ this.success = false;
+ }
+
+ public boolean isSuccess() {
+ return this.success;
+ }
+
+ public checkTrace_result setSuccess(boolean success) {
+ this.success = success;
+ setSuccessIsSet(true);
+ return this;
+ }
+
+ public void unsetSuccess() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ }
+
+ /** Returns true if field success is set (has been assigned a value) and false otherwise */
+ public boolean isSetSuccess() {
+ return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ }
+
+ public void setSuccessIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case SUCCESS:
+ if (value == null) {
+ unsetSuccess();
+ } else {
+ setSuccess((Boolean)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case SUCCESS:
+ return Boolean.valueOf(isSuccess());
+
+ }
+ 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();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof checkTrace_result)
+ return this.equals((checkTrace_result)that);
+ return false;
+ }
+
+ public boolean equals(checkTrace_result that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_success = true;
+ boolean that_present_success = true;
+ if (this_present_success || that_present_success) {
+ if (!(this_present_success && that_present_success))
+ return false;
+ if (this.success != that.success)
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(checkTrace_result other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSuccess()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+ 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("checkTrace_result(");
+ boolean first = true;
+
+ sb.append("success:");
+ sb.append(this.success);
+ 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 {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bitfield = 0;
+ 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 checkTrace_resultStandardSchemeFactory implements SchemeFactory {
+ public checkTrace_resultStandardScheme getScheme() {
+ return new checkTrace_resultStandardScheme();
+ }
+ }
+
+ private static class checkTrace_resultStandardScheme extends StandardScheme<checkTrace_result> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, checkTrace_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.BOOL) {
+ struct.success = iprot.readBool();
+ struct.setSuccessIsSet(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, checkTrace_result struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.isSetSuccess()) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ oprot.writeBool(struct.success);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class checkTrace_resultTupleSchemeFactory implements SchemeFactory {
+ public checkTrace_resultTupleScheme getScheme() {
+ return new checkTrace_resultTupleScheme();
+ }
+ }
+
+ private static class checkTrace_resultTupleScheme extends TupleScheme<checkTrace_result> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, checkTrace_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetSuccess()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetSuccess()) {
+ oprot.writeBool(struct.success);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, checkTrace_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.success = iprot.readBool();
+ struct.setSuccessIsSet(true);
+ }
+ }
+ }
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/scripts/generate-thrift.sh b/server/tracer/src/main/scripts/generate-thrift.sh
new file mode 100755
index 0000000..ab916ec
--- /dev/null
+++ b/server/tracer/src/main/scripts/generate-thrift.sh
@@ -0,0 +1,24 @@
+#! /usr/bin/env bash
+
+# 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.
+
+# This script will regenerate the thrift code for accumulo-trace.
+INCLUDED_MODULES=(../../core)
+BASE_OUTPUT_PACKAGE='org.apache.accumulo'
+PACKAGES_TO_GENERATE=(tracer)
+
+. ../../core/src/main/scripts/generate-thrift.sh
+
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/thrift/tracer.thrift
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/thrift/tracer.thrift b/server/tracer/src/main/thrift/tracer.thrift
new file mode 100644
index 0000000..19350fb
--- /dev/null
+++ b/server/tracer/src/main/thrift/tracer.thrift
@@ -0,0 +1,47 @@
+/*
+* 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.
+*/
+namespace java org.apache.accumulo.tracer.thrift
+namespace cpp org.apache.accumulo.tracer.thrift
+
+include "trace.thrift"
+
+struct Annotation {
+ 1:i64 time,
+ 2:string msg
+}
+
+struct RemoteSpan {
+ 1:string sender,
+ 2:string svc,
+ 3:i64 traceId,
+ 4:i64 spanId,
+ 5:i64 parentId,
+ 6:i64 start,
+ 7:i64 stop,
+ 8:string description,
+ 10:map<binary, binary> data,
+ 11:list<Annotation> annotations
+}
+
+service SpanReceiver {
+ oneway void span(1:RemoteSpan span);
+}
+
+// used for testing trace
+service TestService {
+ bool checkTrace(1:trace.TInfo tinfo, 2:string message),
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
new file mode 100644
index 0000000..c1264bb
--- /dev/null
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
@@ -0,0 +1,234 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.tracer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.wrappers.TraceWrap;
+import org.apache.accumulo.core.trace.thrift.TInfo;
+import org.apache.accumulo.tracer.thrift.TestService;
+import org.apache.accumulo.tracer.thrift.TestService.Iface;
+import org.apache.accumulo.tracer.thrift.TestService.Processor;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TThreadPoolServer;
+import org.apache.thrift.transport.TServerSocket;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+import org.htrace.HTraceConfiguration;
+import org.htrace.Sampler;
+import org.htrace.SpanReceiver;
+import org.htrace.wrappers.TraceProxy;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class TracerTest {
+ static class SpanStruct {
+ public SpanStruct(long traceId, long spanId, long parentId, long start, long stop, String description, Map<byte[],byte[]> data) {
+ super();
+ this.traceId = traceId;
+ this.spanId = spanId;
+ this.parentId = parentId;
+ this.start = start;
+ this.stop = stop;
+ this.description = description;
+ this.data = data;
+ }
+
+ public long traceId;
+ public long spanId;
+ public long parentId;
+ public long start;
+ public long stop;
+ public String description;
+ public Map<byte[],byte[]> data;
+
+ public long millis() {
+ return stop - start;
+ }
+ }
+
+ static class TestReceiver implements SpanReceiver {
+ public Map<Long,List<SpanStruct>> traces = new HashMap<Long,List<SpanStruct>>();
+
+ @Override
+ public void receiveSpan(org.htrace.Span s) {
+ long traceId = s.getTraceId();
+ SpanStruct span = new SpanStruct(traceId, s.getSpanId(), s.getParentId(), s.getStartTimeMillis(), s.getStopTimeMillis(), s.getDescription(),
+ s.getKVAnnotations());
+ if (!traces.containsKey(traceId))
+ traces.put(traceId, new ArrayList<SpanStruct>());
+ traces.get(traceId).add(span);
+ }
+
+ @Override
+ public void configure(HTraceConfiguration conf) {
+ }
+
+ @Override
+ public void close() throws IOException {
+ }
+ }
+
+ @SuppressWarnings("deprecation")
+ @Test
+ public void testTrace() throws Exception {
+ TestReceiver tracer = new TestReceiver();
+ org.htrace.Trace.addReceiver(tracer);
+
+ assertFalse(Trace.isTracing());
+ Trace.start("nop").stop();
+ assertTrue(tracer.traces.size() == 0);
+ assertFalse(Trace.isTracing());
+
+ Trace.on("nop").stop();
+ assertTrue(tracer.traces.size() == 1);
+ assertFalse(Trace.isTracing());
+
+ Span start = Trace.on("testing");
+ assertEquals(Trace.currentTrace().getSpan(), start.getScope().getSpan());
+ assertTrue(Trace.isTracing());
+
+ Span span = Trace.start("shortest trace ever");
+ span.stop();
+ long traceId = Trace.currentTraceId();
+ assertNotNull(tracer.traces.get(traceId));
+ assertTrue(tracer.traces.get(traceId).size() == 1);
+ assertEquals("shortest trace ever", tracer.traces.get(traceId).get(0).description);
+
+ Span pause = Trace.start("pause");
+ Thread.sleep(100);
+ pause.stop();
+ assertTrue(tracer.traces.get(traceId).size() == 2);
+ assertTrue(tracer.traces.get(traceId).get(1).millis() >= 100);
+
+ Thread t = new Thread(Trace.wrap(new Runnable() {
+ @Override
+ public void run() {
+ assertTrue(Trace.isTracing());
+ }
+ }), "My Task");
+ t.start();
+ t.join();
+
+ assertTrue(tracer.traces.get(traceId).size() == 3);
+ assertEquals("My Task", tracer.traces.get(traceId).get(2).description);
+ Trace.off();
+ assertFalse(Trace.isTracing());
+ }
+
+ static class Service implements TestService.Iface {
+ @Override
+ public boolean checkTrace(TInfo t, String message) throws TException {
+ Span trace = Trace.start(message);
+ try {
+ return Trace.isTracing();
+ } finally {
+ trace.stop();
+ }
+ }
+ }
+
+ @Test
+ public void testThrift() throws Exception {
+ TestReceiver tracer = new TestReceiver();
+ org.htrace.Trace.addReceiver(tracer);
+
+ ServerSocket socket = new ServerSocket(0);
+ TServerSocket transport = new TServerSocket(socket);
+ transport.listen();
+ TThreadPoolServer.Args args = new TThreadPoolServer.Args(transport);
+ args.processor(new Processor<Iface>(TraceWrap.service(new Service())));
+ final TServer tserver = new TThreadPoolServer(args);
+ Thread t = new Thread() {
+ public void run() {
+ tserver.serve();
+ }
+ };
+ t.start();
+ TTransport clientTransport = new TSocket(new Socket("localhost", socket.getLocalPort()));
+ TestService.Iface client = new TestService.Client(new TBinaryProtocol(clientTransport), new TBinaryProtocol(clientTransport));
+ client = TraceWrap.client(client);
+ assertFalse(client.checkTrace(null, "test"));
+
+ Span start = Trace.on("start");
+ assertTrue(client.checkTrace(null, "my test"));
+ start.stop();
+
+ assertNotNull(tracer.traces.get(start.traceId()));
+ String traces[] = {"my test", "checkTrace", "client:checkTrace", "start"};
+ assertTrue(tracer.traces.get(start.traceId()).size() == traces.length);
+ for (int i = 0; i < traces.length; i++)
+ assertEquals(traces[i], tracer.traces.get(start.traceId()).get(i).description);
+
+ tserver.stop();
+ t.join(100);
+ }
+
+ Callable<Object> callable;
+
+ @Before
+ public void setup() {
+ callable = new Callable<Object>() {
+ @Override
+ public Object call() throws IOException {
+ throw new IOException();
+ }
+ };
+ }
+
+ /**
+ * Verify that exceptions propagate up through the trace wrapping with sampling enabled, as the cause of the reflexive exceptions.
+ */
+ @Test(expected = IOException.class)
+ public void testTracedException() throws Throwable {
+ try {
+ TraceProxy.trace(callable).call();
+ } catch (InvocationTargetException e) {
+ throw e.getCause();
+ }
+ }
+
+ /**
+ * Verify that exceptions propagate up through the trace wrapping with sampling disabled, as the cause of the reflexive exceptions.
+ */
+ @Test(expected = IOException.class)
+ public void testUntracedException() throws Throwable {
+ try {
+ TraceProxy.trace(callable, Sampler.NEVER).call();
+ } catch (InvocationTargetException e) {
+ throw e.getCause();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 65c33ec..cd0f8ef 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -72,10 +72,6 @@
<artifactId>accumulo-start</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 9fd255a..913feed 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -123,6 +123,9 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Processor;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
import org.apache.accumulo.core.trace.DistributedTrace;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.ColumnFQ;
@@ -185,9 +188,6 @@ import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
import org.apache.accumulo.start.classloader.vfs.ContextManager;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.accumulo.tserver.RowLocks.RowLock;
import org.apache.accumulo.tserver.TabletServerResourceManager.TabletResourceManager;
import org.apache.accumulo.tserver.TabletStatsKeeper.Operation;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index 4855a4f..7806bbc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -40,6 +40,7 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.file.blockfile.cache.LruBlockCache;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
+import org.apache.accumulo.core.trace.wrappers.TraceExecutorService;
import org.apache.accumulo.core.util.Daemon;
import org.apache.accumulo.core.util.LoggingRunnable;
import org.apache.accumulo.core.util.NamingThreadFactory;
@@ -52,7 +53,6 @@ import org.apache.accumulo.server.tabletserver.MemoryManagementActions;
import org.apache.accumulo.server.tabletserver.MemoryManager;
import org.apache.accumulo.server.tabletserver.TabletState;
import org.apache.accumulo.server.util.time.SimpleTimer;
-import org.apache.accumulo.trace.instrument.TraceExecutorService;
import org.apache.accumulo.tserver.FileManager.ScanFileManager;
import org.apache.accumulo.tserver.compaction.CompactionStrategy;
import org.apache.accumulo.tserver.compaction.DefaultCompactionStrategy;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
index 2eb1077..5d61c9c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.tserver.mastermessage;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.accumulo.core.client.impl.Translator;
import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.client.impl.Translators;
@@ -27,6 +26,7 @@ import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.master.thrift.MasterClientService;
import org.apache.accumulo.core.master.thrift.TabletSplit;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
index b168625..655414d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
@@ -16,12 +16,12 @@
*/
package org.apache.accumulo.tserver.mastermessage;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.master.thrift.TabletLoadState;
import org.apache.accumulo.core.master.thrift.MasterClientService.Iface;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.thrift.TException;
public class TabletStatusMessage implements MasterMessage {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 4a899ef..71643e8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -52,13 +52,13 @@ import org.apache.accumulo.core.replication.thrift.ReplicationServicer.Client;
import org.apache.accumulo.core.replication.thrift.WalEdits;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.tserver.log.DfsLogger;
import org.apache.accumulo.tserver.log.DfsLogger.DFSLoggerInputStreams;
import org.apache.accumulo.tserver.log.DfsLogger.LogHeaderIncompleteException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
index 2eee5ea..4f19ff9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
@@ -48,6 +48,8 @@ import org.apache.accumulo.core.iterators.system.DeletingIterator;
import org.apache.accumulo.core.iterators.system.MultiIterator;
import org.apache.accumulo.core.iterators.system.TimeSettingIterator;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
import org.apache.accumulo.server.fs.FileRef;
@@ -56,8 +58,6 @@ import org.apache.accumulo.server.problems.ProblemReport;
import org.apache.accumulo.server.problems.ProblemReportingIterator;
import org.apache.accumulo.server.problems.ProblemReports;
import org.apache.accumulo.server.problems.ProblemType;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.tserver.InMemoryMap;
import org.apache.accumulo.tserver.MinorCompactionReason;
import org.apache.accumulo.tserver.TabletIteratorEnvironment;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index 5cdc1af..3eb7229 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -36,6 +36,8 @@ import org.apache.accumulo.core.metadata.schema.DataFileValue;
import org.apache.accumulo.core.replication.ReplicationConfigurationUtil;
import org.apache.accumulo.core.replication.StatusUtil;
import org.apache.accumulo.core.security.Credentials;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.MapCounter;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -50,8 +52,6 @@ import org.apache.accumulo.server.util.MasterMetadataUtil;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.util.ReplicationTableUtil;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.tserver.TLevel;
import org.apache.hadoop.fs.Path;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
index 5e5f31f..c5dd4a4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
@@ -19,9 +19,9 @@ package org.apache.accumulo.tserver.tablet;
import java.io.IOException;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.server.fs.FileRef;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.tserver.MinorCompactionReason;
import org.apache.accumulo.tserver.compaction.MajorCompactionReason;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 9dd4323..9490903 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -86,6 +86,8 @@ import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -111,8 +113,6 @@ import org.apache.accumulo.server.util.ReplicationTableUtil;
import org.apache.accumulo.server.util.TabletOperations;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.tserver.InMemoryMap;
import org.apache.accumulo.tserver.MinorCompactionReason;
import org.apache.accumulo.tserver.TConstraintViolationException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/shell/pom.xml
----------------------------------------------------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index a5af4b8..db3530f 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
+ <artifactId>accumulo-tracer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
index 819f61c..d6fe075 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
@@ -19,16 +19,16 @@ package org.apache.accumulo.shell.commands;
import java.io.IOException;
import java.util.Map;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.shell.Shell;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.trace.TraceDump;
-import org.apache.accumulo.core.trace.TraceDump.Printer;
import org.apache.accumulo.core.util.BadArgumentException;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.tracer.TraceDump;
+import org.apache.accumulo.tracer.TraceDump.Printer;
import org.apache.commons.cli.CommandLine;
import org.apache.hadoop.io.Text;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java b/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
index 0ba4ab2..00f8f74 100644
--- a/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
@@ -28,10 +28,10 @@ import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
import org.apache.accumulo.core.master.thrift.RecoveryStatus;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.server.util.TableInfoUtil;
-import org.apache.accumulo.trace.instrument.Tracer;
public class GetMasterStats {
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
index 902d49e..02eead2 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
@@ -33,7 +33,7 @@ import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.trace.DistributedTrace;
-import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java b/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
index b563ed9..9089b60 100644
--- a/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
@@ -21,10 +21,10 @@ import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.TDurability;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import com.beust.jcommander.Parameter;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
index b986330..f54b8db 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
@@ -39,9 +39,9 @@ import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.core.trace.CountSampler;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.FastFormat;
-import org.apache.accumulo.trace.instrument.CountSampler;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
index b36dbeb..6ead9a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
@@ -38,6 +38,7 @@ import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.Stat;
import org.apache.accumulo.server.ServerConstants;
@@ -46,7 +47,6 @@ import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.server.util.TableInfoUtil;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ContentSummary;
import org.apache.hadoop.fs.Path;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
index 680ca92..9253093 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
@@ -34,8 +34,8 @@ import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index 879128f..592e177 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -29,6 +29,8 @@ import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.security.thrift.TCredentials;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Processor;
+import org.apache.accumulo.core.trace.Tracer;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.ServerServices.Service;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -42,8 +44,6 @@ import org.apache.accumulo.server.util.TServerUtils.ServerAddress;
import org.apache.accumulo.server.zookeeper.TransactionWatcher;
import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
index 8ab1e98..a47f21a 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
@@ -59,6 +59,7 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Processor;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
+import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.server.client.ClientServiceHandler;
import org.apache.accumulo.server.client.HdfsZooInstance;
@@ -70,7 +71,6 @@ import org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.server.util.TServerUtils;
import org.apache.accumulo.server.zookeeper.TransactionWatcher;
-import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java
index ad93c78..69d54a9 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java
@@ -22,6 +22,7 @@ import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.impl.MasterClient;
import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.master.state.SetGoalState;
import org.apache.accumulo.server.client.HdfsZooInstance;
@@ -29,7 +30,6 @@ import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.test.randomwalk.Environment;
import org.apache.accumulo.test.randomwalk.State;
import org.apache.accumulo.test.randomwalk.Test;
-import org.apache.accumulo.trace.instrument.Tracer;
public class Shutdown extends Test {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java
index 4fc94d8..6b8c43c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java
@@ -23,6 +23,7 @@ import org.apache.accumulo.core.client.impl.MasterClient;
import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
import org.apache.accumulo.core.master.thrift.MasterGoalState;
import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.master.state.SetGoalState;
import org.apache.accumulo.server.client.HdfsZooInstance;
@@ -30,7 +31,6 @@ import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.test.randomwalk.Environment;
import org.apache.accumulo.test.randomwalk.State;
import org.apache.accumulo.test.randomwalk.Test;
-import org.apache.accumulo.trace.instrument.Tracer;
public class StartAll extends Test {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 81e519e..72db704 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -69,16 +69,16 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.trace.DistributedTrace;
-import org.apache.accumulo.core.trace.TraceDump;
-import org.apache.accumulo.core.trace.TraceDump.Printer;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.FastFormat;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint;
import org.apache.accumulo.test.functional.BadIterator;
import org.apache.accumulo.test.functional.SimpleMacIT;
import org.apache.accumulo.test.functional.SlowIterator;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.accumulo.tracer.TraceDump;
+import org.apache.accumulo.tracer.TraceDump.Printer;
import org.apache.accumulo.tracer.TraceServer;
import org.apache.hadoop.io.Text;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
index 7b4a774..c32375b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
@@ -37,11 +37,11 @@ import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.fate.util.UtilWaitThread;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.minicluster.impl.ProcessReference;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
index 87497b9..3ec3ccf 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
@@ -29,10 +29,10 @@ import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.security.Credentials;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.test.TestIngest;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.conf.Configuration;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
index 6b8d9b3..98adbf6 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
@@ -35,10 +35,10 @@ import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.security.Credentials;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.server.util.Admin;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index 966c150..d7e206f 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -35,12 +35,12 @@ import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.security.Credentials;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.minicluster.MemoryUnit;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.test.TestIngest;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.junit.Test;
[11/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index d583cd4..e56e4c1 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -52,129 +52,129 @@ import org.slf4j.LoggerFactory;
public interface Iface extends org.apache.accumulo.core.client.impl.thrift.ClientService.Iface {
- public org.apache.accumulo.core.data.thrift.InitialScan startScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, TooManyFilesException, org.apache.thrift.TException;
+ public org.apache.accumulo.core.data.thrift.InitialScan startScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, TooManyFilesException, org.apache.thrift.TException;
- public org.apache.accumulo.core.data.thrift.ScanResult continueScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, NotServingTabletException, TooManyFilesException, org.apache.thrift.TException;
+ public org.apache.accumulo.core.data.thrift.ScanResult continueScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, NotServingTabletException, TooManyFilesException, org.apache.thrift.TException;
- public void closeScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException;
+ public void closeScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException;
- public org.apache.accumulo.core.data.thrift.InitialMultiScan startMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public org.apache.accumulo.core.data.thrift.InitialMultiScan startMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public org.apache.accumulo.core.data.thrift.MultiScanResult continueMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, org.apache.thrift.TException;
+ public org.apache.accumulo.core.data.thrift.MultiScanResult continueMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, org.apache.thrift.TException;
- public void closeMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, org.apache.thrift.TException;
+ public void closeMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, org.apache.thrift.TException;
- public long startUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public long startUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public void applyUpdates(org.apache.accumulo.trace.thrift.TInfo tinfo, long updateID, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, List<org.apache.accumulo.core.data.thrift.TMutation> mutations) throws org.apache.thrift.TException;
+ public void applyUpdates(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, List<org.apache.accumulo.core.data.thrift.TMutation> mutations) throws org.apache.thrift.TException;
- public org.apache.accumulo.core.data.thrift.UpdateErrors closeUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long updateID) throws NoSuchScanIDException, org.apache.thrift.TException;
+ public org.apache.accumulo.core.data.thrift.UpdateErrors closeUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID) throws NoSuchScanIDException, org.apache.thrift.TException;
- public void update(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, org.apache.accumulo.core.data.thrift.TMutation mutation, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, ConstraintViolationException, org.apache.thrift.TException;
+ public void update(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, org.apache.accumulo.core.data.thrift.TMutation mutation, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, ConstraintViolationException, org.apache.thrift.TException;
- public org.apache.accumulo.core.data.thrift.TConditionalSession startConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<ByteBuffer> authorizations, String tableID, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public org.apache.accumulo.core.data.thrift.TConditionalSession startConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<ByteBuffer> authorizations, String tableID, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public List<org.apache.accumulo.core.data.thrift.TCMResult> conditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TConditionalMutation>> mutations, List<String> symbols) throws NoSuchScanIDException, org.apache.thrift.TException;
+ public List<org.apache.accumulo.core.data.thrift.TCMResult> conditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TConditionalMutation>> mutations, List<String> symbols) throws NoSuchScanIDException, org.apache.thrift.TException;
- public void invalidateConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException;
+ public void invalidateConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException;
- public void closeConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException;
+ public void closeConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException;
- public List<org.apache.accumulo.core.data.thrift.TKeyExtent> bulkImport(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files, boolean setTime) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public List<org.apache.accumulo.core.data.thrift.TKeyExtent> bulkImport(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files, boolean setTime) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public void splitTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, ByteBuffer splitPoint) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, org.apache.thrift.TException;
+ public void splitTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, ByteBuffer splitPoint) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, org.apache.thrift.TException;
- public void loadTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException;
+ public void loadTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException;
- public void unloadTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean save) throws org.apache.thrift.TException;
+ public void unloadTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean save) throws org.apache.thrift.TException;
- public void flush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException;
+ public void flush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException;
- public void flushTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException;
+ public void flushTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException;
- public void chop(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException;
+ public void chop(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException;
- public void compact(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException;
+ public void compact(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException;
- public org.apache.accumulo.core.master.thrift.TabletServerStatus getTabletServerStatus(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 org.apache.accumulo.core.master.thrift.TabletServerStatus getTabletServerStatus(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 List<TabletStats> getTabletStats(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public List<TabletStats> getTabletStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public TabletStats getHistoricalStats(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 TabletStats getHistoricalStats(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 halt(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public void halt(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public void fastHalt(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.thrift.TException;
+ public void fastHalt(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.thrift.TException;
- public List<ActiveScan> getActiveScans(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 List<ActiveScan> getActiveScans(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 List<ActiveCompaction> getActiveCompactions(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 List<ActiveCompaction> getActiveCompactions(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 removeLogs(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames) throws org.apache.thrift.TException;
+ public void removeLogs(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames) throws org.apache.thrift.TException;
}
public interface AsyncIface extends org.apache.accumulo.core.client.impl.thrift.ClientService .AsyncIface {
- public void startScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void startScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void continueScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void continueScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void closeScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void closeScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void startMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void startMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void continueMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void continueMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void closeMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void closeMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void startUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, TDurability durability, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void startUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, TDurability durability, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void applyUpdates(org.apache.accumulo.trace.thrift.TInfo tinfo, long updateID, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, List<org.apache.accumulo.core.data.thrift.TMutation> mutations, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void applyUpdates(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, List<org.apache.accumulo.core.data.thrift.TMutation> mutations, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void closeUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long updateID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void closeUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void update(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, org.apache.accumulo.core.data.thrift.TMutation mutation, TDurability durability, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void update(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, org.apache.accumulo.core.data.thrift.TMutation mutation, TDurability durability, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void startConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<ByteBuffer> authorizations, String tableID, TDurability durability, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void startConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<ByteBuffer> authorizations, String tableID, TDurability durability, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void conditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TConditionalMutation>> mutations, List<String> symbols, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void conditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TConditionalMutation>> mutations, List<String> symbols, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void invalidateConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void invalidateConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void closeConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void closeConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void bulkImport(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files, boolean setTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void bulkImport(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files, boolean setTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void splitTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, ByteBuffer splitPoint, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void splitTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, ByteBuffer splitPoint, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void loadTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void loadTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void unloadTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean save, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void unloadTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean save, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void flush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void flush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void flushTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void flushTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void chop(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void chop(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void compact(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void compact(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getTabletServerStatus(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 getTabletServerStatus(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 getTabletStats(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getTabletStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getHistoricalStats(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 getHistoricalStats(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 halt(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void halt(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void fastHalt(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void fastHalt(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getActiveScans(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 getActiveScans(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 getActiveCompactions(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 getActiveCompactions(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 removeLogs(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void removeLogs(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -198,13 +198,13 @@ import org.slf4j.LoggerFactory;
super(iprot, oprot);
}
- public org.apache.accumulo.core.data.thrift.InitialScan startScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, TooManyFilesException, org.apache.thrift.TException
+ public org.apache.accumulo.core.data.thrift.InitialScan startScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, TooManyFilesException, org.apache.thrift.TException
{
send_startScan(tinfo, credentials, extent, range, columns, batchSize, ssiList, ssio, authorizations, waitForWrites, isolated, readaheadThreshold);
return recv_startScan();
}
- public void send_startScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold) throws org.apache.thrift.TException
+ public void send_startScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold) throws org.apache.thrift.TException
{
startScan_args args = new startScan_args();
args.setTinfo(tinfo);
@@ -241,13 +241,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startScan failed: unknown result");
}
- public org.apache.accumulo.core.data.thrift.ScanResult continueScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, NotServingTabletException, TooManyFilesException, org.apache.thrift.TException
+ public org.apache.accumulo.core.data.thrift.ScanResult continueScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, NotServingTabletException, TooManyFilesException, org.apache.thrift.TException
{
send_continueScan(tinfo, scanID);
return recv_continueScan();
}
- public void send_continueScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
+ public void send_continueScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
{
continueScan_args args = new continueScan_args();
args.setTinfo(tinfo);
@@ -274,12 +274,12 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "continueScan failed: unknown result");
}
- public void closeScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
+ public void closeScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
{
send_closeScan(tinfo, scanID);
}
- public void send_closeScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
+ public void send_closeScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
{
closeScan_args args = new closeScan_args();
args.setTinfo(tinfo);
@@ -287,13 +287,13 @@ import org.slf4j.LoggerFactory;
sendBase("closeScan", args);
}
- public org.apache.accumulo.core.data.thrift.InitialMultiScan startMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public org.apache.accumulo.core.data.thrift.InitialMultiScan startMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_startMultiScan(tinfo, credentials, batch, columns, ssiList, ssio, authorizations, waitForWrites);
return recv_startMultiScan();
}
- public void send_startMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites) throws org.apache.thrift.TException
+ public void send_startMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites) throws org.apache.thrift.TException
{
startMultiScan_args args = new startMultiScan_args();
args.setTinfo(tinfo);
@@ -320,13 +320,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startMultiScan failed: unknown result");
}
- public org.apache.accumulo.core.data.thrift.MultiScanResult continueMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, org.apache.thrift.TException
+ public org.apache.accumulo.core.data.thrift.MultiScanResult continueMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, org.apache.thrift.TException
{
send_continueMultiScan(tinfo, scanID);
return recv_continueMultiScan();
}
- public void send_continueMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
+ public void send_continueMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
{
continueMultiScan_args args = new continueMultiScan_args();
args.setTinfo(tinfo);
@@ -347,13 +347,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "continueMultiScan failed: unknown result");
}
- public void closeMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, org.apache.thrift.TException
+ public void closeMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws NoSuchScanIDException, org.apache.thrift.TException
{
send_closeMultiScan(tinfo, scanID);
recv_closeMultiScan();
}
- public void send_closeMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
+ public void send_closeMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) throws org.apache.thrift.TException
{
closeMultiScan_args args = new closeMultiScan_args();
args.setTinfo(tinfo);
@@ -371,13 +371,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public long startUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public long startUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_startUpdate(tinfo, credentials, durability);
return recv_startUpdate();
}
- public void send_startUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, TDurability durability) throws org.apache.thrift.TException
+ public void send_startUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, TDurability durability) throws org.apache.thrift.TException
{
startUpdate_args args = new startUpdate_args();
args.setTinfo(tinfo);
@@ -399,12 +399,12 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startUpdate failed: unknown result");
}
- public void applyUpdates(org.apache.accumulo.trace.thrift.TInfo tinfo, long updateID, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, List<org.apache.accumulo.core.data.thrift.TMutation> mutations) throws org.apache.thrift.TException
+ public void applyUpdates(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, List<org.apache.accumulo.core.data.thrift.TMutation> mutations) throws org.apache.thrift.TException
{
send_applyUpdates(tinfo, updateID, keyExtent, mutations);
}
- public void send_applyUpdates(org.apache.accumulo.trace.thrift.TInfo tinfo, long updateID, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, List<org.apache.accumulo.core.data.thrift.TMutation> mutations) throws org.apache.thrift.TException
+ public void send_applyUpdates(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, List<org.apache.accumulo.core.data.thrift.TMutation> mutations) throws org.apache.thrift.TException
{
applyUpdates_args args = new applyUpdates_args();
args.setTinfo(tinfo);
@@ -414,13 +414,13 @@ import org.slf4j.LoggerFactory;
sendBase("applyUpdates", args);
}
- public org.apache.accumulo.core.data.thrift.UpdateErrors closeUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long updateID) throws NoSuchScanIDException, org.apache.thrift.TException
+ public org.apache.accumulo.core.data.thrift.UpdateErrors closeUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID) throws NoSuchScanIDException, org.apache.thrift.TException
{
send_closeUpdate(tinfo, updateID);
return recv_closeUpdate();
}
- public void send_closeUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long updateID) throws org.apache.thrift.TException
+ public void send_closeUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID) throws org.apache.thrift.TException
{
closeUpdate_args args = new closeUpdate_args();
args.setTinfo(tinfo);
@@ -441,13 +441,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "closeUpdate failed: unknown result");
}
- public void update(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, org.apache.accumulo.core.data.thrift.TMutation mutation, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, ConstraintViolationException, org.apache.thrift.TException
+ public void update(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, org.apache.accumulo.core.data.thrift.TMutation mutation, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, ConstraintViolationException, org.apache.thrift.TException
{
send_update(tinfo, credentials, keyExtent, mutation, durability);
recv_update();
}
- public void send_update(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, org.apache.accumulo.core.data.thrift.TMutation mutation, TDurability durability) throws org.apache.thrift.TException
+ public void send_update(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent keyExtent, org.apache.accumulo.core.data.thrift.TMutation mutation, TDurability durability) throws org.apache.thrift.TException
{
update_args args = new update_args();
args.setTinfo(tinfo);
@@ -474,13 +474,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public org.apache.accumulo.core.data.thrift.TConditionalSession startConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<ByteBuffer> authorizations, String tableID, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public org.apache.accumulo.core.data.thrift.TConditionalSession startConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<ByteBuffer> authorizations, String tableID, TDurability durability) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_startConditionalUpdate(tinfo, credentials, authorizations, tableID, durability);
return recv_startConditionalUpdate();
}
- public void send_startConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<ByteBuffer> authorizations, String tableID, TDurability durability) throws org.apache.thrift.TException
+ public void send_startConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<ByteBuffer> authorizations, String tableID, TDurability durability) throws org.apache.thrift.TException
{
startConditionalUpdate_args args = new startConditionalUpdate_args();
args.setTinfo(tinfo);
@@ -504,13 +504,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startConditionalUpdate failed: unknown result");
}
- public List<org.apache.accumulo.core.data.thrift.TCMResult> conditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TConditionalMutation>> mutations, List<String> symbols) throws NoSuchScanIDException, org.apache.thrift.TException
+ public List<org.apache.accumulo.core.data.thrift.TCMResult> conditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TConditionalMutation>> mutations, List<String> symbols) throws NoSuchScanIDException, org.apache.thrift.TException
{
send_conditionalUpdate(tinfo, sessID, mutations, symbols);
return recv_conditionalUpdate();
}
- public void send_conditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TConditionalMutation>> mutations, List<String> symbols) throws org.apache.thrift.TException
+ public void send_conditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TConditionalMutation>> mutations, List<String> symbols) throws org.apache.thrift.TException
{
conditionalUpdate_args args = new conditionalUpdate_args();
args.setTinfo(tinfo);
@@ -533,13 +533,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "conditionalUpdate failed: unknown result");
}
- public void invalidateConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException
+ public void invalidateConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException
{
send_invalidateConditionalUpdate(tinfo, sessID);
recv_invalidateConditionalUpdate();
}
- public void send_invalidateConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException
+ public void send_invalidateConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException
{
invalidateConditionalUpdate_args args = new invalidateConditionalUpdate_args();
args.setTinfo(tinfo);
@@ -554,12 +554,12 @@ import org.slf4j.LoggerFactory;
return;
}
- public void closeConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException
+ public void closeConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException
{
send_closeConditionalUpdate(tinfo, sessID);
}
- public void send_closeConditionalUpdate(org.apache.accumulo.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException
+ public void send_closeConditionalUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long sessID) throws org.apache.thrift.TException
{
closeConditionalUpdate_args args = new closeConditionalUpdate_args();
args.setTinfo(tinfo);
@@ -567,13 +567,13 @@ import org.slf4j.LoggerFactory;
sendBase("closeConditionalUpdate", args);
}
- public List<org.apache.accumulo.core.data.thrift.TKeyExtent> bulkImport(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files, boolean setTime) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public List<org.apache.accumulo.core.data.thrift.TKeyExtent> bulkImport(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files, boolean setTime) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_bulkImport(tinfo, credentials, tid, files, setTime);
return recv_bulkImport();
}
- public void send_bulkImport(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files, boolean setTime) throws org.apache.thrift.TException
+ public void send_bulkImport(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> files, boolean setTime) throws org.apache.thrift.TException
{
bulkImport_args args = new bulkImport_args();
args.setTinfo(tinfo);
@@ -597,13 +597,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "bulkImport failed: unknown result");
}
- public void splitTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, ByteBuffer splitPoint) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, org.apache.thrift.TException
+ public void splitTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, ByteBuffer splitPoint) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, NotServingTabletException, org.apache.thrift.TException
{
send_splitTablet(tinfo, credentials, extent, splitPoint);
recv_splitTablet();
}
- public void send_splitTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, ByteBuffer splitPoint) throws org.apache.thrift.TException
+ public void send_splitTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, ByteBuffer splitPoint) throws org.apache.thrift.TException
{
splitTablet_args args = new splitTablet_args();
args.setTinfo(tinfo);
@@ -626,12 +626,12 @@ import org.slf4j.LoggerFactory;
return;
}
- public void loadTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
+ public void loadTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
{
send_loadTablet(tinfo, credentials, lock, extent);
}
- public void send_loadTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
+ public void send_loadTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
{
loadTablet_args args = new loadTablet_args();
args.setTinfo(tinfo);
@@ -641,12 +641,12 @@ import org.slf4j.LoggerFactory;
sendBase("loadTablet", args);
}
- public void unloadTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean save) throws org.apache.thrift.TException
+ public void unloadTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean save) throws org.apache.thrift.TException
{
send_unloadTablet(tinfo, credentials, lock, extent, save);
}
- public void send_unloadTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean save) throws org.apache.thrift.TException
+ public void send_unloadTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean save) throws org.apache.thrift.TException
{
unloadTablet_args args = new unloadTablet_args();
args.setTinfo(tinfo);
@@ -657,12 +657,12 @@ import org.slf4j.LoggerFactory;
sendBase("unloadTablet", args);
}
- public void flush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException
+ public void flush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException
{
send_flush(tinfo, credentials, lock, tableId, startRow, endRow);
}
- public void send_flush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException
+ public void send_flush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException
{
flush_args args = new flush_args();
args.setTinfo(tinfo);
@@ -674,12 +674,12 @@ import org.slf4j.LoggerFactory;
sendBase("flush", args);
}
- public void flushTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
+ public void flushTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
{
send_flushTablet(tinfo, credentials, lock, extent);
}
- public void send_flushTablet(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
+ public void send_flushTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
{
flushTablet_args args = new flushTablet_args();
args.setTinfo(tinfo);
@@ -689,12 +689,12 @@ import org.slf4j.LoggerFactory;
sendBase("flushTablet", args);
}
- public void chop(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
+ public void chop(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
{
send_chop(tinfo, credentials, lock, extent);
}
- public void send_chop(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
+ public void send_chop(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws org.apache.thrift.TException
{
chop_args args = new chop_args();
args.setTinfo(tinfo);
@@ -704,12 +704,12 @@ import org.slf4j.LoggerFactory;
sendBase("chop", args);
}
- public void compact(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException
+ public void compact(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException
{
send_compact(tinfo, credentials, lock, tableId, startRow, endRow);
}
- public void send_compact(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException
+ public void send_compact(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException
{
compact_args args = new compact_args();
args.setTinfo(tinfo);
@@ -721,13 +721,13 @@ import org.slf4j.LoggerFactory;
sendBase("compact", args);
}
- public org.apache.accumulo.core.master.thrift.TabletServerStatus getTabletServerStatus(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 org.apache.accumulo.core.master.thrift.TabletServerStatus getTabletServerStatus(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_getTabletServerStatus(tinfo, credentials);
return recv_getTabletServerStatus();
}
- public void send_getTabletServerStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
+ public void send_getTabletServerStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
getTabletServerStatus_args args = new getTabletServerStatus_args();
args.setTinfo(tinfo);
@@ -748,13 +748,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTabletServerStatus failed: unknown result");
}
- public List<TabletStats> getTabletStats(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public List<TabletStats> getTabletStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_getTabletStats(tinfo, credentials, tableId);
return recv_getTabletStats();
}
- public void send_getTabletStats(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId) throws org.apache.thrift.TException
+ public void send_getTabletStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId) throws org.apache.thrift.TException
{
getTabletStats_args args = new getTabletStats_args();
args.setTinfo(tinfo);
@@ -776,13 +776,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTabletStats failed: unknown result");
}
- public TabletStats getHistoricalStats(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 TabletStats getHistoricalStats(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_getHistoricalStats(tinfo, credentials);
return recv_getHistoricalStats();
}
- public void send_getHistoricalStats(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
+ public void send_getHistoricalStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
getHistoricalStats_args args = new getHistoricalStats_args();
args.setTinfo(tinfo);
@@ -803,13 +803,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getHistoricalStats failed: unknown result");
}
- public void halt(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public void halt(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_halt(tinfo, credentials, lock);
recv_halt();
}
- public void send_halt(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.thrift.TException
+ public void send_halt(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.thrift.TException
{
halt_args args = new halt_args();
args.setTinfo(tinfo);
@@ -828,12 +828,12 @@ import org.slf4j.LoggerFactory;
return;
}
- public void fastHalt(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.thrift.TException
+ public void fastHalt(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.thrift.TException
{
send_fastHalt(tinfo, credentials, lock);
}
- public void send_fastHalt(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.thrift.TException
+ public void send_fastHalt(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock) throws org.apache.thrift.TException
{
fastHalt_args args = new fastHalt_args();
args.setTinfo(tinfo);
@@ -842,13 +842,13 @@ import org.slf4j.LoggerFactory;
sendBase("fastHalt", args);
}
- public List<ActiveScan> getActiveScans(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 List<ActiveScan> getActiveScans(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_getActiveScans(tinfo, credentials);
return recv_getActiveScans();
}
- public void send_getActiveScans(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
+ public void send_getActiveScans(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
getActiveScans_args args = new getActiveScans_args();
args.setTinfo(tinfo);
@@ -869,13 +869,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getActiveScans failed: unknown result");
}
- public List<ActiveCompaction> getActiveCompactions(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 List<ActiveCompaction> getActiveCompactions(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_getActiveCompactions(tinfo, credentials);
return recv_getActiveCompactions();
}
- public void send_getActiveCompactions(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
+ public void send_getActiveCompactions(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
getActiveCompactions_args args = new getActiveCompactions_args();
args.setTinfo(tinfo);
@@ -896,12 +896,12 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getActiveCompactions failed: unknown result");
}
- public void removeLogs(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames) throws org.apache.thrift.TException
+ public void removeLogs(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames) throws org.apache.thrift.TException
{
send_removeLogs(tinfo, credentials, filenames);
}
- public void send_removeLogs(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames) throws org.apache.thrift.TException
+ public void send_removeLogs(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames) throws org.apache.thrift.TException
{
removeLogs_args args = new removeLogs_args();
args.setTinfo(tinfo);
@@ -928,7 +928,7 @@ import org.slf4j.LoggerFactory;
super(protocolFactory, clientManager, transport);
}
- public void startScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void startScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
startScan_call method_call = new startScan_call(tinfo, credentials, extent, range, columns, batchSize, ssiList, ssio, authorizations, waitForWrites, isolated, readaheadThreshold, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -936,7 +936,7 @@ import org.slf4j.LoggerFactory;
}
public static class startScan_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 org.apache.accumulo.core.data.thrift.TKeyExtent extent;
private org.apache.accumulo.core.data.thrift.TRange range;
@@ -948,7 +948,7 @@ import org.slf4j.LoggerFactory;
private boolean waitForWrites;
private boolean isolated;
private long readaheadThreshold;
- public startScan_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold, 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 startScan_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.data.thrift.TKeyExtent extent, org.apache.accumulo.core.data.thrift.TRange range, List<org.apache.accumulo.core.data.thrift.TColumn> columns, int batchSize, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated, long readaheadThreshold, 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;
@@ -993,7 +993,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void continueScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void continueScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
continueScan_call method_call = new continueScan_call(tinfo, scanID, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1001,9 +1001,9 @@ import org.slf4j.LoggerFactory;
}
public static class continueScan_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 long scanID;
- public continueScan_call(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, 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 continueScan_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, 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.scanID = scanID;
@@ -1028,7 +1028,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void closeScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void closeScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
closeScan_call method_call = new closeScan_call(tinfo, scanID, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1036,9 +1036,9 @@ import org.slf4j.LoggerFactory;
}
public static class closeScan_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 long scanID;
- public closeScan_call(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, 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 closeScan_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, 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, true);
this.tinfo = tinfo;
this.scanID = scanID;
@@ -1062,7 +1062,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void startMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void startMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
startMultiScan_call method_call = new startMultiScan_call(tinfo, credentials, batch, columns, ssiList, ssio, authorizations, waitForWrites, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1070,7 +1070,7 @@ import org.slf4j.LoggerFactory;
}
public static class startMultiScan_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 Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch;
private List<org.apache.accumulo.core.data.thrift.TColumn> columns;
@@ -1078,7 +1078,7 @@ import org.slf4j.LoggerFactory;
private Map<String,Map<String,String>> ssio;
private List<ByteBuffer> authorizations;
private boolean waitForWrites;
- public startMultiScan_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, 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 startMultiScan_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, Map<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>> batch, List<org.apache.accumulo.core.data.thrift.TColumn> columns, List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, 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;
@@ -1115,7 +1115,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void continueMultiScan(org.apache.accumulo.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void continueMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
continueMultiScan_call method_call = new continueMultiScan_
<TRUNCATED>
[04/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
deleted file mode 100644
index da5d64f..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
+++ /dev/null
@@ -1,1084 +0,0 @@
-/*
- * 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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.accumulo.trace.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 TestService {
-
- public interface Iface {
-
- public boolean checkTrace(TInfo tinfo, String message) throws org.apache.thrift.TException;
-
- }
-
- public interface AsyncIface {
-
- public void checkTrace(TInfo tinfo, String message, 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 boolean checkTrace(TInfo tinfo, String message) throws org.apache.thrift.TException
- {
- send_checkTrace(tinfo, message);
- return recv_checkTrace();
- }
-
- public void send_checkTrace(TInfo tinfo, String message) throws org.apache.thrift.TException
- {
- checkTrace_args args = new checkTrace_args();
- args.setTinfo(tinfo);
- args.setMessage(message);
- sendBase("checkTrace", args);
- }
-
- public boolean recv_checkTrace() throws org.apache.thrift.TException
- {
- checkTrace_result result = new checkTrace_result();
- receiveBase(result, "checkTrace");
- if (result.isSetSuccess()) {
- return result.success;
- }
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "checkTrace 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 checkTrace(TInfo tinfo, String message, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
- checkReady();
- checkTrace_call method_call = new checkTrace_call(tinfo, message, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class checkTrace_call extends org.apache.thrift.async.TAsyncMethodCall {
- private TInfo tinfo;
- private String message;
- public checkTrace_call(TInfo tinfo, String message, 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.message = message;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("checkTrace", org.apache.thrift.protocol.TMessageType.CALL, 0));
- checkTrace_args args = new checkTrace_args();
- args.setTinfo(tinfo);
- args.setMessage(message);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public boolean getResult() throws 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_checkTrace();
- }
- }
-
- }
-
- 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("checkTrace", new checkTrace());
- return processMap;
- }
-
- public static class checkTrace<I extends Iface> extends org.apache.thrift.ProcessFunction<I, checkTrace_args> {
- public checkTrace() {
- super("checkTrace");
- }
-
- public checkTrace_args getEmptyArgsInstance() {
- return new checkTrace_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public checkTrace_result getResult(I iface, checkTrace_args args) throws org.apache.thrift.TException {
- checkTrace_result result = new checkTrace_result();
- result.success = iface.checkTrace(args.tinfo, args.message);
- result.setSuccessIsSet(true);
- return result;
- }
- }
-
- }
-
- 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("checkTrace", new checkTrace());
- return processMap;
- }
-
- public static class checkTrace<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, checkTrace_args, Boolean> {
- public checkTrace() {
- super("checkTrace");
- }
-
- public checkTrace_args getEmptyArgsInstance() {
- return new checkTrace_args();
- }
-
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
- checkTrace_result result = new checkTrace_result();
- result.success = o;
- result.setSuccessIsSet(true);
- 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;
- checkTrace_result result = new checkTrace_result();
- {
- 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, checkTrace_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.checkTrace(args.tinfo, args.message,resultHandler);
- }
- }
-
- }
-
- public static class checkTrace_args implements org.apache.thrift.TBase<checkTrace_args, checkTrace_args._Fields>, java.io.Serializable, Cloneable, Comparable<checkTrace_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("checkTrace_args");
-
- private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", 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 checkTrace_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new checkTrace_argsTupleSchemeFactory());
- }
-
- public TInfo tinfo; // required
- public String message; // 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 {
- TINFO((short)1, "tinfo"),
- MESSAGE((short)2, "message");
-
- 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: // TINFO
- return TINFO;
- case 2: // MESSAGE
- return MESSAGE;
- 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.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, TInfo.class)));
- tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", 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(checkTrace_args.class, metaDataMap);
- }
-
- public checkTrace_args() {
- }
-
- public checkTrace_args(
- TInfo tinfo,
- String message)
- {
- this();
- this.tinfo = tinfo;
- this.message = message;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public checkTrace_args(checkTrace_args other) {
- if (other.isSetTinfo()) {
- this.tinfo = new TInfo(other.tinfo);
- }
- if (other.isSetMessage()) {
- this.message = other.message;
- }
- }
-
- public checkTrace_args deepCopy() {
- return new checkTrace_args(this);
- }
-
- @Override
- public void clear() {
- this.tinfo = null;
- this.message = null;
- }
-
- public TInfo getTinfo() {
- return this.tinfo;
- }
-
- public checkTrace_args setTinfo(TInfo tinfo) {
- this.tinfo = tinfo;
- return this;
- }
-
- public void unsetTinfo() {
- this.tinfo = null;
- }
-
- /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */
- public boolean isSetTinfo() {
- return this.tinfo != null;
- }
-
- public void setTinfoIsSet(boolean value) {
- if (!value) {
- this.tinfo = null;
- }
- }
-
- public String getMessage() {
- return this.message;
- }
-
- public checkTrace_args setMessage(String message) {
- this.message = message;
- return this;
- }
-
- public void unsetMessage() {
- this.message = null;
- }
-
- /** Returns true if field message is set (has been assigned a value) and false otherwise */
- public boolean isSetMessage() {
- return this.message != null;
- }
-
- public void setMessageIsSet(boolean value) {
- if (!value) {
- this.message = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case TINFO:
- if (value == null) {
- unsetTinfo();
- } else {
- setTinfo((TInfo)value);
- }
- break;
-
- case MESSAGE:
- if (value == null) {
- unsetMessage();
- } else {
- setMessage((String)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case TINFO:
- return getTinfo();
-
- case MESSAGE:
- return getMessage();
-
- }
- 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 TINFO:
- return isSetTinfo();
- case MESSAGE:
- return isSetMessage();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof checkTrace_args)
- return this.equals((checkTrace_args)that);
- return false;
- }
-
- public boolean equals(checkTrace_args that) {
- if (that == null)
- return false;
-
- boolean this_present_tinfo = true && this.isSetTinfo();
- boolean that_present_tinfo = true && that.isSetTinfo();
- if (this_present_tinfo || that_present_tinfo) {
- if (!(this_present_tinfo && that_present_tinfo))
- return false;
- if (!this.tinfo.equals(that.tinfo))
- return false;
- }
-
- boolean this_present_message = true && this.isSetMessage();
- boolean that_present_message = true && that.isSetMessage();
- if (this_present_message || that_present_message) {
- if (!(this_present_message && that_present_message))
- return false;
- if (!this.message.equals(that.message))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
-
- @Override
- public int compareTo(checkTrace_args other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTinfo()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, other.tinfo);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetMessage()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
- 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("checkTrace_args(");
- boolean first = true;
-
- sb.append("tinfo:");
- if (this.tinfo == null) {
- sb.append("null");
- } else {
- sb.append(this.tinfo);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("message:");
- if (this.message == null) {
- sb.append("null");
- } else {
- sb.append(this.message);
- }
- 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 (tinfo != null) {
- tinfo.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 checkTrace_argsStandardSchemeFactory implements SchemeFactory {
- public checkTrace_argsStandardScheme getScheme() {
- return new checkTrace_argsStandardScheme();
- }
- }
-
- private static class checkTrace_argsStandardScheme extends StandardScheme<checkTrace_args> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, checkTrace_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: // TINFO
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.tinfo = new TInfo();
- struct.tinfo.read(iprot);
- struct.setTinfoIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // MESSAGE
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.message = iprot.readString();
- struct.setMessageIsSet(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, checkTrace_args struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.tinfo != null) {
- oprot.writeFieldBegin(TINFO_FIELD_DESC);
- struct.tinfo.write(oprot);
- oprot.writeFieldEnd();
- }
- if (struct.message != null) {
- oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
- oprot.writeString(struct.message);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class checkTrace_argsTupleSchemeFactory implements SchemeFactory {
- public checkTrace_argsTupleScheme getScheme() {
- return new checkTrace_argsTupleScheme();
- }
- }
-
- private static class checkTrace_argsTupleScheme extends TupleScheme<checkTrace_args> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, checkTrace_args struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetTinfo()) {
- optionals.set(0);
- }
- if (struct.isSetMessage()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
- if (struct.isSetTinfo()) {
- struct.tinfo.write(oprot);
- }
- if (struct.isSetMessage()) {
- oprot.writeString(struct.message);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, checkTrace_args struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
- if (incoming.get(0)) {
- struct.tinfo = new TInfo();
- struct.tinfo.read(iprot);
- struct.setTinfoIsSet(true);
- }
- if (incoming.get(1)) {
- struct.message = iprot.readString();
- struct.setMessageIsSet(true);
- }
- }
- }
-
- }
-
- public static class checkTrace_result implements org.apache.thrift.TBase<checkTrace_result, checkTrace_result._Fields>, java.io.Serializable, Cloneable, Comparable<checkTrace_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("checkTrace_result");
-
- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new checkTrace_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new checkTrace_resultTupleSchemeFactory());
- }
-
- public boolean success; // 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");
-
- 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;
- 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
- private static final int __SUCCESS_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
- 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.BOOL)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(checkTrace_result.class, metaDataMap);
- }
-
- public checkTrace_result() {
- }
-
- public checkTrace_result(
- boolean success)
- {
- this();
- this.success = success;
- setSuccessIsSet(true);
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public checkTrace_result(checkTrace_result other) {
- __isset_bitfield = other.__isset_bitfield;
- this.success = other.success;
- }
-
- public checkTrace_result deepCopy() {
- return new checkTrace_result(this);
- }
-
- @Override
- public void clear() {
- setSuccessIsSet(false);
- this.success = false;
- }
-
- public boolean isSuccess() {
- return this.success;
- }
-
- public checkTrace_result setSuccess(boolean success) {
- this.success = success;
- setSuccessIsSet(true);
- return this;
- }
-
- public void unsetSuccess() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
- }
-
- /** Returns true if field success is set (has been assigned a value) and false otherwise */
- public boolean isSetSuccess() {
- return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
- }
-
- public void setSuccessIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case SUCCESS:
- if (value == null) {
- unsetSuccess();
- } else {
- setSuccess((Boolean)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case SUCCESS:
- return Boolean.valueOf(isSuccess());
-
- }
- 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();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof checkTrace_result)
- return this.equals((checkTrace_result)that);
- return false;
- }
-
- public boolean equals(checkTrace_result that) {
- if (that == null)
- return false;
-
- boolean this_present_success = true;
- boolean that_present_success = true;
- if (this_present_success || that_present_success) {
- if (!(this_present_success && that_present_success))
- return false;
- if (this.success != that.success)
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
-
- @Override
- public int compareTo(checkTrace_result other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSuccess()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
- 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("checkTrace_result(");
- boolean first = true;
-
- sb.append("success:");
- sb.append(this.success);
- 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 {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
- 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 checkTrace_resultStandardSchemeFactory implements SchemeFactory {
- public checkTrace_resultStandardScheme getScheme() {
- return new checkTrace_resultStandardScheme();
- }
- }
-
- private static class checkTrace_resultStandardScheme extends StandardScheme<checkTrace_result> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, checkTrace_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.BOOL) {
- struct.success = iprot.readBool();
- struct.setSuccessIsSet(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, checkTrace_result struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.isSetSuccess()) {
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeBool(struct.success);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class checkTrace_resultTupleSchemeFactory implements SchemeFactory {
- public checkTrace_resultTupleScheme getScheme() {
- return new checkTrace_resultTupleScheme();
- }
- }
-
- private static class checkTrace_resultTupleScheme extends TupleScheme<checkTrace_result> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, checkTrace_result struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetSuccess()) {
- optionals.set(0);
- }
- oprot.writeBitSet(optionals, 1);
- if (struct.isSetSuccess()) {
- oprot.writeBool(struct.success);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, checkTrace_result struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(1);
- if (incoming.get(0)) {
- struct.success = iprot.readBool();
- struct.setSuccessIsSet(true);
- }
- }
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/trace/src/main/scripts/generate-thrift.sh b/trace/src/main/scripts/generate-thrift.sh
deleted file mode 100755
index b8a46b6..0000000
--- a/trace/src/main/scripts/generate-thrift.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env bash
-
-# 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.
-
-# This script will regenerate the thrift code for accumulo-trace.
-INCLUDED_MODULES=(-)
-BASE_OUTPUT_PACKAGE='org.apache.accumulo'
-PACKAGES_TO_GENERATE=(trace)
-
-. ../core/src/main/scripts/generate-thrift.sh
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/thrift/trace.thrift
----------------------------------------------------------------------
diff --git a/trace/src/main/thrift/trace.thrift b/trace/src/main/thrift/trace.thrift
deleted file mode 100644
index b7e0abf..0000000
--- a/trace/src/main/thrift/trace.thrift
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* 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.
-*/
-namespace java org.apache.accumulo.trace.thrift
-namespace cpp org.apache.accumulo.trace.thrift
-
-struct Annotation {
- 1:i64 time,
- 2:string msg
-}
-
-struct RemoteSpan {
- 1:string sender,
- 2:string svc,
- 3:i64 traceId,
- 4:i64 spanId,
- 5:i64 parentId,
- 6:i64 start,
- 7:i64 stop,
- 8:string description,
- 10:map<binary, binary> data,
- 11:list<Annotation> annotations
-}
-
-struct TInfo {
- 1:i64 traceId,
- 2:i64 parentId,
-}
-
-
-service SpanReceiver {
- oneway void span(1:RemoteSpan span);
-}
-
-// used for testing trace
-service TestService {
- bool checkTrace(1:TInfo tinfo, 2:string message),
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java
----------------------------------------------------------------------
diff --git a/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java b/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java
deleted file mode 100644
index 7b5e970..0000000
--- a/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class CountSamplerTest {
-
- @Test
- public void testNext() {
- CountSampler half = new CountSampler(2);
- CountSampler hundred = new CountSampler(100);
- int halfCount = 0;
- int hundredCount = 0;
- for (int i = 0; i < 200; i++) {
- if (half.next())
- halfCount++;
- if (hundred.next())
- hundredCount++;
- }
- Assert.assertEquals(2, hundredCount);
- Assert.assertEquals(100, halfCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java
----------------------------------------------------------------------
diff --git a/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java b/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java
deleted file mode 100644
index 2e5aaa5..0000000
--- a/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument;
-
-import org.junit.Test;
-
-public class PerformanceTest {
-
- @Test
- public void test() {
-
- }
-
- public static void main(String[] args) {
-
- long now = System.currentTimeMillis();
- for (long i = 0; i < 1000 * 1000; i++) {
- @SuppressWarnings("unused")
- Long x = new Long(i);
- }
- System.out.println(String.format("Trivial took %d millis", System.currentTimeMillis() - now));
- now = System.currentTimeMillis();
- for (long i = 0; i < 1000 * 1000; i++) {
- Span s = Trace.start("perf");
- s.stop();
- }
- System.out.println(String.format("Span Loop took %d millis", System.currentTimeMillis() - now));
- now = System.currentTimeMillis();
- Trace.on("test");
- for (long i = 0; i < 1000 * 1000; i++) {
- Span s = Trace.start("perf");
- s.stop();
- }
- Trace.off();
- System.out.println(String.format("Trace took %d millis", System.currentTimeMillis() - now));
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
----------------------------------------------------------------------
diff --git a/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java b/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
deleted file mode 100644
index 4afdebe..0000000
--- a/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * 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.
- */
-package org.apache.accumulo.trace.instrument;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import org.apache.accumulo.trace.instrument.thrift.TraceWrap;
-import org.apache.accumulo.trace.thrift.TInfo;
-import org.apache.accumulo.trace.thrift.TestService;
-import org.apache.accumulo.trace.thrift.TestService.Iface;
-import org.apache.accumulo.trace.thrift.TestService.Processor;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TThreadPoolServer;
-import org.apache.thrift.transport.TServerSocket;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.htrace.HTraceConfiguration;
-import org.htrace.Sampler;
-import org.htrace.SpanReceiver;
-import org.htrace.wrappers.TraceProxy;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class TracerTest {
- static class SpanStruct {
- public SpanStruct(long traceId, long spanId, long parentId, long start, long stop, String description, Map<byte[],byte[]> data) {
- super();
- this.traceId = traceId;
- this.spanId = spanId;
- this.parentId = parentId;
- this.start = start;
- this.stop = stop;
- this.description = description;
- this.data = data;
- }
-
- public long traceId;
- public long spanId;
- public long parentId;
- public long start;
- public long stop;
- public String description;
- public Map<byte[],byte[]> data;
-
- public long millis() {
- return stop - start;
- }
- }
-
- static class TestReceiver implements SpanReceiver {
- public Map<Long,List<SpanStruct>> traces = new HashMap<Long,List<SpanStruct>>();
-
- @Override
- public void receiveSpan(org.htrace.Span s) {
- long traceId = s.getTraceId();
- SpanStruct span = new SpanStruct(traceId, s.getSpanId(), s.getParentId(), s.getStartTimeMillis(), s.getStopTimeMillis(), s.getDescription(),
- s.getKVAnnotations());
- if (!traces.containsKey(traceId))
- traces.put(traceId, new ArrayList<SpanStruct>());
- traces.get(traceId).add(span);
- }
-
- @Override
- public void configure(HTraceConfiguration conf) {
- }
-
- @Override
- public void close() throws IOException {
- }
- }
-
- @SuppressWarnings("deprecation")
- @Test
- public void testTrace() throws Exception {
- TestReceiver tracer = new TestReceiver();
- org.htrace.Trace.addReceiver(tracer);
-
- assertFalse(Trace.isTracing());
- Trace.start("nop").stop();
- assertTrue(tracer.traces.size() == 0);
- assertFalse(Trace.isTracing());
-
- Trace.on("nop").stop();
- assertTrue(tracer.traces.size() == 1);
- assertFalse(Trace.isTracing());
-
- Span start = Trace.on("testing");
- assertEquals(Trace.currentTrace().getSpan(), start.getScope().getSpan());
- assertTrue(Trace.isTracing());
-
- Span span = Trace.start("shortest trace ever");
- span.stop();
- long traceId = Trace.currentTraceId();
- assertNotNull(tracer.traces.get(traceId));
- assertTrue(tracer.traces.get(traceId).size() == 1);
- assertEquals("shortest trace ever", tracer.traces.get(traceId).get(0).description);
-
- Span pause = Trace.start("pause");
- Thread.sleep(100);
- pause.stop();
- assertTrue(tracer.traces.get(traceId).size() == 2);
- assertTrue(tracer.traces.get(traceId).get(1).millis() >= 100);
-
- Thread t = new Thread(Trace.wrap(new Runnable() {
- @Override
- public void run() {
- assertTrue(Trace.isTracing());
- }
- }), "My Task");
- t.start();
- t.join();
-
- assertTrue(tracer.traces.get(traceId).size() == 3);
- assertEquals("My Task", tracer.traces.get(traceId).get(2).description);
- Trace.off();
- assertFalse(Trace.isTracing());
- }
-
- static class Service implements TestService.Iface {
- @Override
- public boolean checkTrace(TInfo t, String message) throws TException {
- Span trace = Trace.start(message);
- try {
- return Trace.isTracing();
- } finally {
- trace.stop();
- }
- }
- }
-
- @Test
- public void testThrift() throws Exception {
- TestReceiver tracer = new TestReceiver();
- org.htrace.Trace.addReceiver(tracer);
-
- ServerSocket socket = new ServerSocket(0);
- TServerSocket transport = new TServerSocket(socket);
- transport.listen();
- TThreadPoolServer.Args args = new TThreadPoolServer.Args(transport);
- args.processor(new Processor<Iface>(TraceWrap.service(new Service())));
- final TServer tserver = new TThreadPoolServer(args);
- Thread t = new Thread() {
- public void run() {
- tserver.serve();
- }
- };
- t.start();
- TTransport clientTransport = new TSocket(new Socket("localhost", socket.getLocalPort()));
- TestService.Iface client = new TestService.Client(new TBinaryProtocol(clientTransport), new TBinaryProtocol(clientTransport));
- client = TraceWrap.client(client);
- assertFalse(client.checkTrace(null, "test"));
-
- Span start = Trace.on("start");
- assertTrue(client.checkTrace(null, "my test"));
- start.stop();
-
- assertNotNull(tracer.traces.get(start.traceId()));
- String traces[] = {"my test", "checkTrace", "client:checkTrace", "start"};
- assertTrue(tracer.traces.get(start.traceId()).size() == traces.length);
- for (int i = 0; i < traces.length; i++)
- assertEquals(traces[i], tracer.traces.get(start.traceId()).get(i).description);
-
- tserver.stop();
- t.join(100);
- }
-
- Callable<Object> callable;
-
- @Before
- public void setup() {
- callable = new Callable<Object>() {
- @Override
- public Object call() throws IOException {
- throw new IOException();
- }
- };
- }
-
- /**
- * Verify that exceptions propagate up through the trace wrapping with sampling enabled, as the cause of the reflexive exceptions.
- */
- @Test(expected = IOException.class)
- public void testTracedException() throws Throwable {
- try {
- TraceProxy.trace(callable).call();
- } catch (InvocationTargetException e) {
- throw e.getCause();
- }
- }
-
- /**
- * Verify that exceptions propagate up through the trace wrapping with sampling disabled, as the cause of the reflexive exceptions.
- */
- @Test(expected = IOException.class)
- public void testUntracedException() throws Throwable {
- try {
- TraceProxy.trace(callable, Sampler.NEVER).call();
- } catch (InvocationTargetException e) {
- throw e.getCause();
- }
- }
-}
[14/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
index 638a8b7..d5d5b40 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
@@ -58,59 +58,59 @@ import org.slf4j.LoggerFactory;
public String getZooKeepers() throws org.apache.thrift.TException;
- public List<String> bulkImportFiles(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public List<String> bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public boolean isActive(org.apache.accumulo.trace.thrift.TInfo tinfo, long tid) throws org.apache.thrift.TException;
+ public boolean isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long tid) throws org.apache.thrift.TException;
public void ping(org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException;
public List<TDiskUsage> getDiskUsage(Set<String> tables, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public Set<String> listLocalUsers(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException;
+ public Set<String> listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException;
- public void createLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws ThriftSecurityException, org.apache.thrift.TException;
+ public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws ThriftSecurityException, org.apache.thrift.TException;
- public void dropLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws ThriftSecurityException, org.apache.thrift.TException;
+ public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws ThriftSecurityException, org.apache.thrift.TException;
- public void changeLocalUserPassword(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws ThriftSecurityException, org.apache.thrift.TException;
+ public void changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws ThriftSecurityException, org.apache.thrift.TException;
- public boolean authenticate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException;
+ public boolean authenticate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException;
- public boolean authenticateUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth) throws ThriftSecurityException, org.apache.thrift.TException;
+ public boolean authenticateUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth) throws ThriftSecurityException, org.apache.thrift.TException;
- public void changeAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations) throws ThriftSecurityException, org.apache.thrift.TException;
+ public void changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations) throws ThriftSecurityException, org.apache.thrift.TException;
- public List<ByteBuffer> getUserAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws ThriftSecurityException, org.apache.thrift.TException;
+ public List<ByteBuffer> getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws ThriftSecurityException, org.apache.thrift.TException;
- public boolean hasSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm) throws ThriftSecurityException, org.apache.thrift.TException;
+ public boolean hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm) throws ThriftSecurityException, org.apache.thrift.TException;
- public boolean hasTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public boolean hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public boolean hasNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte tblNspcPerm) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public boolean hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte tblNspcPerm) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public void grantSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws ThriftSecurityException, org.apache.thrift.TException;
+ public void grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws ThriftSecurityException, org.apache.thrift.TException;
- public void revokeSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws ThriftSecurityException, org.apache.thrift.TException;
+ public void revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws ThriftSecurityException, org.apache.thrift.TException;
- public void grantTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public void grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public void revokeTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public void revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public void grantNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public void grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public void revokeNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public void revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public Map<String,String> getConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type) throws org.apache.thrift.TException;
+ public Map<String,String> getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type) throws org.apache.thrift.TException;
- public Map<String,String> getTableConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws ThriftTableOperationException, org.apache.thrift.TException;
+ public Map<String,String> getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws ThriftTableOperationException, org.apache.thrift.TException;
- public Map<String,String> getNamespaceConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) throws ThriftTableOperationException, org.apache.thrift.TException;
+ public Map<String,String> getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) throws ThriftTableOperationException, org.apache.thrift.TException;
- public boolean checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch) throws org.apache.thrift.TException;
+ public boolean checkClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch) throws org.apache.thrift.TException;
- public boolean checkTableClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, String className, String interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public boolean checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, String className, String interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
- public boolean checkNamespaceClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String namespaceId, String className, String interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
+ public boolean checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String namespaceId, String className, String interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
}
@@ -122,59 +122,59 @@ import org.slf4j.LoggerFactory;
public void getZooKeepers(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void bulkImportFiles(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void isActive(org.apache.accumulo.trace.thrift.TInfo tinfo, long tid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long tid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void ping(org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getDiskUsage(Set<String> tables, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void listLocalUsers(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 listLocalUsers(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 createLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void dropLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void changeLocalUserPassword(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void authenticate(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 authenticate(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 authenticateUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void authenticateUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void changeAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getUserAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void hasSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void hasTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void hasNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte tblNspcPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte tblNspcPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void grantSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void revokeSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void grantTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void revokeTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void grantNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void revokeNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getTableConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getNamespaceConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void checkClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void checkTableClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void checkNamespaceClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String namespaceId, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String namespaceId, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -264,13 +264,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getZooKeepers failed: unknown result");
}
- public List<String> bulkImportFiles(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public List<String> bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_bulkImportFiles(tinfo, credentials, tid, tableId, files, errorDir, setTime);
return recv_bulkImportFiles();
}
- public void send_bulkImportFiles(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime) throws org.apache.thrift.TException
+ public void send_bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime) throws org.apache.thrift.TException
{
bulkImportFiles_args args = new bulkImportFiles_args();
args.setTinfo(tinfo);
@@ -299,13 +299,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "bulkImportFiles failed: unknown result");
}
- public boolean isActive(org.apache.accumulo.trace.thrift.TInfo tinfo, long tid) throws org.apache.thrift.TException
+ public boolean isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long tid) throws org.apache.thrift.TException
{
send_isActive(tinfo, tid);
return recv_isActive();
}
- public void send_isActive(org.apache.accumulo.trace.thrift.TInfo tinfo, long tid) throws org.apache.thrift.TException
+ public void send_isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long tid) throws org.apache.thrift.TException
{
isActive_args args = new isActive_args();
args.setTinfo(tinfo);
@@ -376,13 +376,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getDiskUsage failed: unknown result");
}
- public Set<String> listLocalUsers(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException
+ public Set<String> listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException
{
send_listLocalUsers(tinfo, credentials);
return recv_listLocalUsers();
}
- public void send_listLocalUsers(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
+ public void send_listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
listLocalUsers_args args = new listLocalUsers_args();
args.setTinfo(tinfo);
@@ -403,13 +403,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listLocalUsers failed: unknown result");
}
- public void createLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws ThriftSecurityException, org.apache.thrift.TException
+ public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws ThriftSecurityException, org.apache.thrift.TException
{
send_createLocalUser(tinfo, credentials, principal, password);
recv_createLocalUser();
}
- public void send_createLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws org.apache.thrift.TException
+ public void send_createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws org.apache.thrift.TException
{
createLocalUser_args args = new createLocalUser_args();
args.setTinfo(tinfo);
@@ -429,13 +429,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void dropLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws ThriftSecurityException, org.apache.thrift.TException
+ public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws ThriftSecurityException, org.apache.thrift.TException
{
send_dropLocalUser(tinfo, credentials, principal);
recv_dropLocalUser();
}
- public void send_dropLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws org.apache.thrift.TException
+ public void send_dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws org.apache.thrift.TException
{
dropLocalUser_args args = new dropLocalUser_args();
args.setTinfo(tinfo);
@@ -454,13 +454,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void changeLocalUserPassword(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws ThriftSecurityException, org.apache.thrift.TException
+ public void changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws ThriftSecurityException, org.apache.thrift.TException
{
send_changeLocalUserPassword(tinfo, credentials, principal, password);
recv_changeLocalUserPassword();
}
- public void send_changeLocalUserPassword(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws org.apache.thrift.TException
+ public void send_changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password) throws org.apache.thrift.TException
{
changeLocalUserPassword_args args = new changeLocalUserPassword_args();
args.setTinfo(tinfo);
@@ -480,13 +480,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public boolean authenticate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException
+ public boolean authenticate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws ThriftSecurityException, org.apache.thrift.TException
{
send_authenticate(tinfo, credentials);
return recv_authenticate();
}
- public void send_authenticate(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
+ public void send_authenticate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
authenticate_args args = new authenticate_args();
args.setTinfo(tinfo);
@@ -507,13 +507,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "authenticate failed: unknown result");
}
- public boolean authenticateUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth) throws ThriftSecurityException, org.apache.thrift.TException
+ public boolean authenticateUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth) throws ThriftSecurityException, org.apache.thrift.TException
{
send_authenticateUser(tinfo, credentials, toAuth);
return recv_authenticateUser();
}
- public void send_authenticateUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth) throws org.apache.thrift.TException
+ public void send_authenticateUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth) throws org.apache.thrift.TException
{
authenticateUser_args args = new authenticateUser_args();
args.setTinfo(tinfo);
@@ -535,13 +535,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "authenticateUser failed: unknown result");
}
- public void changeAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations) throws ThriftSecurityException, org.apache.thrift.TException
+ public void changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations) throws ThriftSecurityException, org.apache.thrift.TException
{
send_changeAuthorizations(tinfo, credentials, principal, authorizations);
recv_changeAuthorizations();
}
- public void send_changeAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations) throws org.apache.thrift.TException
+ public void send_changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations) throws org.apache.thrift.TException
{
changeAuthorizations_args args = new changeAuthorizations_args();
args.setTinfo(tinfo);
@@ -561,13 +561,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public List<ByteBuffer> getUserAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws ThriftSecurityException, org.apache.thrift.TException
+ public List<ByteBuffer> getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws ThriftSecurityException, org.apache.thrift.TException
{
send_getUserAuthorizations(tinfo, credentials, principal);
return recv_getUserAuthorizations();
}
- public void send_getUserAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws org.apache.thrift.TException
+ public void send_getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal) throws org.apache.thrift.TException
{
getUserAuthorizations_args args = new getUserAuthorizations_args();
args.setTinfo(tinfo);
@@ -589,13 +589,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserAuthorizations failed: unknown result");
}
- public boolean hasSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm) throws ThriftSecurityException, org.apache.thrift.TException
+ public boolean hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm) throws ThriftSecurityException, org.apache.thrift.TException
{
send_hasSystemPermission(tinfo, credentials, principal, sysPerm);
return recv_hasSystemPermission();
}
- public void send_hasSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm) throws org.apache.thrift.TException
+ public void send_hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm) throws org.apache.thrift.TException
{
hasSystemPermission_args args = new hasSystemPermission_args();
args.setTinfo(tinfo);
@@ -618,13 +618,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "hasSystemPermission failed: unknown result");
}
- public boolean hasTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public boolean hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_hasTablePermission(tinfo, credentials, principal, tableName, tblPerm);
return recv_hasTablePermission();
}
- public void send_hasTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm) throws org.apache.thrift.TException
+ public void send_hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm) throws org.apache.thrift.TException
{
hasTablePermission_args args = new hasTablePermission_args();
args.setTinfo(tinfo);
@@ -651,13 +651,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "hasTablePermission failed: unknown result");
}
- public boolean hasNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte tblNspcPerm) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public boolean hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte tblNspcPerm) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_hasNamespacePermission(tinfo, credentials, principal, ns, tblNspcPerm);
return recv_hasNamespacePermission();
}
- public void send_hasNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte tblNspcPerm) throws org.apache.thrift.TException
+ public void send_hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte tblNspcPerm) throws org.apache.thrift.TException
{
hasNamespacePermission_args args = new hasNamespacePermission_args();
args.setTinfo(tinfo);
@@ -684,13 +684,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "hasNamespacePermission failed: unknown result");
}
- public void grantSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws ThriftSecurityException, org.apache.thrift.TException
+ public void grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws ThriftSecurityException, org.apache.thrift.TException
{
send_grantSystemPermission(tinfo, credentials, principal, permission);
recv_grantSystemPermission();
}
- public void send_grantSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws org.apache.thrift.TException
+ public void send_grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws org.apache.thrift.TException
{
grantSystemPermission_args args = new grantSystemPermission_args();
args.setTinfo(tinfo);
@@ -710,13 +710,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void revokeSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws ThriftSecurityException, org.apache.thrift.TException
+ public void revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws ThriftSecurityException, org.apache.thrift.TException
{
send_revokeSystemPermission(tinfo, credentials, principal, permission);
recv_revokeSystemPermission();
}
- public void send_revokeSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws org.apache.thrift.TException
+ public void send_revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte permission) throws org.apache.thrift.TException
{
revokeSystemPermission_args args = new revokeSystemPermission_args();
args.setTinfo(tinfo);
@@ -736,13 +736,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void grantTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public void grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_grantTablePermission(tinfo, credentials, principal, tableName, permission);
recv_grantTablePermission();
}
- public void send_grantTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws org.apache.thrift.TException
+ public void send_grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws org.apache.thrift.TException
{
grantTablePermission_args args = new grantTablePermission_args();
args.setTinfo(tinfo);
@@ -766,13 +766,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void revokeTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public void revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_revokeTablePermission(tinfo, credentials, principal, tableName, permission);
recv_revokeTablePermission();
}
- public void send_revokeTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws org.apache.thrift.TException
+ public void send_revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte permission) throws org.apache.thrift.TException
{
revokeTablePermission_args args = new revokeTablePermission_args();
args.setTinfo(tinfo);
@@ -796,13 +796,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void grantNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public void grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_grantNamespacePermission(tinfo, credentials, principal, ns, permission);
recv_grantNamespacePermission();
}
- public void send_grantNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws org.apache.thrift.TException
+ public void send_grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws org.apache.thrift.TException
{
grantNamespacePermission_args args = new grantNamespacePermission_args();
args.setTinfo(tinfo);
@@ -826,13 +826,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void revokeNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public void revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_revokeNamespacePermission(tinfo, credentials, principal, ns, permission);
recv_revokeNamespacePermission();
}
- public void send_revokeNamespacePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws org.apache.thrift.TException
+ public void send_revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String ns, byte permission) throws org.apache.thrift.TException
{
revokeNamespacePermission_args args = new revokeNamespacePermission_args();
args.setTinfo(tinfo);
@@ -856,13 +856,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public Map<String,String> getConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type) throws org.apache.thrift.TException
+ public Map<String,String> getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type) throws org.apache.thrift.TException
{
send_getConfiguration(tinfo, credentials, type);
return recv_getConfiguration();
}
- public void send_getConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type) throws org.apache.thrift.TException
+ public void send_getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type) throws org.apache.thrift.TException
{
getConfiguration_args args = new getConfiguration_args();
args.setTinfo(tinfo);
@@ -881,13 +881,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getConfiguration failed: unknown result");
}
- public Map<String,String> getTableConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws ThriftTableOperationException, org.apache.thrift.TException
+ public Map<String,String> getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws ThriftTableOperationException, org.apache.thrift.TException
{
send_getTableConfiguration(tinfo, credentials, tableName);
return recv_getTableConfiguration();
}
- public void send_getTableConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws org.apache.thrift.TException
+ public void send_getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws org.apache.thrift.TException
{
getTableConfiguration_args args = new getTableConfiguration_args();
args.setTinfo(tinfo);
@@ -909,13 +909,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTableConfiguration failed: unknown result");
}
- public Map<String,String> getNamespaceConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) throws ThriftTableOperationException, org.apache.thrift.TException
+ public Map<String,String> getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) throws ThriftTableOperationException, org.apache.thrift.TException
{
send_getNamespaceConfiguration(tinfo, credentials, ns);
return recv_getNamespaceConfiguration();
}
- public void send_getNamespaceConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) throws org.apache.thrift.TException
+ public void send_getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) throws org.apache.thrift.TException
{
getNamespaceConfiguration_args args = new getNamespaceConfiguration_args();
args.setTinfo(tinfo);
@@ -937,13 +937,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getNamespaceConfiguration failed: unknown result");
}
- public boolean checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch) throws org.apache.thrift.TException
+ public boolean checkClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch) throws org.apache.thrift.TException
{
send_checkClass(tinfo, credentials, className, interfaceMatch);
return recv_checkClass();
}
- public void send_checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch) throws org.apache.thrift.TException
+ public void send_checkClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch) throws org.apache.thrift.TException
{
checkClass_args args = new checkClass_args();
args.setTinfo(tinfo);
@@ -963,13 +963,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "checkClass failed: unknown result");
}
- public boolean checkTableClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, String className, String interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public boolean checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, String className, String interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_checkTableClass(tinfo, credentials, tableId, className, interfaceMatch);
return recv_checkTableClass();
}
- public void send_checkTableClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, String className, String interfaceMatch) throws org.apache.thrift.TException
+ public void send_checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableId, String className, String interfaceMatch) throws org.apache.thrift.TException
{
checkTableClass_args args = new checkTableClass_args();
args.setTinfo(tinfo);
@@ -996,13 +996,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "checkTableClass failed: unknown result");
}
- public boolean checkNamespaceClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String namespaceId, String className, String interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
+ public boolean checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String namespaceId, String className, String interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException
{
send_checkNamespaceClass(tinfo, credentials, namespaceId, className, interfaceMatch);
return recv_checkNamespaceClass();
}
- public void send_checkNamespaceClass(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String namespaceId, String className, String interfaceMatch) throws org.apache.thrift.TException
+ public void send_checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String namespaceId, String className, String interfaceMatch) throws org.apache.thrift.TException
{
checkNamespaceClass_args args = new checkNamespaceClass_args();
args.setTinfo(tinfo);
@@ -1134,7 +1134,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void bulkImportFiles(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
bulkImportFiles_call method_call = new bulkImportFiles_call(tinfo, credentials, tid, tableId, files, errorDir, setTime, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1142,14 +1142,14 @@ import org.slf4j.LoggerFactory;
}
public static class bulkImportFiles_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 tid;
private String tableId;
private List<String> files;
private String errorDir;
private boolean setTime;
- public bulkImportFiles_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime, 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 bulkImportFiles_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, String tableId, List<String> files, String errorDir, boolean setTime, 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;
@@ -1184,7 +1184,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void isActive(org.apache.accumulo.trace.thrift.TInfo tinfo, long tid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long tid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
isActive_call method_call = new isActive_call(tinfo, tid, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1192,9 +1192,9 @@ import org.slf4j.LoggerFactory;
}
public static class isActive_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 long tid;
- public isActive_call(org.apache.accumulo.trace.thrift.TInfo tinfo, long tid, 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 isActive_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long tid, 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.tid = tid;
@@ -1286,7 +1286,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void listLocalUsers(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 listLocalUsers(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();
listLocalUsers_call method_call = new listLocalUsers_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1294,9 +1294,9 @@ import org.slf4j.LoggerFactory;
}
public static class listLocalUsers_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 listLocalUsers_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 listLocalUsers_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;
@@ -1321,7 +1321,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void createLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
createLocalUser_call method_call = new createLocalUser_call(tinfo, credentials, principal, password, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1329,11 +1329,11 @@ import org.slf4j.LoggerFactory;
}
public static class createLocalUser_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 String principal;
private ByteBuffer password;
- public createLocalUser_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, 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 createLocalUser_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, 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;
@@ -1362,7 +1362,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void dropLocalUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
dropLocalUser_call method_call = new dropLocalUser_call(tinfo, credentials, principal, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1370,10 +1370,10 @@ import org.slf4j.LoggerFactory;
}
public static class dropLocalUser_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 String principal;
- public dropLocalUser_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, 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 dropLocalUser_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, 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;
@@ -1400,7 +1400,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void changeLocalUserPassword(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
changeLocalUserPassword_call method_call = new changeLocalUserPassword_call(tinfo, credentials, principal, password, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1408,11 +1408,11 @@ import org.slf4j.LoggerFactory;
}
public static class changeLocalUserPassword_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 String principal;
private ByteBuffer password;
- public changeLocalUserPassword_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, 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 changeLocalUserPassword_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, ByteBuffer password, 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;
@@ -1441,7 +1441,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void authenticate(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 authenticate(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();
authenticate_call method_call = new authenticate_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1449,9 +1449,9 @@ import org.slf4j.LoggerFactory;
}
public static class authenticate_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 authenticate_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 authenticate_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;
@@ -1476,7 +1476,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void authenticateUser(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void authenticateUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
authenticateUser_call method_call = new authenticateUser_call(tinfo, credentials, toAuth, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1484,10 +1484,10 @@ import org.slf4j.LoggerFactory;
}
public static class authenticateUser_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 org.apache.accumulo.core.security.thrift.TCredentials toAuth;
- public authenticateUser_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth, 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 authenticateUser_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.accumulo.core.security.thrift.TCredentials toAuth, 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;
@@ -1514,7 +1514,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void changeAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
changeAuthorizations_call method_call = new changeAuthorizations_call(tinfo, credentials, principal, authorizations, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1522,11 +1522,11 @@ import org.slf4j.LoggerFactory;
}
public static class changeAuthorizations_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 String principal;
private List<ByteBuffer> authorizations;
- public changeAuthorizations_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations, 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 changeAuthorizations_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, List<ByteBuffer> authorizations, 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;
@@ -1555,7 +1555,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void getUserAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
getUserAuthorizations_call method_call = new getUserAuthorizations_call(tinfo, credentials, principal, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1563,10 +1563,10 @@ import org.slf4j.LoggerFactory;
}
public static class getUserAuthorizations_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 String principal;
- public getUserAuthorizations_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, 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 getUserAuthorizations_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, 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;
@@ -1593,7 +1593,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void hasSystemPermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
hasSystemPermission_call method_call = new hasSystemPermission_call(tinfo, credentials, principal, sysPerm, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1601,11 +1601,11 @@ import org.slf4j.LoggerFactory;
}
public static class hasSystemPermission_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 String principal;
private byte sysPerm;
- public hasSystemPermission_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm, 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 hasSystemPermission_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, byte sysPerm, 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;
@@ -1634,7 +1634,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void hasTablePermission(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String principal, String tableName, byte tblPerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
hasTablePermission_call method_call = new hasTablePermission_call(tinfo, credentials, principal, tableName, tblPerm, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1642,12 +1642,12 @@ import org.slf4j.LoggerFactory;
}
public static class hasTablePermission_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.accumulo.trace.thrift.TInfo tinfo;
+ private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
<TRUNCATED>
[12/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
index a135e6d..f524617 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
@@ -52,69 +52,69 @@ import org.slf4j.LoggerFactory;
public interface Iface extends FateService.Iface {
- public long initiateFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
+ public long initiateFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
- public void waitForFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
+ public void waitForFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
- public void setTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
+ public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
- public void removeTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
+ public void removeTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
- public void setNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
+ public void setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
- public void removeNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
+ public void removeNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
- public void setMasterGoalState(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public void setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public void shutdown(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public void shutdown(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public void shutdownTabletServer(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public void shutdownTabletServer(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public void setSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public void setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public void removeSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public void removeSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
- public MasterMonitorInfo getMasterStats(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 MasterMonitorInfo getMasterStats(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 waitForBalance(org.apache.accumulo.trace.thrift.TInfo tinfo) throws org.apache.thrift.TException;
+ public void waitForBalance(org.apache.accumulo.core.trace.thrift.TInfo tinfo) throws org.apache.thrift.TException;
- public void reportSplitExtent(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split) throws org.apache.thrift.TException;
+ public void reportSplitExtent(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split) throws org.apache.thrift.TException;
- public void reportTabletStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet) throws org.apache.thrift.TException;
+ public void reportTabletStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet) throws org.apache.thrift.TException;
}
public interface AsyncIface extends FateService .AsyncIface {
- public void initiateFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void initiateFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void waitForFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void waitForFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void setTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void removeTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void removeTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void setNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void removeNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void removeNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void setMasterGoalState(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void shutdown(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void shutdown(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void shutdownTabletServer(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void shutdownTabletServer(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void setSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void removeSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void removeSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getMasterStats(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 getMasterStats(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 waitForBalance(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void waitForBalance(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void reportSplitExtent(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void reportSplitExtent(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void reportTabletStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void reportTabletStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -138,13 +138,13 @@ import org.slf4j.LoggerFactory;
super(iprot, oprot);
}
- public long initiateFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
+ public long initiateFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
{
send_initiateFlush(tinfo, credentials, tableName);
return recv_initiateFlush();
}
- public void send_initiateFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws org.apache.thrift.TException
+ public void send_initiateFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName) throws org.apache.thrift.TException
{
initiateFlush_args args = new initiateFlush_args();
args.setTinfo(tinfo);
@@ -169,13 +169,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "initiateFlush failed: unknown result");
}
- public void waitForFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
+ public void waitForFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
{
send_waitForFlush(tinfo, credentials, tableName, startRow, endRow, flushID, maxLoops);
recv_waitForFlush();
}
- public void send_waitForFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops) throws org.apache.thrift.TException
+ public void send_waitForFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops) throws org.apache.thrift.TException
{
waitForFlush_args args = new waitForFlush_args();
args.setTinfo(tinfo);
@@ -201,13 +201,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void setTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
+ public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
{
send_setTableProperty(tinfo, credentials, tableName, property, value);
recv_setTableProperty();
}
- public void send_setTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value) throws org.apache.thrift.TException
+ public void send_setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value) throws org.apache.thrift.TException
{
setTableProperty_args args = new setTableProperty_args();
args.setTinfo(tinfo);
@@ -231,13 +231,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void removeTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
+ public void removeTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
{
send_removeTableProperty(tinfo, credentials, tableName, property);
recv_removeTableProperty();
}
- public void send_removeTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property) throws org.apache.thrift.TException
+ public void send_removeTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property) throws org.apache.thrift.TException
{
removeTableProperty_args args = new removeTableProperty_args();
args.setTinfo(tinfo);
@@ -260,13 +260,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void setNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
+ public void setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
{
send_setNamespaceProperty(tinfo, credentials, ns, property, value);
recv_setNamespaceProperty();
}
- public void send_setNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value) throws org.apache.thrift.TException
+ public void send_setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value) throws org.apache.thrift.TException
{
setNamespaceProperty_args args = new setNamespaceProperty_args();
args.setTinfo(tinfo);
@@ -290,13 +290,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void removeNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
+ public void removeNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
{
send_removeNamespaceProperty(tinfo, credentials, ns, property);
recv_removeNamespaceProperty();
}
- public void send_removeNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property) throws org.apache.thrift.TException
+ public void send_removeNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property) throws org.apache.thrift.TException
{
removeNamespaceProperty_args args = new removeNamespaceProperty_args();
args.setTinfo(tinfo);
@@ -319,13 +319,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void setMasterGoalState(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public void setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_setMasterGoalState(tinfo, credentials, state);
recv_setMasterGoalState();
}
- public void send_setMasterGoalState(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.thrift.TException
+ public void send_setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.thrift.TException
{
setMasterGoalState_args args = new setMasterGoalState_args();
args.setTinfo(tinfo);
@@ -344,13 +344,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void shutdown(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public void shutdown(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_shutdown(tinfo, credentials, stopTabletServers);
recv_shutdown();
}
- public void send_shutdown(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers) throws org.apache.thrift.TException
+ public void send_shutdown(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers) throws org.apache.thrift.TException
{
shutdown_args args = new shutdown_args();
args.setTinfo(tinfo);
@@ -369,13 +369,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void shutdownTabletServer(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public void shutdownTabletServer(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_shutdownTabletServer(tinfo, credentials, tabletServer, force);
recv_shutdownTabletServer();
}
- public void send_shutdownTabletServer(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force) throws org.apache.thrift.TException
+ public void send_shutdownTabletServer(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force) throws org.apache.thrift.TException
{
shutdownTabletServer_args args = new shutdownTabletServer_args();
args.setTinfo(tinfo);
@@ -395,13 +395,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void setSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public void setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_setSystemProperty(tinfo, credentials, property, value);
recv_setSystemProperty();
}
- public void send_setSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value) throws org.apache.thrift.TException
+ public void send_setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value) throws org.apache.thrift.TException
{
setSystemProperty_args args = new setSystemProperty_args();
args.setTinfo(tinfo);
@@ -421,13 +421,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public void removeSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public void removeSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_removeSystemProperty(tinfo, credentials, property);
recv_removeSystemProperty();
}
- public void send_removeSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property) throws org.apache.thrift.TException
+ public void send_removeSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property) throws org.apache.thrift.TException
{
removeSystemProperty_args args = new removeSystemProperty_args();
args.setTinfo(tinfo);
@@ -446,13 +446,13 @@ import org.slf4j.LoggerFactory;
return;
}
- public MasterMonitorInfo getMasterStats(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 MasterMonitorInfo getMasterStats(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_getMasterStats(tinfo, credentials);
return recv_getMasterStats();
}
- public void send_getMasterStats(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
+ public void send_getMasterStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
getMasterStats_args args = new getMasterStats_args();
args.setTinfo(tinfo);
@@ -473,13 +473,13 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getMasterStats failed: unknown result");
}
- public void waitForBalance(org.apache.accumulo.trace.thrift.TInfo tinfo) throws org.apache.thrift.TException
+ public void waitForBalance(org.apache.accumulo.core.trace.thrift.TInfo tinfo) throws org.apache.thrift.TException
{
send_waitForBalance(tinfo);
recv_waitForBalance();
}
- public void send_waitForBalance(org.apache.accumulo.trace.thrift.TInfo tinfo) throws org.apache.thrift.TException
+ public void send_waitForBalance(org.apache.accumulo.core.trace.thrift.TInfo tinfo) throws org.apache.thrift.TException
{
waitForBalance_args args = new waitForBalance_args();
args.setTinfo(tinfo);
@@ -493,12 +493,12 @@ import org.slf4j.LoggerFactory;
return;
}
- public void reportSplitExtent(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split) throws org.apache.thrift.TException
+ public void reportSplitExtent(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split) throws org.apache.thrift.TException
{
send_reportSplitExtent(tinfo, credentials, serverName, split);
}
- public void send_reportSplitExtent(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split) throws org.apache.thrift.TException
+ public void send_reportSplitExtent(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split) throws org.apache.thrift.TException
{
reportSplitExtent_args args = new reportSplitExtent_args();
args.setTinfo(tinfo);
@@ -508,12 +508,12 @@ import org.slf4j.LoggerFactory;
sendBase("reportSplitExtent", args);
}
- public void reportTabletStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet) throws org.apache.thrift.TException
+ public void reportTabletStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet) throws org.apache.thrift.TException
{
send_reportTabletStatus(tinfo, credentials, serverName, status, tablet);
}
- public void send_reportTabletStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet) throws org.apache.thrift.TException
+ public void send_reportTabletStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet) throws org.apache.thrift.TException
{
reportTabletStatus_args args = new reportTabletStatus_args();
args.setTinfo(tinfo);
@@ -542,7 +542,7 @@ import org.slf4j.LoggerFactory;
super(protocolFactory, clientManager, transport);
}
- public void initiateFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void initiateFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
initiateFlush_call method_call = new initiateFlush_call(tinfo, credentials, tableName, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -550,10 +550,10 @@ import org.slf4j.LoggerFactory;
}
public static class initiateFlush_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 String tableName;
- public initiateFlush_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, 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 initiateFlush_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, 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;
@@ -580,7 +580,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void waitForFlush(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void waitForFlush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
waitForFlush_call method_call = new waitForFlush_call(tinfo, credentials, tableName, startRow, endRow, flushID, maxLoops, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -588,14 +588,14 @@ import org.slf4j.LoggerFactory;
}
public static class waitForFlush_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 String tableName;
private ByteBuffer startRow;
private ByteBuffer endRow;
private long flushID;
private long maxLoops;
- public waitForFlush_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops, 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 waitForFlush_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops, 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;
@@ -630,7 +630,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void setTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
setTableProperty_call method_call = new setTableProperty_call(tinfo, credentials, tableName, property, value, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -638,12 +638,12 @@ import org.slf4j.LoggerFactory;
}
public static class setTableProperty_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 String tableName;
private String property;
private String value;
- public setTableProperty_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value, 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 setTableProperty_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, String value, 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;
@@ -674,7 +674,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void removeTableProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void removeTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
removeTableProperty_call method_call = new removeTableProperty_call(tinfo, credentials, tableName, property, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -682,11 +682,11 @@ import org.slf4j.LoggerFactory;
}
public static class removeTableProperty_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 String tableName;
private String property;
- public removeTableProperty_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, 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 removeTableProperty_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, String property, 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;
@@ -715,7 +715,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void setNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
setNamespaceProperty_call method_call = new setNamespaceProperty_call(tinfo, credentials, ns, property, value, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -723,12 +723,12 @@ import org.slf4j.LoggerFactory;
}
public static class setNamespaceProperty_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 String ns;
private String property;
private String value;
- public setNamespaceProperty_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value, 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 setNamespaceProperty_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, String value, 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;
@@ -759,7 +759,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void removeNamespaceProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void removeNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
removeNamespaceProperty_call method_call = new removeNamespaceProperty_call(tinfo, credentials, ns, property, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -767,11 +767,11 @@ import org.slf4j.LoggerFactory;
}
public static class removeNamespaceProperty_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 String ns;
private String property;
- public removeNamespaceProperty_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, 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 removeNamespaceProperty_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, String property, 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;
@@ -800,7 +800,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void setMasterGoalState(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
setMasterGoalState_call method_call = new setMasterGoalState_call(tinfo, credentials, state, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -808,10 +808,10 @@ import org.slf4j.LoggerFactory;
}
public static class setMasterGoalState_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 MasterGoalState state;
- public setMasterGoalState_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state, 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 setMasterGoalState_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, MasterGoalState state, 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;
@@ -838,7 +838,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void shutdown(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void shutdown(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
shutdown_call method_call = new shutdown_call(tinfo, credentials, stopTabletServers, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -846,10 +846,10 @@ import org.slf4j.LoggerFactory;
}
public static class shutdown_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 boolean stopTabletServers;
- public shutdown_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers, 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 shutdown_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, boolean stopTabletServers, 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;
@@ -876,7 +876,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void shutdownTabletServer(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void shutdownTabletServer(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
shutdownTabletServer_call method_call = new shutdownTabletServer_call(tinfo, credentials, tabletServer, force, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -884,11 +884,11 @@ import org.slf4j.LoggerFactory;
}
public static class shutdownTabletServer_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 String tabletServer;
private boolean force;
- public shutdownTabletServer_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force, 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 shutdownTabletServer_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tabletServer, boolean force, 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;
@@ -917,7 +917,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void setSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
setSystemProperty_call method_call = new setSystemProperty_call(tinfo, credentials, property, value, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -925,11 +925,11 @@ import org.slf4j.LoggerFactory;
}
public static class setSystemProperty_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 String property;
private String value;
- public setSystemProperty_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value, 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 setSystemProperty_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, String value, 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;
@@ -958,7 +958,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void removeSystemProperty(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void removeSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
removeSystemProperty_call method_call = new removeSystemProperty_call(tinfo, credentials, property, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -966,10 +966,10 @@ import org.slf4j.LoggerFactory;
}
public static class removeSystemProperty_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 String property;
- public removeSystemProperty_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, 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 removeSystemProperty_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String property, 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;
@@ -996,7 +996,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void getMasterStats(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 getMasterStats(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();
getMasterStats_call method_call = new getMasterStats_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1004,9 +1004,9 @@ import org.slf4j.LoggerFactory;
}
public static class getMasterStats_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 getMasterStats_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 getMasterStats_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;
@@ -1031,7 +1031,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void waitForBalance(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void waitForBalance(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
waitForBalance_call method_call = new waitForBalance_call(tinfo, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1039,8 +1039,8 @@ import org.slf4j.LoggerFactory;
}
public static class waitForBalance_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.accumulo.trace.thrift.TInfo tinfo;
- public waitForBalance_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 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 {
+ private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
+ public waitForBalance_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 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;
}
@@ -1063,7 +1063,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void reportSplitExtent(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void reportSplitExtent(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
reportSplitExtent_call method_call = new reportSplitExtent_call(tinfo, credentials, serverName, split, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1071,11 +1071,11 @@ import org.slf4j.LoggerFactory;
}
public static class reportSplitExtent_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 String serverName;
private TabletSplit split;
- public reportSplitExtent_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split, 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 reportSplitExtent_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletSplit split, 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, true);
this.tinfo = tinfo;
this.credentials = credentials;
@@ -1103,7 +1103,7 @@ import org.slf4j.LoggerFactory;
}
}
- public void reportTabletStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void reportTabletStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
reportTabletStatus_call method_call = new reportTabletStatus_call(tinfo, credentials, serverName, status, tablet, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1111,12 +1111,12 @@ import org.slf4j.LoggerFactory;
}
public static class reportTabletStatus_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 String serverName;
private TabletLoadState status;
private org.apache.accumulo.core.data.thrift.TKeyExtent tablet;
- public reportTabletStatus_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet, 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 reportTabletStatus_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet, 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, true);
this.tinfo = tinfo;
this.credentials = credentials;
@@ -2393,7 +2393,7 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new initiateFlush_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 String tableName; // required
@@ -2466,7 +2466,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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -2479,7 +2479,7 @@ import org.slf4j.LoggerFactory;
}
public initiateFlush_args(
- org.apache.accumulo.trace.thrift.TInfo tinfo,
+ org.apache.accumulo.core.trace.thrift.TInfo tinfo,
org.apache.accumulo.core.security.thrift.TCredentials credentials,
String tableName)
{
@@ -2494,7 +2494,7 @@ import org.slf4j.LoggerFactory;
*/
public initiateFlush_args(initiateFlush_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);
@@ -2515,11 +2515,11 @@ import org.slf4j.LoggerFactory;
this.tableName = null;
}
- public org.apache.accumulo.trace.thrift.TInfo getTinfo() {
+ public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() {
return this.tinfo;
}
- public initiateFlush_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) {
+ public initiateFlush_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
this.tinfo = tinfo;
return this;
}
@@ -2593,7 +2593,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;
@@ -2828,7 +2828,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 {
@@ -2926,7 +2926,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);
}
@@ -3519,7 +3519,7 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new waitForFlush_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 String tableName; // required
public ByteBuffer startRow; // required
@@ -3611,7 +3611,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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -3632,7 +3632,7 @@ import org.slf4j.LoggerFactory;
}
public waitForFlush_args(
- org.apache.accumulo.trace.thrift.TInfo tinfo,
+ org.apache.accumulo.core.trace.thrift.TInfo tinfo,
org.apache.accumulo.core.security.thrift.TCredentials credentials,
String tableName,
ByteBuffer startRow,
@@ -3658,7 +3658,7 @@ import org.slf4j.LoggerFactory;
public waitForFlush_args(waitForFlush_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);
@@ -3695,11 +3695,11 @@ import org.slf4j.LoggerFactory;
this.maxLoops = 0;
}
- public org.apache.accumulo.trace.thrift.TInfo getTinfo() {
+ public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() {
return this.tinfo;
}
- public waitForFlush_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) {
+ public waitForFlush_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
this.tinfo = tinfo;
return this;
}
@@ -3887,7 +3887,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;
@@ -4276,7 +4276,7 @@ import org.slf4j.LoggerFactory;
switch (schemeField.id) {
case 5: // 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 {
@@ -4446,7 +4446,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);
}
@@ -4953,7 +4953,7 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new setTableProperty_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 String tableName; // required
public String property; // required
@@ -5034,7 +5034,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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -5051,7 +5051,7 @@ import org.slf4j.LoggerFactory;
}
public setTableProperty_args(
- org.apache.accumulo.trace.thrift.TInfo tinfo,
+ org.apache.accumulo.core.trace.thrift.TInfo tinfo,
org.apache.accumulo.core.security.thrift.TCredentials credentials,
String tableName,
String property,
@@ -5070,7 +5070,7 @@ import org.slf4j.LoggerFactory;
*/
public setTableProperty_args(setTableProperty_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);
@@ -5099,11 +5099,11 @@ import org.slf4j.LoggerFactory;
this.value = null;
}
- public org.apache.accumulo.trace.thrift.TInfo getTinfo() {
+ public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() {
return this.tinfo;
}
- public setTableProperty_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) {
+ public setTableProperty_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
this.tinfo = tinfo;
return this;
}
@@ -5225,7 +5225,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;
@@ -5540,7 +5540,7 @@ import org.slf4j.LoggerFactory;
switch (schemeField.id) {
case 5: // 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 {
@@ -5676,7 +5676,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(5);
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);
}
@@ -6174,7 +6174,7 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new removeTableProperty_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 String tableName; // required
public String property; // required
@@ -6251,7 +6251,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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -6266,7 +6266,7 @@ import org.slf4j.LoggerFactory;
}
public removeTableProperty_args(
- org.apache.accumulo.trace.thrift.TInfo tinfo,
+ org.apache.accumulo.core.trace.thrift.TInfo tinfo,
org.apache.accumulo.core.security.thrift.TCredentials credentials,
String tableName,
String property)
@@ -6283,7 +6283,7 @@ import org.slf4j.LoggerFactory;
*/
public removeTableProperty_args(removeTableProperty_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);
@@ -6308,11 +6308,11 @@ import org.slf4j.LoggerFactory;
this.property = null;
}
- public org.apache.accumulo.trace.thrift.TInfo getTinfo() {
+ public org.apache.accumulo.core.trace.thrift.TInfo getTinfo() {
return this.tinfo;
}
- public removeTableProperty_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) {
+ public removeTableProperty_args setTinfo(org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
this.tinfo = tinfo;
return this;
}
@@ -6410,7 +6410,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;
@@ -6685,7 +6685,7 @@ import org.slf4j.LoggerFactory;
switch (schemeField.id) {
case 4: // 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);
<TRUNCATED>
[05/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
deleted file mode 100644
index bfe183d..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
+++ /dev/null
@@ -1,1384 +0,0 @@
-/*
- * 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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.accumulo.trace.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 RemoteSpan implements org.apache.thrift.TBase<RemoteSpan, RemoteSpan._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteSpan> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteSpan");
-
- private static final org.apache.thrift.protocol.TField SENDER_FIELD_DESC = new org.apache.thrift.protocol.TField("sender", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField SVC_FIELD_DESC = new org.apache.thrift.protocol.TField("svc", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("traceId", org.apache.thrift.protocol.TType.I64, (short)3);
- private static final org.apache.thrift.protocol.TField SPAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("spanId", org.apache.thrift.protocol.TType.I64, (short)4);
- private static final org.apache.thrift.protocol.TField PARENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentId", org.apache.thrift.protocol.TType.I64, (short)5);
- private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.I64, (short)6);
- private static final org.apache.thrift.protocol.TField STOP_FIELD_DESC = new org.apache.thrift.protocol.TField("stop", org.apache.thrift.protocol.TType.I64, (short)7);
- private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)8);
- private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("data", org.apache.thrift.protocol.TType.MAP, (short)10);
- private static final org.apache.thrift.protocol.TField ANNOTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("annotations", org.apache.thrift.protocol.TType.LIST, (short)11);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new RemoteSpanStandardSchemeFactory());
- schemes.put(TupleScheme.class, new RemoteSpanTupleSchemeFactory());
- }
-
- public String sender; // required
- public String svc; // required
- public long traceId; // required
- public long spanId; // required
- public long parentId; // required
- public long start; // required
- public long stop; // required
- public String description; // required
- public Map<ByteBuffer,ByteBuffer> data; // required
- public List<Annotation> annotations; // 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 {
- SENDER((short)1, "sender"),
- SVC((short)2, "svc"),
- TRACE_ID((short)3, "traceId"),
- SPAN_ID((short)4, "spanId"),
- PARENT_ID((short)5, "parentId"),
- START((short)6, "start"),
- STOP((short)7, "stop"),
- DESCRIPTION((short)8, "description"),
- DATA((short)10, "data"),
- ANNOTATIONS((short)11, "annotations");
-
- 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: // SENDER
- return SENDER;
- case 2: // SVC
- return SVC;
- case 3: // TRACE_ID
- return TRACE_ID;
- case 4: // SPAN_ID
- return SPAN_ID;
- case 5: // PARENT_ID
- return PARENT_ID;
- case 6: // START
- return START;
- case 7: // STOP
- return STOP;
- case 8: // DESCRIPTION
- return DESCRIPTION;
- case 10: // DATA
- return DATA;
- case 11: // ANNOTATIONS
- return ANNOTATIONS;
- 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
- private static final int __TRACEID_ISSET_ID = 0;
- private static final int __SPANID_ISSET_ID = 1;
- private static final int __PARENTID_ISSET_ID = 2;
- private static final int __START_ISSET_ID = 3;
- private static final int __STOP_ISSET_ID = 4;
- private byte __isset_bitfield = 0;
- 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.SENDER, new org.apache.thrift.meta_data.FieldMetaData("sender", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.SVC, new org.apache.thrift.meta_data.FieldMetaData("svc", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("traceId", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.SPAN_ID, new org.apache.thrift.meta_data.FieldMetaData("spanId", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.PARENT_ID, new org.apache.thrift.meta_data.FieldMetaData("parentId", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.START, new org.apache.thrift.meta_data.FieldMetaData("start", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.STOP, new org.apache.thrift.meta_data.FieldMetaData("stop", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.DATA, new org.apache.thrift.meta_data.FieldMetaData("data", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true),
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))));
- tmpMap.put(_Fields.ANNOTATIONS, new org.apache.thrift.meta_data.FieldMetaData("annotations", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Annotation.class))));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RemoteSpan.class, metaDataMap);
- }
-
- public RemoteSpan() {
- }
-
- public RemoteSpan(
- String sender,
- String svc,
- long traceId,
- long spanId,
- long parentId,
- long start,
- long stop,
- String description,
- Map<ByteBuffer,ByteBuffer> data,
- List<Annotation> annotations)
- {
- this();
- this.sender = sender;
- this.svc = svc;
- this.traceId = traceId;
- setTraceIdIsSet(true);
- this.spanId = spanId;
- setSpanIdIsSet(true);
- this.parentId = parentId;
- setParentIdIsSet(true);
- this.start = start;
- setStartIsSet(true);
- this.stop = stop;
- setStopIsSet(true);
- this.description = description;
- this.data = data;
- this.annotations = annotations;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public RemoteSpan(RemoteSpan other) {
- __isset_bitfield = other.__isset_bitfield;
- if (other.isSetSender()) {
- this.sender = other.sender;
- }
- if (other.isSetSvc()) {
- this.svc = other.svc;
- }
- this.traceId = other.traceId;
- this.spanId = other.spanId;
- this.parentId = other.parentId;
- this.start = other.start;
- this.stop = other.stop;
- if (other.isSetDescription()) {
- this.description = other.description;
- }
- if (other.isSetData()) {
- Map<ByteBuffer,ByteBuffer> __this__data = new HashMap<ByteBuffer,ByteBuffer>(other.data);
- this.data = __this__data;
- }
- if (other.isSetAnnotations()) {
- List<Annotation> __this__annotations = new ArrayList<Annotation>(other.annotations.size());
- for (Annotation other_element : other.annotations) {
- __this__annotations.add(new Annotation(other_element));
- }
- this.annotations = __this__annotations;
- }
- }
-
- public RemoteSpan deepCopy() {
- return new RemoteSpan(this);
- }
-
- @Override
- public void clear() {
- this.sender = null;
- this.svc = null;
- setTraceIdIsSet(false);
- this.traceId = 0;
- setSpanIdIsSet(false);
- this.spanId = 0;
- setParentIdIsSet(false);
- this.parentId = 0;
- setStartIsSet(false);
- this.start = 0;
- setStopIsSet(false);
- this.stop = 0;
- this.description = null;
- this.data = null;
- this.annotations = null;
- }
-
- public String getSender() {
- return this.sender;
- }
-
- public RemoteSpan setSender(String sender) {
- this.sender = sender;
- return this;
- }
-
- public void unsetSender() {
- this.sender = null;
- }
-
- /** Returns true if field sender is set (has been assigned a value) and false otherwise */
- public boolean isSetSender() {
- return this.sender != null;
- }
-
- public void setSenderIsSet(boolean value) {
- if (!value) {
- this.sender = null;
- }
- }
-
- public String getSvc() {
- return this.svc;
- }
-
- public RemoteSpan setSvc(String svc) {
- this.svc = svc;
- return this;
- }
-
- public void unsetSvc() {
- this.svc = null;
- }
-
- /** Returns true if field svc is set (has been assigned a value) and false otherwise */
- public boolean isSetSvc() {
- return this.svc != null;
- }
-
- public void setSvcIsSet(boolean value) {
- if (!value) {
- this.svc = null;
- }
- }
-
- public long getTraceId() {
- return this.traceId;
- }
-
- public RemoteSpan setTraceId(long traceId) {
- this.traceId = traceId;
- setTraceIdIsSet(true);
- return this;
- }
-
- public void unsetTraceId() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TRACEID_ISSET_ID);
- }
-
- /** Returns true if field traceId is set (has been assigned a value) and false otherwise */
- public boolean isSetTraceId() {
- return EncodingUtils.testBit(__isset_bitfield, __TRACEID_ISSET_ID);
- }
-
- public void setTraceIdIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TRACEID_ISSET_ID, value);
- }
-
- public long getSpanId() {
- return this.spanId;
- }
-
- public RemoteSpan setSpanId(long spanId) {
- this.spanId = spanId;
- setSpanIdIsSet(true);
- return this;
- }
-
- public void unsetSpanId() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SPANID_ISSET_ID);
- }
-
- /** Returns true if field spanId is set (has been assigned a value) and false otherwise */
- public boolean isSetSpanId() {
- return EncodingUtils.testBit(__isset_bitfield, __SPANID_ISSET_ID);
- }
-
- public void setSpanIdIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SPANID_ISSET_ID, value);
- }
-
- public long getParentId() {
- return this.parentId;
- }
-
- public RemoteSpan setParentId(long parentId) {
- this.parentId = parentId;
- setParentIdIsSet(true);
- return this;
- }
-
- public void unsetParentId() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARENTID_ISSET_ID);
- }
-
- /** Returns true if field parentId is set (has been assigned a value) and false otherwise */
- public boolean isSetParentId() {
- return EncodingUtils.testBit(__isset_bitfield, __PARENTID_ISSET_ID);
- }
-
- public void setParentIdIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARENTID_ISSET_ID, value);
- }
-
- public long getStart() {
- return this.start;
- }
-
- public RemoteSpan setStart(long start) {
- this.start = start;
- setStartIsSet(true);
- return this;
- }
-
- public void unsetStart() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __START_ISSET_ID);
- }
-
- /** Returns true if field start is set (has been assigned a value) and false otherwise */
- public boolean isSetStart() {
- return EncodingUtils.testBit(__isset_bitfield, __START_ISSET_ID);
- }
-
- public void setStartIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __START_ISSET_ID, value);
- }
-
- public long getStop() {
- return this.stop;
- }
-
- public RemoteSpan setStop(long stop) {
- this.stop = stop;
- setStopIsSet(true);
- return this;
- }
-
- public void unsetStop() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STOP_ISSET_ID);
- }
-
- /** Returns true if field stop is set (has been assigned a value) and false otherwise */
- public boolean isSetStop() {
- return EncodingUtils.testBit(__isset_bitfield, __STOP_ISSET_ID);
- }
-
- public void setStopIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STOP_ISSET_ID, value);
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public RemoteSpan setDescription(String description) {
- this.description = description;
- return this;
- }
-
- public void unsetDescription() {
- this.description = null;
- }
-
- /** Returns true if field description is set (has been assigned a value) and false otherwise */
- public boolean isSetDescription() {
- return this.description != null;
- }
-
- public void setDescriptionIsSet(boolean value) {
- if (!value) {
- this.description = null;
- }
- }
-
- public int getDataSize() {
- return (this.data == null) ? 0 : this.data.size();
- }
-
- public void putToData(ByteBuffer key, ByteBuffer val) {
- if (this.data == null) {
- this.data = new HashMap<ByteBuffer,ByteBuffer>();
- }
- this.data.put(key, val);
- }
-
- public Map<ByteBuffer,ByteBuffer> getData() {
- return this.data;
- }
-
- public RemoteSpan setData(Map<ByteBuffer,ByteBuffer> data) {
- this.data = data;
- return this;
- }
-
- public void unsetData() {
- this.data = null;
- }
-
- /** Returns true if field data is set (has been assigned a value) and false otherwise */
- public boolean isSetData() {
- return this.data != null;
- }
-
- public void setDataIsSet(boolean value) {
- if (!value) {
- this.data = null;
- }
- }
-
- public int getAnnotationsSize() {
- return (this.annotations == null) ? 0 : this.annotations.size();
- }
-
- public java.util.Iterator<Annotation> getAnnotationsIterator() {
- return (this.annotations == null) ? null : this.annotations.iterator();
- }
-
- public void addToAnnotations(Annotation elem) {
- if (this.annotations == null) {
- this.annotations = new ArrayList<Annotation>();
- }
- this.annotations.add(elem);
- }
-
- public List<Annotation> getAnnotations() {
- return this.annotations;
- }
-
- public RemoteSpan setAnnotations(List<Annotation> annotations) {
- this.annotations = annotations;
- return this;
- }
-
- public void unsetAnnotations() {
- this.annotations = null;
- }
-
- /** Returns true if field annotations is set (has been assigned a value) and false otherwise */
- public boolean isSetAnnotations() {
- return this.annotations != null;
- }
-
- public void setAnnotationsIsSet(boolean value) {
- if (!value) {
- this.annotations = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case SENDER:
- if (value == null) {
- unsetSender();
- } else {
- setSender((String)value);
- }
- break;
-
- case SVC:
- if (value == null) {
- unsetSvc();
- } else {
- setSvc((String)value);
- }
- break;
-
- case TRACE_ID:
- if (value == null) {
- unsetTraceId();
- } else {
- setTraceId((Long)value);
- }
- break;
-
- case SPAN_ID:
- if (value == null) {
- unsetSpanId();
- } else {
- setSpanId((Long)value);
- }
- break;
-
- case PARENT_ID:
- if (value == null) {
- unsetParentId();
- } else {
- setParentId((Long)value);
- }
- break;
-
- case START:
- if (value == null) {
- unsetStart();
- } else {
- setStart((Long)value);
- }
- break;
-
- case STOP:
- if (value == null) {
- unsetStop();
- } else {
- setStop((Long)value);
- }
- break;
-
- case DESCRIPTION:
- if (value == null) {
- unsetDescription();
- } else {
- setDescription((String)value);
- }
- break;
-
- case DATA:
- if (value == null) {
- unsetData();
- } else {
- setData((Map<ByteBuffer,ByteBuffer>)value);
- }
- break;
-
- case ANNOTATIONS:
- if (value == null) {
- unsetAnnotations();
- } else {
- setAnnotations((List<Annotation>)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case SENDER:
- return getSender();
-
- case SVC:
- return getSvc();
-
- case TRACE_ID:
- return Long.valueOf(getTraceId());
-
- case SPAN_ID:
- return Long.valueOf(getSpanId());
-
- case PARENT_ID:
- return Long.valueOf(getParentId());
-
- case START:
- return Long.valueOf(getStart());
-
- case STOP:
- return Long.valueOf(getStop());
-
- case DESCRIPTION:
- return getDescription();
-
- case DATA:
- return getData();
-
- case ANNOTATIONS:
- return getAnnotations();
-
- }
- 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 SENDER:
- return isSetSender();
- case SVC:
- return isSetSvc();
- case TRACE_ID:
- return isSetTraceId();
- case SPAN_ID:
- return isSetSpanId();
- case PARENT_ID:
- return isSetParentId();
- case START:
- return isSetStart();
- case STOP:
- return isSetStop();
- case DESCRIPTION:
- return isSetDescription();
- case DATA:
- return isSetData();
- case ANNOTATIONS:
- return isSetAnnotations();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof RemoteSpan)
- return this.equals((RemoteSpan)that);
- return false;
- }
-
- public boolean equals(RemoteSpan that) {
- if (that == null)
- return false;
-
- boolean this_present_sender = true && this.isSetSender();
- boolean that_present_sender = true && that.isSetSender();
- if (this_present_sender || that_present_sender) {
- if (!(this_present_sender && that_present_sender))
- return false;
- if (!this.sender.equals(that.sender))
- return false;
- }
-
- boolean this_present_svc = true && this.isSetSvc();
- boolean that_present_svc = true && that.isSetSvc();
- if (this_present_svc || that_present_svc) {
- if (!(this_present_svc && that_present_svc))
- return false;
- if (!this.svc.equals(that.svc))
- return false;
- }
-
- boolean this_present_traceId = true;
- boolean that_present_traceId = true;
- if (this_present_traceId || that_present_traceId) {
- if (!(this_present_traceId && that_present_traceId))
- return false;
- if (this.traceId != that.traceId)
- return false;
- }
-
- boolean this_present_spanId = true;
- boolean that_present_spanId = true;
- if (this_present_spanId || that_present_spanId) {
- if (!(this_present_spanId && that_present_spanId))
- return false;
- if (this.spanId != that.spanId)
- return false;
- }
-
- boolean this_present_parentId = true;
- boolean that_present_parentId = true;
- if (this_present_parentId || that_present_parentId) {
- if (!(this_present_parentId && that_present_parentId))
- return false;
- if (this.parentId != that.parentId)
- return false;
- }
-
- boolean this_present_start = true;
- boolean that_present_start = true;
- if (this_present_start || that_present_start) {
- if (!(this_present_start && that_present_start))
- return false;
- if (this.start != that.start)
- return false;
- }
-
- boolean this_present_stop = true;
- boolean that_present_stop = true;
- if (this_present_stop || that_present_stop) {
- if (!(this_present_stop && that_present_stop))
- return false;
- if (this.stop != that.stop)
- return false;
- }
-
- boolean this_present_description = true && this.isSetDescription();
- boolean that_present_description = true && that.isSetDescription();
- if (this_present_description || that_present_description) {
- if (!(this_present_description && that_present_description))
- return false;
- if (!this.description.equals(that.description))
- return false;
- }
-
- boolean this_present_data = true && this.isSetData();
- boolean that_present_data = true && that.isSetData();
- if (this_present_data || that_present_data) {
- if (!(this_present_data && that_present_data))
- return false;
- if (!this.data.equals(that.data))
- return false;
- }
-
- boolean this_present_annotations = true && this.isSetAnnotations();
- boolean that_present_annotations = true && that.isSetAnnotations();
- if (this_present_annotations || that_present_annotations) {
- if (!(this_present_annotations && that_present_annotations))
- return false;
- if (!this.annotations.equals(that.annotations))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
-
- @Override
- public int compareTo(RemoteSpan other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetSender()).compareTo(other.isSetSender());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSender()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sender, other.sender);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetSvc()).compareTo(other.isSetSvc());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSvc()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.svc, other.svc);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetTraceId()).compareTo(other.isSetTraceId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTraceId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.traceId, other.traceId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSpanId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spanId, other.spanId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetParentId()).compareTo(other.isSetParentId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetParentId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parentId, other.parentId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetStart()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, other.start);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetStop()).compareTo(other.isSetStop());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetStop()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stop, other.stop);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetDescription()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetData()).compareTo(other.isSetData());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetData()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, other.data);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetAnnotations()).compareTo(other.isSetAnnotations());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetAnnotations()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.annotations, other.annotations);
- 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("RemoteSpan(");
- boolean first = true;
-
- sb.append("sender:");
- if (this.sender == null) {
- sb.append("null");
- } else {
- sb.append(this.sender);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("svc:");
- if (this.svc == null) {
- sb.append("null");
- } else {
- sb.append(this.svc);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("traceId:");
- sb.append(this.traceId);
- first = false;
- if (!first) sb.append(", ");
- sb.append("spanId:");
- sb.append(this.spanId);
- first = false;
- if (!first) sb.append(", ");
- sb.append("parentId:");
- sb.append(this.parentId);
- first = false;
- if (!first) sb.append(", ");
- sb.append("start:");
- sb.append(this.start);
- first = false;
- if (!first) sb.append(", ");
- sb.append("stop:");
- sb.append(this.stop);
- first = false;
- if (!first) sb.append(", ");
- sb.append("description:");
- if (this.description == null) {
- sb.append("null");
- } else {
- sb.append(this.description);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("data:");
- if (this.data == null) {
- sb.append("null");
- } else {
- sb.append(this.data);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("annotations:");
- if (this.annotations == null) {
- sb.append("null");
- } else {
- sb.append(this.annotations);
- }
- 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 {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
- 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 RemoteSpanStandardSchemeFactory implements SchemeFactory {
- public RemoteSpanStandardScheme getScheme() {
- return new RemoteSpanStandardScheme();
- }
- }
-
- private static class RemoteSpanStandardScheme extends StandardScheme<RemoteSpan> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteSpan 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: // SENDER
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.sender = iprot.readString();
- struct.setSenderIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // SVC
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.svc = iprot.readString();
- struct.setSvcIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 3: // TRACE_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.traceId = iprot.readI64();
- struct.setTraceIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 4: // SPAN_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.spanId = iprot.readI64();
- struct.setSpanIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 5: // PARENT_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.parentId = iprot.readI64();
- struct.setParentIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 6: // START
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.start = iprot.readI64();
- struct.setStartIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 7: // STOP
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.stop = iprot.readI64();
- struct.setStopIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 8: // DESCRIPTION
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.description = iprot.readString();
- struct.setDescriptionIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 10: // DATA
- if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
- struct.data = new HashMap<ByteBuffer,ByteBuffer>(2*_map0.size);
- for (int _i1 = 0; _i1 < _map0.size; ++_i1)
- {
- ByteBuffer _key2;
- ByteBuffer _val3;
- _key2 = iprot.readBinary();
- _val3 = iprot.readBinary();
- struct.data.put(_key2, _val3);
- }
- iprot.readMapEnd();
- }
- struct.setDataIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 11: // ANNOTATIONS
- if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
- struct.annotations = new ArrayList<Annotation>(_list4.size);
- for (int _i5 = 0; _i5 < _list4.size; ++_i5)
- {
- Annotation _elem6;
- _elem6 = new Annotation();
- _elem6.read(iprot);
- struct.annotations.add(_elem6);
- }
- iprot.readListEnd();
- }
- struct.setAnnotationsIsSet(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, RemoteSpan struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.sender != null) {
- oprot.writeFieldBegin(SENDER_FIELD_DESC);
- oprot.writeString(struct.sender);
- oprot.writeFieldEnd();
- }
- if (struct.svc != null) {
- oprot.writeFieldBegin(SVC_FIELD_DESC);
- oprot.writeString(struct.svc);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(TRACE_ID_FIELD_DESC);
- oprot.writeI64(struct.traceId);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(SPAN_ID_FIELD_DESC);
- oprot.writeI64(struct.spanId);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(PARENT_ID_FIELD_DESC);
- oprot.writeI64(struct.parentId);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(START_FIELD_DESC);
- oprot.writeI64(struct.start);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(STOP_FIELD_DESC);
- oprot.writeI64(struct.stop);
- oprot.writeFieldEnd();
- if (struct.description != null) {
- oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
- oprot.writeString(struct.description);
- oprot.writeFieldEnd();
- }
- if (struct.data != null) {
- oprot.writeFieldBegin(DATA_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.data.size()));
- for (Map.Entry<ByteBuffer, ByteBuffer> _iter7 : struct.data.entrySet())
- {
- oprot.writeBinary(_iter7.getKey());
- oprot.writeBinary(_iter7.getValue());
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (struct.annotations != null) {
- oprot.writeFieldBegin(ANNOTATIONS_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.annotations.size()));
- for (Annotation _iter8 : struct.annotations)
- {
- _iter8.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class RemoteSpanTupleSchemeFactory implements SchemeFactory {
- public RemoteSpanTupleScheme getScheme() {
- return new RemoteSpanTupleScheme();
- }
- }
-
- private static class RemoteSpanTupleScheme extends TupleScheme<RemoteSpan> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, RemoteSpan struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetSender()) {
- optionals.set(0);
- }
- if (struct.isSetSvc()) {
- optionals.set(1);
- }
- if (struct.isSetTraceId()) {
- optionals.set(2);
- }
- if (struct.isSetSpanId()) {
- optionals.set(3);
- }
- if (struct.isSetParentId()) {
- optionals.set(4);
- }
- if (struct.isSetStart()) {
- optionals.set(5);
- }
- if (struct.isSetStop()) {
- optionals.set(6);
- }
- if (struct.isSetDescription()) {
- optionals.set(7);
- }
- if (struct.isSetData()) {
- optionals.set(8);
- }
- if (struct.isSetAnnotations()) {
- optionals.set(9);
- }
- oprot.writeBitSet(optionals, 10);
- if (struct.isSetSender()) {
- oprot.writeString(struct.sender);
- }
- if (struct.isSetSvc()) {
- oprot.writeString(struct.svc);
- }
- if (struct.isSetTraceId()) {
- oprot.writeI64(struct.traceId);
- }
- if (struct.isSetSpanId()) {
- oprot.writeI64(struct.spanId);
- }
- if (struct.isSetParentId()) {
- oprot.writeI64(struct.parentId);
- }
- if (struct.isSetStart()) {
- oprot.writeI64(struct.start);
- }
- if (struct.isSetStop()) {
- oprot.writeI64(struct.stop);
- }
- if (struct.isSetDescription()) {
- oprot.writeString(struct.description);
- }
- if (struct.isSetData()) {
- {
- oprot.writeI32(struct.data.size());
- for (Map.Entry<ByteBuffer, ByteBuffer> _iter9 : struct.data.entrySet())
- {
- oprot.writeBinary(_iter9.getKey());
- oprot.writeBinary(_iter9.getValue());
- }
- }
- }
- if (struct.isSetAnnotations()) {
- {
- oprot.writeI32(struct.annotations.size());
- for (Annotation _iter10 : struct.annotations)
- {
- _iter10.write(oprot);
- }
- }
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, RemoteSpan struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(10);
- if (incoming.get(0)) {
- struct.sender = iprot.readString();
- struct.setSenderIsSet(true);
- }
- if (incoming.get(1)) {
- struct.svc = iprot.readString();
- struct.setSvcIsSet(true);
- }
- if (incoming.get(2)) {
- struct.traceId = iprot.readI64();
- struct.setTraceIdIsSet(true);
- }
- if (incoming.get(3)) {
- struct.spanId = iprot.readI64();
- struct.setSpanIdIsSet(true);
- }
- if (incoming.get(4)) {
- struct.parentId = iprot.readI64();
- struct.setParentIdIsSet(true);
- }
- if (incoming.get(5)) {
- struct.start = iprot.readI64();
- struct.setStartIsSet(true);
- }
- if (incoming.get(6)) {
- struct.stop = iprot.readI64();
- struct.setStopIsSet(true);
- }
- if (incoming.get(7)) {
- struct.description = iprot.readString();
- struct.setDescriptionIsSet(true);
- }
- if (incoming.get(8)) {
- {
- org.apache.thrift.protocol.TMap _map11 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.data = new HashMap<ByteBuffer,ByteBuffer>(2*_map11.size);
- for (int _i12 = 0; _i12 < _map11.size; ++_i12)
- {
- ByteBuffer _key13;
- ByteBuffer _val14;
- _key13 = iprot.readBinary();
- _val14 = iprot.readBinary();
- struct.data.put(_key13, _val14);
- }
- }
- struct.setDataIsSet(true);
- }
- if (incoming.get(9)) {
- {
- org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.annotations = new ArrayList<Annotation>(_list15.size);
- for (int _i16 = 0; _i16 < _list15.size; ++_i16)
- {
- Annotation _elem17;
- _elem17 = new Annotation();
- _elem17.read(iprot);
- struct.annotations.add(_elem17);
- }
- }
- struct.setAnnotationsIsSet(true);
- }
- }
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/thrift/SpanReceiver.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/SpanReceiver.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/SpanReceiver.java
deleted file mode 100644
index 4fe4c38..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/SpanReceiver.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*
- * 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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.accumulo.trace.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 SpanReceiver {
-
- public interface Iface {
-
- public void span(RemoteSpan span) throws org.apache.thrift.TException;
-
- }
-
- public interface AsyncIface {
-
- public void span(RemoteSpan span, 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 void span(RemoteSpan span) throws org.apache.thrift.TException
- {
- send_span(span);
- }
-
- public void send_span(RemoteSpan span) throws org.apache.thrift.TException
- {
- span_args args = new span_args();
- args.setSpan(span);
- sendBase("span", args);
- }
-
- }
- 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 span(RemoteSpan span, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
- checkReady();
- span_call method_call = new span_call(span, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class span_call extends org.apache.thrift.async.TAsyncMethodCall {
- private RemoteSpan span;
- public span_call(RemoteSpan span, 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, true);
- this.span = span;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("span", org.apache.thrift.protocol.TMessageType.CALL, 0));
- span_args args = new span_args();
- args.setSpan(span);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public void getResult() throws 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);
- }
- }
-
- }
-
- 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("span", new span());
- return processMap;
- }
-
- public static class span<I extends Iface> extends org.apache.thrift.ProcessFunction<I, span_args> {
- public span() {
- super("span");
- }
-
- public span_args getEmptyArgsInstance() {
- return new span_args();
- }
-
- protected boolean isOneway() {
- return true;
- }
-
- public org.apache.thrift.TBase getResult(I iface, span_args args) throws org.apache.thrift.TException {
- iface.span(args.span);
- return null;
- }
- }
-
- }
-
- 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("span", new span());
- return processMap;
- }
-
- public static class span<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, span_args, Void> {
- public span() {
- super("span");
- }
-
- public span_args getEmptyArgsInstance() {
- return new span_args();
- }
-
- public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Void>() {
- public void onComplete(Void o) {
- }
- public void onError(Exception e) {
- }
- };
- }
-
- protected boolean isOneway() {
- return true;
- }
-
- public void start(I iface, span_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
- iface.span(args.span,resultHandler);
- }
- }
-
- }
-
- public static class span_args implements org.apache.thrift.TBase<span_args, span_args._Fields>, java.io.Serializable, Cloneable, Comparable<span_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("span_args");
-
- private static final org.apache.thrift.protocol.TField SPAN_FIELD_DESC = new org.apache.thrift.protocol.TField("span", 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 span_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new span_argsTupleSchemeFactory());
- }
-
- public RemoteSpan span; // 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 {
- SPAN((short)1, "span");
-
- 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: // SPAN
- return SPAN;
- 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.SPAN, new org.apache.thrift.meta_data.FieldMetaData("span", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RemoteSpan.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(span_args.class, metaDataMap);
- }
-
- public span_args() {
- }
-
- public span_args(
- RemoteSpan span)
- {
- this();
- this.span = span;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public span_args(span_args other) {
- if (other.isSetSpan()) {
- this.span = new RemoteSpan(other.span);
- }
- }
-
- public span_args deepCopy() {
- return new span_args(this);
- }
-
- @Override
- public void clear() {
- this.span = null;
- }
-
- public RemoteSpan getSpan() {
- return this.span;
- }
-
- public span_args setSpan(RemoteSpan span) {
- this.span = span;
- return this;
- }
-
- public void unsetSpan() {
- this.span = null;
- }
-
- /** Returns true if field span is set (has been assigned a value) and false otherwise */
- public boolean isSetSpan() {
- return this.span != null;
- }
-
- public void setSpanIsSet(boolean value) {
- if (!value) {
- this.span = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case SPAN:
- if (value == null) {
- unsetSpan();
- } else {
- setSpan((RemoteSpan)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case SPAN:
- return getSpan();
-
- }
- 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 SPAN:
- return isSetSpan();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof span_args)
- return this.equals((span_args)that);
- return false;
- }
-
- public boolean equals(span_args that) {
- if (that == null)
- return false;
-
- boolean this_present_span = true && this.isSetSpan();
- boolean that_present_span = true && that.isSetSpan();
- if (this_present_span || that_present_span) {
- if (!(this_present_span && that_present_span))
- return false;
- if (!this.span.equals(that.span))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
-
- @Override
- public int compareTo(span_args other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetSpan()).compareTo(other.isSetSpan());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSpan()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.span, other.span);
- 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("span_args(");
- boolean first = true;
-
- sb.append("span:");
- if (this.span == null) {
- sb.append("null");
- } else {
- sb.append(this.span);
- }
- 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 (span != null) {
- span.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 span_argsStandardSchemeFactory implements SchemeFactory {
- public span_argsStandardScheme getScheme() {
- return new span_argsStandardScheme();
- }
- }
-
- private static class span_argsStandardScheme extends StandardScheme<span_args> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, span_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: // SPAN
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.span = new RemoteSpan();
- struct.span.read(iprot);
- struct.setSpanIsSet(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, span_args struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.span != null) {
- oprot.writeFieldBegin(SPAN_FIELD_DESC);
- struct.span.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class span_argsTupleSchemeFactory implements SchemeFactory {
- public span_argsTupleScheme getScheme() {
- return new span_argsTupleScheme();
- }
- }
-
- private static class span_argsTupleScheme extends TupleScheme<span_args> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, span_args struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetSpan()) {
- optionals.set(0);
- }
- oprot.writeBitSet(optionals, 1);
- if (struct.isSetSpan()) {
- struct.span.write(oprot);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, span_args struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(1);
- if (incoming.get(0)) {
- struct.span = new RemoteSpan();
- struct.span.read(iprot);
- struct.setSpanIsSet(true);
- }
- }
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
index 9f899bf..fc6388f 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
@@ -14,483 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * 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.trace.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 TInfo implements org.apache.thrift.TBase<TInfo, TInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TInfo> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInfo");
-
- private static final org.apache.thrift.protocol.TField TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("traceId", org.apache.thrift.protocol.TType.I64, (short)1);
- private static final org.apache.thrift.protocol.TField PARENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentId", org.apache.thrift.protocol.TType.I64, (short)2);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new TInfoStandardSchemeFactory());
- schemes.put(TupleScheme.class, new TInfoTupleSchemeFactory());
- }
-
- public long traceId; // required
- public long parentId; // 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 {
- TRACE_ID((short)1, "traceId"),
- PARENT_ID((short)2, "parentId");
-
- 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: // TRACE_ID
- return TRACE_ID;
- case 2: // PARENT_ID
- return PARENT_ID;
- 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
- private static final int __TRACEID_ISSET_ID = 0;
- private static final int __PARENTID_ISSET_ID = 1;
- private byte __isset_bitfield = 0;
- 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.TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("traceId", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.PARENT_ID, new org.apache.thrift.meta_data.FieldMetaData("parentId", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TInfo.class, metaDataMap);
- }
-
- public TInfo() {
- }
-
- public TInfo(
- long traceId,
- long parentId)
- {
- this();
- this.traceId = traceId;
- setTraceIdIsSet(true);
- this.parentId = parentId;
- setParentIdIsSet(true);
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public TInfo(TInfo other) {
- __isset_bitfield = other.__isset_bitfield;
- this.traceId = other.traceId;
- this.parentId = other.parentId;
- }
-
- public TInfo deepCopy() {
- return new TInfo(this);
- }
-
- @Override
- public void clear() {
- setTraceIdIsSet(false);
- this.traceId = 0;
- setParentIdIsSet(false);
- this.parentId = 0;
- }
-
- public long getTraceId() {
- return this.traceId;
- }
-
- public TInfo setTraceId(long traceId) {
- this.traceId = traceId;
- setTraceIdIsSet(true);
- return this;
- }
-
- public void unsetTraceId() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TRACEID_ISSET_ID);
- }
-
- /** Returns true if field traceId is set (has been assigned a value) and false otherwise */
- public boolean isSetTraceId() {
- return EncodingUtils.testBit(__isset_bitfield, __TRACEID_ISSET_ID);
- }
-
- public void setTraceIdIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TRACEID_ISSET_ID, value);
- }
-
- public long getParentId() {
- return this.parentId;
- }
-
- public TInfo setParentId(long parentId) {
- this.parentId = parentId;
- setParentIdIsSet(true);
- return this;
- }
-
- public void unsetParentId() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARENTID_ISSET_ID);
- }
-
- /** Returns true if field parentId is set (has been assigned a value) and false otherwise */
- public boolean isSetParentId() {
- return EncodingUtils.testBit(__isset_bitfield, __PARENTID_ISSET_ID);
- }
-
- public void setParentIdIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARENTID_ISSET_ID, value);
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case TRACE_ID:
- if (value == null) {
- unsetTraceId();
- } else {
- setTraceId((Long)value);
- }
- break;
-
- case PARENT_ID:
- if (value == null) {
- unsetParentId();
- } else {
- setParentId((Long)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case TRACE_ID:
- return Long.valueOf(getTraceId());
-
- case PARENT_ID:
- return Long.valueOf(getParentId());
-
- }
- 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 TRACE_ID:
- return isSetTraceId();
- case PARENT_ID:
- return isSetParentId();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof TInfo)
- return this.equals((TInfo)that);
- return false;
- }
-
- public boolean equals(TInfo that) {
- if (that == null)
- return false;
-
- boolean this_present_traceId = true;
- boolean that_present_traceId = true;
- if (this_present_traceId || that_present_traceId) {
- if (!(this_present_traceId && that_present_traceId))
- return false;
- if (this.traceId != that.traceId)
- return false;
- }
-
- boolean this_present_parentId = true;
- boolean that_present_parentId = true;
- if (this_present_parentId || that_present_parentId) {
- if (!(this_present_parentId && that_present_parentId))
- return false;
- if (this.parentId != that.parentId)
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
-
- @Override
- public int compareTo(TInfo other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetTraceId()).compareTo(other.isSetTraceId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTraceId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.traceId, other.traceId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetParentId()).compareTo(other.isSetParentId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetParentId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parentId, other.parentId);
- 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("TInfo(");
- boolean first = true;
-
- sb.append("traceId:");
- sb.append(this.traceId);
- first = false;
- if (!first) sb.append(", ");
- sb.append("parentId:");
- sb.append(this.parentId);
- 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 {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
- 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 TInfoStandardSchemeFactory implements SchemeFactory {
- public TInfoStandardScheme getScheme() {
- return new TInfoStandardScheme();
- }
- }
-
- private static class TInfoStandardScheme extends StandardScheme<TInfo> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, TInfo 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: // TRACE_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.traceId = iprot.readI64();
- struct.setTraceIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // PARENT_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.parentId = iprot.readI64();
- struct.setParentIdIsSet(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, TInfo struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(TRACE_ID_FIELD_DESC);
- oprot.writeI64(struct.traceId);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(PARENT_ID_FIELD_DESC);
- oprot.writeI64(struct.parentId);
- oprot.writeFieldEnd();
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class TInfoTupleSchemeFactory implements SchemeFactory {
- public TInfoTupleScheme getScheme() {
- return new TInfoTupleScheme();
- }
- }
-
- private static class TInfoTupleScheme extends TupleScheme<TInfo> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, TInfo struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetTraceId()) {
- optionals.set(0);
- }
- if (struct.isSetParentId()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
- if (struct.isSetTraceId()) {
- oprot.writeI64(struct.traceId);
- }
- if (struct.isSetParentId()) {
- oprot.writeI64(struct.parentId);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, TInfo struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
- if (incoming.get(0)) {
- struct.traceId = iprot.readI64();
- struct.setTraceIdIsSet(true);
- }
- if (incoming.get(1)) {
- struct.parentId = iprot.readI64();
- struct.setParentIdIsSet(true);
- }
- }
- }
-
+/**
+ * @deprecated since 1.7, use {@link org.apache.accumulo.core.trace.thrift.TInfo} instead
+ */
+@Deprecated
+public class TInfo extends org.apache.accumulo.core.trace.thrift.TInfo {
}
[13/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
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);
}
[08/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation
of old tracing
Posted by bi...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
new file mode 100644
index 0000000..60ffff7
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
@@ -0,0 +1,502 @@
+/*
+ * 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.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.tracer.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 Annotation implements org.apache.thrift.TBase<Annotation, Annotation._Fields>, java.io.Serializable, Cloneable, Comparable<Annotation> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Annotation");
+
+ private static final org.apache.thrift.protocol.TField TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("time", org.apache.thrift.protocol.TType.I64, (short)1);
+ private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", 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 AnnotationStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new AnnotationTupleSchemeFactory());
+ }
+
+ public long time; // required
+ public String msg; // 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 {
+ TIME((short)1, "time"),
+ MSG((short)2, "msg");
+
+ 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: // TIME
+ return TIME;
+ case 2: // MSG
+ return MSG;
+ 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
+ private static final int __TIME_ISSET_ID = 0;
+ private byte __isset_bitfield = 0;
+ 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.TIME, new org.apache.thrift.meta_data.FieldMetaData("time", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", 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(Annotation.class, metaDataMap);
+ }
+
+ public Annotation() {
+ }
+
+ public Annotation(
+ long time,
+ String msg)
+ {
+ this();
+ this.time = time;
+ setTimeIsSet(true);
+ this.msg = msg;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public Annotation(Annotation other) {
+ __isset_bitfield = other.__isset_bitfield;
+ this.time = other.time;
+ if (other.isSetMsg()) {
+ this.msg = other.msg;
+ }
+ }
+
+ public Annotation deepCopy() {
+ return new Annotation(this);
+ }
+
+ @Override
+ public void clear() {
+ setTimeIsSet(false);
+ this.time = 0;
+ this.msg = null;
+ }
+
+ public long getTime() {
+ return this.time;
+ }
+
+ public Annotation setTime(long time) {
+ this.time = time;
+ setTimeIsSet(true);
+ return this;
+ }
+
+ public void unsetTime() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIME_ISSET_ID);
+ }
+
+ /** Returns true if field time is set (has been assigned a value) and false otherwise */
+ public boolean isSetTime() {
+ return EncodingUtils.testBit(__isset_bitfield, __TIME_ISSET_ID);
+ }
+
+ public void setTimeIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIME_ISSET_ID, value);
+ }
+
+ public String getMsg() {
+ return this.msg;
+ }
+
+ public Annotation setMsg(String msg) {
+ this.msg = msg;
+ return this;
+ }
+
+ public void unsetMsg() {
+ this.msg = null;
+ }
+
+ /** Returns true if field msg is set (has been assigned a value) and false otherwise */
+ public boolean isSetMsg() {
+ return this.msg != null;
+ }
+
+ public void setMsgIsSet(boolean value) {
+ if (!value) {
+ this.msg = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case TIME:
+ if (value == null) {
+ unsetTime();
+ } else {
+ setTime((Long)value);
+ }
+ break;
+
+ case MSG:
+ if (value == null) {
+ unsetMsg();
+ } else {
+ setMsg((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case TIME:
+ return Long.valueOf(getTime());
+
+ case MSG:
+ return getMsg();
+
+ }
+ 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 TIME:
+ return isSetTime();
+ case MSG:
+ return isSetMsg();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof Annotation)
+ return this.equals((Annotation)that);
+ return false;
+ }
+
+ public boolean equals(Annotation that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_time = true;
+ boolean that_present_time = true;
+ if (this_present_time || that_present_time) {
+ if (!(this_present_time && that_present_time))
+ return false;
+ if (this.time != that.time)
+ return false;
+ }
+
+ boolean this_present_msg = true && this.isSetMsg();
+ boolean that_present_msg = true && that.isSetMsg();
+ if (this_present_msg || that_present_msg) {
+ if (!(this_present_msg && that_present_msg))
+ return false;
+ if (!this.msg.equals(that.msg))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(Annotation other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetTime()).compareTo(other.isSetTime());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTime()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time, other.time);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetMsg()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+ 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("Annotation(");
+ boolean first = true;
+
+ sb.append("time:");
+ sb.append(this.time);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("msg:");
+ if (this.msg == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.msg);
+ }
+ 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 {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bitfield = 0;
+ 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 AnnotationStandardSchemeFactory implements SchemeFactory {
+ public AnnotationStandardScheme getScheme() {
+ return new AnnotationStandardScheme();
+ }
+ }
+
+ private static class AnnotationStandardScheme extends StandardScheme<Annotation> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Annotation 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: // TIME
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.time = iprot.readI64();
+ struct.setTimeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // MSG
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.msg = iprot.readString();
+ struct.setMsgIsSet(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, Annotation struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldBegin(TIME_FIELD_DESC);
+ oprot.writeI64(struct.time);
+ oprot.writeFieldEnd();
+ if (struct.msg != null) {
+ oprot.writeFieldBegin(MSG_FIELD_DESC);
+ oprot.writeString(struct.msg);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class AnnotationTupleSchemeFactory implements SchemeFactory {
+ public AnnotationTupleScheme getScheme() {
+ return new AnnotationTupleScheme();
+ }
+ }
+
+ private static class AnnotationTupleScheme extends TupleScheme<Annotation> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, Annotation struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetTime()) {
+ optionals.set(0);
+ }
+ if (struct.isSetMsg()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetTime()) {
+ oprot.writeI64(struct.time);
+ }
+ if (struct.isSetMsg()) {
+ oprot.writeString(struct.msg);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, Annotation struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.time = iprot.readI64();
+ struct.setTimeIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.msg = iprot.readString();
+ struct.setMsgIsSet(true);
+ }
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java
new file mode 100644
index 0000000..2e930d3
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java
@@ -0,0 +1,1384 @@
+/*
+ * 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.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.tracer.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 RemoteSpan implements org.apache.thrift.TBase<RemoteSpan, RemoteSpan._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteSpan> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteSpan");
+
+ private static final org.apache.thrift.protocol.TField SENDER_FIELD_DESC = new org.apache.thrift.protocol.TField("sender", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField SVC_FIELD_DESC = new org.apache.thrift.protocol.TField("svc", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField TRACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("traceId", org.apache.thrift.protocol.TType.I64, (short)3);
+ private static final org.apache.thrift.protocol.TField SPAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("spanId", org.apache.thrift.protocol.TType.I64, (short)4);
+ private static final org.apache.thrift.protocol.TField PARENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentId", org.apache.thrift.protocol.TType.I64, (short)5);
+ private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.I64, (short)6);
+ private static final org.apache.thrift.protocol.TField STOP_FIELD_DESC = new org.apache.thrift.protocol.TField("stop", org.apache.thrift.protocol.TType.I64, (short)7);
+ private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("data", org.apache.thrift.protocol.TType.MAP, (short)10);
+ private static final org.apache.thrift.protocol.TField ANNOTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("annotations", org.apache.thrift.protocol.TType.LIST, (short)11);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new RemoteSpanStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new RemoteSpanTupleSchemeFactory());
+ }
+
+ public String sender; // required
+ public String svc; // required
+ public long traceId; // required
+ public long spanId; // required
+ public long parentId; // required
+ public long start; // required
+ public long stop; // required
+ public String description; // required
+ public Map<ByteBuffer,ByteBuffer> data; // required
+ public List<Annotation> annotations; // 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 {
+ SENDER((short)1, "sender"),
+ SVC((short)2, "svc"),
+ TRACE_ID((short)3, "traceId"),
+ SPAN_ID((short)4, "spanId"),
+ PARENT_ID((short)5, "parentId"),
+ START((short)6, "start"),
+ STOP((short)7, "stop"),
+ DESCRIPTION((short)8, "description"),
+ DATA((short)10, "data"),
+ ANNOTATIONS((short)11, "annotations");
+
+ 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: // SENDER
+ return SENDER;
+ case 2: // SVC
+ return SVC;
+ case 3: // TRACE_ID
+ return TRACE_ID;
+ case 4: // SPAN_ID
+ return SPAN_ID;
+ case 5: // PARENT_ID
+ return PARENT_ID;
+ case 6: // START
+ return START;
+ case 7: // STOP
+ return STOP;
+ case 8: // DESCRIPTION
+ return DESCRIPTION;
+ case 10: // DATA
+ return DATA;
+ case 11: // ANNOTATIONS
+ return ANNOTATIONS;
+ 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
+ private static final int __TRACEID_ISSET_ID = 0;
+ private static final int __SPANID_ISSET_ID = 1;
+ private static final int __PARENTID_ISSET_ID = 2;
+ private static final int __START_ISSET_ID = 3;
+ private static final int __STOP_ISSET_ID = 4;
+ private byte __isset_bitfield = 0;
+ 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.SENDER, new org.apache.thrift.meta_data.FieldMetaData("sender", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.SVC, new org.apache.thrift.meta_data.FieldMetaData("svc", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.TRACE_ID, new org.apache.thrift.meta_data.FieldMetaData("traceId", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.SPAN_ID, new org.apache.thrift.meta_data.FieldMetaData("spanId", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.PARENT_ID, new org.apache.thrift.meta_data.FieldMetaData("parentId", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.START, new org.apache.thrift.meta_data.FieldMetaData("start", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.STOP, new org.apache.thrift.meta_data.FieldMetaData("stop", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.DATA, new org.apache.thrift.meta_data.FieldMetaData("data", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true),
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))));
+ tmpMap.put(_Fields.ANNOTATIONS, new org.apache.thrift.meta_data.FieldMetaData("annotations", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Annotation.class))));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RemoteSpan.class, metaDataMap);
+ }
+
+ public RemoteSpan() {
+ }
+
+ public RemoteSpan(
+ String sender,
+ String svc,
+ long traceId,
+ long spanId,
+ long parentId,
+ long start,
+ long stop,
+ String description,
+ Map<ByteBuffer,ByteBuffer> data,
+ List<Annotation> annotations)
+ {
+ this();
+ this.sender = sender;
+ this.svc = svc;
+ this.traceId = traceId;
+ setTraceIdIsSet(true);
+ this.spanId = spanId;
+ setSpanIdIsSet(true);
+ this.parentId = parentId;
+ setParentIdIsSet(true);
+ this.start = start;
+ setStartIsSet(true);
+ this.stop = stop;
+ setStopIsSet(true);
+ this.description = description;
+ this.data = data;
+ this.annotations = annotations;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public RemoteSpan(RemoteSpan other) {
+ __isset_bitfield = other.__isset_bitfield;
+ if (other.isSetSender()) {
+ this.sender = other.sender;
+ }
+ if (other.isSetSvc()) {
+ this.svc = other.svc;
+ }
+ this.traceId = other.traceId;
+ this.spanId = other.spanId;
+ this.parentId = other.parentId;
+ this.start = other.start;
+ this.stop = other.stop;
+ if (other.isSetDescription()) {
+ this.description = other.description;
+ }
+ if (other.isSetData()) {
+ Map<ByteBuffer,ByteBuffer> __this__data = new HashMap<ByteBuffer,ByteBuffer>(other.data);
+ this.data = __this__data;
+ }
+ if (other.isSetAnnotations()) {
+ List<Annotation> __this__annotations = new ArrayList<Annotation>(other.annotations.size());
+ for (Annotation other_element : other.annotations) {
+ __this__annotations.add(new Annotation(other_element));
+ }
+ this.annotations = __this__annotations;
+ }
+ }
+
+ public RemoteSpan deepCopy() {
+ return new RemoteSpan(this);
+ }
+
+ @Override
+ public void clear() {
+ this.sender = null;
+ this.svc = null;
+ setTraceIdIsSet(false);
+ this.traceId = 0;
+ setSpanIdIsSet(false);
+ this.spanId = 0;
+ setParentIdIsSet(false);
+ this.parentId = 0;
+ setStartIsSet(false);
+ this.start = 0;
+ setStopIsSet(false);
+ this.stop = 0;
+ this.description = null;
+ this.data = null;
+ this.annotations = null;
+ }
+
+ public String getSender() {
+ return this.sender;
+ }
+
+ public RemoteSpan setSender(String sender) {
+ this.sender = sender;
+ return this;
+ }
+
+ public void unsetSender() {
+ this.sender = null;
+ }
+
+ /** Returns true if field sender is set (has been assigned a value) and false otherwise */
+ public boolean isSetSender() {
+ return this.sender != null;
+ }
+
+ public void setSenderIsSet(boolean value) {
+ if (!value) {
+ this.sender = null;
+ }
+ }
+
+ public String getSvc() {
+ return this.svc;
+ }
+
+ public RemoteSpan setSvc(String svc) {
+ this.svc = svc;
+ return this;
+ }
+
+ public void unsetSvc() {
+ this.svc = null;
+ }
+
+ /** Returns true if field svc is set (has been assigned a value) and false otherwise */
+ public boolean isSetSvc() {
+ return this.svc != null;
+ }
+
+ public void setSvcIsSet(boolean value) {
+ if (!value) {
+ this.svc = null;
+ }
+ }
+
+ public long getTraceId() {
+ return this.traceId;
+ }
+
+ public RemoteSpan setTraceId(long traceId) {
+ this.traceId = traceId;
+ setTraceIdIsSet(true);
+ return this;
+ }
+
+ public void unsetTraceId() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TRACEID_ISSET_ID);
+ }
+
+ /** Returns true if field traceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetTraceId() {
+ return EncodingUtils.testBit(__isset_bitfield, __TRACEID_ISSET_ID);
+ }
+
+ public void setTraceIdIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TRACEID_ISSET_ID, value);
+ }
+
+ public long getSpanId() {
+ return this.spanId;
+ }
+
+ public RemoteSpan setSpanId(long spanId) {
+ this.spanId = spanId;
+ setSpanIdIsSet(true);
+ return this;
+ }
+
+ public void unsetSpanId() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SPANID_ISSET_ID);
+ }
+
+ /** Returns true if field spanId is set (has been assigned a value) and false otherwise */
+ public boolean isSetSpanId() {
+ return EncodingUtils.testBit(__isset_bitfield, __SPANID_ISSET_ID);
+ }
+
+ public void setSpanIdIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SPANID_ISSET_ID, value);
+ }
+
+ public long getParentId() {
+ return this.parentId;
+ }
+
+ public RemoteSpan setParentId(long parentId) {
+ this.parentId = parentId;
+ setParentIdIsSet(true);
+ return this;
+ }
+
+ public void unsetParentId() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARENTID_ISSET_ID);
+ }
+
+ /** Returns true if field parentId is set (has been assigned a value) and false otherwise */
+ public boolean isSetParentId() {
+ return EncodingUtils.testBit(__isset_bitfield, __PARENTID_ISSET_ID);
+ }
+
+ public void setParentIdIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARENTID_ISSET_ID, value);
+ }
+
+ public long getStart() {
+ return this.start;
+ }
+
+ public RemoteSpan setStart(long start) {
+ this.start = start;
+ setStartIsSet(true);
+ return this;
+ }
+
+ public void unsetStart() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __START_ISSET_ID);
+ }
+
+ /** Returns true if field start is set (has been assigned a value) and false otherwise */
+ public boolean isSetStart() {
+ return EncodingUtils.testBit(__isset_bitfield, __START_ISSET_ID);
+ }
+
+ public void setStartIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __START_ISSET_ID, value);
+ }
+
+ public long getStop() {
+ return this.stop;
+ }
+
+ public RemoteSpan setStop(long stop) {
+ this.stop = stop;
+ setStopIsSet(true);
+ return this;
+ }
+
+ public void unsetStop() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STOP_ISSET_ID);
+ }
+
+ /** Returns true if field stop is set (has been assigned a value) and false otherwise */
+ public boolean isSetStop() {
+ return EncodingUtils.testBit(__isset_bitfield, __STOP_ISSET_ID);
+ }
+
+ public void setStopIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STOP_ISSET_ID, value);
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public RemoteSpan setDescription(String description) {
+ this.description = description;
+ return this;
+ }
+
+ public void unsetDescription() {
+ this.description = null;
+ }
+
+ /** Returns true if field description is set (has been assigned a value) and false otherwise */
+ public boolean isSetDescription() {
+ return this.description != null;
+ }
+
+ public void setDescriptionIsSet(boolean value) {
+ if (!value) {
+ this.description = null;
+ }
+ }
+
+ public int getDataSize() {
+ return (this.data == null) ? 0 : this.data.size();
+ }
+
+ public void putToData(ByteBuffer key, ByteBuffer val) {
+ if (this.data == null) {
+ this.data = new HashMap<ByteBuffer,ByteBuffer>();
+ }
+ this.data.put(key, val);
+ }
+
+ public Map<ByteBuffer,ByteBuffer> getData() {
+ return this.data;
+ }
+
+ public RemoteSpan setData(Map<ByteBuffer,ByteBuffer> data) {
+ this.data = data;
+ return this;
+ }
+
+ public void unsetData() {
+ this.data = null;
+ }
+
+ /** Returns true if field data is set (has been assigned a value) and false otherwise */
+ public boolean isSetData() {
+ return this.data != null;
+ }
+
+ public void setDataIsSet(boolean value) {
+ if (!value) {
+ this.data = null;
+ }
+ }
+
+ public int getAnnotationsSize() {
+ return (this.annotations == null) ? 0 : this.annotations.size();
+ }
+
+ public java.util.Iterator<Annotation> getAnnotationsIterator() {
+ return (this.annotations == null) ? null : this.annotations.iterator();
+ }
+
+ public void addToAnnotations(Annotation elem) {
+ if (this.annotations == null) {
+ this.annotations = new ArrayList<Annotation>();
+ }
+ this.annotations.add(elem);
+ }
+
+ public List<Annotation> getAnnotations() {
+ return this.annotations;
+ }
+
+ public RemoteSpan setAnnotations(List<Annotation> annotations) {
+ this.annotations = annotations;
+ return this;
+ }
+
+ public void unsetAnnotations() {
+ this.annotations = null;
+ }
+
+ /** Returns true if field annotations is set (has been assigned a value) and false otherwise */
+ public boolean isSetAnnotations() {
+ return this.annotations != null;
+ }
+
+ public void setAnnotationsIsSet(boolean value) {
+ if (!value) {
+ this.annotations = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case SENDER:
+ if (value == null) {
+ unsetSender();
+ } else {
+ setSender((String)value);
+ }
+ break;
+
+ case SVC:
+ if (value == null) {
+ unsetSvc();
+ } else {
+ setSvc((String)value);
+ }
+ break;
+
+ case TRACE_ID:
+ if (value == null) {
+ unsetTraceId();
+ } else {
+ setTraceId((Long)value);
+ }
+ break;
+
+ case SPAN_ID:
+ if (value == null) {
+ unsetSpanId();
+ } else {
+ setSpanId((Long)value);
+ }
+ break;
+
+ case PARENT_ID:
+ if (value == null) {
+ unsetParentId();
+ } else {
+ setParentId((Long)value);
+ }
+ break;
+
+ case START:
+ if (value == null) {
+ unsetStart();
+ } else {
+ setStart((Long)value);
+ }
+ break;
+
+ case STOP:
+ if (value == null) {
+ unsetStop();
+ } else {
+ setStop((Long)value);
+ }
+ break;
+
+ case DESCRIPTION:
+ if (value == null) {
+ unsetDescription();
+ } else {
+ setDescription((String)value);
+ }
+ break;
+
+ case DATA:
+ if (value == null) {
+ unsetData();
+ } else {
+ setData((Map<ByteBuffer,ByteBuffer>)value);
+ }
+ break;
+
+ case ANNOTATIONS:
+ if (value == null) {
+ unsetAnnotations();
+ } else {
+ setAnnotations((List<Annotation>)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case SENDER:
+ return getSender();
+
+ case SVC:
+ return getSvc();
+
+ case TRACE_ID:
+ return Long.valueOf(getTraceId());
+
+ case SPAN_ID:
+ return Long.valueOf(getSpanId());
+
+ case PARENT_ID:
+ return Long.valueOf(getParentId());
+
+ case START:
+ return Long.valueOf(getStart());
+
+ case STOP:
+ return Long.valueOf(getStop());
+
+ case DESCRIPTION:
+ return getDescription();
+
+ case DATA:
+ return getData();
+
+ case ANNOTATIONS:
+ return getAnnotations();
+
+ }
+ 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 SENDER:
+ return isSetSender();
+ case SVC:
+ return isSetSvc();
+ case TRACE_ID:
+ return isSetTraceId();
+ case SPAN_ID:
+ return isSetSpanId();
+ case PARENT_ID:
+ return isSetParentId();
+ case START:
+ return isSetStart();
+ case STOP:
+ return isSetStop();
+ case DESCRIPTION:
+ return isSetDescription();
+ case DATA:
+ return isSetData();
+ case ANNOTATIONS:
+ return isSetAnnotations();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof RemoteSpan)
+ return this.equals((RemoteSpan)that);
+ return false;
+ }
+
+ public boolean equals(RemoteSpan that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_sender = true && this.isSetSender();
+ boolean that_present_sender = true && that.isSetSender();
+ if (this_present_sender || that_present_sender) {
+ if (!(this_present_sender && that_present_sender))
+ return false;
+ if (!this.sender.equals(that.sender))
+ return false;
+ }
+
+ boolean this_present_svc = true && this.isSetSvc();
+ boolean that_present_svc = true && that.isSetSvc();
+ if (this_present_svc || that_present_svc) {
+ if (!(this_present_svc && that_present_svc))
+ return false;
+ if (!this.svc.equals(that.svc))
+ return false;
+ }
+
+ boolean this_present_traceId = true;
+ boolean that_present_traceId = true;
+ if (this_present_traceId || that_present_traceId) {
+ if (!(this_present_traceId && that_present_traceId))
+ return false;
+ if (this.traceId != that.traceId)
+ return false;
+ }
+
+ boolean this_present_spanId = true;
+ boolean that_present_spanId = true;
+ if (this_present_spanId || that_present_spanId) {
+ if (!(this_present_spanId && that_present_spanId))
+ return false;
+ if (this.spanId != that.spanId)
+ return false;
+ }
+
+ boolean this_present_parentId = true;
+ boolean that_present_parentId = true;
+ if (this_present_parentId || that_present_parentId) {
+ if (!(this_present_parentId && that_present_parentId))
+ return false;
+ if (this.parentId != that.parentId)
+ return false;
+ }
+
+ boolean this_present_start = true;
+ boolean that_present_start = true;
+ if (this_present_start || that_present_start) {
+ if (!(this_present_start && that_present_start))
+ return false;
+ if (this.start != that.start)
+ return false;
+ }
+
+ boolean this_present_stop = true;
+ boolean that_present_stop = true;
+ if (this_present_stop || that_present_stop) {
+ if (!(this_present_stop && that_present_stop))
+ return false;
+ if (this.stop != that.stop)
+ return false;
+ }
+
+ boolean this_present_description = true && this.isSetDescription();
+ boolean that_present_description = true && that.isSetDescription();
+ if (this_present_description || that_present_description) {
+ if (!(this_present_description && that_present_description))
+ return false;
+ if (!this.description.equals(that.description))
+ return false;
+ }
+
+ boolean this_present_data = true && this.isSetData();
+ boolean that_present_data = true && that.isSetData();
+ if (this_present_data || that_present_data) {
+ if (!(this_present_data && that_present_data))
+ return false;
+ if (!this.data.equals(that.data))
+ return false;
+ }
+
+ boolean this_present_annotations = true && this.isSetAnnotations();
+ boolean that_present_annotations = true && that.isSetAnnotations();
+ if (this_present_annotations || that_present_annotations) {
+ if (!(this_present_annotations && that_present_annotations))
+ return false;
+ if (!this.annotations.equals(that.annotations))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(RemoteSpan other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetSender()).compareTo(other.isSetSender());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSender()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sender, other.sender);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetSvc()).compareTo(other.isSetSvc());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSvc()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.svc, other.svc);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetTraceId()).compareTo(other.isSetTraceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTraceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.traceId, other.traceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSpanId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spanId, other.spanId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetParentId()).compareTo(other.isSetParentId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetParentId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parentId, other.parentId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetStart()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, other.start);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetStop()).compareTo(other.isSetStop());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetStop()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stop, other.stop);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDescription()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetData()).compareTo(other.isSetData());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetData()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, other.data);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetAnnotations()).compareTo(other.isSetAnnotations());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAnnotations()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.annotations, other.annotations);
+ 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("RemoteSpan(");
+ boolean first = true;
+
+ sb.append("sender:");
+ if (this.sender == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.sender);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("svc:");
+ if (this.svc == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.svc);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("traceId:");
+ sb.append(this.traceId);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("spanId:");
+ sb.append(this.spanId);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("parentId:");
+ sb.append(this.parentId);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("start:");
+ sb.append(this.start);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("stop:");
+ sb.append(this.stop);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("description:");
+ if (this.description == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.description);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("data:");
+ if (this.data == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.data);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("annotations:");
+ if (this.annotations == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.annotations);
+ }
+ 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 {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bitfield = 0;
+ 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 RemoteSpanStandardSchemeFactory implements SchemeFactory {
+ public RemoteSpanStandardScheme getScheme() {
+ return new RemoteSpanStandardScheme();
+ }
+ }
+
+ private static class RemoteSpanStandardScheme extends StandardScheme<RemoteSpan> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteSpan 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: // SENDER
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.sender = iprot.readString();
+ struct.setSenderIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // SVC
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.svc = iprot.readString();
+ struct.setSvcIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // TRACE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.traceId = iprot.readI64();
+ struct.setTraceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // SPAN_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.spanId = iprot.readI64();
+ struct.setSpanIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // PARENT_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.parentId = iprot.readI64();
+ struct.setParentIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // START
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.start = iprot.readI64();
+ struct.setStartIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 7: // STOP
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.stop = iprot.readI64();
+ struct.setStopIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // DESCRIPTION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.description = iprot.readString();
+ struct.setDescriptionIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 10: // DATA
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
+ struct.data = new HashMap<ByteBuffer,ByteBuffer>(2*_map0.size);
+ for (int _i1 = 0; _i1 < _map0.size; ++_i1)
+ {
+ ByteBuffer _key2;
+ ByteBuffer _val3;
+ _key2 = iprot.readBinary();
+ _val3 = iprot.readBinary();
+ struct.data.put(_key2, _val3);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setDataIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 11: // ANNOTATIONS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
+ struct.annotations = new ArrayList<Annotation>(_list4.size);
+ for (int _i5 = 0; _i5 < _list4.size; ++_i5)
+ {
+ Annotation _elem6;
+ _elem6 = new Annotation();
+ _elem6.read(iprot);
+ struct.annotations.add(_elem6);
+ }
+ iprot.readListEnd();
+ }
+ struct.setAnnotationsIsSet(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, RemoteSpan struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.sender != null) {
+ oprot.writeFieldBegin(SENDER_FIELD_DESC);
+ oprot.writeString(struct.sender);
+ oprot.writeFieldEnd();
+ }
+ if (struct.svc != null) {
+ oprot.writeFieldBegin(SVC_FIELD_DESC);
+ oprot.writeString(struct.svc);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(TRACE_ID_FIELD_DESC);
+ oprot.writeI64(struct.traceId);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(SPAN_ID_FIELD_DESC);
+ oprot.writeI64(struct.spanId);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(PARENT_ID_FIELD_DESC);
+ oprot.writeI64(struct.parentId);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(START_FIELD_DESC);
+ oprot.writeI64(struct.start);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(STOP_FIELD_DESC);
+ oprot.writeI64(struct.stop);
+ oprot.writeFieldEnd();
+ if (struct.description != null) {
+ oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
+ oprot.writeString(struct.description);
+ oprot.writeFieldEnd();
+ }
+ if (struct.data != null) {
+ oprot.writeFieldBegin(DATA_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.data.size()));
+ for (Map.Entry<ByteBuffer, ByteBuffer> _iter7 : struct.data.entrySet())
+ {
+ oprot.writeBinary(_iter7.getKey());
+ oprot.writeBinary(_iter7.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.annotations != null) {
+ oprot.writeFieldBegin(ANNOTATIONS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.annotations.size()));
+ for (Annotation _iter8 : struct.annotations)
+ {
+ _iter8.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class RemoteSpanTupleSchemeFactory implements SchemeFactory {
+ public RemoteSpanTupleScheme getScheme() {
+ return new RemoteSpanTupleScheme();
+ }
+ }
+
+ private static class RemoteSpanTupleScheme extends TupleScheme<RemoteSpan> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, RemoteSpan struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetSender()) {
+ optionals.set(0);
+ }
+ if (struct.isSetSvc()) {
+ optionals.set(1);
+ }
+ if (struct.isSetTraceId()) {
+ optionals.set(2);
+ }
+ if (struct.isSetSpanId()) {
+ optionals.set(3);
+ }
+ if (struct.isSetParentId()) {
+ optionals.set(4);
+ }
+ if (struct.isSetStart()) {
+ optionals.set(5);
+ }
+ if (struct.isSetStop()) {
+ optionals.set(6);
+ }
+ if (struct.isSetDescription()) {
+ optionals.set(7);
+ }
+ if (struct.isSetData()) {
+ optionals.set(8);
+ }
+ if (struct.isSetAnnotations()) {
+ optionals.set(9);
+ }
+ oprot.writeBitSet(optionals, 10);
+ if (struct.isSetSender()) {
+ oprot.writeString(struct.sender);
+ }
+ if (struct.isSetSvc()) {
+ oprot.writeString(struct.svc);
+ }
+ if (struct.isSetTraceId()) {
+ oprot.writeI64(struct.traceId);
+ }
+ if (struct.isSetSpanId()) {
+ oprot.writeI64(struct.spanId);
+ }
+ if (struct.isSetParentId()) {
+ oprot.writeI64(struct.parentId);
+ }
+ if (struct.isSetStart()) {
+ oprot.writeI64(struct.start);
+ }
+ if (struct.isSetStop()) {
+ oprot.writeI64(struct.stop);
+ }
+ if (struct.isSetDescription()) {
+ oprot.writeString(struct.description);
+ }
+ if (struct.isSetData()) {
+ {
+ oprot.writeI32(struct.data.size());
+ for (Map.Entry<ByteBuffer, ByteBuffer> _iter9 : struct.data.entrySet())
+ {
+ oprot.writeBinary(_iter9.getKey());
+ oprot.writeBinary(_iter9.getValue());
+ }
+ }
+ }
+ if (struct.isSetAnnotations()) {
+ {
+ oprot.writeI32(struct.annotations.size());
+ for (Annotation _iter10 : struct.annotations)
+ {
+ _iter10.write(oprot);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, RemoteSpan struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(10);
+ if (incoming.get(0)) {
+ struct.sender = iprot.readString();
+ struct.setSenderIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.svc = iprot.readString();
+ struct.setSvcIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.traceId = iprot.readI64();
+ struct.setTraceIdIsSet(true);
+ }
+ if (incoming.get(3)) {
+ struct.spanId = iprot.readI64();
+ struct.setSpanIdIsSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.parentId = iprot.readI64();
+ struct.setParentIdIsSet(true);
+ }
+ if (incoming.get(5)) {
+ struct.start = iprot.readI64();
+ struct.setStartIsSet(true);
+ }
+ if (incoming.get(6)) {
+ struct.stop = iprot.readI64();
+ struct.setStopIsSet(true);
+ }
+ if (incoming.get(7)) {
+ struct.description = iprot.readString();
+ struct.setDescriptionIsSet(true);
+ }
+ if (incoming.get(8)) {
+ {
+ org.apache.thrift.protocol.TMap _map11 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.data = new HashMap<ByteBuffer,ByteBuffer>(2*_map11.size);
+ for (int _i12 = 0; _i12 < _map11.size; ++_i12)
+ {
+ ByteBuffer _key13;
+ ByteBuffer _val14;
+ _key13 = iprot.readBinary();
+ _val14 = iprot.readBinary();
+ struct.data.put(_key13, _val14);
+ }
+ }
+ struct.setDataIsSet(true);
+ }
+ if (incoming.get(9)) {
+ {
+ org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.annotations = new ArrayList<Annotation>(_list15.size);
+ for (int _i16 = 0; _i16 < _list15.size; ++_i16)
+ {
+ Annotation _elem17;
+ _elem17 = new Annotation();
+ _elem17.read(iprot);
+ struct.annotations.add(_elem17);
+ }
+ }
+ struct.setAnnotationsIsSet(true);
+ }
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java
new file mode 100644
index 0000000..7cd7c0d
--- /dev/null
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java
@@ -0,0 +1,588 @@
+/*
+ * 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.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.tracer.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 SpanReceiver {
+
+ public interface Iface {
+
+ public void span(RemoteSpan span) throws org.apache.thrift.TException;
+
+ }
+
+ public interface AsyncIface {
+
+ public void span(RemoteSpan span, 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 void span(RemoteSpan span) throws org.apache.thrift.TException
+ {
+ send_span(span);
+ }
+
+ public void send_span(RemoteSpan span) throws org.apache.thrift.TException
+ {
+ span_args args = new span_args();
+ args.setSpan(span);
+ sendBase("span", args);
+ }
+
+ }
+ 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 span(RemoteSpan span, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ span_call method_call = new span_call(span, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class span_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private RemoteSpan span;
+ public span_call(RemoteSpan span, 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, true);
+ this.span = span;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("span", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ span_args args = new span_args();
+ args.setSpan(span);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public void getResult() throws 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);
+ }
+ }
+
+ }
+
+ 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("span", new span());
+ return processMap;
+ }
+
+ public static class span<I extends Iface> extends org.apache.thrift.ProcessFunction<I, span_args> {
+ public span() {
+ super("span");
+ }
+
+ public span_args getEmptyArgsInstance() {
+ return new span_args();
+ }
+
+ protected boolean isOneway() {
+ return true;
+ }
+
+ public org.apache.thrift.TBase getResult(I iface, span_args args) throws org.apache.thrift.TException {
+ iface.span(args.span);
+ return null;
+ }
+ }
+
+ }
+
+ 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("span", new span());
+ return processMap;
+ }
+
+ public static class span<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, span_args, Void> {
+ public span() {
+ super("span");
+ }
+
+ public span_args getEmptyArgsInstance() {
+ return new span_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ }
+ public void onError(Exception e) {
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return true;
+ }
+
+ public void start(I iface, span_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.span(args.span,resultHandler);
+ }
+ }
+
+ }
+
+ public static class span_args implements org.apache.thrift.TBase<span_args, span_args._Fields>, java.io.Serializable, Cloneable, Comparable<span_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("span_args");
+
+ private static final org.apache.thrift.protocol.TField SPAN_FIELD_DESC = new org.apache.thrift.protocol.TField("span", 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 span_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new span_argsTupleSchemeFactory());
+ }
+
+ public RemoteSpan span; // 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 {
+ SPAN((short)1, "span");
+
+ 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: // SPAN
+ return SPAN;
+ 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.SPAN, new org.apache.thrift.meta_data.FieldMetaData("span", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RemoteSpan.class)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(span_args.class, metaDataMap);
+ }
+
+ public span_args() {
+ }
+
+ public span_args(
+ RemoteSpan span)
+ {
+ this();
+ this.span = span;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public span_args(span_args other) {
+ if (other.isSetSpan()) {
+ this.span = new RemoteSpan(other.span);
+ }
+ }
+
+ public span_args deepCopy() {
+ return new span_args(this);
+ }
+
+ @Override
+ public void clear() {
+ this.span = null;
+ }
+
+ public RemoteSpan getSpan() {
+ return this.span;
+ }
+
+ public span_args setSpan(RemoteSpan span) {
+ this.span = span;
+ return this;
+ }
+
+ public void unsetSpan() {
+ this.span = null;
+ }
+
+ /** Returns true if field span is set (has been assigned a value) and false otherwise */
+ public boolean isSetSpan() {
+ return this.span != null;
+ }
+
+ public void setSpanIsSet(boolean value) {
+ if (!value) {
+ this.span = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case SPAN:
+ if (value == null) {
+ unsetSpan();
+ } else {
+ setSpan((RemoteSpan)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case SPAN:
+ return getSpan();
+
+ }
+ 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 SPAN:
+ return isSetSpan();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof span_args)
+ return this.equals((span_args)that);
+ return false;
+ }
+
+ public boolean equals(span_args that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_span = true && this.isSetSpan();
+ boolean that_present_span = true && that.isSetSpan();
+ if (this_present_span || that_present_span) {
+ if (!(this_present_span && that_present_span))
+ return false;
+ if (!this.span.equals(that.span))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(span_args other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetSpan()).compareTo(other.isSetSpan());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSpan()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.span, other.span);
+ 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("span_args(");
+ boolean first = true;
+
+ sb.append("span:");
+ if (this.span == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.span);
+ }
+ 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 (span != null) {
+ span.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 span_argsStandardSchemeFactory implements SchemeFactory {
+ public span_argsStandardScheme getScheme() {
+ return new span_argsStandardScheme();
+ }
+ }
+
+ private static class span_argsStandardScheme extends StandardScheme<span_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, span_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: // SPAN
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.span = new RemoteSpan();
+ struct.span.read(iprot);
+ struct.setSpanIsSet(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, span_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.span != null) {
+ oprot.writeFieldBegin(SPAN_FIELD_DESC);
+ struct.span.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class span_argsTupleSchemeFactory implements SchemeFactory {
+ public span_argsTupleScheme getScheme() {
+ return new span_argsTupleScheme();
+ }
+ }
+
+ private static class span_argsTupleScheme extends TupleScheme<span_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, span_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetSpan()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetSpan()) {
+ struct.span.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, span_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.span = new RemoteSpan();
+ struct.span.read(iprot);
+ struct.setSpanIsSet(true);
+ }
+ }
+ }
+
+ }
+
+}