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

since push info is fetched lazily anyway, get it with the join

Browse Source
This commit is contained in:
Athou
2013-05-31 16:45:09 +02:00
parent ca2d52d576
commit 574f75433d
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -7,6 +7,7 @@ import java.util.List;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
@@ -15,7 +16,6 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedPushInfo;
import com.commafeed.backend.model.Feed_; import com.commafeed.backend.model.Feed_;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@@ -50,6 +50,7 @@ public class FeedDAO extends GenericDAO<Feed> {
query.select(builder.count(root)); query.select(builder.count(root));
query.where(getUpdatablePredicates(root).toArray(new Predicate[0])); query.where(getUpdatablePredicates(root).toArray(new Predicate[0]));
root.fetch(Feed_.pushInfo, JoinType.LEFT);
TypedQuery<Long> q = em.createQuery(query); TypedQuery<Long> q = em.createQuery(query);
return q.getSingleResult(); return q.getSingleResult();
@@ -60,19 +61,14 @@ public class FeedDAO extends GenericDAO<Feed> {
Root<Feed> root = query.from(getType()); Root<Feed> root = query.from(getType());
query.where(getUpdatablePredicates(root).toArray(new Predicate[0])); query.where(getUpdatablePredicates(root).toArray(new Predicate[0]));
root.fetch(Feed_.pushInfo, JoinType.LEFT);
query.orderBy(builder.asc(root.get(Feed_.lastUpdated))); query.orderBy(builder.asc(root.get(Feed_.lastUpdated)));
TypedQuery<Feed> q = em.createQuery(query); TypedQuery<Feed> q = em.createQuery(query);
q.setMaxResults(count); q.setMaxResults(count);
List<Feed> feeds = q.getResultList(); return q.getResultList();
for (Feed feed : feeds) {
FeedPushInfo info = feed.getPushInfo();
if (info != null) {
info.getTopic();
}
}
return feeds;
} }
public Feed findByUrl(String url) { public Feed findByUrl(String url) {