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 ch...@apache.org on 2014/11/27 12:29:33 UTC
svn commit: r1642096 - in /jackrabbit/oak/branches/1.0: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index...
Author: chetanm
Date: Thu Nov 27 11:29:32 2014
New Revision: 1642096
URL: http://svn.apache.org/r1642096
Log:
OAK-2278 - Same Lucene index to support both property restrictions and fulltext constraints
Merging revisions 1640723,1640728
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexLookup.java
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LowCostLuceneIndexProvider.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1640723,1640728
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java Thu Nov 27 11:29:32 2014
@@ -74,6 +74,10 @@ class IndexPlanner {
private IndexPlan.Builder getPlanBuilder() {
FullTextExpression ft = filter.getFullTextConstraint();
+ if (!defn.getVersion().isAtLeast(IndexFormatVersion.V2)){
+ return null;
+ }
+
//Query Fulltext and Index does not support fulltext
if (ft != null && !defn.isFullTextEnabled()) {
return null;
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Thu Nov 27 11:29:32 2014
@@ -191,7 +191,7 @@ public class LuceneIndex implements Adva
return Collections.emptyList();
}
- String indexPath = new LuceneIndexLookup(rootState).getFullTextIndexPath(filter, tracker);
+ String indexPath = new LuceneIndexLookup(rootState).getOldFullTextIndexPath(filter, tracker);
if (indexPath == null) { // unusable index
return Collections.emptyList();
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexLookup.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexLookup.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexLookup.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexLookup.java Thu Nov 27 11:29:32 2014
@@ -42,14 +42,15 @@ class LuceneIndexLookup {
* Returns the path of the first Lucene index node which supports
* fulltext search
*/
- public String getFullTextIndexPath(Filter filter, IndexTracker tracker) {
+ public String getOldFullTextIndexPath(Filter filter, IndexTracker tracker) {
Collection<String> indexPaths = collectIndexNodePaths(filter, false);
IndexNode indexNode = null;
for (String path : indexPaths) {
try {
indexNode = tracker.acquireIndexNode(path);
if (indexNode != null
- && indexNode.getDefinition().isFullTextEnabled()) {
+ && indexNode.getDefinition().isFullTextEnabled()
+ && indexNode.getDefinition().getVersion() == IndexFormatVersion.V1) {
return path;
}
} finally {
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java Thu Nov 27 11:29:32 2014
@@ -68,7 +68,7 @@ public class LuceneIndexProvider impleme
@Override @Nonnull
public List<QueryIndex> getQueryIndexes(NodeState nodeState) {
- return ImmutableList.<QueryIndex> of(newLuceneIndex(), newLucenePropertyIndex());
+ return ImmutableList.<QueryIndex> of(new AggregateIndex(newLuceneIndex()), newLucenePropertyIndex());
}
protected LuceneIndex newLuceneIndex() {
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java Thu Nov 27 11:29:32 2014
@@ -38,7 +38,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.ReferencePolicyOption;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
-import org.apache.jackrabbit.oak.plugins.index.aggregate.AggregateIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
@@ -115,9 +114,7 @@ public class LuceneIndexProviderService
initializeLogging(config);
initialize();
- QueryIndexProvider aggregate = AggregateIndexProvider.wrap(indexProvider);
-
- regs.add(bundleContext.registerService(QueryIndexProvider.class.getName(), aggregate, null));
+ regs.add(bundleContext.registerService(QueryIndexProvider.class.getName(), indexProvider, null));
regs.add(bundleContext.registerService(Observer.class.getName(), indexProvider, null));
oakRegs.add(registerMBean(whiteboard,
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Thu Nov 27 11:29:32 2014
@@ -40,6 +40,7 @@ import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition.IndexingRule;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexPlanner.PlanResult;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.MoreLikeThisHelper;
@@ -57,6 +58,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.IndexRow;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
+import org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -153,7 +155,8 @@ import static org.apache.lucene.search.B
* @see org.apache.jackrabbit.oak.spi.query.QueryIndex
*
*/
-public class LucenePropertyIndex implements AdvancedQueryIndex, QueryIndex, NativeQueryIndex {
+public class LucenePropertyIndex implements AdvancedQueryIndex, QueryIndex, NativeQueryIndex,
+ AdvanceFulltextQueryIndex {
private static final Logger LOG = LoggerFactory
.getLogger(LucenePropertyIndex.class);
@@ -192,12 +195,6 @@ public class LucenePropertyIndex impleme
indexNode = tracker.acquireIndexNode(path);
if (indexNode != null) {
- //TODO Need to be removed for supporting hybrid indexes
- //Ignore full text indexes
- if (indexNode.getDefinition().isFullTextEnabled()){
- continue;
- }
-
IndexPlan plan = new IndexPlanner(indexNode, path, filter, sortOrder).getPlan();
if (plan != null) {
plans.add(plan);
@@ -383,6 +380,11 @@ public class LucenePropertyIndex impleme
return new LucenePathCursor(itr, plan, settings);
}
+ @Override
+ public NodeAggregator getNodeAggregator() {
+ return null;
+ }
+
private IndexNode acquireIndexNode(IndexPlan plan) {
return tracker.acquireIndexNode(pr(plan).indexPath);
}
@@ -438,6 +440,8 @@ public class LucenePropertyIndex impleme
* @return the set of relative paths (possibly empty)
*/
private static Set<String> getRelativePaths(FullTextExpression ft) {
+ //TODO This would need to be relooked as with aggregation we would be
+ //aggregating child properties also
if (ft == null) {
// there might be no full-text constraint when using the
// LowCostLuceneIndexProvider which is used for testing
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java Thu Nov 27 11:29:32 2014
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.jcr;
import static com.google.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
import static org.apache.jackrabbit.JcrConstants.NT_FILE;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import java.util.Properties;
import java.util.Set;
@@ -28,11 +29,14 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.oak.plugins.index.aggregate.AggregateIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
import org.apache.jackrabbit.oak.plugins.index.aggregate.SimpleNodeAggregator;
+import org.apache.jackrabbit.oak.plugins.index.lucene.IndexFormatVersion;
import org.apache.jackrabbit.oak.plugins.index.lucene.LowCostLuceneIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneInitializerHelper;
import org.apache.jackrabbit.oak.spi.commit.Observer;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
public class LuceneOakRepositoryStub extends OakTarMKRepositoryStub {
@@ -45,7 +49,7 @@ public class LuceneOakRepositoryStub ext
protected void preCreateRepository(Jcr jcr) {
LuceneIndexProvider provider = new LowCostLuceneIndexProvider();
jcr.with(
- new LuceneInitializerHelper("luceneGlobal", (Set<String>) null))
+ new LuceneCompatModeInitializer("luceneGlobal", (Set<String>) null))
.with(AggregateIndexProvider.wrap(provider.with(getNodeAggregator())))
.with((Observer) provider)
.with(new LuceneIndexEditorProvider());
@@ -55,4 +59,27 @@ public class LuceneOakRepositoryStub ext
return new SimpleNodeAggregator()
.newRuleWithName(NT_FILE, newArrayList(JCR_CONTENT, JCR_CONTENT + "/*"));
}
+
+ private static class LuceneCompatModeInitializer extends LuceneInitializerHelper {
+ private final String name;
+
+ public LuceneCompatModeInitializer(String name, Set<String> propertyTypes) {
+ super(name, propertyTypes);
+ this.name = name;
+ }
+
+ @Override
+ public void initialize(NodeBuilder builder) {
+ if (builder.hasChildNode(INDEX_DEFINITIONS_NAME)
+ && builder.getChildNode(INDEX_DEFINITIONS_NAME).hasChildNode(name)) {
+ // do nothing
+ } else {
+ super.initialize(builder);
+ builder.getChildNode(INDEX_DEFINITIONS_NAME)
+ .getChildNode(name)
+ //TODO Remove compat mode once OAK-2278 resolved
+ .setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion());
+ }
+ }
+ }
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java Thu Nov 27 11:29:32 2014
@@ -30,6 +30,7 @@ import org.apache.jackrabbit.oak.query.a
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
import org.apache.jackrabbit.oak.query.fulltext.FullTextParser;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -43,12 +44,17 @@ import org.apache.lucene.store.RAMDirect
import org.junit.Test;
import static com.google.common.collect.ImmutableSet.of;
+import static javax.jcr.PropertyType.TYPENAME_STRING;
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INCLUDE_PROPERTY_NAMES;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.ORDERED_PROP_NAMES;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.VERSION;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper.newLuceneIndexDefinition;
import static org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper.newLucenePropertyIndexDefinition;
+import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_NODE_TYPES;
import static org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent.INITIAL_CONTENT;
@@ -120,6 +126,22 @@ public class IndexPlannerTest {
assertNull(planner.getPlan());
}
+ @Test
+ public void worksWithIndexFormatV2Onwards() throws Exception{
+ NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
+ NodeBuilder nb = newLuceneIndexDefinition(index, "lucene",
+ of(TYPENAME_STRING));
+ //Dummy data node to ensure that IndexDefinition does not consider it
+ //as a fresh indexing case
+ nb.child(INDEX_DATA_CHILD_NAME);
+
+ IndexNode node = createIndexNode(new IndexDefinition(root, nb.getNodeState()));
+ FilterImpl filter = createFilter("nt:base");
+ filter.setFullTextConstraint(FullTextParser.parse(".", "mountain"));
+ IndexPlanner planner = new IndexPlanner(node, "/foo", filter, Collections.<OrderEntry>emptyList());
+ assertNull(planner.getPlan());
+ }
+
private IndexNode createIndexNode(IndexDefinition defn) throws IOException {
return new IndexNode("foo", defn, createSampleDirectory());
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LowCostLuceneIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LowCostLuceneIndexProvider.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LowCostLuceneIndexProvider.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LowCostLuceneIndexProvider.java Thu Nov 27 11:29:32 2014
@@ -44,7 +44,7 @@ public class LowCostLuceneIndexProvider
@Override
public List<IndexPlan> getPlans(Filter filter, List<OrderEntry> sortOrder, NodeState rootState) {
- String indexPath = new LuceneIndexLookup(rootState).getFullTextIndexPath(filter, tracker);
+ String indexPath = new LuceneIndexLookup(rootState).getOldFullTextIndexPath(filter, tracker);
return Collections.singletonList(planBuilder(filter)
.setCostPerExecution(1e-3)
.setAttribute(ATTR_INDEX_PATH, indexPath)
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java Thu Nov 27 11:29:32 2014
@@ -55,7 +55,9 @@ public class LuceneIndexAggregationTest
@Override
protected void createTestIndexNode() throws Exception {
Tree index = root.getTree("/");
- createTestIndexNode(index, LuceneIndexConstants.TYPE_LUCENE);
+ Tree indexDefn = createTestIndexNode(index, LuceneIndexConstants.TYPE_LUCENE);
+ //TODO Remove compat mode once OAK-2278 resolved
+ indexDefn.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion());
root.commit();
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java Thu Nov 27 11:29:32 2014
@@ -53,6 +53,8 @@ public class LuceneIndexExclusionQueryTe
lucene.setProperty(INCLUDE_PROPERTY_TYPES,
of(TYPENAME_BINARY, TYPENAME_STRING), STRINGS);
lucene.setProperty(EXCLUDE_PROPERTY_NAMES, of(NOT_IN), STRINGS);
+ //TODO Remove compat mode once OAK-2278 resolved
+ lucene.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion());
root.commit();
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Thu Nov 27 11:29:32 2014
@@ -45,7 +45,9 @@ public class LuceneIndexQueryTest extend
@Override
protected void createTestIndexNode() throws Exception {
Tree index = root.getTree("/");
- createTestIndexNode(index, LuceneIndexConstants.TYPE_LUCENE);
+ Tree indexDefn = createTestIndexNode(index, LuceneIndexConstants.TYPE_LUCENE);
+ //TODO Remove compat mode once OAK-2278 resolved
+ indexDefn.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion());
root.commit();
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1642096&r1=1642095&r2=1642096&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java Thu Nov 27 11:29:32 2014
@@ -674,6 +674,9 @@ public class LucenePropertyIndexTest ext
// Index Definition
Tree idx = createIndex("test1", of("propa", "propb", "propc"));
idx.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, true);
+
+ //TODO Remove compat mode once OAK-2278 resolved
+ idx.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion());
Tree propNode = idx.addChild(PROP_NODE);
// property definition for index test1