You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2010/10/26 10:15:36 UTC
svn commit: r1027396 [1/4] - in /lucene/dev/branches/docvalues: ./ lucene/
lucene/contrib/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/test/
lucene/contrib/instantiated/src/test/org/apache/luce...
Author: simonw
Date: Tue Oct 26 08:15:33 2010
New Revision: 1027396
URL: http://svn.apache.org/viewvc?rev=1027396&view=rev
Log:
catch up with trunk
Added:
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java
- copied unchanged from r1027393, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/TestMinimize.java
- copied unchanged from r1027393, lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/TestMinimize.java
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_fields.vm
- copied unchanged from r1027393, lucene/dev/trunk/solr/example/solr/conf/velocity/facet_fields.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/query.vm
- copied unchanged from r1027393, lucene/dev/trunk/solr/example/solr/conf/velocity/query.vm
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java
- copied unchanged from r1027393, lucene/dev/trunk/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java
- copied unchanged from r1027393, lucene/dev/trunk/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java
Removed:
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/db/data/
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/rss/data/
Modified:
lucene/dev/branches/docvalues/ (props changed)
lucene/dev/branches/docvalues/lucene/ (props changed)
lucene/dev/branches/docvalues/lucene/CHANGES.txt
lucene/dev/branches/docvalues/lucene/build.xml (props changed)
lucene/dev/branches/docvalues/lucene/contrib/ (props changed)
lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt (props changed)
lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/ (props changed)
lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParserConstants.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/TermRangeQuery.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/MMapDirectory.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/BasicOperations.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/MinimizationOperations.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/SpecialOperations.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (contents, props changed)
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/AutomatonTestUtil.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/TestBasicOperations.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/TestDeterminism.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java
lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/docvalues/solr/ (props changed)
lucene/dev/branches/docvalues/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/docvalues/solr/KEYS (props changed)
lucene/dev/branches/docvalues/solr/LICENSE.txt (props changed)
lucene/dev/branches/docvalues/solr/NOTICE.txt (props changed)
lucene/dev/branches/docvalues/solr/README.txt (props changed)
lucene/dev/branches/docvalues/solr/build.xml (props changed)
lucene/dev/branches/docvalues/solr/client/ (props changed)
lucene/dev/branches/docvalues/solr/common-build.xml (props changed)
lucene/dev/branches/docvalues/solr/contrib/ (props changed)
lucene/dev/branches/docvalues/solr/example/ (props changed)
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/db/ (props changed)
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/db/conf/db-data-config.xml
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/mail/ (props changed)
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/rss/ (props changed)
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/rss/conf/ (props changed)
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/rss/conf/rss-data-config.xml
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/branches/docvalues/solr/example/example-DIH/solr/tika/conf/tika-data-config.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/hd.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/ipod_video.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/mem.xml
lucene/dev/branches/docvalues/solr/example/exampledocs/monitor.xml
lucene/dev/branches/docvalues/solr/example/solr/conf/schema.xml
lucene/dev/branches/docvalues/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/VM_global_library.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/browse.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_dates.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_pivot.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_queries.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_ranges.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facets.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/footer.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/header.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/hit.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/layout.vm
lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/main.css
lucene/dev/branches/docvalues/solr/lib/ (props changed)
lucene/dev/branches/docvalues/solr/lib/commons-httpclient-3.1.jar (props changed)
lucene/dev/branches/docvalues/solr/lib/jcl-over-slf4j-1.5.5.jar (props changed)
lucene/dev/branches/docvalues/solr/site/ (props changed)
lucene/dev/branches/docvalues/solr/src/ (props changed)
lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/ (props changed)
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/SolrQueryParser.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java
lucene/dev/branches/docvalues/solr/src/maven/solr-core-pom.xml.template (props changed)
lucene/dev/branches/docvalues/solr/src/maven/solr-solrj-pom.xml.template (props changed)
lucene/dev/branches/docvalues/solr/src/solrj/org/ (props changed)
lucene/dev/branches/docvalues/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestConfig.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (props changed)
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/ (props changed)
lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
lucene/dev/branches/docvalues/solr/testlogging.properties (props changed)
Propchange: lucene/dev/branches/docvalues/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 08:15:33 2010
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x:949730,957490,961612,979161,980654,982195,987811,988512,1025544
+/lucene/dev/branches/branch_3x:949730,957490,961612,979161,980654,982195,987811,988512,1025544,1026614
/lucene/dev/branches/preflexfixes:967125-979432
-/lucene/dev/trunk:1021634-1025711
+/lucene/dev/trunk:1021634-1027393
Propchange: lucene/dev/branches/docvalues/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 08:15:33 2010
@@ -1,6 +1,6 @@
-/lucene/dev/branches/branch_3x/lucene:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544
+/lucene/dev/branches/branch_3x/lucene:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544,1026614
/lucene/dev/branches/preflexfixes/lucene:967125-979432
-/lucene/dev/trunk/lucene:1021634-1025711
+/lucene/dev/trunk/lucene:1021634-1027393
/lucene/java/branches/flex_1458:824912-931101
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,829134,829881,831036,896850,909334,948516
Modified: lucene/dev/branches/docvalues/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/CHANGES.txt?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/CHANGES.txt Tue Oct 26 08:15:33 2010
@@ -270,6 +270,16 @@ New features
* LUCENE-2690: MultiTermQuery boolean rewrites per segment.
(Uwe Schindler, Robert Muir, Mike McCandless, Simon Willnauer)
+* LUCENE-996: The QueryParser now accepts mixed inclusive and exclusive
+ bounds for range queries. Example: "{3 TO 5]"
+ QueryParser subclasses that overrode getRangeQuery will need to be changed
+ to use the new getRangeQuery method. (Andrew Schurman, Mark Miller, yonik)
+
+* LUCENE-995: The QueryParser now interprets * as an open end for range
+ queries. Literal asterisks may be represented by quoting or escaping
+ (i.e. \* or "*") Custom QueryParser sublcasses overriding getRangeQuery()
+ will be passed null for any open endpoint. (Adriano Crestani, yonik)
+
Optimizations
* LUCENE-2410: ~20% speedup on exact (slop=0) PhraseQuery matching.
Propchange: lucene/dev/branches/docvalues/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 08:15:33 2010
@@ -1,6 +1,6 @@
-/lucene/dev/branches/branch_3x/lucene/build.xml:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544
+/lucene/dev/branches/branch_3x/lucene/build.xml:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544,1026614
/lucene/dev/branches/preflexfixes/lucene/build.xml:967125-979432
-/lucene/dev/trunk/lucene/build.xml:1021634-1025711
+/lucene/dev/trunk/lucene/build.xml:1021634-1027393
/lucene/java/branches/flex_1458/build.xml:824912-931101
/lucene/java/branches/lucene_2_9/build.xml:909334,948516
/lucene/java/trunk/build.xml:924483-924731,924781,925176-925462
Propchange: lucene/dev/branches/docvalues/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 08:15:33 2010
@@ -1,6 +1,6 @@
-/lucene/dev/branches/branch_3x/lucene/contrib:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544
+/lucene/dev/branches/branch_3x/lucene/contrib:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544,1026614
/lucene/dev/branches/preflexfixes/lucene/contrib:967125-979432
-/lucene/dev/trunk/lucene/contrib:1021634-1025711
+/lucene/dev/trunk/lucene/contrib:1021634-1027393
/lucene/java/branches/flex_1458/contrib:824912-931101
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334,948516
Propchange: lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 08:15:33 2010
@@ -1,6 +1,6 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544
+/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544,1026614
/lucene/dev/branches/preflexfixes/lucene/contrib/CHANGES.txt:967125-979432
-/lucene/dev/trunk/lucene/contrib/CHANGES.txt:1021634-1025711
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:1021634-1027393
/lucene/java/branches/flex_1458/contrib/CHANGES.txt:824912-931101
/lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,948516
Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Tue Oct 26 08:15:33 2010
@@ -152,17 +152,6 @@ public class WeightedSpanTermExtractor {
IndexReader ir = getReaderForField(mtq.getField());
extract(query.rewrite(ir), terms);
}
- // nocommit is this needed anymore?
- /*
- else {
- FakeReader fReader = new FakeReader();
- MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE.rewrite(fReader, mtq);
- if (fReader.field != null) {
- IndexReader ir = getReaderForField(fReader.field);
- extract(query.rewrite(ir), terms);
- }
- }
- */
} else if (query instanceof MultiPhraseQuery) {
final MultiPhraseQuery mpq = (MultiPhraseQuery) query;
final List<Term[]> termArrays = mpq.getTermArrays();
Propchange: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 08:15:33 2010
@@ -1,6 +1,6 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544
+/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544,1026614
/lucene/dev/branches/preflexfixes/lucene/contrib/highlighter/src/test:967125-979432
-/lucene/dev/trunk/lucene/contrib/highlighter/src/test:1021634-1025711
+/lucene/dev/trunk/lucene/contrib/highlighter/src/test:1021634-1027393
/lucene/java/branches/flex_1458/contrib/highlighter/src/test:824912-931101
/lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
/lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334,948516
Propchange: lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 08:15:33 2010
@@ -1,6 +1,6 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544
+/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544,1026614
/lucene/dev/branches/preflexfixes/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:967125-979432
-/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:1021634-1025711
+/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:1021634-1027393
/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:824912-931101
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:909334,948516
/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-924731,924781,925176-925462
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java Tue Oct 26 08:15:33 2010
@@ -269,54 +269,63 @@ public class AnalyzingQueryParser extend
* @exception ParseException
*/
@Override
- protected Query getRangeQuery(String field, String part1, String part2, boolean inclusive)
+ protected Query getRangeQuery(String field, String part1, String part2, boolean startInclusive, boolean endInclusive)
throws ParseException {
// get Analyzer from superclass and tokenize the terms
- TokenStream source = getAnalyzer().tokenStream(field, new StringReader(part1));
- CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
+ TokenStream source = null;
+ CharTermAttribute termAtt = null;
boolean multipleTokens = false;
- // part1
- try {
- if (source.incrementToken()) {
- part1 = termAtt.toString();
- }
- multipleTokens = source.incrementToken();
- } catch (IOException e) {
- // ignore
- }
- try {
- source.close();
- } catch (IOException e) {
- // ignore
- }
- if (multipleTokens) {
- throw new ParseException("Cannot build RangeQuery with analyzer " + getAnalyzer().getClass()
- + " - tokens were added to part1");
- }
+ if (part1 != null) {
+ // part1
+ try {
+ source = getAnalyzer().tokenStream(field, new StringReader(part1));
+ termAtt = source.addAttribute(CharTermAttribute.class);
+ multipleTokens = false;
- // part2
- source = getAnalyzer().tokenStream(field, new StringReader(part2));
- termAtt = source.addAttribute(CharTermAttribute.class);
-
- try {
- if (source.incrementToken()) {
- part2 = termAtt.toString();
- }
- multipleTokens = source.incrementToken();
- } catch (IOException e) {
- // ignore
- }
- try {
- source.close();
- } catch (IOException e) {
- // ignore
+
+ if (source.incrementToken()) {
+ part1 = termAtt.toString();
+ }
+ multipleTokens = source.incrementToken();
+ } catch (IOException e) {
+ // ignore
+ }
+ try {
+ source.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ if (multipleTokens) {
+ throw new ParseException("Cannot build RangeQuery with analyzer " + getAnalyzer().getClass()
+ + " - tokens were added to part1");
+ }
}
- if (multipleTokens) {
- throw new ParseException("Cannot build RangeQuery with analyzer " + getAnalyzer().getClass()
- + " - tokens were added to part2");
+
+ if (part2 != null) {
+ // part2
+ source = getAnalyzer().tokenStream(field, new StringReader(part2));
+ termAtt = source.addAttribute(CharTermAttribute.class);
+
+ try {
+ if (source.incrementToken()) {
+ part2 = termAtt.toString();
+ }
+ multipleTokens = source.incrementToken();
+ } catch (IOException e) {
+ // ignore
+ }
+ try {
+ source.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ if (multipleTokens) {
+ throw new ParseException("Cannot build RangeQuery with analyzer " + getAnalyzer().getClass()
+ + " - tokens were added to part2");
+ }
}
- return super.getRangeQuery(field, part1, part2, inclusive);
+ return super.getRangeQuery(field, part1, part2, startInclusive, endInclusive);
}
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java Tue Oct 26 08:15:33 2010
@@ -161,25 +161,25 @@ public class ComplexPhraseQueryParser ex
@Override
protected Query getRangeQuery(String field, String part1, String part2,
- boolean inclusive) throws ParseException {
+ boolean startInclusive, boolean endInclusive) throws ParseException {
if (isPass2ResolvingPhrases) {
checkPhraseClauseIsForSameField(field);
}
- return super.getRangeQuery(field, part1, part2, inclusive);
+ return super.getRangeQuery(field, part1, part2, startInclusive, endInclusive);
}
@Override
protected Query newRangeQuery(String field, String part1, String part2,
- boolean inclusive) {
+ boolean startInclusive, boolean endInclusive) {
if (isPass2ResolvingPhrases) {
// Must use old-style RangeQuery in order to produce a BooleanQuery
// that can be turned into SpanOr clause
- TermRangeQuery rangeQuery = new TermRangeQuery(field, part1, part2, inclusive, inclusive,
+ TermRangeQuery rangeQuery = new TermRangeQuery(field, part1, part2, startInclusive, endInclusive,
getRangeCollator());
rangeQuery.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE);
return rangeQuery;
}
- return super.newRangeQuery(field, part1, part2, inclusive);
+ return super.newRangeQuery(field, part1, part2, startInclusive, endInclusive);
}
@Override
Propchange: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 08:15:33 2010
@@ -1,6 +1,6 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512,1025544,1026614
/lucene/dev/branches/preflexfixes/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:967125-979432
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:1021634-1025711
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:1021634-1027393
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:824912-931101
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:909334,948516
/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:924483-924731,924781,925176-925462
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java Tue Oct 26 08:15:33 2010
@@ -1064,6 +1064,12 @@ public class IndexWriter implements Clos
boolean success = false;
+ // TODO: we should check whether this index is too old,
+ // and throw an IndexFormatTooOldExc up front, here,
+ // instead of later when merge, applyDeletes, getReader
+ // is attempted. I think to do this we should store the
+ // oldest segment's version in segments_N.
+
try {
if (create) {
// Try to read first. This is to allow create
@@ -3662,8 +3668,9 @@ public class IndexWriter implements Clos
// This merge (and, generally, any change to the
// segments) may now enable new merges, so we call
// merge policy & update pending merges.
- if (success && !merge.isAborted() && !closed && !closing)
+ if (success && !merge.isAborted() && (merge.optimize || (!closed && !closing))) {
updatePendingMerges(merge.maxNumSegmentsOptimize, merge.optimize);
+ }
}
}
} catch (OutOfMemoryError oom) {
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java Tue Oct 26 08:15:33 2010
@@ -50,7 +50,6 @@ final class TermsHashPerField extends In
final FieldInfo fieldInfo;
- // nocommit - how to communicate byte usage to DocumentsWriter?
final BytesRefHash bytesHash;
ParallelPostingsArray postingsArray;
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java Tue Oct 26 08:15:33 2010
@@ -26,6 +26,7 @@ import org.apache.lucene.index.SegmentWr
import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
import org.apache.lucene.index.codecs.pulsing.PulsingCodec;
import org.apache.lucene.index.codecs.standard.StandardCodec;
+import org.apache.lucene.index.codecs.simpletext.SimpleTextCodec;
/** Holds a set of codecs, keyed by name. You subclass
* this, instantiate it, and register your codecs, then
@@ -45,7 +46,7 @@ public abstract class CodecProvider {
private static String defaultCodec = "Standard";
- public final static String[] CORE_CODECS = new String[] {"Standard", "Pulsing", "PreFlex"};
+ public final static String[] CORE_CODECS = new String[] {"Standard", "Pulsing", "PreFlex", "SimpleText"};
public synchronized void register(Codec codec) {
if (codec.name == null) {
@@ -116,6 +117,7 @@ class DefaultCodecProvider extends Codec
register(new StandardCodec());
register(new PreFlexCodec());
register(new PulsingCodec(1));
+ register(new SimpleTextCodec());
}
@Override
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java Tue Oct 26 08:15:33 2010
@@ -203,16 +203,16 @@ public class MultiFieldQueryParser exten
@Override
- protected Query getRangeQuery(String field, String part1, String part2, boolean inclusive) throws ParseException {
+ protected Query getRangeQuery(String field, String part1, String part2, boolean startInclusive, boolean endInclusive) throws ParseException {
if (field == null) {
List<BooleanClause> clauses = new ArrayList<BooleanClause>();
for (int i = 0; i < fields.length; i++) {
- clauses.add(new BooleanClause(getRangeQuery(fields[i], part1, part2, inclusive),
+ clauses.add(new BooleanClause(getRangeQuery(fields[i], part1, part2, startInclusive, endInclusive),
BooleanClause.Occur.SHOULD));
}
return getBooleanQuery(clauses, true);
}
- return super.getRangeQuery(field, part1, part2, inclusive);
+ return super.getRangeQuery(field, part1, part2, startInclusive, endInclusive);
}
/**
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java?rev=1027396&r1=1027395&r2=1027396&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java Tue Oct 26 08:15:33 2010
@@ -114,1073 +114,20 @@ import org.apache.lucene.util.VirtualMet
* default.
* </ul>
*/
-public class QueryParser implements QueryParserConstants {
-
- private static final int CONJ_NONE = 0;
- private static final int CONJ_AND = 1;
- private static final int CONJ_OR = 2;
-
- private static final int MOD_NONE = 0;
- private static final int MOD_NOT = 10;
- private static final int MOD_REQ = 11;
-
- // make it possible to call setDefaultOperator() without accessing
- // the nested class:
- /** Alternative form of QueryParser.Operator.AND */
- public static final Operator AND_OPERATOR = Operator.AND;
- /** Alternative form of QueryParser.Operator.OR */
- public static final Operator OR_OPERATOR = Operator.OR;
-
- /** The actual operator that parser uses to combine query terms */
- private Operator operator = OR_OPERATOR;
-
- boolean lowercaseExpandedTerms = true;
- MultiTermQuery.RewriteMethod multiTermRewriteMethod = MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
- boolean allowLeadingWildcard = false;
- boolean enablePositionIncrements = true;
-
- Analyzer analyzer;
- String field;
- int phraseSlop = 0;
- float fuzzyMinSim = FuzzyQuery.defaultMinSimilarity;
- int fuzzyPrefixLength = FuzzyQuery.defaultPrefixLength;
- Locale locale = Locale.getDefault();
-
- // the default date resolution
- DateTools.Resolution dateResolution = null;
- // maps field names to date resolutions
- Map<String,DateTools.Resolution> fieldToDateResolution = null;
-
- // The collator to use when determining range inclusion,
- // for use when constructing RangeQuerys.
- Collator rangeCollator = null;
-
- /** @deprecated remove when getFieldQuery is removed */
- @Deprecated
- private static final VirtualMethod<QueryParser> getFieldQueryMethod =
- new VirtualMethod<QueryParser>(QueryParser.class, "getFieldQuery", String.class, String.class);
- /** @deprecated remove when getFieldQuery is removed */
- @Deprecated
- private static final VirtualMethod<QueryParser> getFieldQueryWithQuotedMethod =
- new VirtualMethod<QueryParser>(QueryParser.class, "getFieldQuery", String.class, String.class, boolean.class);
- /** @deprecated remove when getFieldQuery is removed */
- @Deprecated
- private final boolean hasNewAPI =
- VirtualMethod.compareImplementationDistance(getClass(),
- getFieldQueryWithQuotedMethod, getFieldQueryMethod) >= 0; // its ok for both to be overridden
-
- private boolean autoGeneratePhraseQueries;
-
- /** The default operator for parsing queries.
- * Use {@link QueryParser#setDefaultOperator} to change it.
+public class QueryParser extends QueryParserBase implements QueryParserConstants {
+ /** The default operator for parsing queries.
+ * Use {@link QueryParserBase#setDefaultOperator} to change it.
*/
static public enum Operator { OR, AND }
- /** Constructs a query parser.
+ /** Create a query parser.
* @param matchVersion Lucene version to match. See <a href="#version">above</a>.
* @param f the default field for query terms.
* @param a used to find terms in the query text.
*/
- public QueryParser(Version matchVersion, String f, Analyzer a) {
+ public QueryParser(Version matchVersion, String f, Analyzer a) {
this(new FastCharStream(new StringReader("")));
- analyzer = a;
- field = f;
- if (matchVersion.onOrAfter(Version.LUCENE_29)) {
- enablePositionIncrements = true;
- } else {
- enablePositionIncrements = false;
- }
- if (matchVersion.onOrAfter(Version.LUCENE_31)) {
- setAutoGeneratePhraseQueries(false);
- } else {
- setAutoGeneratePhraseQueries(true);
- }
- }
-
- /** Parses a query string, returning a {@link org.apache.lucene.search.Query}.
- * @param query the query string to be parsed.
- * @throws ParseException if the parsing fails
- */
- public Query parse(String query) throws ParseException {
- ReInit(new FastCharStream(new StringReader(query)));
- try {
- // TopLevelQuery is a Query followed by the end-of-input (EOF)
- Query res = TopLevelQuery(field);
- return res!=null ? res : newBooleanQuery(false);
- }
- catch (ParseException tme) {
- // rethrow to include the original query:
- ParseException e = new ParseException("Cannot parse '" +query+ "': " + tme.getMessage());
- e.initCause(tme);
- throw e;
- }
- catch (TokenMgrError tme) {
- ParseException e = new ParseException("Cannot parse '" +query+ "': " + tme.getMessage());
- e.initCause(tme);
- throw e;
- }
- catch (BooleanQuery.TooManyClauses tmc) {
- ParseException e = new ParseException("Cannot parse '" +query+ "': too many boolean clauses");
- e.initCause(tmc);
- throw e;
- }
- }
-
- /**
- * @return Returns the analyzer.
- */
- public Analyzer getAnalyzer() {
- return analyzer;
- }
-
- /**
- * @return Returns the field.
- */
- public String getField() {
- return field;
- }
-
- /**
- * @see #setAutoGeneratePhraseQueries(boolean)
- */
- public final boolean getAutoGeneratePhraseQueries() {
- return autoGeneratePhraseQueries;
- }
-
- /**
- * Set to true if phrase queries will be automatically generated
- * when the analyzer returns more than one term from whitespace
- * delimited text.
- * NOTE: this behavior may not be suitable for all languages.
- * <p>
- * Set to false if phrase queries should only be generated when
- * surrounded by double quotes.
- */
- public final void setAutoGeneratePhraseQueries(boolean value) {
- if (value == false && !hasNewAPI)
- throw new IllegalArgumentException("You must implement the new API: getFieldQuery(String,String,boolean)"
- + " to use setAutoGeneratePhraseQueries(false)");
- this.autoGeneratePhraseQueries = value;
- }
-
- /**
- * Get the minimal similarity for fuzzy queries.
- */
- public float getFuzzyMinSim() {
- return fuzzyMinSim;
- }
-
- /**
- * Set the minimum similarity for fuzzy queries.
- * Default is 2f.
- */
- public void setFuzzyMinSim(float fuzzyMinSim) {
- this.fuzzyMinSim = fuzzyMinSim;
- }
-
- /**
- * Get the prefix length for fuzzy queries.
- * @return Returns the fuzzyPrefixLength.
- */
- public int getFuzzyPrefixLength() {
- return fuzzyPrefixLength;
- }
-
- /**
- * Set the prefix length for fuzzy queries. Default is 0.
- * @param fuzzyPrefixLength The fuzzyPrefixLength to set.
- */
- public void setFuzzyPrefixLength(int fuzzyPrefixLength) {
- this.fuzzyPrefixLength = fuzzyPrefixLength;
- }
-
- /**
- * Sets the default slop for phrases. If zero, then exact phrase matches
- * are required. Default value is zero.
- */
- public void setPhraseSlop(int phraseSlop) {
- this.phraseSlop = phraseSlop;
- }
-
- /**
- * Gets the default slop for phrases.
- */
- public int getPhraseSlop() {
- return phraseSlop;
- }
-
-
- /**
- * Set to <code>true</code> to allow leading wildcard characters.
- * <p>
- * When set, <code>*</code> or <code>?</code> are allowed as
- * the first character of a PrefixQuery and WildcardQuery.
- * Note that this can produce very slow
- * queries on big indexes.
- * <p>
- * Default: false.
- */
- public void setAllowLeadingWildcard(boolean allowLeadingWildcard) {
- this.allowLeadingWildcard = allowLeadingWildcard;
- }
-
- /**
- * @see #setAllowLeadingWildcard(boolean)
- */
- public boolean getAllowLeadingWildcard() {
- return allowLeadingWildcard;
- }
-
- /**
- * Set to <code>true</code> to enable position increments in result query.
- * <p>
- * When set, result phrase and multi-phrase queries will
- * be aware of position increments.
- * Useful when e.g. a StopFilter increases the position increment of
- * the token that follows an omitted token.
- * <p>
- * Default: false.
- */
- public void setEnablePositionIncrements(boolean enable) {
- this.enablePositionIncrements = enable;
- }
-
- /**
- * @see #setEnablePositionIncrements(boolean)
- */
- public boolean getEnablePositionIncrements() {
- return enablePositionIncrements;
- }
-
- /**
- * Sets the boolean operator of the QueryParser.
- * In default mode (<code>OR_OPERATOR</code>) terms without any modifiers
- * are considered optional: for example <code>capital of Hungary</code> is equal to
- * <code>capital OR of OR Hungary</code>.<br/>
- * In <code>AND_OPERATOR</code> mode terms are considered to be in conjunction: the
- * above mentioned query is parsed as <code>capital AND of AND Hungary</code>
- */
- public void setDefaultOperator(Operator op) {
- this.operator = op;
- }
-
-
- /**
- * Gets implicit operator setting, which will be either AND_OPERATOR
- * or OR_OPERATOR.
- */
- public Operator getDefaultOperator() {
- return operator;
- }
-
-
- /**
- * Whether terms of wildcard, prefix, fuzzy and range queries are to be automatically
- * lower-cased or not. Default is <code>true</code>.
- */
- public void setLowercaseExpandedTerms(boolean lowercaseExpandedTerms) {
- this.lowercaseExpandedTerms = lowercaseExpandedTerms;
- }
-
-
- /**
- * @see #setLowercaseExpandedTerms(boolean)
- */
- public boolean getLowercaseExpandedTerms() {
- return lowercaseExpandedTerms;
- }
-
- /**
- * By default QueryParser uses {@link MultiTermQuery#CONSTANT_SCORE_AUTO_REWRITE_DEFAULT}
- * when creating a PrefixQuery, WildcardQuery or RangeQuery. This implementation is generally preferable because it
- * a) Runs faster b) Does not have the scarcity of terms unduly influence score
- * c) avoids any "TooManyBooleanClauses" exception.
- * However, if your application really needs to use the
- * old-fashioned BooleanQuery expansion rewriting and the above
- * points are not relevant then use this to change
- * the rewrite method.
- */
- public void setMultiTermRewriteMethod(MultiTermQuery.RewriteMethod method) {
- multiTermRewriteMethod = method;
- }
-
-
- /**
- * @see #setMultiTermRewriteMethod
- */
- public MultiTermQuery.RewriteMethod getMultiTermRewriteMethod() {
- return multiTermRewriteMethod;
- }
-
- /**
- * Set locale used by date range parsing.
- */
- public void setLocale(Locale locale) {
- this.locale = locale;
- }
-
- /**
- * Returns current locale, allowing access by subclasses.
- */
- public Locale getLocale() {
- return locale;
- }
-
- /**
- * Sets the default date resolution used by RangeQueries for fields for which no
- * specific date resolutions has been set. Field specific resolutions can be set
- * with {@link #setDateResolution(String, DateTools.Resolution)}.
- *
- * @param dateResolution the default date resolution to set
- */
- public void setDateResolution(DateTools.Resolution dateResolution) {
- this.dateResolution = dateResolution;
- }
-
- /**
- * Sets the date resolution used by RangeQueries for a specific field.
- *
- * @param fieldName field for which the date resolution is to be set
- * @param dateResolution date resolution to set
- */
- public void setDateResolution(String fieldName, DateTools.Resolution dateResolution) {
- if (fieldName == null) {
- throw new IllegalArgumentException("Field cannot be null.");
- }
-
- if (fieldToDateResolution == null) {
- // lazily initialize HashMap
- fieldToDateResolution = new HashMap<String,DateTools.Resolution>();
- }
-
- fieldToDateResolution.put(fieldName, dateResolution);
- }
-
- /**
- * Returns the date resolution that is used by RangeQueries for the given field.
- * Returns null, if no default or field specific date resolution has been set
- * for the given field.
- *
- */
- public DateTools.Resolution getDateResolution(String fieldName) {
- if (fieldName == null) {
- throw new IllegalArgumentException("Field cannot be null.");
- }
-
- if (fieldToDateResolution == null) {
- // no field specific date resolutions set; return default date resolution instead
- return this.dateResolution;
- }
-
- DateTools.Resolution resolution = fieldToDateResolution.get(fieldName);
- if (resolution == null) {
- // no date resolutions set for the given field; return default date resolution instead
- resolution = this.dateResolution;
- }
-
- return resolution;
- }
-
- /**
- * Sets the collator used to determine index term inclusion in ranges
- * for RangeQuerys.
- * <p/>
- * <strong>WARNING:</strong> Setting the rangeCollator to a non-null
- * collator using this method will cause every single index Term in the
- * Field referenced by lowerTerm and/or upperTerm to be examined.
- * Depending on the number of index Terms in this Field, the operation could
- * be very slow.
- *
- * @param rc the collator to use when constructing RangeQuerys
- */
- public void setRangeCollator(Collator rc) {
- rangeCollator = rc;
- }
-
- /**
- * @return the collator used to determine index term inclusion in ranges
- * for RangeQuerys.
- */
- public Collator getRangeCollator() {
- return rangeCollator;
- }
-
- protected void addClause(List<BooleanClause> clauses, int conj, int mods, Query q) {
- boolean required, prohibited;
-
- // If this term is introduced by AND, make the preceding term required,
- // unless it's already prohibited
- if (clauses.size() > 0 && conj == CONJ_AND) {
- BooleanClause c = clauses.get(clauses.size()-1);
- if (!c.isProhibited())
- c.setOccur(BooleanClause.Occur.MUST);
- }
-
- if (clauses.size() > 0 && operator == AND_OPERATOR && conj == CONJ_OR) {
- // If this term is introduced by OR, make the preceding term optional,
- // unless it's prohibited (that means we leave -a OR b but +a OR b-->a OR b)
- // notice if the input is a OR b, first term is parsed as required; without
- // this modification a OR b would parsed as +a OR b
- BooleanClause c = clauses.get(clauses.size()-1);
- if (!c.isProhibited())
- c.setOccur(BooleanClause.Occur.SHOULD);
- }
-
- // We might have been passed a null query; the term might have been
- // filtered away by the analyzer.
- if (q == null)
- return;
-
- if (operator == OR_OPERATOR) {
- // We set REQUIRED if we're introduced by AND or +; PROHIBITED if
- // introduced by NOT or -; make sure not to set both.
- prohibited = (mods == MOD_NOT);
- required = (mods == MOD_REQ);
- if (conj == CONJ_AND && !prohibited) {
- required = true;
- }
- } else {
- // We set PROHIBITED if we're introduced by NOT or -; We set REQUIRED
- // if not PROHIBITED and not introduced by OR
- prohibited = (mods == MOD_NOT);
- required = (!prohibited && conj != CONJ_OR);
- }
- if (required && !prohibited)
- clauses.add(newBooleanClause(q, BooleanClause.Occur.MUST));
- else if (!required && !prohibited)
- clauses.add(newBooleanClause(q, BooleanClause.Occur.SHOULD));
- else if (!required && prohibited)
- clauses.add(newBooleanClause(q, BooleanClause.Occur.MUST_NOT));
- else
- throw new RuntimeException("Clause cannot be both required and prohibited");
- }
-
- /**
- * @deprecated Use {@link #getFieldQuery(String,String,boolean)} instead.
- */
- @Deprecated
- protected Query getFieldQuery(String field, String queryText) throws ParseException {
- // treat the text as if it was quoted, to drive phrase logic with old versions.
- return getFieldQuery(field, queryText, true);
- }
-
- /**
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getFieldQuery(String field, String queryText, boolean quoted) throws ParseException {
- // Use the analyzer to get all the tokens, and then build a TermQuery,
- // PhraseQuery, or nothing based on the term count
-
- TokenStream source;
- try {
- source = analyzer.reusableTokenStream(field, new StringReader(queryText));
- source.reset();
- } catch (IOException e) {
- source = analyzer.tokenStream(field, new StringReader(queryText));
- }
- CachingTokenFilter buffer = new CachingTokenFilter(source);
- TermToBytesRefAttribute termAtt = null;
- PositionIncrementAttribute posIncrAtt = null;
- int numTokens = 0;
-
- boolean success = false;
- try {
- buffer.reset();
- success = true;
- } catch (IOException e) {
- // success==false if we hit an exception
- }
- if (success) {
- if (buffer.hasAttribute(TermToBytesRefAttribute.class)) {
- termAtt = buffer.getAttribute(TermToBytesRefAttribute.class);
- }
- if (buffer.hasAttribute(PositionIncrementAttribute.class)) {
- posIncrAtt = buffer.getAttribute(PositionIncrementAttribute.class);
- }
- }
-
- int positionCount = 0;
- boolean severalTokensAtSamePosition = false;
-
- boolean hasMoreTokens = false;
- if (termAtt != null) {
- try {
- hasMoreTokens = buffer.incrementToken();
- while (hasMoreTokens) {
- numTokens++;
- int positionIncrement = (posIncrAtt != null) ? posIncrAtt.getPositionIncrement() : 1;
- if (positionIncrement != 0) {
- positionCount += positionIncrement;
- } else {
- severalTokensAtSamePosition = true;
- }
- hasMoreTokens = buffer.incrementToken();
- }
- } catch (IOException e) {
- // ignore
- }
- }
- try {
- // rewind the buffer stream
- buffer.reset();
-
- // close original stream - all tokens buffered
- source.close();
- }
- catch (IOException e) {
- // ignore
- }
-
- if (numTokens == 0)
- return null;
- else if (numTokens == 1) {
- BytesRef term = new BytesRef();
- try {
- boolean hasNext = buffer.incrementToken();
- assert hasNext == true;
- termAtt.toBytesRef(term);
- } catch (IOException e) {
- // safe to ignore, because we know the number of tokens
- }
- return newTermQuery(new Term(field, term));
- } else {
- if (severalTokensAtSamePosition || (!quoted && !autoGeneratePhraseQueries)) {
- if (positionCount == 1 || (!quoted && !autoGeneratePhraseQueries)) {
- // no phrase query:
- BooleanQuery q = newBooleanQuery(positionCount == 1);
-
- BooleanClause.Occur occur = positionCount > 1 && operator == AND_OPERATOR ?
- BooleanClause.Occur.MUST : BooleanClause.Occur.SHOULD;
-
- for (int i = 0; i < numTokens; i++) {
- BytesRef term = new BytesRef();
- try {
- boolean hasNext = buffer.incrementToken();
- assert hasNext == true;
- termAtt.toBytesRef(term);
- } catch (IOException e) {
- // safe to ignore, because we know the number of tokens
- }
-
- Query currentQuery = newTermQuery(
- new Term(field, term));
- q.add(currentQuery, occur);
- }
- return q;
- }
- else {
- // phrase query:
- MultiPhraseQuery mpq = newMultiPhraseQuery();
- mpq.setSlop(phraseSlop);
- List<Term> multiTerms = new ArrayList<Term>();
- int position = -1;
- for (int i = 0; i < numTokens; i++) {
- BytesRef term = new BytesRef();
- int positionIncrement = 1;
- try {
- boolean hasNext = buffer.incrementToken();
- assert hasNext == true;
- termAtt.toBytesRef(term);
- if (posIncrAtt != null) {
- positionIncrement = posIncrAtt.getPositionIncrement();
- }
- } catch (IOException e) {
- // safe to ignore, because we know the number of tokens
- }
-
- if (positionIncrement > 0 && multiTerms.size() > 0) {
- if (enablePositionIncrements) {
- mpq.add(multiTerms.toArray(new Term[0]),position);
- } else {
- mpq.add(multiTerms.toArray(new Term[0]));
- }
- multiTerms.clear();
- }
- position += positionIncrement;
- multiTerms.add(new Term(field, term));
- }
- if (enablePositionIncrements) {
- mpq.add(multiTerms.toArray(new Term[0]),position);
- } else {
- mpq.add(multiTerms.toArray(new Term[0]));
- }
- return mpq;
- }
- }
- else {
- PhraseQuery pq = newPhraseQuery();
- pq.setSlop(phraseSlop);
- int position = -1;
-
-
- for (int i = 0; i < numTokens; i++) {
- BytesRef term = new BytesRef();
- int positionIncrement = 1;
-
- try {
- boolean hasNext = buffer.incrementToken();
- assert hasNext == true;
- termAtt.toBytesRef(term);
- if (posIncrAtt != null) {
- positionIncrement = posIncrAtt.getPositionIncrement();
- }
- } catch (IOException e) {
- // safe to ignore, because we know the number of tokens
- }
-
- if (enablePositionIncrements) {
- position += positionIncrement;
- pq.add(new Term(field, term),position);
- } else {
- pq.add(new Term(field, term));
- }
- }
- return pq;
- }
- }
- }
-
-
-
- /**
- * Base implementation delegates to {@link #getFieldQuery(String,String,boolean)}.
- * This method may be overridden, for example, to return
- * a SpanNearQuery instead of a PhraseQuery.
- *
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getFieldQuery(String field, String queryText, int slop)
- throws ParseException {
- Query query = hasNewAPI ? getFieldQuery(field, queryText, true) : getFieldQuery(field, queryText);
-
- if (query instanceof PhraseQuery) {
- ((PhraseQuery) query).setSlop(slop);
- }
- if (query instanceof MultiPhraseQuery) {
- ((MultiPhraseQuery) query).setSlop(slop);
- }
-
- return query;
- }
-
-
- /**
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getRangeQuery(String field,
- String part1,
- String part2,
- boolean inclusive) throws ParseException
- {
- if (lowercaseExpandedTerms) {
- part1 = part1.toLowerCase();
- part2 = part2.toLowerCase();
- }
- try {
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
- df.setLenient(true);
- Date d1 = df.parse(part1);
- Date d2 = df.parse(part2);
- if (inclusive) {
- // The user can only specify the date, not the time, so make sure
- // the time is set to the latest possible time of that date to really
- // include all documents:
- Calendar cal = Calendar.getInstance(locale);
- cal.setTime(d2);
- cal.set(Calendar.HOUR_OF_DAY, 23);
- cal.set(Calendar.MINUTE, 59);
- cal.set(Calendar.SECOND, 59);
- cal.set(Calendar.MILLISECOND, 999);
- d2 = cal.getTime();
- }
- DateTools.Resolution resolution = getDateResolution(field);
- if (resolution == null) {
- // no default or field specific date resolution has been set,
- // use deprecated DateField to maintain compatibility with
- // pre-1.9 Lucene versions.
- part1 = DateField.dateToString(d1);
- part2 = DateField.dateToString(d2);
- } else {
- part1 = DateTools.dateToString(d1, resolution);
- part2 = DateTools.dateToString(d2, resolution);
- }
- }
- catch (Exception e) { }
-
- return newRangeQuery(field, part1, part2, inclusive);
- }
-
- /**
- * Builds a new BooleanQuery instance
- * @param disableCoord disable coord
- * @return new BooleanQuery instance
- */
- protected BooleanQuery newBooleanQuery(boolean disableCoord) {
- return new BooleanQuery(disableCoord);
- }
-
- /**
- * Builds a new BooleanClause instance
- * @param q sub query
- * @param occur how this clause should occur when matching documents
- * @return new BooleanClause instance
- */
- protected BooleanClause newBooleanClause(Query q, BooleanClause.Occur occur) {
- return new BooleanClause(q, occur);
- }
-
- /**
- * Builds a new TermQuery instance
- * @param term term
- * @return new TermQuery instance
- */
- protected Query newTermQuery(Term term){
- return new TermQuery(term);
- }
-
- /**
- * Builds a new PhraseQuery instance
- * @return new PhraseQuery instance
- */
- protected PhraseQuery newPhraseQuery(){
- return new PhraseQuery();
- }
-
- /**
- * Builds a new MultiPhraseQuery instance
- * @return new MultiPhraseQuery instance
- */
- protected MultiPhraseQuery newMultiPhraseQuery(){
- return new MultiPhraseQuery();
- }
-
- /**
- * Builds a new PrefixQuery instance
- * @param prefix Prefix term
- * @return new PrefixQuery instance
- */
- protected Query newPrefixQuery(Term prefix){
- PrefixQuery query = new PrefixQuery(prefix);
- query.setRewriteMethod(multiTermRewriteMethod);
- return query;
- }
-
- /**
- * Builds a new RegexpQuery instance
- * @param regexp Regexp term
- * @return new RegexpQuery instance
- */
- protected Query newRegexpQuery(Term regexp) {
- RegexpQuery query = new RegexpQuery(regexp);
- query.setRewriteMethod(multiTermRewriteMethod);
- return query;
- }
-
- /**
- * Builds a new FuzzyQuery instance
- * @param term Term
- * @param minimumSimilarity minimum similarity
- * @param prefixLength prefix length
- * @return new FuzzyQuery Instance
- */
- protected Query newFuzzyQuery(Term term, float minimumSimilarity, int prefixLength) {
- // FuzzyQuery doesn't yet allow constant score rewrite
- return new FuzzyQuery(term,minimumSimilarity,prefixLength);
- }
-
- /**
- * Builds a new TermRangeQuery instance
- * @param field Field
- * @param part1 min
- * @param part2 max
- * @param inclusive true if range is inclusive
- * @return new TermRangeQuery instance
- */
- protected Query newRangeQuery(String field, String part1, String part2, boolean inclusive) {
- final TermRangeQuery query = new TermRangeQuery(field, part1, part2, inclusive, inclusive, rangeCollator);
- query.setRewriteMethod(multiTermRewriteMethod);
- return query;
- }
-
- /**
- * Builds a new MatchAllDocsQuery instance
- * @return new MatchAllDocsQuery instance
- */
- protected Query newMatchAllDocsQuery() {
- return new MatchAllDocsQuery();
- }
-
- /**
- * Builds a new WildcardQuery instance
- * @param t wildcard term
- * @return new WildcardQuery instance
- */
- protected Query newWildcardQuery(Term t) {
- WildcardQuery query = new WildcardQuery(t);
- query.setRewriteMethod(multiTermRewriteMethod);
- return query;
- }
-
- /**
- * Factory method for generating query, given a set of clauses.
- * By default creates a boolean query composed of clauses passed in.
- *
- * Can be overridden by extending classes, to modify query being
- * returned.
- *
- * @param clauses List that contains {@link BooleanClause} instances
- * to join.
- *
- * @return Resulting {@link Query} object.
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getBooleanQuery(List<BooleanClause> clauses) throws ParseException {
- return getBooleanQuery(clauses, false);
- }
-
- /**
- * Factory method for generating query, given a set of clauses.
- * By default creates a boolean query composed of clauses passed in.
- *
- * Can be overridden by extending classes, to modify query being
- * returned.
- *
- * @param clauses List that contains {@link BooleanClause} instances
- * to join.
- * @param disableCoord true if coord scoring should be disabled.
- *
- * @return Resulting {@link Query} object.
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getBooleanQuery(List<BooleanClause> clauses, boolean disableCoord)
- throws ParseException
- {
- if (clauses.size()==0) {
- return null; // all clause words were filtered away by the analyzer.
- }
- BooleanQuery query = newBooleanQuery(disableCoord);
- for(final BooleanClause clause: clauses) {
- query.add(clause);
- }
- return query;
- }
-
- /**
- * Factory method for generating a query. Called when parser
- * parses an input term token that contains one or more wildcard
- * characters (? and *), but is not a prefix term token (one
- * that has just a single * character at the end)
- *<p>
- * Depending on settings, prefix term may be lower-cased
- * automatically. It will not go through the default Analyzer,
- * however, since normal Analyzers are unlikely to work properly
- * with wildcard templates.
- *<p>
- * Can be overridden by extending classes, to provide custom handling for
- * wildcard queries, which may be necessary due to missing analyzer calls.
- *
- * @param field Name of the field query will use.
- * @param termStr Term token that contains one or more wild card
- * characters (? or *), but is not simple prefix term
- *
- * @return Resulting {@link Query} built for the term
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getWildcardQuery(String field, String termStr) throws ParseException
- {
- if ("*".equals(field)) {
- if ("*".equals(termStr)) return newMatchAllDocsQuery();
- }
- if (!allowLeadingWildcard && (termStr.startsWith("*") || termStr.startsWith("?")))
- throw new ParseException("'*' or '?' not allowed as first character in WildcardQuery");
- if (lowercaseExpandedTerms) {
- termStr = termStr.toLowerCase();
- }
- Term t = new Term(field, termStr);
- return newWildcardQuery(t);
- }
-
- /**
- * Factory method for generating a query. Called when parser
- * parses an input term token that contains a regular expression
- * query.
- *<p>
- * Depending on settings, pattern term may be lower-cased
- * automatically. It will not go through the default Analyzer,
- * however, since normal Analyzers are unlikely to work properly
- * with regular expression templates.
- *<p>
- * Can be overridden by extending classes, to provide custom handling for
- * regular expression queries, which may be necessary due to missing analyzer
- * calls.
- *
- * @param field Name of the field query will use.
- * @param termStr Term token that contains a regular expression
- *
- * @return Resulting {@link Query} built for the term
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getRegexpQuery(String field, String termStr) throws ParseException
- {
- if (lowercaseExpandedTerms) {
- termStr = termStr.toLowerCase();
- }
- Term t = new Term(field, termStr);
- return newRegexpQuery(t);
- }
-
- /**
- * Factory method for generating a query (similar to
- * {@link #getWildcardQuery}). Called when parser parses an input term
- * token that uses prefix notation; that is, contains a single '*' wildcard
- * character as its last character. Since this is a special case
- * of generic wildcard term, and such a query can be optimized easily,
- * this usually results in a different query object.
- *<p>
- * Depending on settings, a prefix term may be lower-cased
- * automatically. It will not go through the default Analyzer,
- * however, since normal Analyzers are unlikely to work properly
- * with wildcard templates.
- *<p>
- * Can be overridden by extending classes, to provide custom handling for
- * wild card queries, which may be necessary due to missing analyzer calls.
- *
- * @param field Name of the field query will use.
- * @param termStr Term token to use for building term for the query
- * (<b>without</b> trailing '*' character!)
- *
- * @return Resulting {@link Query} built for the term
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getPrefixQuery(String field, String termStr) throws ParseException
- {
- if (!allowLeadingWildcard && termStr.startsWith("*"))
- throw new ParseException("'*' not allowed as first character in PrefixQuery");
- if (lowercaseExpandedTerms) {
- termStr = termStr.toLowerCase();
- }
- Term t = new Term(field, termStr);
- return newPrefixQuery(t);
- }
-
- /**
- * Factory method for generating a query (similar to
- * {@link #getWildcardQuery}). Called when parser parses
- * an input term token that has the fuzzy suffix (~) appended.
- *
- * @param field Name of the field query will use.
- * @param termStr Term token to use for building term for the query
- *
- * @return Resulting {@link Query} built for the term
- * @exception ParseException throw in overridden method to disallow
- */
- protected Query getFuzzyQuery(String field, String termStr, float minSimilarity) throws ParseException
- {
- if (lowercaseExpandedTerms) {
- termStr = termStr.toLowerCase();
- }
- Term t = new Term(field, termStr);
- return newFuzzyQuery(t, minSimilarity, fuzzyPrefixLength);
- }
-
- /**
- * Returns a String where the escape char has been
- * removed, or kept only once if there was a double escape.
- *
- * Supports escaped unicode characters, e. g. translates
- * <code>\\u0041</code> to <code>A</code>.
- *
- */
- private String discardEscapeChar(String input) throws ParseException {
- // Create char array to hold unescaped char sequence
- char[] output = new char[input.length()];
-
- // The length of the output can be less than the input
- // due to discarded escape chars. This variable holds
- // the actual length of the output
- int length = 0;
-
- // We remember whether the last processed character was
- // an escape character
- boolean lastCharWasEscapeChar = false;
-
- // The multiplier the current unicode digit must be multiplied with.
- // E. g. the first digit must be multiplied with 16^3, the second with 16^2...
- int codePointMultiplier = 0;
-
- // Used to calculate the codepoint of the escaped unicode character
- int codePoint = 0;
-
- for (int i = 0; i < input.length(); i++) {
- char curChar = input.charAt(i);
- if (codePointMultiplier > 0) {
- codePoint += hexToInt(curChar) * codePointMultiplier;
- codePointMultiplier >>>= 4;
- if (codePointMultiplier == 0) {
- output[length++] = (char)codePoint;
- codePoint = 0;
- }
- } else if (lastCharWasEscapeChar) {
- if (curChar == 'u') {
- // found an escaped unicode character
- codePointMultiplier = 16 * 16 * 16;
- } else {
- // this character was escaped
- output[length] = curChar;
- length++;
- }
- lastCharWasEscapeChar = false;
- } else {
- if (curChar == '\\') {
- lastCharWasEscapeChar = true;
- } else {
- output[length] = curChar;
- length++;
- }
- }
- }
-
- if (codePointMultiplier > 0) {
- throw new ParseException("Truncated unicode escape sequence.");
- }
-
- if (lastCharWasEscapeChar) {
- throw new ParseException("Term can not end with escape character.");
- }
-
- return new String(output, 0, length);
- }
-
- /** Returns the numeric value of the hexadecimal character */
- private static final int hexToInt(char c) throws ParseException {
- if ('0' <= c && c <= '9') {
- return c - '0';
- } else if ('a' <= c && c <= 'f'){
- return c - 'a' + 10;
- } else if ('A' <= c && c <= 'F') {
- return c - 'A' + 10;
- } else {
- throw new ParseException("None-hex character in unicode escape sequence: " + c);
- }
- }
-
- /**
- * Returns a String where those characters that QueryParser
- * expects to be escaped are escaped by a preceding <code>\</code>.
- */
- public static String escape(String s) {
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- // These characters are part of the query syntax and must be escaped
- if (c == '\\' || c == '+' || c == '-' || c == '!' || c == '(' || c == ')' || c == ':'
- || c == '^' || c == '[' || c == ']' || c == '\"' || c == '{' || c == '}' || c == '~'
- || c == '*' || c == '?' || c == '|' || c == '&') {
- sb.append('\\');
- }
- sb.append(c);
- }
- return sb.toString();
+ init(matchVersion, f, a);
}
// * Query ::= ( Clause )*
@@ -1355,14 +302,7 @@ public class QueryParser implements Quer
jj_consume_token(-1);
throw new ParseException();
}
- if (boost != null) {
- float f = (float)1.0;
- try {
- f = Float.valueOf(boost.image).floatValue();
- q.setBoost(f);
- } catch (Exception ignored) { }
- }
- {if (true) return q;}
+ {if (true) return handleBoost(q, boost);}
throw new Error("Missing return statement in function");
}
@@ -1372,6 +312,8 @@ public class QueryParser implements Quer
boolean wildcard = false;
boolean fuzzy = false;
boolean regexp = false;
+ boolean startInc=false;
+ boolean endInc=false;
Query q;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STAR:
@@ -1435,38 +377,17 @@ public class QueryParser implements Quer
jj_la1[11] = jj_gen;
;
}
- String termImage=discardEscapeChar(term.image);
- if (wildcard) {
- q = getWildcardQuery(field, termImage);
- } else if (prefix) {
- q = getPrefixQuery(field,
- discardEscapeChar(term.image.substring
- (0, term.image.length()-1)));
- } else if (regexp) {
- q = getRegexpQuery(field, term.image.substring(1, term.image.length()-1));
- } else if (fuzzy) {
- float fms = fuzzyMinSim;
- try {
- fms = Float.valueOf(fuzzySlop.image.substring(1)).floatValue();
- } catch (Exception ignored) { }
- if(fms < 0.0f){
- {if (true) throw new ParseException("Minimum similarity for a FuzzyQuery has to be between 0.0f and 1.0f !");}
- } else if (fms >= 1.0f && fms != (int) fms) {
- {if (true) throw new ParseException("Fractional edit distances are not allowed!");}
- }
- q = getFuzzyQuery(field, termImage,fms);
- } else {
- q = hasNewAPI ? getFieldQuery(field, termImage, false) : getFieldQuery(field, termImage);
- }
+ q = handleBareTokenQuery(field, term, fuzzySlop, prefix, wildcard, fuzzy, regexp);
break;
case RANGEIN_START:
- jj_consume_token(RANGEIN_START);
+ case RANGEEX_START:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case RANGEIN_GOOP:
- goop1 = jj_consume_token(RANGEIN_GOOP);
+ case RANGEIN_START:
+ jj_consume_token(RANGEIN_START);
+ startInc=true;
break;
- case RANGEIN_QUOTED:
- goop1 = jj_consume_token(RANGEIN_QUOTED);
+ case RANGEEX_START:
+ jj_consume_token(RANGEEX_START);
break;
default:
jj_la1[12] = jj_gen;
@@ -1474,95 +395,72 @@ public class QueryParser implements Quer
throw new ParseException();
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case RANGEIN_TO:
- jj_consume_token(RANGEIN_TO);
+ case RANGE_GOOP:
+ goop1 = jj_consume_token(RANGE_GOOP);
break;
- default:
- jj_la1[13] = jj_gen;
- ;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case RANGEIN_GOOP:
- goop2 = jj_consume_token(RANGEIN_GOOP);
- break;
- case RANGEIN_QUOTED:
- goop2 = jj_consume_token(RANGEIN_QUOTED);
+ case RANGE_QUOTED:
+ goop1 = jj_consume_token(RANGE_QUOTED);
break;
default:
- jj_la1[14] = jj_gen;
+ jj_la1[13] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- jj_consume_token(RANGEIN_END);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case CARAT:
- jj_consume_token(CARAT);
- boost = jj_consume_token(NUMBER);
+ case RANGE_TO:
+ jj_consume_token(RANGE_TO);
break;
default:
- jj_la1[15] = jj_gen;
+ jj_la1[14] = jj_gen;
;
}
- if (goop1.kind == RANGEIN_QUOTED) {
- goop1.image = goop1.image.substring(1, goop1.image.length()-1);
- }
- if (goop2.kind == RANGEIN_QUOTED) {
- goop2.image = goop2.image.substring(1, goop2.image.length()-1);
- }
- q = getRangeQuery(field, discardEscapeChar(goop1.image), discardEscapeChar(goop2.image), true);
- break;
- case RANGEEX_START:
- jj_consume_token(RANGEEX_START);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case RANGEEX_GOOP:
- goop1 = jj_consume_token(RANGEEX_GOOP);
+ case RANGE_GOOP:
+ goop2 = jj_consume_token(RANGE_GOOP);
break;
- case RANGEEX_QUOTED:
- goop1 = jj_consume_token(RANGEEX_QUOTED);
+ case RANGE_QUOTED:
+ goop2 = jj_consume_token(RANGE_QUOTED);
break;
default:
- jj_la1[16] = jj_gen;
+ jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case RANGEEX_TO:
- jj_consume_token(RANGEEX_TO);
+ case RANGEIN_END:
+ jj_consume_token(RANGEIN_END);
+ endInc=true;
break;
- default:
- jj_la1[17] = jj_gen;
- ;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case RANGEEX_GOOP:
- goop2 = jj_consume_token(RANGEEX_GOOP);
- break;
- case RANGEEX_QUOTED:
- goop2 = jj_consume_token(RANGEEX_QUOTED);
+ case RANGEEX_END:
+ jj_consume_token(RANGEEX_END);
break;
default:
- jj_la1[18] = jj_gen;
+ jj_la1[16] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- jj_consume_token(RANGEEX_END);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CARAT:
jj_consume_token(CARAT);
boost = jj_consume_token(NUMBER);
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[17] = jj_gen;
;
}
- if (goop1.kind == RANGEEX_QUOTED) {
+ boolean startOpen=false;
+ boolean endOpen=false;
+ if (goop1.kind == RANGE_QUOTED) {
goop1.image = goop1.image.substring(1, goop1.image.length()-1);
+ } else if ("*".equals(goop1.image)) {
+ startOpen=true;
}
- if (goop2.kind == RANGEEX_QUOTED) {
+ if (goop2.kind == RANGE_QUOTED) {
goop2.image = goop2.image.substring(1, goop2.image.length()-1);
+ } else if ("*".equals(goop2.image)) {
+ endOpen=true;
}
-
- q = getRangeQuery(field, discardEscapeChar(goop1.image), discardEscapeChar(goop2.image), false);
+ q = getRangeQuery(field, startOpen ? null : discardEscapeChar(goop1.image), endOpen ? null : discardEscapeChar(goop2.image), startInc, endInc);
break;
case QUOTED:
term = jj_consume_token(QUOTED);
@@ -1571,7 +469,7 @@ public class QueryParser implements Quer
fuzzySlop = jj_consume_token(FUZZY_SLOP);
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[18] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1580,41 +478,17 @@ public class QueryParser implements Quer
boost = jj_consume_token(NUMBER);
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[19] = jj_gen;
;
}
- int s = phraseSlop;
-
- if (fuzzySlop != null) {
- try {
- s = Float.valueOf(fuzzySlop.image.substring(1)).intValue();
- }
- catch (Exception ignored) { }
- }
- q = getFieldQuery(field, discardEscapeChar(term.image.substring(1, term.image.length()-1)), s);
+ q = handleQuotedTerm(field, term, fuzzySlop);
break;
default:
- jj_la1[22] = jj_gen;
+ jj_la1[20] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- if (boost != null) {
- float f = (float) 1.0;
- try {
- f = Float.valueOf(boost.image).floatValue();
- }
- catch (Exception ignored) {
- /* Should this be handled somehow? (defaults to "no boost", if
- * boost number is invalid)
- */
- }
-
- // avoid boosting null queries, such as those caused by stop words
- if (q != null) {
- q.setBoost(f);
- }
- }
- {if (true) return q;}
+ {if (true) return handleBoost(q, boost);}
throw new Error("Missing return statement in function");
}
@@ -1625,16 +499,6 @@ public class QueryParser implements Quer
finally { jj_save(0, xla); }
}
- private boolean jj_3_1() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_2()) {
- jj_scanpos = xsp;
- if (jj_3R_3()) return true;
- }
- return false;
- }
-
private boolean jj_3R_3() {
if (jj_scan_token(STAR)) return true;
if (jj_scan_token(COLON)) return true;
@@ -1647,6 +511,16 @@ public class QueryParser implements Quer
return false;
}
+ private boolean jj_3_1() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_2()) {
+ jj_scanpos = xsp;
+ if (jj_3R_3()) return true;
+ }
+ return false;
+ }
+
/** Generated Token Manager. */
public QueryParserTokenManager token_source;
/** Current token. */
@@ -1657,18 +531,13 @@ public class QueryParser implements Quer
private Token jj_scanpos, jj_lastpos;
private int jj_la;
private int jj_gen;
- final private int[] jj_la1 = new int[23];
+ final private int[] jj_la1 = new int[21];
static private int[] jj_la1_0;
- static private int[] jj_la1_1;
static {
jj_la1_init_0();
- jj_la1_init_1();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[] {0x300,0x300,0x1c00,0x1c00,0x7ed3f00,0x90000,0x20000,0x7ed2000,0x4e90000,0x100000,0x100000,0x20000,0x60000000,0x8000000,0x60000000,0x20000,0x0,0x80000000,0x0,0x20000,0x100000,0x20000,0x7ed0000,};
- }
- private static void jj_la1_init_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6,0x0,0x6,0x0,0x0,0x0,0x0,};
+ jj_la1_0 = new int[] {0x300,0x300,0x1c00,0x1c00,0x7ed3f00,0x90000,0x20000,0x7ed2000,0x4e90000,0x100000,0x100000,0x20000,0x3000000,0xc0000000,0x8000000,0xc0000000,0x30000000,0x20000,0x100000,0x20000,0x7ed0000,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[1];
private boolean jj_rescan = false;
@@ -1680,7 +549,7 @@ public class QueryParser implements Quer
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 23; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 21; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1690,7 +559,7 @@ public class QueryParser implements Quer
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 23; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 21; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1700,7 +569,7 @@ public class QueryParser implements Quer
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 23; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 21; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1710,7 +579,7 @@ public class QueryParser implements Quer
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 23; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 21; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1822,24 +691,21 @@ public class QueryParser implements Quer
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[35];
+ boolean[] la1tokens = new boolean[32];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 23; i++) {
+ for (int i = 0; i < 21; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
la1tokens[j] = true;
}
- if ((jj_la1_1[i] & (1<<j)) != 0) {
- la1tokens[32+j] = true;
- }
}
}
}
- for (int i = 0; i < 35; i++) {
+ for (int i = 0; i < 32; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
@@ -1899,19 +765,4 @@ public class QueryParser implements Quer
JJCalls next;
}
- /**
- * Command line tool to test QueryParser, using {@link org.apache.lucene.analysis.SimpleAnalyzer}.
- * Usage:<br>
- * <code>java org.apache.lucene.queryParser.QueryParser <input></code>
- */
-// public static void main(String[] args) throws Exception {
-// if (args.length == 0) {
-// System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
-// System.exit(0);
-// }
-// QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field",
-// new org.apache.lucene.analysis.SimpleAnalyzer());
-// Query q = qp.parse(args[0]);
-// System.out.println(q.toString("field"));
-// }
}