You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by to...@apache.org on 2012/06/22 10:24:14 UTC
svn commit: r1352798 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/
lucene/analysis/common/src/java/org/apache/lucene/analys...
Author: tommaso
Date: Fri Jun 22 08:24:10 2012
New Revision: 1352798
URL: http://svn.apache.org/viewvc?rev=1352798&view=rev
Log:
[LUCENE-4159] - merged from trunk code review patch to lucene queries package
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/package.html (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/package.html (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/lib/ (props changed)
lucene/dev/branches/branch_4x/solr/lib/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/lib/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/lib/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/lib/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/lib/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/lib/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java Fri Jun 22 08:24:10 2012
@@ -38,9 +38,9 @@ import org.apache.lucene.search.*;
* and is documented here: http://wiki.apache.org/lucene-java/CommunityContributions
*/
public class BoostingQuery extends Query {
- private float boost; // the amount to boost by
- private Query match; // query to match
- private Query context; // boost when matches too
+ private final float boost; // the amount to boost by
+ private final Query match; // query to match
+ private final Query context; // boost when matches too
public BoostingQuery(Query match, Query context, float boost) {
this.match = match;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java Fri Jun 22 08:24:10 2012
@@ -53,7 +53,7 @@ public class ChainedFilter extends Filte
/**
* Logical operation when none is declared. Defaults to OR.
*/
- public static int DEFAULT = OR;
+ public static final int DEFAULT = OR;
/**
* The filter chain
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java Fri Jun 22 08:24:10 2012
@@ -78,8 +78,8 @@ public class CustomScoreProvider {
return customScore(doc, subQueryScore, 1);
}
float score = subQueryScore;
- for(int i = 0; i < valSrcScores.length; i++) {
- score *= valSrcScores[i];
+ for (float valSrcScore : valSrcScores) {
+ score *= valSrcScore;
}
return score;
}
@@ -127,13 +127,13 @@ public class CustomScoreProvider {
return subQueryExpl;
}
float valSrcScore = 1;
- for (int i = 0; i < valSrcExpls.length; i++) {
- valSrcScore *= valSrcExpls[i].getValue();
+ for (Explanation valSrcExpl : valSrcExpls) {
+ valSrcScore *= valSrcExpl.getValue();
}
Explanation exp = new Explanation( valSrcScore * subQueryExpl.getValue(), "custom score: product of:");
exp.addDetail(subQueryExpl);
- for (int i = 0; i < valSrcExpls.length; i++) {
- exp.addDetail(valSrcExpls[i]);
+ for (Explanation valSrcExpl : valSrcExpls) {
+ exp.addDetail(valSrcExpl);
}
return exp;
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java Fri Jun 22 08:24:10 2012
@@ -107,8 +107,8 @@ public class CustomScoreQuery extends Qu
@Override
public void extractTerms(Set<Term> terms) {
subQuery.extractTerms(terms);
- for(int i = 0; i < scoringQueries.length; i++) {
- scoringQueries[i].extractTerms(terms);
+ for (Query scoringQuery : scoringQueries) {
+ scoringQuery.extractTerms(terms);
}
}
@@ -129,8 +129,8 @@ public class CustomScoreQuery extends Qu
public String toString(String field) {
StringBuilder sb = new StringBuilder(name()).append("(");
sb.append(subQuery.toString(field));
- for(int i = 0; i < scoringQueries.length; i++) {
- sb.append(", ").append(scoringQueries[i].toString(field));
+ for (Query scoringQuery : scoringQueries) {
+ sb.append(", ").append(scoringQuery.toString(field));
}
sb.append(")");
sb.append(strict?" STRICT" : "");
@@ -199,11 +199,11 @@ public class CustomScoreQuery extends Qu
@Override
public float getValueForNormalization() throws IOException {
float sum = subQueryWeight.getValueForNormalization();
- for(int i = 0; i < valSrcWeights.length; i++) {
+ for (Weight valSrcWeight : valSrcWeights) {
if (qStrict) {
- valSrcWeights[i].getValueForNormalization(); // do not include ValueSource part in the query normalization
+ valSrcWeight.getValueForNormalization(); // do not include ValueSource part in the query normalization
} else {
- sum += valSrcWeights[i].getValueForNormalization();
+ sum += valSrcWeight.getValueForNormalization();
}
}
sum *= getBoost() * getBoost(); // boost each sub-weight
@@ -215,11 +215,11 @@ public class CustomScoreQuery extends Qu
public void normalize(float norm, float topLevelBoost) {
topLevelBoost *= getBoost(); // incorporate boost
subQueryWeight.normalize(norm, topLevelBoost);
- for(int i = 0; i < valSrcWeights.length; i++) {
+ for (Weight valSrcWeight : valSrcWeights) {
if (qStrict) {
- valSrcWeights[i].normalize(1, 1); // do not normalize the ValueSource part
+ valSrcWeight.normalize(1, 1); // do not normalize the ValueSource part
} else {
- valSrcWeights[i].normalize(norm, topLevelBoost);
+ valSrcWeight.normalize(norm, topLevelBoost);
}
}
}
@@ -283,10 +283,10 @@ public class CustomScoreQuery extends Qu
*/
private class CustomScorer extends Scorer {
private final float qWeight;
- private Scorer subQueryScorer;
- private Scorer[] valSrcScorers;
+ private final Scorer subQueryScorer;
+ private final Scorer[] valSrcScorers;
private final CustomScoreProvider provider;
- private float vScores[]; // reused in score() to avoid allocating this array for each doc
+ private final float[] vScores; // reused in score() to avoid allocating this array for each doc
// constructor
private CustomScorer(CustomScoreProvider provider, CustomWeight w, float qWeight,
@@ -303,8 +303,8 @@ public class CustomScoreQuery extends Qu
public int nextDoc() throws IOException {
int doc = subQueryScorer.nextDoc();
if (doc != NO_MORE_DOCS) {
- for (int i = 0; i < valSrcScorers.length; i++) {
- valSrcScorers[i].advance(doc);
+ for (Scorer valSrcScorer : valSrcScorers) {
+ valSrcScorer.advance(doc);
}
}
return doc;
@@ -328,8 +328,8 @@ public class CustomScoreQuery extends Qu
public int advance(int target) throws IOException {
int doc = subQueryScorer.advance(target);
if (doc != NO_MORE_DOCS) {
- for (int i = 0; i < valSrcScorers.length; i++) {
- valSrcScorers[i].advance(doc);
+ for (Scorer valSrcScorer : valSrcScorers) {
+ valSrcScorer.advance(doc);
}
}
return doc;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java Fri Jun 22 08:24:10 2012
@@ -65,7 +65,7 @@ public class TermsFilter extends Filter
BytesRef br = new BytesRef();
String lastField = null;
- Terms termsC = null;
+ Terms termsC;
TermsEnum termsEnum = null;
DocsEnum docs = null;
for (Term term : terms) {
@@ -80,6 +80,7 @@ public class TermsFilter extends Filter
if (terms != null) { // TODO this check doesn't make sense, decide which variable its supposed to be for
br.copyBytes(term.bytes());
+ assert termsEnum != null;
if (termsEnum.seekCeil(br) == TermsEnum.SeekStatus.FOUND) {
docs = termsEnum.docs(acceptDocs, docs, false);
while (docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java Fri Jun 22 08:24:10 2012
@@ -35,7 +35,7 @@ import java.util.Map;
// something has to give
public class BoostedQuery extends Query {
private Query q;
- private ValueSource boostVal; // optional, can be null
+ private final ValueSource boostVal; // optional, can be null
public BoostedQuery(Query subQuery, ValueSource boostVal) {
this.q = subQuery;
@@ -65,7 +65,7 @@ public class BoostedQuery extends Query
}
private class BoostedWeight extends Weight {
- IndexSearcher searcher;
+ final IndexSearcher searcher;
Weight qWeight;
Map fcontext;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java Fri Jun 22 08:24:10 2012
@@ -38,7 +38,7 @@ import java.util.Map;
*
*/
public class FunctionQuery extends Query {
- ValueSource func;
+ final ValueSource func;
/**
* @param func defines the function to be used for scoring
@@ -61,10 +61,10 @@ public class FunctionQuery extends Query
public void extractTerms(Set<Term> terms) {}
protected class FunctionWeight extends Weight {
- protected IndexSearcher searcher;
+ protected final IndexSearcher searcher;
protected float queryNorm;
protected float queryWeight;
- protected Map context;
+ protected final Map context;
public FunctionWeight(IndexSearcher searcher) throws IOException {
this.searcher = searcher;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java Fri Jun 22 08:24:10 2012
@@ -61,7 +61,7 @@ public abstract class FunctionValues {
}
target.copyChars(s);
return true;
- };
+ }
/** Native Java Object representation of the value */
public Object objectVal(int doc) {
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java Fri Jun 22 08:24:10 2012
@@ -131,7 +131,7 @@ public abstract class ValueSource {
private final double[] values;
private FunctionValues docVals;
private double bottom;
- private Map fcontext;
+ private final Map fcontext;
ValueSourceComparator(Map fcontext, int numHits) {
this.fcontext = fcontext;
@@ -187,7 +187,7 @@ public abstract class ValueSource {
@Override
public int compareDocToValue(int doc, Double valueObj) {
- final double value = valueObj.doubleValue();
+ final double value = valueObj;
final double docValue = docVals.doubleVal(doc);
if (docValue < value) {
return -1;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java Fri Jun 22 08:24:10 2012
@@ -25,7 +25,7 @@ import org.apache.lucene.util.Bits;
import java.io.IOException;
public class ValueSourceScorer extends Scorer {
- protected IndexReader reader;
+ protected final IndexReader reader;
private int doc = -1;
protected final int maxDoc;
protected final FunctionValues values;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java Fri Jun 22 08:24:10 2012
@@ -33,7 +33,7 @@ import org.apache.lucene.search.FieldCac
public class ByteFieldSource extends FieldCacheSource {
- private FieldCache.ByteParser parser;
+ private final FieldCache.ByteParser parser;
public ByteFieldSource(String field) {
this(field, null);
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java Fri Jun 22 08:24:10 2012
@@ -124,10 +124,10 @@ class ConstDoubleDocValues extends Doubl
* @lucene.internal
*/
public class DocFreqValueSource extends ValueSource {
- protected String field;
- protected String indexedField;
- protected String val;
- protected BytesRef indexedBytes;
+ protected final String field;
+ protected final String indexedField;
+ protected final String val;
+ protected final BytesRef indexedBytes;
public DocFreqValueSource(String field, String val, String indexedField, BytesRef indexedBytes) {
this.field = field;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java Fri Jun 22 08:24:10 2012
@@ -40,7 +40,7 @@ import org.apache.lucene.util.mutable.Mu
public class DoubleFieldSource extends FieldCacheSource {
- protected FieldCache.DoubleParser parser;
+ protected final FieldCache.DoubleParser parser;
public DoubleFieldSource(String field) {
this(field, null);
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java Fri Jun 22 08:24:10 2012
@@ -27,8 +27,8 @@ import org.apache.lucene.search.FieldCac
*
*/
public abstract class FieldCacheSource extends ValueSource {
- protected String field;
- protected FieldCache cache = FieldCache.DEFAULT;
+ protected final String field;
+ protected final FieldCache cache = FieldCache.DEFAULT;
public FieldCacheSource(String field) {
this.field=field;
@@ -58,6 +58,6 @@ public abstract class FieldCacheSource e
@Override
public int hashCode() {
return cache.hashCode() + field.hashCode();
- };
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java Fri Jun 22 08:24:10 2012
@@ -38,7 +38,7 @@ import org.apache.lucene.util.mutable.Mu
public class FloatFieldSource extends FieldCacheSource {
- protected FieldCache.FloatParser parser;
+ protected final FieldCache.FloatParser parser;
public FloatFieldSource(String field) {
this(field, null);
@@ -108,5 +108,5 @@ public class FloatFieldSource extends Fi
int h = parser==null ? Float.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
return h;
- };
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java Fri Jun 22 08:24:10 2012
@@ -31,9 +31,9 @@ import java.util.Map;
public class IfFunction extends BoolFunction {
- private ValueSource ifSource;
- private ValueSource trueSource;
- private ValueSource falseSource;
+ private final ValueSource ifSource;
+ private final ValueSource trueSource;
+ private final ValueSource falseSource;
public IfFunction(ValueSource ifSource, ValueSource trueSource, ValueSource falseSource) {
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java Fri Jun 22 08:24:10 2012
@@ -172,5 +172,5 @@ public class IntFieldSource extends Fiel
int h = parser==null ? Integer.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
return h;
- };
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java Fri Jun 22 08:24:10 2012
@@ -57,16 +57,15 @@ public class JoinDocFreqValueSource exte
final IndexReader top = ReaderUtil.getTopLevelContext(readerContext).reader();
return new IntDocValues(this) {
- BytesRef ref = new BytesRef();
+ final BytesRef ref = new BytesRef();
@Override
public int intVal(int doc)
{
try {
terms.getTerm(doc, ref);
- int v = top.docFreq( qfield, ref );
//System.out.println( NAME+"["+field+"="+ref.utf8ToString()+"=("+qfield+":"+v+")]" );
- return v;
+ return top.docFreq( qfield, ref );
}
catch (IOException e) {
throw new RuntimeException("caught exception in function "+description()+" : doc="+doc, e);
@@ -86,5 +85,5 @@ public class JoinDocFreqValueSource exte
@Override
public int hashCode() {
return qfield.hashCode() + super.hashCode();
- };
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java Fri Jun 22 08:24:10 2012
@@ -78,9 +78,8 @@ public class LiteralValueSource extends
LiteralValueSource that = (LiteralValueSource) o;
- if (!string.equals(that.string)) return false;
+ return string.equals(that.string);
- return true;
}
public static final int hash = LiteralValueSource.class.hashCode();
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java Fri Jun 22 08:24:10 2012
@@ -40,7 +40,7 @@ import org.apache.lucene.util.mutable.Mu
public class LongFieldSource extends FieldCacheSource {
- protected FieldCache.LongParser parser;
+ protected final FieldCache.LongParser parser;
public LongFieldSource(String field) {
this(field, null);
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java Fri Jun 22 08:24:10 2012
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.util.Map;
public class NormValueSource extends ValueSource {
- protected String field;
+ protected final String field;
public NormValueSource(String field) {
this.field = field;
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java Fri Jun 22 08:24:10 2012
@@ -52,7 +52,7 @@ import java.util.Map;
*/
public class OrdFieldSource extends ValueSource {
- protected String field;
+ protected final String field;
public OrdFieldSource(String field) {
this.field = field;
@@ -124,6 +124,6 @@ public class OrdFieldSource extends Valu
@Override
public int hashCode() {
return hcode + field.hashCode();
- };
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java Fri Jun 22 08:24:10 2012
@@ -237,7 +237,6 @@ class QueryDocValues extends FloatDocVal
// a match!
mval.value = scorer.score();
mval.exists = true;
- return;
} catch (IOException e) {
throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java Fri Jun 22 08:24:10 2012
@@ -53,7 +53,7 @@ import java.util.Map;
*/
public class ReverseOrdFieldSource extends ValueSource {
- public String field;
+ public final String field;
public ReverseOrdFieldSource(String field) {
this.field = field;
@@ -95,6 +95,6 @@ public class ReverseOrdFieldSource exten
@Override
public int hashCode() {
return hcode + field.hashCode();
- };
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java Fri Jun 22 08:24:10 2012
@@ -34,7 +34,7 @@ import java.util.Map;
* @lucene.internal
*/
public class SumTotalTermFreqValueSource extends ValueSource {
- protected String indexedField;
+ protected final String indexedField;
public SumTotalTermFreqValueSource(String indexedField) {
this.indexedField = indexedField;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java Fri Jun 22 08:24:10 2012
@@ -32,10 +32,10 @@ import java.util.Map;
* @lucene.internal
*/
public class TotalTermFreqValueSource extends ValueSource {
- protected String field;
- protected String indexedField;
- protected String val;
- protected BytesRef indexedBytes;
+ protected final String field;
+ protected final String indexedField;
+ protected final String val;
+ protected final BytesRef indexedBytes;
public TotalTermFreqValueSource(String field, String val, String indexedField, BytesRef indexedBytes) {
this.field = field;
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java Fri Jun 22 08:24:10 2012
@@ -210,9 +210,8 @@ public class VectorValueSource extends M
VectorValueSource that = (VectorValueSource) o;
- if (!sources.equals(that.sources)) return false;
+ return sources.equals(that.sources);
- return true;
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Fri Jun 22 08:24:10 2012
@@ -717,8 +717,8 @@ public final class MoreLikeThis {
if (vector == null) {
Document d = ir.document(docNum);
IndexableField fields[] = d.getFields(fieldName);
- for (int j = 0; j < fields.length; j++) {
- final String stringValue = fields[j].stringValue();
+ for (IndexableField field : fields) {
+ final String stringValue = field.stringValue();
if (stringValue != null) {
addTermFrequencies(new StringReader(stringValue), termFreqMap, fieldName);
}
Modified: lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java?rev=1352798&r1=1352797&r2=1352798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java Fri Jun 22 08:24:10 2012
@@ -41,7 +41,7 @@ public class MoreLikeThisQuery extends Q
private String likeText;
private String[] moreLikeFields;
private Analyzer analyzer;
- private String fieldName;
+ private final String fieldName;
private float percentTermsToMatch = 0.3f;
private int minTermFrequency = 1;
private int maxQueryTerms = 5;
@@ -49,7 +49,7 @@ public class MoreLikeThisQuery extends Q
private int minDocFreq = -1;
/**
- * @param moreLikeFields
+ * @param moreLikeFields fields used for similarity measure
*/
public MoreLikeThisQuery(String likeText, String[] moreLikeFields, Analyzer analyzer, String fieldName) {
this.likeText = likeText;