diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java index 94a75d0dbb6..c4fe5ce4518 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java @@ -680,7 +680,7 @@ static void trackScanning(Map> failures, // translate returned failures, remove them from unscanned, and add them to failures // @formatter:off - Map> retFailures = scanResult.failures.entrySet().stream().collect(Collectors.toMap( + Map> retFailures = scanResult.getFailures().entrySet().stream().collect(Collectors.toMap( entry -> KeyExtent.fromThrift(entry.getKey()), entry -> entry.getValue().stream().map(Range::new).collect(Collectors.toList()) )); @@ -690,25 +690,25 @@ static void trackScanning(Map> failures, // translate full scans and remove them from unscanned Set fullScans = - scanResult.fullScans.stream().map(KeyExtent::fromThrift).collect(Collectors.toSet()); + scanResult.getFullScans().stream().map(KeyExtent::fromThrift).collect(Collectors.toSet()); unscanned.keySet().removeAll(fullScans); // remove partial scan from unscanned - if (scanResult.partScan != null) { - KeyExtent ke = KeyExtent.fromThrift(scanResult.partScan); - Key nextKey = new Key(scanResult.partNextKey); + if (scanResult.getPartScan() != null) { + KeyExtent ke = KeyExtent.fromThrift(scanResult.getPartScan()); + Key nextKey = new Key(scanResult.getPartNextKey()); ListIterator iterator = unscanned.get(ke).listIterator(); while (iterator.hasNext()) { Range range = iterator.next(); if (range.afterEndKey(nextKey) || (nextKey.equals(range.getEndKey()) - && scanResult.partNextKeyInclusive != range.isEndKeyInclusive())) { + && scanResult.isPartNextKeyInclusive() != range.isEndKeyInclusive())) { iterator.remove(); } else if (range.contains(nextKey)) { iterator.remove(); - Range partRange = new Range(nextKey, scanResult.partNextKeyInclusive, range.getEndKey(), - range.isEndKeyInclusive()); + Range partRange = new Range(nextKey, scanResult.isPartNextKeyInclusive(), + range.getEndKey(), range.isEndKeyInclusive()); iterator.add(partRange); } } @@ -839,26 +839,26 @@ static void doLookup(ClientContext context, String server, Map> entries = new ArrayList<>(scanResult.results.size()); - for (TKeyValue kv : scanResult.results) { - entries.add(new SimpleImmutableEntry<>(new Key(kv.key), new Value(kv.value))); + ArrayList> entries = new ArrayList<>(scanResult.getResultsSize()); + for (TKeyValue kv : scanResult.getResults()) { + entries.add(new SimpleImmutableEntry<>(new Key(kv.getKey()), new Value(kv.getValue()))); } if (!entries.isEmpty()) { receiver.receive(entries); } - if (!entries.isEmpty() || !scanResult.fullScans.isEmpty()) { + if (!entries.isEmpty() || !scanResult.getFullScans().isEmpty()) { timeoutTracker.madeProgress(); } @@ -866,43 +866,45 @@ static void doLookup(ClientContext context, String server, Map(scanResult.results.size()); - for (TKeyValue kv : scanResult.results) { - entries.add(new SimpleImmutableEntry<>(new Key(kv.key), new Value(kv.value))); + entries = new ArrayList<>(scanResult.getResultsSize()); + for (TKeyValue kv : scanResult.getResults()) { + entries.add(new SimpleImmutableEntry<>(new Key(kv.getKey()), new Value(kv.getValue()))); } if (!entries.isEmpty()) { receiver.receive(entries); } - if (!entries.isEmpty() || !scanResult.fullScans.isEmpty()) { + if (!entries.isEmpty() || !scanResult.getFullScans().isEmpty()) { timeoutTracker.madeProgress(); } trackScanning(failures, unscanned, scanResult); } - client.closeMultiScan(TraceUtil.traceInfo(), imsr.scanID); + client.closeMultiScan(TraceUtil.traceInfo(), imsr.getScanID()); } finally { ThriftUtil.returnClient(client, context); @@ -913,7 +915,7 @@ static void doLookup(ClientContext context, String server, Map tables; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.util.Set tables; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -10569,9 +10569,9 @@ public static class getDiskUsage_result implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required - public @org.apache.thrift.annotation.Nullable ThriftTableOperationException toe; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable ThriftTableOperationException toe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -11215,8 +11215,8 @@ public static class listLocalUsers_args implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.Set success; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -12246,10 +12246,10 @@ public static class createLocalUser_args implements org.apache.thrift.TBase authorizations; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String principal; // required + private @org.apache.thrift.annotation.Nullable java.util.List authorizations; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -18232,7 +18232,7 @@ public static class changeAuthorizations_result implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new changeAuthorizations_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new changeAuthorizations_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -18614,9 +18614,9 @@ public static class getUserAuthorizations_args implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserAuthorizations_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserAuthorizations_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String principal; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String principal; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -19212,8 +19212,8 @@ public static class getUserAuthorizations_result implements org.apache.thrift.TB private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserAuthorizations_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserAuthorizations_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.util.List success; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -19749,10 +19749,10 @@ public static class hasSystemPermission_args implements org.apache.thrift.TBase< private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new hasSystemPermission_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new hasSystemPermission_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String principal; // required - public byte sysPerm; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String principal; // required + private byte sysPerm; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -20446,8 +20446,8 @@ public static class hasSystemPermission_result implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new hasSystemPermission_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new hasSystemPermission_resultTupleSchemeFactory(); - public boolean success; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private boolean success; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -20931,11 +20931,11 @@ public static class hasTablePermission_args implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.Map success; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -32188,8 +32184,8 @@ public static class getSystemProperties_args implements org.apache.thrift.TBase< private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getSystemProperties_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getSystemProperties_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -32682,8 +32678,8 @@ public static class getSystemProperties_result implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getSystemProperties_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getSystemProperties_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.util.Map success; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.Map success; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -33219,8 +33215,8 @@ public static class getVersionedSystemProperties_args implements org.apache.thri private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersionedSystemProperties_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersionedSystemProperties_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -33713,8 +33709,8 @@ public static class getVersionedSystemProperties_result implements org.apache.th private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersionedSystemProperties_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersionedSystemProperties_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -34204,9 +34200,9 @@ public static class getTableConfiguration_args implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getTableConfiguration_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getTableConfiguration_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -34803,9 +34799,9 @@ public static class getTableConfiguration_result implements org.apache.thrift.TB private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getTableConfiguration_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getTableConfiguration_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.util.Map success; // required - public @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.Map success; // required + private @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -35447,9 +35443,9 @@ public static class getTableProperties_args implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.Map success; // required + private @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -36690,9 +36686,9 @@ public static class getVersionedTableProperties_args implements org.apache.thrif private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersionedTableProperties_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersionedTableProperties_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -37289,9 +37285,9 @@ public static class getVersionedTableProperties_result implements org.apache.thr private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersionedTableProperties_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersionedTableProperties_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required - public @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required + private @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -37886,9 +37882,9 @@ public static class getNamespaceConfiguration_args implements org.apache.thrift. private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getNamespaceConfiguration_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getNamespaceConfiguration_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String ns; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -38485,9 +38481,9 @@ public static class getNamespaceConfiguration_result implements org.apache.thrif private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getNamespaceConfiguration_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getNamespaceConfiguration_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.util.Map success; // required - public @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.Map success; // required + private @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -39129,9 +39125,9 @@ public static class getNamespaceProperties_args implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getNamespaceProperties_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getNamespaceProperties_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String ns; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -39728,9 +39724,9 @@ public static class getNamespaceProperties_result implements org.apache.thrift.T private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getNamespaceProperties_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getNamespaceProperties_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.util.Map success; // required - public @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.Map success; // required + private @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -40372,9 +40368,9 @@ public static class getVersionedNamespaceProperties_args implements org.apache.t private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersionedNamespaceProperties_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersionedNamespaceProperties_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required + private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String ns; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -40971,9 +40967,9 @@ public static class getVersionedNamespaceProperties_result implements org.apache private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersionedNamespaceProperties_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersionedNamespaceProperties_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required - public @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required + private @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required + private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -41569,10 +41565,10 @@ public static class checkClass_args implements org.apache.thrift.TBase tables; // required - public long usage; // required + private @org.apache.thrift.annotation.Nullable java.util.List tables; // required + private long usage; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TInfo.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TInfo.java index d5b95812b1a..18b85aeba02 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TInfo.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TInfo.java @@ -33,7 +33,7 @@ public class TInfo implements org.apache.thrift.TBase, jav private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TInfoStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TInfoTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.util.Map headers; // required + private @org.apache.thrift.annotation.Nullable java.util.Map headers; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TVersionedProperties.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TVersionedProperties.java index 3a8efb7f87d..ab2c1dfe9c7 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TVersionedProperties.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TVersionedProperties.java @@ -34,8 +34,8 @@ public class TVersionedProperties implements org.apache.thrift.TBase properties; // required + private long version; // required + private @org.apache.thrift.annotation.Nullable java.util.Map properties; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftConcurrentModificationException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftConcurrentModificationException.java index 1da23a9ac94..48d19dbf4b4 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftConcurrentModificationException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftConcurrentModificationException.java @@ -33,7 +33,7 @@ public class ThriftConcurrentModificationException extends org.apache.thrift.TEx private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftConcurrentModificationExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftConcurrentModificationExceptionTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.lang.String description; // required + private @org.apache.thrift.annotation.Nullable java.lang.String description; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java index 585f3a51290..d84ddcdbd31 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java @@ -34,8 +34,8 @@ public class ThriftNotActiveServiceException extends org.apache.thrift.TExceptio private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftNotActiveServiceExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftNotActiveServiceExceptionTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.lang.String serv; // required - public @org.apache.thrift.annotation.Nullable java.lang.String description; // required + private @org.apache.thrift.annotation.Nullable java.lang.String serv; // required + private @org.apache.thrift.annotation.Nullable java.lang.String description; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java index 6b765a14816..3305d5342ca 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java @@ -34,12 +34,8 @@ public class ThriftSecurityException extends org.apache.thrift.TException implem private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftSecurityExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftSecurityExceptionTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.lang.String user; // required - /** - * - * @see SecurityErrorCode - */ - public @org.apache.thrift.annotation.Nullable SecurityErrorCode code; // required + private @org.apache.thrift.annotation.Nullable java.lang.String user; // required + private @org.apache.thrift.annotation.Nullable SecurityErrorCode code; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java index 5393c038c0f..97bf84de922 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java @@ -37,19 +37,11 @@ public class ThriftTableOperationException extends org.apache.thrift.TException private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftTableOperationExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftTableOperationExceptionTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.lang.String tableId; // required - public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required - /** - * - * @see TableOperation - */ - public @org.apache.thrift.annotation.Nullable TableOperation op; // required - /** - * - * @see TableOperationExceptionType - */ - public @org.apache.thrift.annotation.Nullable TableOperationExceptionType type; // required - public @org.apache.thrift.annotation.Nullable java.lang.String description; // required + private @org.apache.thrift.annotation.Nullable java.lang.String tableId; // required + private @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required + private @org.apache.thrift.annotation.Nullable TableOperation op; // required + private @org.apache.thrift.annotation.Nullable TableOperationExceptionType type; // required + private @org.apache.thrift.annotation.Nullable java.lang.String description; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java index 790a3f55823..4b72fff40d0 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java @@ -870,7 +870,7 @@ public static class success_result implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -3808,9 +3808,9 @@ public static class cancel_args implements org.apache.thrift.TBase updates; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob job; // required + private @org.apache.thrift.annotation.Nullable java.lang.String queueName; // required + private @org.apache.thrift.annotation.Nullable java.lang.String compactor; // required + private @org.apache.thrift.annotation.Nullable java.util.Map updates; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob job; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompactionList.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompactionList.java index e51aeaa3331..bbfbba0ae70 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompactionList.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TExternalCompactionList.java @@ -33,7 +33,7 @@ public class TExternalCompactionList implements org.apache.thrift.TBase compactions; // required + private @org.apache.thrift.annotation.Nullable java.util.Map compactions; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java index 721a79a0429..f583857a1c4 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java @@ -34,8 +34,8 @@ public class InitialMultiScan implements org.apache.thrift.TBase results; // required - public @org.apache.thrift.annotation.Nullable java.util.Map> failures; // required - public @org.apache.thrift.annotation.Nullable java.util.List fullScans; // required - public @org.apache.thrift.annotation.Nullable TKeyExtent partScan; // required - public @org.apache.thrift.annotation.Nullable TKey partNextKey; // required - public boolean partNextKeyInclusive; // required - public boolean more; // required + private @org.apache.thrift.annotation.Nullable java.util.List results; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> failures; // required + private @org.apache.thrift.annotation.Nullable java.util.List fullScans; // required + private @org.apache.thrift.annotation.Nullable TKeyExtent partScan; // required + private @org.apache.thrift.annotation.Nullable TKey partNextKey; // required + private boolean partNextKeyInclusive; // required + private boolean more; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java index ff872d0608a..62ce1339614 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java @@ -34,8 +34,8 @@ public class ScanResult implements org.apache.thrift.TBase results; // required - public boolean more; // required + private @org.apache.thrift.annotation.Nullable java.util.List results; // required + private boolean more; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java index 0b735e12c3c..67459d1e7fc 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java @@ -34,12 +34,8 @@ public class TCMResult implements org.apache.thrift.TBase conditions; // required - public @org.apache.thrift.annotation.Nullable TMutation mutation; // required - public long id; // required + private @org.apache.thrift.annotation.Nullable java.util.List conditions; // required + private @org.apache.thrift.annotation.Nullable TMutation mutation; // required + private long id; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java index 9e652757f21..f5f85b18ee8 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java @@ -35,9 +35,9 @@ public class TConditionalSession implements org.apache.thrift.TBase, java.i private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TKeyStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TKeyTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer row; // required - public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer colFamily; // required - public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer colQualifier; // required - public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer colVisibility; // required - public long timestamp; // required + private @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer row; // required + private @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer colFamily; // required + private @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer colQualifier; // required + private @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer colVisibility; // required + private long timestamp; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java index 960a2032c13..a6f02914fb3 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java @@ -35,9 +35,9 @@ public class TKeyExtent implements org.apache.thrift.TBase values; // required - public int entries; // required - public @org.apache.thrift.annotation.Nullable java.util.List sources; // optional + private @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer row; // required + private @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer data; // required + private @org.apache.thrift.annotation.Nullable java.util.List values; // required + private int entries; // required + private @org.apache.thrift.annotation.Nullable java.util.List sources; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java index ee3cca19b7a..ab8ca32a3d7 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java @@ -38,12 +38,12 @@ public class TRange implements org.apache.thrift.TBase, private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TRangeStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TRangeTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TKey start; // required - public @org.apache.thrift.annotation.Nullable TKey stop; // required - public boolean startKeyInclusive; // required - public boolean stopKeyInclusive; // required - public boolean infiniteStartKey; // required - public boolean infiniteStopKey; // required + private @org.apache.thrift.annotation.Nullable TKey start; // required + private @org.apache.thrift.annotation.Nullable TKey stop; // required + private boolean startKeyInclusive; // required + private boolean stopKeyInclusive; // required + private boolean infiniteStartKey; // required + private boolean infiniteStopKey; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java index 8f241ab842d..f6e5f775ef0 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java @@ -34,8 +34,8 @@ public class TRowRange implements org.apache.thrift.TBase summaries; // required + private boolean finished; // required + private long sessionId; // required + private long totalFiles; // required + private long deletedFiles; // required + private @org.apache.thrift.annotation.Nullable java.util.List summaries; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java index 702725a8871..e63a346af2b 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java @@ -35,9 +35,9 @@ public class TSummarizerConfiguration implements org.apache.thrift.TBase options; // required - public @org.apache.thrift.annotation.Nullable java.lang.String configId; // required + private @org.apache.thrift.annotation.Nullable java.lang.String classname; // required + private @org.apache.thrift.annotation.Nullable java.util.Map options; // required + private @org.apache.thrift.annotation.Nullable java.lang.String configId; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java index 472cf7b2cbf..82c57be87c0 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java @@ -37,11 +37,11 @@ public class TSummary implements org.apache.thrift.TBase summary; // required - public @org.apache.thrift.annotation.Nullable TSummarizerConfiguration config; // required - public long filesContaining; // required - public long filesExceeding; // required - public long filesLarge; // required + private @org.apache.thrift.annotation.Nullable java.util.Map summary; // required + private @org.apache.thrift.annotation.Nullable TSummarizerConfiguration config; // required + private long filesContaining; // required + private long filesExceeding; // required + private long filesLarge; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java index f10479346f0..a32c5b9f4b4 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java @@ -36,10 +36,10 @@ public class TSummaryRequest implements org.apache.thrift.TBase summarizers; // required - public @org.apache.thrift.annotation.Nullable java.lang.String summarizerPattern; // required + private @org.apache.thrift.annotation.Nullable java.lang.String tableId; // required + private @org.apache.thrift.annotation.Nullable TRowRange bounds; // required + private @org.apache.thrift.annotation.Nullable java.util.List summarizers; // required + private @org.apache.thrift.annotation.Nullable java.lang.String summarizerPattern; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java index 84943e92c50..92a8f27456e 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java @@ -35,9 +35,9 @@ public class UpdateErrors implements org.apache.thrift.TBase failedExtents; // required - public @org.apache.thrift.annotation.Nullable java.util.List violationSummaries; // required - public @org.apache.thrift.annotation.Nullable java.util.Map authorizationFailures; // required + private @org.apache.thrift.annotation.Nullable java.util.Map failedExtents; // required + private @org.apache.thrift.annotation.Nullable java.util.List violationSummaries; // required + private @org.apache.thrift.annotation.Nullable java.util.Map authorizationFailures; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java index 840a5e58df2..d95e55414ac 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java @@ -295,8 +295,8 @@ public static class getStatus_args implements org.apache.thrift.TBase arguments; // required - public @org.apache.thrift.annotation.Nullable java.util.Map options; // required - public boolean autoClean; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private long opid; // required + private @org.apache.thrift.annotation.Nullable FateOperation op; // required + private @org.apache.thrift.annotation.Nullable java.util.List arguments; // required + private @org.apache.thrift.annotation.Nullable java.util.Map options; // required + private boolean autoClean; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -3295,9 +3291,9 @@ public static class executeFateOperation_result implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new executeFateOperation_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new executeFateOperation_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -3889,9 +3885,9 @@ public static class waitForFateOperation_args implements org.apache.thrift.TBase private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFateOperation_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFateOperation_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public long opid; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private long opid; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -4484,10 +4480,10 @@ public static class waitForFateOperation_result implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFateOperation_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFateOperation_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.lang.String success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + private @org.apache.thrift.annotation.Nullable java.lang.String success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -5182,9 +5178,9 @@ public static class finishFateOperation_args implements org.apache.thrift.TBase< private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new finishFateOperation_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new finishFateOperation_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public long opid; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private long opid; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -5775,8 +5771,8 @@ public static class finishFateOperation_result implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new finishFateOperation_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new finishFateOperation_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -6263,9 +6259,9 @@ public static class cancelFateOperation_args implements org.apache.thrift.TBase< private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new cancelFateOperation_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new cancelFateOperation_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public long opid; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private long opid; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -6857,9 +6853,9 @@ public static class cancelFateOperation_result implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new cancelFateOperation_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new cancelFateOperation_resultTupleSchemeFactory(); - public boolean success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + private boolean success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java index b2c82b50386..c39b387f263 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java @@ -3910,9 +3910,9 @@ public static class initiateFlush_args implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -26961,9 +26953,9 @@ public static class getDelegationToken_args implements org.apache.thrift.TBase tableMap; // required - public @org.apache.thrift.annotation.Nullable java.util.List tServerInfo; // required - public @org.apache.thrift.annotation.Nullable java.util.Map badTServers; // required - /** - * - * @see ManagerState - */ - public @org.apache.thrift.annotation.Nullable ManagerState state; // required - /** - * - * @see ManagerGoalState - */ - public @org.apache.thrift.annotation.Nullable ManagerGoalState goalState; // required - public int unassignedTablets; // required - public @org.apache.thrift.annotation.Nullable java.util.Set serversShuttingDown; // required - public @org.apache.thrift.annotation.Nullable java.util.List deadTabletServers; // required - public @org.apache.thrift.annotation.Nullable java.util.List bulkImports; // required + private @org.apache.thrift.annotation.Nullable java.util.Map tableMap; // required + private @org.apache.thrift.annotation.Nullable java.util.List tServerInfo; // required + private @org.apache.thrift.annotation.Nullable java.util.Map badTServers; // required + private @org.apache.thrift.annotation.Nullable ManagerState state; // required + private @org.apache.thrift.annotation.Nullable ManagerGoalState goalState; // required + private int unassignedTablets; // required + private @org.apache.thrift.annotation.Nullable java.util.Set serversShuttingDown; // required + private @org.apache.thrift.annotation.Nullable java.util.List deadTabletServers; // required + private @org.apache.thrift.annotation.Nullable java.util.List bulkImports; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryStatus.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryStatus.java index 021911c43c5..ac71a8f9be0 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryStatus.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryStatus.java @@ -35,9 +35,9 @@ public class RecoveryStatus implements org.apache.thrift.TBase tableMap; // required - public long lastContact; // required - public @org.apache.thrift.annotation.Nullable java.lang.String name; // required - public double osLoad; // required - public long holdTime; // required - public long lookups; // required - public long indexCacheHits; // required - public long indexCacheRequest; // required - public long dataCacheHits; // required - public long dataCacheRequest; // required - public @org.apache.thrift.annotation.Nullable java.util.List logSorts; // required - public long flushs; // required - public long syncs; // required - public @org.apache.thrift.annotation.Nullable java.util.List bulkImports; // required - public @org.apache.thrift.annotation.Nullable java.lang.String version; // required - public long responseTime; // required + private @org.apache.thrift.annotation.Nullable java.util.Map tableMap; // required + private long lastContact; // required + private @org.apache.thrift.annotation.Nullable java.lang.String name; // required + private double osLoad; // required + private long holdTime; // required + private long lookups; // required + private long indexCacheHits; // required + private long indexCacheRequest; // required + private long dataCacheHits; // required + private long dataCacheRequest; // required + private @org.apache.thrift.annotation.Nullable java.util.List logSorts; // required + private long flushs; // required + private long syncs; // required + private @org.apache.thrift.annotation.Nullable java.util.List bulkImports; // required + private @org.apache.thrift.annotation.Nullable java.lang.String version; // required + private long responseTime; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java index 871ffb4137a..e8097f12d24 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java @@ -34,8 +34,8 @@ public class TabletSplit implements org.apache.thrift.TBase newTablets; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent oldTablet; // required + private @org.apache.thrift.annotation.Nullable java.util.List newTablets; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java index 9ce07396ca1..eed2b8b818a 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java @@ -35,9 +35,9 @@ public class ThriftPropertyException extends org.apache.thrift.TException implem private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftPropertyExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftPropertyExceptionTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.lang.String property; // required - public @org.apache.thrift.annotation.Nullable java.lang.String value; // required - public @org.apache.thrift.annotation.Nullable java.lang.String description; // required + private @org.apache.thrift.annotation.Nullable java.lang.String property; // required + private @org.apache.thrift.annotation.Nullable java.lang.String value; // required + private @org.apache.thrift.annotation.Nullable java.lang.String description; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java index 4deb255f546..e62fe55c2eb 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java @@ -36,10 +36,10 @@ public class TAuthenticationKey implements org.apache.thrift.TBase violationSummaries; // required + private @org.apache.thrift.annotation.Nullable java.util.List violationSummaries; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletingest/thrift/DataFileInfo.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletingest/thrift/DataFileInfo.java index 12276fd878d..6fdf26cfe7b 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletingest/thrift/DataFileInfo.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletingest/thrift/DataFileInfo.java @@ -33,7 +33,7 @@ public class DataFileInfo implements org.apache.thrift.TBase mutations; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private long updateID; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent keyExtent; // required + private @org.apache.thrift.annotation.Nullable java.util.List mutations; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -3463,8 +3459,8 @@ public static class closeUpdate_args implements org.apache.thrift.TBase authorizations; // required - public @org.apache.thrift.annotation.Nullable java.lang.String tableID; // required - /** - * - * @see TDurability - */ - public @org.apache.thrift.annotation.Nullable TDurability durability; // required - public @org.apache.thrift.annotation.Nullable java.lang.String classLoaderContext; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.util.List authorizations; // required + private @org.apache.thrift.annotation.Nullable java.lang.String tableID; // required + private @org.apache.thrift.annotation.Nullable TDurability durability; // required + private @org.apache.thrift.annotation.Nullable java.lang.String classLoaderContext; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -6846,8 +6834,8 @@ public static class startConditionalUpdate_result implements org.apache.thrift.T private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new startConditionalUpdate_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new startConditionalUpdate_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TConditionalSession success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TConditionalSession success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -7338,10 +7326,10 @@ public static class conditionalUpdate_args implements org.apache.thrift.TBase> mutations; // required - public @org.apache.thrift.annotation.Nullable java.util.List symbols; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private long sessID; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> mutations; // required + private @org.apache.thrift.annotation.Nullable java.util.List symbols; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -8180,8 +8168,8 @@ public static class conditionalUpdate_result implements org.apache.thrift.TBase< private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new conditionalUpdate_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new conditionalUpdate_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.util.List success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException nssi; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException nssi; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -8720,8 +8708,8 @@ public static class invalidateConditionalUpdate_args implements org.apache.thrif private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new invalidateConditionalUpdate_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new invalidateConditionalUpdate_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public long sessID; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private long sessID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -9469,8 +9457,8 @@ public static class closeConditionalUpdate_args implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new closeConditionalUpdate_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new closeConditionalUpdate_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public long sessID; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private long sessID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -9957,12 +9945,12 @@ public static class loadFiles_args implements org.apache.thrift.TBase> files; // required - public boolean setTime; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private long tid; // required + private @org.apache.thrift.annotation.Nullable java.lang.String dir; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> files; // required + private boolean setTime; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/ActiveScan.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/ActiveScan.java index 248e5884757..cbae8a567ce 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/ActiveScan.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/ActiveScan.java @@ -46,28 +46,20 @@ public class ActiveScan implements org.apache.thrift.TBase columns; // required - public @org.apache.thrift.annotation.Nullable java.util.List ssiList; // required - public @org.apache.thrift.annotation.Nullable java.util.Map> ssio; // required - public @org.apache.thrift.annotation.Nullable java.util.List authorizations; // required - public long scanId; // optional - public @org.apache.thrift.annotation.Nullable java.lang.String classLoaderContext; // required + private @org.apache.thrift.annotation.Nullable java.lang.String client; // required + private @org.apache.thrift.annotation.Nullable java.lang.String user; // required + private @org.apache.thrift.annotation.Nullable java.lang.String tableId; // required + private long age; // required + private long idleTime; // required + private @org.apache.thrift.annotation.Nullable ScanType type; // required + private @org.apache.thrift.annotation.Nullable ScanState state; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private @org.apache.thrift.annotation.Nullable java.util.List columns; // required + private @org.apache.thrift.annotation.Nullable java.util.List ssiList; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> ssio; // required + private @org.apache.thrift.annotation.Nullable java.util.List authorizations; // required + private long scanId; // optional + private @org.apache.thrift.annotation.Nullable java.lang.String classLoaderContext; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TSampleNotPresentException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TSampleNotPresentException.java index 3d0ea9bf174..2a317833b32 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TSampleNotPresentException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TSampleNotPresentException.java @@ -33,7 +33,7 @@ public class TSampleNotPresentException extends org.apache.thrift.TException imp private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TSampleNotPresentExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TSampleNotPresentExceptionTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TSamplerConfiguration.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TSamplerConfiguration.java index ff870bbe7cb..1a770be5b92 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TSamplerConfiguration.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TSamplerConfiguration.java @@ -34,8 +34,8 @@ public class TSamplerConfiguration implements org.apache.thrift.TBase options; // required + private @org.apache.thrift.annotation.Nullable java.lang.String className; // required + private @org.apache.thrift.annotation.Nullable java.util.Map options; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TabletScanClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TabletScanClientService.java index c84c8d6a9a3..a2a4ce6cffd 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TabletScanClientService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TabletScanClientService.java @@ -1527,23 +1527,23 @@ public static class startScan_args implements org.apache.thrift.TBase columns; // required - public int batchSize; // required - public @org.apache.thrift.annotation.Nullable java.util.List ssiList; // required - public @org.apache.thrift.annotation.Nullable java.util.Map> ssio; // required - public @org.apache.thrift.annotation.Nullable java.util.List authorizations; // required - public boolean waitForWrites; // required - public boolean isolated; // required - public long readaheadThreshold; // required - public @org.apache.thrift.annotation.Nullable TSamplerConfiguration samplerConfig; // required - public long batchTimeOut; // required - public @org.apache.thrift.annotation.Nullable java.lang.String classLoaderContext; // required - public @org.apache.thrift.annotation.Nullable java.util.Map executionHints; // required - public long busyTimeout; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TRange range; // required + private @org.apache.thrift.annotation.Nullable java.util.List columns; // required + private int batchSize; // required + private @org.apache.thrift.annotation.Nullable java.util.List ssiList; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> ssio; // required + private @org.apache.thrift.annotation.Nullable java.util.List authorizations; // required + private boolean waitForWrites; // required + private boolean isolated; // required + private long readaheadThreshold; // required + private @org.apache.thrift.annotation.Nullable TSamplerConfiguration samplerConfig; // required + private long batchTimeOut; // required + private @org.apache.thrift.annotation.Nullable java.lang.String classLoaderContext; // required + private @org.apache.thrift.annotation.Nullable java.util.Map executionHints; // required + private long busyTimeout; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -3865,12 +3865,12 @@ public static class startScan_result implements org.apache.thrift.TBase> batch; // required - public @org.apache.thrift.annotation.Nullable java.util.List columns; // required - public @org.apache.thrift.annotation.Nullable java.util.List ssiList; // required - public @org.apache.thrift.annotation.Nullable java.util.Map> ssio; // required - public @org.apache.thrift.annotation.Nullable java.util.List authorizations; // required - public boolean waitForWrites; // required - public @org.apache.thrift.annotation.Nullable TSamplerConfiguration samplerConfig; // required - public long batchTimeOut; // required - public @org.apache.thrift.annotation.Nullable java.lang.String classLoaderContext; // required - public @org.apache.thrift.annotation.Nullable java.util.Map executionHints; // required - public long busyTimeout; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> batch; // required + private @org.apache.thrift.annotation.Nullable java.util.List columns; // required + private @org.apache.thrift.annotation.Nullable java.util.List ssiList; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> ssio; // required + private @org.apache.thrift.annotation.Nullable java.util.List authorizations; // required + private boolean waitForWrites; // required + private @org.apache.thrift.annotation.Nullable TSamplerConfiguration samplerConfig; // required + private long batchTimeOut; // required + private @org.apache.thrift.annotation.Nullable java.lang.String classLoaderContext; // required + private @org.apache.thrift.annotation.Nullable java.util.Map executionHints; // required + private long busyTimeout; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -8809,10 +8809,10 @@ public static class startMultiScan_result implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TooManyFilesException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TooManyFilesException.java index b66641cd26d..d956a7a980e 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TooManyFilesException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletscan/thrift/TooManyFilesException.java @@ -33,7 +33,7 @@ public class TooManyFilesException extends org.apache.thrift.TException implemen private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TooManyFilesExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TooManyFilesExceptionTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java index ef970b002d9..d7426076be1 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java @@ -40,14 +40,14 @@ public class ActionStats implements org.apache.thrift.TBase inputFiles; // required - public @org.apache.thrift.annotation.Nullable java.lang.String outputFile; // required - /** - * - * @see TCompactionType - */ - public @org.apache.thrift.annotation.Nullable TCompactionType type; // required - /** - * - * @see TCompactionReason - */ - public @org.apache.thrift.annotation.Nullable TCompactionReason reason; // required - public @org.apache.thrift.annotation.Nullable java.lang.String localityGroup; // required - public long entriesRead; // required - public long entriesWritten; // required - public @org.apache.thrift.annotation.Nullable java.util.List ssiList; // required - public @org.apache.thrift.annotation.Nullable java.util.Map> ssio; // required - public long timesPaused; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private long age; // required + private @org.apache.thrift.annotation.Nullable java.util.List inputFiles; // required + private @org.apache.thrift.annotation.Nullable java.lang.String outputFile; // required + private @org.apache.thrift.annotation.Nullable TCompactionType type; // required + private @org.apache.thrift.annotation.Nullable TCompactionReason reason; // required + private @org.apache.thrift.annotation.Nullable java.lang.String localityGroup; // required + private long entriesRead; // required + private long entriesWritten; // required + private @org.apache.thrift.annotation.Nullable java.util.List ssiList; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> ssio; // required + private long timesPaused; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java index b0bea134d31..5cca642cf9a 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java @@ -36,10 +36,10 @@ public class InputFile implements org.apache.thrift.TBase iterators; // required + private @org.apache.thrift.annotation.Nullable java.util.List iterators; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java index 403fb755197..22c95b13912 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java @@ -33,7 +33,7 @@ public class NotServingTabletException extends org.apache.thrift.TException impl private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NotServingTabletExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NotServingTabletExceptionTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java index 3cb3b853d08..bdd28ee7f0a 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java @@ -34,8 +34,8 @@ public class TCompactionQueueSummary implements org.apache.thrift.TBase files; // required - public @org.apache.thrift.annotation.Nullable IteratorConfig iteratorSettings; // required - public @org.apache.thrift.annotation.Nullable java.lang.String outputFile; // required - public boolean propagateDeletes; // required - public @org.apache.thrift.annotation.Nullable TCompactionKind kind; // required - public long userCompactionId; // required - public @org.apache.thrift.annotation.Nullable java.util.Map overrides; // required + private @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private @org.apache.thrift.annotation.Nullable java.util.List files; // required + private @org.apache.thrift.annotation.Nullable IteratorConfig iteratorSettings; // required + private @org.apache.thrift.annotation.Nullable java.lang.String outputFile; // required + private boolean propagateDeletes; // required + private @org.apache.thrift.annotation.Nullable TCompactionKind kind; // required + private long userCompactionId; // required + private @org.apache.thrift.annotation.Nullable java.util.Map overrides; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java index cbf08413a56..133abb0da91 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java @@ -36,10 +36,10 @@ public class TIteratorSetting implements org.apache.thrift.TBase properties; // required + private int priority; // required + private @org.apache.thrift.annotation.Nullable java.lang.String name; // required + private @org.apache.thrift.annotation.Nullable java.lang.String iteratorClass; // required + private @org.apache.thrift.annotation.Nullable java.util.Map properties; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletServerClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletServerClientService.java index e627c4f48d6..65dfd5aa905 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletServerClientService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletServerClientService.java @@ -3081,12 +3081,12 @@ public static class flush_args implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -7080,8 +7080,8 @@ public static class getHistoricalStats_args implements org.apache.thrift.TBase success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -10677,9 +10677,9 @@ public static class removeLogs_args implements org.apache.thrift.TBase filenames; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.util.List filenames; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -11325,8 +11325,8 @@ public static class getActiveLogs_args implements org.apache.thrift.TBase success; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -12248,9 +12248,9 @@ public static class startGetSummaries_args implements org.apache.thrift.TBase> files; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TSummaryRequest request; // required + private @org.apache.thrift.annotation.Nullable java.util.Map> files; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -15548,8 +15548,8 @@ public static class startGetSummariesFromFiles_result implements org.apache.thri private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new startGetSummariesFromFiles_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new startGetSummariesFromFiles_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TSummaries success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TSummaries success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -16038,8 +16038,8 @@ public static class contiuneGetSummaries_args implements org.apache.thrift.TBase private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new contiuneGetSummaries_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new contiuneGetSummaries_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public long sessionId; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private long sessionId; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -16522,8 +16522,8 @@ public static class contiuneGetSummaries_result implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new contiuneGetSummaries_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new contiuneGetSummaries_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TSummaries success; // required - public @org.apache.thrift.annotation.Nullable NoSuchScanIDException nssi; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TSummaries success; // required + private @org.apache.thrift.annotation.Nullable NoSuchScanIDException nssi; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -17012,8 +17012,8 @@ public static class getCompactionQueueInfo_args implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCompactionQueueInfo_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCompactionQueueInfo_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -17506,8 +17506,8 @@ public static class getCompactionQueueInfo_result implements org.apache.thrift.T private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCompactionQueueInfo_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCompactionQueueInfo_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.util.List success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable java.util.List success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -18050,12 +18050,12 @@ public static class reserveCompactionJob_args implements org.apache.thrift.TBase private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new reserveCompactionJob_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new reserveCompactionJob_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String queueName; // required - public long priority; // required - public @org.apache.thrift.annotation.Nullable java.lang.String compactor; // required - public @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String queueName; // required + private long priority; // required + private @org.apache.thrift.annotation.Nullable java.lang.String compactor; // required + private @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -18955,8 +18955,8 @@ public static class reserveCompactionJob_result implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new reserveCompactionJob_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new reserveCompactionJob_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable TExternalCompactionJob success; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + private @org.apache.thrift.annotation.Nullable TExternalCompactionJob success; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -19449,12 +19449,12 @@ public static class compactionJobFinished_args implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new compactionJobFinished_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new compactionJobFinished_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required - public long fileSize; // required - public long entries; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private long fileSize; // required + private long entries; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -20352,10 +20352,10 @@ public static class compactionJobFailed_args implements org.apache.thrift.TBase< private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new compactionJobFailed_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new compactionJobFailed_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + private @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required + private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java index d4aa10b1a32..d125309852d 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java @@ -40,14 +40,14 @@ public class TabletStats implements org.apache.thrift.TBase tservers = new ArrayList<>(); - for (TabletServerStatus up : mmi.tServerInfo) { - tservers.add(up.name); + for (TabletServerStatus up : mmi.getTServerInfo()) { + tservers.add(up.getName()); } - for (DeadServer down : mmi.deadTabletServers) { - tservers.add(down.server); + for (DeadServer down : mmi.getDeadTabletServers()) { + tservers.add(down.getServer()); } List managers = monitor.getContext().getManagerLocations(); String manager = managers.isEmpty() ? "Down" : AddressUtil.parseAddress(managers.get(0), false).getHost(); - int onlineTabletServers = mmi.tServerInfo.size(); + int onlineTabletServers = mmi.getTServerInfoSize(); int totalTabletServers = tservers.size(); int tablets = monitor.getTotalTabletCount(); - int unassignedTablets = mmi.unassignedTablets; + int unassignedTablets = mmi.getUnassignedTablets(); long entries = monitor.getTotalEntries(); double ingest = monitor.getTotalIngestRate(); double entriesRead = monitor.getTotalScanRate(); @@ -115,7 +116,7 @@ public static ManagerInformation getTables(Monitor monitor) { double osLoad = ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage(); int tables = monitor.getTotalTables(); - int deadTabletServers = mmi.deadTabletServers.size(); + int deadTabletServers = mmi.getDeadTabletServersSize(); long lookups = monitor.getTotalLookups(); long uptime = System.currentTimeMillis() - monitor.getStartTime(); @@ -140,7 +141,7 @@ public static String getState(Monitor monitor) { if (mmi == null) { return NO_MANAGERS; } - return mmi.state.toString(); + return mmi.getState().toString(); } /** @@ -153,7 +154,7 @@ public static String getGoalState(Monitor monitor) { if (mmi == null) { return NO_MANAGERS; } - return mmi.goalState.name(); + return mmi.getGoalState().name(); } /** @@ -169,9 +170,9 @@ public static DeadServerList getDeadTservers(Monitor monitor) { DeadServerList deadServers = new DeadServerList(); // Add new dead servers to the list - for (DeadServer dead : mmi.deadTabletServers) { - deadServers - .addDeadServer(new DeadServerInformation(dead.server, dead.lastStatus, dead.status)); + for (DeadServer dead : mmi.getDeadTabletServers()) { + deadServers.addDeadServer( + new DeadServerInformation(dead.getServer(), dead.getLastStatus(), dead.getStatus())); } return deadServers; } @@ -189,9 +190,9 @@ public static DeadLoggerList getDeadLoggers(Monitor monitor) { DeadLoggerList deadLoggers = new DeadLoggerList(); // Add new dead loggers to the list - for (DeadServer dead : mmi.deadTabletServers) { - deadLoggers - .addDeadLogger(new DeadLoggerInformation(dead.server, dead.lastStatus, dead.status)); + for (DeadServer dead : mmi.getDeadTabletServers()) { + deadLoggers.addDeadLogger( + new DeadLoggerInformation(dead.getServer(), dead.getLastStatus(), dead.getStatus())); } return deadLoggers; } @@ -241,7 +242,7 @@ public static ServersShuttingDown getServersShuttingDown(Monitor monitor) { } // Add new servers to the list - for (String server : mmi.serversShuttingDown) { + for (String server : mmi.getServersShuttingDown()) { servers.addServerShuttingDown(new ServerShuttingDownInformation(server)); } return servers; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java index 50179f20e06..08b87d7ac4f 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java @@ -39,20 +39,21 @@ public void updateTime(Operation operation, long queued, long start, long count, try { ActionStats data = map[operation.ordinal()]; if (failed) { - data.fail++; - data.status--; + data.setFail(data.getFail() + 1); + data.setStatus(data.getStatus() - 1); } else { double t = (System.currentTimeMillis() - start) / 1000.0; double q = (start - queued) / 1000.0; - data.status--; - data.count += count; - data.num++; - data.elapsed += t; - data.queueTime += q; - data.sumDev += t * t; - data.queueSumDev += q * q; - if (data.elapsed < 0 || data.sumDev < 0 || data.queueSumDev < 0 || data.queueTime < 0) { + data.setStatus(data.getStatus() - 1); + data.setCount(data.getCount() + count); + data.setNum(data.getNum() + 1); + data.setElapsed(data.getElapsed() + t); + data.setQueueTime(data.getQueueTime() + q); + data.setSumDev(data.getSumDev() + t * t); + data.setQueueSumDev(data.getQueueSumDev() + q * q); + if (data.getElapsed() < 0 || data.getSumDev() < 0 || data.getQueueSumDev() < 0 + || data.getQueueTime() < 0) { resetTimes(); } } @@ -66,17 +67,18 @@ public void updateTime(Operation operation, long start, boolean failed) { try { ActionStats data = map[operation.ordinal()]; if (failed) { - data.fail++; - data.status--; + data.setFail(data.getFail() + 1); + data.setStatus(data.getStatus() - 1); } else { double t = (System.currentTimeMillis() - start) / 1000.0; - data.status--; - data.num++; - data.elapsed += t; - data.sumDev += t * t; + data.setStatus(data.getStatus() - 1); + data.setNum(data.getNum() + 1); + data.setElapsed(data.getElapsed() + t); + data.setSumDev(data.getSumDev() + t * t); - if (data.elapsed < 0 || data.sumDev < 0 || data.queueSumDev < 0 || data.queueTime < 0) { + if (data.getElapsed() < 0 || data.getSumDev() < 0 || data.getQueueSumDev() < 0 + || data.getQueueTime() < 0) { resetTimes(); } } @@ -87,8 +89,8 @@ public void updateTime(Operation operation, long start, boolean failed) { } public void saveMajorMinorTimes(TabletStats t) { - ActionStatsUpdator.update(minor, t.minors); - ActionStatsUpdator.update(major, t.majors); + ActionStatsUpdator.update(minor, t.getMinors()); + ActionStatsUpdator.update(major, t.getMajors()); } private void resetTimes() { @@ -98,15 +100,15 @@ private void resetTimes() { } public void incrementStatusMinor() { - minor.status++; + minor.setStatus(minor.getStatus() + 1); } public void incrementStatusMajor() { - major.status++; + major.setStatus(major.getStatus() + 1); } void incrementStatusSplit() { - split.status++; + split.setStatus(split.getStatus() + 1); } public TabletStats getTabletStats() {