same batch size for all operations

This commit is contained in:
Athou
2013-11-16 11:27:48 +01:00
parent fce9086b27
commit d7fb637f68

View File

@@ -25,6 +25,8 @@ import com.commafeed.backend.model.FeedSubscription;
*/ */
@Slf4j @Slf4j
public class DatabaseCleaningService { public class DatabaseCleaningService {
private static final int BATCH_SIZE = 100;
@Inject @Inject
FeedDAO feedDAO; FeedDAO feedDAO;
@@ -52,7 +54,7 @@ public class DatabaseCleaningService {
deleted = 0; deleted = 0;
List<Feed> feeds = feedDAO.findWithoutSubscriptions(1); List<Feed> feeds = feedDAO.findWithoutSubscriptions(1);
for (Feed feed : feeds) { for (Feed feed : feeds) {
deleted += feedEntryDAO.delete(feed, 10); deleted += feedEntryDAO.delete(feed, BATCH_SIZE);
total += deleted; total += deleted;
log.info("removed {} entries for feeds without subscriptions", total); log.info("removed {} entries for feeds without subscriptions", total);
} }
@@ -66,7 +68,7 @@ public class DatabaseCleaningService {
long total = 0; long total = 0;
int deleted = 0; int deleted = 0;
do { do {
deleted = feedDAO.delete(feedDAO.findWithoutSubscriptions(10)); deleted = feedDAO.delete(feedDAO.findWithoutSubscriptions(BATCH_SIZE));
total += deleted; total += deleted;
log.info("removed {} feeds without subscriptions", total); log.info("removed {} feeds without subscriptions", total);
} while (deleted != 0); } while (deleted != 0);
@@ -79,7 +81,7 @@ public class DatabaseCleaningService {
long total = 0; long total = 0;
int deleted = 0; int deleted = 0;
do { do {
deleted = feedEntryContentDAO.deleteWithoutEntries(10); deleted = feedEntryContentDAO.deleteWithoutEntries(BATCH_SIZE);
total += deleted; total += deleted;
log.info("removed {} contents without entries", total); log.info("removed {} contents without entries", total);
} while (deleted != 0); } while (deleted != 0);
@@ -94,7 +96,7 @@ public class DatabaseCleaningService {
long total = 0; long total = 0;
int deleted = 0; int deleted = 0;
do { do {
deleted = feedEntryDAO.delete(cal.getTime(), 100); deleted = feedEntryDAO.delete(cal.getTime(), BATCH_SIZE);
total += deleted; total += deleted;
log.info("removed {} entries", total); log.info("removed {} entries", total);
} while (deleted != 0); } while (deleted != 0);
@@ -122,7 +124,7 @@ public class DatabaseCleaningService {
long total = 0; long total = 0;
List<FeedEntryStatus> list = Collections.emptyList(); List<FeedEntryStatus> list = Collections.emptyList();
do { do {
list = feedEntryStatusDAO.getOldStatuses(olderThan, 100); list = feedEntryStatusDAO.getOldStatuses(olderThan, BATCH_SIZE);
if (!list.isEmpty()) { if (!list.isEmpty()) {
feedEntryStatusDAO.delete(list); feedEntryStatusDAO.delete(list);
total += list.size(); total += list.size();