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 10:43:44 UTC
svn commit: r1382692 [2/2] - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/
oak-core/src/...
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditorTest.java?rev=1382692&r1=1382691&r2=1382692&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditorTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditorTest.java Mon Sep 10 08:43:42 2012
@@ -16,6 +16,11 @@
*/
package org.apache.jackrabbit.oak.plugins.lucene;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.apache.jackrabbit.oak.spi.query.IndexUtils.DEFAULT_INDEX_HOME;
+
import javax.security.auth.Subject;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
@@ -34,18 +39,12 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.IndexDefinitionImpl;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.apache.jackrabbit.oak.plugins.lucene.LuceneIndexUtils.DEFAULT_INDEX_NAME;
-import static org.apache.jackrabbit.oak.spi.query.IndexUtils.DEFAULT_INDEX_HOME;
-
-public class LuceneEditorTest {
+public class LuceneEditorTest implements LuceneIndexConstants {
@Test
public void testLucene() throws Exception {
IndexDefinition testID = new IndexDefinitionImpl(DEFAULT_INDEX_NAME,
- LuceneIndexFactory.TYPE, DEFAULT_INDEX_HOME, false, null);
+ TYPE, DEFAULT_INDEX_HOME, false, null);
KernelNodeStore store = new KernelNodeStore(new MicroKernelImpl());
store.setHook(new LuceneEditor(testID));
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java?rev=1382692&r1=1382691&r2=1382692&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java Mon Sep 10 08:43:42 2012
@@ -24,12 +24,10 @@ import org.apache.jackrabbit.oak.api.Con
import org.apache.jackrabbit.oak.api.CoreValueFactory;
import org.apache.jackrabbit.oak.api.SessionQueryEngine;
import org.apache.jackrabbit.oak.core.ContentRepositoryImpl;
-import org.apache.jackrabbit.oak.plugins.index.PropertyIndexFactory;
+import org.apache.jackrabbit.oak.plugins.index.PropertyIndexer;
import org.apache.jackrabbit.oak.spi.QueryIndexProvider;
+import org.apache.jackrabbit.oak.spi.commit.CompositeHook;
import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
-import org.apache.jackrabbit.oak.spi.query.IndexManager;
-import org.apache.jackrabbit.oak.spi.query.IndexManagerImpl;
-import org.apache.jackrabbit.oak.spi.query.IndexUtils;
import org.junit.Before;
/**
@@ -45,11 +43,10 @@ public abstract class AbstractQueryTest
@Override
protected ContentRepository createRepository() {
mk = new IndexWrapper(new MicroKernelImpl());
- QueryIndexProvider indexer = mk.getIndexer();
- QueryIndexProvider qip = new CompositeQueryIndexProvider(indexer);
- IndexManager im = new IndexManagerImpl(IndexUtils.DEFAULT_INDEX_HOME,
- mk, new PropertyIndexFactory());
- return new ContentRepositoryImpl(mk, qip, im);
+ PropertyIndexer pi = new PropertyIndexer(mk.getIndexer());
+ QueryIndexProvider qip = new CompositeQueryIndexProvider(pi);
+ CompositeHook hook = new CompositeHook(pi);
+ return new ContentRepositoryImpl(mk, qip, hook);
}
@Override
Modified: jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_explain.txt
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_explain.txt?rev=1382692&r1=1382691&r2=1382692&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_explain.txt (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_explain.txt Mon Sep 10 08:43:42 2012
@@ -36,6 +36,7 @@ explain select * from [nt:base] where pr
select * from [nt:base] where property([*], 'REFERENCE') = CAST('123' AS REFERENCE)
/test/a
+commit /oak-index/indexes + "type:": "property"
commit /oak-index/indexes + "prefix@ref:": {}
explain select * from [nt:base] where property([*], 'REFERENCE') = CAST('123' AS REFERENCE)
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1382692&r1=1382691&r2=1382692&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Mon Sep 10 08:43:42 2012
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.api.Con
import org.apache.jackrabbit.oak.core.ContentRepositoryImpl;
import org.apache.jackrabbit.oak.http.OakServlet;
import org.apache.jackrabbit.oak.jcr.RepositoryImpl;
-import org.apache.jackrabbit.oak.plugins.lucene.LuceneEditor;
+import org.apache.jackrabbit.oak.plugins.lucene.LuceneHook;
import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider;
import org.apache.jackrabbit.oak.plugins.name.NamespaceValidatorProvider;
import org.apache.jackrabbit.oak.plugins.type.DefaultTypeEditor;
@@ -202,7 +202,7 @@ public class Main {
List<CommitHook> hooks = new ArrayList<CommitHook>();
hooks.add(new DefaultTypeEditor());
hooks.add(new ValidatingHook(createDefaultValidatorProvider()));
- hooks.add(new LuceneEditor());
+ hooks.add(new LuceneHook());
return new CompositeHook(hooks);
}