Skip to content

Fix InternalSearchHit#hasSource to return the proper boolean value #21441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2016
Merged

Fix InternalSearchHit#hasSource to return the proper boolean value #21441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public byte[] source() {

@Override
public boolean hasSource() {
return source == null;
return source != null;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public void testScriptDocAndFields() throws Exception {
assertNoFailures(response);

assertThat(response.getHits().totalHits(), equalTo(3L));
assertThat(response.getHits().getAt(0).hasSource(), equalTo(true));
assertFalse(response.getHits().getAt(0).hasSource());
assertThat(response.getHits().getAt(0).id(), equalTo("1"));
Set<String> fields = new HashSet<>(response.getHits().getAt(0).fields().keySet());
fields.remove(TimestampFieldMapper.NAME); // randomly enabled via templates
Expand Down
9 changes: 8 additions & 1 deletion core/src/test/java/org/elasticsearch/search/internal/InternalSearchHitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

package org.elasticsearch.search.internal;

import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.InputStreamStreamInput;
import org.elasticsearch.common.text.Text;
import org.elasticsearch.index.Index;
import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.test.ESTestCase;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -87,4 +87,11 @@ public void testNullSource() throws Exception {
assertThat(searchHit.getSourceRef(), nullValue());
assertThat(searchHit.getSourceAsString(), nullValue());
}

public void testHasSource() {
InternalSearchHit searchHit = new InternalSearchHit(randomInt());
assertFalse(searchHit.hasSource());
searchHit.sourceRef(new BytesArray("{}"));
assertTrue(searchHit.hasSource());
}
}
4 changes: 2 additions & 2 deletions modules/reindex/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ private static class ClientHit implements Hit {
private final SearchHit delegate;
private final BytesReference source;

public ClientHit(SearchHit delegate) {
ClientHit(SearchHit delegate) {
this.delegate = delegate;
source = delegate.hasSource() ? null : delegate.getSourceRef();
source = delegate.hasSource() ? delegate.getSourceRef() : null;
}

@Override
Expand Down