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

faster cleanup query

Browse Source
This commit is contained in:
Athou
2013-06-18 10:34:11 +02:00
parent 9b53e2b0fb
commit c4bb8da746
4 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,14 +12,11 @@ public class DatabaseCleaner {
@Inject
FeedEntryStatusDAO feedEntryStatusDAO;
public void cleanOlderThan(long value, TimeUnit unit) {
public int cleanOlderThan(long value, TimeUnit unit) {
Calendar cal = Calendar.getInstance();
cal.add(Calendar.MINUTE, -1 * (int) unit.toMinutes(value));
int deleted = -1;
do {
deleted = feedEntryStatusDAO.delete(cal.getTime(), 1000);
} while (deleted != 0);
return feedEntryStatusDAO.delete(cal.getTime());
}
}

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

@@ -307,24 +307,10 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
query.setHint("javax.persistence.query.timeout", 20000);
}
public int delete(Date olderThan, int max) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
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<FeedEntryStatus> q = em.createQuery(query);
q.setMaxResults(max);
List<FeedEntryStatus> list = q.getResultList();
int deleted = list.size();
delete(list);
public int delete(Date olderThan) {
Query query = em.createNamedQuery("EntryStatus.deleteOlderThan");
query.setParameter("olderThan", olderThan);
int deleted = query.executeUpdate();
return deleted;
}

4
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -194,8 +194,8 @@ public class AdminREST extends AbstractResourceREST {
@Path("/cleanup")
@GET
public Response cleanup() {
cleaner.cleanOlderThan(30, TimeUnit.DAYS);
return Response.ok("ok").build();
int deleted = cleaner.cleanOlderThan(30, TimeUnit.DAYS);
return Response.ok("ok: " + deleted).build();
}
}