[geode] branch feature/GEODE-8287 created (now 335216a)

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

boglesby pushed a change to branch feature/GEODE-8287
in repository https://gitbox.apache.org/repos/asf/geode.git.


      at 335216a  GEODE-8287: Added another condition to cause the indexed value to be used

This branch includes the following new commits:

     new 335216a  GEODE-8287: Added another condition to cause the indexed value to be used

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[geode] 01/01: GEODE-8287: Added another condition to cause the indexed value to be used

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

boglesby pushed a commit to branch feature/GEODE-8287
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 335216ae536aea69d9c58a4c5553807ec220f5f3
Author: Barry Oglesby <bo...@pivotal.io>
AuthorDate: Fri Jun 19 14:42:39 2020 -0700

    GEODE-8287: Added another condition to cause the indexed value to be used
---
 .../main/java/org/apache/geode/cache/query/internal/QueryUtils.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java
index 29446bf..ccae99d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java
@@ -737,6 +737,9 @@ public class QueryUtils {
         } else {
           c = currentLevel.evaluateCollection(context);
         }
+      } else if (useDerivedResults && derivedResults != null && key != null
+          && derivedResults.containsKey(key)) {
+        c = derivedResults.get(key);
       } else {
         c = currentLevel.evaluateCollection(context);
       }