diff --git a/src/main/java/com/spotify/reaper/storage/IStorage.java b/src/main/java/com/spotify/reaper/storage/IStorage.java index 9b8bd02c8..172b6ff56 100644 --- a/src/main/java/com/spotify/reaper/storage/IStorage.java +++ b/src/main/java/com/spotify/reaper/storage/IStorage.java @@ -50,7 +50,7 @@ public interface IStorage { ColumnFamily getColumnFamily(String cluster, String keyspace, String table); - int addRepairSegments(Collection newSegments); + void addRepairSegments(Collection newSegments); boolean updateRepairSegment(RepairSegment newRepairSegment); diff --git a/src/main/java/com/spotify/reaper/storage/MemoryStorage.java b/src/main/java/com/spotify/reaper/storage/MemoryStorage.java index aff339dc9..2c1ac75dc 100644 --- a/src/main/java/com/spotify/reaper/storage/MemoryStorage.java +++ b/src/main/java/com/spotify/reaper/storage/MemoryStorage.java @@ -168,7 +168,7 @@ public ColumnFamily getColumnFamily(String cluster, String keyspace, String tabl } @Override - public int addRepairSegments(Collection segments) { + public void addRepairSegments(Collection segments) { LinkedHashMap newSegments = Maps.newLinkedHashMap(); for (RepairSegment.Builder segment : segments) { RepairSegment newRepairSegment = segment.build(SEGMENT_ID.incrementAndGet()); @@ -176,7 +176,6 @@ public int addRepairSegments(Collection segments) { newSegments.put(newRepairSegment.getId(), newRepairSegment); } repairSegmentsByRunId.put(newSegments.values().iterator().next().getRunId(), newSegments); - return newSegments.size(); } @Override diff --git a/src/main/java/com/spotify/reaper/storage/PostgresStorage.java b/src/main/java/com/spotify/reaper/storage/PostgresStorage.java index 2c86cbd85..2c33fde80 100644 --- a/src/main/java/com/spotify/reaper/storage/PostgresStorage.java +++ b/src/main/java/com/spotify/reaper/storage/PostgresStorage.java @@ -176,14 +176,14 @@ public ColumnFamily getColumnFamily(String clusterName, String keyspaceName, Str } @Override - public int addRepairSegments(Collection newSegments) { + public void addRepairSegments(Collection newSegments) { List insertableSegments = new ArrayList<>(); for (RepairSegment.Builder segment : newSegments) { insertableSegments.add(segment.build(-1)); } Handle h = jdbi.open(); IStoragePostgreSQL postgres = getPostgresStorage(h); - return postgres.insertRepairSegments(insertableSegments.iterator()); + postgres.insertRepairSegments(insertableSegments.iterator()); } @Override diff --git a/src/main/java/com/spotify/reaper/storage/postgresql/IStoragePostgreSQL.java b/src/main/java/com/spotify/reaper/storage/postgresql/IStoragePostgreSQL.java index 917e35639..be8734761 100644 --- a/src/main/java/com/spotify/reaper/storage/postgresql/IStoragePostgreSQL.java +++ b/src/main/java/com/spotify/reaper/storage/postgresql/IStoragePostgreSQL.java @@ -163,7 +163,7 @@ public ColumnFamily getColumnFamilyByClusterAndName(@Bind("clusterName") String @SqlBatch(SQL_INSERT_REPAIR_SEGMENT) @BatchChunkSize(500) - public int insertRepairSegments(@BindBean Iterator newRepairSegments); + public void insertRepairSegments(@BindBean Iterator newRepairSegments); @SqlUpdate(SQL_UPDATE_REPAIR_SEGMENT) public int updateRepairSegment(@BindBean RepairSegment newRepairSegment);