You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by mi...@apache.org on 2009/08/13 22:08:59 UTC
svn commit: r804016 - in /lucene/java/trunk: ./
contrib/queryparser/src/java/ src/java/org/apache/lucene/queryParser/
Author: mikemccand
Date: Thu Aug 13 20:08:58 2009
New Revision: 804016
URL: http://svn.apache.org/viewvc?rev=804016&view=rev
Log:
LUCENE-1802: undeprecate current QueryParser
Modified:
lucene/java/trunk/CHANGES.txt
lucene/java/trunk/contrib/queryparser/src/java/overview.html
lucene/java/trunk/src/java/org/apache/lucene/queryParser/CharStream.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/FastCharStream.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/ParseException.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.jj
lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserConstants.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/Token.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/TokenMgrError.java
lucene/java/trunk/src/java/org/apache/lucene/queryParser/package.html
Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Thu Aug 13 20:08:58 2009
@@ -367,12 +367,7 @@
34. LUCENE-1460: Changed TokenStreams/TokenFilters in contrib to
use the new TokenStream API. (Robert Muir, Michael Busch)
-35. LUCENE-1567: Deprecated Queryparser, which will be replaced by a
- new QueryParser framework in Lucene 3.0, that is currently located
- in contrib. (see New Features 35.)
- (Luis Alves and Adriano Campos via Michael Busch)
-
-36. LUCENE-1748: LUCENE-1001 introduced PayloadSpans, but this was a back
+35. LUCENE-1748: LUCENE-1001 introduced PayloadSpans, but this was a back
compat break and caused custom SpanQuery implementations to fail at runtime
in a variety of ways. This issue attempts to remedy things by causing
a compile time break on custom SpanQuery implementations and removing
@@ -657,23 +652,16 @@
multiple fields with the same name are added to a document.
(Mike McCandless, Mark Miller, Michael Busch)
-32. LUCENE-1567: Added a new QueryParser framework to contrib, that
- allows implementing a new query syntax in a flexible and efficient
- way. This new QueryParser will be moved to Lucene's core in release
- 3.0 and will then replace the current core QueryParser, which
- has been deprecated with this patch.
- (Luis Alves and Adriano Campos via Michael Busch)
-
-33. LUCENE-1776: Add an option to not collect payloads for an ordered
+32. LUCENE-1776: Add an option to not collect payloads for an ordered
SpanNearQuery. Payloads were not lazily loaded in this case as
the javadocs implied. If you have payloads and want to use an ordered
SpanNearQuery that does not need to use the payloads, you can
disable loading them with a new constructor switch. (Mark Miller)
-34. LUCENE-1341: Added BoostingNearQuery to enable SpanNearQuery functionality
+33. LUCENE-1341: Added BoostingNearQuery to enable SpanNearQuery functionality
with payloads (Peter Keegan, Grant Ingersoll)
-35. LUCENE-1790: Added BoostingFunctionTermQuery to enable scoring of payloads
+34. LUCENE-1790: Added BoostingFunctionTermQuery to enable scoring of payloads
based on the maximum payload seen for a document.
Slight refactoring of Similarity and other payload queries (Grant Ingersoll)
Modified: lucene/java/trunk/contrib/queryparser/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/overview.html?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/overview.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/overview.html Thu Aug 13 20:08:58 2009
@@ -23,7 +23,7 @@
<h2>Apache Lucene Flexible Query Parser</h2>
<p>
-This contrib project contains the new Lucene query parser implementation, which is going to replace the old query parser on Lucene 3.0.
+This contrib project contains the new Lucene query parser implementation, which matches the syntax of the core QueryParser but offers a more modular architecture to enable customization.
</p>
<p>
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/CharStream.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/CharStream.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/CharStream.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/CharStream.java Thu Aug 13 20:08:58 2009
@@ -15,8 +15,6 @@
* column number and the String that constitutes a token and are not used
* by the lexer. Hence their implementation won't affect the generated lexer's
* operation.
- *
- * @deprecated this class will be removed in Lucene 3.0, when the {@link QueryParser} is removed
*/
public interface CharStream {
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/FastCharStream.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/FastCharStream.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/FastCharStream.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/FastCharStream.java Thu Aug 13 20:08:58 2009
@@ -25,9 +25,6 @@
* this does not do line-number counting, but instead keeps track of the
* character position of the token in the input, as required by Lucene's {@link
* org.apache.lucene.analysis.Token} API.
- *
- * @deprecated this class will be removed in Lucene 3.0, when the {@link QueryParser} is removed
- *
* */
public final class FastCharStream implements CharStream {
char[] buffer = null;
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java Thu Aug 13 20:08:58 2009
@@ -31,9 +31,6 @@
/**
* A QueryParser which constructs queries to search multiple fields.
*
- * @deprecated use the equivalent class defined in the new <tt>queryparser</tt> project,
- * currently located in contrib: org.apache.lucene.queryParser.original.OriginalQueryParserHelper
- *
* @version $Revision$
*/
public class MultiFieldQueryParser extends QueryParser
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/ParseException.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/ParseException.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/ParseException.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/ParseException.java Thu Aug 13 20:08:58 2009
@@ -10,9 +10,6 @@
*
* You can modify this class to customize your error reporting
* mechanisms so long as you retain the public fields.
- *
- * @deprecated use the equivalent class defined in the new <tt>queryparser</tt> project,
- * currently located in contrib: org.apache.lucene.queryParser.original.parser.ParseException
*/
public class ParseException extends Exception {
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.java Thu Aug 13 20:08:58 2009
@@ -96,10 +96,11 @@
* use a different method for date conversion.
* </p>
*
- * <p>Note that QueryParser is <em>not</em> thread-safe.</p>
+ * <p>Note that QueryParser is <em>not</em> thread-safe.</p>
*
- * @deprecated use the equivalent class defined in the new <tt>queryparser</tt> project,
- * currently located in contrib: org.apache.lucene.queryParser.original.OriginalQueryParserHelper
+ * <p><b>NOTE</b>: there is a new QueryParser in contrib, which matches
+ * the same syntax as this class, but is more modular,
+ * enabling substantial customization to how a query is created.
*/
public class QueryParser implements QueryParserConstants {
@@ -1590,6 +1591,16 @@
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;
@@ -1602,16 +1613,6 @@
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. */
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.jj?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.jj (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParser.jj Thu Aug 13 20:08:58 2009
@@ -121,10 +121,10 @@
* </p>
*
* <p>Note that QueryParser is <em>not</em> thread-safe.</p>
- *
- * @deprecated use the equivalent class defined in the new <tt>queryparser</tt> project,
- * currently located in contrib: org.apache.lucene.queryParser.original.LuceneQueryParserHelper
- *
+ *
+ * <p><b>NOTE</b>: there is a new QueryParser in contrib, which matches
+ * the same syntax as this class, but is more modular,
+ * enabling substantial customization to how a query is created.
*/
public class QueryParser {
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserConstants.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserConstants.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserConstants.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserConstants.java Thu Aug 13 20:08:58 2009
@@ -5,10 +5,6 @@
/**
* Token literal values and constants.
* Generated by org.javacc.parser.OtherFilesGen#start()
- *
- * @deprecated use the equivalent class defined in the new <tt>queryparser</tt> project,
- * currently located in contrib: org.apache.lucene.queryParser.original.parser.TextParserConstants
- *
*/
public interface QueryParserConstants {
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java Thu Aug 13 20:08:58 2009
@@ -34,11 +34,7 @@
import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.util.Parameter;
-/** Token Manager.
- *
- * @deprecated use the equivalent class defined in the new <tt>queryparser</tt> project,
- * currently located in contrib: org.apache.lucene.queryParser.original.parser.TextParserTokenManager
- */
+/** Token Manager. */
public class QueryParserTokenManager implements QueryParserConstants
{
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/Token.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/Token.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/Token.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/Token.java Thu Aug 13 20:08:58 2009
@@ -4,10 +4,6 @@
/**
* Describes the input token stream.
- *
- * @deprecated use the equivalent class defined in the new <tt>queryparser</tt> project,
- * currently located in contrib: org.apache.lucene.queryParser.original.parser.Token
- *
*/
public class Token {
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/TokenMgrError.java?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/TokenMgrError.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/TokenMgrError.java Thu Aug 13 20:08:58 2009
@@ -2,12 +2,7 @@
/* JavaCCOptions: */
package org.apache.lucene.queryParser;
-/** Token Manager Error.
- *
- * @deprecated use the equivalent class defined in the new <tt>queryparser</tt> project,
- * currently located in contrib: org.apache.lucene.queryParser.original.parser.TokenMgrError
- *
- */
+/** Token Manager Error. */
public class TokenMgrError extends Error
{
Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/queryParser/package.html?rev=804016&r1=804015&r2=804016&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/package.html (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/package.html Thu Aug 13 20:08:58 2009
@@ -20,7 +20,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body>
-NOTE: Please look into lucene contrib/queryparser for the new flexible queryparser api.
A simple query parser implemented with JavaCC.
<p>Note that JavaCC defines lots of public classes, methods and fields
@@ -28,5 +27,9 @@
Sorry.
<p>Note that because JavaCC defines a class named <tt>Token</tt>, <tt>org.apache.lucene.analysis.Token</tt>
must always be fully qualified in source code in this package.
+
+<p><b>NOTE</b>: contrib/queryparser has an alternative queryparser that matches the syntax of this one, but is more modular,
+enabling substantial customization to how a query is created.
+
</body>
</html>