Author: srowen
Date: Sat Sep 17 07:03:57 2011
New Revision: 1171922
URL: http://svn.apache.org/viewvc?rev=1171922&view=rev
Log:
Bug in getDiffs SQL
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/AbstractJDBCDiffStorage.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/MySQLJDBCDiffStorage.java
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/AbstractJDBCDiffStorage.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/AbstractJDBCDiffStorage.java?rev=1171922&r1=1171921&r2=1171922&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/AbstractJDBCDiffStorage.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/AbstractJDBCDiffStorage.java
Sat Sep 17 07:03:57 2011
@@ -195,6 +195,8 @@ public abstract class AbstractJDBCDiffSt
stmt.setFetchSize(getFetchSize());
stmt.setLong(1, itemID);
stmt.setLong(2, userID);
+ stmt.setLong(3, itemID);
+ stmt.setLong(4, userID);
log.debug("Executing SQL query: {}", getDiffsSQL);
rs = stmt.executeQuery();
// We should have up to one result for each Preference in prefs
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/MySQLJDBCDiffStorage.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/MySQLJDBCDiffStorage.java?rev=1171922&r1=1171921&r2=1171922&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/MySQLJDBCDiffStorage.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/MySQLJDBCDiffStorage.java
Sat Sep 17 07:03:57 2011
@@ -115,16 +115,16 @@ public final class MySQLJDBCDiffStorage
"SELECT " + countColumn + ", " + avgColumn + ", " + stdevColumn + "
FROM "
+ diffsTable + " WHERE " + itemIDAColumn + "=? AND " +
itemIDBColumn + "=?",
// getDiffsSQL
- "SELECT " + countColumn + ", " + avgColumn + ", " + stdevColumn + ", "
+ itemIDAColumn
+ "(SELECT " + countColumn + ", " + avgColumn + ", " + stdevColumn + ",
" + itemIDAColumn
+ " FROM " + diffsTable + ", "
+ dataModel.getPreferenceTable() + " WHERE " + itemIDBColumn + "=?
AND " + itemIDAColumn + " = "
+ dataModel.getItemIDColumn() + " AND " +
dataModel.getUserIDColumn() + "=? ORDER BY "
- + itemIDAColumn + " UNION "
+ + itemIDAColumn + ") UNION ("
+ "SELECT " + countColumn + ", -" + avgColumn + ", " + stdevColumn
+ ", " + itemIDBColumn
+ " FROM " + diffsTable + ", "
+ dataModel.getPreferenceTable() + " WHERE " + itemIDAColumn + "=?
AND " + itemIDBColumn + " = "
+ dataModel.getItemIDColumn() + " AND " +
dataModel.getUserIDColumn() + "=? ORDER BY "
- + itemIDBColumn,
+ + itemIDBColumn + ')',
// getAverageItemPrefSQL
"SELECT COUNT(1), AVG(" + dataModel.getPreferenceColumn() + ") FROM "
+ dataModel.getPreferenceTable() + " WHERE " +
dataModel.getItemIDColumn() + "=?",
