Author: catholicon
Date: Wed Dec 16 12:24:31 2015
New Revision: 1720345
URL: http://svn.apache.org/viewvc?rev=1720345&view=rev
Log:
OAK-3765 Revert implementation added in r1720261.
Would discuss further on the issue.
Removed:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/indexAugment/IndexAugmentorFactory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/indexAugment/impl/IndexAugmentorFactoryImpl.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/FulltextQueryTermsProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/IndexFieldProvider.java
Modified:
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1720345&r1=1720344&r2=1720345&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Wed Dec 16 12:24:31 2015
@@ -112,7 +112,6 @@
org.apache.jackrabbit.oak.plugins.index.lucene,
org.apache.jackrabbit.oak.plugins.index.lucene.util,
org.apache.jackrabbit.oak.plugins.index.lucene.score,
- org.apache.jackrabbit.oak.plugins.index.lucene.spi,
</Export-Package>
<_exportcontents>
org.apache.lucene.*;version=${lucene.version}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1720345&r1=1720344&r2=1720345&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
Wed Dec 16 12:24:31 2015
@@ -57,7 +57,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText;
import
org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText.ExtractionResult;
import org.apache.jackrabbit.oak.plugins.index.lucene.Aggregate.Matcher;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.indexAugment.IndexAugmentorFactory;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.tree.TreeFactory;
import org.apache.jackrabbit.oak.spi.commit.Editor;
@@ -134,13 +133,12 @@ public class LuceneIndexEditor implement
LuceneIndexEditor(NodeState root, NodeBuilder definition,
IndexUpdateCallback updateCallback,
@Nullable IndexCopier indexCopier,
- ExtractedTextCache extractedTextCache,
- IndexAugmentorFactory augmentorFactory) throws
CommitFailedException {
+ ExtractedTextCache extractedTextCache) throws
CommitFailedException {
this.parent = null;
this.name = null;
this.path = "/";
this.context = new LuceneIndexEditorContext(root, definition,
- updateCallback, indexCopier, extractedTextCache,
augmentorFactory);
+ updateCallback, indexCopier, extractedTextCache);
this.root = root;
this.isDeleted = false;
this.matcherState = MatcherState.NONE;
@@ -522,9 +520,6 @@ public class LuceneIndexEditor implement
}
}
}
-
- dirty |= augmentCustomFields(path, fields, state, property, pname);
-
return dirty;
}
@@ -662,32 +657,6 @@ public class LuceneIndexEditor implement
return fields;
}
- private boolean augmentCustomFields(final String path, final List<Field>
fields,
- final NodeState document, final
PropertyState property,
- final String propertyName) {
- boolean dirty = false;
-
- IndexDefinition defn = getDefinition();
-
- if (defn.getVersion().isAtLeast(IndexFormatVersion.V2)){
- IndexAugmentorFactory augmentorFactory =
context.getAugmentorFactory();
- if (augmentorFactory != null) {
- Iterable<Field> augmentedFields =
augmentorFactory.getIndexFieldProvider()
- .getAugmentedFields(path, propertyName,
- document, property,
defn.getDefinitionNodeState());
-
- if (augmentedFields != null) {
- for (Field field : augmentedFields) {
- fields.add(field);
- dirty = true;
- }
- }
- }
- }
-
- return dirty;
- }
-
//~-------------------------------------------------------< NullCheck
Support >
private boolean indexNotNullCheckEnabledProps(String path, List<Field>
fields, NodeState state) {
@@ -826,6 +795,7 @@ public class LuceneIndexEditor implement
});
return dirtyFlag.get();
}
+
/**
* Create the fulltext field from the aggregated nodes. If result is for
aggregate for a relative node
* include then
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1720345&r1=1720344&r2=1720345&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Wed Dec 16 12:24:31 2015
@@ -33,7 +33,6 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.indexAugment.IndexAugmentorFactory;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -144,23 +143,19 @@ public class LuceneIndexEditorContext {
private final TextExtractionStats textExtractionStats = new
TextExtractionStats();
private final ExtractedTextCache extractedTextCache;
-
- private final IndexAugmentorFactory augmentorFactory;
/**
* The media types supported by the parser used.
*/
private Set<MediaType> supportedMediaTypes;
LuceneIndexEditorContext(NodeState root, NodeBuilder definition,
IndexUpdateCallback updateCallback,
- @Nullable IndexCopier indexCopier,
ExtractedTextCache extractedTextCache,
- IndexAugmentorFactory augmentorFactory) {
+ @Nullable IndexCopier indexCopier,
ExtractedTextCache extractedTextCache) {
this.definitionBuilder = definition;
this.indexCopier = indexCopier;
this.definition = new IndexDefinition(root, definition);
this.indexedNodes = 0;
this.updateCallback = updateCallback;
this.extractedTextCache = extractedTextCache;
- this.augmentorFactory = augmentorFactory;
if (this.definition.isOfOldFormat()){
IndexDefinition.updateDefinition(definition);
}
@@ -345,10 +340,6 @@ public class LuceneIndexEditorContext {
return extractedTextCache;
}
- IndexAugmentorFactory getAugmentorFactory() {
- return augmentorFactory;
- }
-
public boolean isReindex() {
return reindex;
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java?rev=1720345&r1=1720344&r2=1720345&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
Wed Dec 16 12:24:31 2015
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.plugins.index.IndexEditor;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.indexAugment.IndexAugmentorFactory;
import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -40,7 +39,6 @@ import static org.apache.jackrabbit.oak.
public class LuceneIndexEditorProvider implements IndexEditorProvider {
private final IndexCopier indexCopier;
private final ExtractedTextCache extractedTextCache;
- private final IndexAugmentorFactory augmentorFactory;
public LuceneIndexEditorProvider() {
this(null);
@@ -53,15 +51,8 @@ public class LuceneIndexEditorProvider i
public LuceneIndexEditorProvider(@Nullable IndexCopier indexCopier,
ExtractedTextCache extractedTextCache) {
- this(indexCopier, extractedTextCache, IndexAugmentorFactory.DEFAULT);
- }
-
- public LuceneIndexEditorProvider(@Nullable IndexCopier indexCopier,
- ExtractedTextCache extractedTextCache,
- IndexAugmentorFactory augmentorFactory) {
this.indexCopier = indexCopier;
this.extractedTextCache = extractedTextCache;
- this.augmentorFactory = augmentorFactory;
}
@Override
@@ -70,7 +61,7 @@ public class LuceneIndexEditorProvider i
@Nonnull IndexUpdateCallback callback)
throws CommitFailedException {
if (TYPE_LUCENE.equals(type)) {
- return new LuceneIndexEditor(root, definition, callback,
indexCopier, extractedTextCache, augmentorFactory);
+ return new LuceneIndexEditor(root, definition, callback,
indexCopier, extractedTextCache);
}
return null;
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java?rev=1720345&r1=1720344&r2=1720345&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
Wed Dec 16 12:24:31 2015
@@ -23,7 +23,6 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.plugins.index.aggregate.AggregateIndex;
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.indexAugment.IndexAugmentorFactory;
import
org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Observer;
@@ -46,24 +45,21 @@ public class LuceneIndexProvider impleme
ScorerProviderFactory scorerFactory;
- IndexAugmentorFactory augmentorFactory;
-
public LuceneIndexProvider() {
this(new IndexTracker());
}
public LuceneIndexProvider(IndexCopier indexCopier) {
- this(new IndexTracker(indexCopier));
+ this(new IndexTracker(indexCopier), ScorerProviderFactory.DEFAULT);
}
public LuceneIndexProvider(IndexTracker tracker) {
- this(tracker, ScorerProviderFactory.DEFAULT,
IndexAugmentorFactory.DEFAULT);
+ this(tracker, ScorerProviderFactory.DEFAULT);
}
- public LuceneIndexProvider(IndexTracker tracker, ScorerProviderFactory
scorerFactory, IndexAugmentorFactory augmentorFactory) {
+ public LuceneIndexProvider(IndexTracker tracker, ScorerProviderFactory
scorerFactory) {
this.tracker = tracker;
this.scorerFactory = scorerFactory;
- this.augmentorFactory = augmentorFactory;
}
public void close() {
@@ -89,7 +85,7 @@ public class LuceneIndexProvider impleme
}
protected LucenePropertyIndex newLucenePropertyIndex() {
- return new LucenePropertyIndex(tracker, scorerFactory,
augmentorFactory);
+ return new LucenePropertyIndex(tracker, scorerFactory);
}
/**
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=1720345&r1=1720344&r2=1720345&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 Dec 16 12:24:31 2015
@@ -52,7 +52,6 @@ import org.apache.jackrabbit.oak.osgi.Os
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
import
org.apache.jackrabbit.oak.plugins.index.fulltext.PreExtractedTextProvider;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.indexAugment.IndexAugmentorFactory;
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
import
org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory;
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserverMBean;
@@ -178,9 +177,6 @@ public class LuceneIndexProviderService
@Reference
ScorerProviderFactory scorerFactory;
- @Reference
- IndexAugmentorFactory augmentorFactory;
-
@Reference(policy = ReferencePolicy.DYNAMIC,
cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
policyOption = ReferencePolicyOption.GREEDY
@@ -211,7 +207,7 @@ public class LuceneIndexProviderService
whiteboard = new OsgiWhiteboard(bundleContext);
threadPoolSize =
PropertiesUtil.toInteger(config.get(PROP_THREAD_POOL_SIZE),
PROP_THREAD_POOL_SIZE_DEFAULT);
initializeExtractedTextCache(bundleContext, config);
- indexProvider = new LuceneIndexProvider(createTracker(bundleContext,
config), scorerFactory, augmentorFactory);
+ indexProvider = new LuceneIndexProvider(createTracker(bundleContext,
config), scorerFactory);
initializeLogging(config);
initialize();
@@ -292,10 +288,10 @@ public class LuceneIndexProviderService
LuceneIndexEditorProvider editorProvider;
if (enableCopyOnWrite){
initializeIndexCopier(bundleContext, config);
- editorProvider = new LuceneIndexEditorProvider(indexCopier,
extractedTextCache, augmentorFactory);
+ editorProvider = new LuceneIndexEditorProvider(indexCopier,
extractedTextCache);
log.info("Enabling CopyOnWrite support. Index files would be
copied under {}", indexDir.getAbsolutePath());
} else {
- editorProvider = new LuceneIndexEditorProvider(null,
extractedTextCache, augmentorFactory);
+ editorProvider = new LuceneIndexEditorProvider(null,
extractedTextCache);
}
regs.add(bundleContext.registerService(IndexEditorProvider.class.getName(),
editorProvider, null));
oakRegs.add(registerMBean(whiteboard,
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1720345&r1=1720344&r2=1720345&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Wed Dec 16 12:24:31 2015
@@ -18,6 +18,23 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.jcr.PropertyType;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
@@ -29,9 +46,7 @@ import org.apache.jackrabbit.oak.commons
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.indexAugment.IndexAugmentorFactory;
import
org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.spi.FulltextQueryTermsProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.MoreLikeThisHelper;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.SpellcheckHelper;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper;
@@ -109,23 +124,6 @@ import org.apache.lucene.util.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.jcr.PropertyType;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.Lists.newArrayListWithCapacity;
@@ -144,9 +142,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.query.QueryImpl.JCR_PATH;
import static
org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvancedQueryIndex;
import static org.apache.jackrabbit.oak.spi.query.QueryIndex.NativeQueryIndex;
-import static org.apache.lucene.search.BooleanClause.Occur.MUST;
-import static org.apache.lucene.search.BooleanClause.Occur.MUST_NOT;
-import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
+import static org.apache.lucene.search.BooleanClause.Occur.*;
/**
* Provides a QueryIndex that does lookups against a Lucene-based index
@@ -211,20 +207,14 @@ public class LucenePropertyIndex impleme
private final Highlighter highlighter = new Highlighter(new
SimpleHTMLFormatter("<strong>", "</strong>"),
new SimpleHTMLEncoder(), null);
- private final IndexAugmentorFactory augmentorFactory;
-
public LucenePropertyIndex(IndexTracker tracker) {
- this(tracker, ScorerProviderFactory.DEFAULT);
+ this.tracker = tracker;
+ this.scorerProviderFactory = ScorerProviderFactory.DEFAULT;
}
public LucenePropertyIndex(IndexTracker tracker, ScorerProviderFactory
factory) {
- this(tracker, factory, IndexAugmentorFactory.DEFAULT);
- }
-
- public LucenePropertyIndex(IndexTracker tracker, ScorerProviderFactory
factory, IndexAugmentorFactory augmentorFactory) {
this.tracker = tracker;
this.scorerProviderFactory = factory;
- this.augmentorFactory = augmentorFactory;
}
@Override
@@ -284,7 +274,7 @@ public class LucenePropertyIndex impleme
.append("(")
.append(path)
.append(") ");
- sb.append(getLuceneRequest(plan, augmentorFactory, null));
+ sb.append(getLuceneRequest(plan, null));
if (plan.getSortOrder() != null && !plan.getSortOrder().isEmpty())
{
sb.append(" ordering:").append(plan.getSortOrder());
}
@@ -375,7 +365,7 @@ public class LucenePropertyIndex impleme
checkState(indexNode != null);
try {
IndexSearcher searcher = indexNode.getSearcher();
- LuceneRequestFacade luceneRequestFacade =
getLuceneRequest(plan, augmentorFactory, searcher.getIndexReader());
+ LuceneRequestFacade luceneRequestFacade =
getLuceneRequest(plan, searcher.getIndexReader());
if (luceneRequestFacade.getLuceneRequest() instanceof
Query) {
Query query = (Query)
luceneRequestFacade.getLuceneRequest();
@@ -557,7 +547,7 @@ public class LucenePropertyIndex impleme
checkState(indexNode != null);
try {
IndexSearcher searcher = indexNode.getSearcher();
- LuceneRequestFacade luceneRequestFacade =
getLuceneRequest(plan, augmentorFactory, searcher.getIndexReader());
+ LuceneRequestFacade luceneRequestFacade =
getLuceneRequest(plan, searcher.getIndexReader());
if (luceneRequestFacade.getLuceneRequest() instanceof
Query) {
Query query = (Query)
luceneRequestFacade.getLuceneRequest();
TotalHitCountCollector collector = new
TotalHitCountCollector();
@@ -692,8 +682,7 @@ public class LucenePropertyIndex impleme
* @param reader the Lucene reader
* @return the Lucene query
*/
- private static LuceneRequestFacade getLuceneRequest(IndexPlan plan,
IndexAugmentorFactory augmentorFactory, IndexReader reader) {
- FulltextQueryTermsProvider augmentor = getIndexAgumentor(plan,
augmentorFactory);
+ private static LuceneRequestFacade getLuceneRequest(IndexPlan plan,
IndexReader reader) {
List<Query> qs = new ArrayList<Query>();
Filter filter = plan.getFilter();
FullTextExpression ft = filter.getFullTextConstraint();
@@ -705,7 +694,7 @@ public class LucenePropertyIndex impleme
// when using the LowCostLuceneIndexProvider
// which is used for testing
} else {
- qs.add(getFullTextQuery(plan, ft, analyzer, augmentor));
+ qs.add(getFullTextQuery(plan, ft, analyzer));
}
@@ -859,16 +848,6 @@ public class LucenePropertyIndex impleme
}
return null;
}
- private static FulltextQueryTermsProvider getIndexAgumentor(IndexPlan
plan, IndexAugmentorFactory augmentorFactory) {
- PlanResult planResult = getPlanResult(plan);
- IndexDefinition defn = planResult.indexDefinition;
-
- if (defn.getVersion().isAtLeast(IndexFormatVersion.V2)){
- return augmentorFactory.getFulltextQueryTermsProvider();
- }
-
- return null;
- }
private static void addNonFullTextConstraints(List<Query> qs,
IndexPlan plan, IndexReader
reader) {
@@ -1215,7 +1194,7 @@ public class LucenePropertyIndex impleme
}
static Query getFullTextQuery(final IndexPlan plan, FullTextExpression ft,
- final Analyzer analyzer, final
FulltextQueryTermsProvider augmentor) {
+ final Analyzer analyzer) {
final PlanResult pr = getPlanResult(plan);
// a reference to the query, so it can be set in the visitor
// (a "non-local return")
@@ -1232,7 +1211,7 @@ public class LucenePropertyIndex impleme
public boolean visit(FullTextOr or) {
BooleanQuery q = new BooleanQuery();
for (FullTextExpression e : or.list) {
- Query x = getFullTextQuery(plan, e, analyzer, augmentor);
+ Query x = getFullTextQuery(plan, e, analyzer);
q.add(x, SHOULD);
}
result.set(q);
@@ -1243,7 +1222,7 @@ public class LucenePropertyIndex impleme
public boolean visit(FullTextAnd and) {
BooleanQuery q = new BooleanQuery();
for (FullTextExpression e : and.list) {
- Query x = getFullTextQuery(plan, e, analyzer, augmentor);
+ Query x = getFullTextQuery(plan, e, analyzer);
/* Only unwrap the clause if MUST_NOT(x) */
boolean hasMustNot = false;
if (x instanceof BooleanQuery) {
@@ -1270,7 +1249,7 @@ public class LucenePropertyIndex impleme
private boolean visitTerm(String propertyName, String text, String
boost, boolean not) {
String p = getLuceneFieldName(propertyName, pr);
- Query q = tokenToQuery(text, p, pr.indexingRule, analyzer,
augmentor);
+ Query q = tokenToQuery(text, p, pr.indexingRule, analyzer);
if (q == null) {
return false;
}
@@ -1316,8 +1295,7 @@ public class LucenePropertyIndex impleme
return p;
}
- private static Query tokenToQuery(String text, String fieldName,
IndexingRule indexingRule, Analyzer analyzer, FulltextQueryTermsProvider
augmentor) {
- Query ret;
+ private static Query tokenToQuery(String text, String fieldName,
IndexingRule indexingRule, Analyzer analyzer) {
//Expand the query on fulltext field
if (FieldNames.FULLTEXT.equals(fieldName) &&
!indexingRule.getNodeScopeAnalyzedProps().isEmpty()) {
@@ -1331,25 +1309,9 @@ public class LucenePropertyIndex impleme
//Add the query for actual fulltext field also. That query would
//not be boosted
in.add(tokenToQuery(text, fieldName, analyzer),
BooleanClause.Occur.SHOULD);
- ret = in;
- } else {
- ret = tokenToQuery(text, fieldName, analyzer);
+ return in;
}
-
- //Augment query terms if available (as a 'SHOULD' clause)
- if (augmentor != null && FieldNames.FULLTEXT.equals(fieldName)) {
- Query subQuery = augmentor.getQueryTerm(text, analyzer);
- if (subQuery != null) {
- BooleanQuery query = new BooleanQuery();
-
- query.add(ret, BooleanClause.Occur.SHOULD);
- query.add(subQuery, BooleanClause.Occur.SHOULD);
-
- ret = query;
- }
- }
-
- return ret;
+ return tokenToQuery(text, fieldName, analyzer);
}
static Query tokenToQuery(String text, String fieldName, Analyzer
analyzer) {
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java?rev=1720345&r1=1720344&r2=1720345&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
Wed Dec 16 12:24:31 2015
@@ -190,7 +190,6 @@ class PropertyDefinition {
", boost=" + boost +
", isRegexp=" + isRegexp +
", index=" + index +
- ", skipDefaultIndexing=" + skipDefaultIndexing +
", stored=" + stored +
", nodeScopeIndex=" + nodeScopeIndex +
", propertyIndex=" + propertyIndex +
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java?rev=1720345&r1=1720344&r2=1720345&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java
Wed Dec 16 12:24:31 2015
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("3.0.0")
+@Version("2.9.0")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.plugins.index.lucene;
import aQute.bnd.annotation.Version;
-import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Export;
\ No newline at end of file
