first clean entries then clean feeds

src/main/java/com/commafeed/backend/ScheduledTasks.java

@@ -41,6 +41,7 @@ public class ScheduledTasks {
 	 */
 	@Schedule(hour = "*", persistent = false)
 	private void cleanFeedsAndContents() {
+		cleaner.cleanEntriesWithoutSubscriptions();
 		cleaner.cleanFeedsWithoutSubscriptions();
 		cleaner.cleanContentsWithoutEntries();
 	}

src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java

@@ -6,14 +6,19 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.persistence.criteria.SetJoin;
 
 import org.apache.commons.codec.digest.DigestUtils;
 
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedEntry_;
+import com.commafeed.backend.model.FeedSubscription;
+import com.commafeed.backend.model.FeedSubscription_;
 import com.commafeed.backend.model.Feed_;
 import com.google.common.collect.Iterables;
 
@@ -37,6 +42,19 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
 		return Iterables.getFirst(list, null);
 	}
 
+	public List<FeedEntry> findWithoutSubscriptions(int max) {
+		CriteriaQuery<FeedEntry> query = builder.createQuery(getType());
+		Root<FeedEntry> root = query.from(getType());
+
+		Join<FeedEntry, Feed> feedJoin = root.join(FeedEntry_.feed);
+		SetJoin<Feed, FeedSubscription> subJoin = feedJoin.join(Feed_.subscriptions, JoinType.LEFT);
+		query.where(builder.isNull(subJoin.get(FeedSubscription_.id)));
+		TypedQuery<FeedEntry> q = em.createQuery(query);
+		q.setMaxResults(max);
+
+		return q.getResultList();
+	}
+
 	public int delete(Feed feed, int max) {
 
 		CriteriaQuery<FeedEntry> query = builder.createQuery(getType());

src/main/java/com/commafeed/backend/services/DatabaseCleaningService.java

@@ -16,6 +16,7 @@ import com.commafeed.backend.dao.FeedEntryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
 import com.commafeed.backend.model.Feed;
+import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedEntryStatus;
 import com.commafeed.backend.model.FeedSubscription;
 
@@ -45,14 +46,27 @@ public class DatabaseCleaningService {
 
 	@Inject
 	ApplicationSettingsService applicationSettingsService;
+	
+	public long cleanEntriesWithoutSubscriptions() {
+		log.info("cleaning entries without subscriptions");
+		long total = 0;
+		int deleted = 0;
+		do {
+			List<FeedEntry> entries = feedEntryDAO.findWithoutSubscriptions(BATCH_SIZE);
+			deleted = feedEntryDAO.delete(entries);
+			total += deleted;
+			log.info("removed {} entries without subscriptions", total);
+		} while (deleted != 0);
+		log.info("cleanup done: {} entries without subscriptions deleted", total);
+		return total;
+	}
 
 	public long cleanFeedsWithoutSubscriptions() {
 		log.info("cleaning feeds without subscriptions");
 		long total = 0;
 		int deleted = 0;
 		do {
-			List<Feed> feeds = feedDAO.findWithoutSubscriptions(1);
+			List<Feed> feeds = feedDAO.findWithoutSubscriptions(BATCH_SIZE);
-			cleanEntriesForFeedsWithoutSubscriptions(feeds);
 			deleted = feedDAO.delete(feeds);
 			total += deleted;
 			log.info("removed {} feeds without subscriptions", total);
@@ -61,19 +75,6 @@ public class DatabaseCleaningService {
 		return total;
 	}
 
-	private long cleanEntriesForFeedsWithoutSubscriptions(List<Feed> feeds) {
-		long total = 0;
-		for (Feed feed : feeds) {
-			int deleted = 0;
-			do {
-				deleted = feedEntryDAO.delete(feed, BATCH_SIZE);
-				total += deleted;
-				log.info("removed {} entries for feed {}", total, feed.getId());
-			} while (deleted != 0);
-		}
-		return total;
-	}
-
 	public long cleanContentsWithoutEntries() {
 		log.info("cleaning contents without entries");
 		long total = 0;