Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

purge entries as well as statuses

Browse Source
This commit is contained in:
Athou
2013-06-19 13:29:56 +02:00
parent 5bd324f984
commit 5ce780e6a2
3 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/commafeed/backend/DatabaseCleaner.java
View File

@@ -8,14 +8,14 @@ import javax.inject.Inject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedEntryDAO;
public class DatabaseCleaner { public class DatabaseCleaner {
private static Logger log = LoggerFactory.getLogger(DatabaseCleaner.class); private static Logger log = LoggerFactory.getLogger(DatabaseCleaner.class);
@Inject @Inject
FeedEntryStatusDAO feedEntryStatusDAO; FeedEntryDAO feedEntryDAO;
public long cleanOlderThan(long value, TimeUnit unit) { public long cleanOlderThan(long value, TimeUnit unit) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
@@ -24,7 +24,7 @@ public class DatabaseCleaner {
long total = 0; long total = 0;
int deleted = -1; int deleted = -1;
do { do {
deleted = feedEntryStatusDAO.delete(cal.getTime(), 100); deleted = feedEntryDAO.delete(cal.getTime(), 100);
total += deleted; total += deleted;
log.info("removed {} statuses", total); log.info("removed {} statuses", total);
} while (deleted != 0); } while (deleted != 0);

15
src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java
View File

@@ -1,5 +1,6 @@
package com.commafeed.backend.dao; package com.commafeed.backend.dao;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.ejb.Stateless; import javax.ejb.Stateless;
@@ -66,4 +67,18 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
limit(q, offset, limit); limit(q, offset, limit);
return q.getResultList(); return q.getResultList();
} }
public int delete(Date olderThan, int max) {
CriteriaQuery<FeedEntry> query = builder.createQuery(getType());
Root<FeedEntry> root = query.from(getType());
query.where(builder.lessThan(root.get(FeedEntry_.inserted), olderThan));
TypedQuery<FeedEntry> q = em.createQuery(query);
q.setMaxResults(max);
List<FeedEntry> list = q.getResultList();
int deleted = list.size();
delete(list);
return deleted;
}
} }

27
src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -309,33 +309,6 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
query.setHint("javax.persistence.query.timeout", 20000); query.setHint("javax.persistence.query.timeout", 20000);
} }
public int delete(Date olderThan, int max) {
CriteriaQuery<Long> query = builder.createQuery(Long.class);
Root<FeedEntryStatus> root = query.from(getType());
query.select(root.get(FeedEntryStatus_.id));
Join<FeedEntryStatus, FeedEntry> entryJoin = root
.join(FeedEntryStatus_.entry);
Predicate p1 = builder.lessThan(entryJoin.get(FeedEntry_.inserted),
olderThan);
Predicate p2 = builder.isFalse(root.get(FeedEntryStatus_.starred));
query.where(p1, p2);
TypedQuery<Long> q = em.createQuery(query);
q.setMaxResults(max);
List<Long> ids = q.getResultList();
int deleted = 0;
if (ids.isEmpty() == false) {
Query deleteQuery = em.createNamedQuery("EntryStatus.deleteByIds");
deleteQuery.setParameter("ids", ids);
deleted = deleteQuery.executeUpdate();
}
return deleted;
}
public void markSubscriptionEntries(FeedSubscription subscription, public void markSubscriptionEntries(FeedSubscription subscription,
Date olderThan) { Date olderThan) {
List<FeedEntryStatus> statuses = findBySubscription(subscription, true, List<FeedEntryStatus> statuses = findBySubscription(subscription, true,