You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2015/10/05 14:28:17 UTC
svn commit: r1706827 - in /lucene/dev/branches/branch_5x/lucene:
core/src/java/org/apache/lucene/search/
core/src/java/org/apache/lucene/search/spans/
join/src/java/org/apache/lucene/search/join/
queries/src/java/org/apache/lucene/queries/ queries/src/...
Author: jpountz
Date: Mon Oct 5 12:28:17 2015
New Revision: 1706827
URL: http://svn.apache.org/viewvc?rev=1706827&view=rev
Log:
LUCENE-6590: Fix toString() representations of queries to include the boost.
Some of them were lost in the merge, others were just missing.
Modified:
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java
lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java
lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java
lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java
lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java
lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java
lucene/dev/branches/branch_5x/lucene/spatial3d/src/java/org/apache/lucene/bkdtree3d/PointInGeo3DShapeQuery.java
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java Mon Oct 5 12:28:17 2015
@@ -41,6 +41,7 @@ public final class BoostQuery extends Qu
* need parenthesis to have a better toString(). */
private static final Set<Class<? extends Query>> NO_PARENS_REQUIRED_QUERIES = Collections.unmodifiableSet(
new HashSet<>(Arrays.asList(
+ MatchAllDocsQuery.class,
TermQuery.class,
PhraseQuery.class,
MultiPhraseQuery.class,
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java Mon Oct 5 12:28:17 2015
@@ -27,6 +27,7 @@ import java.util.Set;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.util.ToStringUtils;
/**
* A query that generates the union of documents produced by its subqueries, and that scores each document with the maximum
@@ -260,6 +261,7 @@ public final class DisjunctionMaxQuery e
buffer.append("~");
buffer.append(tieBreakerMultiplier);
}
+ buffer.append(ToStringUtils.boost(getBoost()));
return buffer.toString();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java Mon Oct 5 12:28:17 2015
@@ -32,6 +32,7 @@ import org.apache.lucene.index.TermsEnum
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.DocIdSetBuilder;
+import org.apache.lucene.util.ToStringUtils;
/**
* This class also provides the functionality behind
@@ -87,7 +88,7 @@ final class MultiTermQueryConstantScoreW
@Override
public String toString(String field) {
// query.toString should be ok for the filter, too, if the query boost is 1.0f
- return query.toString(field);
+ return query.toString(field) + ToStringUtils.boost(getBoost());
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java Mon Oct 5 12:28:17 2015
@@ -22,6 +22,7 @@ import java.util.Objects;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.util.ToStringUtils;
/**
* This is a {@link PhraseQuery} which is optimized for n-gram phrase query.
@@ -109,6 +110,6 @@ public class NGramPhraseQuery extends Qu
@Override
public String toString(String field) {
- return phraseQuery.toString(field);
+ return phraseQuery.toString(field) + ToStringUtils.boost(getBoost());
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java Mon Oct 5 12:28:17 2015
@@ -33,6 +33,7 @@ import org.apache.lucene.index.TermsEnum
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.util.ToStringUtils;
import org.apache.lucene.index.Term; // for javadocs
/**
@@ -323,6 +324,7 @@ public final class NumericRangeQuery<T e
.append(" TO ")
.append((max == null) ? "*" : max.toString())
.append(maxInclusive ? ']' : '}')
+ .append(ToStringUtils.boost(getBoost()))
.toString();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java Mon Oct 5 12:28:17 2015
@@ -39,6 +39,7 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.similarities.Similarity.SimScorer;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.ToStringUtils;
/** A Query that matches documents containing a particular sequence of terms.
* A PhraseQuery is built by QueryParser for input like <code>"new york"</code>.
@@ -527,6 +528,7 @@ public class PhraseQuery extends Query {
buffer.append("~");
buffer.append(slop);
}
+ buffer.append(ToStringUtils.boost(getBoost()));
return buffer.toString();
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java Mon Oct 5 12:28:17 2015
@@ -57,13 +57,12 @@ public final class SpanBoostQuery extend
)));
private final SpanQuery query;
- private final float boost;
/** Sole constructor: wrap {@code query} in such a way that the produced
* scores will be boosted by {@code boost}. */
public SpanBoostQuery(SpanQuery query, float boost) {
this.query = Objects.requireNonNull(query);
- this.boost = boost;
+ setBoost(boost);
}
/**
@@ -73,11 +72,10 @@ public final class SpanBoostQuery extend
return query;
}
- /**
- * Return the applied boost.
- */
+ @Override
public float getBoost() {
- return boost;
+ // overridden to remove the deprecation warning
+ return super.getBoost();
}
@Override
@@ -86,39 +84,34 @@ public final class SpanBoostQuery extend
return false;
}
SpanBoostQuery that = (SpanBoostQuery) obj;
- return query.equals(that.query)
- && Float.floatToIntBits(boost) == Float.floatToIntBits(that.boost);
+ return query.equals(that.query);
}
@Override
public int hashCode() {
int h = super.hashCode();
h = 31 * h + query.hashCode();
- h = 31 * h + Float.floatToIntBits(boost);
return h;
}
@Override
public Query rewrite(IndexReader reader) throws IOException {
- if (super.getBoost() != 1f) {
- return super.rewrite(reader);
- }
+ final SpanQuery rewritten = (SpanQuery) query.rewrite(reader);
- if (boost == 1f) {
- return query;
+ if (getBoost() == 1f) {
+ return rewritten;
}
- final SpanQuery rewritten = (SpanQuery) query.rewrite(reader);
- if (query != rewritten) {
- return new SpanBoostQuery(rewritten, boost);
+ if (rewritten.getClass() == SpanBoostQuery.class) {
+ SpanBoostQuery in = (SpanBoostQuery) rewritten;
+ return new SpanBoostQuery(in.query, getBoost() * in.getBoost());
}
- if (query.getClass() == SpanBoostQuery.class) {
- SpanBoostQuery in = (SpanBoostQuery) query;
- return new SpanBoostQuery(in.query, boost * in.boost);
+ if (query != rewritten) {
+ return new SpanBoostQuery(rewritten, getBoost());
}
- return super.rewrite(reader);
+ return this;
}
@Override
@@ -133,7 +126,7 @@ public final class SpanBoostQuery extend
builder.append(")");
}
builder.append("^");
- builder.append(boost);
+ builder.append(getBoost());
return builder.toString();
}
@@ -150,7 +143,7 @@ public final class SpanBoostQuery extend
}
Map<Term, TermContext> terms = new TreeMap<>();
weight.extractTermContexts(terms);
- weight.normalize(1f, boost);
+ weight.normalize(1f, getBoost());
return new SpanWeight(this, searcher, terms) {
@Override
@@ -170,7 +163,7 @@ public final class SpanBoostQuery extend
@Override
public void normalize(float norm, float boost) {
- weight.normalize(norm, SpanBoostQuery.this.boost * boost);
+ weight.normalize(norm, SpanBoostQuery.this.getBoost() * boost);
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java Mon Oct 5 12:28:17 2015
@@ -37,6 +37,7 @@ import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LongBitSet;
import org.apache.lucene.util.LongValues;
+import org.apache.lucene.util.ToStringUtils;
final class GlobalOrdinalsQuery extends Query {
@@ -95,7 +96,7 @@ final class GlobalOrdinalsQuery extends
public String toString(String field) {
return "GlobalOrdinalsQuery{" +
"joinField=" + joinField +
- '}';
+ '}' + ToStringUtils.boost(getBoost());
}
final class W extends ConstantScoreWeight {
Modified: lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java Mon Oct 5 12:28:17 2015
@@ -32,6 +32,7 @@ import org.apache.lucene.search.TwoPhase
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LongValues;
+import org.apache.lucene.util.ToStringUtils;
import java.io.IOException;
import java.util.Set;
@@ -103,7 +104,7 @@ final class GlobalOrdinalsWithScoreQuery
"min=" + min +
"max=" + max +
"fromQuery=" + fromQuery +
- '}';
+ '}' + ToStringUtils.boost(getBoost());
}
final class W extends Weight {
Modified: lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java Mon Oct 5 12:28:17 2015
@@ -25,6 +25,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefHash;
+import org.apache.lucene.util.ToStringUtils;
import java.io.IOException;
import java.util.Comparator;
@@ -65,7 +66,7 @@ class TermsQuery extends MultiTermQuery
public String toString(String string) {
return "TermsQuery{" +
"field=" + field +
- '}';
+ '}' + ToStringUtils.boost(getBoost());
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java Mon Oct 5 12:28:17 2015
@@ -25,6 +25,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
+import org.apache.lucene.util.ToStringUtils;
/**
* The BoostingQuery class can be used to effectively demote results that match a given query.
@@ -156,6 +157,6 @@ public class BoostingQuery extends Query
@Override
public String toString(String field) {
- return match.toString(field) + "/" + context.toString(field);
+ return match.toString(field) + "/" + context.toString(field) + ToStringUtils.boost(getBoost());
}
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java Mon Oct 5 12:28:17 2015
@@ -29,6 +29,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
+import org.apache.lucene.util.ToStringUtils;
/**
@@ -171,7 +172,7 @@ public class FunctionQuery extends Query
@Override
public String toString(String field)
{
- return func.toString();
+ return func.toString() + ToStringUtils.boost(getBoost());
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java Mon Oct 5 12:28:17 2015
@@ -29,6 +29,7 @@ import org.apache.lucene.search.Explanat
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Weight;
+import org.apache.lucene.util.ToStringUtils;
/**
* A Query wrapping a {@link ValueSource} that matches docs in which the values in the value source match a configured
@@ -73,7 +74,7 @@ public class FunctionRangeQuery extends
return "frange(" + valueSource + "):"
+ (includeLower ? '[' : '{')
+ (lowerVal == null ? "*" : lowerVal) + " TO " + (upperVal == null ? "*" : upperVal)
- + (includeUpper ? ']' : '}');
+ + (includeUpper ? ']' : '}') + ToStringUtils.boost(getBoost());
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java Mon Oct 5 12:28:17 2015
@@ -23,6 +23,7 @@ import org.apache.lucene.index.DocValues
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedNumericDocValues;
import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.ToStringUtils;
import java.io.IOException;
import java.util.Arrays;
@@ -86,7 +87,7 @@ public class DocValuesNumbersQuery exten
if (numbers.size() > 0) {
sb.setLength(sb.length() - 2);
}
- return sb.append(']').toString();
+ return sb.append(']').append(ToStringUtils.boost(getBoost())).toString();
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java Mon Oct 5 12:28:17 2015
@@ -32,6 +32,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LongBitSet;
+import org.apache.lucene.util.ToStringUtils;
/**
* A {@link Query} that only accepts documents whose
@@ -146,7 +147,7 @@ public class DocValuesTermsQuery extends
if (terms.length > 0) {
sb.setLength(sb.length() - 2);
}
- return sb.append(']').toString();
+ return sb.append(']').append(ToStringUtils.boost(getBoost())).toString();
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java Mon Oct 5 12:28:17 2015
@@ -20,6 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.util.ToStringUtils;
/** Implements a simple bounding box query on a GeoPoint field. This is inspired by
* {@link org.apache.lucene.search.NumericRangeQuery} and is implemented using a
@@ -92,6 +93,7 @@ public class GeoPointInBBoxQuery extends
.append(',')
.append(maxLat)
.append("]")
+ .append(ToStringUtils.boost(getBoost()))
.toString();
}
Modified: lucene/dev/branches/branch_5x/lucene/spatial3d/src/java/org/apache/lucene/bkdtree3d/PointInGeo3DShapeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial3d/src/java/org/apache/lucene/bkdtree3d/PointInGeo3DShapeQuery.java?rev=1706827&r1=1706826&r2=1706827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial3d/src/java/org/apache/lucene/bkdtree3d/PointInGeo3DShapeQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial3d/src/java/org/apache/lucene/bkdtree3d/PointInGeo3DShapeQuery.java Mon Oct 5 12:28:17 2015
@@ -34,6 +34,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.ToStringUtils;
import java.io.IOException;
@@ -217,6 +218,7 @@ public class PointInGeo3DShapeQuery exte
sb.append(planetModel);
sb.append(" Shape: ");
sb.append(shape);
+ sb.append(ToStringUtils.boost(getBoost()));
return sb.toString();
}
}