sonatype-lift[bot] commented on code in PR #1463:
URL: https://github.com/apache/solr/pull/1463#discussion_r1190158811
##########
solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java:
##########
@@ -1275,6 +1270,119 @@ && allSameQueryStructure(lst)) {
}
}
+ /**
+ * Determines whether a list of field-centric queries can be rewritten as
term-centric ones by
+ * regrouping clauses according to startOffset. Requires taht each query
is a BooleanQuery (or
+ * BoostQuery containing a BooleanQuery) with clauses of type
SynonymQueryWithOffset or
+ * TermQueryWithOffset and that each clause has a non-null offset.
+ */
+ private boolean canRewriteUsingStartOffset(List<Query> lst) {
+ for (Query q : lst) {
+
+ Query unwrappedQuery = q;
+ if (q instanceof BoostQuery) {
+ unwrappedQuery = ((BoostQuery) q).getQuery();
+ }
+
+ if (!(unwrappedQuery instanceof BooleanQuery)) {
+ return false;
+ }
+ BooleanQuery bq = (BooleanQuery) unwrappedQuery;
+
+ for (BooleanClause clause : bq.clauses()) {
+ Query innerQuery = clause.getQuery();
+ if (OffsetHolder.getStartOffset(innerQuery) == null) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Rewrites a list of field-centric queries as term-centric queries by
creating a term-centric
+ * query for each unique startOffset found in the clauses inside the
field-centric queries.
+ *
+ * <p>Assumes the list contains only instance BooleanQuery or BoostQuery
containing
+ * BooleanQuery, and that each BooleanQuery has clauses of type
TermQueryWithOffset or
+ * SynonymQueryWithOffset, as confirmed via canRewriteUsingStartOffset()
+ */
+ private BooleanQuery.Builder rewriteUsingStartOffset(List<Query> lst,
float tie) {
+
+ // create a map of startOffsets to the Queries that have a particular
startOffset
+ SortedMap<Integer, List<Query>> offsets = new TreeMap<>();
+ for (Query q : lst) {
+
+ Float boost = null;
+ BooleanQuery bq = null;
+ if (q instanceof BoostQuery) {
+ boost = ((BoostQuery) q).getBoost();
+ bq = (BooleanQuery) ((BoostQuery) q).getQuery();
+ } else {
+ bq = (BooleanQuery) q;
+ }
+
+ for (BooleanClause bc : bq.clauses()) {
+ Query innerQuery = bc.getQuery();
+ int offset = OffsetHolder.getStartOffset(innerQuery);
Review Comment:
<picture><img alt="7% of developers fix this issue"
src="https://lift.sonatype.com/api/commentimage/fixrate/7/display.svg";></picture>
<b>*NULLPTR_DEREFERENCE:</b>* `Integer OffsetHolder.getStartOffset(Query)`
could be null (last assigned on line 1316) and is dereferenced.
---
<details><summary>ℹ️ Expand to see all <b>@sonatype-lift</b>
commands</summary>
You can reply with the following commands. For example, reply with
***@sonatype-lift ignoreall*** to leave out all findings.
| **Command** | **Usage** |
| ------------- | ------------- |
| `@sonatype-lift ignore` | Leave out the above finding from this PR |
| `@sonatype-lift ignoreall` | Leave out all the existing findings from this
PR |
| `@sonatype-lift exclude <file\|issue\|path\|tool>` | Exclude specified
`file\|issue\|path\|tool` from Lift findings by updating your config.toml file |
**Note:** When talking to LiftBot, you need to **refresh** the page to see
its response.
<sub>[Click here](https://github.com/apps/sonatype-lift/installations/new)
to add LiftBot to another repo.</sub></details>
##########
solr/core/src/java/org/apache/solr/parser/PhraseQueryWithOffset.java:
##########
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.parser;
+
+import java.io.IOException;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Weight;
+
+/**
+ * Wraps a PhraseQuery and stores an Integer startOffset taken from the Token
that gave rise to the
+ * contained Terms.
+ */
+public final class PhraseQueryWithOffset extends Query implements OffsetHolder
{
+
+ private final PhraseQuery query;
+
+ private final Integer startOffset;
+
+ public PhraseQueryWithOffset(PhraseQuery query, Integer offset) {
+ this.query = query;
+ this.startOffset = offset;
+ }
+
+ public int getSlop() {
+ return query.getSlop();
+ }
+
+ /** Returns the field this query applies to */
+ public String getField() {
+ return query.getField();
+ }
+
+ /** Returns the list of terms in this phrase. */
+ public Term[] getTerms() {
Review Comment:
<picture><img alt="8% of developers fix this issue"
src="https://lift.sonatype.com/api/commentimage/fixrate/8/display.svg";></picture>
<b>*[AvoidObjectArrays](https://errorprone.info/bugpattern/AvoidObjectArrays):</b>*
Avoid returning a Term[]; consider an ImmutableList<Term> instead
---
<details><summary>ℹ️ Expand to see all <b>@sonatype-lift</b>
commands</summary>
You can reply with the following commands. For example, reply with
***@sonatype-lift ignoreall*** to leave out all findings.
| **Command** | **Usage** |
| ------------- | ------------- |
| `@sonatype-lift ignore` | Leave out the above finding from this PR |
| `@sonatype-lift ignoreall` | Leave out all the existing findings from this
PR |
| `@sonatype-lift exclude <file\|issue\|path\|tool>` | Exclude specified
`file\|issue\|path\|tool` from Lift findings by updating your config.toml file |
**Note:** When talking to LiftBot, you need to **refresh** the page to see
its response.
<sub>[Click here](https://github.com/apps/sonatype-lift/installations/new)
to add LiftBot to another repo.</sub></details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
![https://lift.sonatype.com/api/commentimage/fixrate/7/display.svg"](https://lift.sonatype.com/api/commentimage/fixrate/7/display.svg"){kind=link}
![https://lift.sonatype.com/api/commentimage/fixrate/8/display.svg"](https://lift.sonatype.com/api/commentimage/fixrate/8/display.svg"){kind=link}