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

lucene 4: Moved SearchScript from IndexReader to AtomicReader. This also touches the seach/lookup classes

This commit is contained in:
Martijn van Groningen 2012-10-26 12:40:14 +02:00 committed by Shay Banon
parent d820bfe11b
commit 48b8d0544f
8 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/elasticsearch/script/AbstractSearchScript.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.script;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.search.lookup.DocLookup;
import org.elasticsearch.search.lookup.FieldsLookup;
@ -83,7 +83,7 @@ public abstract class AbstractSearchScript extends AbstractExecutableScript impl
}
@Override
public void setNextReader(IndexReader reader) {
public void setNextReader(AtomicReader reader) {
lookup.setNextReader(reader);
}

3
src/main/java/org/elasticsearch/script/SearchScript.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.script;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
@ -33,7 +34,7 @@ public interface SearchScript extends ExecutableScript {
void setScorer(Scorer scorer);
void setNextReader(IndexReader reader);
void setNextReader(AtomicReader reader);
void setNextDocId(int doc);

4
src/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.script.mvel;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.component.AbstractComponent;
@ -163,7 +163,7 @@ public class MvelScriptEngineService extends AbstractComponent implements Script
}
@Override
public void setNextReader(IndexReader reader) {
public void setNextReader(AtomicReader reader) {
lookup.setNextReader(reader);
}

5
src/main/java/org/elasticsearch/search/lookup/DocLookup.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.search.lookup;
import com.google.common.collect.Maps;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.ElasticSearchException;
@ -52,7 +53,7 @@ public class DocLookup implements Map {
@Nullable
private final String[] types;
private IndexReader reader;
private AtomicReader reader;
private Scorer scorer;
@ -72,7 +73,7 @@ public class DocLookup implements Map {
return this.fieldDataCache;
}
public void setNextReader(IndexReader reader) {
public void setNextReader(AtomicReader reader) {
if (this.reader == reader) { // if we are called with the same reader, don't invalidate source
return;
}

7
src/main/java/org/elasticsearch/search/lookup/FieldLookup.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.search.lookup;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.elasticsearch.index.mapper.FieldMapper;
import java.util.ArrayList;
@ -84,7 +85,7 @@ public class FieldLookup {
}
valueLoaded = true;
value = null;
Fieldable field = doc.getFieldable(mapper.names().indexName());
IndexableField field = doc.getField(mapper.names().indexName());
if (field == null) {
return null;
}
@ -98,8 +99,8 @@ public class FieldLookup {
}
valuesLoaded = true;
values.clear();
Fieldable[] fields = doc.getFieldables(mapper.names().indexName());
for (Fieldable field : fields) {
IndexableField[] fields = doc.getFields(mapper.names().indexName());
for (IndexableField field : fields) {
values.add(mapper.value(field));
}
return values;

5
src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.search.lookup;
import com.google.common.collect.Maps;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.ElasticSearchParseException;
@ -44,7 +45,7 @@ public class FieldsLookup implements Map {
@Nullable
private final String[] types;
private IndexReader reader;
private AtomicReader reader;
private int docId = -1;
@ -57,7 +58,7 @@ public class FieldsLookup implements Map {
this.types = types;
}
public void setNextReader(IndexReader reader) {
public void setNextReader(AtomicReader reader) {
if (this.reader == reader) { // if we are called with the same reader, don't invalidate source
return;
}

3
src/main/java/org/elasticsearch/search/lookup/SearchLookup.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.search.lookup;
import com.google.common.collect.ImmutableMap;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Scorer;
import org.elasticsearch.common.Nullable;
@ -66,7 +67,7 @@ public class SearchLookup {
docMap.setScorer(scorer);
}
public void setNextReader(IndexReader reader) {
public void setNextReader(AtomicReader reader) {
docMap.setNextReader(reader);
sourceLookup.setNextReader(reader);
fieldsLookup.setNextReader(reader);

12
src/main/java/org/elasticsearch/search/lookup/SourceLookup.java
View File

@ -22,7 +22,10 @@ package org.elasticsearch.search.lookup;
import com.google.common.collect.ImmutableMap;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.ElasticSearchParseException;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.XContentHelper;
@ -41,7 +44,7 @@ import java.util.Set;
// TODO: If we are processing it in the per hit fetch phase, we cna initialize it with a source if it was loaded..
public class SourceLookup implements Map {
private IndexReader reader;
private AtomicReader reader;
private int docId = -1;
@ -62,11 +65,12 @@ public class SourceLookup implements Map {
}
try {
Document doc = reader.document(docId, SourceFieldSelector.INSTANCE);
Fieldable sourceField = doc.getFieldable(SourceFieldMapper.NAME);
IndexableField sourceField = doc.getField(SourceFieldMapper.NAME);
if (sourceField == null) {
source = ImmutableMap.of();
} else {
this.source = sourceAsMap(sourceField.getBinaryValue(), sourceField.getBinaryOffset(), sourceField.getBinaryLength());
BytesRef source = sourceField.binaryValue();
this.source = sourceAsMap(source.bytes, source.offset, source.length);
}
} catch (Exception e) {
throw new ElasticSearchParseException("failed to parse / load source", e);
@ -82,7 +86,7 @@ public class SourceLookup implements Map {
return XContentHelper.convertToMap(bytes, offset, length, false).v2();
}
public void setNextReader(IndexReader reader) {
public void setNextReader(AtomicReader reader) {
if (this.reader == reader) { // if we are called with the same reader, don't invalidate source
return;
}