Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (revision 858070042fd36da65a26c01e964bf4a9985f2f7f) @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import org.apache.jackrabbit.oak.plugins.index.aggregate.AggregateIndex; -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; import org.apache.jackrabbit.oak.spi.query.QueryIndex; @@ -40,8 +39,6 @@ protected volatile QueryIndex.NodeAggregator aggregator = null; - ScorerProviderFactory scorerFactory; - IndexAugmentorFactory augmentorFactory; public LuceneIndexProvider() { @@ -53,12 +50,11 @@ } public LuceneIndexProvider(IndexTracker tracker) { - this(tracker, ScorerProviderFactory.DEFAULT, null); + this(tracker, null); } - public LuceneIndexProvider(IndexTracker tracker, ScorerProviderFactory scorerFactory, IndexAugmentorFactory augmentorFactory) { + public LuceneIndexProvider(IndexTracker tracker, IndexAugmentorFactory augmentorFactory) { this.tracker = tracker; - this.scorerFactory = scorerFactory; this.augmentorFactory = augmentorFactory; } @@ -85,7 +81,7 @@ } protected LucenePropertyIndex newLucenePropertyIndex() { - return new LucenePropertyIndex(tracker, scorerFactory, augmentorFactory); + return new LucenePropertyIndex(tracker, augmentorFactory); } /** Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (revision 858070042fd36da65a26c01e964bf4a9985f2f7f) @@ -69,7 +69,6 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.NRTIndexFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.property.PropertyIndexCleaner; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory; -import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.search.TextExtractionStatsMBean; @@ -302,9 +301,6 @@ private BackgroundObserver externalIndexObserver; - @Reference - ScorerProviderFactory scorerFactory; - @Reference private IndexAugmentorFactory augmentorFactory; @@ -395,7 +391,7 @@ initializeIndexDir(bundleContext, config); initializeExtractedTextCache(bundleContext, config, statisticsProvider); tracker = createTracker(bundleContext, config); - indexProvider = new LuceneIndexProvider(tracker, scorerFactory, augmentorFactory); + indexProvider = new LuceneIndexProvider(tracker, augmentorFactory); initializeActiveBlobCollector(whiteboard, config); initializeLogging(config); initialize(); Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (revision 858070042fd36da65a26c01e964bf4a9985f2f7f) @@ -56,7 +56,6 @@ import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.SecureFacetConfiguration; import org.apache.jackrabbit.oak.plugins.index.lucene.property.HybridPropertyIndexLookup; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.LuceneIndexReader; -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.FacetHelper; import org.apache.jackrabbit.oak.plugins.index.lucene.util.MoreLikeThisHelper; @@ -94,7 +93,6 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.Term; -import org.apache.lucene.queries.CustomScoreQuery; import org.apache.lucene.queryparser.classic.ParseException; import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.queryparser.classic.QueryParserBase; @@ -216,8 +214,6 @@ protected final IndexTracker tracker; - private final ScorerProviderFactory scorerProviderFactory; - private final Highlighter highlighter = new Highlighter(new SimpleHTMLFormatter("", ""), new SimpleHTMLEncoder(), null); @@ -226,16 +222,11 @@ private final IndexAugmentorFactory augmentorFactory; public LucenePropertyIndex(IndexTracker tracker) { - this(tracker, ScorerProviderFactory.DEFAULT); - } - - public LucenePropertyIndex(IndexTracker tracker, ScorerProviderFactory factory) { - this(tracker, factory, null); + this(tracker,null); } - public LucenePropertyIndex(IndexTracker tracker, ScorerProviderFactory factory, IndexAugmentorFactory augmentorFactory) { + public LucenePropertyIndex(IndexTracker tracker, IndexAugmentorFactory augmentorFactory) { this.tracker = tracker; - this.scorerProviderFactory = factory; this.augmentorFactory = augmentorFactory; logConfigsOnce(); } @@ -352,12 +343,6 @@ if (luceneRequestFacade.getLuceneRequest() instanceof Query) { Query query = (Query) luceneRequestFacade.getLuceneRequest(); - CustomScoreQuery customScoreQuery = getCustomScoreQuery(plan, query); - - if (customScoreQuery != null) { - query = customScoreQuery; - } - TopDocs docs; long start = PERF_LOGGER.start(); while (true) { @@ -1040,16 +1025,6 @@ return unwrapped; } - private CustomScoreQuery getCustomScoreQuery(IndexPlan plan, Query subQuery) { - PlanResult planResult = getPlanResult(plan); - IndexDefinition idxDef = planResult.indexDefinition; - String providerName = idxDef.getScorerProviderName(); - if (scorerProviderFactory != null && providerName != null) { - return scorerProviderFactory.getScorerProvider(providerName) - .createCustomScoreQuery(subQuery); - } - return null; - } private static FulltextQueryTermsProvider getIndexAgumentor(IndexPlan plan, IndexAugmentorFactory augmentorFactory) { PlanResult planResult = getPlanResult(plan); Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProvider.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProvider.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProvider.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) @@ -1,29 +0,0 @@ -/* - * 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.plugins.index.lucene.score; - -import org.apache.lucene.queries.CustomScoreQuery; -import org.apache.lucene.search.Query; - -/** - * @deprecated Unused interface that exposes Lucene API directly - it will be removed in 1.28 - */ -@Deprecated -public interface ScorerProvider { - String getName(); - CustomScoreQuery createCustomScoreQuery(Query subQuery); -} Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProviderFactory.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProviderFactory.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProviderFactory.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) @@ -1,32 +0,0 @@ -/* - * 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.plugins.index.lucene.score; - -/** - * @deprecated Unused interface that exposes Lucene API directly - it will be removed in 1.28 - */ -@Deprecated -public interface ScorerProviderFactory { - ScorerProviderFactory DEFAULT = new ScorerProviderFactory() { - @Override - public ScorerProvider getScorerProvider(String name) { - return null; - } - }; - - ScorerProvider getScorerProvider(String name); -} Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/impl/ScorerProviderFactoryImpl.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/impl/ScorerProviderFactoryImpl.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/impl/ScorerProviderFactoryImpl.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) @@ -1,66 +0,0 @@ -/* - * 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.plugins.index.lucene.score.impl; - -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Deactivate; -import org.apache.felix.scr.annotations.Reference; -import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.apache.felix.scr.annotations.ReferencePolicy; -import org.apache.felix.scr.annotations.Service; -import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProvider; -import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @deprecated Unused interface that exposes Lucene API directly - it will be removed in 1.28 - */ -@Deprecated -@Component(metatype = false, immediate = true) -@Service(value = ScorerProviderFactory.class) -@Reference(name = "ScorerProvider", - policy = ReferencePolicy.DYNAMIC, - cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, - referenceInterface = ScorerProvider.class, - bind = "bindScorerProvider", - unbind = "unbindScorerProvider" -) -public class ScorerProviderFactoryImpl implements ScorerProviderFactory { - - private Map scorerProviderMap = - new ConcurrentHashMap(); - - @Deactivate - private void deactivate() { - scorerProviderMap.clear(); - } - - @Override - public ScorerProvider getScorerProvider(String scorerName) { - return scorerProviderMap.get(scorerName); - } - - private void bindScorerProvider(ScorerProvider provider) { - scorerProviderMap.put(provider.getName(), provider); - } - - private void unbindScorerProvider(ScorerProvider provider) { - scorerProviderMap.remove(provider.getName()); - } -} Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/package-info.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/package-info.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/package-info.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) @@ -1,21 +0,0 @@ -/* - * 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. - */ -@Deprecated -@Version("1.3.1") -package org.apache.jackrabbit.oak.plugins.index.lucene.score; - -import org.osgi.annotation.versioning.Version; Index: oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java (revision 858070042fd36da65a26c01e964bf4a9985f2f7f) @@ -28,7 +28,6 @@ import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.CIHelper; import org.apache.jackrabbit.oak.plugins.index.IndexConstants; -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.spi.IndexFieldProvider; import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; @@ -78,9 +77,7 @@ LuceneIndexEditorProvider editorProvider = new LuceneIndexEditorProvider(null, new ExtractedTextCache(0, 0), factory, Mounts.defaultMountInfoProvider()); - LuceneIndexProvider provider = new LuceneIndexProvider(tracker, - ScorerProviderFactory.DEFAULT, - factory); + LuceneIndexProvider provider = new LuceneIndexProvider(tracker, factory); return new Oak() .with(new OpenSecurityProvider()) .with((QueryIndexProvider) provider) Index: oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java (revision 858070042fd36da65a26c01e964bf4a9985f2f7f) @@ -43,18 +43,9 @@ import org.apache.jackrabbit.oak.plugins.index.IndexPathService; import org.apache.jackrabbit.oak.plugins.index.fulltext.PreExtractedTextProvider; import org.apache.jackrabbit.oak.plugins.index.importer.IndexImporterProvider; -import org.apache.jackrabbit.oak.plugins.index.lucene.CopyOnReadStatsMBean; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexAugmentorFactory; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier; -import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker; -import org.apache.jackrabbit.oak.plugins.index.lucene.LoggingInfoStream; -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.LuceneIndexProviderService; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.BufferedOakDirectory; import org.apache.jackrabbit.oak.plugins.index.lucene.property.PropertyIndexCleaner; import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory; -import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; @@ -111,7 +102,6 @@ mip = Mounts.newBuilder().build(); context.registerService(MountInfoProvider.class, mip); context.registerService(StatisticsProvider.class, StatisticsProvider.NOOP); - context.registerService(ScorerProviderFactory.class, ScorerProviderFactory.DEFAULT); context.registerService(IndexAugmentorFactory.class, new IndexAugmentorFactory()); context.registerService(NodeStore.class, new MemoryNodeStore()); context.registerService(IndexPathService.class, mock(IndexPathService.class)); Index: oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (revision 0186d70800cac911d8652a3b2bc28ba5ffeba6d9) +++ oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (revision 858070042fd36da65a26c01e964bf4a9985f2f7f) @@ -61,7 +61,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.Set; import javax.jcr.PropertyType; @@ -78,8 +77,6 @@ import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DefaultDirectoryFactory; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.LocalIndexDir; -import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProvider; -import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory; import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.search.IndexFormatVersion; @@ -112,15 +109,9 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.index.AtomicReader; -import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.queries.CustomScoreProvider; -import org.apache.lucene.queries.CustomScoreQuery; -import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.hamcrest.core.IsCollectionContaining; import org.jetbrains.annotations.NotNull; @@ -132,7 +123,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.common.collect.Sets; @SuppressWarnings("ConstantConditions") @@ -622,71 +612,6 @@ assertFilter(filter, queryIndex, indexed, ImmutableList.of("/")); } - @Test - public void customScoreQuery() throws Exception{ - NodeBuilder nb = newLuceneIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME), "lucene", - of(TYPENAME_STRING)); - TestUtil.useV2(nb); - nb.setProperty(FulltextIndexConstants.PROP_SCORER_PROVIDER, "testScorer"); - - NodeState before = builder.getNodeState(); - builder.child("a").setProperty("jcr:createdBy", "bar bar"); - builder.child("b").setProperty("jcr:createdBy", "foo bar"); - NodeState after = builder.getNodeState(); - NodeState indexed = HOOK.processCommit(before, after,CommitInfo.EMPTY); - tracker = new IndexTracker(); - tracker.update(indexed); - - SimpleScorerFactory factory = new SimpleScorerFactory(); - ScorerProvider provider = new ScorerProvider() { - - String scorerName = "testScorer"; - @Override - public String getName() { - return scorerName; - } - @Override - public CustomScoreQuery createCustomScoreQuery(Query query) { - return new ModifiedCustomScoreQuery(query); - } - - class ModifiedCustomScoreQuery extends CustomScoreQuery { - private Query query; - public ModifiedCustomScoreQuery(Query query) { - super(query); - this.query = query; - } - - @Override - public CustomScoreProvider getCustomScoreProvider(AtomicReaderContext context) { - return new CustomScoreProvider(context) { - public float customScore(int doc, float subQueryScore, float valSrcScore) { - AtomicReader atomicReader = context.reader(); - try { - Document document = atomicReader.document(doc); - // boosting docs created by foo - String fieldValue = document.get("full:jcr:createdBy"); - if (fieldValue != null && fieldValue.contains("foo")) { - valSrcScore *= 2.0; - } - } catch (IOException e) { - return subQueryScore * valSrcScore; - } - return subQueryScore * valSrcScore; - } - }; - } - } - }; - - factory.providers.put(provider.getName(), provider); - AdvancedQueryIndex queryIndex = new LucenePropertyIndex(tracker, factory); - - FilterImpl filter = createFilter(NT_BASE); - filter.setFullTextConstraint(new FullTextTerm(null, "bar", false, false, null)); - assertFilter(filter, queryIndex, indexed, asList("/b", "/a"), true); - } - @Test public void testTokens() { Analyzer analyzer = LuceneIndexConstants.ANALYZER; @@ -1081,14 +1006,6 @@ return dir.getAbsolutePath(); } - private static class SimpleScorerFactory implements ScorerProviderFactory { - final Map providers = Maps.newHashMap(); - @Override - public ScorerProvider getScorerProvider(String name) { - return providers.get(name); - } - } - private static class FailingBlob extends ArrayBasedBlob { public FailingBlob(byte[] b) { super(b);