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

better cleaning method

Browse Source
This commit is contained in:
Athou
2013-06-18 08:54:53 +02:00
parent a1253108c9
commit 9b53e2b0fb
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,12 +5,12 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedEntryStatusDAO;
public class DatabaseCleaner {
@Inject
FeedEntryDAO feedEntryDAO;
FeedEntryStatusDAO feedEntryStatusDAO;
public void cleanOlderThan(long value, TimeUnit unit) {
Calendar cal = Calendar.getInstance();
@@ -18,7 +18,7 @@ public class DatabaseCleaner {
int deleted = -1;
do {
deleted = feedEntryDAO.delete(cal.getTime(), 1000);
deleted = feedEntryStatusDAO.delete(cal.getTime(), 1000);
} while (deleted != 0);
}

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

@@ -1,6 +1,5 @@
package com.commafeed.backend.dao;
import java.util.Date;
import java.util.List;
import javax.ejb.Stateless;
@@ -56,20 +55,6 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
return list;
}
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;
}
public List<FeedEntry> findByFeed(Feed feed, int offset, int limit) {
CriteriaQuery<FeedEntry> query = builder.createQuery(getType());
Root<FeedEntry> root = query.from(getType());

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

@@ -307,6 +307,27 @@ 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);
return deleted;
}
public void markSubscriptionEntries(FeedSubscription subscription,
Date olderThan) {
List<FeedEntryStatus> statuses = findBySubscription(subscription, true,