You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/11/06 10:55:51 UTC

svn commit: r1869458 - in /jackrabbit/oak/branches/1.4: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

Author: reschke
Date: Wed Nov  6 10:55:50 2019
New Revision: 1869458

URL: http://svn.apache.org/viewvc?rev=1869458&view=rev
Log:
OAK-4652 - indexName logged in QueryImpl is wrong in case of multiple indexes satisfying the query (merged r1755295 into 1.4)

Modified:
    jackrabbit/oak/branches/1.4/   (props changed)
    jackrabbit/oak/branches/1.4/oak-core/   (props changed)
    jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1755295

Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk/oak-core:r1755295

Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java?rev=1869458&r1=1869457&r2=1869458&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java Wed Nov  6 10:55:50 2019
@@ -1026,12 +1026,13 @@ public class QueryImpl implements Query
                     double c = p.getCostPerExecution() + entryCount * p.getCostPerEntry();
                     if (c < cost) {
                         cost = c;
-                        if (p.getPlanName() != null) {
-                            indexName += "[" + p.getPlanName() + "]";
-                        }
                         indexPlan = p;
                     }
                 }
+
+                if (indexPlan != null && indexPlan.getPlanName() != null) {
+                    indexName += "[" + indexPlan.getPlanName() + "]";
+                }
             } else {
                 cost = index.getCost(filter, rootState);
             }