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

fix bug in term vector api, payloads were not handled correctly when some where missing 

The array holding the payloads (TermVectorFields.payloads) is reused for each token. If the
previous token had payloads but the current token had not, then the payloads of the previous
token were returned, because the payloads of the previous token were never invalidated.
For example, for a field only contained two tokens each occurring once, the first having a
payload and the second not, then for the second token, the payload of the first was returned.

closes #3873
This commit is contained in:
Britta Weber 2013-10-13 18:48:44 +02:00
parent 4e7a1788ea
commit 719d1e0318
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/elasticsearch/action/termvector/TermVectorFields.java
View File

@ -27,7 +27,6 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.RamUsageEstimator; import org.apache.lucene.util.RamUsageEstimator;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.hppc.HppcMaps;
import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamInput;
import java.io.IOException; import java.io.IOException;
@ -246,16 +245,14 @@ public final class TermVectorFields extends Fields {
} }
if (hasPayloads) { if (hasPayloads) {
int payloadLength = input.readVInt(); int payloadLength = input.readVInt();
if (payloadLength > 0) { if (payloads[i] == null) {
if (payloads[i] == null) { payloads[i] = new BytesRef(payloadLength);
payloads[i] = new BytesRef(payloadLength); } else {
} else { payloads[i].grow(payloadLength);
payloads[i].grow(payloadLength);
}
input.readBytes(payloads[i].bytes, 0, payloadLength);
payloads[i].length = payloadLength;
payloads[i].offset = 0;
} }
input.readBytes(payloads[i].bytes, 0, payloadLength);
payloads[i].length = payloadLength;
payloads[i].offset = 0;
} }
} }
} }

2
src/main/java/org/elasticsearch/action/termvector/TermVectorResponse.java
View File

@ -246,7 +246,7 @@ public class TermVectorResponse extends ActionResponse implements ToXContent {
builder.field(FieldStrings.START_OFFSET, currentStartOffset[i]); builder.field(FieldStrings.START_OFFSET, currentStartOffset[i]);
builder.field(FieldStrings.END_OFFSET, currentEndOffset[i]); builder.field(FieldStrings.END_OFFSET, currentEndOffset[i]);
} }
if (curTerms.hasPayloads() && (currentPayloads[i] != null)) { if (curTerms.hasPayloads() && (currentPayloads[i].length() > 0)) {
builder.field(FieldStrings.PAYLOAD, currentPayloads[i]); builder.field(FieldStrings.PAYLOAD, currentPayloads[i]);
} }
builder.endObject(); builder.endObject();

1
src/main/java/org/elasticsearch/action/termvector/TermVectorWriter.java
View File

@ -149,7 +149,6 @@ final class TermVectorWriter {
} }
private void writePayload(BytesRef payload) throws IOException { private void writePayload(BytesRef payload) throws IOException {
assert (payload != null);
if (payload != null) { if (payload != null) {
output.writeVInt(payload.length); output.writeVInt(payload.length);
output.writeBytes(payload.bytes, payload.offset, payload.length); output.writeBytes(payload.bytes, payload.offset, payload.length);