Author: chetanm
Date: Wed Jun 29 06:26:01 2016
New Revision: 1750600
URL: http://svn.apache.org/viewvc?rev=1750600&view=rev
Log:
OAK-4369 - Introduce interface for Secondary NodeStore provider
Introducing NodeStoreProvider interface which can provide access to a NodeStore
instance which plays specific role
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreProvider.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java?rev=1750600&r1=1750599&r2=1750600&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
Wed Jun 29 06:26:01 2016
@@ -47,7 +47,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserverMBean;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
-import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.spi.state.NodeStoreProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
@@ -76,8 +76,8 @@ public class SecondaryStoreCacheService
@Reference
private BlobStore blobStore;
- @Reference(target = "(type=secondary)")
- private NodeStore secondaryStore;
+ @Reference(target = "(role=secondary)")
+ private NodeStoreProvider secondaryStoreProvider;
@Reference
private Executor executor;
@@ -145,7 +145,7 @@ public class SecondaryStoreCacheService
pathFilter = new PathFilter(asList(includedPaths),
asList(excludedPaths));
- SecondaryStoreBuilder builder = new
SecondaryStoreBuilder(secondaryStore)
+ SecondaryStoreBuilder builder = new
SecondaryStoreBuilder(secondaryStoreProvider.getNodeStore())
.differ(differ)
.statisticsProvider(statisticsProvider)
.pathFilter(pathFilter);
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreProvider.java?rev=1750600&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreProvider.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreProvider.java
Wed Jun 29 06:26:01 2016
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.spi.state;
+
+/**
+ * Provides a NodeStore instance for specific role. A role indicates what type
+ * store is it e.g. role set to 'secondary' means that this NodeStore acts like
+ * replica of some primary NodeStore
+ */
+public interface NodeStoreProvider {
+ /**
+ * Service property name which determine what role this NodeStore is
playing.
+ */
+ String ROLE = "role";
+
+ NodeStore getNodeStore();
+
+}
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java?rev=1750600&r1=1750599&r2=1750600&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java
Wed Jun 29 06:26:01 2016
@@ -34,6 +34,7 @@ import org.apache.jackrabbit.oak.spi.blo
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserverMBean;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.spi.state.NodeStoreProvider;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
@@ -58,7 +59,12 @@ public class SecondaryStoreCacheServiceT
@Before
public void configureDefaultServices(){
context.registerService(BlobStore.class, new MemoryBlobStore());
- context.registerService(NodeStore.class, secondaryStore,
ImmutableMap.<String, Object>of("type", "secondary"));
+ context.registerService(NodeStoreProvider.class, new
NodeStoreProvider() {
+ @Override
+ public NodeStore getNodeStore() {
+ return secondaryStore;
+ }
+ }, ImmutableMap.<String, Object>of("role", "secondary"));
context.registerService(Executor.class,
Executors.newSingleThreadExecutor());
context.registerService(StatisticsProvider.class,
StatisticsProvider.NOOP);
MockOsgi.injectServices(cacheService, context.bundleContext());
