Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-1819: MatchAllDocsQuery.toString(field) should produce output that is parsable by the QueryParser. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@805624 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2009-08-18 23:09:18 +00:00
parent f720852e37
commit 7700fa3626
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -490,6 +490,9 @@ Bug fixes
23. LUCENE-1801: Changed all Tokenizers or TokenStreams in core/contrib) 23. LUCENE-1801: Changed all Tokenizers or TokenStreams in core/contrib)
that are the source of Tokens to always call that are the source of Tokens to always call
AttributeSource.clearAttributes() first. (Uwe Schindler) AttributeSource.clearAttributes() first. (Uwe Schindler)
24. LUCENE-1819: MatchAllDocsQuery.toString(field) should produce output
that is parsable by the QueryParser. (John Wang, Mark Miller)
New features New features

2
src/java/org/apache/lucene/search/MatchAllDocsQuery.java
View File

@ -151,7 +151,7 @@ public class MatchAllDocsQuery extends Query {
public String toString(String field) { public String toString(String field) {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("MatchAllDocsQuery"); buffer.append("*:*");
buffer.append(ToStringUtils.boost(getBoost())); buffer.append(ToStringUtils.boost(getBoost()));
return buffer.toString(); return buffer.toString();
} }

22
src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
View File

@ -18,26 +18,30 @@ package org.apache.lucene.search;
import java.io.IOException; import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.Version;
/** /**
* Tests MatchAllDocsQuery. * Tests MatchAllDocsQuery.
* *
*/ */
public class TestMatchAllDocsQuery extends LuceneTestCase { public class TestMatchAllDocsQuery extends LuceneTestCase {
private Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_CURRENT);
public void testQuery() throws IOException {
public void testQuery() throws Exception {
RAMDirectory dir = new RAMDirectory(); RAMDirectory dir = new RAMDirectory();
IndexWriter iw = new IndexWriter(dir, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED); IndexWriter iw = new IndexWriter(dir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
iw.setMaxBufferedDocs(2); // force multi-segment iw.setMaxBufferedDocs(2); // force multi-segment
addDoc("one", iw, 1f); addDoc("one", iw, 1f);
addDoc("two", iw, 20f); addDoc("two", iw, 20f);
@ -95,6 +99,18 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
hits = is.search(new MatchAllDocsQuery(), null, 1000).scoreDocs; hits = is.search(new MatchAllDocsQuery(), null, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
// test parsable toString()
QueryParser qp = new QueryParser("key", analyzer);
hits = is.search(qp.parse(new MatchAllDocsQuery().toString()), null, 1000).scoreDocs;
assertEquals(2, hits.length);
// test parsable toString() with non default boost
Query maq = new MatchAllDocsQuery();
maq.setBoost(2.3f);
Query pq = qp.parse(maq.toString());
hits = is.search(pq, null, 1000).scoreDocs;
assertEquals(2, hits.length);
is.close(); is.close();
ir.close(); ir.close();
dir.close(); dir.close();