In CassandraStorage implement segments as clustering keys within the …

…repair_run table. Change required in IStorage so to identify a segment both by runId and segmentId. ref: - #94 - #102
thelastpickle · Jun 23, 2017 · 85ef9a2 · 85ef9a2
1 parent ce09d54
commit 85ef9a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/com/spotify/reaper/storage/CassandraStorage.java b/src/main/java/com/spotify/reaper/storage/CassandraStorage.java
@@ -405,17 +405,15 @@ public Collection<RepairSegment> getRepairSegmentsForRun(UUID runId) {
 
   private boolean segmentIsWithinRange(RepairSegment segment, RingRange range) {
     return range.encloses(new RingRange(segment.getStartToken(), segment.getEndToken()));
-
   }
 
-  private RepairSegment createRepairSegmentFromRow(Row segmentRow){
-    return createRepairSegmentFromRow(segmentRow, segmentRow.getUUID("id"));
-  }
-  private RepairSegment createRepairSegmentFromRow(Row segmentRow, UUID segmentId){
+  private static RepairSegment createRepairSegmentFromRow(Row segmentRow){
     return new RepairSegment.Builder(
-            new RingRange(new BigInteger(segmentRow.getVarint("start_token") +""), new BigInteger(segmentRow.getVarint("end_token")+"")),
+            new RingRange(
+                    new BigInteger(segmentRow.getVarint("start_token") +""),
+                    new BigInteger(segmentRow.getVarint("end_token")+"")),
             segmentRow.getUUID("repair_unit_id"))
-        .withRunId(segmentRow.getUUID("run_id"))
+        .withRunId(segmentRow.getUUID("id"))
         .coordinatorHost(segmentRow.getString("coordinator_host"))
         .endTime(new DateTime(segmentRow.getTimestamp("segment_end_time")))
         .failCount(segmentRow.getInt("fail_count"))

diff --git a/src/main/resources/db/cassandra/003_switch_to_uuids.cql b/src/main/resources/db/cassandra/003_switch_to_uuids.cql
@@ -75,6 +75,10 @@ CREATE TABLE IF NOT EXISTS repair_run_by_unit (
   AND caching = {'rows_per_partition': 'ALL'};
 
 
+<<<<<<< ce09d5439e7cb85a0954b6c27c52d5968dc26426
+=======
+
+>>>>>>> In CassandraStorage implement segments as clustering keys within the repair_run table.
 
 CREATE TABLE IF NOT EXISTS repair_schedule_v1 (
   id                 timeuuid PRIMARY KEY,