From 1b8db3a5b6a9ee2982b3f5872dd0d9fcb99c8477 Mon Sep 17 00:00:00 2001
From: Hannu Varjoranta <varjo@spotify.com>
Date: Wed, 17 Dec 2014 15:18:32 +0100
Subject: [PATCH] fix database interface issue on batch insert return type

---
 src/main/java/com/spotify/reaper/storage/IStorage.java        | 2 +-
 src/main/java/com/spotify/reaper/storage/MemoryStorage.java   | 3 +--
 src/main/java/com/spotify/reaper/storage/PostgresStorage.java | 4 ++--
 .../spotify/reaper/storage/postgresql/IStoragePostgreSQL.java | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

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<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
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<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());
@@ -176,7 +176,6 @@ public int addRepairSegments(Collection<RepairSegment.Builder> 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<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
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<RepairSegment> newRepairSegments);
+  public void insertRepairSegments(@BindBean Iterator<RepairSegment> newRepairSegments);
 
   @SqlUpdate(SQL_UPDATE_REPAIR_SEGMENT)
   public int updateRepairSegment(@BindBean RepairSegment newRepairSegment);