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

only fetch status when we know it's there

Browse Source
This commit is contained in:
Athou
2013-08-12 10:01:24 +02:00
parent 71368fba62
commit cf185c3877
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,18 +199,21 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
ProjectionList projection = Projections.projectionList(); ProjectionList projection = Projections.projectionList();
projection.add(Projections.property("id"), "id"); projection.add(Projections.property("id"), "id");
projection.add(Projections.property("updated"), "updated"); projection.add(Projections.property("updated"), "updated");
projection.add(Projections.property(ALIAS_STATUS + ".id"), "status_id");
criteria.setProjection(projection); criteria.setProjection(projection);
criteria.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); criteria.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
List<Map<String, Object>> list = criteria.list(); List<Map<String, Object>> list = criteria.list();
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
Long id = (Long) map.get("id"); Long id = (Long) map.get("id");
Date updated = (Date) map.get("updated"); Date updated = (Date) map.get("updated");
Long statusId = (Long) map.get("status_id");
FeedEntry entry = new FeedEntry(); FeedEntry entry = new FeedEntry();
entry.setId(id); entry.setId(id);
entry.setUpdated(updated); entry.setUpdated(updated);
FeedEntryStatus status = new FeedEntryStatus(); FeedEntryStatus status = new FeedEntryStatus();
status.setId(statusId);
status.setEntryUpdated(updated); status.setEntryUpdated(updated);
status.setEntry(entry); status.setEntry(entry);
status.setSubscription(sub); status.setSubscription(sub);
@@ -230,8 +233,9 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
if (!onlyIds) { if (!onlyIds) {
List<FeedEntryStatus> statuses = Lists.newArrayList(); List<FeedEntryStatus> statuses = Lists.newArrayList();
for (FeedEntryStatus status : statusPlaceholders) { for (FeedEntryStatus status : statusPlaceholders) {
Long statusId = status.getId();
FeedEntry entry = em.find(FeedEntry.class, status.getEntry().getId()); FeedEntry entry = em.find(FeedEntry.class, status.getEntry().getId());
statuses.add(getStatus(status.getSubscription(), entry)); statuses.add(handleStatus(statusId == null ? null : findById(statusId), status.getSubscription(), entry));
} }
statusPlaceholders = lazyLoadContent(includeContent, statuses); statusPlaceholders = lazyLoadContent(includeContent, statuses);
} }