You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/03/04 23:20:39 UTC
svn commit: r1664169 - in /jackrabbit/oak/trunk/oak-lucene: ./
src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: mreutegg
Date: Wed Mar 4 22:20:39 2015
New Revision: 1664169
URL: http://svn.apache.org/r1664169
Log:
OAK-2577: LuceneSupportTest fails
Revert OAK-2570
Removed:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1664169&r1=1664168&r2=1664169&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Wed Mar 4 22:20:39 2015
@@ -275,17 +275,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1664169&r1=1664168&r2=1664169&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java Wed Mar 4 22:20:39 2015
@@ -39,7 +39,6 @@ import org.apache.felix.scr.annotations.
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
-import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
@@ -96,33 +95,22 @@ public class LuceneIndexProviderService
)
private static final String PROP_LOCAL_INDEX_DIR = "localIndexDir";
- @Property(
- boolValue = true,
- label = "Open index asynchronously",
- description = "Enable opening of indexes in asynchronous mode"
- )
- private static final String PROP_ASYNC_INDEX_OPEN = "enableOpenIndexAsync";
-
private Whiteboard whiteboard;
private WhiteboardExecutor executor;
- private BackgroundObserver backgroundObserver;
-
@Activate
private void activate(BundleContext bundleContext, Map<String, ?> config)
throws NotCompliantMBeanException {
initializeFactoryClassLoaders(getClass().getClassLoader());
whiteboard = new OsgiWhiteboard(bundleContext);
- executor = new WhiteboardExecutor();
- executor.start(whiteboard);
indexProvider = new LuceneIndexProvider(createTracker(bundleContext, config));
initializeLogging(config);
initialize();
regs.add(bundleContext.registerService(QueryIndexProvider.class.getName(), indexProvider, null));
- registerObserver(bundleContext, config);
+ regs.add(bundleContext.registerService(Observer.class.getName(), indexProvider, null));
oakRegs.add(registerMBean(whiteboard,
LuceneIndexMBean.class,
@@ -141,10 +129,6 @@ public class LuceneIndexProviderService
reg.unregister();
}
- if (backgroundObserver != null){
- backgroundObserver.close();
- }
-
if (indexProvider != null) {
indexProvider.close();
indexProvider = null;
@@ -193,6 +177,8 @@ public class LuceneIndexProviderService
"directory path [%s] nor repository home [%s] defined", PROP_LOCAL_INDEX_DIR, REPOSITORY_HOME);
File indexDir = new File(indexDirPath);
+ executor = new WhiteboardExecutor();
+ executor.start(whiteboard);
IndexCopier copier = new IndexCopier(executor, indexDir);
log.info("Enabling CopyOnRead support. Index files would be copied under {}", indexDir.getAbsolutePath());
@@ -208,17 +194,6 @@ public class LuceneIndexProviderService
return new IndexTracker();
}
- private void registerObserver(BundleContext bundleContext, Map<String, ?> config) {
- boolean enableAsyncIndexOpen = PropertiesUtil.toBoolean(config.get(PROP_ASYNC_INDEX_OPEN), true);
- Observer observer = indexProvider;
- if (enableAsyncIndexOpen) {
- backgroundObserver = new BackgroundObserver(indexProvider, executor, 5);
- observer = backgroundObserver;
- log.info("Registering the LuceneIndexProvider as a BackgroundObserver");
- }
- regs.add(bundleContext.registerService(Observer.class.getName(), observer, null));
- }
-
private void initializeFactoryClassLoaders(ClassLoader classLoader) {
ClassLoader originalClassLoader = Thread.currentThread()
.getContextClassLoader();