Rename field in CompactionSet

prestodb · Jun 29, 2016 · ebd7bf4 · ebd7bf4
1 parent 6295431
commit ebd7bf4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/...o-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/CompactionSet.java b/...o-raptor/src/main/java/com/facebook/presto/raptor/storage/organization/CompactionSet.java
@@ -24,22 +24,22 @@
 public class CompactionSet
 {
     private final long tableId;
-    private final Set<ShardMetadata> shardsToCompact;
+    private final Set<ShardMetadata> shards;
 
-    public CompactionSet(long tableId, Set<ShardMetadata> shardsToCompact)
+    public CompactionSet(long tableId, Set<ShardMetadata> shards)
     {
         this.tableId = tableId;
-        this.shardsToCompact = requireNonNull(shardsToCompact, "shardsToCompact is null");
+        this.shards = requireNonNull(shards, "shards is null");
     }
 
     public long getTableId()
     {
         return tableId;
     }
 
-    public Set<ShardMetadata> getShardsToCompact()
+    public Set<ShardMetadata> getShards()
     {
-        return shardsToCompact;
+        return shards;
     }
 
     @Override
@@ -53,21 +53,21 @@ 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
     public String toString()
     {
         return toStringHelper(this)
                 .add("tableId", tableId)
-                .add("shardsToCompact", shardsToCompact)
+                .add("shards", shards)
                 .toString();
     }
 }
diff --git a/...src/main/java/com/facebook/presto/raptor/storage/organization/ShardCompactionManager.java b/...src/main/java/com/facebook/presto/raptor/storage/organization/ShardCompactionManager.java
@@ -336,12 +336,12 @@ Set<ShardMetadata> filterShardsWithTemporalMetadata(Iterable<ShardMetadata> allS
     private void addToCompactionQueue(CompactionSetCreator compactionSetCreator, long tableId, Set<ShardMetadata> 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<ShardMetadata> shards = compactionSet.getShardsToCompact();
+            Set<ShardMetadata> shards = compactionSet.getShards();
             OptionalInt bucketNumber = shards.iterator().next().getBucketNumber();
             for (ShardMetadata shard : shards) {
                 verify(bucketNumber.equals(shard.getBucketNumber()), "mismatched bucket numbers");

diff --git a/...c/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java b/...c/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java
@@ -52,7 +52,7 @@ public void testNonTemporalCompactionSetSimple()
 
         Set<CompactionSet> compactionSets = compactionSetCreator.createCompactionSets(1L, inputShards);
         assertEquals(compactionSets.size(), 1);
-        assertEquals(getOnlyElement(compactionSets).getShardsToCompact(), inputShards);
+        assertEquals(getOnlyElement(compactionSets).getShards(), inputShards);
     }
 
     @Test