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

denormalized fields on statuses for faster queries

Browse Source
This commit is contained in:
Athou
2013-07-14 05:48:47 +02:00
parent ca9c10a1d3
commit 24ee418f3f
6 changed files with 123 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,6 @@ import java.util.Map;
import javax.ejb.Stateless;
import javax.inject.Inject;
import javax.persistence.NoResultException;
import javax.persistence.Query;
import javax.persistence.Tuple;
import javax.persistence.TypedQuery;
@@ -16,7 +15,6 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Selection;
import javax.persistence.criteria.SetJoin;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
@@ -54,29 +52,6 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
@Inject
ApplicationSettingsService applicationSettingsService;
@SuppressWarnings("unchecked")
public FeedEntryStatus findById(User user, Long id) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
Join<FeedEntryStatus, FeedSubscription> join = (Join<FeedEntryStatus, FeedSubscription>) root
.fetch(FeedEntryStatus_.subscription);
Predicate p1 = builder.equal(root.get(FeedEntryStatus_.id), id);
Predicate p2 = builder.equal(join.get(FeedSubscription_.user), user);
query.where(p1, p2);
FeedEntryStatus status = null;
try {
status = em.createQuery(query).getSingleResult();
} catch (NoResultException e) {
status = null;
}
return status;
}
public FeedEntryStatus findByEntry(FeedEntry entry, FeedSubscription sub) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
@@ -121,8 +96,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
for (FeedEntry entry : entries) {
FeedEntryStatus s = existing.get(entry.getId());
if (s == null) {
s = new FeedEntryStatus();
s.setEntry(entry);
s = new FeedEntryStatus(sub.getUser(), sub, entry);
s.setSubscription(sub);
s.setRead(true);
}
@@ -165,7 +139,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.or(content, title));
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, root, ReadingOrder.desc);
orderEntriesBy(query, root, ReadingOrder.desc);
TypedQuery<Tuple> q = em.createQuery(query);
limit(q, offset, limit);
@@ -179,8 +153,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
FeedEntryStatus status = findByEntry(entry, subscription);
if (status == null) {
status = new FeedEntryStatus();
status.setEntry(entry);
status = new FeedEntryStatus(user, subscription, entry);
status.setRead(true);
status.setSubscription(subscription);
}
@@ -203,23 +176,17 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = root
.join(FeedEntryStatus_.entry);
Join<FeedEntryStatus, FeedSubscription> subJoin = root
.join(FeedEntryStatus_.subscription);
predicates
.add(builder.equal(subJoin.get(FeedSubscription_.user), user));
.add(builder.equal(root.get(FeedEntryStatus_.user), user));
predicates.add(builder.equal(root.get(FeedEntryStatus_.starred), true));
query.where(predicates.toArray(new Predicate[0]));
if (newerThan != null) {
predicates.add(builder.greaterThanOrEqualTo(
entryJoin.get(FeedEntry_.inserted), newerThan));
root.get(FeedEntryStatus_.entryInserted), newerThan));
}
orderBy(query, entryJoin, order);
orderStatusesBy(query, root, order);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
limit(q, offset, limit);
@@ -252,7 +219,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, root, order);
orderEntriesBy(query, root, order);
TypedQuery<Tuple> q = em.createQuery(query);
limit(q, offset, limit);
@@ -266,8 +233,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
FeedEntryStatus status = findByEntry(entry, subscription);
if (status == null) {
status = new FeedEntryStatus();
status.setEntry(entry);
status = new FeedEntryStatus(user, subscription, entry);
status.setRead(true);
status.setSubscription(subscription);
}
@@ -289,22 +255,17 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = root
.join(FeedEntryStatus_.entry);
Join<FeedEntryStatus, FeedSubscription> subJoin = root
.join(FeedEntryStatus_.subscription);
predicates
.add(builder.equal(subJoin.get(FeedSubscription_.user), user));
.add(builder.equal(root.get(FeedEntryStatus_.user), user));
predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read)));
if (newerThan != null) {
predicates.add(builder.greaterThanOrEqualTo(
entryJoin.get(FeedEntry_.inserted), newerThan));
root.get(FeedEntryStatus_.entryInserted), newerThan));
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, entryJoin, order);
orderStatusesBy(query, root, order);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
limit(q, offset, limit);
@@ -332,7 +293,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, root, order);
orderEntriesBy(query, root, order);
TypedQuery<FeedEntry> q = em.createQuery(query);
limit(q, offset, limit);
@@ -359,21 +320,18 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = root
.join(FeedEntryStatus_.entry);
predicates.add(builder.equal(root.get(FeedEntryStatus_.subscription),
subscription));
predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read)));
if (newerThan != null) {
predicates.add(builder.greaterThanOrEqualTo(
entryJoin.get(FeedEntry_.inserted), newerThan));
root.get(FeedEntryStatus_.entryInserted), newerThan));
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, entryJoin, order);
orderStatusesBy(query, root, order);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
limit(q, offset, limit);
@@ -413,7 +371,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, root, order);
orderEntriesBy(query, root, order);
TypedQuery<Tuple> q = em.createQuery(query);
limit(q, offset, limit);
@@ -427,8 +385,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
FeedEntryStatus status = findByEntry(entry, subscription);
if (status == null) {
status = new FeedEntryStatus();
status.setEntry(entry);
status = new FeedEntryStatus(subscription.getUser(), subscription, entry);
status.setSubscription(subscription);
status.setRead(true);
}
@@ -455,8 +412,6 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = root
.join(FeedEntryStatus_.entry);
Join<FeedEntryStatus, FeedSubscription> subJoin = root
.join(FeedEntryStatus_.subscription);
@@ -473,12 +428,12 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
if (newerThan != null) {
predicates.add(builder.greaterThanOrEqualTo(
entryJoin.get(FeedEntry_.inserted), newerThan));
root.get(FeedEntryStatus_.entryInserted), newerThan));
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, entryJoin, order);
orderStatusesBy(query, root, order);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
limit(q, offset, limit);
@@ -514,14 +469,23 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
return results;
}
private void orderBy(CriteriaQuery<?> query, Path<FeedEntry> entryJoin,
private void orderEntriesBy(CriteriaQuery<?> query, Path<FeedEntry> entryJoin,
ReadingOrder order) {
orderBy(query, entryJoin.get(FeedEntry_.updated), order);
}
private void orderStatusesBy(CriteriaQuery<?> query, Path<FeedEntryStatus> statusJoin,
ReadingOrder order) {
orderBy(query, statusJoin.get(FeedEntryStatus_.entryUpdated), order);
}
private void orderBy(CriteriaQuery<?> query, Path<Date> date,
ReadingOrder order) {
if (order != null) {
Path<Date> orderPath = entryJoin.get(FeedEntry_.updated);
if (order == ReadingOrder.asc) {
query.orderBy(builder.asc(orderPath));
query.orderBy(builder.asc(date));
} else {
query.orderBy(builder.desc(orderPath));
query.orderBy(builder.desc(date));
}
}
}

54
src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
View File

@@ -1,5 +1,7 @@
package com.commafeed.backend.model;
import java.util.Date;
import javax.persistence.Cacheable;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -7,6 +9,8 @@ import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -30,6 +34,32 @@ public class FeedEntryStatus extends AbstractModel {
private boolean read;
private boolean starred;
/**
* Denormalization starts here
*/
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(nullable = false)
private User user;
@Temporal(TemporalType.TIMESTAMP)
private Date entryInserted;
@Temporal(TemporalType.TIMESTAMP)
private Date entryUpdated;
public FeedEntryStatus() {
}
public FeedEntryStatus(User user, FeedSubscription subscription, FeedEntry entry) {
setUser(user);
setSubscription(subscription);
setEntry(entry);
setEntryInserted(entry.getInserted());
setEntryUpdated(entry.getUpdated());
}
public FeedSubscription getSubscription() {
return subscription;
}
@@ -62,4 +92,28 @@ public class FeedEntryStatus extends AbstractModel {
this.starred = starred;
}
public Date getEntryInserted() {
return entryInserted;
}
public void setEntryInserted(Date entryInserted) {
this.entryInserted = entryInserted;
}
public Date getEntryUpdated() {
return entryUpdated;
}
public void setEntryUpdated(Date entryUpdated) {
this.entryUpdated = entryUpdated;
}
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
}

6
src/main/java/com/commafeed/backend/services/FeedEntryService.java
View File

@@ -43,8 +43,7 @@ public class FeedEntryService {
}
} else {
if (status == null) {
status = new FeedEntryStatus();
status.setEntry(entry);
status = new FeedEntryStatus(user, sub, entry);
status.setSubscription(sub);
}
status.setRead(false);
@@ -78,8 +77,7 @@ public class FeedEntryService {
}
} else {
if (status == null) {
status = new FeedEntryStatus();
status.setEntry(entry);
status = new FeedEntryStatus(user, sub, entry);
status.setSubscription(sub);
status.setRead(true);
}

3
src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
View File

@@ -93,8 +93,7 @@ public class FeedSubscriptionService {
List<FeedEntry> allEntries = feedEntryDAO.findByFeed(feed, 0,
10);
for (FeedEntry entry : allEntries) {
FeedEntryStatus status = new FeedEntryStatus();
status.setEntry(entry);
FeedEntryStatus status = new FeedEntryStatus(user, sub, entry);
status.setRead(false);
status.setSubscription(sub);
statuses.add(status);

7
src/main/java/com/commafeed/backend/services/FeedUpdateService.java
View File

@@ -75,12 +75,11 @@ public class FeedUpdateService {
List<FeedEntryStatus> statusUpdateList = Lists.newArrayList();
List<User> users = Lists.newArrayList();
for (FeedSubscription sub : subscriptions) {
FeedEntryStatus status = new FeedEntryStatus();
status.setEntry(update);
User user = sub.getUser();
FeedEntryStatus status = new FeedEntryStatus(user, sub, update);
status.setSubscription(sub);
statusUpdateList.add(status);
users.add(sub.getUser());
users.add(user);
}
cache.invalidateUserData(users.toArray(new User[0]));
feedEntryDAO.saveOrUpdate(update);

32
src/main/resources/changelogs/db.changelog-1.1.xml
View File

@@ -279,5 +279,37 @@
<column name="user_id"></column>
</createIndex>
</changeSet>
<changeSet author="athou" id="denormalize-statuses">
<addColumn tableName="FEEDENTRYSTATUSES">
<column name="user_id" type="BIGINT">
<constraints nullable="false" />
</column>
<column name="entryInserted" type="DATETIME" />
<column name="entryUpdated" type="DATETIME" />
</addColumn>
</changeSet>
<changeSet author="athou" id="populate-status-dates">
<sql>update FEEDENTRYSTATUSES s SET s.entryUpdated = (select e.updated from FEEDENTRIES e where e.id = s.entry_id)</sql>
</changeSet>
<changeSet author="athou" id="populate-status-users">
<sql>update FEEDENTRYSTATUSES s SET s.user_id = (select sub.user_id from FEEDSUBSCRIPTIONS sub where sub.id = s.subscription_id)</sql>
</changeSet>
<changeSet author="athou" id="recreate-fes-index-2">
<createIndex indexName="sub_user_entry_read_updated_index" tableName="FEEDENTRYSTATUSES">
<column name="subscription_id" />
<column name="user_id" />
<column name="entry_id" />
<column name="read_status" />
<column name="entryUpdated" />
</createIndex>
</changeSet>
<changeSet author="athou" id="drop-fes-index-2">
<dropIndex tableName="FEEDENTRYSTATUSES" indexName="sub_entry_read_index" />
</changeSet>
</databaseChangeLog>