[sling-org-apache-sling-resourceresolver] 01/01: SLING-12017: resource resolver: add fallback when paged query fails due to missing index

[reschke]

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

reschke pushed a commit to branch SLING-12017
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git

commit 1b58109b2dd420ecf88ef90bca8313f41832b59a
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Fri Sep 1 14:20:13 2023 +0100

    SLING-12017: resource resolver: add fallback when paged query fails due to 
missing index
---
 .../org/apache/sling/resourceresolver/impl/mapping/MapEntries.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index 19aeee4..bba9712 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -1375,7 +1375,11 @@ public class MapEntries implements
             final String queryStringWithSort = baseQueryString + " AND 
FIRST([sling:vanityPath]) > '%s' ORDER BY FIRST([sling:vanityPath])";
             it = new PagedQueryIterator(resolver, queryStringWithSort);
         } catch (QuerySyntaxException ex) {
-            log.debug("sort with first() not supported, falling back to base 
query");
+            log.debug("sort with first() not supported, falling back to base 
query", ex);
+            supportsSort = false;
+            it = queryAllVanityPaths(baseQueryString);
+        } catch (UnsupportedOperationException ex) {
+            log.debug("query failed as unsupported, retrying without 
paging/sorting", ex);
             supportsSort = false;
             it = queryAllVanityPaths(baseQueryString);
         }