diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveScanImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveScanImpl.java index ff6f360c7b5..5ecb62cf9d4 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveScanImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveScanImpl.java @@ -62,28 +62,28 @@ public final class ActiveScanImpl extends ActiveScan { ActiveScanImpl(ClientContext context, org.apache.accumulo.core.tabletscan.thrift.ActiveScan activeScan, ServerId server) throws TableNotFoundException { - this.scanId = activeScan.getScanId(); - this.client = activeScan.getClient(); - this.user = activeScan.getUser(); - this.age = activeScan.getAge(); - this.idle = activeScan.getIdleTime(); - this.tableName = context.getQualifiedTableName(TableId.of(activeScan.getTableId())); + this.scanId = activeScan.scanId; + this.client = activeScan.client; + this.user = activeScan.user; + this.age = activeScan.age; + this.idle = activeScan.idleTime; + this.tableName = context.getQualifiedTableName(TableId.of(activeScan.tableId)); this.type = ScanType.valueOf(activeScan.getType().name()); - this.state = ScanState.valueOf(activeScan.getState().name()); - this.extent = KeyExtent.fromThrift(activeScan.getExtent()); - this.authorizations = new Authorizations(activeScan.getAuthorizations()); + this.state = ScanState.valueOf(activeScan.state.name()); + this.extent = KeyExtent.fromThrift(activeScan.extent); + this.authorizations = new Authorizations(activeScan.authorizations); - this.columns = new ArrayList<>(activeScan.getColumns().size()); + this.columns = new ArrayList<>(activeScan.columns.size()); - for (TColumn tcolumn : activeScan.getColumns()) { + for (TColumn tcolumn : activeScan.columns) { this.columns.add(new Column(tcolumn)); } this.ssiList = new ArrayList<>(); - for (IterInfo ii : activeScan.getSsiList()) { - this.ssiList.add(ii.getIterName() + "=" + ii.getPriority() + "," + ii.getClassName()); + for (IterInfo ii : activeScan.ssiList) { + this.ssiList.add(ii.iterName + "=" + ii.priority + "," + ii.className); } - this.ssio = activeScan.getSsio(); + this.ssio = activeScan.ssio; this.server = Objects.requireNonNull(server); } diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/AuthenticationTokenIdentifier.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/AuthenticationTokenIdentifier.java index e86796b6aba..ce56b065ae5 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/AuthenticationTokenIdentifier.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/AuthenticationTokenIdentifier.java @@ -115,7 +115,7 @@ public void readFields(DataInput in) throws IOException { } private void populateFields(TAuthenticationTokenIdentifier tAuthTokenId) { - impl.setPrincipal(tAuthTokenId.getPrincipal()); + impl.principal = tAuthTokenId.getPrincipal(); setExpirationDate(tAuthTokenId.getExpirationDate()); setIssueDate(tAuthTokenId.getIssueDate()); if (tAuthTokenId.getInstanceId() != null) { diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java index d5417c4fbcb..2e970bd5fe6 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java @@ -511,9 +511,9 @@ private SessionID reserveSessionID(HostAndPort location, TabletIngestClientServi synchronized (cachedSessionIDs) { SessionID sid = new SessionID(); sid.reserved = true; - sid.sessionID = tcs.getSessionId(); - sid.lockId = tcs.getTserverLock(); - sid.ttl = tcs.getTtl(); + sid.sessionID = tcs.sessionId; + sid.lockId = tcs.tserverLock; + sid.ttl = tcs.ttl; sid.location = location; if (cachedSessionIDs.put(location, sid) != null) { throw new IllegalStateException(); @@ -601,13 +601,13 @@ private void sendToServer(HostAndPort location, TabletServerMutations ignored = new ArrayList<>(); for (TCMResult tcmResult : tresults) { - if (tcmResult.getStatus() == TCMStatus.IGNORED) { - CMK cmk = cmidToCm.get(tcmResult.getCmid()); + if (tcmResult.status == TCMStatus.IGNORED) { + CMK cmk = cmidToCm.get(tcmResult.cmid); ignored.add(cmk.cm); extentsToInvalidate.add(cmk.ke); } else { - QCMutation qcm = cmidToCm.get(tcmResult.getCmid()).cm; - qcm.queueResult(new Result(fromThrift(tcmResult.getStatus()), qcm, location.toString())); + QCMutation qcm = cmidToCm.get(tcmResult.cmid).cm; + qcm.queueResult(new Result(fromThrift(tcmResult.status), qcm, location.toString())); } } diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java index 549a48d5ffe..9bbd1b1a3db 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java @@ -311,7 +311,7 @@ private List getActiveScans(ServerId server) } return as; } catch (ThriftSecurityException e) { - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (TException e) { throw new AccumuloException(e); } finally { @@ -365,7 +365,7 @@ private List getActiveCompactions(ServerId server) } return as; } catch (ThriftSecurityException e) { - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (TException e) { throw new AccumuloException(e); } @@ -429,7 +429,7 @@ private List queryServers(Collection servers, ServerQuery T handleFateOperation(FateOperationExecutor executor, String tabl "Target namespace does not exist"); default: String tableInfo = context.getPrintableTableInfoFromName(tableOrNamespaceName); - throw new AccumuloSecurityException(e.getUser(), e.getCode(), tableInfo, e); + throw new AccumuloSecurityException(e.user, e.code, tableInfo, e); } } catch (ThriftTableOperationException e) { switch (e.getType()) { @@ -418,7 +418,7 @@ private T handleFateOperation(FateOperationExecutor executor, String tabl case BULK_CONCURRENT_MERGE: throw new AccumuloBulkMergeException(e); default: - throw new AccumuloException(e.getDescription(), e); + throw new AccumuloException(e.description, e); } } catch (Exception e) { throw new AccumuloException(e.getMessage(), e); @@ -1016,12 +1016,12 @@ private void _flush(TableId tableId, Text start, Text end, boolean wait) throw new TableNotFoundException(tableId.canonical(), null, e.getMessage(), e); } log.debug("flush security exception on table id {}", tableId); - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (ThriftTableOperationException e) { if (requireNonNull(e.getType()) == TableOperationExceptionType.NOTFOUND) { throw new TableNotFoundException(e); } - throw new AccumuloException(e.getDescription(), e); + throw new AccumuloException(e.description, e); } catch (Exception e) { throw new AccumuloException(e); } @@ -1592,7 +1592,7 @@ public List getDiskUsage(Set tableNames) case NAMESPACE_NOTFOUND: throw new TableNotFoundException(e.getTableName(), new NamespaceNotFoundException(e)); default: - throw new AccumuloException(e.getDescription(), e); + throw new AccumuloException(e.description, e); } } catch (ThriftSecurityException e) { throw new AccumuloSecurityException(e.getUser(), e.getCode()); @@ -2069,8 +2069,8 @@ public List retrieve() TSummaries ret = ThriftClientTypes.TABLET_SERVER.execute(context, client -> { TSummaries tsr = client.startGetSummaries(TraceUtil.traceInfo(), context.rpcCreds(), request); - while (!tsr.isFinished()) { - tsr = client.contiuneGetSummaries(TraceUtil.traceInfo(), tsr.getSessionId()); + while (!tsr.finished) { + tsr = client.contiuneGetSummaries(TraceUtil.traceInfo(), tsr.sessionId); } return tsr; }); diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletMergeabilityUtil.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletMergeabilityUtil.java index 867757d0477..d26ff5804ce 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletMergeabilityUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletMergeabilityUtil.java @@ -95,10 +95,10 @@ public static SplitMergeability decode(String data) { } public static TabletMergeability fromThrift(TTabletMergeability thriftTm) { - if (thriftTm.isNever()) { + if (thriftTm.never) { return TabletMergeability.never(); } - return TabletMergeability.after(Duration.ofNanos(thriftTm.getDelay())); + return TabletMergeability.after(Duration.ofNanos(thriftTm.delay)); } public static TTabletMergeability toThrift(TabletMergeability tabletMergeability) { 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 0778f30e7f1..72a7ffa86de 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 @@ -767,7 +767,7 @@ static void trackScanning(Map> failures, // translate returned failures, remove them from unscanned, and add them to failures // @formatter:off - Map> retFailures = scanResult.getFailures().entrySet().stream().collect(Collectors.toMap( + Map> retFailures = scanResult.failures.entrySet().stream().collect(Collectors.toMap( entry -> KeyExtent.fromThrift(entry.getKey()), entry -> entry.getValue().stream().map(Range::new).collect(Collectors.toList()) )); @@ -777,25 +777,25 @@ static void trackScanning(Map> failures, // translate full scans and remove them from unscanned Set fullScans = - scanResult.getFullScans().stream().map(KeyExtent::fromThrift).collect(Collectors.toSet()); + scanResult.fullScans.stream().map(KeyExtent::fromThrift).collect(Collectors.toSet()); unscanned.keySet().removeAll(fullScans); // remove partial scan from unscanned - if (scanResult.getPartScan() != null) { - KeyExtent ke = KeyExtent.fromThrift(scanResult.getPartScan()); - Key nextKey = new Key(scanResult.getPartNextKey()); + if (scanResult.partScan != null) { + KeyExtent ke = KeyExtent.fromThrift(scanResult.partScan); + Key nextKey = new Key(scanResult.partNextKey); ListIterator iterator = unscanned.get(ke).listIterator(); while (iterator.hasNext()) { Range range = iterator.next(); if (range.afterEndKey(nextKey) || (nextKey.equals(range.getEndKey()) - && scanResult.isPartNextKeyInclusive() != range.isEndKeyInclusive())) { + && scanResult.partNextKeyInclusive != range.isEndKeyInclusive())) { iterator.remove(); } else if (range.contains(nextKey)) { iterator.remove(); - Range partRange = new Range(nextKey, scanResult.isPartNextKeyInclusive(), - range.getEndKey(), range.isEndKeyInclusive()); + Range partRange = new Range(nextKey, scanResult.partNextKeyInclusive, range.getEndKey(), + range.isEndKeyInclusive()); iterator.add(partRange); } } @@ -940,35 +940,33 @@ static void doLookup(ClientContext context, String server, Map> entries = new ArrayList<>(scanResult.getResults().size()); - for (TKeyValue kv : scanResult.getResults()) { - entries.add(new SimpleImmutableEntry<>(new Key(kv.getKey()), new Value(kv.getValue()))); + ArrayList> entries = new ArrayList<>(scanResult.results.size()); + for (TKeyValue kv : scanResult.results) { + entries.add(new SimpleImmutableEntry<>(new Key(kv.key), new Value(kv.value))); } if (!entries.isEmpty()) { receiver.receive(entries); } - if (!entries.isEmpty() || !scanResult.getFullScans().isEmpty() - || scanResult.getPartScan() != null) { + if (!entries.isEmpty() || !scanResult.fullScans.isEmpty() || scanResult.partScan != null) { // Got some data back, finished scanning a tablet w/o getting data, or partially scanned a // tablet w/o getting data. Any of these indicate the scan is making progress. timeoutSession.madeProgress(); - } else if (!scanResult.getFailures().isEmpty()) { + } else if (!scanResult.failures.isEmpty()) { // Observed no progress and only tablets failed. Want to eventually timeout if this // situation continues. timeoutTracker.sawOnlyFailures(timeoutSession); @@ -978,45 +976,44 @@ static void doLookup(ClientContext context, String server, Map(scanResult.getResults().size()); - for (TKeyValue kv : scanResult.getResults()) { - entries.add(new SimpleImmutableEntry<>(new Key(kv.getKey()), new Value(kv.getValue()))); + entries = new ArrayList<>(scanResult.results.size()); + for (TKeyValue kv : scanResult.results) { + entries.add(new SimpleImmutableEntry<>(new Key(kv.key), new Value(kv.value))); } if (!entries.isEmpty()) { receiver.receive(entries); } - if (!entries.isEmpty() || !scanResult.getFullScans().isEmpty() - || scanResult.getPartScan() != null) { + if (!entries.isEmpty() || !scanResult.fullScans.isEmpty() + || scanResult.partScan != null) { timeoutSession.madeProgress(); - } else if (!scanResult.getFailures().isEmpty()) { + } else if (!scanResult.failures.isEmpty()) { timeoutTracker.sawOnlyFailures(timeoutSession); } trackScanning(failures, unscanned, scanResult); } - client.closeMultiScan(TraceUtil.traceInfo(), imsr.getScanID()); + client.closeMultiScan(TraceUtil.traceInfo(), imsr.scanID); scanIdToClose = null; } finally { @@ -1041,7 +1038,7 @@ static void doLookup(ClientContext context, String server, Map tsm) sessionCloser); } catch (ThriftSecurityException e) { updateAuthorizationFailures( - mutationBatch.keySet().stream().collect(toMap(identity(), ke -> e.getCode()))); - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + mutationBatch.keySet().stream().collect(toMap(identity(), ke -> e.code))); + throw new AccumuloSecurityException(e.user, e.code, e); } long st2 = System.currentTimeMillis(); @@ -984,15 +984,15 @@ private MutationSet sendMutationsToTabletServer(String location, sessionCloser.clearSession(); // @formatter:off - Map failures = updateErrors.getFailedExtents().entrySet().stream().collect(toMap( + Map failures = updateErrors.failedExtents.entrySet().stream().collect(toMap( entry -> KeyExtent.fromThrift(entry.getKey()), Entry::getValue )); // @formatter:on - updatedConstraintViolations(updateErrors.getViolationSummaries().stream() + updatedConstraintViolations(updateErrors.violationSummaries.stream() .map(ConstraintViolationSummary::new).collect(toList())); // @formatter:off - updateAuthorizationFailures(updateErrors.getAuthorizationFailures().entrySet().stream().collect(toMap( + updateAuthorizationFailures(updateErrors.authorizationFailures.entrySet().stream().collect(toMap( entry -> KeyExtent.fromThrift(entry.getKey()), Entry::getValue ))); @@ -1036,8 +1036,8 @@ private MutationSet sendMutationsToTabletServer(String location, // no need to close the session when unretryable errors happen sessionCloser.clearSession(); updateAuthorizationFailures( - tabMuts.keySet().stream().collect(toMap(identity(), ke -> e.getCode()))); - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + tabMuts.keySet().stream().collect(toMap(identity(), ke -> e.code))); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (TException e) { throw new IOException(e); } diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java index 5523873eb49..e5330840826 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java @@ -152,15 +152,15 @@ public static boolean getBatchFromServer(ClientContext context, Range range, Key serversWaitedForWrites.get(ttype).add(server); } - Key.decompress(isr.getResult().getResults()); + Key.decompress(isr.result.results); - for (TKeyValue kv : isr.getResult().getResults()) { - results.put(new Key(kv.getKey()), new Value(kv.getValue())); + for (TKeyValue kv : isr.result.results) { + results.put(new Key(kv.key), new Value(kv.value)); } - client.closeScan(tinfo, isr.getScanID()); + client.closeScan(tinfo, isr.scanID); - return isr.getResult().isMore(); + return isr.result.more; } finally { ThriftUtil.returnClient(client, context); } @@ -170,7 +170,7 @@ public static boolean getBatchFromServer(ClientContext context, Range range, Key log.debug("Tablet ({}) has too many files {} : {}", extent, server, e.getMessage()); } catch (ThriftSecurityException e) { log.warn("Security Violation in scan request to {}: {}", server, e.getMessage()); - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (TException e) { log.debug("Error getting transport to {}: {}", server, e.getMessage()); } @@ -897,12 +897,12 @@ private static List scanRpc(ScanAddress addr, ScanState scanState, serversWaitedForWrites.get(ttype).add(addr.serverAddress); } - sr = is.getResult(); + sr = is.result; - if (sr.isMore()) { - scanState.scanID = is.getScanID(); + if (sr.more) { + scanState.scanID = is.scanID; } else { - client.closeScan(tinfo, is.getScanID()); + client.closeScan(tinfo, is.scanID); } } else { @@ -916,17 +916,17 @@ private static List scanRpc(ScanAddress addr, ScanState scanState, } sr = client.continueScan(tinfo, scanState.scanID, busyTimeout); - if (!sr.isMore()) { + if (!sr.more) { client.closeScan(tinfo, scanState.scanID); scanState.scanID = null; } } - if (sr.isMore()) { + if (sr.more) { if (timer != null) { log.trace("Finished scan in {} #results={} scanid={}", - String.format("%.3f secs", timer.elapsed(MILLISECONDS) / 1000.0), - sr.getResults().size(), scanState.scanID); + String.format("%.3f secs", timer.elapsed(MILLISECONDS) / 1000.0), sr.results.size(), + scanState.scanID); } } else { if (addr.getExtent().endRow() == null) { @@ -935,7 +935,7 @@ private static List scanRpc(ScanAddress addr, ScanState scanState, if (timer != null) { log.trace("Completely finished scan in {} #results={}", String.format("%.3f secs", timer.elapsed(MILLISECONDS) / 1000.0), - sr.getResults().size()); + sr.results.size()); } } else if (scanState.range.getEndKey() == null || !scanState.range @@ -946,35 +946,34 @@ private static List scanRpc(ScanAddress addr, ScanState scanState, if (timer != null) { log.trace("Finished scanning tablet in {} #results={}", String.format("%.3f secs", timer.elapsed(MILLISECONDS) / 1000.0), - sr.getResults().size()); + sr.results.size()); } } else { scanState.finished = true; if (timer != null) { log.trace("Completely finished in {} #results={}", String.format("%.3f secs", timer.elapsed(MILLISECONDS) / 1000.0), - sr.getResults().size()); + sr.results.size()); } } } - Key.decompress(sr.getResults()); + Key.decompress(sr.results); - if (!sr.getResults().isEmpty() && !scanState.finished) { - scanState.range = - new Range(new Key(sr.getResults().get(sr.getResults().size() - 1).getKey()), false, - scanState.range.getEndKey(), scanState.range.isEndKeyInclusive()); + if (!sr.results.isEmpty() && !scanState.finished) { + scanState.range = new Range(new Key(sr.results.get(sr.results.size() - 1).key), false, + scanState.range.getEndKey(), scanState.range.isEndKeyInclusive()); } - List results = new ArrayList<>(sr.getResults().size()); - for (TKeyValue tkv : sr.getResults()) { - results.add(new KeyValue(new Key(tkv.getKey()), tkv.getValue())); + List results = new ArrayList<>(sr.results.size()); + for (TKeyValue tkv : sr.results) { + results.add(new KeyValue(new Key(tkv.key), tkv.value)); } return results; } catch (ThriftSecurityException e) { - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } finally { ThriftUtil.returnClient(client, context); Thread.currentThread().setName(old); diff --git a/core/src/main/java/org/apache/accumulo/core/data/Column.java b/core/src/main/java/org/apache/accumulo/core/data/Column.java index 7f6698e39cb..9ca524f59ca 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Column.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Column.java @@ -139,8 +139,7 @@ public Column(byte[] columnFamily, byte[] columnQualifier, byte[] columnVisibili * @param tcol Thrift column */ public Column(TColumn tcol) { - this(toBytes(tcol.bufferForColumnFamily()), toBytes(tcol.bufferForColumnQualifier()), - toBytes(tcol.bufferForColumnVisibility())); + this(toBytes(tcol.columnFamily), toBytes(tcol.columnQualifier), toBytes(tcol.columnVisibility)); } @Override diff --git a/core/src/main/java/org/apache/accumulo/core/data/ConstraintViolationSummary.java b/core/src/main/java/org/apache/accumulo/core/data/ConstraintViolationSummary.java index 2260d3c0ee2..960ebf0198d 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/ConstraintViolationSummary.java +++ b/core/src/main/java/org/apache/accumulo/core/data/ConstraintViolationSummary.java @@ -55,8 +55,8 @@ public ConstraintViolationSummary(String constrainClass, short violationCode, * @param tcvs Thrift summary */ public ConstraintViolationSummary(TConstraintViolationSummary tcvs) { - this(tcvs.getConstrainClass(), tcvs.getViolationCode(), tcvs.getViolationDescription(), - tcvs.getNumberOfViolatingMutations()); + this(tcvs.constrainClass, tcvs.violationCode, tcvs.violationDescription, + tcvs.numberOfViolatingMutations); } public String getConstrainClass() { diff --git a/core/src/main/java/org/apache/accumulo/core/data/Key.java b/core/src/main/java/org/apache/accumulo/core/data/Key.java index f0b5e795660..3e69b9598b2 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Key.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Key.java @@ -18,6 +18,8 @@ */ package org.apache.accumulo.core.data; +import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -29,7 +31,6 @@ import org.apache.accumulo.core.dataImpl.thrift.TKey; import org.apache.accumulo.core.dataImpl.thrift.TKeyValue; import org.apache.accumulo.core.security.ColumnVisibility; -import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.io.WritableComparator; @@ -685,11 +686,11 @@ public Key(Key other) { * @param tkey Thrift key */ public Key(TKey tkey) { - this.row = ByteBufferUtil.toBytes(tkey.bufferForRow()); - this.colFamily = ByteBufferUtil.toBytes(tkey.bufferForColFamily()); - this.colQualifier = ByteBufferUtil.toBytes(tkey.bufferForColQualifier()); - this.colVisibility = ByteBufferUtil.toBytes(tkey.bufferForColVisibility()); - this.timestamp = tkey.getTimestamp(); + this.row = toBytes(tkey.row); + this.colFamily = toBytes(tkey.colFamily); + this.colQualifier = toBytes(tkey.colQualifier); + this.colVisibility = toBytes(tkey.colVisibility); + this.timestamp = tkey.timestamp; this.deleted = false; if (row == null) { @@ -1317,28 +1318,28 @@ public static List compress(List param) { if (isEqual(prevKey.row, key.row)) { newKey = key.toThrift(); - newKey.setRow((byte[]) null); + newKey.row = null; } if (isEqual(prevKey.colFamily, key.colFamily)) { if (newKey == null) { newKey = key.toThrift(); } - newKey.setColFamily((byte[]) null); + newKey.colFamily = null; } if (isEqual(prevKey.colQualifier, key.colQualifier)) { if (newKey == null) { newKey = key.toThrift(); } - newKey.setColQualifier((byte[]) null); + newKey.colQualifier = null; } if (isEqual(prevKey.colVisibility, key.colVisibility)) { if (newKey == null) { newKey = key.toThrift(); } - newKey.setColVisibility((byte[]) null); + newKey.colVisibility = null; } if (newKey == null) { @@ -1359,20 +1360,20 @@ public static List compress(List param) { */ public static void decompress(List param) { for (int i = 1; i < param.size(); i++) { - TKey prevKey = param.get(i - 1).getKey(); - TKey key = param.get(i).getKey(); + TKey prevKey = param.get(i - 1).key; + TKey key = param.get(i).key; - if (key.getRow() == null) { - key.setRow(prevKey.getRow()); + if (key.row == null) { + key.row = prevKey.row; } - if (key.getColFamily() == null) { - key.setColFamily(prevKey.getColFamily()); + if (key.colFamily == null) { + key.colFamily = prevKey.colFamily; } - if (key.getColQualifier() == null) { - key.setColQualifier(prevKey.getColQualifier()); + if (key.colQualifier == null) { + key.colQualifier = prevKey.colQualifier; } - if (key.getColVisibility() == null) { - key.setColVisibility(prevKey.getColVisibility()); + if (key.colVisibility == null) { + key.colVisibility = prevKey.colVisibility; } } } diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java index 00e401218ea..e64194e4f1d 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java @@ -236,10 +236,10 @@ public Mutation() {} * @param tmutation Thrift mutation */ public Mutation(TMutation tmutation) { - this.row = ByteBufferUtil.toBytes(tmutation.bufferForRow()); - this.data = ByteBufferUtil.toBytes(tmutation.bufferForData()); - this.entries = tmutation.getEntries(); - this.values = ByteBufferUtil.toBytesList(tmutation.getValues()); + this.row = ByteBufferUtil.toBytes(tmutation.row); + this.data = ByteBufferUtil.toBytes(tmutation.data); + this.entries = tmutation.entries; + this.values = ByteBufferUtil.toBytesList(tmutation.values); if (this.row == null) { throw new IllegalArgumentException("null row"); diff --git a/core/src/main/java/org/apache/accumulo/core/data/Range.java b/core/src/main/java/org/apache/accumulo/core/data/Range.java index bd59af69bfd..7cc0dd694e0 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Range.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Range.java @@ -235,10 +235,9 @@ protected Range(Key start, boolean startKeyInclusive, boolean infiniteStartKey, * @param trange Thrift range */ public Range(TRange trange) { - this(trange.getStart() == null ? null : new Key(trange.getStart()), - trange.isStartKeyInclusive(), trange.isInfiniteStartKey(), - trange.getStop() == null ? null : new Key(trange.getStop()), trange.isStopKeyInclusive(), - trange.isInfiniteStopKey()); + this(trange.start == null ? null : new Key(trange.start), trange.startKeyInclusive, + trange.infiniteStartKey, trange.stop == null ? null : new Key(trange.stop), + trange.stopKeyInclusive, trange.infiniteStopKey); if (!infiniteStartKey && !infiniteStopKey && beforeStartKeyImpl(stop)) { throw new IllegalArgumentException( "Start key must be less than end key in range (" + start + ", " + stop + ")"); diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java index 8e3dbf56636..5a3ed07f908 100644 --- a/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java +++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java @@ -53,6 +53,7 @@ import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily; +import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.core.util.TextUtil; import org.apache.hadoop.io.BinaryComparable; @@ -115,9 +116,10 @@ public static KeyExtent copyOf(KeyExtent original) { * @param tke the KeyExtent in its Thrift object form */ public static KeyExtent fromThrift(TKeyExtent tke) { - TableId tableId = TableId.of(new String(tke.getTable(), UTF_8)); - Text endRow = tke.getEndRow() == null ? null : new Text(tke.getEndRow()); - Text prevEndRow = tke.getPrevEndRow() == null ? null : new Text(tke.getPrevEndRow()); + TableId tableId = TableId.of(new String(ByteBufferUtil.toBytes(tke.table), UTF_8)); + Text endRow = tke.endRow == null ? null : new Text(ByteBufferUtil.toBytes(tke.endRow)); + Text prevEndRow = + tke.prevEndRow == null ? null : new Text(ByteBufferUtil.toBytes(tke.prevEndRow)); return new KeyExtent(tableId, endRow, prevEndRow); } diff --git a/core/src/main/java/org/apache/accumulo/core/fate/FatePartition.java b/core/src/main/java/org/apache/accumulo/core/fate/FatePartition.java index 877b61ddb4e..44907cb788c 100644 --- a/core/src/main/java/org/apache/accumulo/core/fate/FatePartition.java +++ b/core/src/main/java/org/apache/accumulo/core/fate/FatePartition.java @@ -29,7 +29,7 @@ public TFatePartition toThrift() { } public static FatePartition from(TFatePartition tfp) { - return new FatePartition(FateId.from(tfp.getStart()), FateId.from(tfp.getStop())); + return new FatePartition(FateId.from(tfp.start), FateId.from(tfp.stop)); } private static final FatePartition ALL_USER = diff --git a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java index 1550de02b4a..4e9f8576cf7 100644 --- a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java @@ -215,13 +215,13 @@ public static SortedKeyValueIterator convertItersAndLoad(IteratorScop for (IterInfo iterInfo : iteratorBuilder.iters) { Class> clazz = null; - log.trace("Attempting to load iterator class {}", iterInfo.getClassName()); + log.trace("Attempting to load iterator class {}", iterInfo.className); if (iteratorBuilder.useClassCache) { - clazz = classCache.get(iterInfo.getClassName()); + clazz = classCache.get(iterInfo.className); if (clazz == null) { clazz = loadClass(useClassLoader, iteratorBuilder.context, iterInfo); - classCache.put(iterInfo.getClassName(), clazz); + classCache.put(iterInfo.className, clazz); } } else { clazz = loadClass(useClassLoader, iteratorBuilder.context, iterInfo); @@ -229,7 +229,7 @@ public static SortedKeyValueIterator convertItersAndLoad(IteratorScop SortedKeyValueIterator skvi = clazz.getDeclaredConstructor().newInstance(); - Map options = iteratorBuilder.iterOpts.get(iterInfo.getIterName()); + Map options = iteratorBuilder.iterOpts.get(iterInfo.iterName); if (options == null) { options = Collections.emptyMap(); @@ -252,15 +252,15 @@ private static Class> loadClass(boolean useAcc if (useAccumuloClassLoader) { @SuppressWarnings("unchecked") var clazz = (Class>) ClassLoaderUtil.loadClass(context, - iterInfo.getClassName(), SortedKeyValueIterator.class); - log.trace("Iterator class {} loaded from context {}, classloader: {}", - iterInfo.getClassName(), context, clazz.getClassLoader()); + iterInfo.className, SortedKeyValueIterator.class); + log.trace("Iterator class {} loaded from context {}, classloader: {}", iterInfo.className, + context, clazz.getClassLoader()); return clazz; } @SuppressWarnings("unchecked") - var clazz = (Class>) Class.forName(iterInfo.getClassName()) + var clazz = (Class>) Class.forName(iterInfo.className) .asSubclass(SortedKeyValueIterator.class); - log.trace("Iterator class {} loaded from classpath", iterInfo.getClassName()); + log.trace("Iterator class {} loaded from classpath", iterInfo.className); return clazz; } diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerThriftClient.java b/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerThriftClient.java index 96dffdc0e34..eb353feb908 100644 --- a/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerThriftClient.java +++ b/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerThriftClient.java @@ -63,7 +63,7 @@ public R executeTableCommand(ClientContext context, Exec exec) LOG.debug("ManagerClient request failed, retrying ... ", tte); sleepUninterruptibly(100, MILLISECONDS); } catch (ThriftSecurityException e) { - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (ThriftTableOperationException e) { switch (e.getType()) { case NAMESPACE_NOTFOUND: @@ -111,7 +111,7 @@ public void executeVoidTableCommand(ClientContext context, ExecVoid exec LOG.debug("ManagerClient request failed, retrying ... ", tte); sleepUninterruptibly(100, MILLISECONDS); } catch (ThriftSecurityException e) { - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (ThriftTableOperationException e) { switch (e.getType()) { case NAMESPACE_NOTFOUND: diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/clients/TServerClient.java b/core/src/main/java/org/apache/accumulo/core/rpc/clients/TServerClient.java index ce15cce1744..6a40c2e71d3 100644 --- a/core/src/main/java/org/apache/accumulo/core/rpc/clients/TServerClient.java +++ b/core/src/main/java/org/apache/accumulo/core/rpc/clients/TServerClient.java @@ -173,7 +173,7 @@ default R execute(Logger LOG, ClientContext context, Exec exec) client = pair.getSecond(); return exec.execute(client); } catch (ThriftSecurityException e) { - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (TApplicationException tae) { throw new AccumuloServerException(server, tae); } catch (TTransportException tte) { @@ -214,7 +214,7 @@ default void executeVoid(Logger LOG, ClientContext context, ExecVoid exec) exec.execute(client); return; } catch (ThriftSecurityException e) { - throw new AccumuloSecurityException(e.getUser(), e.getCode(), e); + throw new AccumuloSecurityException(e.user, e.code, e); } catch (TApplicationException tae) { throw new AccumuloServerException(server, tae); } catch (TTransportException tte) { diff --git a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java index d26b80f7613..c67965a9262 100644 --- a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java +++ b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java @@ -126,9 +126,9 @@ public class Gatherer { public Gatherer(ClientContext context, TSummaryRequest request, AccumuloConfiguration tableConfig, CryptoService cryptoService) { this.ctx = context; - this.tableId = TableId.of(request.getTableId()); - this.startRow = ByteBufferUtil.toText(request.getBounds().bufferForStartRow()); - this.endRow = ByteBufferUtil.toText(request.getBounds().bufferForEndRow()); + this.tableId = TableId.of(request.tableId); + this.startRow = ByteBufferUtil.toText(request.bounds.startRow); + this.endRow = ByteBufferUtil.toText(request.bounds.endRow); this.clipRange = new Range(startRow, false, endRow, true); this.summaries = request.getSummarizers().stream().map(SummarizerConfigurationUtil::fromThrift) .collect(Collectors.toSet()); @@ -319,8 +319,8 @@ public ProcessedFiles get() { TSummaries tSums = client.startGetSummariesFromFiles(tinfo, ctx.rpcCreds(), getRequest(), files.entrySet().stream().collect(Collectors .toMap(entry -> entry.getKey().getNormalizedPathStr(), Entry::getValue))); - while (!tSums.isFinished() && !cancelFlag.get()) { - tSums = client.contiuneGetSummaries(tinfo, tSums.getSessionId()); + while (!tSums.finished && !cancelFlag.get()) { + tSums = client.contiuneGetSummaries(tinfo, tSums.sessionId); } pfiles.summaries.merge(new SummaryCollection(tSums), factory); @@ -436,8 +436,8 @@ public Future processFiles(FileSystemResolver volMgr, Map> files, BlockCache summaryCache, BlockCache indexCache, Cache fileLenCache, ExecutorService srp) { Function fromThrift = tRowRange -> { - Text lowerBound = ByteBufferUtil.toText(tRowRange.bufferForStartRow()); - Text upperBound = ByteBufferUtil.toText(tRowRange.bufferForEndRow()); + Text lowerBound = ByteBufferUtil.toText(tRowRange.startRow); + Text upperBound = ByteBufferUtil.toText(tRowRange.endRow); return RowRange.range(lowerBound, false, upperBound, true); }; List> futures = new ArrayList<>(); @@ -483,8 +483,8 @@ public SummaryCollection get() { tSums = ThriftClientTypes.TABLET_SERVER.execute(ctx, client -> { TSummaries tsr = client.startGetSummariesForPartition(tinfo, ctx.rpcCreds(), req, modulus, remainder); - while (!tsr.isFinished() && !cancelFlag.get()) { - tsr = client.contiuneGetSummaries(tinfo, tsr.getSessionId()); + while (!tsr.finished && !cancelFlag.get()) { + tsr = client.contiuneGetSummaries(tinfo, tsr.sessionId); } return tsr; }); diff --git a/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java b/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java index 758aae59254..25637c39602 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java +++ b/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java @@ -110,7 +110,7 @@ public RunningCompactionInfo(TExternalCompaction ec) { if (updates.isEmpty()) { status = "na"; } else { - status = last.getState().name(); + status = last.state.name(); } log.trace("Parsed running compaction {} for {} with progress = {}%", status, ecid, progress); if (sinceLastUpdateSeconds > 30) { @@ -124,8 +124,8 @@ public RunningCompactionInfo(TExternalCompaction ec) { status = "na"; duration = 0; } - this.inputFiles = convertInputFiles(job.getFiles()); - this.outputFile = job.getOutputFile(); + this.inputFiles = convertInputFiles(job.files); + this.outputFile = job.outputFile; } @@ -138,8 +138,8 @@ public long getStartTime() { */ private List convertInputFiles(List files) { return files.stream() - .map(file -> new CompactionInputFileDetails(file.getMetadataFileEntry(), file.getSize(), - file.getEntries(), file.getTimestamp())) + .map(file -> new CompactionInputFileDetails(file.metadataFileEntry, file.size, file.entries, + file.timestamp)) .sorted(Comparator.comparingLong(CompactionInputFileDetails::size).reversed()).toList(); } diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh index f47b30ff957..54bb124bf62 100755 --- a/core/src/main/scripts/generate-thrift.sh +++ b/core/src/main/scripts/generate-thrift.sh @@ -67,7 +67,7 @@ THRIFT_ARGS=("${THRIFT_ARGS[@]}" -o "$BUILD_DIR") mkdir -p "$BUILD_DIR" rm -rf "$BUILD_DIR"/gen-java for f in src/main/thrift/*.thrift; do - thrift "${THRIFT_ARGS[@]}" --gen java:generated_annotations=suppress,private-members "$f" || fail unable to generate java thrift classes + thrift "${THRIFT_ARGS[@]}" --gen java:generated_annotations=suppress "$f" || fail unable to generate java thrift classes thrift "${THRIFT_ARGS[@]}" --gen py "$f" || fail unable to generate python thrift classes thrift "${THRIFT_ARGS[@]}" --gen rb "$f" || fail unable to generate ruby thrift classes thrift "${THRIFT_ARGS[@]}" --gen cpp "$f" || fail unable to generate cpp thrift classes diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java index 83ede224667..3e808fdf1ac 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java @@ -6347,7 +6347,7 @@ public static class ping_args implements org.apache.thrift.TBase tables; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + public @org.apache.thrift.annotation.Nullable java.util.Set tables; // required + public @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 { @@ -7682,9 +7682,9 @@ public static class getDiskUsage_result implements org.apache.thrift.TBase success; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required - private @org.apache.thrift.annotation.Nullable ThriftTableOperationException toe; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public @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 { @@ -8338,8 +8338,8 @@ public static class listLocalUsers_args implements org.apache.thrift.TBase success; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public @org.apache.thrift.annotation.Nullable java.util.Set success; // required + public @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 { @@ -9389,10 +9389,10 @@ public static class createLocalUser_args implements org.apache.thrift.TBase authorizations; // required + 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 @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 { @@ -15485,7 +15485,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(); - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public @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 { @@ -15877,9 +15877,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -16485,8 +16485,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(); - private @org.apache.thrift.annotation.Nullable java.util.List success; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @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 { @@ -17032,10 +17032,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -17739,8 +17739,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(); - private boolean success; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public boolean success; // required + public @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 { @@ -18234,11 +18234,11 @@ public static class hasTablePermission_args implements org.apache.thrift.TBase success; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public @org.apache.thrift.annotation.Nullable java.util.Map success; // required + public @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 { @@ -29667,8 +29671,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(); - private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + public @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 { @@ -30171,8 +30175,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(); - private @org.apache.thrift.annotation.Nullable java.util.Map success; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public @org.apache.thrift.annotation.Nullable java.util.Map success; // required + public @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 { @@ -30718,8 +30722,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(); - private @org.apache.thrift.annotation.Nullable TInfo tinfo; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + public @org.apache.thrift.annotation.Nullable TInfo tinfo; // required + public @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 { @@ -31222,8 +31226,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(); - private @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required + public @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 { @@ -31723,9 +31727,9 @@ public static class getVersionedResourceGroupProperties_args implements org.apac private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersionedResourceGroupProperties_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersionedResourceGroupProperties_argsTupleSchemeFactory(); - 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 resourceGroup; // required + 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 resourceGroup; // 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 { @@ -32332,9 +32336,9 @@ public static class getVersionedResourceGroupProperties_result implements org.ap private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersionedResourceGroupProperties_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersionedResourceGroupProperties_resultTupleSchemeFactory(); - private @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required - private @org.apache.thrift.annotation.Nullable ThriftResourceGroupNotExistsException rgne; // required + public @org.apache.thrift.annotation.Nullable TVersionedProperties success; // required + public @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + public @org.apache.thrift.annotation.Nullable ThriftResourceGroupNotExistsException rgne; // 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 { @@ -32939,9 +32943,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -33548,9 +33552,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -34202,9 +34206,9 @@ public static class getTableProperties_args implements org.apache.thrift.TBase success; // required - private @org.apache.thrift.annotation.Nullable ThriftTableOperationException tope; // required - private @org.apache.thrift.annotation.Nullable ThriftSecurityException sec; // required + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -35465,9 +35469,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -36074,9 +36078,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -36681,9 +36685,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -37290,9 +37294,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -37944,9 +37948,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -38553,9 +38557,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -39207,9 +39211,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -39816,9 +39820,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -40424,10 +40428,10 @@ public static class checkClass_args implements org.apache.thrift.TBase tables; // required - private long usage; // required + public @org.apache.thrift.annotation.Nullable java.util.List tables; // required + public 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 289f3319d79..8efd28a2848 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(); - private @org.apache.thrift.annotation.Nullable java.util.Map headers; // required + public @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 666a63a00bb..67e9d34d60b 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 + public long version; // required + public @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 188aa961fb4..07d89340354 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(); - private @org.apache.thrift.annotation.Nullable java.lang.String description; // required + public @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 e166f23ca55..f904b0eba0f 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(); - private @org.apache.thrift.annotation.Nullable java.lang.String serv; // required - private @org.apache.thrift.annotation.Nullable java.lang.String description; // required + public @org.apache.thrift.annotation.Nullable java.lang.String serv; // required + public @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/ThriftResourceGroupNotExistsException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftResourceGroupNotExistsException.java index 6a9cbd438f7..0a7f68f61b3 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftResourceGroupNotExistsException.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftResourceGroupNotExistsException.java @@ -33,7 +33,7 @@ public class ThriftResourceGroupNotExistsException extends org.apache.thrift.TEx private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftResourceGroupNotExistsExceptionStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftResourceGroupNotExistsExceptionTupleSchemeFactory(); - private @org.apache.thrift.annotation.Nullable java.lang.String resourceGroupName; // required + public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroupName; // 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 3ce9345993a..b32b34fd1e4 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,8 +34,12 @@ 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(); - private @org.apache.thrift.annotation.Nullable java.lang.String user; // required - private @org.apache.thrift.annotation.Nullable SecurityErrorCode code; // required + public @org.apache.thrift.annotation.Nullable java.lang.String user; // required + /** + * + * @see SecurityErrorCode + */ + public @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 6684c3d7185..067872d149c 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,11 +37,19 @@ 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(); - 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 + 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 /** 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 6c231469d3e..fe65ecb03f8 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 @@ -910,7 +910,7 @@ public static class success_result implements org.apache.thrift.TBase success; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -3908,9 +3908,9 @@ public static class cancel_args implements org.apache.thrift.TBase updates; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob job; // required - private long startTime; // required + public @org.apache.thrift.annotation.Nullable java.lang.String groupName; // required + public @org.apache.thrift.annotation.Nullable java.lang.String compactor; // required + public @org.apache.thrift.annotation.Nullable java.util.Map updates; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob job; // required + public long startTime; // 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 c6f1ff2f2ad..01680f63830 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 + public @org.apache.thrift.annotation.Nullable java.util.List 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/compaction/thrift/TNextCompactionJob.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TNextCompactionJob.java index 9d3dfcf66a6..2b7bdd9bf2f 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TNextCompactionJob.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TNextCompactionJob.java @@ -34,8 +34,8 @@ public class TNextCompactionJob implements org.apache.thrift.TBase 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 + public @org.apache.thrift.annotation.Nullable java.util.List 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 /** 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 2e2c2583e9c..96c36755e41 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 - private boolean more; // required + public @org.apache.thrift.annotation.Nullable java.util.List results; // required + public 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 1df73373fd0..61a9d47d020 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,8 +34,12 @@ public class TCMResult implements org.apache.thrift.TBase conditions; // required - private @org.apache.thrift.annotation.Nullable TMutation mutation; // required - private long id; // required + public @org.apache.thrift.annotation.Nullable java.util.List conditions; // required + public @org.apache.thrift.annotation.Nullable TMutation mutation; // required + public 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 f71332fee42..f4500c49f71 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(); - 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 + 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 /** 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 808443868f3..5f9bfa95695 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 - private int entries; // required - private @org.apache.thrift.annotation.Nullable java.util.List sources; // optional + public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer row; // required + public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer data; // required + public @org.apache.thrift.annotation.Nullable java.util.List values; // required + public int entries; // required + public @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 2294081176e..01deed97db2 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(); - 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 + 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 /** 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 39979f393ca..5cc8669500d 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 + public boolean finished; // required + public long sessionId; // required + public long totalFiles; // required + public long deletedFiles; // required + public @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 72bcb09130b..f19768b8021 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 - private @org.apache.thrift.annotation.Nullable java.lang.String configId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String classname; // required + public @org.apache.thrift.annotation.Nullable java.util.Map options; // required + public @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 adb3ec09f54..07edcd4208a 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 - private @org.apache.thrift.annotation.Nullable TSummarizerConfiguration config; // required - private long filesContaining; // required - private long filesExceeding; // required - private long filesLarge; // required + public @org.apache.thrift.annotation.Nullable java.util.Map summary; // required + public @org.apache.thrift.annotation.Nullable TSummarizerConfiguration config; // required + public long filesContaining; // required + public long filesExceeding; // required + public 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 ebdfd591fac..733ff804f59 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 - private @org.apache.thrift.annotation.Nullable java.lang.String summarizerPattern; // required + public @org.apache.thrift.annotation.Nullable java.lang.String tableId; // required + public @org.apache.thrift.annotation.Nullable TRowRange bounds; // required + public @org.apache.thrift.annotation.Nullable java.util.List summarizers; // required + public @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 a7977f5c52c..f7bbe1c4b68 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 - private @org.apache.thrift.annotation.Nullable java.util.List violationSummaries; // required - private @org.apache.thrift.annotation.Nullable java.util.Map authorizationFailures; // required + public @org.apache.thrift.annotation.Nullable java.util.Map failedExtents; // required + public @org.apache.thrift.annotation.Nullable java.util.List violationSummaries; // required + public @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 efd42cc2290..176af003338 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 @@ -305,8 +305,8 @@ public static class getStatus_args implements org.apache.thrift.TBase arguments; // required - private @org.apache.thrift.annotation.Nullable java.util.Map options; // required - private boolean autoClean; // required + 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 TFateId opid; // required + /** + * + * @see TFateOperation + */ + public @org.apache.thrift.annotation.Nullable TFateOperation op; // required + public @org.apache.thrift.annotation.Nullable java.util.List arguments; // required + public @org.apache.thrift.annotation.Nullable java.util.Map options; // required + public 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 { @@ -3512,9 +3520,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -4116,9 +4124,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(); - 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 TFateId opid; // required + 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 TFateId 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 { @@ -4731,10 +4739,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -5439,9 +5447,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(); - 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 TFateId opid; // required + 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 TFateId 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 { @@ -6052,8 +6060,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -6550,9 +6558,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(); - 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 TFateId opid; // required + 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 TFateId 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 { @@ -7164,9 +7172,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(); - 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 + 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 /** 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/FateWorkerService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java index dcf2c4af9cc..3dc8e9076a1 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java @@ -675,8 +675,8 @@ public static class getPartitions_args implements org.apache.thrift.TBase desired; // required + 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 updateId; // required + public @org.apache.thrift.annotation.Nullable java.util.List desired; // 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 { @@ -2443,8 +2443,8 @@ public static class setPartitions_result implements org.apache.thrift.TBase tpartitions; // required + 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.util.List tpartitions; // 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 ad6eb39aa1a..2e5c46c7663 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 @@ -5845,9 +5845,9 @@ public static class initiateFlush_args implements org.apache.thrift.TBase 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 + 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 + public @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 { @@ -35440,9 +35448,9 @@ public static class getDelegationToken_args implements org.apache.thrift.TBase extents; // required + 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 tableId; // required + public @org.apache.thrift.annotation.Nullable java.util.List extents; // 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 { @@ -37430,9 +37438,9 @@ public static class requestTabletHosting_result implements org.apache.thrift.TBa private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new requestTabletHosting_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new requestTabletHosting_resultTupleSchemeFactory(); - 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 toe; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // 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 toe; // required + public @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 { @@ -38035,10 +38043,10 @@ public static class updateTabletMergeability_args implements org.apache.thrift.T private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateTabletMergeability_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateTabletMergeability_argsTupleSchemeFactory(); - 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 tableName; // required - private @org.apache.thrift.annotation.Nullable java.util.Map splits; // required + 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 tableName; // required + public @org.apache.thrift.annotation.Nullable java.util.Map splits; // 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 { @@ -38816,10 +38824,10 @@ public static class updateTabletMergeability_result implements org.apache.thrift private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateTabletMergeability_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateTabletMergeability_resultTupleSchemeFactory(); - 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.ThriftTableOperationException toe; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + 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 + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException toe; // required + public @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 { @@ -39578,8 +39586,8 @@ public static class getManagerTimeNanos_args implements org.apache.thrift.TBase< private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getManagerTimeNanos_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getManagerTimeNanos_argsTupleSchemeFactory(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -40083,9 +40091,9 @@ public static class getManagerTimeNanos_result implements org.apache.thrift.TBas private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getManagerTimeNanos_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getManagerTimeNanos_resultTupleSchemeFactory(); - private long 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 + public long 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -40682,9 +40690,9 @@ public static class processEvents_args implements org.apache.thrift.TBase events; // required + 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.util.List events; // 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 { @@ -41345,8 +41353,8 @@ public static class processEvents_result implements org.apache.thrift.TBase, private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TEventStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TEventTupleSchemeFactory(); - private @org.apache.thrift.annotation.Nullable java.lang.String level; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + public @org.apache.thrift.annotation.Nullable java.lang.String level; // required + public @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/manager/thrift/TFateId.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFateId.java index d90852c4341..da38c4b6c37 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFateId.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFateId.java @@ -34,8 +34,12 @@ public class TFateId implements org.apache.thrift.TBase partitions; // required + public long updateId; // required + public @org.apache.thrift.annotation.Nullable java.util.List partitions; // 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/TTabletMergeability.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TTabletMergeability.java index 8fd06645d8b..9a94d8d0ac6 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TTabletMergeability.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TTabletMergeability.java @@ -34,8 +34,8 @@ public class TTabletMergeability implements org.apache.thrift.TBase 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.lang.String version; // required - private long responseTime; // required + public @org.apache.thrift.annotation.Nullable java.util.Map 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.lang.String version; // required + public 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 f37ba750916..b908efcfc23 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 + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent oldTablet; // required + public @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 e5944674d2b..f3c71ad8729 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(); - 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 + 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 /** 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/process/thrift/MetricResponse.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/MetricResponse.java index 46ab5dc163d..14da2bc8cd6 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/MetricResponse.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/MetricResponse.java @@ -37,11 +37,15 @@ public class MetricResponse implements org.apache.thrift.TBase metrics; // required + /** + * + * @see MetricSource + */ + public @org.apache.thrift.annotation.Nullable MetricSource serverType; // required + public @org.apache.thrift.annotation.Nullable java.lang.String server; // required + public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required + public long timestamp; // required + public @org.apache.thrift.annotation.Nullable java.util.List metrics; // 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/process/thrift/ServerProcessService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/ServerProcessService.java index 656b2bb11c6..22c23d7d9ef 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/ServerProcessService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/ServerProcessService.java @@ -436,8 +436,8 @@ public static class getMetrics_args implements org.apache.thrift.TBase violationSummaries; // required + public @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 61e9655e87a..9a66979e7d4 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 + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + public long updateID; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent keyExtent; // required + public @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 { @@ -3392,8 +3396,8 @@ public static class closeUpdate_args implements org.apache.thrift.TBase 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 + 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.util.List 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -6251,8 +6259,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -6753,10 +6761,10 @@ public static class conditionalUpdate_args implements org.apache.thrift.TBase> mutations; // required - private @org.apache.thrift.annotation.Nullable java.util.List symbols; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + public long sessID; // required + public @org.apache.thrift.annotation.Nullable java.util.Map> mutations; // required + public @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 { @@ -7608,8 +7616,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -8158,8 +8166,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(); - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - private long sessID; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + public 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 { @@ -8927,8 +8935,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(); - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - private long sessID; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + public 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 { 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 d74b8f7d989..b792a869efd 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,20 +46,28 @@ public class ActiveScan implements org.apache.thrift.TBase 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 + public @org.apache.thrift.annotation.Nullable java.lang.String client; // required + public @org.apache.thrift.annotation.Nullable java.lang.String user; // required + public @org.apache.thrift.annotation.Nullable java.lang.String tableId; // required + public long age; // required + public long idleTime; // required + /** + * + * @see ScanType + */ + public @org.apache.thrift.annotation.Nullable ScanType type; // required + /** + * + * @see ScanState + */ + public @org.apache.thrift.annotation.Nullable ScanState state; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // 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 long scanId; // optional + public @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 2f7f4b58707..fdc2a9a4560 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(); - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + public @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 12b68e4856c..086ec06b020 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 + public @org.apache.thrift.annotation.Nullable java.lang.String className; // required + public @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 8b158564425..6e148b26756 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 @@ -1597,23 +1597,23 @@ public static class startScan_args implements org.apache.thrift.TBase 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 + 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 org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TRange range; // required + public @org.apache.thrift.annotation.Nullable java.util.List 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -3945,12 +3945,12 @@ public static class startScan_result implements org.apache.thrift.TBase> 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 + 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.util.Map> 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -8942,10 +8942,10 @@ public static class startMultiScan_result implements org.apache.thrift.TBase success; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + 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 /** 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 d6a756d926c..90f4df0b29c 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(); - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + public @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 d49fa40acfe..897426145bd 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 - 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 + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + public long age; // required + public @org.apache.thrift.annotation.Nullable java.util.List 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 /** 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 ecae7041f5b..136a0804434 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 + public @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 8616dc91108..c23be939335 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(); - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required + public @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/TCompactionGroupSummary.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionGroupSummary.java index 6fe6c0264dc..d10aeed4066 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionGroupSummary.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionGroupSummary.java @@ -34,8 +34,8 @@ public class TCompactionGroupSummary implements org.apache.thrift.TBase 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 @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.manager.thrift.TFateId fateId; // required - private @org.apache.thrift.annotation.Nullable java.util.Map overrides; // 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 @org.apache.thrift.annotation.Nullable java.util.List 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 + /** + * + * @see TCompactionKind + */ + public @org.apache.thrift.annotation.Nullable TCompactionKind kind; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.manager.thrift.TFateId fateId; // required + public @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 6ccddc6083f..e08c9628b65 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 + public int priority; // required + public @org.apache.thrift.annotation.Nullable java.lang.String name; // required + public @org.apache.thrift.annotation.Nullable java.lang.String iteratorClass; // required + public @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 8a243255046..45949b42c0c 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 @@ -2786,12 +2786,12 @@ public static class flush_args implements org.apache.thrift.TBase success; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -5895,8 +5895,8 @@ public static class getHistoricalStats_args implements org.apache.thrift.TBase success; // required - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -9562,9 +9562,9 @@ public static class removeLogs_args implements org.apache.thrift.TBase filenames; // required + 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.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 { @@ -10220,8 +10220,8 @@ public static class getActiveLogs_args implements org.apache.thrift.TBase success; // required + public @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 { @@ -11163,9 +11163,9 @@ public static class startGetSummaries_args implements org.apache.thrift.TBase> files; // required + 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 org.apache.accumulo.core.dataImpl.thrift.TSummaryRequest request; // required + public @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 { @@ -14513,8 +14513,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(); - 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -15013,8 +15013,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(); - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - private long sessionId; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required + public 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 { @@ -15507,8 +15507,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(); - private @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TSummaries success; // required - private @org.apache.thrift.annotation.Nullable NoSuchScanIDException nssi; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TSummaries success; // required + public @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 { @@ -16008,9 +16008,9 @@ public static class refreshTablets_args implements org.apache.thrift.TBase tabletsToRefresh; // required + 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.util.List tabletsToRefresh; // 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 { @@ -16670,7 +16670,7 @@ public static class refreshTablets_result implements org.apache.thrift.TBase success; // required + public @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 { @@ -17115,9 +17115,9 @@ public static class allocateTimestamps_args implements org.apache.thrift.TBase tablets; // required + 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.util.List tablets; // 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 { @@ -17777,7 +17777,7 @@ public static class allocateTimestamps_result implements org.apache.thrift.TBase private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new allocateTimestamps_resultStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new allocateTimestamps_resultTupleSchemeFactory(); - private @org.apache.thrift.annotation.Nullable java.util.Map success; // required + public @org.apache.thrift.annotation.Nullable java.util.Map 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 { 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 1c93087df80..d3cd7170ed8 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 @@ -37,11 +37,11 @@ public class TabletStats implements org.apache.thrift.TBase()); + result.tableMap = new HashMap<>(); for (TabletId tabletId : tablets) { - TableInfo info = result.getTableMap().get(tabletId.getTable().canonical()); + TableInfo info = result.tableMap.get(tabletId.getTable().canonical()); if (info == null) { - result.getTableMap().put(tabletId.getTable().canonical(), info = new TableInfo()); + result.tableMap.put(tabletId.getTable().canonical(), info = new TableInfo()); } - info.setOnlineTablets(info.getOnlineTablets() + 1); - info.setRecs(info.getOnlineTablets()); - info.setIngestRate(123.); - info.setQueryRate(456.); + info.onlineTablets++; + info.recs = info.onlineTablets; + info.ingestRate = 123.; + info.queryRate = 456.; } return new TServerStatusImpl(result); } diff --git a/core/src/test/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancerTest.java b/core/src/test/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancerTest.java index 1da4dbe3251..919e55c3b49 100644 --- a/core/src/test/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancerTest.java +++ b/core/src/test/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancerTest.java @@ -69,7 +69,7 @@ private static TabletServerId mkts(String host, int port, String session) { private static TServerStatus status(Object... config) { org.apache.accumulo.core.manager.thrift.TabletServerStatus thriftStatus = new org.apache.accumulo.core.manager.thrift.TabletServerStatus(); - thriftStatus.setTableMap(new HashMap<>()); + thriftStatus.tableMap = new HashMap<>(); String tablename = null; for (Object c : config) { if (c instanceof String) { @@ -77,9 +77,9 @@ private static TServerStatus status(Object... config) { } else { TableInfo info = new TableInfo(); int count = (Integer) c; - info.setOnlineTablets(count); - info.setTablets(count); - thriftStatus.getTableMap().put(tablename, info); + info.onlineTablets = count; + info.tablets = count; + thriftStatus.tableMap.put(tablename, info); } } return new TServerStatusImpl(thriftStatus); @@ -94,9 +94,9 @@ static List generateFakeTablets(TabletServerId tserver, TableI for (int i = 0; i < tableInfo.getTableMap().get(tableId.canonical()).getOnlineTabletCount(); i++) { TabletStats stats = new TabletStats(); - stats.setExtent( + stats.extent = new KeyExtent(tableId, new Text(tserver.getHost() + String.format("%03d", i + 1)), - new Text(tserver.getHost() + String.format("%03d", i))).toThrift()); + new Text(tserver.getHost() + String.format("%03d", i))).toThrift(); result.add(new TabletStatisticsImpl(stats)); } return result; diff --git a/server/base/src/main/java/org/apache/accumulo/server/data/ServerConditionalMutation.java b/server/base/src/main/java/org/apache/accumulo/server/data/ServerConditionalMutation.java index 9b9a20e41c9..6c70089787e 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/data/ServerConditionalMutation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/data/ServerConditionalMutation.java @@ -29,10 +29,10 @@ public class ServerConditionalMutation extends ServerMutation { private final List conditions; public ServerConditionalMutation(TConditionalMutation input) { - super(input.getMutation()); + super(input.mutation); - this.cmid = input.getId(); - this.conditions = input.getConditions(); + this.cmid = input.id; + this.conditions = input.conditions; } public long getID() { diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandler.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandler.java index e6c6d58ff34..f22dbbebdee 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandler.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandler.java @@ -91,8 +91,7 @@ protected void updateArgs(Object[] args) throws ThriftSecurityException { return; } - Class tokenClass = - getTokenClassFromName(tcreds.getTokenClassName()); + Class tokenClass = getTokenClassFromName(tcreds.tokenClassName); // The Accumulo principal extracted from the SASL transport final String principal = UGIAssumingProcessor.rpcPrincipal(); @@ -101,9 +100,9 @@ protected void updateArgs(Object[] args) throws ThriftSecurityException { // should match if (UGIAssumingProcessor.rpcMechanism() == SaslMechanism.DIGEST_MD5 && DelegationTokenImpl.class.isAssignableFrom(tokenClass)) { - if (!principal.equals(tcreds.getPrincipal())) { + if (!principal.equals(tcreds.principal)) { log.warn("{} issued RPC with delegation token over DIGEST-MD5 as the " - + "Accumulo principal {}. Disallowing RPC", principal, tcreds.getPrincipal()); + + "Accumulo principal {}. Disallowing RPC", principal, tcreds.principal); throw new ThriftSecurityException("RPC principal did not match provided Accumulo principal", SecurityErrorCode.BAD_CREDENTIALS); } @@ -129,13 +128,13 @@ protected void updateArgs(Object[] args) throws ThriftSecurityException { // The principal from the SASL transport should match what the user requested as their Accumulo // principal - if (!principal.equals(tcreds.getPrincipal())) { + if (!principal.equals(tcreds.principal)) { UsersWithHosts usersWithHosts = impersonation.get(principal); if (usersWithHosts == null) { - principalMismatch(principal, tcreds.getPrincipal()); + principalMismatch(principal, tcreds.principal); } - if (!usersWithHosts.getUsers().contains(tcreds.getPrincipal())) { - principalMismatch(principal, tcreds.getPrincipal()); + if (!usersWithHosts.getUsers().contains(tcreds.principal)) { + principalMismatch(principal, tcreds.principal); } String clientAddr = TServerUtils.clientAddress.get(); if (!usersWithHosts.getHosts().contains(clientAddr)) { diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java index c80376f8d79..5e1a08a713f 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java @@ -590,7 +590,7 @@ private boolean canModifyNamespacePermission(TCredentials c, NamespaceId namespa // This is a bit hackier then I (vines) wanted, but I think this one hackiness makes the overall // SecurityOperations more succinct. return hasSystemPermissionWithNamespaceId(c, SystemPermission.ALTER_NAMESPACE, namespace, false) - || hasNamespacePermission(c, c.getPrincipal(), namespace, NamespacePermission.GRANT); + || hasNamespacePermission(c, c.principal, namespace, NamespacePermission.GRANT); } protected boolean canRevokeSystem(TCredentials c, String user, SystemPermission sysPerm) diff --git a/server/base/src/main/java/org/apache/accumulo/server/tablets/ConditionCheckerContext.java b/server/base/src/main/java/org/apache/accumulo/server/tablets/ConditionCheckerContext.java index f45793f44c9..517d07aae0d 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/tablets/ConditionCheckerContext.java +++ b/server/base/src/main/java/org/apache/accumulo/server/tablets/ConditionCheckerContext.java @@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkArgument; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -89,10 +88,10 @@ public ConditionCheckerContext(ServerContext context, CompressedIterators compre SortedKeyValueIterator buildIterator(SortedKeyValueIterator systemIter, TCondition tc) throws IOException, ReflectiveOperationException { - ArrayByteSequence key = new ArrayByteSequence(tc.getIterators()); + ArrayByteSequence key = new ArrayByteSequence(tc.iterators); MergedIterConfig mic = mergedIterCache.get(key); if (mic == null) { - IterConfig ic = compressedIters.decompress(ByteBuffer.wrap(tc.getIterators())); + IterConfig ic = compressedIters.decompress(tc.iterators); List mergedIters = new ArrayList<>(tableIters.size() + ic.ssiList.size()); Map> mergedItersOpts = @@ -118,7 +117,7 @@ boolean checkConditions(SortedKeyValueIterator systemIter, for (TCondition tc : scm.getConditions()) { Range range; - if (tc.isHasTimestamp()) { + if (tc.hasTimestamp) { range = Range.exact(new Text(scm.getRow()), new Text(tc.getCf()), new Text(tc.getCq()), new Text(tc.getCv()), tc.getTs()); } else { diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ActionStatsUpdator.java b/server/base/src/main/java/org/apache/accumulo/server/util/ActionStatsUpdator.java index 4141f1ca033..b44a5eb8172 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ActionStatsUpdator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ActionStatsUpdator.java @@ -23,14 +23,14 @@ public class ActionStatsUpdator { public static void update(ActionStats summary, ActionStats td) { - summary.setStatus(summary.getStatus() + td.getStatus()); - summary.setElapsed(summary.getElapsed() + td.getElapsed()); - summary.setNum(summary.getNum() + td.getNum()); - summary.setCount(summary.getCount() + td.getCount()); - summary.setSumDev(summary.getSumDev() + td.getSumDev()); - summary.setQueueTime(summary.getQueueTime() + td.getQueueTime()); - summary.setQueueSumDev(summary.getQueueSumDev() + td.getQueueSumDev()); - summary.setFail(summary.getFail() + td.getFail()); + summary.status += td.status; + summary.elapsed += td.elapsed; + summary.num += td.num; + summary.count += td.count; + summary.sumDev += td.sumDev; + summary.queueTime += td.queueTime; + summary.queueSumDev += td.queueSumDev; + summary.fail += td.fail; } } diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListCompactions.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListCompactions.java index cdbe2b00b5c..635339f842c 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ListCompactions.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListCompactions.java @@ -64,9 +64,9 @@ public RunningCompactionSummary(TExternalCompaction runningCompaction, boolean a super(); ecid = runningCompaction.getJob().getExternalCompactionId(); addr = runningCompaction.getCompactor(); - kind = runningCompaction.getJob().getKind(); + kind = runningCompaction.getJob().kind; groupName = ResourceGroupId.of(runningCompaction.getGroupName()); - KeyExtent extent = KeyExtent.fromThrift(runningCompaction.getJob().getExtent()); + KeyExtent extent = KeyExtent.fromThrift(runningCompaction.getJob().extent); ke = extent.obscured(); tableId = extent.tableId().canonical(); if (addDetail) { diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/adminCommand/VerifyTabletAssignments.java b/server/base/src/main/java/org/apache/accumulo/server/util/adminCommand/VerifyTabletAssignments.java index 31b5a5b0651..dec97210a5c 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/adminCommand/VerifyTabletAssignments.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/adminCommand/VerifyTabletAssignments.java @@ -180,7 +180,7 @@ private void checkTable(final ClientContext context, final boolean verbose, Stri private void checkFailures(HostAndPort server, HashSet failures, MultiScanResult scanResult) { - for (TKeyExtent tke : scanResult.getFailures().keySet()) { + for (TKeyExtent tke : scanResult.failures.keySet()) { KeyExtent ke = KeyExtent.fromThrift(tke); System.out.println(" Tablet " + ke + " failed at " + server); failures.add(ke); @@ -227,17 +227,17 @@ private void checkTabletServer(ClientContext context, Entry collection, final GCStatus sta } finally { deleteThreadPool.shutdownNow(); } - status.getCurrentLog().setDeleted(status.getCurrentLog().getDeleted() + counter.get()); + status.currentLog.deleted += counter.get(); return counter.get(); } diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 13044b69aa9..111d53352f4 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -223,26 +223,23 @@ public void run() { try { System.gc(); // make room - status.getCurrent().setStarted(System.currentTimeMillis()); + status.current.started = System.currentTimeMillis(); var rootGC = new GCRun(DataLevel.ROOT, getContext()); var mdGC = new GCRun(DataLevel.METADATA, getContext()); var userGC = new GCRun(DataLevel.USER, getContext()); log.info("Starting Root table Garbage Collection."); - status.getCurrent().setBulks(status.getCurrent().getBulks() - + new GarbageCollectionAlgorithm().collect(rootGC)); + status.current.bulks += new GarbageCollectionAlgorithm().collect(rootGC); incrementStatsForRun(rootGC); logStats(); log.info("Starting Metadata table Garbage Collection."); - status.getCurrent().setBulks( - status.getCurrent().getBulks() + new GarbageCollectionAlgorithm().collect(mdGC)); + status.current.bulks += new GarbageCollectionAlgorithm().collect(mdGC); incrementStatsForRun(mdGC); logStats(); log.info("Starting User table Garbage Collection."); - status.getCurrent().setBulks(status.getCurrent().getBulks() - + new GarbageCollectionAlgorithm().collect(userGC)); + status.current.bulks += new GarbageCollectionAlgorithm().collect(userGC); incrementStatsForRun(userGC); logStats(); @@ -250,10 +247,10 @@ public void run() { TraceUtil.setException(innerSpan, e, false); log.error("{}", e.getMessage(), e); } finally { - status.getCurrent().setFinished(System.currentTimeMillis()); - status.setLast(status.getCurrent()); - gcCycleMetrics.setLastCollect(status.getCurrent()); - status.setCurrent(new GcCycleStats()); + status.current.finished = System.currentTimeMillis(); + status.last = status.current; + gcCycleMetrics.setLastCollect(status.current); + status.current = new GcCycleStats(); } log.info(String.format("Collect cycle took %.2f seconds", @@ -266,7 +263,7 @@ public void run() { new GarbageCollectWriteAheadLogs(getContext(), fs, liveTServerSet); log.info("Beginning garbage collection of write-ahead logs"); walogCollector.collect(status); - gcCycleMetrics.setLastWalCollect(status.getLastLog()); + gcCycleMetrics.setLastWalCollect(status.lastLog); } catch (Exception e) { TraceUtil.setException(walSpan, e, false); log.error("{}", e.getMessage(), e); @@ -361,21 +358,19 @@ public void run() { } private void incrementStatsForRun(GCRun gcRun) { - status.getCurrent() - .setCandidates(status.getCurrent().getCandidates() + gcRun.getCandidatesStat()); - status.getCurrent().setInUse(status.getCurrent().getInUse() + gcRun.getInUseStat()); - status.getCurrent().setDeleted(status.getCurrent().getDeleted() + gcRun.getDeletedStat()); - status.getCurrent().setErrors(status.getCurrent().getErrors() + gcRun.getErrorsStat()); + status.current.candidates += gcRun.getCandidatesStat(); + status.current.inUse += gcRun.getInUseStat(); + status.current.deleted += gcRun.getDeletedStat(); + status.current.errors += gcRun.getErrorsStat(); } // public for ExitCodesIT public void logStats() { - log.info("Number of data file candidates for deletion: {}", - status.getCurrent().getCandidates()); - log.info("Number of data file candidates still in use: {}", status.getCurrent().getInUse()); - log.info("Number of successfully deleted data files: {}", status.getCurrent().getDeleted()); - log.info("Number of data files delete failures: {}", status.getCurrent().getErrors()); - log.info("Number of bulk imports in progress: {}", status.getCurrent().getBulks()); + log.info("Number of data file candidates for deletion: {}", status.current.candidates); + log.info("Number of data file candidates still in use: {}", status.current.inUse); + log.info("Number of successfully deleted data files: {}", status.current.deleted); + log.info("Number of data files delete failures: {}", status.current.errors); + log.info("Number of bulk imports in progress: {}", status.current.bulks); } /** diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java index 9ed0badc5a1..3784311ab19 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java @@ -720,7 +720,7 @@ public TDelegationToken getDelegationToken(TInfo tinfo, TCredentials credentials final AuthenticationTokenSecretManager secretManager = context.getSecretManager(); try { Entry,AuthenticationTokenIdentifier> pair = - secretManager.generateToken(credentials.getPrincipal(), config); + secretManager.generateToken(credentials.principal, config); return new TDelegationToken(ByteBuffer.wrap(pair.getKey().getPassword()), pair.getValue().getThriftIdentifier()); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java index d12b8400fe8..60f233ac020 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java @@ -55,9 +55,9 @@ public JsonElement serialize(CompactionCommitData src, Type typeOfSrc, obj.addProperty("ecid", src.ecid); obj.addProperty("extent", src.textent.toString()); obj.addProperty("outputTmpPath", src.outputTmpPath); - obj.addProperty("entriesRead", src.stats.getEntriesRead()); - obj.addProperty("entriesWritten", src.stats.getEntriesWritten()); - obj.addProperty("fileSize", src.stats.getFileSize()); + obj.addProperty("entriesRead", src.stats.entriesRead); + obj.addProperty("entriesWritten", src.stats.entriesWritten); + obj.addProperty("fileSize", src.stats.fileSize); JsonArray arr = new JsonArray(); src.inputPaths.forEach(arr::add); obj.add("inputs", arr); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/fate/FateManager.java b/server/manager/src/main/java/org/apache/accumulo/manager/fate/FateManager.java index 64f1371a9ed..0aa7683a018 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/fate/FateManager.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/fate/FateManager.java @@ -397,10 +397,9 @@ public static Map getCurrentAssignments(ServerCon try { var tparitions = client.getPartitions(TraceUtil.traceInfo(), context.rpcCreds()); - var partitions = tparitions.getPartitions().stream().map(FatePartition::from) - .collect(Collectors.toSet()); - currentAssignments.put(address, - new CurrentPartitions(tparitions.getUpdateId(), partitions)); + var partitions = + tparitions.partitions.stream().map(FatePartition::from).collect(Collectors.toSet()); + currentAssignments.put(address, new CurrentPartitions(tparitions.updateId, partitions)); } finally { ThriftUtil.returnClient(client, context); } diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/LockTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/LockTable.java index 9bac61b12cc..82bdffa58a8 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/LockTable.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/LockTable.java @@ -88,7 +88,7 @@ public void undo(FateId fateId, FateEnv env) throws Exception { * be converted to a RowRange, an infinite LockRange is returned. */ private LockRange getLockRange(FateEnv env) { - if (tRange.isInfiniteStartKey() && tRange.isInfiniteStopKey()) { + if (tRange.infiniteStartKey && tRange.infiniteStopKey) { return LockRange.infinite(); } Range range = new Range(tRange); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java index 92a1c8439f9..1350669997f 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java @@ -75,7 +75,7 @@ public long isReady(FateId fateId, FateEnv env) { ThriftUtil.getClient(ThriftClientTypes.TABLET_SERVER, hostAndPort, env.getContext()); TabletServerStatus status = client.getTabletServerStatus(TraceUtil.traceInfo(), env.getContext().rpcCreds()); - if (status.getTableMap() != null && status.getTableMap().isEmpty()) { + if (status.tableMap != null && status.tableMap.isEmpty()) { log.info("tablet server hosts no tablets {}", server); client.halt(TraceUtil.traceInfo(), env.getContext().rpcCreds(), env.getServiceLock().getLockID().serialize()); @@ -83,7 +83,7 @@ public long isReady(FateId fateId, FateEnv env) { return 0; } else { log.info("tablet server {} still has tablets for tables: {}", server, - (status.getTableMap() == null) ? "null" : status.getTableMap().keySet()); + (status.tableMap == null) ? "null" : status.tableMap.keySet()); } } catch (TTransportException ex) { // expected diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/next/SystemInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/next/SystemInformation.java index 70dfe828cf6..e0e9624284b 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/next/SystemInformation.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/next/SystemInformation.java @@ -907,7 +907,7 @@ public void processResponse(final ServerId server, final MetricResponse response captureRecoveriesInProgress(server, response); FMetric flatbuffer = new FMetric(); FTag tag = new FTag(); - switch (response.getServerType()) { + switch (response.serverType) { case COMPACTOR: compactors .computeIfAbsent(response.getResourceGroup(), (rg) -> ConcurrentHashMap.newKeySet()) @@ -1086,13 +1086,13 @@ public void processResponse(final ServerId server, final MetricResponse response } break; default: - LOG.error("Unhandled server type in fetch metric response: {}", response.getServerType()); + LOG.error("Unhandled server type in fetch metric response: {}", response.serverType); break; } } public void processExternalCompaction(TExternalCompaction tec) { - var tableId = KeyExtent.fromThrift(tec.getJob().getExtent()).tableId(); + var tableId = KeyExtent.fromThrift(tec.getJob().extent).tableId(); runningCompactionsPerTable.computeIfAbsent(tableId, t -> new LongAdder()).increment(); runningCompactionsPerGroup.computeIfAbsent(tec.getGroupName(), t -> new LongAdder()) .increment(); @@ -1347,7 +1347,7 @@ private void computeAlerts(final List failures, ServerId sid = e.getKey(); MetricResponse mr = e.getValue(); if (mr != null) { - List metrics = mr.getMetrics(); + List metrics = mr.metrics; if (sid.getType() == ServerId.Type.SCAN_SERVER || sid.getType() == ServerId.Type.TABLET_SERVER) { for (ByteBuffer binary : metrics) { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java index 3a5c334f033..e2ece2a752a 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java @@ -924,10 +924,10 @@ public List getTabletStats(TInfo tinfo, TCredentials credentials, S if (ke.tableId().compareTo(text) == 0) { Tablet tablet = entry.getValue(); TabletStats stats = tablet.getTabletStats(); - stats.setExtent(ke.toThrift()); - stats.setIngestRate(tablet.ingestRate()); - stats.setQueryRate(tablet.queryRate()); - stats.setNumEntries(tablet.getNumEntries()); + stats.extent = ke.toThrift(); + stats.ingestRate = tablet.ingestRate(); + stats.queryRate = tablet.queryRate(); + stats.numEntries = tablet.getNumEntries(); result.add(stats); } } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index b678dd06de9..ff6c2124b3b 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -796,25 +796,25 @@ public TabletServerStatus getStats(Map> scanCou TableInfo table = tables.get(tableId); if (table == null) { table = new TableInfo(); - table.setMinors(new Compacting()); + table.minors = new Compacting(); tables.put(tableId, table); } long recs = tablet.getNumEntries(); - table.setTablets(table.getTablets() + 1); - table.setOnlineTablets(table.getOnlineTablets() + 1); - table.setRecs(table.getRecs() + recs); - table.setQueryRate(table.getQueryRate() + tablet.queryRate()); - table.setQueryByteRate(table.getQueryByteRate() + tablet.queryByteRate()); - table.setIngestRate(table.getIngestRate() + tablet.ingestRate()); - table.setIngestByteRate(table.getIngestByteRate() + tablet.ingestByteRate()); - table.setScanRate(table.getScanRate() + tablet.scanRate()); + table.tablets++; + table.onlineTablets++; + table.recs += recs; + table.queryRate += tablet.queryRate(); + table.queryByteRate += tablet.queryByteRate(); + table.ingestRate += tablet.ingestRate(); + table.ingestByteRate += tablet.ingestByteRate(); + table.scanRate += tablet.scanRate(); long recsInMemory = tablet.getNumEntriesInMemory(); - table.setRecsInMemory(table.getRecsInMemory() + recsInMemory); + table.recsInMemory += recsInMemory; if (tablet.isMinorCompactionRunning()) { - table.getMinors().setRunning(table.getMinors().getRunning() + 1); + table.minors.running++; } if (tablet.isMinorCompactionQueued()) { - table.getMinors().setQueued(table.getMinors().getQueued() + 1); + table.minors.queued++; } }); @@ -825,14 +825,12 @@ public TabletServerStatus getStats(Map> scanCou tables.put(tableId.canonical(), table); } - if (table.getScans() == null) { - table.setScans(new Compacting()); + if (table.scans == null) { + table.scans = new Compacting(); } - table.getScans() - .setQueued(table.getScans().getQueued() + mapCounter.getInt(ScanRunState.QUEUED)); - table.getScans() - .setRunning(table.getScans().getRunning() + mapCounter.getInt(ScanRunState.RUNNING)); + table.scans.queued += mapCounter.getInt(ScanRunState.QUEUED); + table.scans.running += mapCounter.getInt(ScanRunState.RUNNING); }); ArrayList offlineTabletsCopy = new ArrayList<>(); @@ -850,24 +848,24 @@ public TabletServerStatus getStats(Map> scanCou table = new TableInfo(); tables.put(tableId, table); } - table.setTablets(table.getTablets() + 1); + table.tablets++; } - result.setLastContact(RelativeTime.currentTimeMillis()); - result.setTableMap(tables); - result.setOsLoad(ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage()); - result.setName(String.valueOf(getAdvertiseAddress())); - result.setHoldTime(resourceManager.holdTime()); - result.setLookups(seekCount.sum()); - result.setIndexCacheHits(resourceManager.getIndexCache().getStats().hitCount()); - result.setIndexCacheRequest(resourceManager.getIndexCache().getStats().requestCount()); - result.setDataCacheHits(resourceManager.getDataCache().getStats().hitCount()); - result.setDataCacheRequest(resourceManager.getDataCache().getStats().requestCount()); - result.setLogSorts(logSorter.getLogSorts()); - result.setFlushs(flushCounter.get()); - result.setSyncs(syncCounter.get()); - result.setVersion(getVersion()); - result.setResponseTime(System.currentTimeMillis() - start); + result.lastContact = RelativeTime.currentTimeMillis(); + result.tableMap = tables; + result.osLoad = ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage(); + result.name = String.valueOf(getAdvertiseAddress()); + result.holdTime = resourceManager.holdTime(); + result.lookups = seekCount.sum(); + result.indexCacheHits = resourceManager.getIndexCache().getStats().hitCount(); + result.indexCacheRequest = resourceManager.getIndexCache().getStats().requestCount(); + result.dataCacheHits = resourceManager.getDataCache().getStats().hitCount(); + result.dataCacheRequest = resourceManager.getDataCache().getStats().requestCount(); + result.logSorts = logSorter.getLogSorts(); + result.flushs = flushCounter.get(); + result.syncs = syncCounter.get(); + result.version = getVersion(); + result.responseTime = System.currentTimeMillis() - start; return result; } 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 0f25f5698f4..43abdd67564 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 @@ -38,21 +38,20 @@ public void updateTime(Operation operation, long queued, long start, long count, try { ActionStats data = map[operation.ordinal()]; if (failed) { - data.setFail(data.getFail() + 1); - data.setStatus(data.getStatus() - 1); + data.fail++; + data.status--; } else { double t = (System.currentTimeMillis() - start) / 1000.0; double q = (start - queued) / 1000.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) { + 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) { resetTimes(); } } @@ -63,7 +62,7 @@ public void updateTime(Operation operation, long queued, long start, long count, } public void saveMajorMinorTimes(TabletStats t) { - ActionStatsUpdator.update(minor, t.getMinors()); + ActionStatsUpdator.update(minor, t.minors); } private void resetTimes() { @@ -71,7 +70,7 @@ private void resetTimes() { } public void incrementStatusMinor() { - minor.setStatus(minor.getStatus() + 1); + minor.status++; } public TabletStats getTabletStats() { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftScanClientHandler.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftScanClientHandler.java index 56d61bdf46a..88ecfd5e841 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftScanClientHandler.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftScanClientHandler.java @@ -308,11 +308,11 @@ protected ScanResult continueScan(TInfo tinfo, long scanID, SingleScanSession sc ScanResult scanResult = new ScanResult(Key.compress(bresult.getResults()), bresult.isMore()); - scanSession.entriesReturned += scanResult.getResults().size(); + scanSession.entriesReturned += scanResult.results.size(); scanSession.batchCount++; - if (scanResult.isMore() && scanSession.batchCount > scanSession.readaheadThreshold) { + if (scanResult.more && scanSession.batchCount > scanSession.readaheadThreshold) { // start reading next batch while current batch is transmitted // to client scanSession.setScanTask(new NextBatchTask(server, scanID, scanSession.interruptFlag)); @@ -320,7 +320,7 @@ protected ScanResult continueScan(TInfo tinfo, long scanID, SingleScanSession sc getScanDispatcher(scanSession.extent), scanSession, scanSession.getScanTask()); } - if (!scanResult.isMore()) { + if (!scanResult.more) { closeScan(tinfo, scanID); } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java index 56db5f2a277..dc11899e979 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java @@ -338,15 +338,15 @@ public List getLogSorts() { synchronized (currentWork) { for (Entry entries : currentWork.entrySet()) { RecoveryStatus status = new RecoveryStatus(); - status.setName(entries.getKey()); + status.name = entries.getKey(); try { double progress = entries.getValue().getBytesCopied() / walBlockSize; // to be sure progress does not exceed 100% - status.setProgress(Math.min(progress, 99.9)); + status.progress = Math.min(progress, 99.9); } catch (IOException ex) { log.warn("Error getting bytes read"); } - status.setRuntime((int) entries.getValue().getSortTime()); + status.runtime = (int) entries.getValue().getSortTime(); result.add(status); } return result; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/ScanSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/ScanSession.java index e2522c50883..557fd4eb3b8 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/ScanSession.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/ScanSession.java @@ -147,22 +147,22 @@ private class IterConfImpl implements IteratorConfiguration { @Override public String getIteratorClass() { - return ii.getClassName(); + return ii.className; } @Override public String getName() { - return ii.getIterName(); + return ii.iterName; } @Override public int getPriority() { - return ii.getPriority(); + return ii.priority; } @Override public Map getOptions() { - Map opts = scanParams.getSsio().get(ii.getIterName()); + Map opts = scanParams.getSsio().get(ii.iterName); return opts == null || opts.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(opts); } diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java index 70f651e88b2..a1ad2f73dbb 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java +++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java @@ -1113,9 +1113,9 @@ private void printConstraintViolationException(ConstraintViolationException cve) "Constraint class", "Violation code", "Violation Description")); logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3))); - for (TConstraintViolationSummary cvs : cve.getViolationSummaries()) { + for (TConstraintViolationSummary cvs : cve.violationSummaries) { logError(String.format("%-" + COL1 + "s | %" + COL2 + "d | %-" + col3 + "s%n", - cvs.getConstrainClass(), cvs.getViolationCode(), cvs.getViolationDescription())); + cvs.constrainClass, cvs.violationCode, cvs.violationDescription)); } logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3))); diff --git a/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java b/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java index a724979ca71..d5e0ef065ae 100644 --- a/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java @@ -94,7 +94,7 @@ public void testCorruptMutation() throws Exception { // Simulate data corruption in the serialized mutation TMutation badMutation = createTMutation("ghi", "z3"); - badMutation.setEntries(-42); + badMutation.entries = -42; // Write some good and bad mutations to the session. The server side will see an error here, // however since this is a thrift oneway method no exception is expected here. This should diff --git a/test/src/main/java/org/apache/accumulo/test/ListCompactionsIT.java b/test/src/main/java/org/apache/accumulo/test/ListCompactionsIT.java index be14de80a36..a7fa9b0f6d4 100644 --- a/test/src/main/java/org/apache/accumulo/test/ListCompactionsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ListCompactionsIT.java @@ -123,11 +123,10 @@ public void testListRunningCompactions() throws Exception { }, 10000); expectedCompactions.values().forEach(tec -> { - RunningCompactionSummary rcs = - compactionsByEcid.get(tec.getJob().getExternalCompactionId()); + RunningCompactionSummary rcs = compactionsByEcid.get(tec.job.getExternalCompactionId()); assertNotNull(rcs); assertEquals(tec.getJob().getExternalCompactionId(), rcs.getEcid()); - assertEquals(tec.getGroupName(), rcs.getGroup().canonical()); + assertEquals(tec.groupName, rcs.getGroup().canonical()); assertEquals(tec.getCompactor(), rcs.getAddr()); }); diff --git a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java index f550e131de3..7f85448fa3e 100644 --- a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java @@ -142,7 +142,7 @@ private long getSyncs(AccumuloClient c) throws Exception { ThriftUtil.getClient(ThriftClientTypes.TABLET_SERVER, HostAndPort.fromParts(tserver.getHost(), tserver.getPort()), context); TabletServerStatus status = client.getTabletServerStatus(null, context.rpcCreds()); - return status.getSyncs(); + return status.syncs; } return 0; } diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java index d238e962d06..9519a5b2fc2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java @@ -84,7 +84,7 @@ public TabletServerStatus getTabletServerStatus(TInfo tinfo, TCredentials creden synchronized (this) { if (statusCount++ < 1) { TabletServerStatus result = new TabletServerStatus(); - result.setTableMap(new HashMap<>()); + result.tableMap = new HashMap<>(); return result; } } diff --git a/test/src/main/thrift-gen-java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java b/test/src/main/thrift-gen-java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java index 0ae1f502c7e..ff21680f2e1 100644 --- a/test/src/main/thrift-gen-java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java +++ b/test/src/main/thrift-gen-java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java @@ -1189,7 +1189,7 @@ public static class echoPass_args implements org.apache.thrift.TBase()); + thriftStatus.tableMap = new HashMap<>(); for (TabletId extent : tablets) { TableId table = extent.getTable(); - TableInfo info = thriftStatus.getTableMap().get(table.canonical()); + TableInfo info = thriftStatus.tableMap.get(table.canonical()); if (info == null) { - thriftStatus.getTableMap().put(table.canonical(), info = new TableInfo()); + thriftStatus.tableMap.put(table.canonical(), info = new TableInfo()); } - info.setOnlineTablets(info.getOnlineTablets() + 1); - info.setRecs(info.getOnlineTablets()); - info.setIngestRate(123.); - info.setQueryRate(456.); + info.onlineTablets++; + info.recs = info.onlineTablets; + info.ingestRate = 123.; + info.queryRate = 456.; } return new TServerStatusImpl(thriftStatus);