You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/12/07 11:52:05 UTC
svn commit: r1643659 [6/7] - in /lucene/dev/branches/lucene6005/lucene: ./
analysis/common/src/test/org/apache/lucene/analysis/core/
analysis/icu/src/test/org/apache/lucene/collation/
backward-codecs/src/test/org/apache/lucene/index/ benchmark/src/java...
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java Sun Dec 7 10:52:03 2014
@@ -1,6 +1,7 @@
package org.apache.lucene.queryparser.xml;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.queryparser.xml.builders.*;
@@ -34,8 +35,8 @@ public class CorePlusExtensionsParser ex
*
* @param parser A QueryParser which will be synchronized on during parse calls.
*/
- public CorePlusExtensionsParser(Analyzer analyzer, QueryParser parser) {
- this(null, analyzer, parser);
+ public CorePlusExtensionsParser(FieldTypes fieldTypes, Analyzer analyzer, QueryParser parser) {
+ this(fieldTypes, null, analyzer, parser);
}
/**
@@ -43,12 +44,12 @@ public class CorePlusExtensionsParser ex
*
* @param defaultField The default field name used by QueryParsers constructed for UserQuery tags
*/
- public CorePlusExtensionsParser(String defaultField, Analyzer analyzer) {
- this(defaultField, analyzer, null);
+ public CorePlusExtensionsParser(FieldTypes fieldTypes, String defaultField, Analyzer analyzer) {
+ this(fieldTypes, defaultField, analyzer, null);
}
- private CorePlusExtensionsParser(String defaultField, Analyzer analyzer, QueryParser parser) {
- super(defaultField, analyzer, parser);
+ private CorePlusExtensionsParser(FieldTypes fieldTypes, String defaultField, Analyzer analyzer, QueryParser parser) {
+ super(fieldTypes, defaultField, analyzer, parser);
filterFactory.addBuilder("TermsFilter", new TermsFilterBuilder(analyzer));
filterFactory.addBuilder("BooleanFilter", new BooleanFilterBuilder(filterFactory));
filterFactory.addBuilder("DuplicateFilter", new DuplicateFilterBuilder());
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java Sun Dec 7 10:52:03 2014
@@ -3,6 +3,7 @@
*/
package org.apache.lucene.queryparser.xml;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.Filter;
import org.w3c.dom.Element;
/*
@@ -27,5 +28,5 @@ import org.w3c.dom.Element;
*/
public interface FilterBuilder {
- public Filter getFilter(Element e) throws ParserException;
+ public Filter getFilter(FieldTypes fieldTypes, Element e) throws ParserException;
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilderFactory.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilderFactory.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilderFactory.java Sun Dec 7 10:52:03 2014
@@ -3,10 +3,11 @@
*/
package org.apache.lucene.queryparser.xml;
+import java.util.HashMap;
+
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.Filter;
import org.w3c.dom.Element;
-
-import java.util.HashMap;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,12 +33,12 @@ public class FilterBuilderFactory implem
HashMap<String, FilterBuilder> builders = new HashMap<>();
@Override
- public Filter getFilter(Element n) throws ParserException {
+ public Filter getFilter(FieldTypes fieldTypes, Element n) throws ParserException {
FilterBuilder builder = builders.get(n.getNodeName());
if (builder == null) {
throw new ParserException("No FilterBuilder defined for node " + n.getNodeName());
}
- return builder.getFilter(n);
+ return builder.getFilter(fieldTypes, n);
}
public void addBuilder(String nodeName, FilterBuilder builder) {
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,7 +1,9 @@
package org.apache.lucene.queryparser.xml;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.Query;
import org.w3c.dom.Element;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,11 +20,12 @@ import org.w3c.dom.Element;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* Implemented by objects that produce Lucene Query objects from XML streams. Implementations are
* expected to be thread-safe so that they can be used to simultaneously parse multiple XML documents.
*/
public interface QueryBuilder {
- public Query getQuery(Element e) throws ParserException;
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException;
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java Sun Dec 7 10:52:03 2014
@@ -3,10 +3,11 @@
*/
package org.apache.lucene.queryparser.xml;
+import java.util.HashMap;
+
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.Query;
import org.w3c.dom.Element;
-
-import java.util.HashMap;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,12 +33,12 @@ public class QueryBuilderFactory impleme
HashMap<String, QueryBuilder> builders = new HashMap<>();
@Override
- public Query getQuery(Element n) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element n) throws ParserException {
QueryBuilder builder = builders.get(n.getNodeName());
if (builder == null) {
throw new ParserException("No QueryObjectBuilder defined for node " + n.getNodeName());
}
- return builder.getQuery(n);
+ return builder.getQuery(fieldTypes, n);
}
public void addBuilder(String nodeName, QueryBuilder builder) {
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanFilterBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanFilterBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanFilterBuilder.java Sun Dec 7 10:52:03 2014
@@ -3,13 +3,14 @@
*/
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queries.BooleanFilter;
-import org.apache.lucene.search.Filter;
import org.apache.lucene.queries.FilterClause;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.Filter;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -43,7 +44,7 @@ public class BooleanFilterBuilder implem
}
@Override
- public Filter getFilter(Element e) throws ParserException {
+ public Filter getFilter(FieldTypes fieldTypes, Element e) throws ParserException {
BooleanFilter bf = new BooleanFilter();
NodeList nl = e.getChildNodes();
@@ -54,7 +55,7 @@ public class BooleanFilterBuilder implem
BooleanClause.Occur occurs = BooleanQueryBuilder.getOccursValue(clauseElem);
Element clauseFilter = DOMUtils.getFirstChildOrFail(clauseElem);
- Filter f = factory.getFilter(clauseFilter);
+ Filter f = factory.getFilter(fieldTypes, clauseFilter);
bf.add(new FilterClause(f, occurs));
}
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -3,12 +3,13 @@
*/
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Query;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Query;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -45,7 +46,7 @@ public class BooleanQueryBuilder impleme
*/
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
BooleanQuery bq = new BooleanQuery(DOMUtils.getAttribute(e, "disableCoord", false));
bq.setMinimumNumberShouldMatch(DOMUtils.getAttribute(e, "minimumNumberShouldMatch", 0));
bq.setBoost(DOMUtils.getAttribute(e, "boost", 1.0f));
@@ -58,7 +59,7 @@ public class BooleanQueryBuilder impleme
BooleanClause.Occur occurs = getOccursValue(clauseElem);
Element clauseQuery = DOMUtils.getFirstChildOrFail(clauseElem);
- Query q = factory.getQuery(clauseQuery);
+ Query q = factory.getQuery(fieldTypes, clauseQuery);
bq.add(new BooleanClause(q, occurs));
}
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,10 +1,11 @@
package org.apache.lucene.queryparser.xml.builders;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queries.BoostingQuery;
-import org.apache.lucene.search.Query;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.Query;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,15 +38,15 @@ public class BoostingQueryBuilder implem
}
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
Element mainQueryElem = DOMUtils.getChildByTagOrFail(e, "Query");
mainQueryElem = DOMUtils.getFirstChildOrFail(mainQueryElem);
- Query mainQuery = factory.getQuery(mainQueryElem);
+ Query mainQuery = factory.getQuery(fieldTypes, mainQueryElem);
Element boostQueryElem = DOMUtils.getChildByTagOrFail(e, "BoostQuery");
float boost = DOMUtils.getAttribute(boostQueryElem, "boost", DEFAULT_BOOST);
boostQueryElem = DOMUtils.getFirstChildOrFail(boostQueryElem);
- Query boostQuery = factory.getQuery(boostQueryElem);
+ Query boostQuery = factory.getQuery(fieldTypes, boostQueryElem);
BoostingQuery bq = new BoostingQuery(mainQuery, boostQuery, boost);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,11 +1,12 @@
package org.apache.lucene.queryparser.xml.builders;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.xml.DOMUtils;
+import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.search.payloads.AveragePayloadFunction;
import org.apache.lucene.search.payloads.PayloadTermQuery;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.queryparser.xml.DOMUtils;
-import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/*
@@ -31,7 +32,7 @@ import org.w3c.dom.Element;
public class BoostingTermBuilder extends SpanBuilderBase {
@Override
- public SpanQuery getSpanQuery(Element e) throws ParserException {
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String fieldName = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
String value = DOMUtils.getNonBlankTextOrFail(e);
@@ -40,4 +41,4 @@ public class BoostingTermBuilder extends
return btq;
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java Sun Dec 7 10:52:03 2014
@@ -3,14 +3,15 @@
*/
package org.apache.lucene.queryparser.xml.builders;
+import java.util.Map;
+
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.*;
import org.apache.lucene.search.CachingWrapperFilter;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
import org.w3c.dom.Element;
-
-import java.util.Map;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -61,7 +62,7 @@ public class CachedFilterBuilder impleme
}
@Override
- public synchronized Filter getFilter(Element e) throws ParserException {
+ public synchronized Filter getFilter(FieldTypes fieldTypes, Element e) throws ParserException {
Element childElement = DOMUtils.getFirstChildOrFail(e);
if (filterCache == null) {
@@ -75,10 +76,10 @@ public class CachedFilterBuilder impleme
Query q = null;
Filter f = null;
if (qb != null) {
- q = qb.getQuery(childElement);
+ q = qb.getQuery(fieldTypes, childElement);
cacheKey = q;
} else {
- f = filterFactory.getFilter(childElement);
+ f = filterFactory.getFilter(fieldTypes, childElement);
cacheKey = f;
}
Filter cachedFilter = filterCache.get(cacheKey);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,11 +1,12 @@
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.ConstantScoreQuery;
-import org.apache.lucene.search.Query;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilderFactory;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.ConstantScoreQuery;
+import org.apache.lucene.search.Query;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,10 +37,10 @@ public class ConstantScoreQueryBuilder i
}
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
Element filterElem = DOMUtils.getFirstChildOrFail(e);
- Query q = new ConstantScoreQuery(filterFactory.getFilter(filterElem));
+ Query q = new ConstantScoreQuery(filterFactory.getFilter(fieldTypes, filterElem));
q.setBoost(DOMUtils.getAttribute(e, "boost", 1.0f));
return q;
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -16,6 +16,7 @@ package org.apache.lucene.queryparser.xm
* limitations under the License.
*/
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
@@ -41,7 +42,7 @@ public class DisjunctionMaxQueryBuilder
*/
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
float tieBreaker = DOMUtils.getAttribute(e, "tieBreaker", 0.0f);
DisjunctionMaxQuery dq = new DisjunctionMaxQuery(tieBreaker);
dq.setBoost(DOMUtils.getAttribute(e, "boost", 1.0f));
@@ -51,7 +52,7 @@ public class DisjunctionMaxQueryBuilder
Node node = nl.item(i);
if (node instanceof Element) { // all elements are disjuncts.
Element queryElem = (Element) node;
- Query q = factory.getQuery(queryElem);
+ Query q = factory.getQuery(fieldTypes, queryElem);
dq.add(q);
}
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DuplicateFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DuplicateFilterBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DuplicateFilterBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DuplicateFilterBuilder.java Sun Dec 7 10:52:03 2014
@@ -3,6 +3,7 @@
*/
package org.apache.lucene.queryparser.xml.builders;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
@@ -33,7 +34,7 @@ import org.w3c.dom.Element;
public class DuplicateFilterBuilder implements FilterBuilder {
@Override
- public Filter getFilter(Element e) throws ParserException {
+ public Filter getFilter(FieldTypes fieldTypes, Element e) throws ParserException {
String fieldName = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
DuplicateFilter df = new DuplicateFilter(fieldName);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FilteredQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FilteredQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FilteredQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FilteredQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -3,13 +3,14 @@
*/
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.FilteredQuery;
-import org.apache.lucene.search.Query;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
+import org.apache.lucene.search.Query;
import org.w3c.dom.Element;
/*
@@ -47,14 +48,14 @@ public class FilteredQueryBuilder implem
* @see org.apache.lucene.xmlparser.QueryObjectBuilder#process(org.w3c.dom.Element)
*/
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
Element filterElement = DOMUtils.getChildByTagOrFail(e, "Filter");
filterElement = DOMUtils.getFirstChildOrFail(filterElement);
- Filter f = filterFactory.getFilter(filterElement);
+ Filter f = filterFactory.getFilter(fieldTypes, filterElement);
Element queryElement = DOMUtils.getChildByTagOrFail(e, "Query");
queryElement = DOMUtils.getFirstChildOrFail(queryElement);
- Query q = queryFactory.getQuery(queryElement);
+ Query q = queryFactory.getQuery(fieldTypes, queryElement);
FilteredQuery fq = new FilteredQuery(q, f);
fq.setBoost(DOMUtils.getAttribute(e, "boost", 1.0f));
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,6 +1,7 @@
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
@@ -44,7 +45,7 @@ public class FuzzyLikeThisQueryBuilder i
}
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
NodeList nl = e.getElementsByTagName("Field");
int maxNumTerms = DOMUtils.getAttribute(e, "maxNumTerms", DEFAULT_MAX_NUM_TERMS);
FuzzyLikeThisQuery fbq = new FuzzyLikeThisQuery(maxNumTerms, analyzer);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -10,11 +10,12 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queries.mlt.MoreLikeThisQuery;
-import org.apache.lucene.queryparser.xml.QueryBuilder;
-import org.apache.lucene.search.Query;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.Query;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -54,7 +55,7 @@ public class LikeThisQueryBuilder implem
* @see org.apache.lucene.xmlparser.QueryObjectBuilder#process(org.w3c.dom.Element)
*/
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String fieldsList = e.getAttribute("fieldNames"); //a comma-delimited list of fields
String fields[] = defaultFieldNames;
if ((fieldsList != null) && (fieldsList.trim().length() > 0)) {
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,9 +1,10 @@
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Query;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,7 +29,7 @@ import org.w3c.dom.Element;
public class MatchAllDocsQueryBuilder implements QueryBuilder {
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
return new MatchAllDocsQuery();
}
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java Sun Dec 7 10:52:03 2014
@@ -17,19 +17,19 @@ package org.apache.lucene.queryparser.xm
* limitations under the License.
*/
+import java.io.IOException;
+
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.queryparser.xml.DOMUtils;
+import org.apache.lucene.queryparser.xml.FilterBuilder;
+import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.NumericRangeFilter;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.NumericUtils;
-import org.apache.lucene.queryparser.xml.DOMUtils;
-import org.apache.lucene.queryparser.xml.FilterBuilder;
-import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
-import java.io.IOException;
-
/**
* Creates a {@link NumericRangeFilter}. The table below specifies the required
* attributes and the defaults if optional attributes are omitted. For more
@@ -113,37 +113,26 @@ public class NumericRangeFilterBuilder i
}
@Override
- public Filter getFilter(Element e) throws ParserException {
+ public Filter getFilter(FieldTypes fieldTypes, Element e) throws ParserException {
String field = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
String lowerTerm = DOMUtils.getAttributeOrFail(e, "lowerTerm");
String upperTerm = DOMUtils.getAttributeOrFail(e, "upperTerm");
boolean lowerInclusive = DOMUtils.getAttribute(e, "includeLower", true);
boolean upperInclusive = DOMUtils.getAttribute(e, "includeUpper", true);
- int precisionStep = DOMUtils.getAttribute(e, "precisionStep", NumericUtils.PRECISION_STEP_DEFAULT);
String type = DOMUtils.getAttribute(e, "type", "int");
try {
- Filter filter;
if (type.equalsIgnoreCase("int")) {
- filter = NumericRangeFilter.newIntRange(field, precisionStep, Integer
- .valueOf(lowerTerm), Integer.valueOf(upperTerm), lowerInclusive,
- upperInclusive);
+ return fieldTypes.newIntRangeFilter(field, Integer.valueOf(lowerTerm), lowerInclusive, Integer.valueOf(upperTerm), upperInclusive);
} else if (type.equalsIgnoreCase("long")) {
- filter = NumericRangeFilter.newLongRange(field, precisionStep, Long
- .valueOf(lowerTerm), Long.valueOf(upperTerm), lowerInclusive,
- upperInclusive);
+ return fieldTypes.newLongRangeFilter(field, Long.valueOf(lowerTerm), lowerInclusive, Long.valueOf(upperTerm), upperInclusive);
} else if (type.equalsIgnoreCase("double")) {
- filter = NumericRangeFilter.newDoubleRange(field, precisionStep, Double
- .valueOf(lowerTerm), Double.valueOf(upperTerm), lowerInclusive,
- upperInclusive);
+ return fieldTypes.newDoubleRangeFilter(field, Double.valueOf(lowerTerm), lowerInclusive, Double.valueOf(upperTerm), upperInclusive);
} else if (type.equalsIgnoreCase("float")) {
- filter = NumericRangeFilter.newFloatRange(field, precisionStep, Float
- .valueOf(lowerTerm), Float.valueOf(upperTerm), lowerInclusive,
- upperInclusive);
+ return fieldTypes.newFloatRangeFilter(field, Float.valueOf(lowerTerm), lowerInclusive, Float.valueOf(upperTerm), upperInclusive);
} else {
throw new ParserException("type attribute must be one of: [long, int, double, float]");
}
- return filter;
} catch (NumberFormatException nfe) {
if (strictMode) {
throw new ParserException("Could not parse lowerTerm or upperTerm into a number", nfe);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -17,12 +17,14 @@ package org.apache.lucene.queryparser.xm
* limitations under the License.
*/
-import org.apache.lucene.search.NumericRangeQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.ConstantScoreQuery;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.util.NumericUtils;
import org.w3c.dom.Element;
/**
@@ -88,37 +90,29 @@ import org.w3c.dom.Element;
public class NumericRangeQueryBuilder implements QueryBuilder {
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String field = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
String lowerTerm = DOMUtils.getAttributeOrFail(e, "lowerTerm");
String upperTerm = DOMUtils.getAttributeOrFail(e, "upperTerm");
boolean lowerInclusive = DOMUtils.getAttribute(e, "includeLower", true);
boolean upperInclusive = DOMUtils.getAttribute(e, "includeUpper", true);
- int precisionStep = DOMUtils.getAttribute(e, "precisionStep", NumericUtils.PRECISION_STEP_DEFAULT);
String type = DOMUtils.getAttribute(e, "type", "int");
+
try {
- Query filter;
+ Filter filter;
if (type.equalsIgnoreCase("int")) {
- filter = NumericRangeQuery.newIntRange(field, precisionStep, Integer
- .valueOf(lowerTerm), Integer.valueOf(upperTerm), lowerInclusive,
- upperInclusive);
+ filter = fieldTypes.newIntRangeFilter(field, Integer.valueOf(lowerTerm), lowerInclusive, Integer.valueOf(upperTerm), upperInclusive);
} else if (type.equalsIgnoreCase("long")) {
- filter = NumericRangeQuery.newLongRange(field, precisionStep, Long
- .valueOf(lowerTerm), Long.valueOf(upperTerm), lowerInclusive,
- upperInclusive);
+ filter = fieldTypes.newLongRangeFilter(field, Long.valueOf(lowerTerm), lowerInclusive, Long.valueOf(upperTerm), upperInclusive);
} else if (type.equalsIgnoreCase("double")) {
- filter = NumericRangeQuery.newDoubleRange(field, precisionStep, Double
- .valueOf(lowerTerm), Double.valueOf(upperTerm), lowerInclusive,
- upperInclusive);
+ filter = fieldTypes.newDoubleRangeFilter(field, Double.valueOf(lowerTerm), lowerInclusive, Double.valueOf(upperTerm), upperInclusive);
} else if (type.equalsIgnoreCase("float")) {
- filter = NumericRangeQuery.newFloatRange(field, precisionStep, Float
- .valueOf(lowerTerm), Float.valueOf(upperTerm), lowerInclusive,
- upperInclusive);
+ filter = fieldTypes.newFloatRangeFilter(field, Float.valueOf(lowerTerm), lowerInclusive, Float.valueOf(upperTerm), upperInclusive);
} else {
throw new ParserException("type attribute must be one of: [long, int, double, float]");
}
- return filter;
+ return new ConstantScoreQuery(filter);
} catch (NumberFormatException nfe) {
throw new ParserException("Could not parse lowerTerm or upperTerm into a number", nfe);
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeFilterBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeFilterBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeFilterBuilder.java Sun Dec 7 10:52:03 2014
@@ -3,11 +3,12 @@
*/
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.TermRangeFilter;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.TermRangeFilter;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,7 +34,7 @@ import org.w3c.dom.Element;
public class RangeFilterBuilder implements FilterBuilder {
@Override
- public Filter getFilter(Element e) throws ParserException {
+ public Filter getFilter(FieldTypes fieldTypes, Element e) throws ParserException {
String fieldName = DOMUtils.getAttributeWithInheritance(e, "fieldName");
String lowerTerm = e.getAttribute("lowerTerm");
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java Sun Dec 7 10:52:03 2014
@@ -1,8 +1,9 @@
package org.apache.lucene.queryparser.xml.builders;
+import org.apache.lucene.document.FieldTypes;
+import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.spans.SpanQuery; // javadocs
-import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,8 +28,8 @@ import org.w3c.dom.Element;
public abstract class SpanBuilderBase implements SpanQueryBuilder {
@Override
- public Query getQuery(Element e) throws ParserException {
- return getSpanQuery(e);
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
+ return getSpanQuery(fieldTypes, e);
}
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,9 +1,10 @@
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.spans.SpanFirstQuery;
-import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.search.spans.SpanFirstQuery;
+import org.apache.lucene.search.spans.SpanQuery;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,10 +35,10 @@ public class SpanFirstBuilder extends Sp
}
@Override
- public SpanQuery getSpanQuery(Element e) throws ParserException {
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException {
int end = DOMUtils.getAttribute(e, "end", 1);
Element child = DOMUtils.getFirstChildElement(e);
- SpanQuery q = factory.getSpanQuery(child);
+ SpanQuery q = factory.getSpanQuery(fieldTypes, child);
SpanFirstQuery sfq = new SpanFirstQuery(q, end);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,14 +1,15 @@
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.spans.SpanNearQuery;
-import org.apache.lucene.search.spans.SpanQuery;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.search.spans.SpanNearQuery;
+import org.apache.lucene.search.spans.SpanQuery;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
-import java.util.ArrayList;
-import java.util.List;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -38,14 +39,14 @@ public class SpanNearBuilder extends Spa
}
@Override
- public SpanQuery getSpanQuery(Element e) throws ParserException {
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String slopString = DOMUtils.getAttributeOrFail(e, "slop");
int slop = Integer.parseInt(slopString);
boolean inOrder = DOMUtils.getAttribute(e, "inOrder", false);
List<SpanQuery> spans = new ArrayList<>();
for (Node kid = e.getFirstChild(); kid != null; kid = kid.getNextSibling()) {
if (kid.getNodeType() == Node.ELEMENT_NODE) {
- spans.add(factory.getSpanQuery((Element) kid));
+ spans.add(factory.getSpanQuery(fieldTypes, (Element) kid));
}
}
SpanQuery[] spanQueries = spans.toArray(new SpanQuery[spans.size()]);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,9 +1,10 @@
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.spans.SpanNotQuery;
-import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.search.spans.SpanNotQuery;
+import org.apache.lucene.search.spans.SpanQuery;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,15 +35,15 @@ public class SpanNotBuilder extends Span
}
@Override
- public SpanQuery getSpanQuery(Element e) throws ParserException {
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException {
Element includeElem = DOMUtils.getChildByTagOrFail(e, "Include");
includeElem = DOMUtils.getFirstChildOrFail(includeElem);
Element excludeElem = DOMUtils.getChildByTagOrFail(e, "Exclude");
excludeElem = DOMUtils.getFirstChildOrFail(excludeElem);
- SpanQuery include = factory.getSpanQuery(includeElem);
- SpanQuery exclude = factory.getSpanQuery(excludeElem);
+ SpanQuery include = factory.getSpanQuery(fieldTypes, includeElem);
+ SpanQuery exclude = factory.getSpanQuery(fieldTypes, excludeElem);
SpanNotQuery snq = new SpanNotQuery(include, exclude);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,14 +1,15 @@
package org.apache.lucene.queryparser.xml.builders;
-import org.apache.lucene.search.spans.SpanOrQuery;
-import org.apache.lucene.search.spans.SpanQuery;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.search.spans.SpanOrQuery;
+import org.apache.lucene.search.spans.SpanQuery;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
-import java.util.ArrayList;
-import java.util.List;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -38,11 +39,11 @@ public class SpanOrBuilder extends SpanB
}
@Override
- public SpanQuery getSpanQuery(Element e) throws ParserException {
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException {
List<SpanQuery> clausesList = new ArrayList<>();
for (Node kid = e.getFirstChild(); kid != null; kid = kid.getNextSibling()) {
if (kid.getNodeType() == Node.ELEMENT_NODE) {
- SpanQuery clause = factory.getSpanQuery((Element) kid);
+ SpanQuery clause = factory.getSpanQuery(fieldTypes, (Element) kid);
clausesList.add(clause);
}
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,21 +1,22 @@
package org.apache.lucene.queryparser.xml.builders;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.xml.DOMUtils;
+import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.search.spans.SpanOrQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.queryparser.xml.DOMUtils;
-import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -45,7 +46,7 @@ public class SpanOrTermsBuilder extends
}
@Override
- public SpanQuery getSpanQuery(Element e) throws ParserException {
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String fieldName = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
String value = DOMUtils.getNonBlankTextOrFail(e);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -15,9 +15,10 @@ package org.apache.lucene.queryparser.xm
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.spans.SpanQuery;
import org.w3c.dom.Element;
/**
@@ -25,5 +26,5 @@ import org.w3c.dom.Element;
*/
public interface SpanQueryBuilder extends QueryBuilder {
- public SpanQuery getSpanQuery(Element e) throws ParserException;
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException;
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java Sun Dec 7 10:52:03 2014
@@ -1,12 +1,13 @@
package org.apache.lucene.queryparser.xml.builders;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.lucene.document.FieldTypes;
+import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,8 +33,8 @@ public class SpanQueryBuilderFactory imp
private final Map<String, SpanQueryBuilder> builders = new HashMap<>();
@Override
- public Query getQuery(Element e) throws ParserException {
- return getSpanQuery(e);
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
+ return getSpanQuery(fieldTypes, e);
}
public void addBuilder(String nodeName, SpanQueryBuilder builder) {
@@ -41,12 +42,12 @@ public class SpanQueryBuilderFactory imp
}
@Override
- public SpanQuery getSpanQuery(Element e) throws ParserException {
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException {
SpanQueryBuilder builder = builders.get(e.getNodeName());
if (builder == null) {
throw new ParserException("No SpanQueryObjectBuilder defined for node " + e.getNodeName());
}
- return builder.getSpanQuery(e);
+ return builder.getSpanQuery(fieldTypes, e);
}
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,10 +1,11 @@
package org.apache.lucene.queryparser.xml.builders;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.search.spans.SpanTermQuery;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,7 +30,7 @@ import org.w3c.dom.Element;
public class SpanTermBuilder extends SpanBuilderBase {
@Override
- public SpanQuery getSpanQuery(Element e) throws ParserException {
+ public SpanQuery getSpanQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String fieldName = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
String value = DOMUtils.getNonBlankTextOrFail(e);
SpanTermQuery stq = new SpanTermQuery(new Term(fieldName, value));
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,11 +1,12 @@
package org.apache.lucene.queryparser.xml.builders;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
import org.w3c.dom.Element;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,7 +31,7 @@ import org.w3c.dom.Element;
public class TermQueryBuilder implements QueryBuilder {
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String field = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
String value = DOMUtils.getNonBlankTextOrFail(e);
TermQuery tq = new TermQuery(new Term(field, value));
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,20 +1,21 @@
package org.apache.lucene.queryparser.xml.builders;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
-import org.apache.lucene.search.Filter;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queries.TermsFilter;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.util.BytesRef;
import org.w3c.dom.Element;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -49,7 +50,7 @@ public class TermsFilterBuilder implemen
* @see org.apache.lucene.xmlparser.FilterBuilder#process(org.w3c.dom.Element)
*/
@Override
- public Filter getFilter(Element e) throws ParserException {
+ public Filter getFilter(FieldTypes fieldTypes, Element e) throws ParserException {
List<BytesRef> terms = new ArrayList<>();
String text = DOMUtils.getNonBlankTextOrFail(e);
String fieldName = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,21 +1,22 @@
package org.apache.lucene.queryparser.xml.builders;
+import java.io.IOException;
+
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.xml.DOMUtils;
+import org.apache.lucene.queryparser.xml.ParserException;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.queryparser.xml.DOMUtils;
-import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
-import java.io.IOException;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -45,7 +46,7 @@ public class TermsQueryBuilder implement
}
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String fieldName = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName");
String text = DOMUtils.getNonBlankTextOrFail(e);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java Sun Dec 7 10:52:03 2014
@@ -1,13 +1,14 @@
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.util.Version;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.util.Version;
import org.w3c.dom.Element;
/*
@@ -58,7 +59,7 @@ public class UserInputQueryBuilder imple
*/
@Override
- public Query getQuery(Element e) throws ParserException {
+ public Query getQuery(FieldTypes fieldTypes, Element e) throws ParserException {
String text = DOMUtils.getText(e);
try {
Query q = null;
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java Sun Dec 7 10:52:03 2014
@@ -32,7 +32,8 @@ import java.util.TimeZone;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.NumericType;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
@@ -48,12 +49,20 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-// nocommit cutover to FieldTypes
-@Ignore
public class TestNumericQueryParser extends LuceneTestCase {
+
+ private static enum NumericType {
+ /** 32-bit integer numeric type */
+ INT,
+ /** 64-bit long numeric type */
+ LONG,
+ /** 32-bit float numeric type */
+ FLOAT,
+ /** 64-bit double numeric type */
+ DOUBLE
+ }
private static enum NumberType {
NEGATIVE, ZERO, POSITIVE;
@@ -62,7 +71,6 @@ public class TestNumericQueryParser exte
final private static int[] DATE_STYLES = {DateFormat.FULL, DateFormat.LONG,
DateFormat.MEDIUM, DateFormat.SHORT};
- final private static int PRECISION_STEP = 8;
final private static String FIELD_NAME = "field";
private static Locale LOCALE;
private static TimeZone TIMEZONE;
@@ -189,78 +197,29 @@ public class TestNumericQueryParser exte
.setMaxBufferedDocs(TestUtil.nextInt(random(), 50, 1000))
.setMergePolicy(newLogMergePolicy()));
- //Document doc = new Document();
- HashMap<String,NumericConfig> numericConfigMap = new HashMap<>();
- //HashMap<String,Field> numericFieldMap = new HashMap<>();
- //qp.setNumericConfigMap(numericConfigMap);
-
- for (NumericType type : NumericType.values()) {
- numericConfigMap.put(type.name(), new NumericConfig(PRECISION_STEP,
- NUMBER_FORMAT, type));
-
- /*
- FieldType ft = new FieldType(IntField.TYPE_NOT_STORED);
- ft.setNumericType(type);
- ft.setStored(true);
- ft.setNumericPrecisionStep(PRECISION_STEP);
- ft.freeze();
- */
- // nocommit fixme
- /*
- FieldType ft = null;
- final Field field;
-
- switch(type) {
- case INT:
- // nocommit fixme
- //field = new IntField(type.name(), 0, ft);
- field = null;
- break;
- case FLOAT:
- // nocommit fixme
- //field = new FloatField(type.name(), 0.0f, ft);
- field = null;
- break;
- case LONG:
- // nocommit fixme
- //field = new LongField(type.name(), 0l, ft);
- field = null;
- break;
- case DOUBLE:
- // nocommit fixme
- //field = new DoubleField(type.name(), 0.0, ft);
- field = null;
- break;
- default:
- fail();
- field = null;
- }
- numericFieldMap.put(type.name(), field);
- doc.add(field);
- */
- }
-
- numericConfigMap.put(DATE_FIELD_NAME, new NumericConfig(PRECISION_STEP,
- DATE_FORMAT, NumericType.LONG));
- // nocommit fixme
- //FieldType ft = new FieldType(LongField.TYPE_NOT_STORED);
- //ft.setStored(true);
- //ft.setNumericPrecisionStep(PRECISION_STEP);
- // nocommit fixme
- // LongField dateField = new LongField(DATE_FIELD_NAME, 0l, ft);
- //numericFieldMap.put(DATE_FIELD_NAME, dateField);
- // doc.add(dateField);
-
for (NumberType numberType : NumberType.values()) {
- //setFieldValues(numberType, numericFieldMap);
- //if (VERBOSE) System.out.println("Indexing document: " + doc);
- //writer.addDocument(doc);
+ Document doc = writer.newDocument();
+ doc.addInt("INT", getNumberType(numberType, "INT").intValue());
+ doc.addLong("LONG", getNumberType(numberType, "LONG").longValue());
+ doc.addFloat("FLOAT", getNumberType(numberType, "FLOAT").floatValue());
+ doc.addDouble("DOUBLE", getNumberType(numberType, "DOUBLE").doubleValue());
+ doc.addDouble(DATE_FIELD_NAME, getNumberType(numberType, DATE_FIELD_NAME).longValue());
+ if (VERBOSE) System.out.println("Indexing document: " + doc);
+ writer.addDocument(doc);
}
reader = writer.getReader();
searcher = newSearcher(reader);
+
+ HashMap<String,NumericConfig> numericConfigMap = new HashMap<>();
+ qp.setNumericConfigMap(numericConfigMap);
+ FieldTypes fieldTypes = reader.getFieldTypes();
+ for (NumericType type : NumericType.values()) {
+ numericConfigMap.put(type.name(), new NumericConfig(NUMBER_FORMAT, fieldTypes));
+ }
+ numericConfigMap.put(DATE_FIELD_NAME, new NumericConfig(DATE_FORMAT, fieldTypes));
+
writer.close();
-
}
private static Number getNumberType(NumberType numberType, String fieldName) {
@@ -304,33 +263,6 @@ public class TestNumericQueryParser exte
}
- // nocommit fixme
- /*
- private static void setFieldValues(NumberType numberType,
- HashMap<String,Field> numericFieldMap) {
-
- Number number = getNumberType(numberType, NumericType.DOUBLE
- .name());
- numericFieldMap.get(NumericType.DOUBLE.name()).setDoubleValue(
- number.doubleValue());
-
- number = getNumberType(numberType, NumericType.INT.name());
- numericFieldMap.get(NumericType.INT.name()).setIntValue(
- number.intValue());
-
- number = getNumberType(numberType, NumericType.LONG.name());
- numericFieldMap.get(NumericType.LONG.name()).setLongValue(
- number.longValue());
-
- number = getNumberType(numberType, NumericType.FLOAT.name());
- numericFieldMap.get(NumericType.FLOAT.name()).setFloatValue(
- number.floatValue());
-
- number = getNumberType(numberType, DATE_FIELD_NAME);
- numericFieldMap.get(DATE_FIELD_NAME).setLongValue(number.longValue());
- }
- */
-
private static int randomDateStyle(Random random) {
return DATE_STYLES[random.nextInt(DATE_STYLES.length)];
}
@@ -450,7 +382,7 @@ public class TestNumericQueryParser exte
}
if (upperDateNumber != null) {
- upperDateStr = ESCAPER.escape(
+ upperDateStr = ESCAPER.escape(
DATE_FORMAT.format(new Date(upperDateNumber.longValue())), LOCALE,
EscapeQuerySyntax.Type.STRING).toString();
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Sun Dec 7 10:52:03 2014
@@ -57,8 +57,6 @@ public class TestParser extends LuceneTe
public static void beforeClass() throws Exception {
// TODO: rewrite test (this needs to set QueryParser.enablePositionIncrements, too, for work with CURRENT):
Analyzer analyzer = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, true, MockTokenFilter.ENGLISH_STOPSET);
- //initialize the parser
- builder = new CorePlusExtensionsParser("contents", analyzer);
BufferedReader d = new BufferedReader(new InputStreamReader(
TestParser.class.getResourceAsStream("reuters21578.txt"), StandardCharsets.US_ASCII));
@@ -80,7 +78,8 @@ public class TestParser extends LuceneTe
writer.close();
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
-
+ //initialize the parser
+ builder = new CorePlusExtensionsParser(reader.getFieldTypes(), "contents", analyzer);
}
@AfterClass
@@ -202,15 +201,11 @@ public class TestParser extends LuceneTe
assertEquals("DuplicateFilterQuery should produce 1 result ", 1, h);
}
- @Ignore
- // nocommit
public void testNumericRangeFilterQueryXML() throws ParserException, IOException {
Query q = parse("NumericRangeFilterQuery.xml");
dumpResults("NumericRangeFilter", q, 5);
}
- @Ignore
- // nocommit
public void testNumericRangeQueryQueryXML() throws ParserException, IOException {
Query q = parse("NumericRangeQueryQuery.xml");
dumpResults("NumericRangeQuery", q, 5);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java Sun Dec 7 10:52:03 2014
@@ -94,7 +94,7 @@ public class TestQueryTemplateManager ex
Document doc = qtm.getQueryAsDOM(queryFormProperties, queryFormProperties.getProperty("template"));
//Parse the XML query using the XML parser
- Query q = builder.getQuery(doc.getDocumentElement());
+ Query q = builder.getQuery(searcher.getFieldTypes(), doc.getDocumentElement());
//Run the query
int h = searcher.search(q, null, 1000).totalHits;
@@ -154,7 +154,7 @@ public class TestQueryTemplateManager ex
searcher = newSearcher(reader);
//initialize the parser
- builder = new CorePlusExtensionsParser("artist", analyzer);
+ builder = new CorePlusExtensionsParser(reader.getFieldTypes(), "artist", analyzer);
}