Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tf + termfreq functions when no terms in field 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1138732 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2011-06-23 04:00:40 +00:00
parent 635934f150
commit 0333b8caf0
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/src/java/org/apache/solr/search/function/TFValueSource.java
View File

@ -53,7 +53,7 @@ public class TFValueSource extends TermFreqValueSource {
public void reset() throws IOException {
// no one should call us for deleted docs?
docs = terms.docs(null, indexedBytes, null);
docs = terms==null ? null : terms.docs(null, indexedBytes, null);
if (docs == null) {
docs = new DocsEnum() {
@Override

2
solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java
View File

@ -50,7 +50,7 @@ public class TermFreqValueSource extends DocFreqValueSource {
public void reset() throws IOException {
// no one should call us for deleted docs?
docs = terms.docs(null, indexedBytes, null);
docs = terms == null ? null : terms.docs(null, indexedBytes, null);
if (docs == null) {
docs = new DocsEnum() {
@Override

10
solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java
View File

@ -289,7 +289,17 @@ public class TestFunctionQuery extends SolrTestCaseJ4 {
assertQ(req("fl","*,score","q", "{!func}docfreq('a_t','cow')", "fq","id:6"), "//float[@name='score']='3.0'");
assertQ(req("fl","*,score","q", "{!func}docfreq($field,$value)", "fq","id:6", "field","a_t", "value","cow"), "//float[@name='score']='3.0'");
assertQ(req("fl","*,score","q", "{!func}termfreq(a_t,cow)", "fq","id:6"), "//float[@name='score']='5.0'");
Similarity similarity = new DefaultSimilarity();
// make sure it doesn't get a NPE if no terms are present in a field.
assertQ(req("fl","*,score","q", "{!func}termfreq(nofield_t,cow)", "fq","id:6"), "//float[@name='score']='0.0'");
assertQ(req("fl","*,score","q", "{!func}docfreq(nofield_t,cow)", "fq","id:6"), "//float[@name='score']='0.0'");
assertQ(req("fl","*,score","q", "{!func}idf(nofield_t,cow)", "fq","id:6"),
"//float[@name='score']='" + similarity.idf(0,6) + "'");
assertQ(req("fl","*,score","q", "{!func}tf(nofield_t,cow)", "fq","id:6"),
"//float[@name='score']='" + similarity.tf(0) + "'");
assertQ(req("fl","*,score","q", "{!func}idf(a_t,cow)", "fq","id:6"),
"//float[@name='score']='" + similarity.idf(3,6) + "'");
assertQ(req("fl","*,score","q", "{!func}tf(a_t,cow)", "fq","id:6"),