Skip to content

Apache Lucene open-source search software

Avoid redundant copies of BytesRef when constructing new Term (#12234)

Andrey Bozhko2d0dc6407a5e
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/utils/NearestFuzzyQuery.java b/lucene/classification/src/java/org/apache/lucene/classification/utils/NearestFuzzyQuery.java
index 12d11e59b9d..8f7f15d69b4 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/utils/NearestFuzzyQuery.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/utils/NearestFuzzyQuery.java
@@ -159,10 +159,7 @@ public class NearestFuzzyQuery extends Query {
float score = fe.getBoost();
if (variantsQ.size() < MAX_VARIANTS_PER_TERM || score > minScore) {
ScoreTerm st =
- new ScoreTerm(
- new Term(startTerm.field(), BytesRef.deepCopyOf(possibleMatch)),
- score,
- startTerm);
+ new ScoreTerm(new Term(startTerm.field(), possibleMatch), score, startTerm);
variantsQ.insertWithOverflow(st);
minScore = variantsQ.top().score; // maintain minScore
}
diff --git a/lucene/monitor/src/java/org/apache/lucene/monitor/TermFilteredPresearcher.java b/lucene/monitor/src/java/org/apache/lucene/monitor/TermFilteredPresearcher.java
index aaf1360fbac..0e8db5db248 100644
--- a/lucene/monitor/src/java/org/apache/lucene/monitor/TermFilteredPresearcher.java
+++ b/lucene/monitor/src/java/org/apache/lucene/monitor/TermFilteredPresearcher.java
@@ -186,7 +186,7 @@ public class TermFilteredPresearcher extends Presearcher {
+ field
+ ":"
+ Term.toString(term));
- bq.add(new TermQuery(new Term(field, BytesRef.deepCopyOf(term))), BooleanClause.Occur.SHOULD);
+ bq.add(new TermQuery(new Term(field, term)), BooleanClause.Occur.SHOULD);
}
BooleanQuery built = bq.build();
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
index 6dc13db7773..8a8bc719528 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
@@ -28,7 +28,6 @@ import org.apache.lucene.queries.spans.SpanQuery;
import org.apache.lucene.queries.spans.SpanTermQuery;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.util.BytesRef;
import org.w3c.dom.Element;
/** Builder that analyzes the text into a {@link SpanOrQuery} */
@@ -51,8 +50,7 @@ public class SpanOrTermsBuilder extends SpanBuilderBase {
TermToBytesRefAttribute termAtt = ts.addAttribute(TermToBytesRefAttribute.class);
ts.reset();
while (ts.incrementToken()) {
- SpanTermQuery stq =
- new SpanTermQuery(new Term(fieldName, BytesRef.deepCopyOf(termAtt.getBytesRef())));
+ SpanTermQuery stq = new SpanTermQuery(new Term(fieldName, termAtt.getBytesRef()));
clausesList.add(stq);
}
ts.end();
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java
index 547a80fd5a2..facfedf6056 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java
@@ -29,7 +29,6 @@ import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.BoostQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.util.BytesRef;
import org.w3c.dom.Element;
/**
@@ -55,7 +54,7 @@ public class TermsQueryBuilder implements QueryBuilder {
Term term = null;
ts.reset();
while (ts.incrementToken()) {
- term = new Term(fieldName, BytesRef.deepCopyOf(termAtt.getBytesRef()));
+ term = new Term(fieldName, termAtt.getBytesRef());
bq.add(new BooleanClause(new TermQuery(term), BooleanClause.Occur.SHOULD));
}
ts.end();
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
index ab4cbb05fc9..f834e66d33e 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
@@ -224,10 +224,7 @@ public class FuzzyLikeThisQuery extends Query {
float score = boostAtt.getBoost();
if (variantsQ.size() < MAX_VARIANTS_PER_TERM || score > minScore) {
ScoreTerm st =
- new ScoreTerm(
- new Term(startTerm.field(), BytesRef.deepCopyOf(possibleMatch)),
- score,
- startTerm);
+ new ScoreTerm(new Term(startTerm.field(), possibleMatch), score, startTerm);
variantsQ.insertWithOverflow(st);
minScore = variantsQ.top().score; // maintain minScore
}
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java
index f57a68184c0..1dc5f240eeb 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java
@@ -451,9 +451,7 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas
// System.out.println(Thread.currentThread().getName() + " now search
// body:" + term.utf8ToString());
// }
- totHits.addAndGet(
- runQuery(
- s, new TermQuery(new Term("body", BytesRef.deepCopyOf(term)))));
+ totHits.addAndGet(runQuery(s, new TermQuery(new Term("body", term))));
}
}
// if (VERBOSE) {