Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 367109C53 for ; Mon, 25 Jun 2012 17:10:34 +0000 (UTC) Received: (qmail 44417 invoked by uid 500); 25 Jun 2012 17:10:34 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 44394 invoked by uid 500); 25 Jun 2012 17:10:34 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 44387 invoked by uid 99); 25 Jun 2012 17:10:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2012 17:10:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2012 17:10:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BB312238899C for ; Mon, 25 Jun 2012 17:09:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1353663 [3/6] - in /accumulo/branches/ACCUMULO-259: ./ bin/ conf/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/512MB/native-standalone/ conf/examples/512MB/standalone/ core/ core/src/main/java/org/apache... Date: Mon, 25 Jun 2012 17:09:39 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120625170950.BB312238899C@eris.apache.org> Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java?rev=1353663&r1=1353662&r2=1353663&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java Mon Jun 25 17:09:31 2012 @@ -60,8 +60,6 @@ import org.slf4j.LoggerFactory; public void compact(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws org.apache.thrift.TException; - public void useLoggers(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, Set loggers) throws org.apache.thrift.TException; - public org.apache.accumulo.core.master.thrift.TabletServerStatus getTabletServerStatus(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException; public List getTabletStats(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, String tableId) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException; @@ -74,6 +72,8 @@ import org.slf4j.LoggerFactory; public List getActiveScans(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException; + public void removeLogs(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, List filenames) throws org.apache.thrift.TException; + } public interface AsyncIface extends org.apache.accumulo.core.client.impl.thrift.ClientService .AsyncIface { @@ -114,8 +114,6 @@ import org.slf4j.LoggerFactory; public void compact(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void useLoggers(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, Set loggers, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getTabletServerStatus(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getTabletStats(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, String tableId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -128,6 +126,8 @@ import org.slf4j.LoggerFactory; public void getActiveScans(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void removeLogs(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, List filenames, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + } public static class Client extends org.apache.accumulo.core.client.impl.thrift.ClientService.Client implements org.apache.thrift.TServiceClient, Iface { @@ -732,23 +732,6 @@ import org.slf4j.LoggerFactory; oprot_.getTransport().flush(); } - public void useLoggers(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, Set loggers) throws org.apache.thrift.TException - { - send_useLoggers(tinfo, credentials, loggers); - } - - public void send_useLoggers(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, Set loggers) throws org.apache.thrift.TException - { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("useLoggers", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); - useLoggers_args args = new useLoggers_args(); - args.setTinfo(tinfo); - args.setCredentials(credentials); - args.setLoggers(loggers); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); - } - public org.apache.accumulo.core.master.thrift.TabletServerStatus getTabletServerStatus(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException { send_getTabletServerStatus(tinfo, credentials); @@ -965,6 +948,23 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getActiveScans failed: unknown result"); } + public void removeLogs(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, List filenames) throws org.apache.thrift.TException + { + send_removeLogs(tinfo, credentials, filenames); + } + + public void send_removeLogs(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, List filenames) throws org.apache.thrift.TException + { + oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("removeLogs", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); + removeLogs_args args = new removeLogs_args(); + args.setTinfo(tinfo); + args.setCredentials(credentials); + args.setFilenames(filenames); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); + } + } public static class AsyncClient extends org.apache.accumulo.core.client.impl.thrift.ClientService.AsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { @@ -1728,43 +1728,6 @@ import org.slf4j.LoggerFactory; } } - public void useLoggers(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, Set loggers, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - checkReady(); - useLoggers_call method_call = new useLoggers_call(tinfo, credentials, loggers, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); - } - - public static class useLoggers_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.accumulo.cloudtrace.thrift.TInfo tinfo; - private org.apache.accumulo.core.security.thrift.AuthInfo credentials; - private Set loggers; - public useLoggers_call(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, Set loggers, 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; - this.loggers = loggers; - } - - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("useLoggers", org.apache.thrift.protocol.TMessageType.CALL, 0)); - useLoggers_args args = new useLoggers_args(); - args.setTinfo(tinfo); - args.setCredentials(credentials); - args.setLoggers(loggers); - 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 void getTabletServerStatus(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getTabletServerStatus_call method_call = new getTabletServerStatus_call(tinfo, credentials, resultHandler, this, protocolFactory, transport); @@ -1983,6 +1946,43 @@ import org.slf4j.LoggerFactory; } } + public void removeLogs(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, List filenames, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + removeLogs_call method_call = new removeLogs_call(tinfo, credentials, filenames, resultHandler, this, protocolFactory, transport); + this.currentMethod = method_call; + manager.call(method_call); + } + + public static class removeLogs_call extends org.apache.thrift.async.TAsyncMethodCall { + private org.apache.accumulo.cloudtrace.thrift.TInfo tinfo; + private org.apache.accumulo.core.security.thrift.AuthInfo credentials; + private List filenames; + public removeLogs_call(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.AuthInfo credentials, List filenames, 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; + this.filenames = filenames; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("removeLogs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + removeLogs_args args = new removeLogs_args(); + args.setTinfo(tinfo); + args.setCredentials(credentials); + args.setFilenames(filenames); + 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 extends org.apache.accumulo.core.client.impl.thrift.ClientService.Processor implements org.apache.thrift.TProcessor { @@ -2009,13 +2009,13 @@ import org.slf4j.LoggerFactory; processMap_.put("flushTablet", new flushTablet()); processMap_.put("chop", new chop()); processMap_.put("compact", new compact()); - processMap_.put("useLoggers", new useLoggers()); processMap_.put("getTabletServerStatus", new getTabletServerStatus()); processMap_.put("getTabletStats", new getTabletStats()); processMap_.put("getHistoricalStats", new getHistoricalStats()); processMap_.put("halt", new halt()); processMap_.put("fastHalt", new fastHalt()); processMap_.put("getActiveScans", new getActiveScans()); + processMap_.put("removeLogs", new removeLogs()); } private Iface iface_; @@ -2601,27 +2601,6 @@ import org.slf4j.LoggerFactory; } } - private class useLoggers implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - useLoggers_args args = new useLoggers_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("useLoggers", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); - iface_.useLoggers(args.tinfo, args.credentials, args.loggers); - return; - } - } - private class getTabletServerStatus implements ProcessFunction { public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { @@ -2833,6 +2812,27 @@ import org.slf4j.LoggerFactory; } + private class removeLogs implements ProcessFunction { + public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException + { + removeLogs_args args = new removeLogs_args(); + try { + args.read(iprot); + } catch (org.apache.thrift.protocol.TProtocolException e) { + iprot.readMessageEnd(); + org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("removeLogs", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); + iface_.removeLogs(args.tinfo, args.credentials, args.filenames); + return; + } + } + } public static class startScan_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { @@ -18291,22 +18291,19 @@ import org.slf4j.LoggerFactory; } - public static class useLoggers_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("useLoggers_args"); + public static class getTabletServerStatus_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTabletServerStatus_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)3); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField LOGGERS_FIELD_DESC = new org.apache.thrift.protocol.TField("loggers", org.apache.thrift.protocol.TType.SET, (short)2); public org.apache.accumulo.cloudtrace.thrift.TInfo tinfo; public org.apache.accumulo.core.security.thrift.AuthInfo credentials; - public Set loggers; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)3, "tinfo"), - CREDENTIALS((short)1, "credentials"), - LOGGERS((short)2, "loggers"); + CREDENTIALS((short)1, "credentials"); private static final Map byName = new HashMap(); @@ -18325,8 +18322,6 @@ import org.slf4j.LoggerFactory; return TINFO; case 1: // CREDENTIALS return CREDENTIALS; - case 2: // LOGGERS - return LOGGERS; default: return null; } @@ -18375,62 +18370,49 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.cloudtrace.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.AuthInfo.class))); - tmpMap.put(_Fields.LOGGERS, new org.apache.thrift.meta_data.FieldMetaData("loggers", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(useLoggers_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTabletServerStatus_args.class, metaDataMap); } - public useLoggers_args() { + public getTabletServerStatus_args() { } - public useLoggers_args( + public getTabletServerStatus_args( org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, - org.apache.accumulo.core.security.thrift.AuthInfo credentials, - Set loggers) + org.apache.accumulo.core.security.thrift.AuthInfo credentials) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.loggers = loggers; } /** * Performs a deep copy on other. */ - public useLoggers_args(useLoggers_args other) { + public getTabletServerStatus_args(getTabletServerStatus_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo(other.credentials); } - if (other.isSetLoggers()) { - Set __this__loggers = new HashSet(); - for (String other_element : other.loggers) { - __this__loggers.add(other_element); - } - this.loggers = __this__loggers; - } } - public useLoggers_args deepCopy() { - return new useLoggers_args(this); + public getTabletServerStatus_args deepCopy() { + return new getTabletServerStatus_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - this.loggers = null; } public org.apache.accumulo.cloudtrace.thrift.TInfo getTinfo() { return this.tinfo; } - public useLoggers_args setTinfo(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo) { + public getTabletServerStatus_args setTinfo(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -18454,7 +18436,7 @@ import org.slf4j.LoggerFactory; return this.credentials; } - public useLoggers_args setCredentials(org.apache.accumulo.core.security.thrift.AuthInfo credentials) { + public getTabletServerStatus_args setCredentials(org.apache.accumulo.core.security.thrift.AuthInfo credentials) { this.credentials = credentials; return this; } @@ -18474,45 +18456,6 @@ import org.slf4j.LoggerFactory; } } - public int getLoggersSize() { - return (this.loggers == null) ? 0 : this.loggers.size(); - } - - public java.util.Iterator getLoggersIterator() { - return (this.loggers == null) ? null : this.loggers.iterator(); - } - - public void addToLoggers(String elem) { - if (this.loggers == null) { - this.loggers = new HashSet(); - } - this.loggers.add(elem); - } - - public Set getLoggers() { - return this.loggers; - } - - public useLoggers_args setLoggers(Set loggers) { - this.loggers = loggers; - return this; - } - - public void unsetLoggers() { - this.loggers = null; - } - - /** Returns true if field loggers is set (has been assigned a value) and false otherwise */ - public boolean isSetLoggers() { - return this.loggers != null; - } - - public void setLoggersIsSet(boolean value) { - if (!value) { - this.loggers = null; - } - } - public void setFieldValue(_Fields field, Object value) { switch (field) { case TINFO: @@ -18531,14 +18474,6 @@ import org.slf4j.LoggerFactory; } break; - case LOGGERS: - if (value == null) { - unsetLoggers(); - } else { - setLoggers((Set)value); - } - break; - } } @@ -18550,9 +18485,6 @@ import org.slf4j.LoggerFactory; case CREDENTIALS: return getCredentials(); - case LOGGERS: - return getLoggers(); - } throw new IllegalStateException(); } @@ -18568,8 +18500,6 @@ import org.slf4j.LoggerFactory; return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case LOGGERS: - return isSetLoggers(); } throw new IllegalStateException(); } @@ -18578,12 +18508,12 @@ import org.slf4j.LoggerFactory; public boolean equals(Object that) { if (that == null) return false; - if (that instanceof useLoggers_args) - return this.equals((useLoggers_args)that); + if (that instanceof getTabletServerStatus_args) + return this.equals((getTabletServerStatus_args)that); return false; } - public boolean equals(useLoggers_args that) { + public boolean equals(getTabletServerStatus_args that) { if (that == null) return false; @@ -18605,15 +18535,6 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_loggers = true && this.isSetLoggers(); - boolean that_present_loggers = true && that.isSetLoggers(); - if (this_present_loggers || that_present_loggers) { - if (!(this_present_loggers && that_present_loggers)) - return false; - if (!this.loggers.equals(that.loggers)) - return false; - } - return true; } @@ -18622,13 +18543,13 @@ import org.slf4j.LoggerFactory; return 0; } - public int compareTo(useLoggers_args other) { + public int compareTo(getTabletServerStatus_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - useLoggers_args typedOther = (useLoggers_args)other; + getTabletServerStatus_args typedOther = (getTabletServerStatus_args)other; lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(typedOther.isSetTinfo()); if (lastComparison != 0) { @@ -18650,16 +18571,6 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLoggers()).compareTo(typedOther.isSetLoggers()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLoggers()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loggers, typedOther.loggers); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -18693,23 +18604,6 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; - case 2: // LOGGERS - if (field.type == org.apache.thrift.protocol.TType.SET) { - { - org.apache.thrift.protocol.TSet _set106 = iprot.readSetBegin(); - this.loggers = new HashSet(2*_set106.size); - for (int _i107 = 0; _i107 < _set106.size; ++_i107) - { - String _elem108; - _elem108 = iprot.readString(); - this.loggers.add(_elem108); - } - iprot.readSetEnd(); - } - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } @@ -18730,18 +18624,6 @@ import org.slf4j.LoggerFactory; this.credentials.write(oprot); oprot.writeFieldEnd(); } - if (this.loggers != null) { - oprot.writeFieldBegin(LOGGERS_FIELD_DESC); - { - oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, this.loggers.size())); - for (String _iter109 : this.loggers) - { - oprot.writeString(_iter109); - } - oprot.writeSetEnd(); - } - oprot.writeFieldEnd(); - } if (this.tinfo != null) { oprot.writeFieldBegin(TINFO_FIELD_DESC); this.tinfo.write(oprot); @@ -18753,7 +18635,7 @@ import org.slf4j.LoggerFactory; @Override public String toString() { - StringBuilder sb = new StringBuilder("useLoggers_args("); + StringBuilder sb = new StringBuilder("getTabletServerStatus_args("); boolean first = true; sb.append("tinfo:"); @@ -18771,14 +18653,6 @@ import org.slf4j.LoggerFactory; sb.append(this.credentials); } first = false; - if (!first) sb.append(", "); - sb.append("loggers:"); - if (this.loggers == null) { - sb.append("null"); - } else { - sb.append(this.loggers); - } - first = false; sb.append(")"); return sb.toString(); } @@ -18805,19 +18679,19 @@ import org.slf4j.LoggerFactory; } - public static class getTabletServerStatus_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTabletServerStatus_args"); + public static class getTabletServerStatus_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTabletServerStatus_result"); - 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)3); - private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public org.apache.accumulo.cloudtrace.thrift.TInfo tinfo; - public org.apache.accumulo.core.security.thrift.AuthInfo credentials; + public org.apache.accumulo.core.master.thrift.TabletServerStatus success; + public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - TINFO((short)3, "tinfo"), - CREDENTIALS((short)1, "credentials"); + SUCCESS((short)0, "success"), + SEC((short)1, "sec"); private static final Map byName = new HashMap(); @@ -18832,10 +18706,10 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 3: // TINFO - return TINFO; - case 1: // CREDENTIALS - return CREDENTIALS; + case 0: // SUCCESS + return SUCCESS; + case 1: // SEC + return SEC; default: return null; } @@ -18880,111 +18754,111 @@ import org.slf4j.LoggerFactory; 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.cloudtrace.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.AuthInfo.class))); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.master.thrift.TabletServerStatus.class))); + tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTabletServerStatus_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTabletServerStatus_result.class, metaDataMap); } - public getTabletServerStatus_args() { + public getTabletServerStatus_result() { } - public getTabletServerStatus_args( - org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, - org.apache.accumulo.core.security.thrift.AuthInfo credentials) + public getTabletServerStatus_result( + org.apache.accumulo.core.master.thrift.TabletServerStatus success, + org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) { this(); - this.tinfo = tinfo; - this.credentials = credentials; + this.success = success; + this.sec = sec; } /** * Performs a deep copy on other. */ - public getTabletServerStatus_args(getTabletServerStatus_args other) { - if (other.isSetTinfo()) { - this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); + public getTabletServerStatus_result(getTabletServerStatus_result other) { + if (other.isSetSuccess()) { + this.success = new org.apache.accumulo.core.master.thrift.TabletServerStatus(other.success); } - if (other.isSetCredentials()) { - this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo(other.credentials); + if (other.isSetSec()) { + this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(other.sec); } } - public getTabletServerStatus_args deepCopy() { - return new getTabletServerStatus_args(this); + public getTabletServerStatus_result deepCopy() { + return new getTabletServerStatus_result(this); } @Override public void clear() { - this.tinfo = null; - this.credentials = null; + this.success = null; + this.sec = null; } - public org.apache.accumulo.cloudtrace.thrift.TInfo getTinfo() { - return this.tinfo; + public org.apache.accumulo.core.master.thrift.TabletServerStatus getSuccess() { + return this.success; } - public getTabletServerStatus_args setTinfo(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo) { - this.tinfo = tinfo; + public getTabletServerStatus_result setSuccess(org.apache.accumulo.core.master.thrift.TabletServerStatus success) { + this.success = success; return this; } - public void unsetTinfo() { - this.tinfo = null; + public void unsetSuccess() { + this.success = null; } - /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */ - public boolean isSetTinfo() { - return this.tinfo != null; + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return this.success != null; } - public void setTinfoIsSet(boolean value) { + public void setSuccessIsSet(boolean value) { if (!value) { - this.tinfo = null; + this.success = null; } } - public org.apache.accumulo.core.security.thrift.AuthInfo getCredentials() { - return this.credentials; + public org.apache.accumulo.core.security.thrift.ThriftSecurityException getSec() { + return this.sec; } - public getTabletServerStatus_args setCredentials(org.apache.accumulo.core.security.thrift.AuthInfo credentials) { - this.credentials = credentials; + public getTabletServerStatus_result setSec(org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) { + this.sec = sec; return this; } - public void unsetCredentials() { - this.credentials = null; + public void unsetSec() { + this.sec = null; } - /** Returns true if field credentials is set (has been assigned a value) and false otherwise */ - public boolean isSetCredentials() { - return this.credentials != null; + /** Returns true if field sec is set (has been assigned a value) and false otherwise */ + public boolean isSetSec() { + return this.sec != null; } - public void setCredentialsIsSet(boolean value) { + public void setSecIsSet(boolean value) { if (!value) { - this.credentials = null; + this.sec = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case TINFO: + case SUCCESS: if (value == null) { - unsetTinfo(); + unsetSuccess(); } else { - setTinfo((org.apache.accumulo.cloudtrace.thrift.TInfo)value); + setSuccess((org.apache.accumulo.core.master.thrift.TabletServerStatus)value); } break; - case CREDENTIALS: + case SEC: if (value == null) { - unsetCredentials(); + unsetSec(); } else { - setCredentials((org.apache.accumulo.core.security.thrift.AuthInfo)value); + setSec((org.apache.accumulo.core.security.thrift.ThriftSecurityException)value); } break; @@ -18993,11 +18867,11 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case TINFO: - return getTinfo(); + case SUCCESS: + return getSuccess(); - case CREDENTIALS: - return getCredentials(); + case SEC: + return getSec(); } throw new IllegalStateException(); @@ -19010,10 +18884,10 @@ import org.slf4j.LoggerFactory; } switch (field) { - case TINFO: - return isSetTinfo(); - case CREDENTIALS: - return isSetCredentials(); + case SUCCESS: + return isSetSuccess(); + case SEC: + return isSetSec(); } throw new IllegalStateException(); } @@ -19022,30 +18896,30 @@ import org.slf4j.LoggerFactory; public boolean equals(Object that) { if (that == null) return false; - if (that instanceof getTabletServerStatus_args) - return this.equals((getTabletServerStatus_args)that); + if (that instanceof getTabletServerStatus_result) + return this.equals((getTabletServerStatus_result)that); return false; } - public boolean equals(getTabletServerStatus_args that) { + public boolean equals(getTabletServerStatus_result 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)) + boolean this_present_success = true && this.isSetSuccess(); + boolean that_present_success = true && that.isSetSuccess(); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) return false; - if (!this.tinfo.equals(that.tinfo)) + if (!this.success.equals(that.success)) return false; } - boolean this_present_credentials = true && this.isSetCredentials(); - boolean that_present_credentials = true && that.isSetCredentials(); - if (this_present_credentials || that_present_credentials) { - if (!(this_present_credentials && that_present_credentials)) + boolean this_present_sec = true && this.isSetSec(); + boolean that_present_sec = true && that.isSetSec(); + if (this_present_sec || that_present_sec) { + if (!(this_present_sec && that_present_sec)) return false; - if (!this.credentials.equals(that.credentials)) + if (!this.sec.equals(that.sec)) return false; } @@ -19057,30 +18931,30 @@ import org.slf4j.LoggerFactory; return 0; } - public int compareTo(getTabletServerStatus_args other) { + public int compareTo(getTabletServerStatus_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getTabletServerStatus_args typedOther = (getTabletServerStatus_args)other; + getTabletServerStatus_result typedOther = (getTabletServerStatus_result)other; - lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(typedOther.isSetTinfo()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } - if (isSetTinfo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, typedOther.tinfo); + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials()); + lastComparison = Boolean.valueOf(isSetSec()).compareTo(typedOther.isSetSec()); if (lastComparison != 0) { return lastComparison; } - if (isSetCredentials()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials); + if (isSetSec()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, typedOther.sec); if (lastComparison != 0) { return lastComparison; } @@ -19102,18 +18976,18 @@ import org.slf4j.LoggerFactory; break; } switch (field.id) { - case 3: // TINFO + case 0: // SUCCESS if (field.type == org.apache.thrift.protocol.TType.STRUCT) { - this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(); - this.tinfo.read(iprot); + this.success = new org.apache.accumulo.core.master.thrift.TabletServerStatus(); + this.success.read(iprot); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; - case 1: // CREDENTIALS + case 1: // SEC if (field.type == org.apache.thrift.protocol.TType.STRUCT) { - this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo(); - this.credentials.read(iprot); + this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(); + this.sec.read(iprot); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } @@ -19130,17 +19004,15 @@ import org.slf4j.LoggerFactory; } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - validate(); - oprot.writeStructBegin(STRUCT_DESC); - if (this.credentials != null) { - oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC); - this.credentials.write(oprot); + + if (this.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + this.success.write(oprot); oprot.writeFieldEnd(); - } - if (this.tinfo != null) { - oprot.writeFieldBegin(TINFO_FIELD_DESC); - this.tinfo.write(oprot); + } else if (this.isSetSec()) { + oprot.writeFieldBegin(SEC_FIELD_DESC); + this.sec.write(oprot); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -19149,22 +19021,22 @@ import org.slf4j.LoggerFactory; @Override public String toString() { - StringBuilder sb = new StringBuilder("getTabletServerStatus_args("); + StringBuilder sb = new StringBuilder("getTabletServerStatus_result("); boolean first = true; - sb.append("tinfo:"); - if (this.tinfo == null) { + sb.append("success:"); + if (this.success == null) { sb.append("null"); } else { - sb.append(this.tinfo); + sb.append(this.success); } first = false; if (!first) sb.append(", "); - sb.append("credentials:"); - if (this.credentials == null) { + sb.append("sec:"); + if (this.sec == null) { sb.append("null"); } else { - sb.append(this.credentials); + sb.append(this.sec); } first = false; sb.append(")"); @@ -19193,19 +19065,22 @@ import org.slf4j.LoggerFactory; } - public static class getTabletServerStatus_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTabletServerStatus_result"); + public static class getTabletStats_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTabletStats_args"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); - private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); + 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)3); + private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.STRING, (short)2); - public org.apache.accumulo.core.master.thrift.TabletServerStatus success; - public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; + public org.apache.accumulo.cloudtrace.thrift.TInfo tinfo; + public org.apache.accumulo.core.security.thrift.AuthInfo credentials; + public String tableId; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - SUCCESS((short)0, "success"), - SEC((short)1, "sec"); + TINFO((short)3, "tinfo"), + CREDENTIALS((short)1, "credentials"), + TABLE_ID((short)2, "tableId"); private static final Map byName = new HashMap(); @@ -19220,10 +19095,12 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 0: // SUCCESS - return SUCCESS; - case 1: // SEC - return SEC; + case 3: // TINFO + return TINFO; + case 1: // CREDENTIALS + return CREDENTIALS; + case 2: // TABLE_ID + return TABLE_ID; default: return null; } @@ -19268,111 +19145,151 @@ import org.slf4j.LoggerFactory; 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.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.master.thrift.TabletServerStatus.class))); - tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + 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.cloudtrace.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.AuthInfo.class))); + tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", 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(getTabletServerStatus_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTabletStats_args.class, metaDataMap); } - public getTabletServerStatus_result() { + public getTabletStats_args() { } - public getTabletServerStatus_result( - org.apache.accumulo.core.master.thrift.TabletServerStatus success, - org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) + public getTabletStats_args( + org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, + org.apache.accumulo.core.security.thrift.AuthInfo credentials, + String tableId) { this(); - this.success = success; - this.sec = sec; + this.tinfo = tinfo; + this.credentials = credentials; + this.tableId = tableId; } /** * Performs a deep copy on other. */ - public getTabletServerStatus_result(getTabletServerStatus_result other) { - if (other.isSetSuccess()) { - this.success = new org.apache.accumulo.core.master.thrift.TabletServerStatus(other.success); + public getTabletStats_args(getTabletStats_args other) { + if (other.isSetTinfo()) { + this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } - if (other.isSetSec()) { - this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(other.sec); + if (other.isSetCredentials()) { + this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo(other.credentials); + } + if (other.isSetTableId()) { + this.tableId = other.tableId; } } - public getTabletServerStatus_result deepCopy() { - return new getTabletServerStatus_result(this); + public getTabletStats_args deepCopy() { + return new getTabletStats_args(this); } @Override public void clear() { - this.success = null; - this.sec = null; + this.tinfo = null; + this.credentials = null; + this.tableId = null; } - public org.apache.accumulo.core.master.thrift.TabletServerStatus getSuccess() { - return this.success; + public org.apache.accumulo.cloudtrace.thrift.TInfo getTinfo() { + return this.tinfo; } - public getTabletServerStatus_result setSuccess(org.apache.accumulo.core.master.thrift.TabletServerStatus success) { - this.success = success; + public getTabletStats_args setTinfo(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo) { + this.tinfo = tinfo; return this; } - public void unsetSuccess() { - this.success = null; + public void unsetTinfo() { + this.tinfo = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ - public boolean isSetSuccess() { - return this.success != 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 setSuccessIsSet(boolean value) { + public void setTinfoIsSet(boolean value) { if (!value) { - this.success = null; + this.tinfo = null; } } - public org.apache.accumulo.core.security.thrift.ThriftSecurityException getSec() { - return this.sec; + public org.apache.accumulo.core.security.thrift.AuthInfo getCredentials() { + return this.credentials; } - public getTabletServerStatus_result setSec(org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) { - this.sec = sec; + public getTabletStats_args setCredentials(org.apache.accumulo.core.security.thrift.AuthInfo credentials) { + this.credentials = credentials; return this; } - public void unsetSec() { - this.sec = null; + public void unsetCredentials() { + this.credentials = null; } - /** Returns true if field sec is set (has been assigned a value) and false otherwise */ - public boolean isSetSec() { - return this.sec != null; + /** Returns true if field credentials is set (has been assigned a value) and false otherwise */ + public boolean isSetCredentials() { + return this.credentials != null; } - public void setSecIsSet(boolean value) { + public void setCredentialsIsSet(boolean value) { if (!value) { - this.sec = null; + this.credentials = null; + } + } + + public String getTableId() { + return this.tableId; + } + + public getTabletStats_args setTableId(String tableId) { + this.tableId = tableId; + return this; + } + + public void unsetTableId() { + this.tableId = null; + } + + /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ + public boolean isSetTableId() { + return this.tableId != null; + } + + public void setTableIdIsSet(boolean value) { + if (!value) { + this.tableId = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case SUCCESS: + case TINFO: if (value == null) { - unsetSuccess(); + unsetTinfo(); } else { - setSuccess((org.apache.accumulo.core.master.thrift.TabletServerStatus)value); + setTinfo((org.apache.accumulo.cloudtrace.thrift.TInfo)value); } break; - case SEC: + case CREDENTIALS: if (value == null) { - unsetSec(); + unsetCredentials(); } else { - setSec((org.apache.accumulo.core.security.thrift.ThriftSecurityException)value); + setCredentials((org.apache.accumulo.core.security.thrift.AuthInfo)value); + } + break; + + case TABLE_ID: + if (value == null) { + unsetTableId(); + } else { + setTableId((String)value); } break; @@ -19381,11 +19298,14 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case SUCCESS: - return getSuccess(); + case TINFO: + return getTinfo(); - case SEC: - return getSec(); + case CREDENTIALS: + return getCredentials(); + + case TABLE_ID: + return getTableId(); } throw new IllegalStateException(); @@ -19398,10 +19318,12 @@ import org.slf4j.LoggerFactory; } switch (field) { - case SUCCESS: - return isSetSuccess(); - case SEC: - return isSetSec(); + case TINFO: + return isSetTinfo(); + case CREDENTIALS: + return isSetCredentials(); + case TABLE_ID: + return isSetTableId(); } throw new IllegalStateException(); } @@ -19410,30 +19332,39 @@ import org.slf4j.LoggerFactory; public boolean equals(Object that) { if (that == null) return false; - if (that instanceof getTabletServerStatus_result) - return this.equals((getTabletServerStatus_result)that); + if (that instanceof getTabletStats_args) + return this.equals((getTabletStats_args)that); return false; } - public boolean equals(getTabletServerStatus_result that) { + public boolean equals(getTabletStats_args that) { if (that == null) return false; - boolean this_present_success = true && this.isSetSuccess(); - boolean that_present_success = true && that.isSetSuccess(); - if (this_present_success || that_present_success) { - if (!(this_present_success && that_present_success)) + 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.success.equals(that.success)) + if (!this.tinfo.equals(that.tinfo)) return false; } - boolean this_present_sec = true && this.isSetSec(); - boolean that_present_sec = true && that.isSetSec(); - if (this_present_sec || that_present_sec) { - if (!(this_present_sec && that_present_sec)) + boolean this_present_credentials = true && this.isSetCredentials(); + boolean that_present_credentials = true && that.isSetCredentials(); + if (this_present_credentials || that_present_credentials) { + if (!(this_present_credentials && that_present_credentials)) return false; - if (!this.sec.equals(that.sec)) + if (!this.credentials.equals(that.credentials)) + return false; + } + + boolean this_present_tableId = true && this.isSetTableId(); + boolean that_present_tableId = true && that.isSetTableId(); + if (this_present_tableId || that_present_tableId) { + if (!(this_present_tableId && that_present_tableId)) + return false; + if (!this.tableId.equals(that.tableId)) return false; } @@ -19445,30 +19376,40 @@ import org.slf4j.LoggerFactory; return 0; } - public int compareTo(getTabletServerStatus_result other) { + public int compareTo(getTabletStats_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getTabletServerStatus_result typedOther = (getTabletServerStatus_result)other; + getTabletStats_args typedOther = (getTabletStats_args)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(typedOther.isSetTinfo()); if (lastComparison != 0) { return lastComparison; } - if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + if (isSetTinfo()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, typedOther.tinfo); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSec()).compareTo(typedOther.isSetSec()); + lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials()); if (lastComparison != 0) { return lastComparison; } - if (isSetSec()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, typedOther.sec); + if (isSetCredentials()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetTableId()).compareTo(typedOther.isSetTableId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTableId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, typedOther.tableId); if (lastComparison != 0) { return lastComparison; } @@ -19490,18 +19431,25 @@ import org.slf4j.LoggerFactory; break; } switch (field.id) { - case 0: // SUCCESS + case 3: // TINFO if (field.type == org.apache.thrift.protocol.TType.STRUCT) { - this.success = new org.apache.accumulo.core.master.thrift.TabletServerStatus(); - this.success.read(iprot); + this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(); + this.tinfo.read(iprot); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; - case 1: // SEC + case 1: // CREDENTIALS if (field.type == org.apache.thrift.protocol.TType.STRUCT) { - this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(); - this.sec.read(iprot); + this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo(); + this.credentials.read(iprot); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + } + break; + case 2: // TABLE_ID + if (field.type == org.apache.thrift.protocol.TType.STRING) { + this.tableId = iprot.readString(); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } @@ -19518,15 +19466,22 @@ import org.slf4j.LoggerFactory; } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - oprot.writeStructBegin(STRUCT_DESC); + validate(); - if (this.isSetSuccess()) { - oprot.writeFieldBegin(SUCCESS_FIELD_DESC); - this.success.write(oprot); + oprot.writeStructBegin(STRUCT_DESC); + if (this.credentials != null) { + oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC); + this.credentials.write(oprot); oprot.writeFieldEnd(); - } else if (this.isSetSec()) { - oprot.writeFieldBegin(SEC_FIELD_DESC); - this.sec.write(oprot); + } + if (this.tableId != null) { + oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); + oprot.writeString(this.tableId); + oprot.writeFieldEnd(); + } + if (this.tinfo != null) { + oprot.writeFieldBegin(TINFO_FIELD_DESC); + this.tinfo.write(oprot); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -19535,22 +19490,30 @@ import org.slf4j.LoggerFactory; @Override public String toString() { - StringBuilder sb = new StringBuilder("getTabletServerStatus_result("); + StringBuilder sb = new StringBuilder("getTabletStats_args("); boolean first = true; - sb.append("success:"); - if (this.success == null) { + sb.append("tinfo:"); + if (this.tinfo == null) { sb.append("null"); } else { - sb.append(this.success); + sb.append(this.tinfo); } first = false; if (!first) sb.append(", "); - sb.append("sec:"); - if (this.sec == null) { + sb.append("credentials:"); + if (this.credentials == null) { sb.append("null"); } else { - sb.append(this.sec); + sb.append(this.credentials); + } + first = false; + if (!first) sb.append(", "); + sb.append("tableId:"); + if (this.tableId == null) { + sb.append("null"); + } else { + sb.append(this.tableId); } first = false; sb.append(")"); @@ -19579,22 +19542,19 @@ import org.slf4j.LoggerFactory; } - public static class getTabletStats_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTabletStats_args"); + public static class getTabletStats_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTabletStats_result"); - 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)3); - private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); + private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public org.apache.accumulo.cloudtrace.thrift.TInfo tinfo; - public org.apache.accumulo.core.security.thrift.AuthInfo credentials; - public String tableId; + public List success; + public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - TINFO((short)3, "tinfo"), - CREDENTIALS((short)1, "credentials"), - TABLE_ID((short)2, "tableId"); + SUCCESS((short)0, "success"), + SEC((short)1, "sec"); private static final Map byName = new HashMap(); @@ -19609,12 +19569,10 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 3: // TINFO - return TINFO; - case 1: // CREDENTIALS - return CREDENTIALS; - case 2: // TABLE_ID - return TABLE_ID; + case 0: // SUCCESS + return SUCCESS; + case 1: // SEC + return SEC; default: return null; } @@ -19659,151 +19617,131 @@ import org.slf4j.LoggerFactory; 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.cloudtrace.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.AuthInfo.class))); - tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", 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, TabletStats.class)))); + tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTabletStats_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTabletStats_result.class, metaDataMap); } - public getTabletStats_args() { + public getTabletStats_result() { } - public getTabletStats_args( - org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, - org.apache.accumulo.core.security.thrift.AuthInfo credentials, - String tableId) + public getTabletStats_result( + List success, + org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) { this(); - this.tinfo = tinfo; - this.credentials = credentials; - this.tableId = tableId; + this.success = success; + this.sec = sec; } /** * Performs a deep copy on other. */ - public getTabletStats_args(getTabletStats_args other) { - if (other.isSetTinfo()) { - this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); - } - if (other.isSetCredentials()) { - this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo(other.credentials); + public getTabletStats_result(getTabletStats_result other) { + if (other.isSetSuccess()) { + List __this__success = new ArrayList(); + for (TabletStats other_element : other.success) { + __this__success.add(new TabletStats(other_element)); + } + this.success = __this__success; } - if (other.isSetTableId()) { - this.tableId = other.tableId; + if (other.isSetSec()) { + this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(other.sec); } } - public getTabletStats_args deepCopy() { - return new getTabletStats_args(this); + public getTabletStats_result deepCopy() { + return new getTabletStats_result(this); } @Override public void clear() { - this.tinfo = null; - this.credentials = null; - this.tableId = null; - } - - public org.apache.accumulo.cloudtrace.thrift.TInfo getTinfo() { - return this.tinfo; - } - - public getTabletStats_args setTinfo(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo) { - this.tinfo = tinfo; - return this; + this.success = null; + this.sec = null; } - public void unsetTinfo() { - this.tinfo = null; + public int getSuccessSize() { + return (this.success == null) ? 0 : this.success.size(); } - /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */ - public boolean isSetTinfo() { - return this.tinfo != null; + public java.util.Iterator getSuccessIterator() { + return (this.success == null) ? null : this.success.iterator(); } - public void setTinfoIsSet(boolean value) { - if (!value) { - this.tinfo = null; + public void addToSuccess(TabletStats elem) { + if (this.success == null) { + this.success = new ArrayList(); } + this.success.add(elem); } - public org.apache.accumulo.core.security.thrift.AuthInfo getCredentials() { - return this.credentials; + public List getSuccess() { + return this.success; } - public getTabletStats_args setCredentials(org.apache.accumulo.core.security.thrift.AuthInfo credentials) { - this.credentials = credentials; + public getTabletStats_result setSuccess(List success) { + this.success = success; return this; } - public void unsetCredentials() { - this.credentials = null; + public void unsetSuccess() { + this.success = null; } - /** Returns true if field credentials is set (has been assigned a value) and false otherwise */ - public boolean isSetCredentials() { - return this.credentials != null; + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return this.success != null; } - public void setCredentialsIsSet(boolean value) { + public void setSuccessIsSet(boolean value) { if (!value) { - this.credentials = null; + this.success = null; } } - public String getTableId() { - return this.tableId; + public org.apache.accumulo.core.security.thrift.ThriftSecurityException getSec() { + return this.sec; } - public getTabletStats_args setTableId(String tableId) { - this.tableId = tableId; + public getTabletStats_result setSec(org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) { + this.sec = sec; return this; } - public void unsetTableId() { - this.tableId = null; + public void unsetSec() { + this.sec = null; } - /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ - public boolean isSetTableId() { - return this.tableId != null; + /** Returns true if field sec is set (has been assigned a value) and false otherwise */ + public boolean isSetSec() { + return this.sec != null; } - public void setTableIdIsSet(boolean value) { + public void setSecIsSet(boolean value) { if (!value) { - this.tableId = null; + this.sec = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case TINFO: - if (value == null) { - unsetTinfo(); - } else { - setTinfo((org.apache.accumulo.cloudtrace.thrift.TInfo)value); - } - break; - - case CREDENTIALS: + case SUCCESS: if (value == null) { - unsetCredentials(); + unsetSuccess(); } else { - setCredentials((org.apache.accumulo.core.security.thrift.AuthInfo)value); + setSuccess((List)value); } break; - case TABLE_ID: + case SEC: if (value == null) { - unsetTableId(); + unsetSec(); } else { - setTableId((String)value); + setSec((org.apache.accumulo.core.security.thrift.ThriftSecurityException)value); } break; @@ -19812,14 +19750,11 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case TINFO: - return getTinfo(); - - case CREDENTIALS: - return getCredentials(); + case SUCCESS: + return getSuccess(); - case TABLE_ID: - return getTableId(); + case SEC: + return getSec(); } throw new IllegalStateException(); @@ -19832,12 +19767,10 @@ import org.slf4j.LoggerFactory; } switch (field) { - case TINFO: - return isSetTinfo(); - case CREDENTIALS: - return isSetCredentials(); - case TABLE_ID: - return isSetTableId(); + case SUCCESS: + return isSetSuccess(); + case SEC: + return isSetSec(); } throw new IllegalStateException(); } @@ -19846,39 +19779,30 @@ import org.slf4j.LoggerFactory; public boolean equals(Object that) { if (that == null) return false; - if (that instanceof getTabletStats_args) - return this.equals((getTabletStats_args)that); + if (that instanceof getTabletStats_result) + return this.equals((getTabletStats_result)that); return false; } - public boolean equals(getTabletStats_args that) { + public boolean equals(getTabletStats_result 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_credentials = true && this.isSetCredentials(); - boolean that_present_credentials = true && that.isSetCredentials(); - if (this_present_credentials || that_present_credentials) { - if (!(this_present_credentials && that_present_credentials)) + boolean this_present_success = true && this.isSetSuccess(); + boolean that_present_success = true && that.isSetSuccess(); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) return false; - if (!this.credentials.equals(that.credentials)) + if (!this.success.equals(that.success)) return false; } - boolean this_present_tableId = true && this.isSetTableId(); - boolean that_present_tableId = true && that.isSetTableId(); - if (this_present_tableId || that_present_tableId) { - if (!(this_present_tableId && that_present_tableId)) + boolean this_present_sec = true && this.isSetSec(); + boolean that_present_sec = true && that.isSetSec(); + if (this_present_sec || that_present_sec) { + if (!(this_present_sec && that_present_sec)) return false; - if (!this.tableId.equals(that.tableId)) + if (!this.sec.equals(that.sec)) return false; } @@ -19890,40 +19814,30 @@ import org.slf4j.LoggerFactory; return 0; } - public int compareTo(getTabletStats_args other) { + public int compareTo(getTabletStats_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getTabletStats_args typedOther = (getTabletStats_args)other; + getTabletStats_result typedOther = (getTabletStats_result)other; - lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(typedOther.isSetTinfo()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTinfo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, typedOther.tinfo); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } - if (isSetCredentials()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials); + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTableId()).compareTo(typedOther.isSetTableId()); + lastComparison = Boolean.valueOf(isSetSec()).compareTo(typedOther.isSetSec()); if (lastComparison != 0) { return lastComparison; } - if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, typedOther.tableId); + if (isSetSec()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, typedOther.sec); if (lastComparison != 0) { return lastComparison; } @@ -19945,25 +19859,28 @@ import org.slf4j.LoggerFactory; break; } switch (field.id) { - case 3: // TINFO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { - this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(); - this.tinfo.read(iprot); + case 0: // SUCCESS + if (field.type == org.apache.thrift.protocol.TType.LIST) { + { + org.apache.thrift.protocol.TList _list106 = iprot.readListBegin(); + this.success = new ArrayList(_list106.size); + for (int _i107 = 0; _i107 < _list106.size; ++_i107) + { + TabletStats _elem108; + _elem108 = new TabletStats(); + _elem108.read(iprot); + this.success.add(_elem108); + } + iprot.readListEnd(); + } } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; - case 1: // CREDENTIALS + case 1: // SEC if (field.type == org.apache.thrift.protocol.TType.STRUCT) { - this.credentials = new org.apache.accumulo.core.security.thrift.AuthInfo(); - this.credentials.read(iprot); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - break; - case 2: // TABLE_ID - if (field.type == org.apache.thrift.protocol.TType.STRING) { - this.tableId = iprot.readString(); + this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(); + this.sec.read(iprot); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } @@ -19980,22 +19897,22 @@ import org.slf4j.LoggerFactory; } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - validate(); - oprot.writeStructBegin(STRUCT_DESC); - if (this.credentials != null) { - oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC); - this.credentials.write(oprot); - oprot.writeFieldEnd(); - } - if (this.tableId != null) { - oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); - oprot.writeString(this.tableId); + + if (this.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + for (TabletStats _iter109 : this.success) + { + _iter109.write(oprot); + } + oprot.writeListEnd(); + } oprot.writeFieldEnd(); - } - if (this.tinfo != null) { - oprot.writeFieldBegin(TINFO_FIELD_DESC); - this.tinfo.write(oprot); + } else if (this.isSetSec()) { + oprot.writeFieldBegin(SEC_FIELD_DESC); + this.sec.write(oprot); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -20004,30 +19921,22 @@ import org.slf4j.LoggerFactory; @Override public String toString() { - StringBuilder sb = new StringBuilder("getTabletStats_args("); + StringBuilder sb = new StringBuilder("getTabletStats_result("); 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("credentials:"); - if (this.credentials == null) { + sb.append("success:"); + if (this.success == null) { sb.append("null"); } else { - sb.append(this.credentials); + sb.append(this.success); } first = false; if (!first) sb.append(", "); - sb.append("tableId:"); - if (this.tableId == null) { + sb.append("sec:"); + if (this.sec == null) { sb.append("null"); } else { - sb.append(this.tableId); + sb.append(this.sec); } first = false; sb.append(")"); @@ -20056,19 +19965,19 @@ import org.slf4j.LoggerFactory; } - public static class getTabletStats_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTabletStats_result"); - - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); + public static class getHistoricalStats_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getHistoricalStats_args"); - public List success; - public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; + 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)2); + private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1); + + public org.apache.accumulo.cloudtrace.thrift.TInfo tinfo; + public org.apache.accumulo.core.security.thrift.AuthInfo credentials; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - SUCCESS((short)0, "success"), - SEC((short)1, "sec"); + TINFO((short)2, "tinfo"), + CREDENTIALS((short)1, "credentials"); private static final Map byName = new HashMap(); @@ -20083,10 +19992,10 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 0: // SUCCESS - return SUCCESS; - case 1: // SEC - return SEC; + case 2: // TINFO + return TINFO; + case 1: // CREDENTIALS + return CREDENTIALS; default: return null; } @@ -20131,131 +20040,111 @@ import org.slf4j.LoggerFactory; 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.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TabletStats.class)))); - tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + 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.cloudtrace.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.AuthInfo.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTabletStats_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getHistoricalStats_args.class, metaDataMap); } - public getTabletStats_result() { + public getHistoricalStats_args() { } - public getTabletStats_result( - List success, - org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) + public getHistoricalStats_args( + org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, + org.apache.accumulo.core.security.thrift.AuthInfo credentials) { this(); - this.success = success; - this.sec = sec; + this.tinfo = tinfo; + this.credentials = credentials; } /** [... 3415 lines stripped ...]