This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch 1451-external-compactions-feature in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1451-external-compactions-feature by this push: new 42de4ef Prefix thrift types with T that have duplicate names 42de4ef is described below commit 42de4efab84b4dc0e4eda23c6d348be744941c30 Author: Keith Turner <ktur...@apache.org> AuthorDate: Wed Apr 21 14:09:45 2021 -0400 Prefix thrift types with T that have duplicate names --- .../compaction/thrift/CompactionCoordinator.java | 70 +++++++++++----------- .../accumulo/core/compaction/thrift/Status.java | 24 ++++---- ...{CompactionState.java => TCompactionState.java} | 6 +- .../core/tabletserver/thrift/ActiveCompaction.java | 48 +++++++-------- .../{CompactionKind.java => TCompactionKind.java} | 6 +- ...ompactionReason.java => TCompactionReason.java} | 6 +- ...{CompactionStats.java => TCompactionStats.java} | 60 +++++++++---------- .../{CompactionType.java => TCompactionType.java} | 6 +- .../thrift/TExternalCompactionJob.java | 64 ++++++++++---------- core/src/main/thrift/compaction-coordinator.thrift | 8 +-- core/src/main/thrift/tabletserver.thrift | 20 +++---- .../accumulo/server/compaction/CompactionInfo.java | 16 ++--- .../accumulo/server/compaction/Compactor.java | 6 +- .../coordinator/CompactionCoordinator.java | 12 ++-- .../accumulo/coordinator/CompactionUpdate.java | 8 +-- .../accumulo/coordinator/RunningCompaction.java | 12 ++-- .../coordinator/CompactionCoordinatorTest.java | 5 +- .../accumulo/compactor/CompactionEnvironment.java | 10 ++-- .../accumulo/compactor/CompactionJobHolder.java | 8 +-- .../org/apache/accumulo/compactor/Compactor.java | 20 +++---- .../apache/accumulo/compactor/CompactorTest.java | 16 ++--- .../tserver/compactions/ExternalCompactionJob.java | 16 ++--- .../accumulo/tserver/tablet/CompactableUtils.java | 10 ++-- .../accumulo/tserver/tablet/MinorCompactor.java | 10 ++-- .../accumulo/test/ExternalDoNothingCompactor.java | 4 +- 25 files changed, 236 insertions(+), 235 deletions(-) diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinator.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinator.java index 43ed0ee..490f729 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinator.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinator.java @@ -31,11 +31,11 @@ public class CompactionCoordinator { public void cancelCompaction(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId) throws UnknownCompactionIdException, org.apache.thrift.TException; - public void compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats) throws UnknownCompactionIdException, org.apache.thrift.TException; + public void compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats) throws UnknownCompactionIdException, org.apache.thrift.TException; public org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob getCompactionJob(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String queueName, java.lang.String compactor, java.lang.String externalCompactionId) throws org.apache.thrift.TException; - public void updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, CompactionState state, java.lang.String message, long timestamp) throws UnknownCompactionIdException, org.apache.thrift.TException; + public void updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, TCompactionState state, java.lang.String message, long timestamp) throws UnknownCompactionIdException, org.apache.thrift.TException; public void compactionFailed(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent) throws UnknownCompactionIdException, org.apache.thrift.TException; @@ -45,11 +45,11 @@ public class CompactionCoordinator { public void cancelCompaction(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; - public void compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; public void getCompactionJob(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String queueName, java.lang.String compactor, java.lang.String externalCompactionId, org.apache.thrift.async.AsyncMethodCallback<org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob> resultHandler) throws org.apache.thrift.TException; - public void updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, CompactionState state, java.lang.String message, long timestamp, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; + public void updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, TCompactionState state, java.lang.String message, long timestamp, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; public void compactionFailed(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException; @@ -100,13 +100,13 @@ public class CompactionCoordinator { return; } - public void compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats) throws UnknownCompactionIdException, org.apache.thrift.TException + public void compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats) throws UnknownCompactionIdException, org.apache.thrift.TException { send_compactionCompleted(tinfo, credentials, externalCompactionId, extent, stats); recv_compactionCompleted(); } - public void send_compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats) throws org.apache.thrift.TException + public void send_compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats) throws org.apache.thrift.TException { compactionCompleted_args args = new compactionCompleted_args(); args.setTinfo(tinfo); @@ -154,13 +154,13 @@ public class CompactionCoordinator { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getCompactionJob failed: unknown result"); } - public void updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, CompactionState state, java.lang.String message, long timestamp) throws UnknownCompactionIdException, org.apache.thrift.TException + public void updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, TCompactionState state, java.lang.String message, long timestamp) throws UnknownCompactionIdException, org.apache.thrift.TException { send_updateCompactionStatus(tinfo, credentials, externalCompactionId, state, message, timestamp); recv_updateCompactionStatus(); } - public void send_updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, CompactionState state, java.lang.String message, long timestamp) throws org.apache.thrift.TException + public void send_updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, TCompactionState state, java.lang.String message, long timestamp) throws org.apache.thrift.TException { updateCompactionStatus_args args = new updateCompactionStatus_args(); args.setTinfo(tinfo); @@ -264,7 +264,7 @@ public class CompactionCoordinator { } } - public void compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + public void compactionCompleted(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); compactionCompleted_call method_call = new compactionCompleted_call(tinfo, credentials, externalCompactionId, extent, stats, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -276,8 +276,8 @@ public class CompactionCoordinator { private org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; private java.lang.String externalCompactionId; private org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; - private org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats; - public compactionCompleted_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFac [...] + private org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats; + public compactionCompleted_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFa [...] super(client, protocolFactory, transport, resultHandler, false); this.tinfo = tinfo; this.credentials = credentials; @@ -352,7 +352,7 @@ public class CompactionCoordinator { } } - public void updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, CompactionState state, java.lang.String message, long timestamp, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { + public void updateCompactionStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, TCompactionState state, java.lang.String message, long timestamp, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException { checkReady(); updateCompactionStatus_call method_call = new updateCompactionStatus_call(tinfo, credentials, externalCompactionId, state, message, timestamp, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -363,10 +363,10 @@ public class CompactionCoordinator { private org.apache.accumulo.core.trace.thrift.TInfo tinfo; private org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; private java.lang.String externalCompactionId; - private CompactionState state; + private TCompactionState state; private java.lang.String message; private long timestamp; - public updateCompactionStatus_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, CompactionState state, java.lang.String message, long timestamp, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport tran [...] + public updateCompactionStatus_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, TCompactionState state, java.lang.String message, long timestamp, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport tra [...] super(client, protocolFactory, transport, resultHandler, false); this.tinfo = tinfo; this.credentials = credentials; @@ -1914,7 +1914,7 @@ public class CompactionCoordinator { public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats; // 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 { @@ -2001,7 +2001,7 @@ public class CompactionCoordinator { tmpMap.put(_Fields.EXTENT, new org.apache.thrift.meta_data.FieldMetaData("extent", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent.class))); tmpMap.put(_Fields.STATS, new org.apache.thrift.meta_data.FieldMetaData("stats", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.tabletserver.thrift.CompactionStats.class))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.tabletserver.thrift.TCompactionStats.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(compactionCompleted_args.class, metaDataMap); } @@ -2014,7 +2014,7 @@ public class CompactionCoordinator { org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent, - org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats) + org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats) { this(); this.tinfo = tinfo; @@ -2041,7 +2041,7 @@ public class CompactionCoordinator { this.extent = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(other.extent); } if (other.isSetStats()) { - this.stats = new org.apache.accumulo.core.tabletserver.thrift.CompactionStats(other.stats); + this.stats = new org.apache.accumulo.core.tabletserver.thrift.TCompactionStats(other.stats); } } @@ -2159,11 +2159,11 @@ public class CompactionCoordinator { } @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.tabletserver.thrift.CompactionStats getStats() { + public org.apache.accumulo.core.tabletserver.thrift.TCompactionStats getStats() { return this.stats; } - public compactionCompleted_args setStats(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.CompactionStats stats) { + public compactionCompleted_args setStats(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.TCompactionStats stats) { this.stats = stats; return this; } @@ -2221,7 +2221,7 @@ public class CompactionCoordinator { if (value == null) { unsetStats(); } else { - setStats((org.apache.accumulo.core.tabletserver.thrift.CompactionStats)value); + setStats((org.apache.accumulo.core.tabletserver.thrift.TCompactionStats)value); } break; @@ -2571,7 +2571,7 @@ public class CompactionCoordinator { break; case 5: // STATS if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.stats = new org.apache.accumulo.core.tabletserver.thrift.CompactionStats(); + struct.stats = new org.apache.accumulo.core.tabletserver.thrift.TCompactionStats(); struct.stats.read(iprot); struct.setStatsIsSet(true); } else { @@ -2693,7 +2693,7 @@ public class CompactionCoordinator { struct.setExtentIsSet(true); } if (incoming.get(4)) { - struct.stats = new org.apache.accumulo.core.tabletserver.thrift.CompactionStats(); + struct.stats = new org.apache.accumulo.core.tabletserver.thrift.TCompactionStats(); struct.stats.read(iprot); struct.setStatsIsSet(true); } @@ -4261,9 +4261,9 @@ public class CompactionCoordinator { public @org.apache.thrift.annotation.Nullable java.lang.String externalCompactionId; // required /** * - * @see CompactionState + * @see TCompactionState */ - public @org.apache.thrift.annotation.Nullable CompactionState state; // required + public @org.apache.thrift.annotation.Nullable TCompactionState state; // required public @org.apache.thrift.annotation.Nullable java.lang.String message; // required public long timestamp; // required @@ -4274,7 +4274,7 @@ public class CompactionCoordinator { EXTERNAL_COMPACTION_ID((short)3, "externalCompactionId"), /** * - * @see CompactionState + * @see TCompactionState */ STATE((short)4, "state"), MESSAGE((short)5, "message"), @@ -4359,7 +4359,7 @@ public class CompactionCoordinator { tmpMap.put(_Fields.EXTERNAL_COMPACTION_ID, new org.apache.thrift.meta_data.FieldMetaData("externalCompactionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CompactionState.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TCompactionState.class))); tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -4375,7 +4375,7 @@ public class CompactionCoordinator { org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String externalCompactionId, - CompactionState state, + TCompactionState state, java.lang.String message, long timestamp) { @@ -4504,18 +4504,18 @@ public class CompactionCoordinator { /** * - * @see CompactionState + * @see TCompactionState */ @org.apache.thrift.annotation.Nullable - public CompactionState getState() { + public TCompactionState getState() { return this.state; } /** * - * @see CompactionState + * @see TCompactionState */ - public updateCompactionStatus_args setState(@org.apache.thrift.annotation.Nullable CompactionState state) { + public updateCompactionStatus_args setState(@org.apache.thrift.annotation.Nullable TCompactionState state) { this.state = state; return this; } @@ -4613,7 +4613,7 @@ public class CompactionCoordinator { if (value == null) { unsetState(); } else { - setState((CompactionState)value); + setState((TCompactionState)value); } break; @@ -4996,7 +4996,7 @@ public class CompactionCoordinator { break; case 4: // STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.state = org.apache.accumulo.core.compaction.thrift.CompactionState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.compaction.thrift.TCompactionState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -5137,7 +5137,7 @@ public class CompactionCoordinator { struct.setExternalCompactionIdIsSet(true); } if (incoming.get(3)) { - struct.state = org.apache.accumulo.core.compaction.thrift.CompactionState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.compaction.thrift.TCompactionState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } if (incoming.get(4)) { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/Status.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/Status.java index b41f72b..bd505d4 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/Status.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/Status.java @@ -42,9 +42,9 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>, public @org.apache.thrift.annotation.Nullable java.lang.String compactor; // required /** * - * @see CompactionState + * @see TCompactionState */ - public @org.apache.thrift.annotation.Nullable CompactionState state; // required + public @org.apache.thrift.annotation.Nullable TCompactionState state; // required public @org.apache.thrift.annotation.Nullable java.lang.String message; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -54,7 +54,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>, COMPACTOR((short)3, "compactor"), /** * - * @see CompactionState + * @see TCompactionState */ STATE((short)4, "state"), MESSAGE((short)5, "message"); @@ -136,7 +136,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>, tmpMap.put(_Fields.COMPACTOR, new org.apache.thrift.meta_data.FieldMetaData("compactor", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CompactionState.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TCompactionState.class))); tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); @@ -150,7 +150,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>, long timestamp, java.lang.String externalCompactionId, java.lang.String compactor, - CompactionState state, + TCompactionState state, java.lang.String message) { this(); @@ -271,18 +271,18 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>, /** * - * @see CompactionState + * @see TCompactionState */ @org.apache.thrift.annotation.Nullable - public CompactionState getState() { + public TCompactionState getState() { return this.state; } /** * - * @see CompactionState + * @see TCompactionState */ - public Status setState(@org.apache.thrift.annotation.Nullable CompactionState state) { + public Status setState(@org.apache.thrift.annotation.Nullable TCompactionState state) { this.state = state; return this; } @@ -357,7 +357,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>, if (value == null) { unsetState(); } else { - setState((CompactionState)value); + setState((TCompactionState)value); } break; @@ -688,7 +688,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>, break; case 4: // STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.state = org.apache.accumulo.core.compaction.thrift.CompactionState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.compaction.thrift.TCompactionState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -808,7 +808,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>, struct.setCompactorIsSet(true); } if (incoming.get(3)) { - struct.state = org.apache.accumulo.core.compaction.thrift.CompactionState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.compaction.thrift.TCompactionState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } if (incoming.get(4)) { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionState.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java similarity index 91% rename from core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionState.java rename to core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java index 5f95054..815c8d8 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionState.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java @@ -25,7 +25,7 @@ package org.apache.accumulo.core.compaction.thrift; -public enum CompactionState implements org.apache.thrift.TEnum { +public enum TCompactionState implements org.apache.thrift.TEnum { ASSIGNED(0), STARTED(1), IN_PROGRESS(2), @@ -35,7 +35,7 @@ public enum CompactionState implements org.apache.thrift.TEnum { private final int value; - private CompactionState(int value) { + private TCompactionState(int value) { this.value = value; } @@ -51,7 +51,7 @@ public enum CompactionState implements org.apache.thrift.TEnum { * @return null if the value is not found. */ @org.apache.thrift.annotation.Nullable - public static CompactionState findByValue(int value) { + public static TCompactionState findByValue(int value) { switch (value) { case 0: return ASSIGNED; diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java index 0c682b8..70c4422 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java @@ -49,14 +49,14 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio public @org.apache.thrift.annotation.Nullable java.lang.String outputFile; // required /** * - * @see CompactionType + * @see TCompactionType */ - public @org.apache.thrift.annotation.Nullable CompactionType type; // required + public @org.apache.thrift.annotation.Nullable TCompactionType type; // required /** * - * @see CompactionReason + * @see TCompactionReason */ - public @org.apache.thrift.annotation.Nullable CompactionReason reason; // required + 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 @@ -71,12 +71,12 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio OUTPUT_FILE((short)4, "outputFile"), /** * - * @see CompactionType + * @see TCompactionType */ TYPE((short)5, "type"), /** * - * @see CompactionReason + * @see TCompactionReason */ REASON((short)6, "reason"), LOCALITY_GROUP((short)7, "localityGroup"), @@ -179,9 +179,9 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio tmpMap.put(_Fields.OUTPUT_FILE, new org.apache.thrift.meta_data.FieldMetaData("outputFile", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CompactionType.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TCompactionType.class))); tmpMap.put(_Fields.REASON, new org.apache.thrift.meta_data.FieldMetaData("reason", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CompactionReason.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TCompactionReason.class))); tmpMap.put(_Fields.LOCALITY_GROUP, new org.apache.thrift.meta_data.FieldMetaData("localityGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.ENTRIES_READ, new org.apache.thrift.meta_data.FieldMetaData("entriesRead", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -209,8 +209,8 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio long age, java.util.List<java.lang.String> inputFiles, java.lang.String outputFile, - CompactionType type, - CompactionReason reason, + TCompactionType type, + TCompactionReason reason, java.lang.String localityGroup, long entriesRead, long entriesWritten, @@ -423,18 +423,18 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio /** * - * @see CompactionType + * @see TCompactionType */ @org.apache.thrift.annotation.Nullable - public CompactionType getType() { + public TCompactionType getType() { return this.type; } /** * - * @see CompactionType + * @see TCompactionType */ - public ActiveCompaction setType(@org.apache.thrift.annotation.Nullable CompactionType type) { + public ActiveCompaction setType(@org.apache.thrift.annotation.Nullable TCompactionType type) { this.type = type; return this; } @@ -456,18 +456,18 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio /** * - * @see CompactionReason + * @see TCompactionReason */ @org.apache.thrift.annotation.Nullable - public CompactionReason getReason() { + public TCompactionReason getReason() { return this.reason; } /** * - * @see CompactionReason + * @see TCompactionReason */ - public ActiveCompaction setReason(@org.apache.thrift.annotation.Nullable CompactionReason reason) { + public ActiveCompaction setReason(@org.apache.thrift.annotation.Nullable TCompactionReason reason) { this.reason = reason; return this; } @@ -673,7 +673,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetType(); } else { - setType((CompactionType)value); + setType((TCompactionType)value); } break; @@ -681,7 +681,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio if (value == null) { unsetReason(); } else { - setReason((CompactionReason)value); + setReason((TCompactionReason)value); } break; @@ -1270,7 +1270,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio break; case 5: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = org.apache.accumulo.core.tabletserver.thrift.CompactionType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.core.tabletserver.thrift.TCompactionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1278,7 +1278,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio break; case 6: // REASON if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.reason = org.apache.accumulo.core.tabletserver.thrift.CompactionReason.findByValue(iprot.readI32()); + struct.reason = org.apache.accumulo.core.tabletserver.thrift.TCompactionReason.findByValue(iprot.readI32()); struct.setReasonIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1597,11 +1597,11 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio struct.setOutputFileIsSet(true); } if (incoming.get(4)) { - struct.type = org.apache.accumulo.core.tabletserver.thrift.CompactionType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.core.tabletserver.thrift.TCompactionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } if (incoming.get(5)) { - struct.reason = org.apache.accumulo.core.tabletserver.thrift.CompactionReason.findByValue(iprot.readI32()); + struct.reason = org.apache.accumulo.core.tabletserver.thrift.TCompactionReason.findByValue(iprot.readI32()); struct.setReasonIsSet(true); } if (incoming.get(6)) { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionKind.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java similarity index 91% rename from core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionKind.java rename to core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java index f3599a5..6223671 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionKind.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java @@ -25,7 +25,7 @@ package org.apache.accumulo.core.tabletserver.thrift; -public enum CompactionKind implements org.apache.thrift.TEnum { +public enum TCompactionKind implements org.apache.thrift.TEnum { CHOP(0), SELECTOR(1), SYSTEM(2), @@ -33,7 +33,7 @@ public enum CompactionKind implements org.apache.thrift.TEnum { private final int value; - private CompactionKind(int value) { + private TCompactionKind(int value) { this.value = value; } @@ -49,7 +49,7 @@ public enum CompactionKind implements org.apache.thrift.TEnum { * @return null if the value is not found. */ @org.apache.thrift.annotation.Nullable - public static CompactionKind findByValue(int value) { + public static TCompactionKind findByValue(int value) { switch (value) { case 0: return CHOP; diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java similarity index 90% rename from core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java rename to core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java index 803892a..d4364b4 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java @@ -25,7 +25,7 @@ package org.apache.accumulo.core.tabletserver.thrift; -public enum CompactionReason implements org.apache.thrift.TEnum { +public enum TCompactionReason implements org.apache.thrift.TEnum { USER(0), SYSTEM(1), CHOP(2), @@ -34,7 +34,7 @@ public enum CompactionReason implements org.apache.thrift.TEnum { private final int value; - private CompactionReason(int value) { + private TCompactionReason(int value) { this.value = value; } @@ -50,7 +50,7 @@ public enum CompactionReason implements org.apache.thrift.TEnum { * @return null if the value is not found. */ @org.apache.thrift.annotation.Nullable - public static CompactionReason findByValue(int value) { + public static TCompactionReason findByValue(int value) { switch (value) { case 0: return USER; diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionStats.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java similarity index 90% rename from core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionStats.java rename to core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java index 4189a6f..daf0e40 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionStats.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java @@ -25,15 +25,15 @@ package org.apache.accumulo.core.tabletserver.thrift; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, CompactionStats._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionStats> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionStats"); +public class TCompactionStats implements org.apache.thrift.TBase<TCompactionStats, TCompactionStats._Fields>, java.io.Serializable, Cloneable, Comparable<TCompactionStats> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCompactionStats"); private static final org.apache.thrift.protocol.TField ENTRIES_READ_FIELD_DESC = new org.apache.thrift.protocol.TField("entriesRead", org.apache.thrift.protocol.TType.I64, (short)1); private static final org.apache.thrift.protocol.TField ENTRIES_WRITTEN_FIELD_DESC = new org.apache.thrift.protocol.TField("entriesWritten", org.apache.thrift.protocol.TType.I64, (short)2); private static final org.apache.thrift.protocol.TField FILE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSize", org.apache.thrift.protocol.TType.I64, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CompactionStatsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CompactionStatsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TCompactionStatsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TCompactionStatsTupleSchemeFactory(); public long entriesRead; // required public long entriesWritten; // required @@ -120,13 +120,13 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, tmpMap.put(_Fields.FILE_SIZE, new org.apache.thrift.meta_data.FieldMetaData("fileSize", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CompactionStats.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCompactionStats.class, metaDataMap); } - public CompactionStats() { + public TCompactionStats() { } - public CompactionStats( + public TCompactionStats( long entriesRead, long entriesWritten, long fileSize) @@ -143,15 +143,15 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, /** * Performs a deep copy on <i>other</i>. */ - public CompactionStats(CompactionStats other) { + public TCompactionStats(TCompactionStats other) { __isset_bitfield = other.__isset_bitfield; this.entriesRead = other.entriesRead; this.entriesWritten = other.entriesWritten; this.fileSize = other.fileSize; } - public CompactionStats deepCopy() { - return new CompactionStats(this); + public TCompactionStats deepCopy() { + return new TCompactionStats(this); } @Override @@ -168,7 +168,7 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, return this.entriesRead; } - public CompactionStats setEntriesRead(long entriesRead) { + public TCompactionStats setEntriesRead(long entriesRead) { this.entriesRead = entriesRead; setEntriesReadIsSet(true); return this; @@ -191,7 +191,7 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, return this.entriesWritten; } - public CompactionStats setEntriesWritten(long entriesWritten) { + public TCompactionStats setEntriesWritten(long entriesWritten) { this.entriesWritten = entriesWritten; setEntriesWrittenIsSet(true); return this; @@ -214,7 +214,7 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, return this.fileSize; } - public CompactionStats setFileSize(long fileSize) { + public TCompactionStats setFileSize(long fileSize) { this.fileSize = fileSize; setFileSizeIsSet(true); return this; @@ -299,12 +299,12 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, public boolean equals(java.lang.Object that) { if (that == null) return false; - if (that instanceof CompactionStats) - return this.equals((CompactionStats)that); + if (that instanceof TCompactionStats) + return this.equals((TCompactionStats)that); return false; } - public boolean equals(CompactionStats that) { + public boolean equals(TCompactionStats that) { if (that == null) return false; if (this == that) @@ -354,7 +354,7 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, } @Override - public int compareTo(CompactionStats other) { + public int compareTo(TCompactionStats other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -409,7 +409,7 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("CompactionStats("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("TCompactionStats("); boolean first = true; sb.append("entriesRead:"); @@ -450,15 +450,15 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, } } - private static class CompactionStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public CompactionStatsStandardScheme getScheme() { - return new CompactionStatsStandardScheme(); + private static class TCompactionStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + public TCompactionStatsStandardScheme getScheme() { + return new TCompactionStatsStandardScheme(); } } - private static class CompactionStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionStats> { + private static class TCompactionStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCompactionStats> { - public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionStats struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, TCompactionStats struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -503,7 +503,7 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, CompactionStats struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, TCompactionStats struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -522,16 +522,16 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, } - private static class CompactionStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public CompactionStatsTupleScheme getScheme() { - return new CompactionStatsTupleScheme(); + private static class TCompactionStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + public TCompactionStatsTupleScheme getScheme() { + return new TCompactionStatsTupleScheme(); } } - private static class CompactionStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<CompactionStats> { + private static class TCompactionStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCompactionStats> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, CompactionStats struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, TCompactionStats struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetEntriesRead()) { @@ -556,7 +556,7 @@ public class CompactionStats implements org.apache.thrift.TBase<CompactionStats, } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, CompactionStats struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, TCompactionStats struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java similarity index 90% rename from core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java rename to core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java index e56692e..c0de733 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java @@ -25,7 +25,7 @@ package org.apache.accumulo.core.tabletserver.thrift; -public enum CompactionType implements org.apache.thrift.TEnum { +public enum TCompactionType implements org.apache.thrift.TEnum { MINOR(0), MERGE(1), MAJOR(2), @@ -33,7 +33,7 @@ public enum CompactionType implements org.apache.thrift.TEnum { private final int value; - private CompactionType(int value) { + private TCompactionType(int value) { this.value = value; } @@ -49,7 +49,7 @@ public enum CompactionType implements org.apache.thrift.TEnum { * @return null if the value is not found. */ @org.apache.thrift.annotation.Nullable - public static CompactionType findByValue(int value) { + public static TCompactionType findByValue(int value) { switch (value) { case 0: return MINOR; diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java index 1c42fe9..3345f6a 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java @@ -53,17 +53,17 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal public @org.apache.thrift.annotation.Nullable IteratorConfig iteratorSettings; // required /** * - * @see CompactionType + * @see TCompactionType */ - public @org.apache.thrift.annotation.Nullable CompactionType type; // required + public @org.apache.thrift.annotation.Nullable TCompactionType type; // required /** * - * @see CompactionReason + * @see TCompactionReason */ - public @org.apache.thrift.annotation.Nullable CompactionReason reason; // required + public @org.apache.thrift.annotation.Nullable TCompactionReason reason; // required public @org.apache.thrift.annotation.Nullable java.lang.String outputFile; // required public boolean propagateDeletes; // required - public @org.apache.thrift.annotation.Nullable CompactionKind kind; // required + public @org.apache.thrift.annotation.Nullable TCompactionKind kind; // 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 { @@ -76,12 +76,12 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal ITERATOR_SETTINGS((short)7, "iteratorSettings"), /** * - * @see CompactionType + * @see TCompactionType */ TYPE((short)8, "type"), /** * - * @see CompactionReason + * @see TCompactionReason */ REASON((short)9, "reason"), OUTPUT_FILE((short)10, "outputFile"), @@ -191,15 +191,15 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal tmpMap.put(_Fields.ITERATOR_SETTINGS, new org.apache.thrift.meta_data.FieldMetaData("iteratorSettings", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, IteratorConfig.class))); tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CompactionType.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TCompactionType.class))); tmpMap.put(_Fields.REASON, new org.apache.thrift.meta_data.FieldMetaData("reason", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CompactionReason.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TCompactionReason.class))); tmpMap.put(_Fields.OUTPUT_FILE, new org.apache.thrift.meta_data.FieldMetaData("outputFile", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PROPAGATE_DELETES, new org.apache.thrift.meta_data.FieldMetaData("propagateDeletes", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.KIND, new org.apache.thrift.meta_data.FieldMetaData("kind", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.ENUM , "CompactionKind"))); + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.ENUM , "TCompactionKind"))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TExternalCompactionJob.class, metaDataMap); } @@ -215,11 +215,11 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal int readRate, int writeRate, IteratorConfig iteratorSettings, - CompactionType type, - CompactionReason reason, + TCompactionType type, + TCompactionReason reason, java.lang.String outputFile, boolean propagateDeletes, - CompactionKind kind) + TCompactionKind kind) { this(); this.externalCompactionId = externalCompactionId; @@ -490,18 +490,18 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal /** * - * @see CompactionType + * @see TCompactionType */ @org.apache.thrift.annotation.Nullable - public CompactionType getType() { + public TCompactionType getType() { return this.type; } /** * - * @see CompactionType + * @see TCompactionType */ - public TExternalCompactionJob setType(@org.apache.thrift.annotation.Nullable CompactionType type) { + public TExternalCompactionJob setType(@org.apache.thrift.annotation.Nullable TCompactionType type) { this.type = type; return this; } @@ -523,18 +523,18 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal /** * - * @see CompactionReason + * @see TCompactionReason */ @org.apache.thrift.annotation.Nullable - public CompactionReason getReason() { + public TCompactionReason getReason() { return this.reason; } /** * - * @see CompactionReason + * @see TCompactionReason */ - public TExternalCompactionJob setReason(@org.apache.thrift.annotation.Nullable CompactionReason reason) { + public TExternalCompactionJob setReason(@org.apache.thrift.annotation.Nullable TCompactionReason reason) { this.reason = reason; return this; } @@ -603,11 +603,11 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal } @org.apache.thrift.annotation.Nullable - public CompactionKind getKind() { + public TCompactionKind getKind() { return this.kind; } - public TExternalCompactionJob setKind(@org.apache.thrift.annotation.Nullable CompactionKind kind) { + public TExternalCompactionJob setKind(@org.apache.thrift.annotation.Nullable TCompactionKind kind) { this.kind = kind; return this; } @@ -689,7 +689,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal if (value == null) { unsetType(); } else { - setType((CompactionType)value); + setType((TCompactionType)value); } break; @@ -697,7 +697,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal if (value == null) { unsetReason(); } else { - setReason((CompactionReason)value); + setReason((TCompactionReason)value); } break; @@ -721,7 +721,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal if (value == null) { unsetKind(); } else { - setKind((CompactionKind)value); + setKind((TCompactionKind)value); } break; @@ -1329,7 +1329,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal break; case 8: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = org.apache.accumulo.core.tabletserver.thrift.CompactionType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.core.tabletserver.thrift.TCompactionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1337,7 +1337,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal break; case 9: // REASON if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.reason = org.apache.accumulo.core.tabletserver.thrift.CompactionReason.findByValue(iprot.readI32()); + struct.reason = org.apache.accumulo.core.tabletserver.thrift.TCompactionReason.findByValue(iprot.readI32()); struct.setReasonIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1361,7 +1361,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal break; case 12: // KIND if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.kind = org.apache.accumulo.core.tabletserver.thrift.CompactionKind.findByValue(iprot.readI32()); + struct.kind = org.apache.accumulo.core.tabletserver.thrift.TCompactionKind.findByValue(iprot.readI32()); struct.setKindIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1585,11 +1585,11 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal struct.setIteratorSettingsIsSet(true); } if (incoming.get(7)) { - struct.type = org.apache.accumulo.core.tabletserver.thrift.CompactionType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.core.tabletserver.thrift.TCompactionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } if (incoming.get(8)) { - struct.reason = org.apache.accumulo.core.tabletserver.thrift.CompactionReason.findByValue(iprot.readI32()); + struct.reason = org.apache.accumulo.core.tabletserver.thrift.TCompactionReason.findByValue(iprot.readI32()); struct.setReasonIsSet(true); } if (incoming.get(9)) { @@ -1601,7 +1601,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal struct.setPropagateDeletesIsSet(true); } if (incoming.get(11)) { - struct.kind = org.apache.accumulo.core.tabletserver.thrift.CompactionKind.findByValue(iprot.readI32()); + struct.kind = org.apache.accumulo.core.tabletserver.thrift.TCompactionKind.findByValue(iprot.readI32()); struct.setKindIsSet(true); } } diff --git a/core/src/main/thrift/compaction-coordinator.thrift b/core/src/main/thrift/compaction-coordinator.thrift index 545ab74..3db0be4 100644 --- a/core/src/main/thrift/compaction-coordinator.thrift +++ b/core/src/main/thrift/compaction-coordinator.thrift @@ -25,7 +25,7 @@ include "security.thrift" include "tabletserver.thrift" include "trace.thrift" -enum CompactionState { +enum TCompactionState { # Coordinator should set state to ASSIGNED when getCompactionJob is called by Compactor ASSIGNED # Compactor should set state to STARTED when compaction has successfully begun @@ -44,7 +44,7 @@ struct Status { 1:i64 timestamp 2:string externalCompactionId 3:string compactor - 4:CompactionState state + 4:TCompactionState state 5:string message } @@ -71,7 +71,7 @@ service CompactionCoordinator { 2:security.TCredentials credentials 3:string externalCompactionId 4:data.TKeyExtent extent - 5:tabletserver.CompactionStats stats + 5:tabletserver.TCompactionStats stats ) throws ( 1:UnknownCompactionIdException e ) @@ -94,7 +94,7 @@ service CompactionCoordinator { 1:trace.TInfo tinfo 2:security.TCredentials credentials 3:string externalCompactionId - 4:CompactionState state + 4:TCompactionState state 5:string message 6:i64 timestamp ) throws ( diff --git a/core/src/main/thrift/tabletserver.thrift b/core/src/main/thrift/tabletserver.thrift index ec636aa..8447426 100644 --- a/core/src/main/thrift/tabletserver.thrift +++ b/core/src/main/thrift/tabletserver.thrift @@ -99,14 +99,14 @@ struct ActiveScan { 15:string classLoaderContext } -enum CompactionType { +enum TCompactionType { MINOR MERGE MAJOR FULL } -enum CompactionReason { +enum TCompactionReason { USER SYSTEM CHOP @@ -127,8 +127,8 @@ struct ActiveCompaction { 2:i64 age 3:list<string> inputFiles 4:string outputFile - 5:CompactionType type - 6:CompactionReason reason + 5:TCompactionType type + 6:TCompactionReason reason 7:string localityGroup 8:i64 entriesRead 9:i64 entriesWritten @@ -174,15 +174,15 @@ struct TExternalCompactionJob { 5:i32 readRate 6:i32 writeRate 7:IteratorConfig iteratorSettings - 8:CompactionType type - # Need to add SELECTOR To CompactionReason, delete CompactionKind? - 9:CompactionReason reason + 8:TCompactionType type + # Need to add SELECTOR To TCompactionReason, delete TCompactionKind? + 9:TCompactionReason reason 10:string outputFile 11:bool propagateDeletes - 12:CompactionKind kind + 12:TCompactionKind kind } -enum CompactionKind { +enum TCompactionKind { CHOP SELECTOR SYSTEM @@ -194,7 +194,7 @@ struct TCompactionQueueSummary { 2:i64 priority } -struct CompactionStats{ +struct TCompactionStats{ 1:i64 entriesRead; 2:i64 entriesWritten; 3:i64 fileSize; diff --git a/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionInfo.java b/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionInfo.java index 6195c86..9d60951 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionInfo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionInfo.java @@ -29,8 +29,8 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.dataImpl.thrift.IterInfo; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction; -import org.apache.accumulo.core.tabletserver.thrift.CompactionReason; -import org.apache.accumulo.core.tabletserver.thrift.CompactionType; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionType; public class CompactionInfo { @@ -38,7 +38,7 @@ public class CompactionInfo { private final String localityGroup; private final long entriesRead; private final long entriesWritten; - private final CompactionReason reason; + private final TCompactionReason reason; CompactionInfo(Compactor compactor) { this.localityGroup = compactor.getCurrentLocalityGroup(); @@ -74,17 +74,17 @@ public class CompactionInfo { public ActiveCompaction toThrift() { - CompactionType type; + TCompactionType type; if (compactor.hasIMM()) if (!compactor.getFilesToCompact().isEmpty()) - type = CompactionType.MERGE; + type = TCompactionType.MERGE; else - type = CompactionType.MINOR; + type = TCompactionType.MINOR; else if (!compactor.willPropogateDeletes()) - type = CompactionType.FULL; + type = TCompactionType.FULL; else - type = CompactionType.MAJOR; + type = TCompactionType.MAJOR; List<IterInfo> iiList = new ArrayList<>(); Map<String,Map<String,String>> iterOptions = new HashMap<>(); diff --git a/server/base/src/main/java/org/apache/accumulo/server/compaction/Compactor.java b/server/base/src/main/java/org/apache/accumulo/server/compaction/Compactor.java index da3074c..e2dc374 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/compaction/Compactor.java +++ b/server/base/src/main/java/org/apache/accumulo/server/compaction/Compactor.java @@ -53,7 +53,7 @@ import org.apache.accumulo.core.iteratorsImpl.system.TimeSettingIterator; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.TabletFile; import org.apache.accumulo.core.metadata.schema.DataFileValue; -import org.apache.accumulo.core.tabletserver.thrift.CompactionReason; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason; import org.apache.accumulo.core.util.LocalityGroupUtil; import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError; import org.apache.accumulo.core.util.ratelimit.RateLimiter; @@ -93,7 +93,7 @@ public class Compactor implements Callable<CompactionStats> { SortedKeyValueIterator<Key,Value> getMinCIterator(); - CompactionReason getReason(); + TCompactionReason getReason(); } private final Map<StoredTabletFile,DataFileValue> filesToCompact; @@ -438,7 +438,7 @@ public class Compactor implements Callable<CompactionStats> { return this.iterators; } - public CompactionReason getReason() { + public TCompactionReason getReason() { return env.getReason(); } diff --git a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java index ac8e522..e6e7549 100644 --- a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java +++ b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java @@ -35,8 +35,8 @@ import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.clientImpl.ThriftTransportPool; import org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinator.Iface; -import org.apache.accumulo.core.compaction.thrift.CompactionState; import org.apache.accumulo.core.compaction.thrift.Compactor; +import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.compaction.thrift.UnknownCompactionIdException; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; @@ -49,8 +49,8 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType; import org.apache.accumulo.core.rpc.ThriftUtil; import org.apache.accumulo.core.securityImpl.thrift.TCredentials; -import org.apache.accumulo.core.tabletserver.thrift.CompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TCompactionQueueSummary; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; import org.apache.accumulo.core.trace.TraceUtil; @@ -617,7 +617,7 @@ public class CompactionCoordinator extends AbstractServer */ @Override public void compactionCompleted(TInfo tinfo, TCredentials credentials, - String externalCompactionId, TKeyExtent textent, CompactionStats stats) throws TException { + String externalCompactionId, TKeyExtent textent, TCompactionStats stats) throws TException { // do not expect users to call this directly, expect other tservers to call this method if (!security.canPerformSystemActions(credentials)) { throw new AccumuloSecurityException(credentials.getPrincipal(), @@ -675,7 +675,7 @@ public class CompactionCoordinator extends AbstractServer * @throws TException * thrift error */ - public CompactionStats isCompactionCompleted(String externalCompactionId) throws TException { + public TCompactionStats isCompactionCompleted(String externalCompactionId) throws TException { final var ecid = ExternalCompactionId.of(externalCompactionId); final RunningCompaction rc = RUNNING.get(ecid); if (null != rc && rc.isCompleted()) { @@ -692,7 +692,7 @@ public class CompactionCoordinator extends AbstractServer LOG.debug("isCompactionCompleted called by TServer for {}, but compaction is not complete.", externalCompactionId); // Return empty stats as a marker that it's not done. - return new CompactionStats(); + return new TCompactionStats(); } } @@ -718,7 +718,7 @@ public class CompactionCoordinator extends AbstractServer */ @Override public void updateCompactionStatus(TInfo tinfo, TCredentials credentials, - String externalCompactionId, CompactionState state, String message, long timestamp) + String externalCompactionId, TCompactionState state, String message, long timestamp) throws TException { // do not expect users to call this directly, expect other tservers to call this method if (!security.canPerformSystemActions(credentials)) { diff --git a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionUpdate.java b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionUpdate.java index becc428..2811e3f 100644 --- a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionUpdate.java +++ b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionUpdate.java @@ -18,15 +18,15 @@ */ package org.apache.accumulo.coordinator; -import org.apache.accumulo.core.compaction.thrift.CompactionState; +import org.apache.accumulo.core.compaction.thrift.TCompactionState; public class CompactionUpdate { private final Long timestamp; private final String message; - private final CompactionState state; + private final TCompactionState state; - CompactionUpdate(Long timestamp, String message, CompactionState state) { + CompactionUpdate(Long timestamp, String message, TCompactionState state) { super(); this.timestamp = timestamp; this.message = message; @@ -41,7 +41,7 @@ public class CompactionUpdate { return message; } - public CompactionState getState() { + public TCompactionState getState() { return state; } diff --git a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/RunningCompaction.java b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/RunningCompaction.java index ea35349..21db915 100644 --- a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/RunningCompaction.java +++ b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/RunningCompaction.java @@ -22,9 +22,9 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.accumulo.core.compaction.thrift.CompactionState; +import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.metadata.TServerInstance; -import org.apache.accumulo.core.tabletserver.thrift.CompactionStats; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; public class RunningCompaction { @@ -34,7 +34,7 @@ public class RunningCompaction { private final TServerInstance tserver; private final Map<Long,CompactionUpdate> updates = new TreeMap<>(); private final AtomicBoolean completed = new AtomicBoolean(Boolean.FALSE); - private CompactionStats stats = null; + private TCompactionStats stats = null; RunningCompaction(TExternalCompactionJob job, String compactorAddress, TServerInstance tserver) { super(); @@ -47,15 +47,15 @@ public class RunningCompaction { return updates; } - public void addUpdate(Long timestamp, String message, CompactionState state) { + public void addUpdate(Long timestamp, String message, TCompactionState state) { this.updates.put(timestamp, new CompactionUpdate(timestamp, message, state)); } - public CompactionStats getStats() { + public TCompactionStats getStats() { return stats; } - public void setStats(CompactionStats stats) { + public void setStats(TCompactionStats stats) { this.stats = stats; } diff --git a/server/compaction-coordinator/src/test/java/org/apache/accumulo/coordinator/CompactionCoordinatorTest.java b/server/compaction-coordinator/src/test/java/org/apache/accumulo/coordinator/CompactionCoordinatorTest.java index 5de768f..e1ec07d 100644 --- a/server/compaction-coordinator/src/test/java/org/apache/accumulo/coordinator/CompactionCoordinatorTest.java +++ b/server/compaction-coordinator/src/test/java/org/apache/accumulo/coordinator/CompactionCoordinatorTest.java @@ -41,8 +41,8 @@ import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.rpc.ThriftUtil; import org.apache.accumulo.core.securityImpl.thrift.TCredentials; -import org.apache.accumulo.core.tabletserver.thrift.CompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TCompactionQueueSummary; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client; @@ -144,7 +144,8 @@ public class CompactionCoordinatorTest { @Override public void compactionCompleted(TInfo tinfo, TCredentials credentials, - String externalCompactionId, TKeyExtent textent, CompactionStats stats) throws TException {} + String externalCompactionId, TKeyExtent textent, TCompactionStats stats) + throws TException {} @Override public void compactionFailed(TInfo tinfo, TCredentials credentials, String externalCompactionId, diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionEnvironment.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionEnvironment.java index b37a737..31ebe8d 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionEnvironment.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionEnvironment.java @@ -28,7 +28,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.spi.compaction.CompactionKind; -import org.apache.accumulo.core.tabletserver.thrift.CompactionReason; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason; import org.apache.accumulo.core.util.ratelimit.RateLimiter; import org.apache.accumulo.core.util.ratelimit.SharedRateLimiterFactory; import org.apache.accumulo.server.ServerContext; @@ -108,16 +108,16 @@ public class CompactionEnvironment implements Closeable, CompactionEnv { } @Override - public CompactionReason getReason() { + public TCompactionReason getReason() { switch (jobHolder.getJob().getKind()) { case USER: - return CompactionReason.USER; + return TCompactionReason.USER; case CHOP: - return CompactionReason.CHOP; + return TCompactionReason.CHOP; case SELECTOR: case SYSTEM: default: - return CompactionReason.SYSTEM; + return TCompactionReason.SYSTEM; } } diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java index f6ab00c..b94e033 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java @@ -20,7 +20,7 @@ package org.apache.accumulo.compactor; import java.util.Objects; -import org.apache.accumulo.core.tabletserver.thrift.CompactionStats; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; public class CompactionJobHolder { @@ -28,7 +28,7 @@ public class CompactionJobHolder { private TExternalCompactionJob job; private Thread compactionThread; private volatile Boolean cancelled = Boolean.FALSE; - private CompactionStats stats = null; + private TCompactionStats stats = null; CompactionJobHolder() {} @@ -47,11 +47,11 @@ public class CompactionJobHolder { return compactionThread; } - public CompactionStats getStats() { + public TCompactionStats getStats() { return stats; } - public void setStats(CompactionStats stats) { + public void setStats(TCompactionStats stats) { this.stats = stats; } diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java index 528810f..1fbb3b6 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java @@ -40,8 +40,8 @@ import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode; import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinator; -import org.apache.accumulo.core.compaction.thrift.CompactionState; import org.apache.accumulo.core.compaction.thrift.Compactor.Iface; +import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.compaction.thrift.UnknownCompactionIdException; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; @@ -54,7 +54,7 @@ import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.rpc.ThriftUtil; import org.apache.accumulo.core.securityImpl.thrift.TCredentials; -import org.apache.accumulo.core.tabletserver.thrift.CompactionStats; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.core.trace.thrift.TInfo; @@ -325,7 +325,7 @@ public class Compactor extends AbstractServer * @throws RetriesExceededException * thrown when retries have been exceeded */ - protected void updateCompactionState(TExternalCompactionJob job, CompactionState state, + protected void updateCompactionState(TExternalCompactionJob job, TCompactionState state, String message) throws RetriesExceededException { // CBUG the return type was changed from Void to String just to make this work. When type was // Void and returned null, it would retry forever. Could specialize RetryableThriftCall for case @@ -385,7 +385,7 @@ public class Compactor extends AbstractServer * @throws RetriesExceededException * thrown when retries have been exceeded */ - protected void updateCompactionCompleted(TExternalCompactionJob job, CompactionStats stats) + protected void updateCompactionCompleted(TExternalCompactionJob job, TCompactionStats stats) throws RetriesExceededException { RetryableThriftCall<String> thriftCall = new RetryableThriftCall<>(1000, RetryableThriftCall.MAX_WAIT_TIME, 25, new RetryableThriftFunction<String>() { @@ -482,7 +482,7 @@ public class Compactor extends AbstractServer public void run() { try { LOG.info("Starting up compaction runnable for job: {}", job); - updateCompactionState(job, CompactionState.STARTED, "Compaction started"); + updateCompactionState(job, TCompactionState.STARTED, "Compaction started"); final TableId tableId = TableId.of(new String(job.getExtent().getTable(), UTF_8)); final TableConfiguration tConfig = getContext().getTableConfiguration(tableId); @@ -511,7 +511,7 @@ public class Compactor extends AbstractServer started.countDown(); org.apache.accumulo.server.compaction.CompactionStats stat = compactor.call(); - CompactionStats cs = new CompactionStats(); + TCompactionStats cs = new TCompactionStats(); cs.setEntriesRead(stat.getEntriesRead()); cs.setEntriesWritten(stat.getEntriesWritten()); cs.setFileSize(stat.getFileSize()); @@ -519,7 +519,7 @@ public class Compactor extends AbstractServer } LOG.info("Compaction completed successfully {} ", job.getExternalCompactionId()); // Update state when completed - updateCompactionState(job, CompactionState.SUCCEEDED, + updateCompactionState(job, TCompactionState.SUCCEEDED, "Compaction completed successfully"); } catch (Exception e) { LOG.error("Compaction failed", e); @@ -678,7 +678,7 @@ public class Compactor extends AbstractServer LOG.info(message); try { LOG.info("Updating coordinator with compaction progress: {}.", message); - updateCompactionState(job, CompactionState.IN_PROGRESS, message); + updateCompactionState(job, TCompactionState.IN_PROGRESS, message); } catch (RetriesExceededException e) { LOG.warn("Error updating coordinator with compaction progress, error: {}", e.getMessage()); @@ -695,7 +695,7 @@ public class Compactor extends AbstractServer || ((err.get() != null && err.get().getClass().equals(InterruptedException.class)))) { LOG.warn("Compaction thread was interrupted, sending CANCELLED state"); try { - updateCompactionState(job, CompactionState.CANCELLED, "Compaction cancelled"); + updateCompactionState(job, TCompactionState.CANCELLED, "Compaction cancelled"); updateCompactionFailed(job); } catch (RetriesExceededException e) { LOG.error("Error updating coordinator with compaction cancellation.", e); @@ -705,7 +705,7 @@ public class Compactor extends AbstractServer } else if (err.get() != null) { try { LOG.info("Updating coordinator with compaction failure."); - updateCompactionState(job, CompactionState.FAILED, + updateCompactionState(job, TCompactionState.FAILED, "Compaction failed due to: " + err.get().getMessage()); updateCompactionFailed(job); } catch (RetriesExceededException e) { diff --git a/server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java b/server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java index 7495aa1..36c7cbc 100644 --- a/server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java +++ b/server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java @@ -31,12 +31,12 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.LongAdder; import java.util.function.Supplier; -import org.apache.accumulo.core.compaction.thrift.CompactionState; +import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; -import org.apache.accumulo.core.tabletserver.thrift.CompactionStats; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.util.Halt; import org.apache.accumulo.core.util.HostAndPort; @@ -169,7 +169,7 @@ public class CompactorTest { private final ExternalCompactionId eci; private volatile boolean completedCalled = false; private volatile boolean failedCalled = false; - private CompactionState latestState = null; + private TCompactionState latestState = null; SuccessfulCompactor(Supplier<UUID> uuid, ServerAddress address, TExternalCompactionJob job, AccumuloConfiguration conf, ServerContext ctx, ExternalCompactionId eci) { @@ -232,7 +232,7 @@ public class CompactorTest { } @Override - protected void updateCompactionState(TExternalCompactionJob job, CompactionState state, + protected void updateCompactionState(TExternalCompactionJob job, TCompactionState state, String message) throws RetriesExceededException { latestState = state; } @@ -244,12 +244,12 @@ public class CompactorTest { } @Override - protected void updateCompactionCompleted(TExternalCompactionJob job, CompactionStats stats) + protected void updateCompactionCompleted(TExternalCompactionJob job, TCompactionStats stats) throws RetriesExceededException { completedCalled = true; } - public CompactionState getLatestState() { + public TCompactionState getLatestState() { return latestState; } @@ -415,7 +415,7 @@ public class CompactorTest { assertFalse(c.isCompletedCalled()); assertTrue(c.isFailedCalled()); - assertEquals(CompactionState.FAILED, c.getLatestState()); + assertEquals(TCompactionState.FAILED, c.getLatestState()); } @Test @@ -471,7 +471,7 @@ public class CompactorTest { assertFalse(c.isCompletedCalled()); assertTrue(c.isFailedCalled()); - assertEquals(CompactionState.CANCELLED, c.getLatestState()); + assertEquals(TCompactionState.CANCELLED, c.getLatestState()); } } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/ExternalCompactionJob.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/ExternalCompactionJob.java index 67830d2..fdb58e1 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/ExternalCompactionJob.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/ExternalCompactionJob.java @@ -30,10 +30,10 @@ import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.TabletFile; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.spi.compaction.CompactionKind; -import org.apache.accumulo.core.tabletserver.thrift.CompactionReason; -import org.apache.accumulo.core.tabletserver.thrift.CompactionType; import org.apache.accumulo.core.tabletserver.thrift.InputFile; import org.apache.accumulo.core.tabletserver.thrift.IteratorConfig; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionType; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; public class ExternalCompactionJob { @@ -69,18 +69,18 @@ public class ExternalCompactionJob { int writeRate = 0; // TODO how are these two used? - CompactionType type = propogateDeletes ? CompactionType.MAJOR : CompactionType.FULL; - CompactionReason reason; + TCompactionType type = propogateDeletes ? TCompactionType.MAJOR : TCompactionType.FULL; + TCompactionReason reason; switch (kind) { case USER: - reason = CompactionReason.USER; + reason = TCompactionReason.USER; break; case CHOP: - reason = CompactionReason.CHOP; + reason = TCompactionReason.CHOP; break; case SYSTEM: case SELECTOR: - reason = CompactionReason.SYSTEM; + reason = TCompactionReason.SYSTEM; break; default: throw new IllegalStateException(); @@ -98,7 +98,7 @@ public class ExternalCompactionJob { return new TExternalCompactionJob(externalCompactionId.toString(), extent.toThrift(), files, (int) priority, readRate, writeRate, iteratorSettings, type, reason, compactTmpName.getPathStr(), propogateDeletes, - org.apache.accumulo.core.tabletserver.thrift.CompactionKind.valueOf(kind.name())); + org.apache.accumulo.core.tabletserver.thrift.TCompactionKind.valueOf(kind.name())); } public ExternalCompactionId getExternalCompactionId() { diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableUtils.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableUtils.java index 45cf61e..9e07951 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableUtils.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableUtils.java @@ -72,7 +72,7 @@ import org.apache.accumulo.core.summary.Gatherer; import org.apache.accumulo.core.summary.SummarizerFactory; import org.apache.accumulo.core.summary.SummaryCollection; import org.apache.accumulo.core.summary.SummaryReader; -import org.apache.accumulo.core.tabletserver.thrift.CompactionReason; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason; import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.core.util.ratelimit.RateLimiter; import org.apache.accumulo.server.ServerContext; @@ -575,16 +575,16 @@ public class CompactableUtils { } @Override - public CompactionReason getReason() { + public TCompactionReason getReason() { switch (job.getKind()) { case USER: - return CompactionReason.USER; + return TCompactionReason.USER; case CHOP: - return CompactionReason.CHOP; + return TCompactionReason.CHOP; case SELECTOR: case SYSTEM: default: - return CompactionReason.SYSTEM; + return TCompactionReason.SYSTEM; } } }; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java index 886cc68..8974c78 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java @@ -38,7 +38,7 @@ import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.manager.state.tables.TableState; import org.apache.accumulo.core.metadata.TabletFile; -import org.apache.accumulo.core.tabletserver.thrift.CompactionReason; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason; import org.apache.accumulo.core.util.LocalityGroupUtil; import org.apache.accumulo.core.util.ratelimit.RateLimiter; import org.apache.accumulo.server.ServerContext; @@ -100,15 +100,15 @@ public class MinorCompactor extends Compactor { } @Override - public CompactionReason getReason() { + public TCompactionReason getReason() { switch (mincReason) { case USER: - return CompactionReason.USER; + return TCompactionReason.USER; case CLOSE: - return CompactionReason.CLOSE; + return TCompactionReason.CLOSE; case SYSTEM: default: - return CompactionReason.SYSTEM; + return TCompactionReason.SYSTEM; } } }, Collections.emptyList(), tableConfig); diff --git a/test/src/main/java/org/apache/accumulo/test/ExternalDoNothingCompactor.java b/test/src/main/java/org/apache/accumulo/test/ExternalDoNothingCompactor.java index 49f6acb..b1441ae 100644 --- a/test/src/main/java/org/apache/accumulo/test/ExternalDoNothingCompactor.java +++ b/test/src/main/java/org/apache/accumulo/test/ExternalDoNothingCompactor.java @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.LongAdder; import org.apache.accumulo.compactor.Compactor; -import org.apache.accumulo.core.compaction.thrift.CompactionState; import org.apache.accumulo.core.compaction.thrift.Compactor.Iface; +import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.fate.util.UtilWaitThread; import org.apache.accumulo.server.compaction.Compactor.CompactionCanceledException; @@ -49,7 +49,7 @@ public class ExternalDoNothingCompactor extends Compactor implements Iface { public void run() { try { LOG.info("Starting up compaction runnable for job: {}", job); - updateCompactionState(job, CompactionState.STARTED, "Compaction started"); + updateCompactionState(job, TCompactionState.STARTED, "Compaction started"); LOG.info("Starting compactor"); started.countDown();