You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/04/15 20:47:17 UTC
svn commit: r1468181 - in /lucene/dev/trunk/lucene: ./
core/src/java/org/apache/lucene/index/
core/src/java/org/apache/lucene/search/
core/src/test/org/apache/lucene/index/
facet/src/java/org/apache/lucene/facet/search/
facet/src/test/org/apache/lucene...
Author: rmuir
Date: Mon Apr 15 18:47:16 2013
New Revision: 1468181
URL: http://svn.apache.org/r1468181
Log:
LUCENE-4934: AssertingIndexSearcher should do basic QueryUtils/etc checks on every query
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Term.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDownQuery.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSidewaysQuery.java
lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownQueryTest.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Apr 15 18:47:16 2013
@@ -299,6 +299,10 @@ Bug Fixes
the number of documents per chunk has been added to fix this issue.
(Robert Muir, Adrien Grand)
+* LUCENE-4934: Fix minor equals/hashcode problems in facet/DrillDownQuery,
+ BoostingQuery, MoreLikeThisQuery, FuzzyLikeThisQuery, and block join queries.
+ (Robert Muir, Uwe Schindler)
+
Documentation
* LUCENE-4841: Added example SimpleSortedSetFacetsExample to show how
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Term.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Term.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Term.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Term.java Mon Apr 15 18:47:16 2013
@@ -17,7 +17,13 @@ package org.apache.lucene.index;
* limitations under the License.
*/
+import java.nio.ByteBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.IOUtils;
/**
A Term represents a word from text. This is the unit of search. It is
@@ -69,7 +75,23 @@ public final class Term implements Compa
/** Returns the text of this term. In the case of words, this is simply the
text of the word. In the case of dates and other types, this is an
encoding of the object as a string. */
- public final String text() { return bytes.utf8ToString(); }
+ public final String text() {
+ return toString(bytes);
+ }
+
+ /** Returns human-readable form of the term text. If the term is not unicode,
+ * the raw bytes will be printed instead. */
+ public static final String toString(BytesRef termText) {
+ // the term might not be text, but usually is. so we make a best effort
+ CharsetDecoder decoder = IOUtils.CHARSET_UTF_8.newDecoder()
+ .onMalformedInput(CodingErrorAction.REPORT)
+ .onUnmappableCharacter(CodingErrorAction.REPORT);
+ try {
+ return decoder.decode(ByteBuffer.wrap(termText.bytes, termText.offset, termText.length)).toString();
+ } catch (CharacterCodingException e) {
+ return termText.toString();
+ }
+ }
/** Returns the bytes of this term. */
public final BytesRef bytes() { return bytes; }
@@ -132,5 +154,5 @@ public final class Term implements Compa
}
@Override
- public final String toString() { return field + ":" + bytes.utf8ToString(); }
+ public final String toString() { return field + ":" + text(); }
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java Mon Apr 15 18:47:16 2013
@@ -19,6 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
+import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.AttributeSource;
@@ -122,9 +123,9 @@ public class TermRangeQuery extends Mult
}
buffer.append(includeLower ? '[' : '{');
// TODO: all these toStrings for queries should just output the bytes, it might not be UTF-8!
- buffer.append(lowerTerm != null ? ("*".equals(lowerTerm.utf8ToString()) ? "\\*" : lowerTerm.utf8ToString()) : "*");
+ buffer.append(lowerTerm != null ? ("*".equals(Term.toString(lowerTerm)) ? "\\*" : Term.toString(lowerTerm)) : "*");
buffer.append(" TO ");
- buffer.append(upperTerm != null ? ("*".equals(upperTerm.utf8ToString()) ? "\\*" : upperTerm.utf8ToString()) : "*");
+ buffer.append(upperTerm != null ? ("*".equals(Term.toString(upperTerm)) ? "\\*" : Term.toString(upperTerm)) : "*");
buffer.append(includeUpper ? ']' : '}');
buffer.append(ToStringUtils.boost(getBoost()));
return buffer.toString();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java Mon Apr 15 18:47:16 2013
@@ -69,4 +69,9 @@ public class TestBinaryTerms extends Luc
ir.close();
dir.close();
}
+
+ public void testToString() {
+ Term term = new Term("foo", new BytesRef(new byte[] { (byte) 0xff, (byte) 0xfe }));
+ assertEquals("foo:[ff fe]", term.toString());
+ }
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDownQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDownQuery.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDownQuery.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDownQuery.java Mon Apr 15 18:47:16 2013
@@ -181,7 +181,9 @@ public final class DrillDownQuery extend
@Override
public int hashCode() {
- return query.hashCode();
+ final int prime = 31;
+ int result = super.hashCode();
+ return prime * result + query.hashCode();
}
@Override
@@ -191,7 +193,7 @@ public final class DrillDownQuery extend
}
DrillDownQuery other = (DrillDownQuery) obj;
- return query.equals(other.query);
+ return query.equals(other.query) && super.equals(other);
}
@Override
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSidewaysQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSidewaysQuery.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSidewaysQuery.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSidewaysQuery.java Mon Apr 15 18:47:16 2013
@@ -157,13 +157,34 @@ class DrillSidewaysQuery extends Query {
};
}
+ // TODO: these should do "deeper" equals/hash on the 2-D drillDownTerms array
+
@Override
public int hashCode() {
- throw new UnsupportedOperationException();
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + ((baseQuery == null) ? 0 : baseQuery.hashCode());
+ result = prime * result
+ + ((drillDownCollector == null) ? 0 : drillDownCollector.hashCode());
+ result = prime * result + Arrays.hashCode(drillDownTerms);
+ result = prime * result + Arrays.hashCode(drillSidewaysCollectors);
+ return result;
}
@Override
public boolean equals(Object obj) {
- throw new UnsupportedOperationException();
+ if (this == obj) return true;
+ if (!super.equals(obj)) return false;
+ if (getClass() != obj.getClass()) return false;
+ DrillSidewaysQuery other = (DrillSidewaysQuery) obj;
+ if (baseQuery == null) {
+ if (other.baseQuery != null) return false;
+ } else if (!baseQuery.equals(other.baseQuery)) return false;
+ if (drillDownCollector == null) {
+ if (other.drillDownCollector != null) return false;
+ } else if (!drillDownCollector.equals(other.drillDownCollector)) return false;
+ if (!Arrays.equals(drillDownTerms, other.drillDownTerms)) return false;
+ if (!Arrays.equals(drillSidewaysCollectors, other.drillSidewaysCollectors)) return false;
+ return true;
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownQueryTest.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownQueryTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownQueryTest.java Mon Apr 15 18:47:16 2013
@@ -43,6 +43,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
@@ -148,6 +149,7 @@ public class DrillDownQueryTest extends
// Making sure the query yields 25 documents with the facet "a"
DrillDownQuery q = new DrillDownQuery(defaultParams);
q.add(new CategoryPath("a"));
+ QueryUtils.check(q);
TopDocs docs = searcher.search(q, 100);
assertEquals(25, docs.totalHits);
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java Mon Apr 15 18:47:16 2013
@@ -339,7 +339,8 @@ public class ToChildBlockJoinQuery exten
final ToChildBlockJoinQuery other = (ToChildBlockJoinQuery) _other;
return origParentQuery.equals(other.origParentQuery) &&
parentsFilter.equals(other.parentsFilter) &&
- doScores == other.doScores;
+ doScores == other.doScores &&
+ super.equals(other);
} else {
return false;
}
@@ -348,7 +349,7 @@ public class ToChildBlockJoinQuery exten
@Override
public int hashCode() {
final int prime = 31;
- int hash = 1;
+ int hash = super.hashCode();
hash = prime * hash + origParentQuery.hashCode();
hash = prime * hash + new Boolean(doScores).hashCode();
hash = prime * hash + parentsFilter.hashCode();
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Mon Apr 15 18:47:16 2013
@@ -446,7 +446,8 @@ public class ToParentBlockJoinQuery exte
final ToParentBlockJoinQuery other = (ToParentBlockJoinQuery) _other;
return origChildQuery.equals(other.origChildQuery) &&
parentsFilter.equals(other.parentsFilter) &&
- scoreMode == other.scoreMode;
+ scoreMode == other.scoreMode &&
+ super.equals(other);
} else {
return false;
}
@@ -455,17 +456,10 @@ public class ToParentBlockJoinQuery exte
@Override
public int hashCode() {
final int prime = 31;
- int hash = 1;
+ int hash = super.hashCode();
hash = prime * hash + origChildQuery.hashCode();
hash = prime * hash + scoreMode.hashCode();
hash = prime * hash + parentsFilter.hashCode();
return hash;
}
-
- @Override
- public ToParentBlockJoinQuery clone() {
- return new ToParentBlockJoinQuery(origChildQuery.clone(),
- parentsFilter,
- scoreMode);
- }
}
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Mon Apr 15 18:47:16 2013
@@ -263,6 +263,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher s = newSearcher(r);
ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(new MatchAllDocsQuery(), new QueryWrapperFilter(new MatchAllDocsQuery()), ScoreMode.Avg);
+ QueryUtils.check(random(), q, s);
s.search(q, 10);
BooleanQuery bq = new BooleanQuery();
bq.setBoost(2f); // we boost the BQ
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java Mon Apr 15 18:47:16 2013
@@ -84,7 +84,7 @@ public class BoostingQuery extends Query
@Override
public int hashCode() {
final int prime = 31;
- int result = 1;
+ int result = super.hashCode();
result = prime * result + Float.floatToIntBits(boost);
result = prime * result + ((context == null) ? 0 : context.hashCode());
result = prime * result + ((match == null) ? 0 : match.hashCode());
@@ -102,6 +102,10 @@ public class BoostingQuery extends Query
if (getClass() != obj.getClass()) {
return false;
}
+
+ if (!super.equals(obj)) {
+ return false;
+ }
BoostingQuery other = (BoostingQuery) obj;
if (Float.floatToIntBits(boost) != Float.floatToIntBits(other.boost)) {
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java Mon Apr 15 18:47:16 2013
@@ -29,6 +29,7 @@ import org.apache.lucene.search.Query;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
+import java.util.Arrays;
import java.util.Set;
/**
@@ -148,4 +149,47 @@ public class MoreLikeThisQuery extends Q
public void setMinDocFreq(int minDocFreq) {
this.minDocFreq = minDocFreq;
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + ((analyzer == null) ? 0 : analyzer.hashCode());
+ result = prime * result + ((fieldName == null) ? 0 : fieldName.hashCode());
+ result = prime * result + ((likeText == null) ? 0 : likeText.hashCode());
+ result = prime * result + maxQueryTerms;
+ result = prime * result + minDocFreq;
+ result = prime * result + minTermFrequency;
+ result = prime * result + Arrays.hashCode(moreLikeFields);
+ result = prime * result + Float.floatToIntBits(percentTermsToMatch);
+ result = prime * result + ((stopWords == null) ? 0 : stopWords.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (!super.equals(obj)) return false;
+ if (getClass() != obj.getClass()) return false;
+ MoreLikeThisQuery other = (MoreLikeThisQuery) obj;
+ if (analyzer == null) {
+ if (other.analyzer != null) return false;
+ } else if (!analyzer.equals(other.analyzer)) return false;
+ if (fieldName == null) {
+ if (other.fieldName != null) return false;
+ } else if (!fieldName.equals(other.fieldName)) return false;
+ if (likeText == null) {
+ if (other.likeText != null) return false;
+ } else if (!likeText.equals(other.likeText)) return false;
+ if (maxQueryTerms != other.maxQueryTerms) return false;
+ if (minDocFreq != other.minDocFreq) return false;
+ if (minTermFrequency != other.minTermFrequency) return false;
+ if (!Arrays.equals(moreLikeFields, other.moreLikeFields)) return false;
+ if (Float.floatToIntBits(percentTermsToMatch) != Float
+ .floatToIntBits(other.percentTermsToMatch)) return false;
+ if (stopWords == null) {
+ if (other.stopWords != null) return false;
+ } else if (!stopWords.equals(other.stopWords)) return false;
+ return true;
+ }
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java Mon Apr 15 18:47:16 2013
@@ -18,15 +18,20 @@ package org.apache.lucene.queries;
*/
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.LuceneTestCase;
public class BoostingQueryTest extends LuceneTestCase {
+ // TODO: this suite desperately needs more tests!
+ // ... like ones that actually run the query
+
public void testBoostingQueryEquals() {
TermQuery q1 = new TermQuery(new Term("subject:", "java"));
TermQuery q2 = new TermQuery(new Term("subject:", "java"));
assertEquals("Two TermQueries with same attributes should be equal", q1, q2);
BoostingQuery bq1 = new BoostingQuery(q1, q2, 0.1f);
+ QueryUtils.check(bq1);
BoostingQuery bq2 = new BoostingQuery(q1, q2, 0.1f);
assertEquals("BoostingQuery with same attributes is not equal", bq1, bq2);
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java Mon Apr 15 18:47:16 2013
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
@@ -32,6 +33,8 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -134,4 +137,11 @@ public class TestMoreLikeThis extends Lu
mlt.setFieldNames(new String[] {"text", "foobar"});
mlt.like(new StringReader("this is a test"), "foobar");
}
+
+ // just basic equals/hashcode etc
+ public void testMoreLikeThisQuery() throws Exception {
+ Query query = new MoreLikeThisQuery("this is a test", new String[] { "text" }, new MockAnalyzer(random()), "text");
+ QueryUtils.check(random(), query, searcher);
+ }
+ // TODO: add tests for the MoreLikeThisQuery
}
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java Mon Apr 15 18:47:16 2013
@@ -72,7 +72,7 @@ public class FuzzyLikeThisQuery extends
@Override
public int hashCode() {
final int prime = 31;
- int result = 1;
+ int result = super.hashCode();
result = prime * result + ((analyzer == null) ? 0 : analyzer.hashCode());
result = prime * result
+ ((fieldVals == null) ? 0 : fieldVals.hashCode());
@@ -89,6 +89,9 @@ public class FuzzyLikeThisQuery extends
return false;
if (getClass() != obj.getClass())
return false;
+ if (!super.equals(obj)) {
+ return false;
+ }
FuzzyLikeThisQuery other = (FuzzyLikeThisQuery) obj;
if (analyzer == null) {
if (other.analyzer != null)
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java?rev=1468181&r1=1468180&r2=1468181&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java Mon Apr 15 18:47:16 2013
@@ -82,6 +82,15 @@ public class AssertingIndexSearcher exte
}
@Override
+ public Query rewrite(Query original) throws IOException {
+ // TODO: use the more sophisticated QueryUtils.check sometimes!
+ QueryUtils.check(original);
+ Query rewritten = super.rewrite(original);
+ QueryUtils.check(rewritten);
+ return rewritten;
+ }
+
+ @Override
protected Query wrapFilter(Query query, Filter filter) {
if (random.nextBoolean())
return super.wrapFilter(query, filter);