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

removed unused urlHash field

Browse Source
This commit is contained in:
Athou
2013-07-27 15:45:15 +02:00
parent 3dd4f140e2
commit 60bf96411c
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,15 +72,10 @@ public class FeedDAO extends GenericDAO<Feed> {
} }
public Feed findByUrl(String url) { public Feed findByUrl(String url) {
List<Feed> feeds = findByField(Feed_.urlHash, DigestUtils.sha1Hex(url));
Feed feed = Iterables.getFirst(feeds, null);
if (feed != null && StringUtils.equals(url, feed.getUrl())) {
return feed;
}
String normalized = FeedUtils.normalizeURL(url); String normalized = FeedUtils.normalizeURL(url);
feeds = findByField(Feed_.normalizedUrlHash, DigestUtils.sha1Hex(normalized)); List<Feed> feeds = findByField(Feed_.normalizedUrlHash, DigestUtils.sha1Hex(normalized));
feed = Iterables.getFirst(feeds, null); Feed feed = Iterables.getFirst(feeds, null);
if (feed != null && StringUtils.equals(normalized, feed.getNormalizedUrl())) { if (feed != null && StringUtils.equals(normalized, feed.getNormalizedUrl())) {
return feed; return feed;
} }

11
src/main/java/com/commafeed/backend/model/Feed.java
View File

@@ -29,9 +29,6 @@ public class Feed extends AbstractModel {
@Column(length = 2048, nullable = false) @Column(length = 2048, nullable = false)
private String url; private String url;
@Column(length = 40, nullable = false)
private String urlHash;
@Column(length = 2048, nullable = false) @Column(length = 2048, nullable = false)
private String normalizedUrl; private String normalizedUrl;
@@ -199,14 +196,6 @@ public class Feed extends AbstractModel {
this.disabledUntil = disabledUntil; this.disabledUntil = disabledUntil;
} }
public String getUrlHash() {
return urlHash;
}
public void setUrlHash(String urlHash) {
this.urlHash = urlHash;
}
public String getLastModifiedHeader() { public String getLastModifiedHeader() {
return lastModifiedHeader; return lastModifiedHeader;
} }

1
src/main/java/com/commafeed/backend/services/FeedService.java
View File

@@ -30,7 +30,6 @@ public class FeedService {
String normalized = FeedUtils.normalizeURL(url); String normalized = FeedUtils.normalizeURL(url);
feed = new Feed(); feed = new Feed();
feed.setUrl(url); feed.setUrl(url);
feed.setUrlHash(DigestUtils.sha1Hex(url));
feed.setNormalizedUrl(normalized); feed.setNormalizedUrl(normalized);
feed.setNormalizedUrlHash(DigestUtils.sha1Hex(normalized)); feed.setNormalizedUrlHash(DigestUtils.sha1Hex(normalized));
feed.setDisabledUntil(new Date(0)); feed.setDisabledUntil(new Date(0));

6
src/main/resources/changelogs/db.changelog-1.2.xml
View File

@@ -103,7 +103,13 @@
<changeSet author="athou" id="drop-last-update-success"> <changeSet author="athou" id="drop-last-update-success">
<dropIndex tableName="FEEDS" indexName="disabled_lastupdated_index" /> <dropIndex tableName="FEEDS" indexName="disabled_lastupdated_index" />
<dropIndex tableName="FEEDS" indexName="lastupdated_index" />
<dropColumn tableName="FEEDS" columnName="lastUpdateSuccess" /> <dropColumn tableName="FEEDS" columnName="lastUpdateSuccess" />
</changeSet> </changeSet>
<changeSet author="athou" id="drop-url-hash">
<dropIndex tableName="FEEDS" indexName="urlHash_index" />
<dropColumn tableName="FEEDS" columnName="urlHash" />
</changeSet>
</databaseChangeLog> </databaseChangeLog>