lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r1547571 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/queries/ lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java solr/ solr/CHANGES.txt
Date Tue, 03 Dec 2013 20:27:01 GMT
Author: yonik
Date: Tue Dec  3 20:27:01 2013
New Revision: 1547571

URL: http://svn.apache.org/r1547571
Log:
SOLR-552: change scale function to use itself as context key instead of source

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/queries/   (props changed)
    lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java?rev=1547571&r1=1547570&r2=1547571&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
(original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
Tue Dec  3 20:27:01 2013
@@ -94,14 +94,14 @@ public class ScaleFloatFunction extends 
     ScaleInfo scaleInfo = new ScaleInfo();
     scaleInfo.minVal = minVal;
     scaleInfo.maxVal = maxVal;
-    context.put(this.source, scaleInfo);
+    context.put(ScaleFloatFunction.this, scaleInfo);
     return scaleInfo;
   }
 
   @Override
   public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws
IOException {
 
-    ScaleInfo scaleInfo = (ScaleInfo)context.get(source);
+    ScaleInfo scaleInfo = (ScaleInfo)context.get(ScaleFloatFunction.this);
     if (scaleInfo == null) {
       scaleInfo = createScaleInfo(context, readerContext);
     }

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1547571&r1=1547570&r2=1547571&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Dec  3 20:27:01 2013
@@ -155,6 +155,9 @@ Bug Fixes
 
 * SOLR-5502: A "/" in a document id will cause an exception to be thrown
   when using the composite id router. (Anshum Gupta via Mark Miller)
+
+* SOLR-552: Exception when using Query Function inside Scale Function.
+  (Trey Grainger, yonik)
   
 Optimizations
 ----------------------



Mime
View raw message