From e0873a610ca41328279fe53ac6879e6377981e64 Mon Sep 17 00:00:00 2001 From: Jukka Zitting Date: Wed, 16 Apr 2014 10:14:18 -0400 Subject: [PATCH] OAK-1734: UserInitializer#initialize runs a query without any indexes Use the PropertyIndexProvider to speed up the lookup for existing admin/anon users --- .../java/org/apache/jackrabbit/oak/security/user/UserInitializer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java index 550072b..8572aef 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java @@ -28,11 +28,11 @@ import org.apache.jackrabbit.oak.core.SystemRoot; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.index.IndexConstants; import org.apache.jackrabbit.oak.plugins.index.IndexUtils; +import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.lifecycle.WorkspaceInitializer; -import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; @@ -92,7 +92,7 @@ class UserInitializer implements WorkspaceInitializer, UserConstants { Root root = new SystemRoot( store, EmptyHook.INSTANCE, workspaceName, securityProvider, - new QueryEngineSettings(), new CompositeQueryIndexProvider()); + new QueryEngineSettings(), new PropertyIndexProvider()); UserConfiguration userConfiguration = securityProvider.getConfiguration(UserConfiguration.class); UserManager userManager = userConfiguration.getUserManager(root, NamePathMapper.DEFAULT); -- 1.8.4.msysgit.0