ACCUMULO-3488 make MajorCompactionRequest backwards compatible
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/351f199d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/351f199d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/351f199d Branch: refs/heads/master Commit: 351f199d390b192d09e176bb2c5a1b19e74b72a0 Parents: 02db25e Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Apr 23 11:12:52 2015 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Apr 23 11:12:52 2015 -0400 ---------------------------------------------------------------------- .../compaction/MajorCompactionRequest.java | 15 +++++++++++++-- test/src/test/resources/TestCompactionStrat.jar | Bin 2259 -> 2530 bytes 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/351f199d/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java index 712e8df..c6733f8 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java @@ -22,7 +22,9 @@ import java.util.Map; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.TabletId; import org.apache.accumulo.core.data.impl.KeyExtent; +import org.apache.accumulo.core.data.impl.TabletIdImpl; import org.apache.accumulo.core.file.FileOperations; import org.apache.accumulo.core.file.FileSKVIterator; import org.apache.accumulo.core.metadata.schema.DataFileValue; @@ -54,8 +56,17 @@ public class MajorCompactionRequest implements Cloneable { this.files = mcr.files; } - public KeyExtent getExtent() { - return extent; + /** + * @return org.apache.accumulo.core.data.KeyExtent + * @deprecated since 1.7. Use {@link #getTabletId()} instead. + */ + @Deprecated + public org.apache.accumulo.core.data.KeyExtent getExtent() { + return new org.apache.accumulo.core.data.KeyExtent(extent.getTableId(), extent.getEndRow(), extent.getPrevEndRow()); + } + + public TabletId getTabletId() { + return new TabletIdImpl(extent); } public MajorCompactionReason getReason() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/351f199d/test/src/test/resources/TestCompactionStrat.jar ---------------------------------------------------------------------- diff --git a/test/src/test/resources/TestCompactionStrat.jar b/test/src/test/resources/TestCompactionStrat.jar index a28cf7a..3daa16e 100644 Binary files a/test/src/test/resources/TestCompactionStrat.jar and b/test/src/test/resources/TestCompactionStrat.jar differ
