[infinispan-commits] Infinispan SVN: r1299 - trunk/query/src/main/java/org/infinispan/query/impl.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-12-15 07:25:18 -0500 (Tue, 15 Dec 2009)
New Revision: 1299

Modified:
   trunk/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
   trunk/query/src/main/java/org/infinispan/query/impl/LazyIterator.java
Log:
[ISPN-315] (Query iterators return nulls)

Modified: trunk/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
===================================================================
--- trunk/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java	2009-12-14 13:20:42 UTC (rev 1298)
+++ trunk/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java	2009-12-15 12:25:18 UTC (rev 1299)
@@ -227,8 +227,8 @@
             // The extractor.extract.id gives me the documentId that we need.
 
 
-            Object key = extractor.extract(index).id;
-            keyList.add(key);
+            String keyString = (String) extractor.extract(index).id;
+            keyList.add(KeyTransformationHandler.stringToKey(keyString));
          }
 
       }

Modified: trunk/query/src/main/java/org/infinispan/query/impl/LazyIterator.java
===================================================================
--- trunk/query/src/main/java/org/infinispan/query/impl/LazyIterator.java	2009-12-14 13:20:42 UTC (rev 1298)
+++ trunk/query/src/main/java/org/infinispan/query/impl/LazyIterator.java	2009-12-15 12:25:18 UTC (rev 1299)
@@ -29,6 +29,7 @@
 import org.infinispan.Cache;
 import org.infinispan.CacheException;
 import org.infinispan.query.backend.IndexSearcherCloser;
+import org.infinispan.query.backend.KeyTransformationHandler;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -100,7 +101,7 @@
 
          try {
             String documentId = (String) extractor.extract(index).id;
-            toReturn = cache.get(documentId);
+            toReturn = cache.get(KeyTransformationHandler.stringToKey(documentId));
 
             //Wiping bufferObjects and the bufferIndex so that there is no stale data.
             Arrays.fill(buffer, null);
@@ -112,7 +113,7 @@
 
             for (int i = 1; i < bufferSize; i++) {
                String bufferDocumentId = (String) extractor.extract(index + i).id;
-               Object toBuffer = cache.get(bufferDocumentId);
+               Object toBuffer = cache.get(KeyTransformationHandler.stringToKey(bufferDocumentId));
                buffer[i] = toBuffer;
             }
             bufferIndex = index;
@@ -148,14 +149,14 @@
          Arrays.fill(buffer, null);
 
          String documentId = (String) extractor.extract(index).id;
-         toReturn = cache.get(documentId);
+         toReturn = cache.get(KeyTransformationHandler.stringToKey(documentId));
 
          buffer[0] = toReturn;
 
          //now loop through bufferSize times to add the rest of the objects into the list.
          for (int i = 1; i < bufferSize; i++) {
             String bufferDocumentId = (String) extractor.extract(index - i).id;    //In this case it has to be index - i because previous() is called.
-            Object toBuffer = cache.get(bufferDocumentId);
+            Object toBuffer = cache.get(KeyTransformationHandler.stringToKey(bufferDocumentId));
             buffer[i] = toBuffer;
          }