Skip to content

Commit 27892c3

Browse files
authored
Change script context names for run time fields to type_field (#71581) (#71586)
This changes all the script context names specifically for runtime fields to be *_field such as long_field and geo_point_field, etc. This change is internal detail that will only be exposed through the Painless execute API as part of (#71374) and should not have bwc issues. I tested this change locally on a mixed cluster to ensure scripts stored with the old runtime fields context names are both still retrievable and delete-able. This works because the context name is only used during the request to check for valid compilation, but never actually stored as part of the cluster state.
1 parent 72a62ae commit 27892c3

8 files changed

+8
-8
lines changed

server/src/main/java/org/elasticsearch/script/AbstractFieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public abstract class AbstractFieldScript {
3535

3636
static <F> ScriptContext<F> newContext(String name, Class<F> factoryClass) {
3737
return new ScriptContext<>(
38-
name + "_script_field",
38+
name,
3939
factoryClass,
4040
/*
4141
* We rely on the script cache in two ways:

server/src/main/java/org/elasticsearch/script/BooleanFieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public abstract class BooleanFieldScript extends AbstractFieldScript {
1818

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

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

server/src/main/java/org/elasticsearch/script/DateFieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.Map;
1616

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

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

server/src/main/java/org/elasticsearch/script/DoubleFieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.function.DoubleConsumer;
1717

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

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

server/src/main/java/org/elasticsearch/script/GeoPointFieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* it encodes the points as a long value.
2323
*/
2424
public abstract class GeoPointFieldScript extends AbstractLongFieldScript {
25-
public static final ScriptContext<Factory> CONTEXT = newContext("geo_point_script_field", Factory.class);
25+
public static final ScriptContext<Factory> CONTEXT = newContext("geo_point_field", Factory.class);
2626

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

server/src/main/java/org/elasticsearch/script/IpFieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* </ul>
3737
*/
3838
public abstract class IpFieldScript extends AbstractFieldScript {
39-
public static final ScriptContext<Factory> CONTEXT = newContext("ip_script_field", Factory.class);
39+
public static final ScriptContext<Factory> CONTEXT = newContext("ip_field", Factory.class);
4040

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

server/src/main/java/org/elasticsearch/script/LongFieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.Map;
1515

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

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

server/src/main/java/org/elasticsearch/script/StringFieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class StringFieldScript extends AbstractFieldScript {
2323
*/
2424
public static final long MAX_CHARS = 1024 * 1024;
2525

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

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

0 commit comments

Comments
 (0)