diff --git a/src/java/org/apache/solr/common/params/TermVectorParams.java b/src/java/org/apache/solr/common/params/TermVectorParams.java index a8401c3086d..cf75ac73616 100644 --- a/src/java/org/apache/solr/common/params/TermVectorParams.java +++ b/src/java/org/apache/solr/common/params/TermVectorParams.java @@ -25,12 +25,12 @@ public interface TermVectorParams { /** * Return IDF information. May be expensive * */ - public static final String IDF = TV_PREFIX + "idf"; + public static final String DF = TV_PREFIX + "df"; /** * Return TF-IDF calculation, i.e. (tf / idf). May be expensive. */ - public static final String TF_IDF = TV_PREFIX + "tf-idf"; + public static final String TF_IDF = TV_PREFIX + "tf_idf"; /** diff --git a/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/src/java/org/apache/solr/handler/component/TermVectorComponent.java index ebff20ddd01..c55b0840367 100644 --- a/src/java/org/apache/solr/handler/component/TermVectorComponent.java +++ b/src/java/org/apache/solr/handler/component/TermVectorComponent.java @@ -19,7 +19,6 @@ import org.apache.solr.schema.IndexSchema; import org.apache.solr.search.DocList; import org.apache.solr.search.DocListAndSet; import org.apache.solr.search.SolrIndexSearcher; -import org.apache.solr.util.RefCounted; import org.apache.solr.util.plugin.SolrCoreAware; import java.io.IOException; @@ -31,7 +30,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.logging.Logger; /** @@ -81,7 +79,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar boolean termFreq = params.getBool(TermVectorParams.TF, false); boolean positions = params.getBool(TermVectorParams.POSITIONS, false); boolean offsets = params.getBool(TermVectorParams.OFFSETS, false); - boolean idf = params.getBool(TermVectorParams.IDF, false); + boolean docFreq = params.getBool(TermVectorParams.DF, false); boolean tfIdf = params.getBool(TermVectorParams.TF_IDF, false); //boolean cacheIdf = params.getBool(TermVectorParams.IDF, false); //short cut to all values. @@ -90,7 +88,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar termFreq = true; positions = true; offsets = true; - idf = true; + docFreq = true; tfIdf = true; } @@ -111,7 +109,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar IndexReader reader = searcher.getReader(); //the TVMapper is a TermVectorMapper which can be used to optimize loading of Term Vectors - TVMapper mapper = new TVMapper(fields, reader, termFreq, positions, offsets, idf, tfIdf); + TVMapper mapper = new TVMapper(fields, reader, termFreq, positions, offsets, docFreq, tfIdf); IndexSchema schema = rb.req.getSchema(); String uniqFieldName = schema.getUniqueKeyField().getName(); //Only load the id field @@ -188,21 +186,21 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar private NamedList docNL; private IndexReader reader; private Set fields; - private boolean termFreq, positions, offsets, idf, tfIdf; + private boolean termFreq, positions, offsets, docFreq, tfIdf; //internal vars not passed in by construction private boolean map, useOffsets, usePositions; //private Map idfCache; private NamedList fieldNL; private Term currentTerm; - public TVMapper(String[] fields, IndexReader reader, boolean termFreq, boolean positions, boolean offsets, boolean idf, boolean tfIdf) { + public TVMapper(String[] fields, IndexReader reader, boolean termFreq, boolean positions, boolean offsets, boolean docFreq, boolean tfIdf) { this.reader = reader; this.fields = fields != null ? new HashSet(Arrays.asList(fields)) : Collections.emptySet(); this.termFreq = termFreq; this.positions = positions; this.offsets = offsets; - this.idf = idf; + this.docFreq = docFreq; this.tfIdf = tfIdf; } @@ -212,7 +210,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar NamedList termInfo = new NamedList(); fieldNL.add(term, termInfo); if (termFreq == true) { - termInfo.add("freq", frequency); + termInfo.add("tf", frequency); } if (useOffsets == true) { NamedList theOffsets = new NamedList(); @@ -230,17 +228,17 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar } termInfo.add("positions", positionsNL); } - if (idf == true) { - termInfo.add("idf", getIdf(term)); + if (docFreq == true) { + termInfo.add("df", getDocFreq(term)); } if (tfIdf == true){ - double tfIdfVal = ((double) frequency) / getIdf(term); + double tfIdfVal = ((double) frequency) / getDocFreq(term); termInfo.add("tf-idf", tfIdfVal); } } } - private int getIdf(String term) { + private int getDocFreq(String term) { int result = 1; currentTerm = currentTerm.createTerm(term); try { @@ -256,7 +254,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) { - if (idf == true && reader != null) { + if (docFreq == true && reader != null) { this.currentTerm = new Term(field); } useOffsets = storeOffsets && offsets; diff --git a/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java b/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java index 469b3ec7082..710b29ddfe0 100644 --- a/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java +++ b/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java @@ -92,7 +92,7 @@ public class TermVectorComponentTest extends AbstractSolrTestCase { assertTrue(field.size() + " does not equal: " + 2, field.size() == 2); NamedList titl = (NamedList) field.get("titl"); assertTrue("titl is null and it shouldn't be", titl != null); - assertTrue(titl.get("freq") + " does not equal: " + 2, ((Integer) titl.get("freq")) == 2); + assertTrue(titl.get("tf") + " does not equal: " + 2, ((Integer) titl.get("tf")) == 2); String uniqueKeyFieldName = (String) termVectors.getVal(1); assertTrue("uniqueKeyFieldName is null and it shouldn't be", uniqueKeyFieldName != null); @@ -108,7 +108,7 @@ public class TermVectorComponentTest extends AbstractSolrTestCase { params.add(CommonParams.Q, "id:0"); params.add(CommonParams.QT, "tvrh"); params.add(TermVectorParams.TF, "true"); - params.add(TermVectorParams.IDF, "true"); + params.add(TermVectorParams.DF, "true"); params.add(TermVectorParams.OFFSETS, "true"); params.add(TermVectorParams.POSITIONS, "true"); params.add(TermVectorParams.TF_IDF, "true"); @@ -167,7 +167,7 @@ public class TermVectorComponentTest extends AbstractSolrTestCase { params.add(CommonParams.Q, "id:0"); params.add(CommonParams.QT, "tvrh"); params.add(TermVectorParams.TF, "true"); - params.add(TermVectorParams.IDF, "true"); + params.add(TermVectorParams.DF, "true"); params.add(TermVectorParams.OFFSETS, "true"); params.add(TermVectorParams.POSITIONS, "true"); params.add(TermVectorComponent.COMPONENT_NAME, "true");