You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2010/03/31 13:01:38 UTC

svn commit: r929472 - in /lucene/mahout/trunk/core/src: main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java main/java/org/apache/mahout/cf/taste/impl/common/Retriever.java test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java

Author: srowen
Date: Wed Mar 31 11:01:38 2010
New Revision: 929472

URL: http://svn.apache.org/viewvc?rev=929472&view=rev
Log:
Make sure retrievers don't return null -- throw more descriptive exception

Modified:
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Retriever.java
    lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java?rev=929472&r1=929471&r2=929472&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java Wed Mar 31 11:01:38 2010
@@ -171,11 +171,11 @@ public final class RecommenderMapper ext
         throw new TasteException(ioe);
       }
       if (writable == null) {
-        return null;
+        throw new TasteException("Could not load column vector from map files");
       }
       Vector value = writable.get();
       if (value == null) {
-        return null;
+        throw new TasteException("Vector in map file was empty?");
       }
       columnVector = new VectorWritable();
       columnVector.set(new RandomAccessSparseVector(Integer.MAX_VALUE, 1000));

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Retriever.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Retriever.java?rev=929472&r1=929471&r2=929472&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Retriever.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Retriever.java Wed Mar 31 11:01:38 2010
@@ -29,7 +29,7 @@ public interface Retriever<K,V> {
   /**
    * @param key
    *          key for which a value should be retrieved
-   * @return value for key
+   * @return value for key. Implementations should not return null.
    * @throws TasteException
    *           if an error occurs while retrieving the value
    */

Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java?rev=929472&r1=929471&r2=929472&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java Wed Mar 31 11:01:38 2010
@@ -51,7 +51,10 @@ public final class CacheTest extends Tas
   
   private static class IdentityRetriever implements Retriever<Object,Object> {
     @Override
-    public Object get(Object key) {
+    public Object get(Object key) throws TasteException {
+      if (key == null) {
+        throw new TasteException("key is null");
+      }
       return key;
     }
   }