Skip to content

Remove AtomiFieldData#getLegacyFieldValues #38087

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 3 commits into from
Feb 1, 2019
Merged

Remove AtomiFieldData#getLegacyFieldValues #38087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b7f0a4
Remove AtomiFieldData#getLegacyFieldValues
jimczi Jan 31, 2019
2887deb
Merge branch 'master' into unused_get_legacy_field_values
jimczi Jan 31, 2019
63bdcae
Merge branch 'master' into unused_get_legacy_field_values
jimczi Feb 1, 2019
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
7 changes: 0 additions & 7 deletions server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ public interface AtomicFieldData extends Accountable, Releasable {
*/
ScriptDocValues<?> getScriptValues();

/**
* Returns field values for use by returned hits.
*/
default ScriptDocValues<?> getLegacyFieldValues() {
return getScriptValues();
}

/**
* Return a String representation of the values.
*/
Expand Down
33 changes: 0 additions & 33 deletions server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
import org.elasticsearch.index.fielddata.ScriptDocValues;
import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
import org.elasticsearch.script.JodaCompatibleZonedDateTime;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;

import java.io.IOException;

/**
* Specialization of {@link AtomicNumericFieldData} for integers.
Expand All @@ -52,34 +47,6 @@ public long ramBytesUsed() {
return ramBytesUsed;
}

@Override
public final ScriptDocValues<?> getLegacyFieldValues() {
switch (numericType) {
case DATE:
final ScriptDocValues.Dates realDV = new ScriptDocValues.Dates(getLongValues());
return new ScriptDocValues<DateTime>() {

@Override
public int size() {
return realDV.size();
}

@Override
public DateTime get(int index) {
JodaCompatibleZonedDateTime dt = realDV.get(index);
return new DateTime(dt.toInstant().toEpochMilli(), DateTimeZone.UTC);
}

@Override
public void setNextDocId(int docId) throws IOException {
realDV.setNextDocId(docId);
}
};
default:
return getScriptValues();
}
}

@Override
public final ScriptDocValues<?> getScriptValues() {
switch (numericType) {
Expand Down