garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

actually remove entries for feeds

Browse Source
This commit is contained in:
Athou
2014-03-17 06:18:36 +01:00
parent dced21c8e4
commit 3b69e3b029
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/commafeed/backend/ScheduledTasks.java
View File

@@ -41,7 +41,6 @@ public class ScheduledTasks {
*/
@Schedule(hour = "*", persistent = false)
private void cleanFeedsAndContents() {
cleaner.cleanEntriesForFeedsWithoutSubscriptions();
cleaner.cleanFeedsWithoutSubscriptions();
cleaner.cleanContentsWithoutEntries();
}

38
src/main/java/com/commafeed/backend/services/DatabaseCleaningService.java
View File

@@ -25,7 +25,7 @@ import com.commafeed.backend.model.FeedSubscription;
*/
@Slf4j
public class DatabaseCleaningService {
private static final int BATCH_SIZE = 100;
@Inject
@@ -46,36 +46,34 @@ public class DatabaseCleaningService {
@Inject
ApplicationSettingsService applicationSettingsService;
public long cleanEntriesForFeedsWithoutSubscriptions() {
log.info("cleaning entries for feeds without subscriptions");
long total = 0;
int deleted = 0;
do {
deleted = 0;
List<Feed> feeds = feedDAO.findWithoutSubscriptions(1);
for (Feed feed : feeds) {
deleted += feedEntryDAO.delete(feed, BATCH_SIZE);
total += deleted;
log.info("removed {} entries for feeds without subscriptions", total);
}
} while (deleted != 0);
log.info("cleanup done: {} entries for feeds without subscriptions deleted", total);
return total;
}
public long cleanFeedsWithoutSubscriptions() {
log.info("cleaning feeds without subscriptions");
long total = 0;
long totalEntries = 0;
int deleted = 0;
do {
deleted = feedDAO.delete(feedDAO.findWithoutSubscriptions(1));
List<Feed> feeds = feedDAO.findWithoutSubscriptions(1);
totalEntries += cleanEntriesForFeedsWithoutSubscriptions(feeds);
deleted = feedDAO.delete(feeds);
total += deleted;
log.info("removed {} feeds without subscriptions", total);
log.info("removed {} feeds without subscriptions ({} entries)", total, totalEntries);
} while (deleted != 0);
log.info("cleanup done: {} feeds without subscriptions deleted", total);
return total;
}
private long cleanEntriesForFeedsWithoutSubscriptions(List<Feed> feeds) {
long total = 0;
for (Feed feed : feeds) {
int deleted = 0;
do {
deleted = feedEntryDAO.delete(feed, BATCH_SIZE);
total += deleted;
} while (deleted != 0);
}
return total;
}
public long cleanContentsWithoutEntries() {
log.info("cleaning contents without entries");
long total = 0;