honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use custom similarity in search (if there is one)

This commit is contained in:
kimchy 2010-06-23 14:30:14 +03:00
parent a7fdd36f6e
commit 296b6b2f57
3 changed files with 75 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/ExtendedIndexSearcher.java Normal file
View File

@ -0,0 +1,69 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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.elasticsearch.common.lucene.search;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.IndexSearcher;
/**
* @author kimchy (shay.banon)
*/
public class ExtendedIndexSearcher extends IndexSearcher {
public ExtendedIndexSearcher(IndexSearcher searcher) {
super(searcher.getIndexReader());
setSimilarity(searcher.getSimilarity());
}
public ExtendedIndexSearcher(IndexReader r) {
super(r);
}
public IndexReader[] subReaders() {
return this.subReaders;
}
public int[] docStarts() {
return this.docStarts;
}
// taken from DirectoryReader#readerIndex
public int readerIndex(int doc) {
int lo = 0; // search starts array
int hi = subReaders.length - 1; // for first element less
while (hi >= lo) {
int mid = (lo + hi) >>> 1;
int midValue = docStarts[mid];
if (doc < midValue)
hi = mid - 1;
else if (doc > midValue)
lo = mid + 1;
else { // found a match
while (mid + 1 < subReaders.length && docStarts[mid + 1] == midValue) {
mid++; // scan to last match
}
return mid;
}
}
return hi;
}
}

40
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
View File

@ -19,10 +19,11 @@
package org.elasticsearch.search.internal;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.*;
import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.lucene.MultiCollector;
import org.elasticsearch.common.lucene.search.ExtendedIndexSearcher;
import org.elasticsearch.index.engine.Engine;
import org.elasticsearch.search.dfs.CachedDfSource;
import java.io.IOException;
@ -31,7 +32,7 @@ import java.util.List;
/**
* @author kimchy (shay.banon)
*/
public class ContextIndexSearcher extends IndexSearcher {
public class ContextIndexSearcher extends ExtendedIndexSearcher {
private SearchContext searchContext;
@ -43,42 +44,11 @@ public class ContextIndexSearcher extends IndexSearcher {
private boolean useGlobalCollectors = false;
public ContextIndexSearcher(SearchContext searchContext, IndexReader r) {
super(r);
public ContextIndexSearcher(SearchContext searchContext, Engine.Searcher searcher) {
super(searcher.searcher());
this.searchContext = searchContext;
}
public IndexReader[] subReaders() {
return this.subReaders;
}
public int[] docStarts() {
return this.docStarts;
}
// taken from DirectoryReader#readerIndex
public int readerIndex(int doc) {
int lo = 0; // search starts array
int hi = subReaders.length - 1; // for first element less
while (hi >= lo) {
int mid = (lo + hi) >>> 1;
int midValue = docStarts[mid];
if (doc < midValue)
hi = mid - 1;
else if (doc > midValue)
lo = mid + 1;
else { // found a match
while (mid + 1 < subReaders.length && docStarts[mid + 1] == midValue) {
mid++; // scan to last match
}
return mid;
}
}
return hi;
}
public void dfSource(CachedDfSource dfSource) {
this.dfSource = dfSource;
}

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
View File

@ -129,7 +129,7 @@ public class SearchContext implements Releasable {
this.fetchResult = new FetchSearchResult(id, shardTarget);
this.indexService = indexService;
this.searcher = new ContextIndexSearcher(this, engineSearcher.reader());
this.searcher = new ContextIndexSearcher(this, engineSearcher);
}
@Override public boolean release() throws ElasticSearchException {