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 933DCD868 for ; Mon, 29 Oct 2012 15:23:47 +0000 (UTC) Received: (qmail 28934 invoked by uid 500); 29 Oct 2012 15:23:47 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 28884 invoked by uid 500); 29 Oct 2012 15:23:46 -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 28869 invoked by uid 99); 29 Oct 2012 15:23:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2012 15:23:46 +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, 29 Oct 2012 15:23:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 287582388A66 for ; Mon, 29 Oct 2012 15:22:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1403360 [6/7] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ assemble/platform/debian/ assemble/platform/debian/init.d/ bin/ conf/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ ... Date: Mon, 29 Oct 2012 15:22:31 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121029152237.287582388A66@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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=1403360&r1=1403359&r2=1403360&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 Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard 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 java.util.List; import java.util.ArrayList; import java.util.Map; @@ -1766,7 +1769,7 @@ import org.slf4j.LoggerFactory; } - public static class Processor extends org.apache.accumulo.core.client.impl.thrift.ClientService.Processor implements org.apache.thrift.TProcessor { + public static class Processor extends org.apache.accumulo.core.client.impl.thrift.ClientService.Processor implements org.apache.thrift.TProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { super(iface, getProcessMap(new HashMap>())); @@ -1805,16 +1808,20 @@ import org.slf4j.LoggerFactory; return processMap; } - private static class startScan extends org.apache.thrift.ProcessFunction { + public static class startScan extends org.apache.thrift.ProcessFunction { public startScan() { super("startScan"); } - protected startScan_args getEmptyArgsInstance() { + public startScan_args getEmptyArgsInstance() { return new startScan_args(); } - protected startScan_result getResult(I iface, startScan_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public startScan_result getResult(I iface, startScan_args args) throws org.apache.thrift.TException { startScan_result result = new startScan_result(); try { result.success = iface.startScan(args.tinfo, args.credentials, args.extent, args.range, args.columns, args.batchSize, args.ssiList, args.ssio, args.authorizations, args.waitForWrites, args.isolated); @@ -1829,16 +1836,20 @@ import org.slf4j.LoggerFactory; } } - private static class continueScan extends org.apache.thrift.ProcessFunction { + public static class continueScan extends org.apache.thrift.ProcessFunction { public continueScan() { super("continueScan"); } - protected continueScan_args getEmptyArgsInstance() { + public continueScan_args getEmptyArgsInstance() { return new continueScan_args(); } - protected continueScan_result getResult(I iface, continueScan_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public continueScan_result getResult(I iface, continueScan_args args) throws org.apache.thrift.TException { continueScan_result result = new continueScan_result(); try { result.success = iface.continueScan(args.tinfo, args.scanID); @@ -1853,31 +1864,39 @@ import org.slf4j.LoggerFactory; } } - private static class closeScan extends org.apache.thrift.ProcessFunction { + public static class closeScan extends org.apache.thrift.ProcessFunction { public closeScan() { super("closeScan"); } - protected closeScan_args getEmptyArgsInstance() { + public closeScan_args getEmptyArgsInstance() { return new closeScan_args(); } - protected org.apache.thrift.TBase getResult(I iface, closeScan_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, closeScan_args args) throws org.apache.thrift.TException { iface.closeScan(args.tinfo, args.scanID); return null; } } - private static class startMultiScan extends org.apache.thrift.ProcessFunction { + public static class startMultiScan extends org.apache.thrift.ProcessFunction { public startMultiScan() { super("startMultiScan"); } - protected startMultiScan_args getEmptyArgsInstance() { + public startMultiScan_args getEmptyArgsInstance() { return new startMultiScan_args(); } - protected startMultiScan_result getResult(I iface, startMultiScan_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public startMultiScan_result getResult(I iface, startMultiScan_args args) throws org.apache.thrift.TException { startMultiScan_result result = new startMultiScan_result(); try { result.success = iface.startMultiScan(args.tinfo, args.credentials, args.batch, args.columns, args.ssiList, args.ssio, args.authorizations, args.waitForWrites); @@ -1888,16 +1907,20 @@ import org.slf4j.LoggerFactory; } } - private static class continueMultiScan extends org.apache.thrift.ProcessFunction { + public static class continueMultiScan extends org.apache.thrift.ProcessFunction { public continueMultiScan() { super("continueMultiScan"); } - protected continueMultiScan_args getEmptyArgsInstance() { + public continueMultiScan_args getEmptyArgsInstance() { return new continueMultiScan_args(); } - protected continueMultiScan_result getResult(I iface, continueMultiScan_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public continueMultiScan_result getResult(I iface, continueMultiScan_args args) throws org.apache.thrift.TException { continueMultiScan_result result = new continueMultiScan_result(); try { result.success = iface.continueMultiScan(args.tinfo, args.scanID); @@ -1908,16 +1931,20 @@ import org.slf4j.LoggerFactory; } } - private static class closeMultiScan extends org.apache.thrift.ProcessFunction { + public static class closeMultiScan extends org.apache.thrift.ProcessFunction { public closeMultiScan() { super("closeMultiScan"); } - protected closeMultiScan_args getEmptyArgsInstance() { + public closeMultiScan_args getEmptyArgsInstance() { return new closeMultiScan_args(); } - protected closeMultiScan_result getResult(I iface, closeMultiScan_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public closeMultiScan_result getResult(I iface, closeMultiScan_args args) throws org.apache.thrift.TException { closeMultiScan_result result = new closeMultiScan_result(); try { iface.closeMultiScan(args.tinfo, args.scanID); @@ -1928,16 +1955,20 @@ import org.slf4j.LoggerFactory; } } - private static class startUpdate extends org.apache.thrift.ProcessFunction { + public static class startUpdate extends org.apache.thrift.ProcessFunction { public startUpdate() { super("startUpdate"); } - protected startUpdate_args getEmptyArgsInstance() { + public startUpdate_args getEmptyArgsInstance() { return new startUpdate_args(); } - protected startUpdate_result getResult(I iface, startUpdate_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public startUpdate_result getResult(I iface, startUpdate_args args) throws org.apache.thrift.TException { startUpdate_result result = new startUpdate_result(); try { result.success = iface.startUpdate(args.tinfo, args.credentials); @@ -1949,31 +1980,39 @@ import org.slf4j.LoggerFactory; } } - private static class applyUpdates extends org.apache.thrift.ProcessFunction { + public static class applyUpdates extends org.apache.thrift.ProcessFunction { public applyUpdates() { super("applyUpdates"); } - protected applyUpdates_args getEmptyArgsInstance() { + public applyUpdates_args getEmptyArgsInstance() { return new applyUpdates_args(); } - protected org.apache.thrift.TBase getResult(I iface, applyUpdates_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, applyUpdates_args args) throws org.apache.thrift.TException { iface.applyUpdates(args.tinfo, args.updateID, args.keyExtent, args.mutations); return null; } } - private static class closeUpdate extends org.apache.thrift.ProcessFunction { + public static class closeUpdate extends org.apache.thrift.ProcessFunction { public closeUpdate() { super("closeUpdate"); } - protected closeUpdate_args getEmptyArgsInstance() { + public closeUpdate_args getEmptyArgsInstance() { return new closeUpdate_args(); } - protected closeUpdate_result getResult(I iface, closeUpdate_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public closeUpdate_result getResult(I iface, closeUpdate_args args) throws org.apache.thrift.TException { closeUpdate_result result = new closeUpdate_result(); try { result.success = iface.closeUpdate(args.tinfo, args.updateID); @@ -1984,16 +2023,20 @@ import org.slf4j.LoggerFactory; } } - private static class update extends org.apache.thrift.ProcessFunction { + public static class update extends org.apache.thrift.ProcessFunction { public update() { super("update"); } - protected update_args getEmptyArgsInstance() { + public update_args getEmptyArgsInstance() { return new update_args(); } - protected update_result getResult(I iface, update_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public update_result getResult(I iface, update_args args) throws org.apache.thrift.TException { update_result result = new update_result(); try { iface.update(args.tinfo, args.credentials, args.keyExtent, args.mutation); @@ -2008,16 +2051,20 @@ import org.slf4j.LoggerFactory; } } - private static class bulkImport extends org.apache.thrift.ProcessFunction { + public static class bulkImport extends org.apache.thrift.ProcessFunction { public bulkImport() { super("bulkImport"); } - protected bulkImport_args getEmptyArgsInstance() { + public bulkImport_args getEmptyArgsInstance() { return new bulkImport_args(); } - protected bulkImport_result getResult(I iface, bulkImport_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public bulkImport_result getResult(I iface, bulkImport_args args) throws org.apache.thrift.TException { bulkImport_result result = new bulkImport_result(); try { result.success = iface.bulkImport(args.tinfo, args.credentials, args.tid, args.files, args.setTime); @@ -2028,16 +2075,20 @@ import org.slf4j.LoggerFactory; } } - private static class splitTablet extends org.apache.thrift.ProcessFunction { + public static class splitTablet extends org.apache.thrift.ProcessFunction { public splitTablet() { super("splitTablet"); } - protected splitTablet_args getEmptyArgsInstance() { + public splitTablet_args getEmptyArgsInstance() { return new splitTablet_args(); } - protected splitTablet_result getResult(I iface, splitTablet_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public splitTablet_result getResult(I iface, splitTablet_args args) throws org.apache.thrift.TException { splitTablet_result result = new splitTablet_result(); try { iface.splitTablet(args.tinfo, args.credentials, args.extent, args.splitPoint); @@ -2050,106 +2101,134 @@ import org.slf4j.LoggerFactory; } } - private static class loadTablet extends org.apache.thrift.ProcessFunction { + public static class loadTablet extends org.apache.thrift.ProcessFunction { public loadTablet() { super("loadTablet"); } - protected loadTablet_args getEmptyArgsInstance() { + public loadTablet_args getEmptyArgsInstance() { return new loadTablet_args(); } - protected org.apache.thrift.TBase getResult(I iface, loadTablet_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, loadTablet_args args) throws org.apache.thrift.TException { iface.loadTablet(args.tinfo, args.credentials, args.lock, args.extent); return null; } } - private static class unloadTablet extends org.apache.thrift.ProcessFunction { + public static class unloadTablet extends org.apache.thrift.ProcessFunction { public unloadTablet() { super("unloadTablet"); } - protected unloadTablet_args getEmptyArgsInstance() { + public unloadTablet_args getEmptyArgsInstance() { return new unloadTablet_args(); } - protected org.apache.thrift.TBase getResult(I iface, unloadTablet_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, unloadTablet_args args) throws org.apache.thrift.TException { iface.unloadTablet(args.tinfo, args.credentials, args.lock, args.extent, args.save); return null; } } - private static class flush extends org.apache.thrift.ProcessFunction { + public static class flush extends org.apache.thrift.ProcessFunction { public flush() { super("flush"); } - protected flush_args getEmptyArgsInstance() { + public flush_args getEmptyArgsInstance() { return new flush_args(); } - protected org.apache.thrift.TBase getResult(I iface, flush_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, flush_args args) throws org.apache.thrift.TException { iface.flush(args.tinfo, args.credentials, args.lock, args.tableId, args.startRow, args.endRow); return null; } } - private static class flushTablet extends org.apache.thrift.ProcessFunction { + public static class flushTablet extends org.apache.thrift.ProcessFunction { public flushTablet() { super("flushTablet"); } - protected flushTablet_args getEmptyArgsInstance() { + public flushTablet_args getEmptyArgsInstance() { return new flushTablet_args(); } - protected org.apache.thrift.TBase getResult(I iface, flushTablet_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, flushTablet_args args) throws org.apache.thrift.TException { iface.flushTablet(args.tinfo, args.credentials, args.lock, args.extent); return null; } } - private static class chop extends org.apache.thrift.ProcessFunction { + public static class chop extends org.apache.thrift.ProcessFunction { public chop() { super("chop"); } - protected chop_args getEmptyArgsInstance() { + public chop_args getEmptyArgsInstance() { return new chop_args(); } - protected org.apache.thrift.TBase getResult(I iface, chop_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, chop_args args) throws org.apache.thrift.TException { iface.chop(args.tinfo, args.credentials, args.lock, args.extent); return null; } } - private static class compact extends org.apache.thrift.ProcessFunction { + public static class compact extends org.apache.thrift.ProcessFunction { public compact() { super("compact"); } - protected compact_args getEmptyArgsInstance() { + public compact_args getEmptyArgsInstance() { return new compact_args(); } - protected org.apache.thrift.TBase getResult(I iface, compact_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, compact_args args) throws org.apache.thrift.TException { iface.compact(args.tinfo, args.credentials, args.lock, args.tableId, args.startRow, args.endRow); return null; } } - private static class getTabletServerStatus extends org.apache.thrift.ProcessFunction { + public static class getTabletServerStatus extends org.apache.thrift.ProcessFunction { public getTabletServerStatus() { super("getTabletServerStatus"); } - protected getTabletServerStatus_args getEmptyArgsInstance() { + public getTabletServerStatus_args getEmptyArgsInstance() { return new getTabletServerStatus_args(); } - protected getTabletServerStatus_result getResult(I iface, getTabletServerStatus_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getTabletServerStatus_result getResult(I iface, getTabletServerStatus_args args) throws org.apache.thrift.TException { getTabletServerStatus_result result = new getTabletServerStatus_result(); try { result.success = iface.getTabletServerStatus(args.tinfo, args.credentials); @@ -2160,16 +2239,20 @@ import org.slf4j.LoggerFactory; } } - private static class getTabletStats extends org.apache.thrift.ProcessFunction { + public static class getTabletStats extends org.apache.thrift.ProcessFunction { public getTabletStats() { super("getTabletStats"); } - protected getTabletStats_args getEmptyArgsInstance() { + public getTabletStats_args getEmptyArgsInstance() { return new getTabletStats_args(); } - protected getTabletStats_result getResult(I iface, getTabletStats_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getTabletStats_result getResult(I iface, getTabletStats_args args) throws org.apache.thrift.TException { getTabletStats_result result = new getTabletStats_result(); try { result.success = iface.getTabletStats(args.tinfo, args.credentials, args.tableId); @@ -2180,16 +2263,20 @@ import org.slf4j.LoggerFactory; } } - private static class getHistoricalStats extends org.apache.thrift.ProcessFunction { + public static class getHistoricalStats extends org.apache.thrift.ProcessFunction { public getHistoricalStats() { super("getHistoricalStats"); } - protected getHistoricalStats_args getEmptyArgsInstance() { + public getHistoricalStats_args getEmptyArgsInstance() { return new getHistoricalStats_args(); } - protected getHistoricalStats_result getResult(I iface, getHistoricalStats_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getHistoricalStats_result getResult(I iface, getHistoricalStats_args args) throws org.apache.thrift.TException { getHistoricalStats_result result = new getHistoricalStats_result(); try { result.success = iface.getHistoricalStats(args.tinfo, args.credentials); @@ -2200,16 +2287,20 @@ import org.slf4j.LoggerFactory; } } - private static class halt extends org.apache.thrift.ProcessFunction { + public static class halt extends org.apache.thrift.ProcessFunction { public halt() { super("halt"); } - protected halt_args getEmptyArgsInstance() { + public halt_args getEmptyArgsInstance() { return new halt_args(); } - protected halt_result getResult(I iface, halt_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public halt_result getResult(I iface, halt_args args) throws org.apache.thrift.TException { halt_result result = new halt_result(); try { iface.halt(args.tinfo, args.credentials, args.lock); @@ -2220,31 +2311,39 @@ import org.slf4j.LoggerFactory; } } - private static class fastHalt extends org.apache.thrift.ProcessFunction { + public static class fastHalt extends org.apache.thrift.ProcessFunction { public fastHalt() { super("fastHalt"); } - protected fastHalt_args getEmptyArgsInstance() { + public fastHalt_args getEmptyArgsInstance() { return new fastHalt_args(); } - protected org.apache.thrift.TBase getResult(I iface, fastHalt_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, fastHalt_args args) throws org.apache.thrift.TException { iface.fastHalt(args.tinfo, args.credentials, args.lock); return null; } } - private static class getActiveScans extends org.apache.thrift.ProcessFunction { + public static class getActiveScans extends org.apache.thrift.ProcessFunction { public getActiveScans() { super("getActiveScans"); } - protected getActiveScans_args getEmptyArgsInstance() { + public getActiveScans_args getEmptyArgsInstance() { return new getActiveScans_args(); } - protected getActiveScans_result getResult(I iface, getActiveScans_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getActiveScans_result getResult(I iface, getActiveScans_args args) throws org.apache.thrift.TException { getActiveScans_result result = new getActiveScans_result(); try { result.success = iface.getActiveScans(args.tinfo, args.credentials); @@ -2255,16 +2354,20 @@ import org.slf4j.LoggerFactory; } } - private static class removeLogs extends org.apache.thrift.ProcessFunction { + public static class removeLogs extends org.apache.thrift.ProcessFunction { public removeLogs() { super("removeLogs"); } - protected removeLogs_args getEmptyArgsInstance() { + public removeLogs_args getEmptyArgsInstance() { return new removeLogs_args(); } - protected org.apache.thrift.TBase getResult(I iface, removeLogs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return true; + } + + public org.apache.thrift.TBase getResult(I iface, removeLogs_args args) throws org.apache.thrift.TException { iface.removeLogs(args.tinfo, args.credentials, args.filenames); return null; } @@ -2397,7 +2500,7 @@ import org.slf4j.LoggerFactory; private static final int __BATCHSIZE_ISSET_ID = 0; private static final int __WAITFORWRITES_ISSET_ID = 1; private static final int __ISOLATED_ISSET_ID = 2; - private BitSet __isset_bit_vector = new BitSet(3); + 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); @@ -2471,8 +2574,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public startScan_args(startScan_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -2707,16 +2809,16 @@ import org.slf4j.LoggerFactory; } public void unsetBatchSize() { - __isset_bit_vector.clear(__BATCHSIZE_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BATCHSIZE_ISSET_ID); } /** Returns true if field batchSize is set (has been assigned a value) and false otherwise */ public boolean isSetBatchSize() { - return __isset_bit_vector.get(__BATCHSIZE_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __BATCHSIZE_ISSET_ID); } public void setBatchSizeIsSet(boolean value) { - __isset_bit_vector.set(__BATCHSIZE_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BATCHSIZE_ISSET_ID, value); } public int getSsiListSize() { @@ -2843,16 +2945,16 @@ import org.slf4j.LoggerFactory; } public void unsetWaitForWrites() { - __isset_bit_vector.clear(__WAITFORWRITES_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WAITFORWRITES_ISSET_ID); } /** Returns true if field waitForWrites is set (has been assigned a value) and false otherwise */ public boolean isSetWaitForWrites() { - return __isset_bit_vector.get(__WAITFORWRITES_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __WAITFORWRITES_ISSET_ID); } public void setWaitForWritesIsSet(boolean value) { - __isset_bit_vector.set(__WAITFORWRITES_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WAITFORWRITES_ISSET_ID, value); } public boolean isIsolated() { @@ -2866,16 +2968,16 @@ import org.slf4j.LoggerFactory; } public void unsetIsolated() { - __isset_bit_vector.clear(__ISOLATED_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISOLATED_ISSET_ID); } /** Returns true if field isolated is set (has been assigned a value) and false otherwise */ public boolean isSetIsolated() { - return __isset_bit_vector.get(__ISOLATED_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __ISOLATED_ISSET_ID); } public void setIsolatedIsSet(boolean value) { - __isset_bit_vector.set(__ISOLATED_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISOLATED_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -3382,6 +3484,19 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } + if (extent != null) { + extent.validate(); + } + if (range != null) { + range.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -3395,7 +3510,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -4376,6 +4491,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -4635,7 +4754,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __SCANID_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -4664,8 +4783,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public continueScan_args(continueScan_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -4718,16 +4836,16 @@ import org.slf4j.LoggerFactory; } public void unsetScanID() { - __isset_bit_vector.clear(__SCANID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID); } /** Returns true if field scanID is set (has been assigned a value) and false otherwise */ public boolean isSetScanID() { - return __isset_bit_vector.get(__SCANID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID); } public void setScanIDIsSet(boolean value) { - __isset_bit_vector.set(__SCANID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -4882,6 +5000,10 @@ import org.slf4j.LoggerFactory; 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 { @@ -4895,7 +5017,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -5491,6 +5613,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -5750,7 +5876,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __SCANID_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -5779,8 +5905,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public closeScan_args(closeScan_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -5833,16 +5958,16 @@ import org.slf4j.LoggerFactory; } public void unsetScanID() { - __isset_bit_vector.clear(__SCANID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID); } /** Returns true if field scanID is set (has been assigned a value) and false otherwise */ public boolean isSetScanID() { - return __isset_bit_vector.get(__SCANID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID); } public void setScanIDIsSet(boolean value) { - __isset_bit_vector.set(__SCANID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -5997,6 +6122,10 @@ import org.slf4j.LoggerFactory; 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 { @@ -6010,7 +6139,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -6234,7 +6363,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __WAITFORWRITES_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -6294,8 +6423,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public startMultiScan_args(startMultiScan_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -6620,16 +6748,16 @@ import org.slf4j.LoggerFactory; } public void unsetWaitForWrites() { - __isset_bit_vector.clear(__WAITFORWRITES_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WAITFORWRITES_ISSET_ID); } /** Returns true if field waitForWrites is set (has been assigned a value) and false otherwise */ public boolean isSetWaitForWrites() { - return __isset_bit_vector.get(__WAITFORWRITES_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __WAITFORWRITES_ISSET_ID); } public void setWaitForWritesIsSet(boolean value) { - __isset_bit_vector.set(__WAITFORWRITES_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WAITFORWRITES_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -7024,6 +7152,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -7037,7 +7172,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -7869,6 +8004,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -8078,7 +8217,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __SCANID_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -8107,8 +8246,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public continueMultiScan_args(continueMultiScan_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -8161,16 +8299,16 @@ import org.slf4j.LoggerFactory; } public void unsetScanID() { - __isset_bit_vector.clear(__SCANID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID); } /** Returns true if field scanID is set (has been assigned a value) and false otherwise */ public boolean isSetScanID() { - return __isset_bit_vector.get(__SCANID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID); } public void setScanIDIsSet(boolean value) { - __isset_bit_vector.set(__SCANID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -8325,6 +8463,10 @@ import org.slf4j.LoggerFactory; 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 { @@ -8338,7 +8480,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -8780,6 +8922,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -8989,7 +9135,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __SCANID_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -9018,8 +9164,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public closeMultiScan_args(closeMultiScan_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -9072,16 +9217,16 @@ import org.slf4j.LoggerFactory; } public void unsetScanID() { - __isset_bit_vector.clear(__SCANID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID); } /** Returns true if field scanID is set (has been assigned a value) and false otherwise */ public boolean isSetScanID() { - return __isset_bit_vector.get(__SCANID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID); } public void setScanIDIsSet(boolean value) { - __isset_bit_vector.set(__SCANID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -9236,6 +9381,10 @@ import org.slf4j.LoggerFactory; 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 { @@ -9249,7 +9398,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -9614,6 +9763,7 @@ import org.slf4j.LoggerFactory; 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 { @@ -10046,6 +10196,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -10255,7 +10412,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __SUCCESS_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -10284,8 +10441,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public startUpdate_result(startUpdate_result other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; this.success = other.success; if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(other.sec); @@ -10314,16 +10470,16 @@ import org.slf4j.LoggerFactory; } public void unsetSuccess() { - __isset_bit_vector.clear(__SUCCESS_ISSET_ID); + __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 __isset_bit_vector.get(__SUCCESS_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bit_vector.set(__SUCCESS_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } public org.apache.accumulo.core.security.thrift.ThriftSecurityException getSec() { @@ -10502,6 +10658,7 @@ import org.slf4j.LoggerFactory; 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 { @@ -10514,6 +10671,8 @@ import org.slf4j.LoggerFactory; 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); @@ -10570,9 +10729,11 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - oprot.writeFieldBegin(SUCCESS_FIELD_DESC); - oprot.writeI64(struct.success); - oprot.writeFieldEnd(); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeI64(struct.success); + oprot.writeFieldEnd(); + } if (struct.sec != null) { oprot.writeFieldBegin(SEC_FIELD_DESC); struct.sec.write(oprot); @@ -10717,7 +10878,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __UPDATEID_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -10755,8 +10916,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public applyUpdates_args(applyUpdates_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -10821,16 +10981,16 @@ import org.slf4j.LoggerFactory; } public void unsetUpdateID() { - __isset_bit_vector.clear(__UPDATEID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPDATEID_ISSET_ID); } /** Returns true if field updateID is set (has been assigned a value) and false otherwise */ public boolean isSetUpdateID() { - return __isset_bit_vector.get(__UPDATEID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __UPDATEID_ISSET_ID); } public void setUpdateIDIsSet(boolean value) { - __isset_bit_vector.set(__UPDATEID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPDATEID_ISSET_ID, value); } public org.apache.accumulo.core.data.thrift.TKeyExtent getKeyExtent() { @@ -11128,6 +11288,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (keyExtent != null) { + keyExtent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -11141,7 +11308,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -11417,7 +11584,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __UPDATEID_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -11446,8 +11613,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public closeUpdate_args(closeUpdate_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -11500,16 +11666,16 @@ import org.slf4j.LoggerFactory; } public void unsetUpdateID() { - __isset_bit_vector.clear(__UPDATEID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPDATEID_ISSET_ID); } /** Returns true if field updateID is set (has been assigned a value) and false otherwise */ public boolean isSetUpdateID() { - return __isset_bit_vector.get(__UPDATEID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __UPDATEID_ISSET_ID); } public void setUpdateIDIsSet(boolean value) { - __isset_bit_vector.set(__UPDATEID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPDATEID_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -11664,6 +11830,10 @@ import org.slf4j.LoggerFactory; 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 { @@ -11677,7 +11847,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -12119,6 +12289,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -12730,6 +12904,19 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } + if (keyExtent != null) { + keyExtent.validate(); + } + if (mutation != null) { + mutation.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -13314,6 +13501,7 @@ import org.slf4j.LoggerFactory; 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 { @@ -13564,7 +13752,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __TID_ISSET_ID = 0; private static final int __SETTIME_ISSET_ID = 1; - private BitSet __isset_bit_vector = new BitSet(2); + 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); @@ -13606,8 +13794,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public bulkImport_args(bulkImport_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -13695,16 +13882,16 @@ import org.slf4j.LoggerFactory; } public void unsetTid() { - __isset_bit_vector.clear(__TID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TID_ISSET_ID); } /** Returns true if field tid is set (has been assigned a value) and false otherwise */ public boolean isSetTid() { - return __isset_bit_vector.get(__TID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __TID_ISSET_ID); } public void setTidIsSet(boolean value) { - __isset_bit_vector.set(__TID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TID_ISSET_ID, value); } public int getFilesSize() { @@ -13753,16 +13940,16 @@ import org.slf4j.LoggerFactory; } public void unsetSetTime() { - __isset_bit_vector.clear(__SETTIME_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SETTIME_ISSET_ID); } /** Returns true if field setTime is set (has been assigned a value) and false otherwise */ public boolean isSetSetTime() { - return __isset_bit_vector.get(__SETTIME_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SETTIME_ISSET_ID); } public void setSetTimeIsSet(boolean value) { - __isset_bit_vector.set(__SETTIME_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SETTIME_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -14033,6 +14220,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -14046,7 +14240,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -14657,6 +14851,7 @@ import org.slf4j.LoggerFactory; 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 { @@ -15311,6 +15506,16 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } + if (extent != null) { + extent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -15816,6 +16021,7 @@ import org.slf4j.LoggerFactory; 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 { @@ -16427,6 +16633,16 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } + if (extent != null) { + extent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -16699,7 +16915,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __SAVE_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(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); @@ -16740,8 +16956,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public unloadTablet_args(unloadTablet_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.cloudtrace.thrift.TInfo(other.tinfo); } @@ -16878,16 +17093,16 @@ import org.slf4j.LoggerFactory; } public void unsetSave() { - __isset_bit_vector.clear(__SAVE_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SAVE_ISSET_ID); } /** Returns true if field save is set (has been assigned a value) and false otherwise */ public boolean isSetSave() { - return __isset_bit_vector.get(__SAVE_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SAVE_ISSET_ID); } public void setSaveIsSet(boolean value) { - __isset_bit_vector.set(__SAVE_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SAVE_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -17162,6 +17377,16 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } + if (extent != null) { + extent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -17175,7 +17400,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); @@ -18020,6 +18245,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -18723,6 +18955,16 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } + if (extent != null) { + extent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -19382,6 +19624,16 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } + if (extent != null) { + extent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -20217,6 +20469,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -20766,6 +21025,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -21223,6 +21489,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -21757,6 +22027,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -22257,6 +22534,7 @@ import org.slf4j.LoggerFactory; 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 { @@ -22746,6 +23024,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -23203,6 +23488,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -23737,6 +24026,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -24140,6 +24436,7 @@ import org.slf4j.LoggerFactory; 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 { @@ -24649,6 +24946,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -25129,6 +25433,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -25606,6 +25917,7 @@ import org.slf4j.LoggerFactory; 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 { @@ -26192,6 +26504,13 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (tinfo != null) { + tinfo.validate(); + } + if (credentials != null) { + credentials.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard 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 java.util.List; import java.util.ArrayList; import java.util.Map; @@ -138,7 +141,7 @@ import org.slf4j.LoggerFactory; private static final int __INGESTRATE_ISSET_ID = 1; private static final int __QUERYRATE_ISSET_ID = 2; private static final int __SPLITCREATIONTIME_ISSET_ID = 3; - private BitSet __isset_bit_vector = new BitSet(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); @@ -194,8 +197,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public TabletStats(TabletStats other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetExtent()) { this.extent = new org.apache.accumulo.core.data.thrift.TKeyExtent(other.extent); } @@ -341,16 +343,16 @@ import org.slf4j.LoggerFactory; } public void unsetNumEntries() { - __isset_bit_vector.clear(__NUMENTRIES_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUMENTRIES_ISSET_ID); } /** Returns true if field numEntries is set (has been assigned a value) and false otherwise */ public boolean isSetNumEntries() { - return __isset_bit_vector.get(__NUMENTRIES_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUMENTRIES_ISSET_ID); } public void setNumEntriesIsSet(boolean value) { - __isset_bit_vector.set(__NUMENTRIES_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUMENTRIES_ISSET_ID, value); } public double getIngestRate() { @@ -364,16 +366,16 @@ import org.slf4j.LoggerFactory; } public void unsetIngestRate() { - __isset_bit_vector.clear(__INGESTRATE_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INGESTRATE_ISSET_ID); } /** Returns true if field ingestRate is set (has been assigned a value) and false otherwise */ public boolean isSetIngestRate() { - return __isset_bit_vector.get(__INGESTRATE_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __INGESTRATE_ISSET_ID); } public void setIngestRateIsSet(boolean value) { - __isset_bit_vector.set(__INGESTRATE_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INGESTRATE_ISSET_ID, value); } public double getQueryRate() { @@ -387,16 +389,16 @@ import org.slf4j.LoggerFactory; } public void unsetQueryRate() { - __isset_bit_vector.clear(__QUERYRATE_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __QUERYRATE_ISSET_ID); } /** Returns true if field queryRate is set (has been assigned a value) and false otherwise */ public boolean isSetQueryRate() { - return __isset_bit_vector.get(__QUERYRATE_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __QUERYRATE_ISSET_ID); } public void setQueryRateIsSet(boolean value) { - __isset_bit_vector.set(__QUERYRATE_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUERYRATE_ISSET_ID, value); } public long getSplitCreationTime() { @@ -410,16 +412,16 @@ import org.slf4j.LoggerFactory; } public void unsetSplitCreationTime() { - __isset_bit_vector.clear(__SPLITCREATIONTIME_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SPLITCREATIONTIME_ISSET_ID); } /** Returns true if field splitCreationTime is set (has been assigned a value) and false otherwise */ public boolean isSetSplitCreationTime() { - return __isset_bit_vector.get(__SPLITCREATIONTIME_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SPLITCREATIONTIME_ISSET_ID); } public void setSplitCreationTimeIsSet(boolean value) { - __isset_bit_vector.set(__SPLITCREATIONTIME_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SPLITCREATIONTIME_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -802,6 +804,19 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (extent != null) { + extent.validate(); + } + if (major != null) { + major.validate(); + } + if (minor != null) { + minor.validate(); + } + if (split != null) { + split.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -815,7 +830,7 @@ import org.slf4j.LoggerFactory; 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_bit_vector = new BitSet(1); + __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); Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard 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 java.util.List; import java.util.ArrayList; import java.util.Map; @@ -27,7 +30,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class TooManyFilesException extends Exception implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class TooManyFilesException extends TException 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("TooManyFilesException"); private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -276,6 +279,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (extent != null) { + extent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/ScanInterpreter.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Mon Oct 29 15:22:24 2012 @@ -766,6 +766,10 @@ public class Shell extends ShellOptions }; public final void printLines(Iterator lines, boolean paginate) throws IOException { + printLines(lines, paginate, null); + } + + public final void printLines(Iterator lines, boolean paginate, PrintLine out) throws IOException { int linesPrinted = 0; String prompt = "-- hit any key to continue or 'q' to quit --"; int lastPromptLength = prompt.length(); @@ -778,46 +782,59 @@ public class Shell extends ShellOptions if (nextLine == null) continue; for (String line : nextLine.split("\\n")) { - if (peek != null) { - reader.printString(peek); - reader.printNewline(); - if (paginate) { - linesPrinted += peek.length() == 0 ? 0 : Math.ceil(peek.length() * 1.0 / termWidth); - - // check if displaying the next line would result in - // scrolling off the screen - if (linesPrinted + Math.ceil(lastPromptLength * 1.0 / termWidth) + Math.ceil(prompt.length() * 1.0 / termWidth) - + Math.ceil(line.length() * 1.0 / termWidth) > maxLines) { - linesPrinted = 0; - int numdashes = (termWidth - prompt.length()) / 2; - String nextPrompt = repeat("-", numdashes) + prompt + repeat("-", numdashes); - lastPromptLength = nextPrompt.length(); - reader.printString(nextPrompt); - reader.flushConsole(); - if (Character.toUpperCase((char) reader.readVirtualKey()) == 'Q') { + if (out == null) { + if (peek != null) { + reader.printString(peek); + reader.printNewline(); + if (paginate) { + linesPrinted += peek.length() == 0 ? 0 : Math.ceil(peek.length() * 1.0 / termWidth); + + // check if displaying the next line would result in + // scrolling off the screen + if (linesPrinted + Math.ceil(lastPromptLength * 1.0 / termWidth) + Math.ceil(prompt.length() * 1.0 / termWidth) + + Math.ceil(line.length() * 1.0 / termWidth) > maxLines) { + linesPrinted = 0; + int numdashes = (termWidth - prompt.length()) / 2; + String nextPrompt = repeat("-", numdashes) + prompt + repeat("-", numdashes); + lastPromptLength = nextPrompt.length(); + reader.printString(nextPrompt); + reader.flushConsole(); + if (Character.toUpperCase((char) reader.readVirtualKey()) == 'Q') { + reader.printNewline(); + return; + } reader.printNewline(); - return; + termWidth = reader.getTermwidth(); + maxLines = reader.getTermheight(); } - reader.printNewline(); - termWidth = reader.getTermwidth(); - maxLines = reader.getTermheight(); } } + peek = line; + } else { + out.print(line); } - peek = line; } } - if (peek != null) { + if (out == null && peek != null) { reader.printString(peek); reader.printNewline(); } } + public final void printRecords(Iterable> scanner, boolean printTimestamps, boolean paginate, Class formatterClass, + PrintLine outFile) throws IOException { + printLines(FormatterFactory.getFormatter(formatterClass, scanner, printTimestamps), paginate, outFile); + } + public final void printRecords(Iterable> scanner, boolean printTimestamps, boolean paginate, Class formatterClass) throws IOException { printLines(FormatterFactory.getFormatter(formatterClass, scanner, printTimestamps), paginate); } + public final void printBinaryRecords(Iterable> scanner, boolean printTimestamps, boolean paginate, PrintLine outFile) throws IOException { + printLines(FormatterFactory.getFormatter(binaryFormatterClass, scanner, printTimestamps), paginate, outFile); + } + public final void printBinaryRecords(Iterable> scanner, boolean printTimestamps, boolean paginate) throws IOException { printLines(FormatterFactory.getFormatter(binaryFormatterClass, scanner, printTimestamps), paginate); } Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptions.java ------------------------------------------------------------------------------ svn:eol-style = native