Skip to content

Fix missing keywordsCanBeId #4491

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
yuancu merged 2 commits into from
Oct 10, 2025
Merged

Fix missing keywordsCanBeId #4491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20caae3
Fix missing keywordsCanBeId
LantaoJin Oct 10, 2025
d7abcfb
revert partially
LantaoJin Oct 10, 2025
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
59 changes: 59 additions & 0 deletions integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4481.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
"Fix missing keywordsCanBeID":
- skip:
features:
- headers
- allowed_warnings
- do:
indices.create:
index: log-test
body:
mappings:
properties:
"as":
properties:
"field":
properties:
"on":
properties:
"limit":
properties:
"datamodel":
properties:
"overwrite":
properties:
"sed":
properties:
"label":
properties:
"aggregation":
properties:
"brain":
properties:
"simple_pattern":
properties:
"max_match":
properties:
"offset_field":
properties:
"to":
properties:
"millisecond":
type: integer

- do:
bulk:
index: log-test
refresh: true
body:
- '{"index": {}}'
- '{"as": {"field": {"on": {"limit": {"datamodel": {"overwrite": {"sed": {"label": {"aggregation": {"brain": {"simple_pattern": {"max_match": {"offset_field": {"to": {"millisecond": 1 } } } } } } } } } } } } } } }'

- do:
headers:
Content-Type: 'application/json'
ppl:
body:
query: source=log-test | fields as.field.on.limit.datamodel.overwrite.sed.label.aggregation.brain.simple_pattern.max_match.offset_field.to.millisecond

- match: { total: 1 }
- length: { datarows: 1 }
4 changes: 0 additions & 4 deletions ppl/src/main/antlr/OpenSearchPPLLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ HOUR_OF_DAY: 'HOUR_OF_DAY';
HOUR_SECOND: 'HOUR_SECOND';
INTERVAL: 'INTERVAL';
MICROSECOND: 'MICROSECOND';
MILLISECOND: 'MILLISECOND';
MINUTE: 'MINUTE';
MINUTE_MICROSECOND: 'MINUTE_MICROSECOND';
MINUTE_OF_DAY: 'MINUTE_OF_DAY';
Expand All @@ -188,9 +187,7 @@ YEAR: 'YEAR';
YEAR_MONTH: 'YEAR_MONTH';

// DATASET TYPES
DATAMODEL: 'DATAMODEL';
LOOKUP: 'LOOKUP';
SAVEDSEARCH: 'SAVEDSEARCH';

// CONVERTED DATA TYPES
INT: 'INT';
Expand Down Expand Up @@ -398,7 +395,6 @@ SUBSTRING: 'SUBSTRING';
LTRIM: 'LTRIM';
RTRIM: 'RTRIM';
TRIM: 'TRIM';
TO: 'TO';
LOWER: 'LOWER';
UPPER: 'UPPER';
CONCAT: 'CONCAT';
Expand Down
11 changes: 10 additions & 1 deletion ppl/src/main/antlr/OpenSearchPPLParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,16 @@ searchableKeyWord
| PATH
| INPUT
| OUTPUT

| AS
| ON
| LIMIT
| OVERWRITE
| FIELD
| SED
| MAX_MATCH
| OFFSET_FIELD
| patternMethod
| patternMode
// AGGREGATIONS AND WINDOW
| statsFunctionName
| windowFunctionName
Expand Down
Loading