DominikSuess commented on a change in pull request #5: SLING-7544 - improving
optimized alias lookup to not block during int…
URL:
https://github.com/apache/sling-org-apache-sling-resourceresolver/pull/5#discussion_r185453659
##########
File path:
src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
##########
@@ -1027,16 +1052,51 @@ private boolean addEntry(final Map<String,
List<MapEntry>> entryMap, final Strin
*/
private Map<String, Map<String, String>> loadAliases(final
ResourceResolver resolver) {
final Map<String, Map<String, String>> map = new ConcurrentHashMap<>();
- final String queryString = "SELECT sling:alias FROM nt:base WHERE
sling:alias IS NOT NULL";
- final Iterator<Resource> i = resolver.findResources(queryString,
"sql");
- while (i.hasNext()) {
- final Resource resource = i.next();
- loadAlias(resource, map);
- }
+ String queryString = "SELECT sling:alias FROM nt:base WHERE
sling:alias IS NOT NULL";
+ if (this.factory.isForceNoAliasTraversal()) {
+ queryString += " option(traversal fail)";
+ }
+ while (true){
+ try {
+ final Iterator<Resource> i =
resolver.findResources(queryString, "sql");
+ while (i.hasNext()) {
+ final Resource resource = i.next();
+ loadAlias(resource, map);
+ }
+ break;
+ } catch (QuerySyntaxException e) {
+ Throwable cause = unwrapThrowable(e);
+ if (cause instanceof IllegalArgumentException) {
Review comment:
@catholicon ok I constrained it to check for the right query to be used so
the retry behavior will only kick in when the corresponding query is active.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
