Skip to content

Change script context names for run time fields to type_field #71581

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
jdconrad merged 4 commits into from
Apr 12, 2021
Merged

Change script context names for run time fields to type_field #71581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e67886
change runtime field script context names
jdconrad Apr 8, 2021
acf932b
remove extraneous comment
jdconrad Apr 12, 2021
487244f
Merge branch 'master' into changenames0
jdconrad Apr 12, 2021
a32a3e6
Merge branch 'master' into changenames0
jdconrad Apr 12, 2021
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 server/src/main/java/org/elasticsearch/script/AbstractFieldScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public abstract class AbstractFieldScript {

static <F> ScriptContext<F> newContext(String name, Class<F> factoryClass) {
return new ScriptContext<>(
name + "_script_field",
name,
factoryClass,
/*
* We rely on the script cache in two ways:
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/script/BooleanFieldScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

public abstract class BooleanFieldScript extends AbstractFieldScript {

public static final ScriptContext<Factory> CONTEXT = newContext("boolean_script_field", Factory.class);
public static final ScriptContext<Factory> CONTEXT = newContext("boolean_field", Factory.class);

@SuppressWarnings("unused")
public static final String[] PARAMETERS = {};
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/script/DateFieldScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.util.Map;

public abstract class DateFieldScript extends AbstractLongFieldScript {
public static final ScriptContext<Factory> CONTEXT = newContext("date", Factory.class);
public static final ScriptContext<Factory> CONTEXT = newContext("date_field", Factory.class);

@SuppressWarnings("unused")
public static final String[] PARAMETERS = {};
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/script/DoubleFieldScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.function.DoubleConsumer;

public abstract class DoubleFieldScript extends AbstractFieldScript {
public static final ScriptContext<Factory> CONTEXT = newContext("double_script_field", Factory.class);
public static final ScriptContext<Factory> CONTEXT = newContext("double_field", Factory.class);

@SuppressWarnings("unused")
public static final String[] PARAMETERS = {};
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/script/GeoPointFieldScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* it encodes the points as a long value.
*/
public abstract class GeoPointFieldScript extends AbstractLongFieldScript {
public static final ScriptContext<Factory> CONTEXT = newContext("geo_point_script_field", Factory.class);
public static final ScriptContext<Factory> CONTEXT = newContext("geo_point_field", Factory.class);

@SuppressWarnings("unused")
public static final String[] PARAMETERS = {};
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/script/IpFieldScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* </ul>
*/
public abstract class IpFieldScript extends AbstractFieldScript {
public static final ScriptContext<Factory> CONTEXT = newContext("ip_script_field", Factory.class);
public static final ScriptContext<Factory> CONTEXT = newContext("ip_field", Factory.class);

@SuppressWarnings("unused")
public static final String[] PARAMETERS = {};
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/script/LongFieldScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import java.util.Map;

public abstract class LongFieldScript extends AbstractLongFieldScript {
public static final ScriptContext<Factory> CONTEXT = newContext("long_script_field", Factory.class);
public static final ScriptContext<Factory> CONTEXT = newContext("long_field", Factory.class);

@SuppressWarnings("unused")
public static final String[] PARAMETERS = {};
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/script/StringFieldScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public abstract class StringFieldScript extends AbstractFieldScript {
*/
public static final long MAX_CHARS = 1024 * 1024;

public static final ScriptContext<Factory> CONTEXT = newContext("string_script_field", Factory.class);
public static final ScriptContext<Factory> CONTEXT = newContext("string_field", Factory.class);

@SuppressWarnings("unused")
public static final String[] PARAMETERS = {};
Expand Down