You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/12/25 02:21:52 UTC
svn commit: r1052738 - in /lucene/dev/trunk/solr/src:
common/org/apache/solr/common/util/ java/org/apache/solr/handler/
java/org/apache/solr/request/ java/org/apache/solr/schema/
java/org/apache/solr/search/ test/org/apache/solr/ test/org/apache/solr/c...
Author: yonik
Date: Sat Dec 25 01:21:51 2010
New Revision: 1052738
URL: http://svn.apache.org/viewvc?rev=1052738&view=rev
Log:
SOLR-1930: remove deprecations
Removed:
lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/NamedListCodec.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/DisMaxRequestHandler.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/AppendedSolrParams.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/DefaultSolrParams.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/DisMaxRequestHandler.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/JSONResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/MapSolrParams.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/MultiMapSolrParams.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/PHPResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/PythonResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/QueryResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/RawResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/RequiredSolrParams.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/RubyResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/SolrParams.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/SolrQueryResponse.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/StandardRequestHandler.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/TextResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/XMLResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LegacyDateField.java
lucene/dev/trunk/solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java
Modified:
lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
lucene/dev/trunk/solr/src/java/org/apache/solr/search/ValueSourceParser.java
lucene/dev/trunk/solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInject.java
lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java
lucene/dev/trunk/solr/src/test/org/apache/solr/schema/DateFieldTest.java
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java Sat Dec 25 01:21:51 2010
@@ -22,10 +22,92 @@ import org.apache.solr.request.SolrQuery
/**
* Create a dismax query from the input value.
- * <br>Other parameters: all main query related parameters from the {@link org.apache.solr.handler.DisMaxRequestHandler} are supported.
- * localParams are checked before global request params.
+ * <br>localParams are checked before global request params.
* <br>Example: <code>{!dismax qf='myfield mytitle^2'}foo</code> creates a dismax query across
* across myfield and mytitle, with a higher weight on mytitle.
+ *
+ * <p>
+ * A Generic query plugin designed to be given a simple query expression
+ * from a user, which it will then query against a variety of
+ * pre-configured fields, in a variety of ways, using BooleanQueries,
+ * DisjunctionMaxQueries, and PhraseQueries.
+ * </p>
+ *
+ * <p>
+ * All of the following options may be configured for this plugin
+ * in the solrconfig as defaults, and may be overriden as request parameters
+ * </p>
+ *
+ * <ul>
+ * <li>q.alt - An alternate query to be used in cases where the main
+ * query (q) is not specified (or blank). This query should
+ * be expressed in the Standard SolrQueryParser syntax (you
+ * can use <code>q.alt=*:*</code> to denote that all documents
+ * should be returned when no query is specified)
+ * </li>
+ * <li>tie - (Tie breaker) float value to use as tiebreaker in
+ * DisjunctionMaxQueries (should be something much less than 1)
+ * </li>
+ * <li> qf - (Query Fields) fields and boosts to use when building
+ * DisjunctionMaxQueries from the users query. Format is:
+ * "<code>fieldA^1.0 fieldB^2.2</code>".
+ * This param can be specified multiple times, and the fields
+ * are additive.
+ * </li>
+ * <li> mm - (Minimum Match) this supports a wide variety of
+ * complex expressions.
+ * read {@link org.apache.solr.util.SolrPluginUtils#setMinShouldMatch SolrPluginUtils.setMinShouldMatch} and <a href="http://lucene.apache.org/solr/api/org/apache/solr/util/doc-files/min-should-match.html">mm expression format</a> for details.
+ * </li>
+ * <li> pf - (Phrase Fields) fields/boosts to make phrase queries out
+ * of, to boost the users query for exact matches on the specified fields.
+ * Format is: "<code>fieldA^1.0 fieldB^2.2</code>".
+ * This param can be specified multiple times, and the fields
+ * are additive.
+ * </li>
+ * <li> ps - (Phrase Slop) amount of slop on phrase queries built for pf
+ * fields.
+ * </li>
+ * <li> qs - (Query Slop) amount of slop on phrase queries explicitly
+ * specified in the "q" for qf fields.
+ * </li>
+ * <li> bq - (Boost Query) a raw lucene query that will be included in the
+ * users query to influence the score. If this is a BooleanQuery
+ * with a default boost (1.0f), then the individual clauses will be
+ * added directly to the main query. Otherwise, the query will be
+ * included as is.
+ * This param can be specified multiple times, and the boosts are
+ * are additive. NOTE: the behaviour listed above is only in effect
+ * if a single <code>bq</code> paramter is specified. Hence you can
+ * disable it by specifying an additional, blank, <code>bq</code>
+ * parameter.
+ * </li>
+ * <li> bf - (Boost Functions) functions (with optional boosts) that will be
+ * included in the users query to influence the score.
+ * Format is: "<code>funcA(arg1,arg2)^1.2
+ * funcB(arg3,arg4)^2.2</code>". NOTE: Whitespace is not allowed
+ * in the function arguments.
+ * This param can be specified multiple times, and the functions
+ * are additive.
+ * </li>
+ * <li> fq - (Filter Query) a raw lucene query that can be used
+ * to restrict the super set of products we are interested in - more
+ * efficient then using bq, but doesn't influence score.
+ * This param can be specified multiple times, and the filters
+ * are additive.
+ * </li>
+ * </ul>
+ *
+ * <p>
+ * The following options are only available as request params...
+ * </p>
+ *
+ * <ul>
+ * <li> q - (Query) the raw unparsed, unescaped, query from the user.
+ * </li>
+ * <li>sort - (Order By) list of fields and direction to sort on.
+ * </li>
+ * </ul>
+ *
*/
public class DisMaxQParserPlugin extends QParserPlugin {
public static String NAME = "dismax";
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/ValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/ValueSourceParser.java?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/ValueSourceParser.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/ValueSourceParser.java Sat Dec 25 01:21:51 2010
@@ -614,7 +614,7 @@ class DateValueSourceParser extends Valu
public ValueSource getValueSource(FunctionQParser fp, String arg) {
if (arg == null) return null;
SchemaField f = fp.req.getSchema().getField(arg);
- if (f.getType().getClass() == DateField.class || f.getType().getClass() == LegacyDateField.class) {
+ if (f.getType().getClass() == DateField.class) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Can't use ms() function on non-numeric legacy date field " + arg);
}
return f.getType().getValueSource(f, fp);
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java Sat Dec 25 01:21:51 2010
@@ -198,18 +198,6 @@ public class DisMaxRequestHandlerTest ex
}
@Test
- public void testOldStyleDefaults() throws Exception {
-
- lrf = h.getRequestFactory
- ("dismaxOldStyleDefaults", 0, 20,
- "version","2.0",
- "facet", "true",
- "facet.field","t_s"
- );
- doTestSomeStuff("dismaxOldStyleDefaults");
- }
-
- @Test
public void testSimplestParams() throws Exception {
assertQ("match w/o only q param",
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/SolrTestCaseJ4.java?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/SolrTestCaseJ4.java Sat Dec 25 01:21:51 2010
@@ -20,10 +20,8 @@ package org.apache.solr;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
import org.apache.noggit.CharArr;
import org.apache.noggit.JSONUtil;
-import org.apache.noggit.JSONWriter;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
@@ -33,18 +31,13 @@ import org.apache.solr.common.util.XML;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.JsonUpdateRequestHandler;
-import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.request.BinaryQueryResponseWriter;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
-import org.apache.solr.response.QueryResponseWriter;
-import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.servlet.DirectSolrConnection;
-import org.apache.solr.servlet.SolrRequestParsers;
import org.apache.solr.util.TestHarness;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -55,7 +48,6 @@ import org.xml.sax.SAXException;
import javax.xml.xpath.XPathExpressionException;
import java.io.File;
import java.io.IOException;
-import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.*;
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java Sat Dec 25 01:21:51 2010
@@ -40,7 +40,7 @@ public class TestFastInputStream extends
String ss = "Helloooooooooooooooooooo";
writeChars(gzos, ss, 0, ss.length());
gzos.close();
- NamedListCodec.writeVInt(10, fos);
+ JavaBinCodec.writeVInt(10, fos);
fos.flushBuffer();
GZIPInputStream gzis = new GZIPInputStream(new ByteArrayInputStream(b.toByteArray(), 0, b.size()));
char[] cbuf = new char[ss.length()];
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInject.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInject.java?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInject.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInject.java Sat Dec 25 01:21:51 2010
@@ -32,7 +32,7 @@ public class TestPropInject extends Abst
ExposeWriterHandler uh = new ExposeWriterHandler();
IndexWriter writer = uh.getWriter();
LogByteSizeMergePolicy mp = (LogByteSizeMergePolicy)writer.getConfig().getMergePolicy();
- assertEquals(64.0, mp.getMaxMergeMB());
+ assertEquals(64.0, mp.getMaxMergeMB(), 0);
uh.close();
}
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java Sat Dec 25 01:21:51 2010
@@ -49,7 +49,7 @@ public class TestPropInjectDefaults exte
ExposeWriterHandler uh = new ExposeWriterHandler();
IndexWriter writer = uh.getWriter();
LogByteSizeMergePolicy mp = (LogByteSizeMergePolicy)writer.getConfig().getMergePolicy();
- assertEquals(32.0, mp.getMaxMergeMB());
+ assertEquals(32.0, mp.getMaxMergeMB(), 0);
uh.close();
}
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/schema/DateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/schema/DateFieldTest.java?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/schema/DateFieldTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/schema/DateFieldTest.java Sat Dec 25 01:21:51 2010
@@ -17,6 +17,7 @@
package org.apache.solr.schema;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.schema.DateField;
import org.apache.solr.util.DateMathParser;
import org.apache.lucene.document.Fieldable;
@@ -28,13 +29,24 @@ import java.text.DateFormat;
import junit.framework.TestCase;
-public class DateFieldTest extends LegacyDateFieldTest {
-
+public class DateFieldTest extends LuceneTestCase {
+ public static TimeZone UTC = TimeZone.getTimeZone("UTC");
+ protected DateField f = null;
+ protected DateMathParser p = new DateMathParser(UTC, Locale.US);
+
public void setUp() throws Exception {
super.setUp();
f = new DateField();
}
+
+ public void assertToI(String expected, String input) {
+ assertEquals("Input: " + input, expected, f.toInternal(input));
+ }
+ public void assertToI(String expected, long input) {
+ assertEquals("Input: " + input, expected, f.toInternal(new Date(input)));
+ }
+
public void testToInternal() throws Exception {
assertToI("1995-12-31T23:59:59.999", "1995-12-31T23:59:59.999666Z");
assertToI("1995-12-31T23:59:59.999", "1995-12-31T23:59:59.999Z");
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml?rev=1052738&r1=1052737&r2=1052738&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml Sat Dec 25 01:21:51 2010
@@ -251,30 +251,10 @@
<requestHandler name="standard" class="solr.StandardRequestHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="dismaxOldStyleDefaults"
- class="solr.DisMaxRequestHandler" >
- <!-- for historic reasons, DisMaxRequestHandler will use all of
- it's init params as "defaults" if there is no "defaults" list
- specified
- -->
- <str name="q.alt">*:*</str>
- <float name="tie">0.01</float>
- <str name="qf">
- text^0.5 features_t^1.0 subject^1.4 title_stemmed^2.0
- </str>
- <str name="pf">
- text^0.2 features_t^1.1 subject^1.4 title_stemmed^2.0 title^1.5
- </str>
- <str name="bf">
- ord(weight)^0.5 recip(rord(iind),1,1000,1000)^0.3
- </str>
- <str name="mm">
- 3<-1 5<-2 6<90%
- </str>
- <int name="ps">100</int>
- </requestHandler>
- <requestHandler name="dismax" class="solr.DisMaxRequestHandler" >
+
+ <requestHandler name="dismax" class="solr.SearchHandler" >
<lst name="defaults">
+ <str name="defType">dismax</str>
<str name="q.alt">*:*</str>
<float name="tie">0.01</float>
<str name="qf">
@@ -292,8 +272,13 @@
<int name="ps">100</int>
</lst>
</requestHandler>
- <requestHandler name="dismaxNoDefaults" class="solr.DisMaxRequestHandler" >
- </requestHandler>
+
+ <requestHandler name="dismaxNoDefaults" class="solr.SearchHandler" >
+ <lst name="defaults">
+ <str name="defType">dismax</str>
+ </lst>
+ </requestHandler>
+
<requestHandler name="old" class="solr.tst.OldRequestHandler" >
<int name="myparam">1000</int>
<float name="ratio">1.4142135</float>