From 7e2ebf2dfceab334dc2ea42f0858765a19a4f507 Mon Sep 17 00:00:00 2001 From: Athou Date: Thu, 4 Jul 2013 10:21:00 +0200 Subject: [PATCH] don't filter on having subscriptions as the query is too long to execute --- src/main/java/com/commafeed/backend/dao/FeedDAO.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/src/main/java/com/commafeed/backend/dao/FeedDAO.java index 5f0fdefc..a9e7b418 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedDAO.java @@ -27,9 +27,6 @@ public class FeedDAO extends GenericDAO { private List getUpdatablePredicates(Root root, Date threshold) { - Predicate hasSubscriptions = builder.isNotEmpty(root - .get(Feed_.subscriptions)); - Predicate neverUpdated = builder.isNull(root.get(Feed_.lastUpdated)); Predicate updatedBeforeThreshold = builder.lessThan( root.get(Feed_.lastUpdated), threshold); @@ -39,7 +36,7 @@ public class FeedDAO extends GenericDAO { Predicate disabledDateIsInPast = builder.lessThan( root.get(Feed_.disabledUntil), new Date()); - return Lists.newArrayList(hasSubscriptions, + return Lists.newArrayList( builder.or(neverUpdated, updatedBeforeThreshold), builder.or(disabledDateIsNull, disabledDateIsInPast)); }