fix database interface issue on batch insert return type

thelastpickle · Dec 17, 2014 · 1b8db3a · 1b8db3a
1 parent a9375fd
commit 1b8db3a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git 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<RepairSegment.Builder> newSegments);
+  void addRepairSegments(Collection<RepairSegment.Builder> 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
@@ -168,15 +168,14 @@ public ColumnFamily getColumnFamily(String cluster, String keyspace, String tabl
   }
 
   @Override
-  public int addRepairSegments(Collection<RepairSegment.Builder> segments) {
+  public void addRepairSegments(Collection<RepairSegment.Builder> segments) {
     LinkedHashMap<Long, RepairSegment> newSegments = Maps.newLinkedHashMap();
     for (RepairSegment.Builder segment : segments) {
       RepairSegment newRepairSegment = segment.build(SEGMENT_ID.incrementAndGet());
       repairSegments.put(newRepairSegment.getId(), newRepairSegment);
       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
@@ -176,14 +176,14 @@ public ColumnFamily getColumnFamily(String clusterName, String keyspaceName, Str
   }
 
   @Override
-  public int addRepairSegments(Collection<RepairSegment.Builder> newSegments) {
+  public void addRepairSegments(Collection<RepairSegment.Builder> newSegments) {
     List<RepairSegment> 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
@@ -163,7 +163,7 @@ public ColumnFamily getColumnFamilyByClusterAndName(@Bind("clusterName") String
 
   @SqlBatch(SQL_INSERT_REPAIR_SEGMENT)
   @BatchChunkSize(500)
-  public int insertRepairSegments(@BindBean Iterator<RepairSegment> newRepairSegments);
+  public void insertRepairSegments(@BindBean Iterator<RepairSegment> newRepairSegments);
 
   @SqlUpdate(SQL_UPDATE_REPAIR_SEGMENT)
   public int updateRepairSegment(@BindBean RepairSegment newRepairSegment);