You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/05/10 12:35:25 UTC
[38/50] [abbrv] lucene-solr:jira/solr-10290: LUCENE-5365,
LUCENE-7818: Fix incorrect condition in queryparser's
QueryNodeOperation#logicalAnd()
LUCENE-5365, LUCENE-7818: Fix incorrect condition in queryparser's QueryNodeOperation#logicalAnd()
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a95438e8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a95438e8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a95438e8
Branch: refs/heads/jira/solr-10290
Commit: a95438e851570c37ca5652e9ce41e57eb5aaa0fd
Parents: 6de19d0
Author: Uwe Schindler <us...@apache.org>
Authored: Sun May 7 13:24:21 2017 +0200
Committer: Cassandra Targett <ca...@lucidworks.com>
Committed: Wed May 10 07:30:33 2017 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 6 +++++-
.../queryparser/flexible/core/util/QueryNodeOperation.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a95438e8/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index e9aefe5..54cc54a 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -114,9 +114,13 @@ Bug Fixes
* LUCENE-7798: Add .equals and .hashCode to ToParentBlockJoinSortField
(Mikhail Khludnev)
-* LUCENE-7814: DateRangePrefixTree (in spatial-extras ) had edge-case bugs for
+* LUCENE-7814: DateRangePrefixTree (in spatial-extras) had edge-case bugs for
years >= 292,000,000. (David Smiley)
+* LUCENE-5365, LUCENE-7818: Fix incorrect condition in queryparser's
+ QueryNodeOperation#logicalAnd(). (Olivier Binda, Amrit Sarkar,
+ AppChecker via Uwe Schindler)
+
Improvements
* LUCENE-7782: OfflineSorter now passes the total number of items it
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a95438e8/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java
index 4280d1c..7d82510 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java
@@ -56,7 +56,7 @@ public final class QueryNodeOperation {
op = ANDOperation.BOTH;
else if (q1 instanceof AndQueryNode)
op = ANDOperation.Q1;
- else if (q1 instanceof AndQueryNode)
+ else if (q2 instanceof AndQueryNode)
op = ANDOperation.Q2;
else
op = ANDOperation.NONE;