svn commit: r779303 - in /lucene/solr/trunk/src/java/org/apache/solr/search: MissingStringLastComparatorSource.java function/StringIndexDocValues.java

[yonik]

Author: yonik
Date: Wed May 27 20:42:42 2009
New Revision: 779303

URL: http://svn.apache.org/viewvc?rev=779303&view=rev
Log:
SOLR-1111: use right FieldCache instances

Modified:
    
lucene/solr/trunk/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java
    
lucene/solr/trunk/src/java/org/apache/solr/search/function/StringIndexDocValues.java

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java?rev=779303&r1=779302&r2=779303&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java
 (original)
+++ 
lucene/solr/trunk/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java
 Wed May 27 20:42:42 2009
@@ -178,7 +178,7 @@
     }
 
     public void setNextReader(IndexReader reader, int docBase,  int 
numSlotsFull) throws IOException {
-      FieldCache.StringIndex currentReaderValues = 
ExtendedFieldCache.EXT_DEFAULT.getStringIndex(reader, field);
+      FieldCache.StringIndex currentReaderValues = 
FieldCache.DEFAULT.getStringIndex(reader, field);
       currentReaderGen++;
       order = currentReaderValues.order;
       lookup = currentReaderValues.lookup;

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/search/function/StringIndexDocValues.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/StringIndexDocValues.java?rev=779303&r1=779302&r2=779303&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/java/org/apache/solr/search/function/StringIndexDocValues.java
 (original)
+++ 
lucene/solr/trunk/src/java/org/apache/solr/search/function/StringIndexDocValues.java
 Wed May 27 20:42:42 2009
@@ -33,7 +33,7 @@
     protected final ValueSource vs;
 
     public StringIndexDocValues(ValueSource vs, IndexReader reader, String 
field) throws IOException {
-      index = ExtendedFieldCache.EXT_DEFAULT.getStringIndex(reader, field);
+      index = FieldCache.DEFAULT.getStringIndex(reader, field);
       order = index.order;
       lookup = index.lookup;
       this.vs = vs;