Skip to content

Fix the breaking change check due to Derived fields changes in 2.15 #14143

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
andrross merged 1 commit into from
Jun 10, 2024
Merged

Fix the breaking change check due to Derived fields changes in 2.15 #14143

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
20 changes: 19 additions & 1 deletion server/src/main/java/org/opensearch/index/mapper/DerivedFieldValueFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.LeafReaderContext;
import org.opensearch.common.annotation.DeprecatedApi;
import org.opensearch.common.annotation.PublicApi;
import org.opensearch.script.DerivedFieldScript;
import org.opensearch.search.lookup.SourceLookup;
Expand All @@ -28,14 +29,23 @@
public class DerivedFieldValueFetcher implements ValueFetcher {
private DerivedFieldScript derivedFieldScript;
private final DerivedFieldScript.LeafFactory derivedFieldScriptFactory;

private final Function<Object, Object> valueForDisplay;

public DerivedFieldValueFetcher(DerivedFieldScript.LeafFactory derivedFieldScriptFactory, Function<Object, Object> valueForDisplay) {
this.derivedFieldScriptFactory = derivedFieldScriptFactory;
this.valueForDisplay = valueForDisplay;
}

@DeprecatedApi(since = "2.15.0")
public DerivedFieldValueFetcher(
DerivedFieldScript.LeafFactory derivedFieldScriptFactory,
Function<Object, Object> valueForDisplay,
Function<Object, IndexableField> indexableFieldFunction
) {
this.derivedFieldScriptFactory = derivedFieldScriptFactory;
this.valueForDisplay = valueForDisplay;
}

@Override
public List<Object> fetchValues(SourceLookup lookup) {
List<Object> values = fetchValuesInternal(lookup);
Expand Down Expand Up @@ -66,6 +76,14 @@ public List<IndexableField> getIndexableField(SourceLookup lookup, Function<Obje
return indexableFields;
}

/**
* Use {@link #getIndexableField(SourceLookup, Function)} instead
*/
@DeprecatedApi(since = "2.15.0")
public List<IndexableField> getIndexableField(SourceLookup sourceLookup) {
throw new UnsupportedOperationException("Use getIndexableField(SourceLookup, Function) instead.");
}

@Override
public void setNextReader(LeafReaderContext context) {
try {
Expand Down
11 changes: 11 additions & 0 deletions server/src/main/java/org/opensearch/index/query/QueryShardContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.opensearch.common.CheckedFunction;
import org.opensearch.common.SetOnce;
import org.opensearch.common.TriFunction;
import org.opensearch.common.annotation.DeprecatedApi;
import org.opensearch.common.annotation.PublicApi;
import org.opensearch.common.lucene.search.Queries;
import org.opensearch.common.util.BigArrays;
Expand Down Expand Up @@ -414,6 +415,16 @@ public void setDerivedFieldResolver(DerivedFieldResolver derivedFieldResolver) {
this.derivedFieldResolver = derivedFieldResolver;
}

@DeprecatedApi(since = "2.15.0")
public void setDerivedFieldTypes(Map<String, MappedFieldType> derivedFieldTypeMap) {
throw new UnsupportedOperationException("Use setDerivedFieldResolver() instead.");
}

@DeprecatedApi(since = "2.15.0")
public MappedFieldType getDerivedFieldType(String fieldName) {
throw new UnsupportedOperationException("Use resolveDerivedFieldType() instead.");
}

public void setAllowUnmappedFields(boolean allowUnmappedFields) {
this.allowUnmappedFields = allowUnmappedFields;
}
Expand Down