diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/CompactionSet.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/CompactionSet.java index 260c2b650583..5b7f2a5ac730 100644 --- a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/CompactionSet.java +++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/CompactionSet.java @@ -24,12 +24,12 @@ public class CompactionSet { private final long tableId; - private final Set shardsToCompact; + private final Set shards; - public CompactionSet(long tableId, Set shardsToCompact) + public CompactionSet(long tableId, Set shards) { this.tableId = tableId; - this.shardsToCompact = requireNonNull(shardsToCompact, "shardsToCompact is null"); + this.shards = requireNonNull(shards, "shards is null"); } public long getTableId() @@ -37,9 +37,9 @@ public long getTableId() return tableId; } - public Set getShardsToCompact() + public Set getShards() { - return shardsToCompact; + return shards; } @Override @@ -53,13 +53,13 @@ public boolean equals(Object o) } CompactionSet that = (CompactionSet) o; return Objects.equals(tableId, that.tableId) && - Objects.equals(shardsToCompact, that.shardsToCompact); + Objects.equals(shards, that.shards); } @Override public int hashCode() { - return Objects.hash(tableId, shardsToCompact); + return Objects.hash(tableId, shards); } @Override @@ -67,7 +67,7 @@ public String toString() { return toStringHelper(this) .add("tableId", tableId) - .add("shardsToCompact", shardsToCompact) + .add("shards", shards) .toString(); } } diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/ShardCompactionManager.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/ShardCompactionManager.java index 819ad8f4f2e5..49bb204569f6 100644 --- a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/ShardCompactionManager.java +++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/ShardCompactionManager.java @@ -336,12 +336,12 @@ Set filterShardsWithTemporalMetadata(Iterable allS private void addToCompactionQueue(CompactionSetCreator compactionSetCreator, long tableId, Set shardsToCompact) { for (CompactionSet compactionSet : compactionSetCreator.createCompactionSets(tableId, shardsToCompact)) { - if (compactionSet.getShardsToCompact().size() <= 1) { + if (compactionSet.getShards().size() <= 1) { // throw it away because there is no work to be done continue; } - compactionSet.getShardsToCompact().stream() + compactionSet.getShards().stream() .map(ShardMetadata::getShardUuid) .forEach(shardsInProgress::add); @@ -401,7 +401,7 @@ public CompactionJob(CompactionSet compactionSet) @Override public void run() { - Set shards = compactionSet.getShardsToCompact(); + Set shards = compactionSet.getShards(); OptionalInt bucketNumber = shards.iterator().next().getBucketNumber(); for (ShardMetadata shard : shards) { verify(bucketNumber.equals(shard.getBucketNumber()), "mismatched bucket numbers"); diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java index 381bf6eea892..553bb283fa6d 100644 --- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java +++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java @@ -52,7 +52,7 @@ public void testNonTemporalCompactionSetSimple() Set compactionSets = compactionSetCreator.createCompactionSets(1L, inputShards); assertEquals(compactionSets.size(), 1); - assertEquals(getOnlyElement(compactionSets).getShardsToCompact(), inputShards); + assertEquals(getOnlyElement(compactionSets).getShards(), inputShards); } @Test