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 al...@apache.org on 2012/09/10 11:42:40 UTC

svn commit: r1382721 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit: mk/index/IndexWrapper.java oak/plugins/index/Indexer.java oak/plugins/index/PropertyIndexer.java

Author: alexparvulescu
Date: Mon Sep 10 09:42:40 2012
New Revision: 1382721

URL: http://svn.apache.org/viewvc?rev=1382721&view=rev
Log:
OAK-298 Refactor the Indexer mechanism to use the NodeStore apis

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexer.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java?rev=1382721&r1=1382720&r2=1382721&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java Mon Sep 10 09:42:40 2012
@@ -27,15 +27,17 @@ import org.apache.jackrabbit.mk.api.Micr
 import org.apache.jackrabbit.mk.api.MicroKernelException;
 import org.apache.jackrabbit.mk.json.JsopReader;
 import org.apache.jackrabbit.mk.json.JsopStream;
+import org.apache.jackrabbit.mk.wrapper.MicroKernelWrapper;
+import org.apache.jackrabbit.mk.wrapper.MicroKernelWrapperBase;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.plugins.index.Indexer;
 import org.apache.jackrabbit.oak.plugins.index.PrefixIndex;
 import org.apache.jackrabbit.oak.plugins.index.PropertyIndex;
-import org.apache.jackrabbit.mk.wrapper.MicroKernelWrapper;
-import org.apache.jackrabbit.mk.wrapper.MicroKernelWrapperBase;
 
 /**
  * The index mechanism, as a wrapper.
+ * 
+ * @deprecated - see OAK-289
  */
 public class IndexWrapper extends MicroKernelWrapperBase implements MicroKernel {
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java?rev=1382721&r1=1382720&r2=1382721&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java Mon Sep 10 09:42:40 2012
@@ -37,6 +37,7 @@ import org.apache.jackrabbit.oak.commons
  * A index mechanism. An index is bound to a certain repository, and supports
  * one or more indexes.
  * 
+ * @deprecated use {@link PropertyIndexer} - see OAK-289
  */
 public class Indexer implements PropertyIndexConstants, BTreeHelper {
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexer.java?rev=1382721&r1=1382720&r2=1382721&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexer.java Mon Sep 10 09:42:40 2012
@@ -46,7 +46,7 @@ public class PropertyIndexer implements 
     @Override
     public NodeState processCommit(NodeStore store, NodeState before,
             NodeState after) throws CommitFailedException {
-        // TODO update index data
+        // TODO update index data see OAK-289
         return after;
     }