You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/05/28 10:31:46 UTC
svn commit: r1682170 [2/2] - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/util/fst/ lucene/suggest/
lucene/suggest/src/java/org/apache/lucene/search/suggest/document/
lucene/suggest/src/test/org/apac...
Copied: lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java (from r1682158, lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java?p2=lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java&p1=lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java&r1=1682158&r2=1682170&rev=1682170&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java Thu May 28 08:31:45 2015
@@ -58,7 +58,7 @@ public class TestFuzzyCompletionQuery ex
document.add(new SuggestField("suggest_field", "suaggestion", 4));
document.add(new SuggestField("suggest_field", "ssuggestion", 1));
iw.addDocument(document);
- document.clear();
+ document = new Document();
document.add(new SuggestField("suggest_field", "sugfoo", 1));
iw.addDocument(document);
@@ -87,13 +87,13 @@ public class TestFuzzyCompletionQuery ex
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
Document document = new Document();
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type1"), "sduggestion", 1));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type2"), "sudggestion", 1));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type3"), "sugdgestion", 1));
- iw.addDocument(document);
- document.clear();
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type4"), "suggdestion", 1));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type4"), "suggestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type1"), "sduggestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type2"), "sudggestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type3"), "sugdgestion", 1));
+ iw.addDocument(document);
+ document = new Document();
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type4"), "suggdestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type4"), "suggestion", 1));
iw.addDocument(document);
if (rarely()) {
@@ -122,13 +122,13 @@ public class TestFuzzyCompletionQuery ex
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
Document document = new Document();
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type1"), "sduggestion", 1));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type2"), "sudggestion", 1));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type3"), "sugdgestion", 1));
- iw.addDocument(document);
- document.clear();
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type4"), "suggdestion", 1));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type4"), "suggestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type1"), "sduggestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type2"), "sudggestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type3"), "sugdgestion", 1));
+ iw.addDocument(document);
+ document = new Document();
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type4"), "suggdestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type4"), "suggestion", 1));
iw.addDocument(document);
if (rarely()) {
Copied: lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java (from r1682158, lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java?p2=lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java&p1=lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java&r1=1682158&r2=1682170&rev=1682170&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java Thu May 28 08:31:45 2015
@@ -72,7 +72,7 @@ public class TestPrefixCompletionQuery e
document.add(new SuggestField("suggest_field", "abd", 4));
document.add(new SuggestField("suggest_field", "The Foo Fighters", 2));
iw.addDocument(document);
- document.clear();
+ document = new Document();
document.add(new SuggestField("suggest_field", "abcdd", 5));
iw.addDocument(document);
@@ -95,12 +95,11 @@ public class TestPrefixCompletionQuery e
Analyzer analyzer = new MockAnalyzer(random());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
int num = Math.min(1000, atLeast(10));
- Document document = new Document();
for (int i = 0; i < num; i++) {
+ Document document = new Document();
document.add(new SuggestField("suggest_field", "abc_" + i, i));
document.add(new IntField("filter_int_fld", i, Field.Store.NO));
iw.addDocument(document);
- document.clear();
if (usually()) {
iw.commit();
@@ -151,12 +150,12 @@ public class TestPrefixCompletionQuery e
document.add(new SuggestField("suggest_field", "apples", 3));
iw.addDocument(document);
- document.clear();
+ document = new Document();
document.add(new IntField("filter_int_fld", 10, Field.Store.NO));
document.add(new SuggestField("suggest_field", "applle", 4));
iw.addDocument(document);
- document.clear();
+ document = new Document();
document.add(new IntField("filter_int_fld", 4, Field.Store.NO));
document.add(new SuggestField("suggest_field", "apple", 5));
iw.addDocument(document);
Copied: lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java (from r1682158, lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java?p2=lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java&p1=lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java&r1=1682158&r2=1682170&rev=1682170&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java Thu May 28 08:31:45 2015
@@ -58,7 +58,7 @@ public class TestRegexCompletionQuery ex
document.add(new SuggestField("suggest_field", "asuggestion", 2));
document.add(new SuggestField("suggest_field", "ssuggestion", 3));
iw.addDocument(document);
- document.clear();
+ document = new Document();
document.add(new SuggestField("suggest_field", "wsuggestion", 4));
iw.addDocument(document);
@@ -83,13 +83,13 @@ public class TestRegexCompletionQuery ex
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
Document document = new Document();
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type1"), "sduggestion", 5));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type2"), "sudggestion", 4));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type3"), "sugdgestion", 3));
- iw.addDocument(document);
- document.clear();
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type4"), "suggdestion", 2));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type4"), "suggestion", 1));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type1"), "sduggestion", 5));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type2"), "sudggestion", 4));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type3"), "sugdgestion", 3));
+ iw.addDocument(document);
+ document = new Document();
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type4"), "suggdestion", 2));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type4"), "suggestion", 1));
iw.addDocument(document);
if (rarely()) {
@@ -115,15 +115,15 @@ public class TestRegexCompletionQuery ex
public void testRegexContextQueryWithBoost() throws Exception {
Analyzer analyzer = new MockAnalyzer(random());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
- Document document = new Document();
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type1"), "sduggestion", 5));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type2"), "sudggestion", 4));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type3"), "sugdgestion", 3));
- iw.addDocument(document);
- document.clear();
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type4"), "suggdestion", 2));
- document.add(new ContextSuggestField("suggest_field", Collections.singletonList("type4"), "suggestion", 1));
+ Document document = new Document();
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type1"), "sduggestion", 5));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type2"), "sudggestion", 4));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type3"), "sugdgestion", 3));
+ iw.addDocument(document);
+ document = new Document();
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type4"), "suggdestion", 2));
+ document.add(new ContextSuggestField("suggest_field", Collections.<CharSequence>singletonList("type4"), "suggestion", 1));
iw.addDocument(document);
if (rarely()) {
Copied: lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java (from r1682158, lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java?p2=lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java&p1=lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java&r1=1682158&r2=1682170&rev=1682170&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java Thu May 28 08:31:45 2015
@@ -38,7 +38,6 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.TermsQuery;
import org.apache.lucene.search.Filter;
@@ -176,10 +175,10 @@ public class TestSuggestField extends Lu
int num = Math.min(1000, atLeast(10));
- Document document = new Document();
int numLive = 0;
List<Entry> expectedEntries = new ArrayList<>();
for (int i = 0; i < num; i++) {
+ Document document = new Document();
document.add(new SuggestField("suggest_field", "abc_" + i, num - i));
if (i % 2 == 0) {
document.add(newStringField("str_field", "delete", Field.Store.YES));
@@ -189,7 +188,6 @@ public class TestSuggestField extends Lu
document.add(newStringField("str_field", "no_delete", Field.Store.YES));
}
iw.addDocument(document);
- document.clear();
if (usually()) {
iw.commit();
@@ -213,12 +211,11 @@ public class TestSuggestField extends Lu
Analyzer analyzer = new MockAnalyzer(random());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
int num = Math.min(1000, atLeast(10));
- Document document = new Document();
for (int i = 0; i < num; i++) {
+ Document document = new Document();
document.add(new SuggestField("suggest_field", "abc_" + i, i));
document.add(newStringField("str_fld", "deleted", Field.Store.NO));
iw.addDocument(document);
- document.clear();
if (usually()) {
iw.commit();
@@ -243,12 +240,11 @@ public class TestSuggestField extends Lu
// using IndexWriter instead of RandomIndexWriter
IndexWriter iw = new IndexWriter(dir, iwcWithSuggestField(analyzer, "suggest_field"));
int num = Math.min(1000, atLeast(10));
- Document document = new Document();
for (int i = 0; i < num; i++) {
+ Document document = new Document();
document.add(new SuggestField("suggest_field", "abc_" + i, i));
document.add(newStringField("delete", "delete", Field.Store.NO));
iw.addDocument(document);
- document.clear();
if (usually()) {
iw.commit();
@@ -273,12 +269,11 @@ public class TestSuggestField extends Lu
// using IndexWriter instead of RandomIndexWriter
IndexWriter iw = new IndexWriter(dir, iwcWithSuggestField(analyzer, "suggest_field"));
int num = Math.min(1000, atLeast(10));
- Document document = new Document();
for (int i = 1; i <= num; i++) {
+ Document document = new Document();
document.add(new SuggestField("suggest_field", "abc_" + i, i));
document.add(new IntField("weight_fld", i, Field.Store.YES));
iw.addDocument(document);
- document.clear();
if (usually()) {
iw.commit();
@@ -306,7 +301,8 @@ public class TestSuggestField extends Lu
document.add(new SuggestField("sug_field_1", "apple", 4));
document.add(new SuggestField("sug_field_2", "april", 3));
iw.addDocument(document);
- document.clear();
+
+ document = new Document();
document.add(new SuggestField("sug_field_1", "aples", 3));
document.add(new SuggestField("sug_field_2", "apartment", 2));
iw.addDocument(document);
@@ -340,16 +336,15 @@ public class TestSuggestField extends Lu
Analyzer analyzer = new MockAnalyzer(random());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
int num = Math.min(1000, atLeast(10));
- Document document = new Document();
// have segments of 4 documents
// with descending suggestion weights
// suggest should early terminate for
// segments with docs having lower suggestion weights
for (int i = num; i > 0; i--) {
+ Document document = new Document();
document.add(new SuggestField("suggest_field", "abc_" + i, i));
iw.addDocument(document);
- document.clear();
if (i % 4 == 0) {
iw.commit();
}
@@ -369,18 +364,17 @@ public class TestSuggestField extends Lu
Analyzer analyzer = new MockAnalyzer(random());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
int num = Math.min(1000, atLeast(10));
- Document document = new Document();
List<Entry> entries = new ArrayList<>();
// ensure at least some segments have no suggest field
for (int i = num; i > 0; i--) {
+ Document document = new Document();
if (random().nextInt(4) == 1) {
document.add(new SuggestField("suggest_field", "abc_" + i, i));
entries.add(new Entry("abc_" + i, i));
}
document.add(new IntField("weight_fld", i, Field.Store.YES));
iw.addDocument(document);
- document.clear();
if (usually()) {
iw.commit();
}
@@ -401,13 +395,12 @@ public class TestSuggestField extends Lu
Analyzer analyzer = new MockAnalyzer(random());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field"));
- Document document = new Document();
int num = Math.min(1000, atLeast(10));
for (int i = 0; i < num; i++) {
+ Document document = new Document();
document.add(new SuggestField("suggest_field", "abc_" + i, num));
document.add(new IntField("int_field", i, Field.Store.YES));
iw.addDocument(document);
- document.clear();
if (random().nextBoolean()) {
iw.commit();
@@ -424,7 +417,7 @@ public class TestSuggestField extends Lu
assertTrue(key.startsWith("abc_"));
String substring = key.substring(4);
int fieldValue = Integer.parseInt(substring);
- StoredDocument doc = reader.document(suggestScoreDoc.doc);
+ Document doc = reader.document(suggestScoreDoc.doc);
assertEquals(doc.getField("int_field").numericValue().intValue(), fieldValue);
}
@@ -526,7 +519,7 @@ public class TestSuggestField extends Lu
public void testThreads() throws Exception {
final Analyzer analyzer = new MockAnalyzer(random());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwcWithSuggestField(analyzer, "suggest_field_1", "suggest_field_2", "suggest_field_3"));
- int num = Math.min(1000, atLeast(100));
+ final int num = Math.min(1000, atLeast(100));
final String prefix1 = "abc1_";
final String prefix2 = "abc2_";
final String prefix3 = "abc3_";
@@ -608,13 +601,13 @@ public class TestSuggestField extends Lu
static void assertSuggestions(TopDocs actual, Entry... expected) {
SuggestScoreDoc[] suggestScoreDocs = (SuggestScoreDoc[]) actual.scoreDocs;
- assertThat(suggestScoreDocs.length, equalTo(expected.length));
+ assertEquals(expected.length, suggestScoreDocs.length);
for (int i = 0; i < suggestScoreDocs.length; i++) {
SuggestScoreDoc lookupDoc = suggestScoreDocs[i];
String msg = "Expected: " + toString(expected[i]) + " Actual: " + toString(lookupDoc);
- assertThat(msg, lookupDoc.key.toString(), equalTo(expected[i].output));
- assertThat(msg, lookupDoc.score, equalTo(expected[i].value));
- assertThat(msg, lookupDoc.context, equalTo(expected[i].context));
+ assertEquals(msg, expected[i].output, lookupDoc.key.toString());
+ assertEquals(msg, expected[i].value, lookupDoc.score, .0001f);
+ assertEquals(msg, expected[i].context, lookupDoc.context);
}
}
@@ -630,7 +623,7 @@ public class TestSuggestField extends Lu
return iwcWithSuggestField(analyzer, asSet(suggestFields));
}
- static IndexWriterConfig iwcWithSuggestField(Analyzer analyzer, Set<String> suggestFields) {
+ static IndexWriterConfig iwcWithSuggestField(Analyzer analyzer, final Set<String> suggestFields) {
IndexWriterConfig iwc = newIndexWriterConfig(random(), analyzer);
iwc.setMergePolicy(newLogMergePolicy());
Codec filterCodec = new Lucene50Codec() {