(sling-org-apache-sling-resourceresolver) branch SLING-12204 updated: SLING-12204: ResourceResolver: refactor PagedQueryIterator for re-use (more DEBUG diagnostics)

[reschke]

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

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


The following commit(s) were added to refs/heads/SLING-12204 by this push:
     new eaf9955  SLING-12204: ResourceResolver: refactor PagedQueryIterator 
for re-use (more DEBUG diagnostics)
eaf9955 is described below

commit eaf995539c7a7374e14728afd7499dd0b9aaff2e
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Wed Dec 20 15:34:59 2023 +0100

    SLING-12204: ResourceResolver: refactor PagedQueryIterator for re-use (more 
DEBUG diagnostics)
---
 .../org/apache/sling/resourceresolver/impl/mapping/MapEntries.java    | 4 +++-
 1 file changed, 3 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 942a658..d949f66 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
@@ -1303,6 +1303,7 @@ public class MapEntries implements
         private int page = 0;
         private int pageSize;
         private Resource next = null;
+        private String[] defaultValue = new String[0];
 
         public PagedQueryIterator(String name, String propertyName, 
ResourceResolver resolver, String query, int pageSize) {
             this.name = name;
@@ -1327,7 +1328,7 @@ public class MapEntries implements
         private Resource getNext() throws NoSuchElementException {
             Resource resource = it.next();
             count += 1;
-            final String[] values = resource.getValueMap().get(propertyName, 
new String[0]);
+            final String[] values = resource.getValueMap().get(propertyName, 
defaultValue);
             if (values.length > 0) {
                 String value = values[0];
                 if (value.compareTo(lastValue) < 0) {
@@ -1339,6 +1340,7 @@ public class MapEntries implements
                 }
                 // start next page?
                 if (count > pageSize && !value.equals(lastValue)) {
+                    log.debug("read {} query (page {}); {} entries", name, 
page, count);
                     lastValue = value;
                     nextPage();
                 }