Skip to content

Commit 19773de

Browse files
map as function argument
1 parent ff2c7f1 commit 19773de

File tree

2 files changed

+83
-83
lines changed

2 files changed

+83
-83
lines changed

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens

Lines changed: 69 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,22 +1077,20 @@ private static void renderDocsForOperators(String name) throws IOException {
10771077
List<EsqlFunctionRegistry.ArgSignature> args = new ArrayList<>(params.length);
10781078
for (int i = 1; i < params.length; i++) { // skipping 1st argument, the source
10791079
if (Configuration.class.isAssignableFrom(params[i].getType()) == false) {
1080-
if (Configuration.class.isAssignableFrom(params[i].getType()) == false) {
1081-
MapParam mapParamInfo = params[i].getAnnotation(MapParam.class);
1082-
if (mapParamInfo != null) {
1083-
String paramName = mapParamInfo.name();
1084-
String[] valueType = mapParamInfo.valueType();
1085-
String desc = mapParamInfo.description().replace('\n', ' ');
1086-
boolean optional = mapParamInfo.optional();
1087-
args.add(new EsqlFunctionRegistry.ArgSignature(paramName, valueType, desc, optional));
1088-
} else {
1089-
Param paramInfo = params[i].getAnnotation(Param.class);
1090-
String paramName = paramInfo == null ? params[i].getName() : paramInfo.name();
1091-
String[] type = paramInfo == null ? new String[] { "?" } : paramInfo.type();
1092-
String desc = paramInfo == null ? "" : paramInfo.description().replace('\n', ' ');
1093-
boolean optional = paramInfo != null && paramInfo.optional();
1094-
args.add(new EsqlFunctionRegistry.ArgSignature(paramName, type, desc, optional));
1095-
}
1080+
MapParam mapParamInfo = params[i].getAnnotation(MapParam.class);
1081+
if (mapParamInfo != null) {
1082+
String paramName = mapParamInfo.name();
1083+
String[] valueType = mapParamInfo.valueType();
1084+
String desc = mapParamInfo.description().replace('\n', ' ');
1085+
boolean optional = mapParamInfo.optional();
1086+
args.add(new EsqlFunctionRegistry.ArgSignature(paramName, valueType, desc, optional));
1087+
} else {
1088+
Param paramInfo = params[i].getAnnotation(Param.class);
1089+
String paramName = paramInfo == null ? params[i].getName() : paramInfo.name();
1090+
String[] type = paramInfo == null ? new String[] { "?" } : paramInfo.type();
1091+
String desc = paramInfo == null ? "" : paramInfo.description().replace('\n', ' ');
1092+
boolean optional = paramInfo != null && paramInfo.optional();
1093+
args.add(new EsqlFunctionRegistry.ArgSignature(paramName, type, desc, optional));
10961094
}
10971095
}
10981096
}

0 commit comments

Comments
 (0)