-
+
- Enterprise Search
+ Search
Create search experiences for your content, wherever it lives.
diff --git a/docs/search/index.asciidoc b/docs/search/index.asciidoc
index ab4b007800da..4d2ee436327b 100644
--- a/docs/search/index.asciidoc
+++ b/docs/search/index.asciidoc
@@ -2,7 +2,7 @@
[[search-space]]
= Search
-The *Search* space in {kib} comprises the following features:
+The *Search* space in the {kib} UI contains the following GUI features:
* https://www.elastic.co/guide/en/enterprise-search/current/connectors.html[Connectors]
* https://www.elastic.co/guide/en/enterprise-search/current/crawler.html[Web crawler]
@@ -11,7 +11,7 @@ The *Search* space in {kib} comprises the following features:
* https://www.elastic.co/guide/en/elasticsearch/reference/current/behavioral-analytics-overview.html[Behavioral Analytics]
* <>
* <>
-* Persistent Dev Tools <>
+* Dev Tools <>
[float]
[[search-release-notes]]
diff --git a/docs/user/dashboard/view-dashboard-usage.asciidoc b/docs/user/dashboard/view-dashboard-usage.asciidoc
index 5ac7e72c3e24..8520c6348829 100644
--- a/docs/user/dashboard/view-dashboard-usage.asciidoc
+++ b/docs/user/dashboard/view-dashboard-usage.asciidoc
@@ -6,4 +6,4 @@ image:images/view-details-dashboards-8.16.0.png[View details icon in the list of
These details include a graph showing the total number of views during the last 90 days.
-image:images/dashboard-usage-count.png[Graph showing the number of views during the last 90 days]
\ No newline at end of file
+image:images/dashboard-usage-count.png[Graph showing the number of views during the last 90 days, width="50%"]
\ No newline at end of file
diff --git a/docs/user/security/audit-logging.asciidoc b/docs/user/security/audit-logging.asciidoc
index 0ddc830e4ed4..1ac40bcc7764 100644
--- a/docs/user/security/audit-logging.asciidoc
+++ b/docs/user/security/audit-logging.asciidoc
@@ -17,20 +17,20 @@ by cluster-wide privileges. For more information on enabling audit logging in
Audit logs are **disabled** by default. To enable this functionality, you must
set `xpack.security.audit.enabled` to `true` in `kibana.yml`.
-You can optionally configure audit logs location, file/rolling file appenders and
+You can optionally configure audit logs location, file/rolling file appenders and
ignore filters using <>.
============================================================================
[[xpack-security-ecs-audit-logging]]
==== Audit events
-Refer to the table of events that can be logged for auditing purposes.
+Refer to the table of events that can be logged for auditing purposes.
Each event is broken down into <>, <>, <> and
<> fields to make it easy to filter, query and aggregate the resulting logs. The <>
field can be used to correlate multiple events that originate from the same request.
-Refer to <> for a table of fields that get logged with audit event.
+Refer to <> for a table of fields that get logged with audit event.
[NOTE]
============================================================================
@@ -116,6 +116,38 @@ Refer to the corresponding {es} logs for potential write errors.
.1+| `case_user_action_create_case`
| `success` | User has created a case.
+.2+| `ml_put_ad_job`
+| `success` | Creating anomaly detection job.
+| `failure` | Failed to create anomaly detection job.
+
+.2+| `ml_put_ad_datafeed`
+| `success` | Creating anomaly detection datafeed.
+| `failure` | Failed to create anomaly detection datafeed.
+
+.2+| `ml_put_calendar`
+| `success` | Creating calendar.
+| `failure` | Failed to create calendar.
+
+.2+| `ml_post_calendar_events`
+| `success` | Adding events to calendar.
+| `failure` | Failed to add events to calendar.
+
+.2+| `ml_forecast`
+| `success` | Creating anomaly detection forecast.
+| `failure` | Failed to create anomaly detection forecast.
+
+.2+| `ml_put_filter`
+| `success` | Creating filter.
+| `failure` | Failed to create filter.
+
+.2+| `ml_put_dfa_job`
+| `success` | Creating data frame analytics job.
+| `failure` | Failed to create data frame analytics job.
+
+.2+| `ml_put_trained_model`
+| `success` | Creating trained model.
+| `failure` | Failed to create trained model.
+
3+a|
====== Type: change
@@ -234,6 +266,74 @@ Refer to the corresponding {es} logs for potential write errors.
.1+| `case_user_action_update_case_title`
| `success` | User has updated the case title.
+.2+| `ml_open_ad_job`
+| `success` | Opening anomaly detection job.
+| `failure` | Failed to open anomaly detection job.
+
+.2+| `ml_close_ad_job`
+| `success` | Closing anomaly detection job.
+| `failure` | Failed to close anomaly detection job.
+
+.2+| `ml_start_ad_datafeed`
+| `success` | Starting anomaly detection datafeed.
+| `failure` | Failed to start anomaly detection datafeed.
+
+.2+| `ml_stop_ad_datafeed`
+| `success` | Stopping anomaly detection datafeed.
+| `failure` | Failed to stop anomaly detection datafeed.
+
+.2+| `ml_update_ad_job`
+| `success` | Updating anomaly detection job.
+| `failure` | Failed to update anomaly detection job.
+
+.2+| `ml_reset_ad_job`
+| `success` | Resetting anomaly detection job.
+| `failure` | Failed to reset anomaly detection job.
+
+.2+| `ml_revert_ad_snapshot`
+| `success` | Reverting anomaly detection snapshot.
+| `failure` | Failed to revert anomaly detection snapshot.
+
+.2+| `ml_update_ad_datafeed`
+| `success` | Updating anomaly detection datafeed.
+| `failure` | Failed to update anomaly detection datafeed.
+
+.2+| `ml_put_calendar_job`
+| `success` | Adding job to calendar.
+| `failure` | Failed to add job to calendar.
+
+.2+| `ml_delete_calendar_job`
+| `success` | Removing job from calendar.
+| `failure` | Failed to remove job from calendar.
+
+.2+| `ml_update_filter`
+| `success` | Updating filter.
+| `failure` | Failed to update filter.
+
+.2+| `ml_start_dfa_job`
+| `success` | Starting data frame analytics job.
+| `failure` | Failed to start data frame analytics job.
+
+.2+| `ml_stop_dfa_job`
+| `success` | Stopping data frame analytics job.
+| `failure` | Failed to stop data frame analytics job.
+
+.2+| `ml_update_dfa_job`
+| `success` | Updating data frame analytics job.
+| `failure` | Failed to update data frame analytics job.
+
+.2+| `ml_start_trained_model_deployment`
+| `success` | Starting trained model deployment.
+| `failure` | Failed to start trained model deployment.
+
+.2+| `ml_stop_trained_model_deployment`
+| `success` | Stopping trained model deployment.
+| `failure` | Failed to stop trained model deployment.
+
+.2+| `ml_update_trained_model_deployment`
+| `success` | Updating trained model deployment.
+| `failure` | Failed to update trained model deployment.
+
3+a|
====== Type: deletion
@@ -289,6 +389,42 @@ Refer to the corresponding {es} logs for potential write errors.
.1+| `case_user_action_delete_case_tags`
| `success` | User has removed tags from a case.
+.2+| `ml_delete_ad_job`
+| `success` | Deleting anomaly detection job.
+| `failure` | Failed to delete anomaly detection job.
+
+.2+| `ml_delete_model_snapshot`
+| `success` | Deleting model snapshot.
+| `failure` | Failed to delete model snapshot.
+
+.2+| `ml_delete_ad_datafeed`
+| `success` | Deleting anomaly detection datafeed.
+| `failure` | Failed to delete anomaly detection datafeed.
+
+.2+| `ml_delete_calendar`
+| `success` | Deleting calendar.
+| `failure` | Failed to delete calendar.
+
+.2+| `ml_delete_calendar_event`
+| `success` | Deleting calendar event.
+| `failure` | Failed to delete calendar event.
+
+.2+| `ml_delete_filter`
+| `success` | Deleting filter.
+| `failure` | Failed to delete filter.
+
+.2+| `ml_delete_forecast`
+| `success` | Deleting forecast.
+| `failure` | Failed to delete forecast.
+
+.2+| `ml_delete_dfa_job`
+| `success` | Deleting data frame analytics job.
+| `failure` | Failed to delete data frame analytics job.
+
+.2+| `ml_delete_trained_model`
+| `success` | Deleting trained model.
+| `failure` | Failed to delete trained model.
+
3+a|
====== Type: access
@@ -448,6 +584,10 @@ Refer to the corresponding {es} logs for potential write errors.
| `success` | User has accessed the connectors of a case.
| `failure` | User is not authorized to access the connectors of a case.
+.2+| `ml_infer_trained_model`
+| `success` | Inferring using trained model.
+| `failure` | Failed to infer using trained model.
+
3+a|
===== Category: web
@@ -474,12 +614,12 @@ Audit logs are written in JSON using https://www.elastic.co/guide/en/ecs/1.6/ind
| *Description*
| `@timestamp`
-| Time when the event was generated.
+| Time when the event was generated.
Example: `2016-05-23T08:05:34.853Z`
| `message`
-| Human readable description of the event.
+| Human readable description of the event.
2+a| ===== Event Fields
@@ -489,7 +629,7 @@ Example: `2016-05-23T08:05:34.853Z`
| [[field-event-action]] `event.action`
| The action captured by the event.
-Refer to <> for a table of possible actions.
+Refer to <> for a table of possible actions.
| [[field-event-category]] `event.category`
| High level category associated with the event.
@@ -513,7 +653,7 @@ Possible values:
`deletion`
| [[field-event-outcome]] `event.outcome`
-a| Denotes whether the event represents a success or failure:
+a| Denotes whether the event represents a success or failure:
* Any actions that the user is not authorized to perform are logged with outcome: `failure`
* Authorized read operations are only logged after successfully fetching the data from {es} with outcome: `success`
@@ -553,7 +693,7 @@ Example: `[kibana_admin, reporting_user]`
Example: `default`
| `kibana.session_id`
-| ID of the user session associated with the event.
+| ID of the user session associated with the event.
Each login attempt results in a unique session id.
@@ -604,7 +744,7 @@ Example: `[marketing]`
| Error code describing the error.
| `error.message`
-| Error message.
+| Error message.
2+a| ===== HTTP and URL Fields
diff --git a/oas_docs/bundle.json b/oas_docs/bundle.json
index 8fdffea9bac4..744763f3da42 100644
--- a/oas_docs/bundle.json
+++ b/oas_docs/bundle.json
@@ -5077,6 +5077,15 @@
"responses": {
"204": {
"description": "Indicates a successful call."
+ },
+ "400": {
+ "description": "Indicates an invalid schema or parameters."
+ },
+ "403": {
+ "description": "Indicates that this call is forbidden."
+ },
+ "404": {
+ "description": "Indicates a rule with the given ID does not exist."
}
},
"summary": "Mute all alerts",
@@ -5124,6 +5133,15 @@
"responses": {
"204": {
"description": "Indicates a successful call."
+ },
+ "400": {
+ "description": "Indicates an invalid schema or parameters."
+ },
+ "403": {
+ "description": "Indicates that this call is forbidden."
+ },
+ "404": {
+ "description": "Indicates a rule with the given ID does not exist."
}
},
"summary": "Unmute all alerts",
@@ -40978,7 +40996,28 @@
"/api/security/role": {
"get": {
"operationId": "%2Fapi%2Fsecurity%2Frole#0",
- "parameters": [],
+ "parameters": [
+ {
+ "description": "The version of the API to use",
+ "in": "header",
+ "name": "elastic-api-version",
+ "schema": {
+ "default": "2023-10-31",
+ "enum": [
+ "2023-10-31"
+ ],
+ "type": "string"
+ }
+ },
+ {
+ "in": "query",
+ "name": "replaceDeprecatedPrivileges",
+ "required": false,
+ "schema": {
+ "type": "boolean"
+ }
+ }
+ ],
"responses": {},
"summary": "Get all roles",
"tags": [
@@ -41051,6 +41090,14 @@
"minLength": 1,
"type": "string"
}
+ },
+ {
+ "in": "query",
+ "name": "replaceDeprecatedPrivileges",
+ "required": false,
+ "schema": {
+ "type": "boolean"
+ }
}
],
"responses": {},
diff --git a/oas_docs/bundle.serverless.json b/oas_docs/bundle.serverless.json
index 4719fcb479bb..b73fa1fc2284 100644
--- a/oas_docs/bundle.serverless.json
+++ b/oas_docs/bundle.serverless.json
@@ -5077,6 +5077,15 @@
"responses": {
"204": {
"description": "Indicates a successful call."
+ },
+ "400": {
+ "description": "Indicates an invalid schema or parameters."
+ },
+ "403": {
+ "description": "Indicates that this call is forbidden."
+ },
+ "404": {
+ "description": "Indicates a rule with the given ID does not exist."
}
},
"summary": "Mute all alerts",
@@ -5124,6 +5133,15 @@
"responses": {
"204": {
"description": "Indicates a successful call."
+ },
+ "400": {
+ "description": "Indicates an invalid schema or parameters."
+ },
+ "403": {
+ "description": "Indicates that this call is forbidden."
+ },
+ "404": {
+ "description": "Indicates a rule with the given ID does not exist."
}
},
"summary": "Unmute all alerts",
diff --git a/oas_docs/output/kibana.serverless.staging.yaml b/oas_docs/output/kibana.serverless.staging.yaml
index aad5256524f4..d7b1b6d02323 100644
--- a/oas_docs/output/kibana.serverless.staging.yaml
+++ b/oas_docs/output/kibana.serverless.staging.yaml
@@ -4217,6 +4217,12 @@ paths:
responses:
'204':
description: Indicates a successful call.
+ '400':
+ description: Indicates an invalid schema or parameters.
+ '403':
+ description: Indicates that this call is forbidden.
+ '404':
+ description: Indicates a rule with the given ID does not exist.
summary: Mute all alerts
tags:
- alerting
@@ -4248,6 +4254,12 @@ paths:
responses:
'204':
description: Indicates a successful call.
+ '400':
+ description: Indicates an invalid schema or parameters.
+ '403':
+ description: Indicates that this call is forbidden.
+ '404':
+ description: Indicates a rule with the given ID does not exist.
summary: Unmute all alerts
tags:
- alerting
@@ -8421,6 +8433,56 @@ paths:
summary: Stop an Entity Engine
tags:
- Security Entity Analytics API
+ /api/entity_store/engines/apply_dataview_indices:
+ post:
+ operationId: ApplyEntityEngineDataviewIndices
+ responses:
+ '200':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ result:
+ items:
+ $ref: >-
+ #/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
+ type: array
+ success:
+ type: boolean
+ description: Successful response
+ '207':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ errors:
+ items:
+ type: string
+ type: array
+ result:
+ items:
+ $ref: >-
+ #/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
+ type: array
+ success:
+ type: boolean
+ description: Partial successful response
+ '500':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ body:
+ type: string
+ statusCode:
+ type: number
+ description: Error response
+ summary: Apply DataView indices to all installed engines
+ tags:
+ - Security Entity Analytics API
/api/entity_store/entities/list:
get:
description: List entities records, paging, sorting and filtering as needed.
@@ -35199,6 +35261,11 @@ paths:
schema:
nullable: true
type: string
+ - in: query
+ name: userFilter
+ schema:
+ nullable: true
+ type: string
responses:
'200':
content:
@@ -47909,6 +47976,20 @@ components:
#/components/schemas/Security_Entity_Analytics_API_AssetCriticalityLevel
required:
- criticality_level
+ Security_Entity_Analytics_API_EngineDataviewUpdateResult:
+ type: object
+ properties:
+ changes:
+ type: object
+ properties:
+ indexPatterns:
+ items:
+ type: string
+ type: array
+ type:
+ type: string
+ required:
+ - type
Security_Entity_Analytics_API_EngineDescriptor:
type: object
properties:
@@ -47932,6 +48013,8 @@ components:
- installing
- started
- stopped
+ - updating
+ - error
type: string
Security_Entity_Analytics_API_Entity:
oneOf:
diff --git a/oas_docs/output/kibana.serverless.yaml b/oas_docs/output/kibana.serverless.yaml
index aad5256524f4..d7b1b6d02323 100644
--- a/oas_docs/output/kibana.serverless.yaml
+++ b/oas_docs/output/kibana.serverless.yaml
@@ -4217,6 +4217,12 @@ paths:
responses:
'204':
description: Indicates a successful call.
+ '400':
+ description: Indicates an invalid schema or parameters.
+ '403':
+ description: Indicates that this call is forbidden.
+ '404':
+ description: Indicates a rule with the given ID does not exist.
summary: Mute all alerts
tags:
- alerting
@@ -4248,6 +4254,12 @@ paths:
responses:
'204':
description: Indicates a successful call.
+ '400':
+ description: Indicates an invalid schema or parameters.
+ '403':
+ description: Indicates that this call is forbidden.
+ '404':
+ description: Indicates a rule with the given ID does not exist.
summary: Unmute all alerts
tags:
- alerting
@@ -8421,6 +8433,56 @@ paths:
summary: Stop an Entity Engine
tags:
- Security Entity Analytics API
+ /api/entity_store/engines/apply_dataview_indices:
+ post:
+ operationId: ApplyEntityEngineDataviewIndices
+ responses:
+ '200':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ result:
+ items:
+ $ref: >-
+ #/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
+ type: array
+ success:
+ type: boolean
+ description: Successful response
+ '207':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ errors:
+ items:
+ type: string
+ type: array
+ result:
+ items:
+ $ref: >-
+ #/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
+ type: array
+ success:
+ type: boolean
+ description: Partial successful response
+ '500':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ body:
+ type: string
+ statusCode:
+ type: number
+ description: Error response
+ summary: Apply DataView indices to all installed engines
+ tags:
+ - Security Entity Analytics API
/api/entity_store/entities/list:
get:
description: List entities records, paging, sorting and filtering as needed.
@@ -35199,6 +35261,11 @@ paths:
schema:
nullable: true
type: string
+ - in: query
+ name: userFilter
+ schema:
+ nullable: true
+ type: string
responses:
'200':
content:
@@ -47909,6 +47976,20 @@ components:
#/components/schemas/Security_Entity_Analytics_API_AssetCriticalityLevel
required:
- criticality_level
+ Security_Entity_Analytics_API_EngineDataviewUpdateResult:
+ type: object
+ properties:
+ changes:
+ type: object
+ properties:
+ indexPatterns:
+ items:
+ type: string
+ type: array
+ type:
+ type: string
+ required:
+ - type
Security_Entity_Analytics_API_EngineDescriptor:
type: object
properties:
@@ -47932,6 +48013,8 @@ components:
- installing
- started
- stopped
+ - updating
+ - error
type: string
Security_Entity_Analytics_API_Entity:
oneOf:
diff --git a/oas_docs/output/kibana.staging.yaml b/oas_docs/output/kibana.staging.yaml
index d8310ef79738..24b0462ae93e 100644
--- a/oas_docs/output/kibana.staging.yaml
+++ b/oas_docs/output/kibana.staging.yaml
@@ -4598,6 +4598,12 @@ paths:
responses:
'204':
description: Indicates a successful call.
+ '400':
+ description: Indicates an invalid schema or parameters.
+ '403':
+ description: Indicates that this call is forbidden.
+ '404':
+ description: Indicates a rule with the given ID does not exist.
summary: Mute all alerts
tags:
- alerting
@@ -4629,6 +4635,12 @@ paths:
responses:
'204':
description: Indicates a successful call.
+ '400':
+ description: Indicates an invalid schema or parameters.
+ '403':
+ description: Indicates that this call is forbidden.
+ '404':
+ description: Indicates a rule with the given ID does not exist.
summary: Unmute all alerts
tags:
- alerting
@@ -11850,6 +11862,56 @@ paths:
summary: Stop an Entity Engine
tags:
- Security Entity Analytics API
+ /api/entity_store/engines/apply_dataview_indices:
+ post:
+ operationId: ApplyEntityEngineDataviewIndices
+ responses:
+ '200':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ result:
+ items:
+ $ref: >-
+ #/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
+ type: array
+ success:
+ type: boolean
+ description: Successful response
+ '207':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ errors:
+ items:
+ type: string
+ type: array
+ result:
+ items:
+ $ref: >-
+ #/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
+ type: array
+ success:
+ type: boolean
+ description: Partial successful response
+ '500':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ body:
+ type: string
+ statusCode:
+ type: number
+ description: Error response
+ summary: Apply DataView indices to all installed engines
+ tags:
+ - Security Entity Analytics API
/api/entity_store/entities/list:
get:
description: List entities records, paging, sorting and filtering as needed.
@@ -38630,6 +38692,11 @@ paths:
schema:
nullable: true
type: string
+ - in: query
+ name: userFilter
+ schema:
+ nullable: true
+ type: string
responses:
'200':
content:
@@ -40578,7 +40645,20 @@ paths:
/api/security/role:
get:
operationId: '%2Fapi%2Fsecurity%2Frole#0'
- parameters: []
+ parameters:
+ - description: The version of the API to use
+ in: header
+ name: elastic-api-version
+ schema:
+ default: '2023-10-31'
+ enum:
+ - '2023-10-31'
+ type: string
+ - in: query
+ name: replaceDeprecatedPrivileges
+ required: false
+ schema:
+ type: boolean
responses: {}
summary: Get all roles
tags:
@@ -40629,6 +40709,11 @@ paths:
schema:
minLength: 1
type: string
+ - in: query
+ name: replaceDeprecatedPrivileges
+ required: false
+ schema:
+ type: boolean
responses: {}
summary: Get a role
tags:
@@ -56657,6 +56742,20 @@ components:
#/components/schemas/Security_Entity_Analytics_API_AssetCriticalityLevel
required:
- criticality_level
+ Security_Entity_Analytics_API_EngineDataviewUpdateResult:
+ type: object
+ properties:
+ changes:
+ type: object
+ properties:
+ indexPatterns:
+ items:
+ type: string
+ type: array
+ type:
+ type: string
+ required:
+ - type
Security_Entity_Analytics_API_EngineDescriptor:
type: object
properties:
@@ -56680,6 +56779,8 @@ components:
- installing
- started
- stopped
+ - updating
+ - error
type: string
Security_Entity_Analytics_API_Entity:
oneOf:
diff --git a/oas_docs/output/kibana.yaml b/oas_docs/output/kibana.yaml
index d8310ef79738..24b0462ae93e 100644
--- a/oas_docs/output/kibana.yaml
+++ b/oas_docs/output/kibana.yaml
@@ -4598,6 +4598,12 @@ paths:
responses:
'204':
description: Indicates a successful call.
+ '400':
+ description: Indicates an invalid schema or parameters.
+ '403':
+ description: Indicates that this call is forbidden.
+ '404':
+ description: Indicates a rule with the given ID does not exist.
summary: Mute all alerts
tags:
- alerting
@@ -4629,6 +4635,12 @@ paths:
responses:
'204':
description: Indicates a successful call.
+ '400':
+ description: Indicates an invalid schema or parameters.
+ '403':
+ description: Indicates that this call is forbidden.
+ '404':
+ description: Indicates a rule with the given ID does not exist.
summary: Unmute all alerts
tags:
- alerting
@@ -11850,6 +11862,56 @@ paths:
summary: Stop an Entity Engine
tags:
- Security Entity Analytics API
+ /api/entity_store/engines/apply_dataview_indices:
+ post:
+ operationId: ApplyEntityEngineDataviewIndices
+ responses:
+ '200':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ result:
+ items:
+ $ref: >-
+ #/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
+ type: array
+ success:
+ type: boolean
+ description: Successful response
+ '207':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ errors:
+ items:
+ type: string
+ type: array
+ result:
+ items:
+ $ref: >-
+ #/components/schemas/Security_Entity_Analytics_API_EngineDataviewUpdateResult
+ type: array
+ success:
+ type: boolean
+ description: Partial successful response
+ '500':
+ content:
+ application/json; Elastic-Api-Version=2023-10-31:
+ schema:
+ type: object
+ properties:
+ body:
+ type: string
+ statusCode:
+ type: number
+ description: Error response
+ summary: Apply DataView indices to all installed engines
+ tags:
+ - Security Entity Analytics API
/api/entity_store/entities/list:
get:
description: List entities records, paging, sorting and filtering as needed.
@@ -38630,6 +38692,11 @@ paths:
schema:
nullable: true
type: string
+ - in: query
+ name: userFilter
+ schema:
+ nullable: true
+ type: string
responses:
'200':
content:
@@ -40578,7 +40645,20 @@ paths:
/api/security/role:
get:
operationId: '%2Fapi%2Fsecurity%2Frole#0'
- parameters: []
+ parameters:
+ - description: The version of the API to use
+ in: header
+ name: elastic-api-version
+ schema:
+ default: '2023-10-31'
+ enum:
+ - '2023-10-31'
+ type: string
+ - in: query
+ name: replaceDeprecatedPrivileges
+ required: false
+ schema:
+ type: boolean
responses: {}
summary: Get all roles
tags:
@@ -40629,6 +40709,11 @@ paths:
schema:
minLength: 1
type: string
+ - in: query
+ name: replaceDeprecatedPrivileges
+ required: false
+ schema:
+ type: boolean
responses: {}
summary: Get a role
tags:
@@ -56657,6 +56742,20 @@ components:
#/components/schemas/Security_Entity_Analytics_API_AssetCriticalityLevel
required:
- criticality_level
+ Security_Entity_Analytics_API_EngineDataviewUpdateResult:
+ type: object
+ properties:
+ changes:
+ type: object
+ properties:
+ indexPatterns:
+ items:
+ type: string
+ type: array
+ type:
+ type: string
+ required:
+ - type
Security_Entity_Analytics_API_EngineDescriptor:
type: object
properties:
@@ -56680,6 +56779,8 @@ components:
- installing
- started
- stopped
+ - updating
+ - error
type: string
Security_Entity_Analytics_API_Entity:
oneOf:
diff --git a/package.json b/package.json
index f6412a3da925..0a7c0d6936d0 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
"@elastic/ecs": "^8.11.1",
"@elastic/elasticsearch": "^8.15.0",
"@elastic/ems-client": "8.5.3",
- "@elastic/eui": "96.1.0",
+ "@elastic/eui": "97.0.0-backport.0",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
@@ -218,8 +218,8 @@
"@kbn/cloud-integration-saml-provider-plugin": "link:x-pack/test/cloud_integration/plugins/saml_provider",
"@kbn/cloud-links-plugin": "link:x-pack/plugins/cloud_integrations/cloud_links",
"@kbn/cloud-plugin": "link:x-pack/plugins/cloud",
- "@kbn/cloud-security-posture": "link:x-pack/packages/kbn-cloud-security-posture",
- "@kbn/cloud-security-posture-common": "link:x-pack/packages/kbn-cloud-security-posture-common",
+ "@kbn/cloud-security-posture": "link:x-pack/packages/kbn-cloud-security-posture/public",
+ "@kbn/cloud-security-posture-common": "link:x-pack/packages/kbn-cloud-security-posture/common",
"@kbn/cloud-security-posture-graph": "link:x-pack/packages/kbn-cloud-security-posture/graph",
"@kbn/cloud-security-posture-plugin": "link:x-pack/plugins/cloud_security_posture",
"@kbn/code-editor": "link:packages/shared-ux/code_editor/impl",
@@ -522,6 +522,7 @@
"@kbn/feature-flags-example-plugin": "link:examples/feature_flags_example",
"@kbn/feature-usage-test-plugin": "link:x-pack/test/plugin_api_integration/plugins/feature_usage_test",
"@kbn/features-plugin": "link:x-pack/plugins/features",
+ "@kbn/features-provider-plugin": "link:x-pack/test/security_api_integration/plugins/features_provider",
"@kbn/fec-alerts-test-plugin": "link:x-pack/test/functional_execution_context/plugins/alerts",
"@kbn/field-formats-example-plugin": "link:examples/field_formats_example",
"@kbn/field-formats-plugin": "link:src/plugins/field_formats",
@@ -797,6 +798,7 @@
"@kbn/searchprofiler-plugin": "link:x-pack/plugins/searchprofiler",
"@kbn/security-api-key-management": "link:x-pack/packages/security/api_key_management",
"@kbn/security-authorization-core": "link:x-pack/packages/security/authorization_core",
+ "@kbn/security-authorization-core-common": "link:x-pack/packages/security/authorization_core_common",
"@kbn/security-form-components": "link:x-pack/packages/security/form_components",
"@kbn/security-hardening": "link:packages/kbn-security-hardening",
"@kbn/security-plugin": "link:x-pack/plugins/security",
@@ -1240,7 +1242,7 @@
"redux-saga-testing": "^2.0.2",
"redux-thunk": "^2.4.2",
"redux-thunks": "^1.0.0",
- "reflect-metadata": "^0.2.1",
+ "reflect-metadata": "^0.2.2",
"remark-gfm": "1.0.0",
"remark-parse-no-trim": "^8.0.4",
"remark-stringify": "^8.0.3",
@@ -1290,6 +1292,7 @@
"xstate": "^4.38.2",
"xstate5": "npm:xstate@^5.18.1",
"xterm": "^5.1.0",
+ "yaml": "^2.5.1",
"yauzl": "^2.10.0",
"yazl": "^2.5.1",
"zod": "^3.22.3"
@@ -1473,7 +1476,6 @@
"@kbn/serverless-storybook-config": "link:packages/serverless/storybook/config",
"@kbn/some-dev-log": "link:packages/kbn-some-dev-log",
"@kbn/sort-package-json": "link:packages/kbn-sort-package-json",
- "@kbn/spec-to-console": "link:packages/kbn-spec-to-console",
"@kbn/stdio-dev-helpers": "link:packages/kbn-stdio-dev-helpers",
"@kbn/storybook": "link:packages/kbn-storybook",
"@kbn/synthetics-e2e": "link:x-pack/plugins/observability_solution/synthetics/e2e",
@@ -1585,7 +1587,7 @@
"@types/jsonwebtoken": "^9.0.0",
"@types/license-checker": "15.0.0",
"@types/loader-utils": "^2.0.3",
- "@types/lodash": "^4.14.159",
+ "@types/lodash": "^4.17.10",
"@types/lru-cache": "^5.1.0",
"@types/lz-string": "^1.3.34",
"@types/mapbox__vector-tile": "1.3.0",
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundle_route.test.ts b/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundle_route.test.ts
index 0b1a0136fea9..e100fe3476dd 100644
--- a/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundle_route.test.ts
+++ b/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundle_route.test.ts
@@ -45,6 +45,7 @@ describe('registerRouteForBundle', () => {
options: {
access: 'public',
authRequired: false,
+ httpResource: true,
},
validate: expect.any(Object),
},
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundles_route.ts b/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundles_route.ts
index 08daf6b96e8b..7ad9c2ef2223 100644
--- a/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundles_route.ts
+++ b/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundles_route.ts
@@ -32,6 +32,7 @@ export function registerRouteForBundle(
{
path: `${routePath}{path*}`,
options: {
+ httpResource: true,
authRequired: false,
access: 'public',
},
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
index 7d7122e7387c..4994302c2e75 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
@@ -392,7 +392,7 @@ describe('start', () => {
describe('breadcrumbs', () => {
it('updates/emits the current set of breadcrumbs', async () => {
const { chrome, service } = await start();
- const promise = chrome.getBreadcrumbs$().pipe(toArray()).toPromise();
+ const promise = firstValueFrom(chrome.getBreadcrumbs$().pipe(toArray()));
chrome.setBreadcrumbs([{ text: 'foo' }, { text: 'bar' }]);
chrome.setBreadcrumbs([{ text: 'foo' }]);
@@ -425,6 +425,35 @@ describe('start', () => {
]
`);
});
+
+ it('allows the project breadcrumb to also be set', async () => {
+ const { chrome } = await start();
+
+ chrome.setBreadcrumbs([{ text: 'foo' }, { text: 'bar' }]); // only setting the classic breadcrumbs
+
+ {
+ const breadcrumbs = await firstValueFrom(chrome.project.getBreadcrumbs$());
+ expect(breadcrumbs.length).toBe(1);
+ expect(breadcrumbs[0]).toMatchObject({
+ 'data-test-subj': 'deploymentCrumb',
+ });
+ }
+
+ chrome.setBreadcrumbs([{ text: 'foo' }, { text: 'bar' }], {
+ project: { value: [{ text: 'baz' }] }, // also setting the project breadcrumb
+ });
+
+ {
+ const breadcrumbs = await firstValueFrom(chrome.project.getBreadcrumbs$());
+ expect(breadcrumbs.length).toBe(2);
+ expect(breadcrumbs[0]).toMatchObject({
+ 'data-test-subj': 'deploymentCrumb',
+ });
+ expect(breadcrumbs[1]).toEqual({
+ text: 'baz', // the project breadcrumb
+ });
+ }
+ });
});
describe('breadcrumbsAppendExtension$', () => {
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
index 8ae1b7fb61cc..5d86209ec880 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
@@ -27,6 +27,7 @@ import type {
ChromeNavLink,
ChromeBadge,
ChromeBreadcrumb,
+ ChromeSetBreadcrumbsParams,
ChromeBreadcrumbsAppendExtension,
ChromeGlobalHelpExtensionMenuLink,
ChromeHelpExtension,
@@ -354,6 +355,17 @@ export class ChromeService {
projectNavigation.setProjectBreadcrumbs(breadcrumbs, params);
};
+ const setClassicBreadcrumbs = (
+ newBreadcrumbs: ChromeBreadcrumb[],
+ { project }: ChromeSetBreadcrumbsParams = {}
+ ) => {
+ breadcrumbs$.next(newBreadcrumbs);
+ if (project) {
+ const { value: projectValue, absolute = false } = project;
+ setProjectBreadcrumbs(projectValue ?? [], { absolute });
+ }
+ };
+
const setProjectHome = (homeHref: string) => {
validateChromeStyle();
projectNavigation.setProjectHome(homeHref);
@@ -507,9 +519,7 @@ export class ChromeService {
getBreadcrumbs$: () => breadcrumbs$.pipe(takeUntil(this.stop$)),
- setBreadcrumbs: (newBreadcrumbs: ChromeBreadcrumb[]) => {
- breadcrumbs$.next(newBreadcrumbs);
- },
+ setBreadcrumbs: setClassicBreadcrumbs,
getBreadcrumbsAppendExtension$: () => breadcrumbsAppendExtension$.pipe(takeUntil(this.stop$)),
@@ -586,6 +596,7 @@ export class ChromeService {
getNavigationTreeUi$: () => projectNavigation.getNavigationTreeUi$(),
setSideNavComponent: setProjectSideNavComponent,
setBreadcrumbs: setProjectBreadcrumbs,
+ getBreadcrumbs$: projectNavigation.getProjectBreadcrumbs$.bind(projectNavigation),
getActiveNavigationNodes$: () => projectNavigation.getActiveNodes$(),
updateSolutionNavigations: projectNavigation.updateSolutionNavigations,
changeActiveSolutionNavigation: projectNavigation.changeActiveSolutionNavigation,
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/breadcrumbs.tsx b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/breadcrumbs.tsx
index fe247f44fbad..d6bc89deb2ce 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/breadcrumbs.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/breadcrumbs.tsx
@@ -11,7 +11,6 @@ import React from 'react';
import { EuiContextMenuPanel, EuiContextMenuItem, EuiButtonEmpty } from '@elastic/eui';
import type {
AppDeepLinkId,
- ChromeProjectBreadcrumb,
ChromeProjectNavigationNode,
ChromeSetProjectBreadcrumbsParams,
ChromeBreadcrumb,
@@ -30,14 +29,14 @@ export function buildBreadcrumbs({
}: {
projectName?: string;
projectBreadcrumbs: {
- breadcrumbs: ChromeProjectBreadcrumb[];
+ breadcrumbs: ChromeBreadcrumb[];
params: ChromeSetProjectBreadcrumbsParams;
};
chromeBreadcrumbs: ChromeBreadcrumb[];
cloudLinks: CloudLinks;
activeNodes: ChromeProjectNavigationNode[][];
isServerless: boolean;
-}): ChromeProjectBreadcrumb[] {
+}): ChromeBreadcrumb[] {
const rootCrumb = buildRootCrumb({
projectName,
cloudLinks,
@@ -54,7 +53,7 @@ export function buildBreadcrumbs({
(n) => Boolean(n.title) && n.breadcrumbStatus !== 'hidden'
);
const navBreadcrumbs = navBreadcrumbPath.map(
- (node): ChromeProjectBreadcrumb => ({
+ (node): ChromeBreadcrumb => ({
href: node.deepLink?.url ?? node.href,
deepLinkId: node.deepLink?.id as AppDeepLinkId,
text: node.title,
@@ -99,7 +98,7 @@ function buildRootCrumb({
projectName?: string;
cloudLinks: CloudLinks;
isServerless: boolean;
-}): ChromeProjectBreadcrumb {
+}): ChromeBreadcrumb {
if (isServerless) {
return {
text:
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
index 6f77705069ea..85c3fd1905ad 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
@@ -11,7 +11,6 @@ import { InternalApplicationStart } from '@kbn/core-application-browser-internal
import type {
ChromeNavLinks,
SideNavComponent,
- ChromeProjectBreadcrumb,
ChromeBreadcrumb,
ChromeSetProjectBreadcrumbsParams,
ChromeProjectNavigationNode,
@@ -80,7 +79,7 @@ export class ProjectNavigationService {
);
private projectBreadcrumbs$ = new BehaviorSubject<{
- breadcrumbs: ChromeProjectBreadcrumb[];
+ breadcrumbs: ChromeBreadcrumb[];
params: ChromeSetProjectBreadcrumbsParams;
}>({ breadcrumbs: [], params: { absolute: false } });
private readonly stop$ = new ReplaySubject(1);
@@ -153,7 +152,7 @@ export class ProjectNavigationService {
return this.customProjectSideNavComponent$.asObservable();
},
setProjectBreadcrumbs: (
- breadcrumbs: ChromeProjectBreadcrumb | ChromeProjectBreadcrumb[],
+ breadcrumbs: ChromeBreadcrumb | ChromeBreadcrumb[],
params?: Partial
) => {
this.projectBreadcrumbs$.next({
@@ -161,7 +160,7 @@ export class ProjectNavigationService {
params: { absolute: false, ...params },
});
},
- getProjectBreadcrumbs$: (): Observable => {
+ getProjectBreadcrumbs$: (): Observable => {
return combineLatest([
this.projectBreadcrumbs$,
this.activeNodes$,
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/types.ts b/packages/core/chrome/core-chrome-browser-internal/src/types.ts
index a958eb59cd5f..0e6bec4d2678 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/types.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/types.ts
@@ -9,8 +9,8 @@
import type {
ChromeStart,
+ ChromeBreadcrumb,
SideNavComponent,
- ChromeProjectBreadcrumb,
ChromeSetProjectBreadcrumbsParams,
ChromeProjectNavigationNode,
AppDeepLinkId,
@@ -87,6 +87,9 @@ export interface InternalChromeStart extends ChromeStart {
*/
setSideNavComponent(component: SideNavComponent | null): void;
+ /** Get an Observable of the current project breadcrumbs */
+ getBreadcrumbs$(): Observable;
+
/**
* Set project breadcrumbs
* @param breadcrumbs
@@ -95,7 +98,7 @@ export interface InternalChromeStart extends ChromeStart {
* Use {@link ServerlessPluginStart.setBreadcrumbs} to set project breadcrumbs.
*/
setBreadcrumbs(
- breadcrumbs: ChromeProjectBreadcrumb[] | ChromeProjectBreadcrumb,
+ breadcrumbs: ChromeBreadcrumb[] | ChromeBreadcrumb,
params?: Partial
): void;
diff --git a/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts b/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
index 144002ee9454..6be7bb68907e 100644
--- a/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
+++ b/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
@@ -84,6 +84,7 @@ const createStartContractMock = () => {
initNavigation: jest.fn(),
setSideNavComponent: jest.fn(),
setBreadcrumbs: jest.fn(),
+ getBreadcrumbs$: jest.fn(),
getActiveNavigationNodes$: jest.fn(),
getNavigationTreeUi$: jest.fn(),
changeActiveSolutionNavigation: jest.fn(),
diff --git a/packages/core/chrome/core-chrome-browser/index.ts b/packages/core/chrome/core-chrome-browser/index.ts
index 4400c5e7d2b3..afb2050d12e8 100644
--- a/packages/core/chrome/core-chrome-browser/index.ts
+++ b/packages/core/chrome/core-chrome-browser/index.ts
@@ -12,6 +12,7 @@ export type {
AppId,
ChromeBadge,
ChromeBreadcrumb,
+ ChromeSetBreadcrumbsParams,
ChromeBreadcrumbsAppendExtension,
ChromeDocTitle,
ChromeGlobalHelpExtensionMenuLink,
@@ -41,7 +42,6 @@ export type {
SideNavCompProps,
SideNavComponent,
SideNavNodeStatus,
- ChromeProjectBreadcrumb,
ChromeSetProjectBreadcrumbsParams,
NodeDefinition,
NodeDefinitionWithChildren,
diff --git a/packages/core/chrome/core-chrome-browser/src/breadcrumb.ts b/packages/core/chrome/core-chrome-browser/src/breadcrumb.ts
index 0a655b770630..c0067030b7b0 100644
--- a/packages/core/chrome/core-chrome-browser/src/breadcrumb.ts
+++ b/packages/core/chrome/core-chrome-browser/src/breadcrumb.ts
@@ -24,3 +24,22 @@ export interface ChromeBreadcrumb extends EuiBreadcrumb {
export interface ChromeBreadcrumbsAppendExtension {
content: MountPoint;
}
+
+/** @public */
+export interface ChromeSetBreadcrumbsParams {
+ /**
+ * Declare the breadcrumbs for the project/solution type navigation in stateful.
+ * Those breadcrumbs correspond to the serverless breadcrumbs declaration.
+ */
+ project?: {
+ /**
+ * The breadcrumb value to set. Can be a single breadcrumb or an array of breadcrumbs.
+ */
+ value: ChromeBreadcrumb | ChromeBreadcrumb[];
+ /**
+ * Indicates whether the breadcrumb should be absolute (replaces the full path) or relative.
+ * @default false
+ */
+ absolute?: boolean;
+ };
+}
diff --git a/packages/core/chrome/core-chrome-browser/src/contracts.ts b/packages/core/chrome/core-chrome-browser/src/contracts.ts
index aa2e4cf23ebb..f5b5d1f0eaf1 100644
--- a/packages/core/chrome/core-chrome-browser/src/contracts.ts
+++ b/packages/core/chrome/core-chrome-browser/src/contracts.ts
@@ -13,7 +13,11 @@ import type { ChromeRecentlyAccessed } from './recently_accessed';
import type { ChromeDocTitle } from './doc_title';
import type { ChromeHelpMenuLink, ChromeNavControls } from './nav_controls';
import type { ChromeHelpExtension } from './help_extension';
-import type { ChromeBreadcrumb, ChromeBreadcrumbsAppendExtension } from './breadcrumb';
+import type {
+ ChromeBreadcrumb,
+ ChromeBreadcrumbsAppendExtension,
+ ChromeSetBreadcrumbsParams,
+} from './breadcrumb';
import type { ChromeBadge, ChromeStyle, ChromeUserBanner } from './types';
import type { ChromeGlobalHelpExtensionMenuLink } from './help_extension';
import type { PanelSelectedNode } from './project_navigation';
@@ -84,7 +88,7 @@ export interface ChromeStart {
/**
* Override the current set of breadcrumbs
*/
- setBreadcrumbs(newBreadcrumbs: ChromeBreadcrumb[]): void;
+ setBreadcrumbs(newBreadcrumbs: ChromeBreadcrumb[], params?: ChromeSetBreadcrumbsParams): void;
/**
* Get an observable of the current extension appended to breadcrumbs
diff --git a/packages/core/chrome/core-chrome-browser/src/index.ts b/packages/core/chrome/core-chrome-browser/src/index.ts
index 7247bfe69710..efc2fb5636d8 100644
--- a/packages/core/chrome/core-chrome-browser/src/index.ts
+++ b/packages/core/chrome/core-chrome-browser/src/index.ts
@@ -7,7 +7,11 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-export type { ChromeBreadcrumbsAppendExtension, ChromeBreadcrumb } from './breadcrumb';
+export type {
+ ChromeBreadcrumbsAppendExtension,
+ ChromeBreadcrumb,
+ ChromeSetBreadcrumbsParams,
+} from './breadcrumb';
export type { ChromeStart } from './contracts';
export type { ChromeDocTitle } from './doc_title';
export type {
@@ -42,7 +46,6 @@ export type {
SideNavComponent,
SideNavNodeStatus,
ChromeSetProjectBreadcrumbsParams,
- ChromeProjectBreadcrumb,
NodeDefinition,
NodeDefinitionWithChildren,
RenderAs as NodeRenderAs,
diff --git a/packages/core/chrome/core-chrome-browser/src/project_navigation.ts b/packages/core/chrome/core-chrome-browser/src/project_navigation.ts
index 417deea8e003..3e6afeb8f611 100644
--- a/packages/core/chrome/core-chrome-browser/src/project_navigation.ts
+++ b/packages/core/chrome/core-chrome-browser/src/project_navigation.ts
@@ -39,7 +39,6 @@ import type { AppId as SecurityApp, DeepLinkId as SecurityLink } from '@kbn/deep
import type { AppId as FleetApp, DeepLinkId as FleetLink } from '@kbn/deeplinks-fleet';
import type { AppId as SharedApp, DeepLinkId as SharedLink } from '@kbn/deeplinks-shared';
-import type { ChromeBreadcrumb } from './breadcrumb';
import type { ChromeNavLink } from './nav_links';
import type { ChromeRecentlyAccessedHistoryItem } from './recently_accessed';
@@ -262,9 +261,6 @@ export interface SideNavCompProps {
/** @public */
export type SideNavComponent = ComponentType;
-/** @public */
-export type ChromeProjectBreadcrumb = ChromeBreadcrumb;
-
/** @public */
export interface ChromeSetProjectBreadcrumbsParams {
absolute: boolean;
diff --git a/packages/core/http/core-http-resources-server-internal/src/http_resources_service.test.ts b/packages/core/http/core-http-resources-server-internal/src/http_resources_service.test.ts
index 1a7757d4e1ea..2dea4759c3d4 100644
--- a/packages/core/http/core-http-resources-server-internal/src/http_resources_service.test.ts
+++ b/packages/core/http/core-http-resources-server-internal/src/http_resources_service.test.ts
@@ -61,6 +61,25 @@ describe('HttpResources service', () => {
expect(registeredRouteConfig.options?.access).toBe('public');
});
+ it('registration does not allow changing "httpResource"', () => {
+ register(
+ { ...routeConfig, options: { ...routeConfig.options, httpResource: undefined } },
+ async (ctx, req, res) => res.ok()
+ );
+ register(
+ { ...routeConfig, options: { ...routeConfig.options, httpResource: true } },
+ async (ctx, req, res) => res.ok()
+ );
+ register(
+ { ...routeConfig, options: { ...routeConfig.options, httpResource: false } },
+ async (ctx, req, res) => res.ok()
+ );
+ const [[first], [second], [third]] = router.get.mock.calls;
+ expect(first.options?.httpResource).toBe(true);
+ expect(second.options?.httpResource).toBe(true);
+ expect(third.options?.httpResource).toBe(true);
+ });
+
it('registration can set access to "internal"', () => {
register({ ...routeConfig, options: { access: 'internal' } }, async (ctx, req, res) =>
res.ok()
diff --git a/packages/core/http/core-http-resources-server-internal/src/http_resources_service.ts b/packages/core/http/core-http-resources-server-internal/src/http_resources_service.ts
index 29114c0dffc0..039497790658 100644
--- a/packages/core/http/core-http-resources-server-internal/src/http_resources_service.ts
+++ b/packages/core/http/core-http-resources-server-internal/src/http_resources_service.ts
@@ -91,6 +91,7 @@ export class HttpResourcesService implements CoreService {
diff --git a/packages/core/http/core-http-router-server-internal/src/router.test.ts b/packages/core/http/core-http-router-server-internal/src/router.test.ts
index b506933574d4..c318e9312546 100644
--- a/packages/core/http/core-http-router-server-internal/src/router.test.ts
+++ b/packages/core/http/core-http-router-server-internal/src/router.test.ts
@@ -134,40 +134,76 @@ describe('Router', () => {
}
);
- it('adds versioned header v2023-10-31 to public, unversioned routes', async () => {
- const router = new Router('', logger, enhanceWithContext, routerOptions);
- router.post(
- {
- path: '/public',
- options: {
- access: 'public',
+ describe('elastic-api-version header', () => {
+ it('adds the header to public, unversioned routes', async () => {
+ const router = new Router('', logger, enhanceWithContext, routerOptions);
+ router.post(
+ {
+ path: '/public',
+ options: {
+ access: 'public',
+ },
+ validate: false,
},
- validate: false,
- },
- (context, req, res) => res.ok({ headers: { AAAA: 'test' } }) // with some fake headers
- );
- router.post(
- {
- path: '/internal',
- options: {
- access: 'internal',
+ (context, req, res) => res.ok({ headers: { AAAA: 'test' } }) // with some fake headers
+ );
+ router.post(
+ {
+ path: '/internal',
+ options: {
+ access: 'internal',
+ },
+ validate: false,
},
- validate: false,
- },
- (context, req, res) => res.ok()
- );
- const [{ handler: publicHandler }, { handler: internalHandler }] = router.getRoutes();
+ (context, req, res) => res.ok()
+ );
+ const [{ handler: publicHandler }, { handler: internalHandler }] = router.getRoutes();
+
+ await publicHandler(createRequestMock(), mockResponseToolkit);
+ expect(mockResponse.header).toHaveBeenCalledTimes(2);
+ const [first, second] = mockResponse.header.mock.calls
+ .concat()
+ .sort(([k1], [k2]) => k1.localeCompare(k2));
+ expect(first).toEqual(['AAAA', 'test']);
+ expect(second).toEqual(['elastic-api-version', '2023-10-31']);
+
+ await internalHandler(createRequestMock(), mockResponseToolkit);
+ expect(mockResponse.header).toHaveBeenCalledTimes(2); // no additional calls
+ });
+
+ it('does not add the header to public http resource routes', async () => {
+ const router = new Router('', logger, enhanceWithContext, routerOptions);
+ router.post(
+ {
+ path: '/public',
+ options: {
+ access: 'public',
+ },
+ validate: false,
+ },
+ (context, req, res) => res.ok()
+ );
+ router.post(
+ {
+ path: '/public-resource',
+ options: {
+ access: 'public',
+ httpResource: true,
+ },
+ validate: false,
+ },
+ (context, req, res) => res.ok()
+ );
+ const [{ handler: publicHandler }, { handler: resourceHandler }] = router.getRoutes();
- await publicHandler(createRequestMock(), mockResponseToolkit);
- expect(mockResponse.header).toHaveBeenCalledTimes(2);
- const [first, second] = mockResponse.header.mock.calls
- .concat()
- .sort(([k1], [k2]) => k1.localeCompare(k2));
- expect(first).toEqual(['AAAA', 'test']);
- expect(second).toEqual(['elastic-api-version', '2023-10-31']);
+ await publicHandler(createRequestMock(), mockResponseToolkit);
+ expect(mockResponse.header).toHaveBeenCalledTimes(1);
+ const [headersTuple] = mockResponse.header.mock.calls;
+ expect(headersTuple).toEqual(['elastic-api-version', '2023-10-31']);
- await internalHandler(createRequestMock(), mockResponseToolkit);
- expect(mockResponse.header).toHaveBeenCalledTimes(2); // no additional calls
+ await resourceHandler(createRequestMock(), mockResponseToolkit);
+ expect(mockResponse.header).toHaveBeenCalledTimes(1); // no additional calls
+ });
});
it('constructs lazily provided validations once (idempotency)', async () => {
diff --git a/packages/core/http/core-http-router-server-internal/src/router.ts b/packages/core/http/core-http-router-server-internal/src/router.ts
index bb99de64581b..36f324236a4d 100644
--- a/packages/core/http/core-http-router-server-internal/src/router.ts
+++ b/packages/core/http/core-http-router-server-internal/src/router.ts
@@ -149,6 +149,7 @@ export interface RouterOptions {
export interface InternalRegistrarOptions {
isVersioned: boolean;
}
+
/** @internal */
export type VersionedRouteConfig = Omit<
RouteConfig,
@@ -201,11 +202,15 @@ export class Router(
route: InternalRouteConfig,
handler: RequestHandler,
- { isVersioned }: { isVersioned: boolean } = { isVersioned: false }
+ { isVersioned }: InternalRegistrarOptions = { isVersioned: false }
) => {
route = prepareRouteConfigValidation(route);
const routeSchemas = routeSchemasFromRouteConfig(route, method);
- const isPublicUnversionedRoute = route.options?.access === 'public' && !isVersioned;
+ const isPublicUnversionedApi =
+ !isVersioned &&
+ route.options?.access === 'public' &&
+ // We do not consider HTTP resource routes as APIs
+ route.options?.httpResource !== true;
this.routes.push({
handler: async (req, responseToolkit) =>
@@ -213,7 +218,7 @@ export class Router, route.options),
- /** Below is added for introspection */
validationSchemas: route.validate,
isVersioned,
});
@@ -269,12 +273,12 @@ export class Router {
tags: ['access:test'],
timeout: { payload: 60_000, idleSocket: 10_000 },
xsrfRequired: false,
+ excludeFromOAS: true,
+ httpResource: true,
+ summary: `test`,
},
};
diff --git a/packages/core/http/core-http-server/src/router/route.ts b/packages/core/http/core-http-server/src/router/route.ts
index 194191e6f423..a97ff9dd4040 100644
--- a/packages/core/http/core-http-server/src/router/route.ts
+++ b/packages/core/http/core-http-server/src/router/route.ts
@@ -307,6 +307,20 @@ export interface RouteConfigOptions {
* @remarks This will be surfaced in OAS documentation.
*/
security?: RouteSecurity;
+
+ /**
+ * Whether this endpoint is being used to serve generated or static HTTP resources
+ * like JS, CSS or HTML. _Do not set to `true` for HTTP APIs._
+ *
+ * @note Unless you need this setting for a special case, rather use the
+ * {@link HttpResources} service exposed to plugins directly.
+ *
+ * @note This is not a security feature. It may affect aspects of the HTTP
+ * response like headers.
+ *
+ * @default false
+ */
+ httpResource?: boolean;
}
/**
diff --git a/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap b/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap
index 23a5239116c9..bd50f4ffe0e4 100644
--- a/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap
+++ b/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap
@@ -140,8 +140,8 @@ exports[`#start() returns \`Context\` component 1`] = `
"euiDisplaySelector.rowHeightLabel": "Row height",
"euiDualRange.sliderScreenReaderInstructions": "You are in a custom range slider. Use the Up and Down arrow keys to change the minimum value. Press Tab to interact with the maximum value.",
"euiErrorBoundary.error": "Error",
- "euiExternalLinkIcon.ariaLabel": "External link",
- "euiExternalLinkIcon.newTarget.screenReaderOnlyText": "(opens in a new tab or window)",
+ "euiExternalLinkIcon.externalTarget.screenReaderOnlyText": "(external)",
+ "euiExternalLinkIcon.newTarget.screenReaderOnlyText": "(external, opens in a new tab or window)",
"euiFieldPassword.maskPassword": "Mask password",
"euiFieldPassword.showPassword": "Show password as plain text. Note: this will visually expose your password on the screen.",
"euiFieldSearch.clearSearchButtonLabel": "Clear search input",
diff --git a/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx b/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx
index 3fa687fddd9d..ad1ba505dc6f 100644
--- a/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx
+++ b/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx
@@ -860,13 +860,16 @@ export const getEuiContextMapping = (): EuiTokensObject => {
'core.euiInlineEditForm.saveButtonAriaLabel',
{ defaultMessage: 'Save edit' }
),
- 'euiExternalLinkIcon.ariaLabel': i18n.translate('core.euiExternalLinkIcon.ariaLabel', {
- defaultMessage: 'External link',
- }),
+ 'euiExternalLinkIcon.externalTarget.screenReaderOnlyText': i18n.translate(
+ 'core.euiExternalLinkIcon.externalTarget.screenReaderOnlyText',
+ {
+ defaultMessage: '(external)',
+ }
+ ),
'euiExternalLinkIcon.newTarget.screenReaderOnlyText': i18n.translate(
'core.euiExternalLinkIcon.newTarget.screenReaderOnlyText',
{
- defaultMessage: '(opens in a new tab or window)',
+ defaultMessage: '(external, opens in a new tab or window)',
}
),
'euiLoadingStrings.ariaLabel': i18n.translate('core.euiLoadingStrings.ariaLabel', {
diff --git a/packages/core/i18n/core-i18n-server-internal/src/routes/translations.test.ts b/packages/core/i18n/core-i18n-server-internal/src/routes/translations.test.ts
index cd945dc8202f..6c68388cd6a7 100644
--- a/packages/core/i18n/core-i18n-server-internal/src/routes/translations.test.ts
+++ b/packages/core/i18n/core-i18n-server-internal/src/routes/translations.test.ts
@@ -24,7 +24,7 @@ describe('registerTranslationsRoute', () => {
1,
expect.objectContaining({
path: '/translations/{locale}.json',
- options: { access: 'public', authRequired: false },
+ options: { access: 'public', authRequired: false, httpResource: true },
}),
expect.any(Function)
);
@@ -32,7 +32,7 @@ describe('registerTranslationsRoute', () => {
2,
expect.objectContaining({
path: '/translations/XXXX/{locale}.json',
- options: { access: 'public', authRequired: false },
+ options: { access: 'public', authRequired: false, httpResource: true },
}),
expect.any(Function)
);
diff --git a/packages/core/i18n/core-i18n-server-internal/src/routes/translations.ts b/packages/core/i18n/core-i18n-server-internal/src/routes/translations.ts
index 2ffa82cb7baf..8c4ca28ac59f 100644
--- a/packages/core/i18n/core-i18n-server-internal/src/routes/translations.ts
+++ b/packages/core/i18n/core-i18n-server-internal/src/routes/translations.ts
@@ -45,6 +45,7 @@ export const registerTranslationsRoute = ({
},
options: {
access: 'public',
+ httpResource: true,
authRequired: false,
},
},
diff --git a/packages/deeplinks/observability/constants.ts b/packages/deeplinks/observability/constants.ts
index 45868fa3a16b..25642ba69613 100644
--- a/packages/deeplinks/observability/constants.ts
+++ b/packages/deeplinks/observability/constants.ts
@@ -11,6 +11,9 @@ export const LOGS_APP_ID = 'logs';
export const OBSERVABILITY_LOGS_EXPLORER_APP_ID = 'observability-logs-explorer';
+// TODO: Remove the app once context-aware switching between discover and observability logs explorer is implemented
+export const LAST_USED_LOGS_VIEWER_APP_ID = 'last-used-logs-viewer';
+
export const OBSERVABILITY_OVERVIEW_APP_ID = 'observability-overview';
export const METRICS_APP_ID = 'metrics';
diff --git a/packages/deeplinks/observability/deep_links.ts b/packages/deeplinks/observability/deep_links.ts
index 088b9c866c03..1253b4e889fc 100644
--- a/packages/deeplinks/observability/deep_links.ts
+++ b/packages/deeplinks/observability/deep_links.ts
@@ -12,6 +12,7 @@ import {
LOGS_APP_ID,
METRICS_APP_ID,
OBSERVABILITY_LOGS_EXPLORER_APP_ID,
+ LAST_USED_LOGS_VIEWER_APP_ID,
OBSERVABILITY_ONBOARDING_APP_ID,
OBSERVABILITY_OVERVIEW_APP_ID,
SYNTHETICS_APP_ID,
@@ -24,6 +25,7 @@ import {
type LogsApp = typeof LOGS_APP_ID;
type ObservabilityLogsExplorerApp = typeof OBSERVABILITY_LOGS_EXPLORER_APP_ID;
+type LastUsedLogsViewerApp = typeof LAST_USED_LOGS_VIEWER_APP_ID;
type ObservabilityOverviewApp = typeof OBSERVABILITY_OVERVIEW_APP_ID;
type MetricsApp = typeof METRICS_APP_ID;
type ApmApp = typeof APM_APP_ID;
@@ -38,6 +40,7 @@ type InventoryApp = typeof INVENTORY_APP_ID;
export type AppId =
| LogsApp
| ObservabilityLogsExplorerApp
+ | LastUsedLogsViewerApp
| ObservabilityOverviewApp
| ObservabilityOnboardingApp
| ApmApp
diff --git a/packages/deeplinks/observability/index.ts b/packages/deeplinks/observability/index.ts
index 7185a4cfbcd6..8bedc43f5d6a 100644
--- a/packages/deeplinks/observability/index.ts
+++ b/packages/deeplinks/observability/index.ts
@@ -10,6 +10,7 @@
export {
LOGS_APP_ID,
OBSERVABILITY_LOGS_EXPLORER_APP_ID,
+ LAST_USED_LOGS_VIEWER_APP_ID,
OBSERVABILITY_ONBOARDING_APP_ID,
OBSERVABILITY_OVERVIEW_APP_ID,
AI_ASSISTANT_APP_ID,
diff --git a/packages/deeplinks/observability/locators/observability_logs_explorer.ts b/packages/deeplinks/observability/locators/observability_logs_explorer.ts
index 037acb7d946a..ae4cbc12cec6 100644
--- a/packages/deeplinks/observability/locators/observability_logs_explorer.ts
+++ b/packages/deeplinks/observability/locators/observability_logs_explorer.ts
@@ -49,3 +49,6 @@ export interface ObsLogsExplorerDataViewLocatorParams extends DatasetLocatorPara
*/
id: string;
}
+
+// To store the last used logs viewer (either of discover or observability-logs-explorer)
+export const OBS_LOGS_EXPLORER_LOGS_VIEWER_KEY = 'obs-logs-explorer:lastUsedViewer';
diff --git a/packages/deeplinks/security/deep_links.ts b/packages/deeplinks/security/deep_links.ts
index 54b18dcaf920..644691bd5b8b 100644
--- a/packages/deeplinks/security/deep_links.ts
+++ b/packages/deeplinks/security/deep_links.ts
@@ -86,6 +86,7 @@ export enum SecurityPageName {
entityAnalytics = 'entity_analytics',
entityAnalyticsManagement = 'entity_analytics-management',
entityAnalyticsAssetClassification = 'entity_analytics-asset-classification',
+ entityAnalyticsEntityStoreManagement = 'entity_analytics-entity_store_management',
coverageOverview = 'coverage-overview',
notes = 'notes',
}
diff --git a/packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts b/packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts
index ed6a7211c7a9..68208951eea4 100644
--- a/packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts
+++ b/packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts
@@ -23,6 +23,7 @@ import {
ALERT_RULE_CATEGORY,
ALERT_RULE_CONSUMER,
ALERT_RULE_EXECUTION_TIMESTAMP,
+ ALERT_RULE_EXECUTION_TYPE,
ALERT_RULE_EXECUTION_UUID,
ALERT_RULE_NAME,
ALERT_RULE_PARAMETERS,
@@ -134,6 +135,11 @@ export const alertFieldMap = {
array: false,
required: false,
},
+ [ALERT_RULE_EXECUTION_TYPE]: {
+ type: 'keyword',
+ array: false,
+ required: false,
+ },
[ALERT_INTENDED_TIMESTAMP]: {
type: 'date',
array: false,
diff --git a/packages/kbn-alerts-as-data-utils/src/schemas/generated/alert_schema.ts b/packages/kbn-alerts-as-data-utils/src/schemas/generated/alert_schema.ts
index 4a4117a8f219..e377039566dd 100644
--- a/packages/kbn-alerts-as-data-utils/src/schemas/generated/alert_schema.ts
+++ b/packages/kbn-alerts-as-data-utils/src/schemas/generated/alert_schema.ts
@@ -99,6 +99,7 @@ const AlertOptional = rt.partial({
'kibana.alert.previous_action_group': schemaString,
'kibana.alert.reason': schemaString,
'kibana.alert.rule.execution.timestamp': schemaDate,
+ 'kibana.alert.rule.execution.type': schemaString,
'kibana.alert.rule.execution.uuid': schemaString,
'kibana.alert.rule.parameters': schemaUnknown,
'kibana.alert.rule.tags': schemaStringArray,
diff --git a/packages/kbn-alerts-as-data-utils/src/schemas/generated/security_schema.ts b/packages/kbn-alerts-as-data-utils/src/schemas/generated/security_schema.ts
index 3573efa5535e..58e1d8ebd1f4 100644
--- a/packages/kbn-alerts-as-data-utils/src/schemas/generated/security_schema.ts
+++ b/packages/kbn-alerts-as-data-utils/src/schemas/generated/security_schema.ts
@@ -164,6 +164,7 @@ const SecurityAlertOptional = rt.partial({
'kibana.alert.rule.description': schemaString,
'kibana.alert.rule.enabled': schemaString,
'kibana.alert.rule.execution.timestamp': schemaDate,
+ 'kibana.alert.rule.execution.type': schemaString,
'kibana.alert.rule.execution.uuid': schemaString,
'kibana.alert.rule.from': schemaString,
'kibana.alert.rule.immutable': schemaStringArray,
diff --git a/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/transform_update_rule_body.ts b/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/transform_update_rule_body.ts
index 8f4e59d80458..9a719c24076f 100644
--- a/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/transform_update_rule_body.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/transform_update_rule_body.ts
@@ -54,6 +54,6 @@ export const transformUpdateRuleBody: RewriteResponseCase = ({
...(uuid && { uuid }),
};
}),
- ...(alertDelay ? { alert_delay: alertDelay } : {}),
+ ...(alertDelay !== undefined ? { alert_delay: alertDelay } : {}),
...(flapping !== undefined ? { flapping: transformUpdateRuleFlapping(flapping) } : {}),
});
diff --git a/packages/kbn-alerts-ui-shared/src/common/constants/rule_flapping.ts b/packages/kbn-alerts-ui-shared/src/common/constants/rule_flapping.ts
index 49ea5a63b3fc..542bb055fd43 100644
--- a/packages/kbn-alerts-ui-shared/src/common/constants/rule_flapping.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/constants/rule_flapping.ts
@@ -8,4 +8,4 @@
*/
// Feature flag for frontend rule specific flapping in rule flyout
-export const IS_RULE_SPECIFIC_FLAPPING_ENABLED = false;
+export const IS_RULE_SPECIFIC_FLAPPING_ENABLED = true;
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts
index 4ee00a94b90e..ebdfeeafbe2f 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts
@@ -10,10 +10,11 @@
import { useMutation } from '@tanstack/react-query';
import type { HttpStart, IHttpFetchError } from '@kbn/core-http-browser';
import { createRule, CreateRuleBody } from '../apis/create_rule';
+import { Rule } from '../types';
export interface UseCreateRuleProps {
http: HttpStart;
- onSuccess?: (formData: CreateRuleBody) => void;
+ onSuccess?: (rule: Rule) => void;
onError?: (error: IHttpFetchError<{ message: string }>) => void;
}
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connectors.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connectors.ts
index 9ae876d06278..8c93881762b1 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connectors.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connectors.ts
@@ -15,10 +15,11 @@ export interface UseLoadConnectorsProps {
http: HttpStart;
includeSystemActions?: boolean;
enabled?: boolean;
+ cacheTime?: number;
}
export const useLoadConnectors = (props: UseLoadConnectorsProps) => {
- const { http, includeSystemActions = false, enabled = true } = props;
+ const { http, includeSystemActions = false, enabled = true, cacheTime } = props;
const queryFn = () => {
return fetchConnectors({ http, includeSystemActions });
@@ -27,6 +28,7 @@ export const useLoadConnectors = (props: UseLoadConnectorsProps) => {
const { data, isLoading, isFetching, isInitialLoading } = useQuery({
queryKey: ['useLoadConnectors', includeSystemActions],
queryFn,
+ cacheTime,
refetchOnWindowFocus: false,
enabled,
});
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_type_aad_template_fields.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_type_aad_template_fields.ts
index fab6fd3336f2..c9dbc6c75ff3 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_type_aad_template_fields.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_type_aad_template_fields.ts
@@ -17,10 +17,11 @@ export interface UseLoadRuleTypeAadTemplateFieldProps {
http: HttpStart;
ruleTypeId?: string;
enabled: boolean;
+ cacheTime?: number;
}
export const useLoadRuleTypeAadTemplateField = (props: UseLoadRuleTypeAadTemplateFieldProps) => {
- const { http, ruleTypeId, enabled } = props;
+ const { http, ruleTypeId, enabled, cacheTime } = props;
const queryFn = () => {
if (!ruleTypeId) {
@@ -43,6 +44,7 @@ export const useLoadRuleTypeAadTemplateField = (props: UseLoadRuleTypeAadTemplat
description: getDescription(d.name, EcsFlat),
}));
},
+ cacheTime,
refetchOnWindowFocus: false,
enabled,
});
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts
index fafd372dc364..95c3ca6baad0 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts
@@ -15,10 +15,11 @@ import { RuleFormData } from '../../rule_form';
export interface UseResolveProps {
http: HttpStart;
id?: string;
+ cacheTime?: number;
}
export const useResolveRule = (props: UseResolveProps) => {
- const { id, http } = props;
+ const { id, http, cacheTime } = props;
const queryFn = () => {
if (id) {
@@ -30,6 +31,7 @@ export const useResolveRule = (props: UseResolveProps) => {
queryKey: ['useResolveRule', id],
queryFn,
enabled: !!id,
+ cacheTime,
select: (rule): RuleFormData | null => {
if (!rule) {
return null;
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts
index 0e8199fc1cca..5764b8128ef4 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts
@@ -10,10 +10,11 @@
import { useMutation } from '@tanstack/react-query';
import type { HttpStart, IHttpFetchError } from '@kbn/core-http-browser';
import { updateRule, UpdateRuleBody } from '../apis/update_rule';
+import { Rule } from '../types';
export interface UseUpdateRuleProps {
http: HttpStart;
- onSuccess?: (formData: UpdateRuleBody) => void;
+ onSuccess?: (rule: Rule) => void;
onError?: (error: IHttpFetchError<{ message: string }>) => void;
}
diff --git a/packages/kbn-alerts-ui-shared/src/common/types/rule_types.ts b/packages/kbn-alerts-ui-shared/src/common/types/rule_types.ts
index 40498f1a2788..29eaf17552a2 100644
--- a/packages/kbn-alerts-ui-shared/src/common/types/rule_types.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/types/rule_types.ts
@@ -27,8 +27,6 @@ import { TypeRegistry } from '../type_registry';
export type { SanitizedRuleAction as RuleAction } from '@kbn/alerting-types';
-export type { Flapping } from '@kbn/alerting-types';
-
export type RuleTypeWithDescription = RuleType & { description?: string };
export type RuleTypeIndexWithDescriptions = Map;
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/constants.ts b/packages/kbn-alerts-ui-shared/src/rule_form/constants.ts
index f557dc5ebdb4..a3748eeabe69 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/constants.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/constants.ts
@@ -27,7 +27,7 @@ export const DEFAULT_FREQUENCY = {
summary: false,
};
-export const GET_DEFAULT_FORM_DATA = ({
+export const getDefaultFormData = ({
ruleTypeId,
name,
consumer,
@@ -50,6 +50,7 @@ export const GET_DEFAULT_FORM_DATA = ({
ruleTypeId,
name,
actions,
+ alertDelay: { active: 1 },
};
};
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/create_rule_form.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/create_rule_form.tsx
index fc96ae214a7a..4399dc5239ec 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/create_rule_form.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/create_rule_form.tsx
@@ -12,7 +12,7 @@ import { EuiLoadingElastic } from '@elastic/eui';
import { toMountPoint } from '@kbn/react-kibana-mount';
import { type RuleCreationValidConsumer } from '@kbn/rule-data-utils';
import type { RuleFormData, RuleFormPlugins } from './types';
-import { DEFAULT_VALID_CONSUMERS, GET_DEFAULT_FORM_DATA } from './constants';
+import { DEFAULT_VALID_CONSUMERS, getDefaultFormData } from './constants';
import { RuleFormStateProvider } from './rule_form_state';
import { useCreateRule } from '../common/hooks';
import { RulePage } from './rule_page';
@@ -24,6 +24,7 @@ import {
} from './rule_form_errors';
import { useLoadDependencies } from './hooks/use_load_dependencies';
import {
+ getAvailableRuleTypes,
getInitialConsumer,
getInitialMultiConsumer,
getInitialSchedule,
@@ -42,7 +43,8 @@ export interface CreateRuleFormProps {
shouldUseRuleProducer?: boolean;
canShowConsumerSelection?: boolean;
showMustacheAutocompleteSwitch?: boolean;
- returnUrl: string;
+ onCancel?: () => void;
+ onSubmit?: (ruleId: string) => void;
}
export const CreateRuleForm = (props: CreateRuleFormProps) => {
@@ -56,7 +58,8 @@ export const CreateRuleForm = (props: CreateRuleFormProps) => {
shouldUseRuleProducer = false,
canShowConsumerSelection = true,
showMustacheAutocompleteSwitch = false,
- returnUrl,
+ onCancel,
+ onSubmit,
} = props;
const { http, docLinks, notifications, ruleTypeRegistry, i18n, theme } = plugins;
@@ -64,8 +67,9 @@ export const CreateRuleForm = (props: CreateRuleFormProps) => {
const { mutate, isLoading: isSaving } = useCreateRule({
http,
- onSuccess: ({ name }) => {
+ onSuccess: ({ name, id }) => {
toasts.addSuccess(RULE_CREATE_SUCCESS_TEXT(name));
+ onSubmit?.(id);
},
onError: (error) => {
const message = parseRuleCircuitBreakerErrorMessage(
@@ -86,6 +90,7 @@ export const CreateRuleForm = (props: CreateRuleFormProps) => {
const {
isInitialLoading,
ruleType,
+ ruleTypes,
ruleTypeModel,
uiConfig,
healthCheckError,
@@ -153,7 +158,7 @@ export const CreateRuleForm = (props: CreateRuleFormProps) => {
{
minimumScheduleInterval: uiConfig?.minimumScheduleInterval,
selectedRuleTypeModel: ruleTypeModel,
selectedRuleType: ruleType,
+ availableRuleTypes: getAvailableRuleTypes({
+ consumer,
+ ruleTypes,
+ ruleTypeRegistry,
+ }).map(({ ruleType: rt }) => rt),
validConsumers,
flappingSettings,
canShowConsumerSelection,
@@ -185,7 +195,7 @@ export const CreateRuleForm = (props: CreateRuleFormProps) => {
}),
}}
>
-
+
);
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/edit_rule_form.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/edit_rule_form.tsx
index 6e92b94cc2e0..917fc87420f9 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/edit_rule_form.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/edit_rule_form.tsx
@@ -24,17 +24,19 @@ import {
RuleFormRuleTypeError,
} from './rule_form_errors';
import { RULE_EDIT_ERROR_TEXT, RULE_EDIT_SUCCESS_TEXT } from './translations';
-import { parseRuleCircuitBreakerErrorMessage } from './utils';
+import { getAvailableRuleTypes, parseRuleCircuitBreakerErrorMessage } from './utils';
+import { DEFAULT_VALID_CONSUMERS, getDefaultFormData } from './constants';
export interface EditRuleFormProps {
id: string;
plugins: RuleFormPlugins;
showMustacheAutocompleteSwitch?: boolean;
- returnUrl: string;
+ onCancel?: () => void;
+ onSubmit?: (ruleId: string) => void;
}
export const EditRuleForm = (props: EditRuleFormProps) => {
- const { id, plugins, returnUrl, showMustacheAutocompleteSwitch = false } = props;
+ const { id, plugins, showMustacheAutocompleteSwitch = false, onCancel, onSubmit } = props;
const { http, notifications, docLinks, ruleTypeRegistry, i18n, theme, application } = plugins;
const { toasts } = notifications;
@@ -42,6 +44,7 @@ export const EditRuleForm = (props: EditRuleFormProps) => {
http,
onSuccess: ({ name }) => {
toasts.addSuccess(RULE_EDIT_SUCCESS_TEXT(name));
+ onSubmit?.(id);
},
onError: (error) => {
const message = parseRuleCircuitBreakerErrorMessage(
@@ -62,6 +65,7 @@ export const EditRuleForm = (props: EditRuleFormProps) => {
const {
isInitialLoading,
ruleType,
+ ruleTypes,
ruleTypeModel,
uiConfig,
healthCheckError,
@@ -156,17 +160,31 @@ export const EditRuleForm = (props: EditRuleFormProps) => {
connectors,
connectorTypes,
aadTemplateFields,
- formData: fetchedFormData,
+ formData: {
+ ...getDefaultFormData({
+ ruleTypeId: fetchedFormData.ruleTypeId,
+ name: fetchedFormData.name,
+ consumer: fetchedFormData.consumer,
+ actions: fetchedFormData.actions,
+ }),
+ ...fetchedFormData,
+ },
id,
plugins,
minimumScheduleInterval: uiConfig?.minimumScheduleInterval,
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleTypeModel,
+ availableRuleTypes: getAvailableRuleTypes({
+ consumer: fetchedFormData.consumer,
+ ruleTypes,
+ ruleTypeRegistry,
+ }).map(({ ruleType: rt }) => rt),
flappingSettings,
+ validConsumers: DEFAULT_VALID_CONSUMERS,
showMustacheAutocompleteSwitch,
}}
>
-
+
);
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.test.tsx
index 9d2ce3b6f121..f0a14ac82e4a 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.test.tsx
@@ -46,10 +46,6 @@ jest.mock('../../common/hooks/use_load_rule_type_aad_template_fields', () => ({
useLoadRuleTypeAadTemplateField: jest.fn(),
}));
-jest.mock('../utils/get_authorized_rule_types', () => ({
- getAvailableRuleTypes: jest.fn(),
-}));
-
jest.mock('../../common/hooks/use_fetch_flapping_settings', () => ({
useFetchFlappingSettings: jest.fn(),
}));
@@ -63,7 +59,6 @@ const { useLoadRuleTypeAadTemplateField } = jest.requireMock(
'../../common/hooks/use_load_rule_type_aad_template_fields'
);
const { useLoadRuleTypesQuery } = jest.requireMock('../../common/hooks/use_load_rule_types_query');
-const { getAvailableRuleTypes } = jest.requireMock('../utils/get_authorized_rule_types');
const { useFetchFlappingSettings } = jest.requireMock(
'../../common/hooks/use_fetch_flapping_settings'
);
@@ -168,13 +163,6 @@ useLoadRuleTypesQuery.mockReturnValue({
},
});
-getAvailableRuleTypes.mockReturnValue([
- {
- ruleType: indexThresholdRuleType,
- ruleTypeModel: indexThresholdRuleTypeModel,
- },
-]);
-
const mockConnector = {
id: 'test-connector',
name: 'Test',
@@ -236,7 +224,7 @@ const toastsMock = jest.fn();
const ruleTypeRegistryMock: RuleTypeRegistryContract = {
has: jest.fn(),
register: jest.fn(),
- get: jest.fn(),
+ get: jest.fn().mockReturnValue(indexThresholdRuleTypeModel),
list: jest.fn(),
};
@@ -272,6 +260,7 @@ describe('useLoadDependencies', () => {
isLoading: false,
isInitialLoading: false,
ruleType: indexThresholdRuleType,
+ ruleTypes: [...ruleTypeIndex.values()],
ruleTypeModel: indexThresholdRuleTypeModel,
uiConfig: uiConfigMock,
healthCheckError: null,
@@ -317,39 +306,6 @@ describe('useLoadDependencies', () => {
});
});
- test('should call getAvailableRuleTypes with the correct params', async () => {
- const { result } = renderHook(
- () => {
- return useLoadDependencies({
- http: httpMock as unknown as HttpStart,
- toasts: toastsMock as unknown as ToastsStart,
- ruleTypeRegistry: ruleTypeRegistryMock,
- validConsumers: ['stackAlerts', 'logs'],
- consumer: 'logs',
- capabilities: {
- actions: {
- show: true,
- save: true,
- execute: true,
- },
- } as unknown as ApplicationStart['capabilities'],
- });
- },
- { wrapper }
- );
-
- await waitFor(() => {
- return expect(result.current.isInitialLoading).toEqual(false);
- });
-
- expect(getAvailableRuleTypes).toBeCalledWith({
- consumer: 'logs',
- ruleTypeRegistry: ruleTypeRegistryMock,
- ruleTypes: [indexThresholdRuleType],
- validConsumers: ['stackAlerts', 'logs'],
- });
- });
-
test('should call resolve rule with the correct params', async () => {
const { result } = renderHook(
() => {
@@ -377,6 +333,7 @@ describe('useLoadDependencies', () => {
expect(useResolveRule).toBeCalledWith({
http: httpMock,
id: 'test-rule-id',
+ cacheTime: 0,
});
});
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.ts b/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.ts
index 5e0c52b1089b..9fb0f173b9d2 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.ts
@@ -20,7 +20,6 @@ import {
useLoadUiConfig,
useResolveRule,
} from '../../common/hooks';
-import { getAvailableRuleTypes } from '../utils';
import { RuleTypeRegistryContract } from '../../common';
import { useFetchFlappingSettings } from '../../common/hooks/use_fetch_flapping_settings';
import { IS_RULE_SPECIFIC_FLAPPING_ENABLED } from '../../common/constants/rule_flapping';
@@ -43,8 +42,6 @@ export const useLoadDependencies = (props: UseLoadDependencies) => {
http,
toasts,
ruleTypeRegistry,
- consumer,
- validConsumers,
id,
ruleTypeId,
capabilities,
@@ -69,7 +66,7 @@ export const useLoadDependencies = (props: UseLoadDependencies) => {
data: fetchedFormData,
isLoading: isLoadingRule,
isInitialLoading: isInitialLoadingRule,
- } = useResolveRule({ http, id });
+ } = useResolveRule({ http, id, cacheTime: 0 });
const {
ruleTypesState: {
@@ -100,6 +97,7 @@ export const useLoadDependencies = (props: UseLoadDependencies) => {
http,
includeSystemActions: true,
enabled: canReadConnectors,
+ cacheTime: 0,
});
const computedRuleTypeId = useMemo(() => {
@@ -125,28 +123,22 @@ export const useLoadDependencies = (props: UseLoadDependencies) => {
http,
ruleTypeId: computedRuleTypeId,
enabled: !!computedRuleTypeId && canReadConnectors,
+ cacheTime: 0,
});
- const authorizedRuleTypeItems = useMemo(() => {
- const computedConsumer = consumer || fetchedFormData?.consumer;
- if (!computedConsumer) {
- return [];
+ const ruleType = useMemo(() => {
+ if (!computedRuleTypeId || !ruleTypeIndex) {
+ return null;
}
- return getAvailableRuleTypes({
- consumer: computedConsumer,
- ruleTypes: [...ruleTypeIndex.values()],
- ruleTypeRegistry,
- validConsumers,
- });
- }, [consumer, ruleTypeIndex, ruleTypeRegistry, validConsumers, fetchedFormData]);
-
- const [ruleType, ruleTypeModel] = useMemo(() => {
- const item = authorizedRuleTypeItems.find(({ ruleType: rt }) => {
- return rt.id === computedRuleTypeId;
- });
-
- return [item?.ruleType, item?.ruleTypeModel];
- }, [authorizedRuleTypeItems, computedRuleTypeId]);
+ return ruleTypeIndex.get(computedRuleTypeId);
+ }, [computedRuleTypeId, ruleTypeIndex]);
+
+ const ruleTypeModel = useMemo(() => {
+ if (!computedRuleTypeId) {
+ return null;
+ }
+ return ruleTypeRegistry.get(computedRuleTypeId);
+ }, [computedRuleTypeId, ruleTypeRegistry]);
const isLoading = useMemo(() => {
// Create Mode
@@ -227,6 +219,7 @@ export const useLoadDependencies = (props: UseLoadDependencies) => {
isInitialLoading: !!isInitialLoading,
ruleType,
ruleTypeModel,
+ ruleTypes: [...ruleTypeIndex.values()],
uiConfig,
healthCheckError,
fetchedFormData,
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions.test.tsx
index 63846fb3628c..9560d933060f 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions.test.tsx
@@ -117,12 +117,18 @@ describe('ruleActions', () => {
getActionTypeModel('1', {
id: 'actionType-1',
validateParams: mockValidate,
+ defaultActionParams: {
+ key: 'value',
+ },
})
);
actionTypeRegistry.register(
getActionTypeModel('2', {
id: 'actionType-2',
validateParams: mockValidate,
+ defaultActionParams: {
+ key: 'value',
+ },
})
);
@@ -150,6 +156,10 @@ describe('ruleActions', () => {
selectedRuleType: {
id: 'selectedRuleTypeId',
defaultActionGroupId: 'test',
+ recoveryActionGroup: {
+ id: 'test-recovery-group-id',
+ name: 'test-recovery-group',
+ },
producer: 'stackAlerts',
},
connectors: mockConnectors,
@@ -222,7 +232,7 @@ describe('ruleActions', () => {
frequency: { notifyWhen: 'onActionGroupChange', summary: false, throttle: null },
group: 'test',
id: 'connector-1',
- params: {},
+ params: { key: 'value' },
uuid: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
},
type: 'addAction',
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions.tsx
index b9eb28025205..47588b487be6 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions.tsx
@@ -18,6 +18,7 @@ import { ActionConnector, RuleAction, RuleFormParamsErrors } from '../../common/
import { DEFAULT_FREQUENCY, MULTI_CONSUMER_RULE_TYPE_IDS } from '../constants';
import { RuleActionsItem } from './rule_actions_item';
import { RuleActionsSystemActionsItem } from './rule_actions_system_actions_item';
+import { getDefaultParams } from '../utils';
export const RuleActions = () => {
const [isConnectorModalOpen, setIsConnectorModalOpen] = useState
(false);
@@ -44,7 +45,15 @@ export const RuleActions = () => {
async (connector: ActionConnector) => {
const { id, actionTypeId } = connector;
const uuid = uuidv4();
- const params = {};
+ const group = selectedRuleType.defaultActionGroupId;
+ const actionTypeModel = actionTypeRegistry.get(actionTypeId);
+
+ const params =
+ getDefaultParams({
+ group,
+ ruleType: selectedRuleType,
+ actionTypeModel,
+ }) || {};
dispatch({
type: 'addAction',
@@ -53,7 +62,7 @@ export const RuleActions = () => {
actionTypeId,
uuid,
params,
- group: selectedRuleType.defaultActionGroupId,
+ group,
frequency: DEFAULT_FREQUENCY,
},
});
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_alerts_filter.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_alerts_filter.tsx
index 791c1ce0491f..a5bbacc74d7a 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_alerts_filter.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_alerts_filter.tsx
@@ -68,6 +68,7 @@ export const RuleActionsAlertsFilter = ({
() => onChange(state ? undefined : query),
[state, query, onChange]
);
+
const updateQuery = useCallback(
(update: Partial) => {
setQuery({
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_connectors_modal.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_connectors_modal.tsx
index 9c3dbcf15e36..82496d9578ff 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_connectors_modal.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_connectors_modal.tsx
@@ -163,7 +163,10 @@ export const RuleActionsConnectorsModal = (props: RuleActionsConnectorsModalProp
const connectorFacetButtons = useMemo(() => {
return (
-
+
{
await userEvent.click(screen.getByText('onTimeframeChange'));
- expect(mockOnChange).toHaveBeenCalledTimes(1);
+ expect(mockOnChange).toHaveBeenCalledTimes(2);
expect(mockOnChange).toHaveBeenCalledWith({
payload: {
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_item.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_item.tsx
index b80a79a69cfc..9bf6cac970b1 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_item.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_actions/rule_actions_item.tsx
@@ -40,17 +40,12 @@ import { isEmpty, some } from 'lodash';
import { css } from '@emotion/react';
import { SavedObjectAttribute } from '@kbn/core/types';
import { useRuleFormDispatch, useRuleFormState } from '../hooks';
-import {
- ActionConnector,
- ActionTypeModel,
- RuleFormParamsErrors,
- RuleTypeWithDescription,
-} from '../../common/types';
+import { ActionConnector, RuleFormParamsErrors } from '../../common/types';
import { getAvailableActionVariables } from '../../action_variables';
import { validateAction, validateParamsForWarnings } from '../validation';
import { RuleActionsSettings } from './rule_actions_settings';
-import { getSelectedActionGroup } from '../utils';
+import { getDefaultParams, getSelectedActionGroup } from '../utils';
import { RuleActionsMessage } from './rule_actions_message';
import {
ACTION_ERROR_TOOLTIP,
@@ -60,6 +55,7 @@ import {
TECH_PREVIEW_DESCRIPTION,
TECH_PREVIEW_LABEL,
} from '../translations';
+import { checkActionFormActionTypeEnabled } from '../utils/check_action_type_enabled';
const SUMMARY_GROUP_TITLE = i18n.translate('alertsUIShared.ruleActionsItem.summaryGroupTitle', {
defaultMessage: 'Summary of alerts',
@@ -83,22 +79,6 @@ const ACTION_TITLE = (connector: ActionConnector) =>
},
});
-const getDefaultParams = ({
- group,
- ruleType,
- actionTypeModel,
-}: {
- group: string;
- actionTypeModel: ActionTypeModel;
- ruleType: RuleTypeWithDescription;
-}) => {
- if (group === ruleType.recoveryActionGroup.id) {
- return actionTypeModel.defaultRecoveredActionParams;
- } else {
- return actionTypeModel.defaultActionParams;
- }
-};
-
export interface RuleActionsItemProps {
action: RuleAction;
index: number;
@@ -178,6 +158,16 @@ export const RuleActionsItem = (props: RuleActionsItemProps) => {
? aadTemplateFields
: availableActionVariables;
+ const checkEnabledResult = useMemo(() => {
+ if (!actionType) {
+ return null;
+ }
+ return checkActionFormActionTypeEnabled(
+ actionType,
+ connectors.filter((c) => c.isPreconfigured)
+ );
+ }, [actionType, connectors]);
+
const onDelete = (id: string) => {
dispatch({ type: 'removeAction', payload: { uuid: id } });
};
@@ -381,16 +371,24 @@ export const RuleActionsItem = (props: RuleActionsItemProps) => {
...action.alertsFilter,
query,
};
+
+ if (!newAlertsFilter.query) {
+ delete newAlertsFilter.query;
+ }
+
+ const alertsFilter = isEmpty(newAlertsFilter) ? undefined : newAlertsFilter;
+
const newAction = {
...action,
- alertsFilter: newAlertsFilter,
+ alertsFilter,
};
+
dispatch({
type: 'setActionProperty',
payload: {
uuid: action.uuid!,
key: 'alertsFilter',
- value: newAlertsFilter,
+ value: alertsFilter,
},
});
validateActionBase(newAction);
@@ -400,19 +398,33 @@ export const RuleActionsItem = (props: RuleActionsItemProps) => {
const onTimeframeChange = useCallback(
(timeframe?: AlertsFilterTimeframe) => {
+ const newAlertsFilter = {
+ ...action.alertsFilter,
+ timeframe,
+ };
+
+ if (!newAlertsFilter.timeframe) {
+ delete newAlertsFilter.timeframe;
+ }
+
+ const alertsFilter = isEmpty(newAlertsFilter) ? undefined : newAlertsFilter;
+
+ const newAction = {
+ ...action,
+ alertsFilter,
+ };
+
dispatch({
type: 'setActionProperty',
payload: {
uuid: action.uuid!,
key: 'alertsFilter',
- value: {
- ...action.alertsFilter,
- timeframe,
- },
+ value: alertsFilter,
},
});
+ validateActionBase(newAction);
},
- [action, dispatch]
+ [action, dispatch, validateActionBase]
);
const onUseAadTemplateFieldsChange = useCallback(() => {
@@ -443,9 +455,25 @@ export const RuleActionsItem = (props: RuleActionsItemProps) => {
}, [action, storedActionParamsForAadToggle, dispatch]);
const accordionContent = useMemo(() => {
- if (!connector) {
+ if (!connector || !checkEnabledResult) {
return null;
}
+
+ if (!checkEnabledResult.isEnabled) {
+ return (
+
+ {checkEnabledResult.messageCard}
+
+ );
+ }
+
return (
{
templateFields,
useDefaultMessage,
warning,
+ checkEnabledResult,
onNotifyWhenChange,
onActionGroupChange,
onAlertsFilterChange,
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_alert_delay.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_alert_delay.test.tsx
index 7b12160c1dad..327a0ba12634 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_alert_delay.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_alert_delay.test.tsx
@@ -74,17 +74,14 @@ describe('RuleAlertDelay', () => {
expect(mockOnChange).not.toHaveBeenCalled();
});
- test('Should call onChange with null if empty string is typed', () => {
+ test('Should not call onChange if empty string is typed', () => {
render();
fireEvent.change(screen.getByTestId('alertDelayInput'), {
target: {
value: '',
},
});
- expect(mockOnChange).toHaveBeenCalledWith({
- type: 'setAlertDelay',
- payload: null,
- });
+ expect(mockOnChange).not.toHaveBeenCalled();
});
test('Should display error when input is invalid', () => {
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_alert_delay.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_alert_delay.tsx
index 5b26c38232ab..a79f1f5efe44 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_alert_delay.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_alert_delay.tsx
@@ -28,16 +28,8 @@ export const RuleAlertDelay = () => {
const onAlertDelayChange = useCallback(
(e: React.ChangeEvent) => {
- if (!e.target.validity.valid) {
- return;
- }
- const value = e.target.value;
- if (value === '') {
- dispatch({
- type: 'setAlertDelay',
- payload: null,
- });
- } else if (INTEGER_REGEX.test(value)) {
+ const value = e.target.value.trim();
+ if (INTEGER_REGEX.test(value)) {
const parsedValue = parseInt(value, 10);
dispatch({
type: 'setAlertDelay',
@@ -66,7 +58,7 @@ export const RuleAlertDelay = () => {
{
active: 5,
},
notifyWhen: null,
- consumer: 'stackAlerts',
+ consumer: 'alerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
canShowConsumerSelection: true,
validConsumers: ['logs', 'stackAlerts'],
+ availableRuleTypes: [ruleType],
});
render();
@@ -164,13 +167,16 @@ describe('Rule Definition', () => {
active: 5,
},
notifyWhen: null,
- consumer: 'stackAlerts',
+ consumer: 'alerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: {
...ruleModel,
documentationUrl: null,
},
+ availableRuleTypes: [ruleType],
+ validConsumers: ['logs', 'stackAlerts'],
});
render();
@@ -191,6 +197,7 @@ describe('Rule Definition', () => {
},
notifyWhen: null,
consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
@@ -215,9 +222,11 @@ describe('Rule Definition', () => {
},
notifyWhen: null,
consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
+ availableRuleTypes: [ruleType],
canShowConsumerSelect: true,
validConsumers: ['logs'],
});
@@ -241,9 +250,11 @@ describe('Rule Definition', () => {
},
notifyWhen: null,
consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
+ availableRuleTypes: [ruleType],
canShowConsumerSelect: true,
validConsumers: ['logs', 'observability'],
});
@@ -267,9 +278,11 @@ describe('Rule Definition', () => {
},
notifyWhen: null,
consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
+ availableRuleTypes: [ruleType],
});
render();
@@ -292,9 +305,11 @@ describe('Rule Definition', () => {
},
notifyWhen: null,
consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
+ availableRuleTypes: [ruleType],
});
render();
@@ -326,9 +341,11 @@ describe('Rule Definition', () => {
},
notifyWhen: null,
consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
+ availableRuleTypes: [ruleType],
canShowConsumerSelection: true,
validConsumers: ['logs', 'stackAlerts'],
});
@@ -339,6 +356,48 @@ describe('Rule Definition', () => {
expect(screen.getByTestId('ruleSettingsFlappingForm')).toBeInTheDocument();
});
+ test('should hide flapping if the user does not have read access', async () => {
+ useRuleFormState.mockReturnValue({
+ plugins: {
+ charts: {} as ChartsPluginSetup,
+ data: {} as DataPublicPluginStart,
+ dataViews: {} as DataViewsPublicPluginStart,
+ unifiedSearch: {} as UnifiedSearchPublicPluginStart,
+ docLinks: {} as DocLinksStart,
+ application: {
+ capabilities: {
+ rulesSettings: {
+ readFlappingSettingsUI: false,
+ writeFlappingSettingsUI: true,
+ },
+ },
+ },
+ },
+ formData: {
+ id: 'test-id',
+ params: {},
+ schedule: {
+ interval: '1m',
+ },
+ alertDelay: {
+ active: 5,
+ },
+ notifyWhen: null,
+ consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
+ },
+ selectedRuleType: ruleType,
+ selectedRuleTypeModel: ruleModel,
+ availableRuleTypes: [ruleType],
+ canShowConsumerSelection: true,
+ validConsumers: ['logs', 'stackAlerts'],
+ });
+
+ render();
+
+ expect(screen.queryByTestId('ruleDefinitionFlappingFormGroup')).not.toBeInTheDocument();
+ });
+
test('should allow flapping to be changed', async () => {
useRuleFormState.mockReturnValue({
plugins,
@@ -353,9 +412,11 @@ describe('Rule Definition', () => {
},
notifyWhen: null,
consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
+ availableRuleTypes: [ruleType],
canShowConsumerSelection: true,
validConsumers: ['logs', 'stackAlerts'],
});
@@ -389,9 +450,11 @@ describe('Rule Definition', () => {
},
notifyWhen: null,
consumer: 'stackAlerts',
+ ruleTypeId: '.es-query',
},
selectedRuleType: ruleType,
selectedRuleTypeModel: ruleModel,
+ availableRuleTypes: [ruleType],
canShowConsumerSelection: true,
validConsumers: ['logs', 'stackAlerts'],
});
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_definition.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_definition.tsx
index 3b404edc5d02..997e666e8340 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_definition.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_definition.tsx
@@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import React, { Suspense, useMemo, useState, useCallback } from 'react';
+import React, { Suspense, useMemo, useState, useCallback, useEffect } from 'react';
import {
EuiEmptyPrompt,
EuiLoadingSpinner,
@@ -47,7 +47,7 @@ import { RuleAlertDelay } from './rule_alert_delay';
import { RuleConsumerSelection } from './rule_consumer_selection';
import { RuleSchedule } from './rule_schedule';
import { useRuleFormState, useRuleFormDispatch } from '../hooks';
-import { MULTI_CONSUMER_RULE_TYPE_IDS } from '../constants';
+import { ALERTING_FEATURE_ID, MULTI_CONSUMER_RULE_TYPE_IDS } from '../constants';
import { getAuthorizedConsumers } from '../utils';
import { RuleSettingsFlappingTitleTooltip } from '../../rule_settings/rule_settings_flapping_title_tooltip';
import { RuleSettingsFlappingForm } from '../../rule_settings/rule_settings_flapping_form';
@@ -62,6 +62,7 @@ export const RuleDefinition = () => {
metadata,
selectedRuleType,
selectedRuleTypeModel,
+ availableRuleTypes,
validConsumers,
canShowConsumerSelection = false,
flappingSettings,
@@ -70,29 +71,44 @@ export const RuleDefinition = () => {
const { colorMode } = useEuiTheme();
const dispatch = useRuleFormDispatch();
+ useEffect(() => {
+ // Need to do a dry run validating the params because the Missing Monitor Data rule type
+ // does not properly initialize the params
+ if (selectedRuleType.id === 'monitoring_alert_missing_monitoring_data') {
+ dispatch({ type: 'runValidation' });
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
const { charts, data, dataViews, unifiedSearch, docLinks, application } = plugins;
const {
capabilities: { rulesSettings },
} = application;
- const { writeFlappingSettingsUI } = rulesSettings || {};
+ const { readFlappingSettingsUI, writeFlappingSettingsUI } = rulesSettings || {};
- const { params, schedule, notifyWhen, flapping } = formData;
+ const { params, schedule, notifyWhen, flapping, consumer, ruleTypeId } = formData;
const [isAdvancedOptionsVisible, setIsAdvancedOptionsVisible] = useState(false);
const [isFlappingPopoverOpen, setIsFlappingPopoverOpen] = useState(false);
const authorizedConsumers = useMemo(() => {
- if (!validConsumers?.length) {
+ if (consumer !== ALERTING_FEATURE_ID) {
+ return [];
+ }
+ const selectedAvailableRuleType = availableRuleTypes.find((ruleType) => {
+ return ruleType.id === selectedRuleType.id;
+ });
+ if (!selectedAvailableRuleType?.authorizedConsumers) {
return [];
}
return getAuthorizedConsumers({
- ruleType: selectedRuleType,
+ ruleType: selectedAvailableRuleType,
validConsumers,
});
- }, [selectedRuleType, validConsumers]);
+ }, [consumer, selectedRuleType, availableRuleTypes, validConsumers]);
const shouldShowConsumerSelect = useMemo(() => {
if (!canShowConsumerSelection) {
@@ -107,10 +123,8 @@ export const RuleDefinition = () => {
) {
return false;
}
- return (
- selectedRuleTypeModel.id && MULTI_CONSUMER_RULE_TYPE_IDS.includes(selectedRuleTypeModel.id)
- );
- }, [authorizedConsumers, selectedRuleTypeModel, canShowConsumerSelection]);
+ return !!(ruleTypeId && MULTI_CONSUMER_RULE_TYPE_IDS.includes(ruleTypeId));
+ }, [ruleTypeId, authorizedConsumers, canShowConsumerSelection]);
const RuleParamsExpressionComponent = selectedRuleTypeModel.ruleParamsExpression ?? null;
@@ -305,8 +319,9 @@ export const RuleDefinition = () => {
>
- {IS_RULE_SPECIFIC_FLAPPING_ENABLED && (
+ {IS_RULE_SPECIFIC_FLAPPING_ENABLED && readFlappingSettingsUI && (
{ALERT_FLAPPING_DETECTION_TITLE}}
description={
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_schedule.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_schedule.tsx
index 26342d99580a..1768303c5522 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_schedule.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_definition/rule_schedule.tsx
@@ -80,9 +80,6 @@ export const RuleSchedule = () => {
const onIntervalNumberChange = useCallback(
(e: React.ChangeEvent) => {
- if (!e.target.validity.valid) {
- return;
- }
const value = e.target.value.trim();
if (INTEGER_REGEX.test(value)) {
const parsedValue = parseInt(value, 10);
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_form.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_form.tsx
index d1a0f6a56fe2..c09add5ae1c0 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_form.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_form.tsx
@@ -23,11 +23,12 @@ const queryClient = new QueryClient();
export interface RuleFormProps {
plugins: RuleFormPlugins;
- returnUrl: string;
+ onCancel?: () => void;
+ onSubmit?: (ruleId: string) => void;
}
export const RuleForm = (props: RuleFormProps) => {
- const { plugins, returnUrl } = props;
+ const { plugins, onCancel, onSubmit } = props;
const { id, ruleTypeId } = useParams<{
id?: string;
ruleTypeId?: string;
@@ -35,23 +36,31 @@ export const RuleForm = (props: RuleFormProps) => {
const ruleFormComponent = useMemo(() => {
if (id) {
- return ;
+ return ;
}
if (ruleTypeId) {
- return ;
+ return (
+
+ );
}
return (
{RULE_FORM_ROUTE_PARAMS_ERROR_TITLE}}
- >
-
- {RULE_FORM_ROUTE_PARAMS_ERROR_TEXT}
-
-
+ body={
+
+ {RULE_FORM_ROUTE_PARAMS_ERROR_TEXT}
+
+ }
+ />
);
- }, [id, ruleTypeId, plugins, returnUrl]);
+ }, [id, ruleTypeId, plugins, onCancel, onSubmit]);
return {ruleFormComponent};
};
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.test.tsx
index 81d1aab4b2c3..d8e6380462f9 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.test.tsx
@@ -76,6 +76,8 @@ const initialState: RuleFormState = {
selectedRuleType: indexThresholdRuleType,
selectedRuleTypeModel: indexThresholdRuleTypeModel,
multiConsumerSelection: 'stackAlerts',
+ availableRuleTypes: [],
+ validConsumers: [],
connectors: [],
connectorTypes: [],
aadTemplateFields: [],
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.ts b/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.ts
index a65842125b6a..d79ae0098887 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.ts
@@ -8,7 +8,7 @@
*/
import { RuleActionParams } from '@kbn/alerting-types';
-import { omit } from 'lodash';
+import { isEmpty, omit } from 'lodash';
import { RuleFormActionsErrors, RuleFormParamsErrors, RuleUiAction } from '../../common';
import { RuleFormData, RuleFormState } from '../types';
import { validateRuleBase, validateRuleParams } from '../validation';
@@ -106,13 +106,20 @@ export type RuleFormStateReducerAction =
uuid: string;
errors: RuleFormParamsErrors;
};
+ }
+ | {
+ type: 'runValidation';
};
const getUpdateWithValidation =
(ruleFormState: RuleFormState) =>
(updater: () => RuleFormData): RuleFormState => {
- const { minimumScheduleInterval, selectedRuleTypeModel, multiConsumerSelection } =
- ruleFormState;
+ const {
+ minimumScheduleInterval,
+ selectedRuleTypeModel,
+ multiConsumerSelection,
+ selectedRuleType,
+ } = ruleFormState;
const formData = updater();
@@ -121,17 +128,33 @@ const getUpdateWithValidation =
...(multiConsumerSelection ? { consumer: multiConsumerSelection } : {}),
};
+ const baseErrors = validateRuleBase({
+ formData: formDataWithMultiConsumer,
+ minimumScheduleInterval,
+ });
+
+ const paramsErrors = validateRuleParams({
+ formData: formDataWithMultiConsumer,
+ ruleTypeModel: selectedRuleTypeModel,
+ });
+
+ // We need to do this because the Missing Monitor Data rule type
+ // for whatever reason does not initialize the params with any data,
+ // therefore the expression component renders as blank
+ if (selectedRuleType.id === 'monitoring_alert_missing_monitoring_data') {
+ if (isEmpty(formData.params) && !isEmpty(paramsErrors)) {
+ Object.keys(paramsErrors).forEach((key) => {
+ formData.params[key] = null;
+ });
+ }
+ }
+
return {
...ruleFormState,
formData,
- baseErrors: validateRuleBase({
- formData: formDataWithMultiConsumer,
- minimumScheduleInterval,
- }),
- paramsErrors: validateRuleParams({
- formData: formDataWithMultiConsumer,
- ruleTypeModel: selectedRuleTypeModel,
- }),
+ baseErrors,
+ paramsErrors,
+ touched: true,
};
};
@@ -222,6 +245,7 @@ export const ruleFormStateReducer = (
return {
...ruleFormState,
multiConsumerSelection: payload,
+ touched: true,
};
}
case 'setMetadata': {
@@ -326,6 +350,9 @@ export const ruleFormStateReducer = (
},
};
}
+ case 'runValidation': {
+ return updateWithValidation(() => formData);
+ }
default: {
return ruleFormState;
}
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.test.tsx
index ca80c0b77aae..ac07c580fbd4 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.test.tsx
@@ -61,6 +61,8 @@ const formDataMock: RuleFormData = {
},
};
+const onCancel = jest.fn();
+
useRuleFormState.mockReturnValue({
plugins: {
application: {
@@ -84,7 +86,6 @@ useRuleFormState.mockReturnValue({
});
const onSave = jest.fn();
-const returnUrl = 'management';
describe('rulePage', () => {
afterEach(() => {
@@ -92,7 +93,7 @@ describe('rulePage', () => {
});
test('renders correctly', () => {
- render();
+ render();
expect(screen.getByText(RULE_FORM_PAGE_RULE_DEFINITION_TITLE)).toBeInTheDocument();
expect(screen.getByText(RULE_FORM_PAGE_RULE_ACTIONS_TITLE)).toBeInTheDocument();
@@ -100,7 +101,7 @@ describe('rulePage', () => {
});
test('should call onSave when save button is pressed', () => {
- render();
+ render();
fireEvent.click(screen.getByTestId('rulePageFooterSaveButton'));
fireEvent.click(screen.getByTestId('confirmModalConfirmButton'));
@@ -112,16 +113,16 @@ describe('rulePage', () => {
});
test('should call onCancel when the cancel button is clicked', () => {
- render();
+ render();
fireEvent.click(screen.getByTestId('rulePageFooterCancelButton'));
- expect(navigateToUrl).toHaveBeenCalledWith('management');
+ expect(onCancel).toHaveBeenCalled();
});
test('should call onCancel when the return button is clicked', () => {
- render();
+ render();
fireEvent.click(screen.getByTestId('rulePageReturnButton'));
- expect(navigateToUrl).toHaveBeenCalledWith('management');
+ expect(onCancel).toHaveBeenCalled();
});
});
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.tsx
index 4e2e019d4126..68ff6d5db6b1 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.tsx
@@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
import {
EuiPageTemplate,
EuiHorizontalRule,
@@ -18,6 +18,8 @@ import {
EuiButtonEmpty,
EuiFlexGroup,
EuiFlexItem,
+ EuiCallOut,
+ EuiConfirmModal,
} from '@elastic/eui';
import {
RuleDefinition,
@@ -33,32 +35,45 @@ import {
RULE_FORM_PAGE_RULE_ACTIONS_TITLE,
RULE_FORM_PAGE_RULE_DETAILS_TITLE,
RULE_FORM_RETURN_TITLE,
+ DISABLED_ACTIONS_WARNING_TITLE,
+ RULE_FORM_CANCEL_MODAL_TITLE,
+ RULE_FORM_CANCEL_MODAL_DESCRIPTION,
+ RULE_FORM_CANCEL_MODAL_CONFIRM,
+ RULE_FORM_CANCEL_MODAL_CANCEL,
} from '../translations';
+import { hasActionsError, hasActionsParamsErrors, hasParamsErrors } from '../validation';
+import { checkActionFormActionTypeEnabled } from '../utils/check_action_type_enabled';
export interface RulePageProps {
isEdit?: boolean;
isSaving?: boolean;
- returnUrl: string;
+ onCancel?: () => void;
onSave: (formData: RuleFormData) => void;
}
export const RulePage = (props: RulePageProps) => {
- const { isEdit = false, isSaving = false, returnUrl, onSave } = props;
+ const { isEdit = false, isSaving = false, onCancel = () => {}, onSave } = props;
+ const [isCancelModalOpen, setIsCancelModalOpen] = useState(false);
const {
plugins: { application },
+ baseErrors = {},
+ paramsErrors = {},
+ actionsErrors = {},
+ actionsParamsErrors = {},
formData,
multiConsumerSelection,
+ connectorTypes,
+ connectors,
+ touched,
} = useRuleFormState();
+ const { actions } = formData;
+
const canReadConnectors = !!application.capabilities.actions?.show;
const styles = useEuiBackgroundColorCSS().transparent;
- const onCancel = useCallback(() => {
- application.navigateToUrl(returnUrl);
- }, [application, returnUrl]);
-
const onSaveInternal = useCallback(() => {
onSave({
...formData,
@@ -66,11 +81,51 @@ export const RulePage = (props: RulePageProps) => {
});
}, [onSave, formData, multiConsumerSelection]);
- const actionComponent = useMemo(() => {
+ const onCancelInternal = useCallback(() => {
+ if (touched) {
+ setIsCancelModalOpen(true);
+ } else {
+ onCancel();
+ }
+ }, [touched, onCancel]);
+
+ const hasActionsDisabled = useMemo(() => {
+ const preconfiguredConnectors = connectors.filter((connector) => connector.isPreconfigured);
+ return actions.some((action) => {
+ const actionType = connectorTypes.find(({ id }) => id === action.actionTypeId);
+ if (!actionType) {
+ return false;
+ }
+ const checkEnabledResult = checkActionFormActionTypeEnabled(
+ actionType,
+ preconfiguredConnectors
+ );
+ return !actionType.enabled && !checkEnabledResult.isEnabled;
+ });
+ }, [actions, connectors, connectorTypes]);
+
+ const hasRuleDefinitionErrors = useMemo(() => {
+ return !!(
+ hasParamsErrors(paramsErrors) ||
+ baseErrors.interval?.length ||
+ baseErrors.alertDelay?.length
+ );
+ }, [paramsErrors, baseErrors]);
+
+ const hasActionErrors = useMemo(() => {
+ return hasActionsError(actionsErrors) || hasActionsParamsErrors(actionsParamsErrors);
+ }, [actionsErrors, actionsParamsErrors]);
+
+ const hasRuleDetailsError = useMemo(() => {
+ return baseErrors.name?.length || baseErrors.tags?.length;
+ }, [baseErrors]);
+
+ const actionComponent: EuiStepsProps['steps'] = useMemo(() => {
if (canReadConnectors) {
return [
{
title: RULE_FORM_PAGE_RULE_ACTIONS_TITLE,
+ status: hasActionErrors ? 'danger' : undefined,
children: (
<>
@@ -82,17 +137,19 @@ export const RulePage = (props: RulePageProps) => {
];
}
return [];
- }, [canReadConnectors]);
+ }, [hasActionErrors, canReadConnectors]);
const steps: EuiStepsProps['steps'] = useMemo(() => {
return [
{
title: RULE_FORM_PAGE_RULE_DEFINITION_TITLE,
+ status: hasRuleDefinitionErrors ? 'danger' : undefined,
children: ,
},
...actionComponent,
{
title: RULE_FORM_PAGE_RULE_DETAILS_TITLE,
+ status: hasRuleDetailsError ? 'danger' : undefined,
children: (
<>
@@ -102,46 +159,73 @@ export const RulePage = (props: RulePageProps) => {
),
},
];
- }, [actionComponent]);
+ }, [hasRuleDefinitionErrors, hasRuleDetailsError, actionComponent]);
return (
-
-
-
+
+
+
+
+
+ {RULE_FORM_RETURN_TITLE}
+
+
+
+
+
+
+
+
+
+ {hasActionsDisabled && (
+ <>
+
+
+
+ )}
+
+
+
+
+
+
+ {isCancelModalOpen && (
+ setIsCancelModalOpen(false)}
+ onConfirm={onCancel}
+ buttonColor="danger"
+ defaultFocusedButton="confirm"
+ title={RULE_FORM_CANCEL_MODAL_TITLE}
+ confirmButtonText={RULE_FORM_CANCEL_MODAL_CONFIRM}
+ cancelButtonText={RULE_FORM_CANCEL_MODAL_CANCEL}
>
-
-
- {RULE_FORM_RETURN_TITLE}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ {RULE_FORM_CANCEL_MODAL_DESCRIPTION}
+
+ )}
+
);
};
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page_footer.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page_footer.test.tsx
index 45e200877358..d937c60aa3a5 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page_footer.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page_footer.test.tsx
@@ -32,15 +32,27 @@ const onSave = jest.fn();
const onCancel = jest.fn();
hasRuleErrors.mockReturnValue(false);
-useRuleFormState.mockReturnValue({
- baseErrors: {},
- paramsErrors: {},
- formData: {
- actions: [],
- },
-});
describe('rulePageFooter', () => {
+ beforeEach(() => {
+ useRuleFormState.mockReturnValue({
+ plugins: {
+ application: {
+ capabilities: {
+ actions: {
+ show: true,
+ },
+ },
+ },
+ },
+ baseErrors: {},
+ paramsErrors: {},
+ formData: {
+ actions: [],
+ },
+ });
+ });
+
afterEach(() => {
jest.clearAllMocks();
});
@@ -75,6 +87,30 @@ describe('rulePageFooter', () => {
expect(screen.getByTestId('rulePageConfirmCreateRule')).toBeInTheDocument();
});
+ test('should not show creat rule confirmation if user cannot read actions', () => {
+ useRuleFormState.mockReturnValue({
+ plugins: {
+ application: {
+ capabilities: {
+ actions: {
+ show: false,
+ },
+ },
+ },
+ },
+ baseErrors: {},
+ paramsErrors: {},
+ formData: {
+ actions: [],
+ },
+ });
+
+ render();
+ fireEvent.click(screen.getByTestId('rulePageFooterSaveButton'));
+ expect(screen.queryByTestId('rulePageConfirmCreateRule')).not.toBeInTheDocument();
+ expect(onSave).toHaveBeenCalled();
+ });
+
test('should show call onSave if clicking rule confirmation', () => {
render();
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page_footer.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page_footer.tsx
index 09d2ac429fd5..62a0e4b64e4f 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page_footer.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page_footer.tsx
@@ -34,6 +34,7 @@ export const RulePageFooter = (props: RulePageFooterProps) => {
const { isEdit = false, isSaving = false, onCancel, onSave } = props;
const {
+ plugins: { application },
formData: { actions },
connectors,
baseErrors = {},
@@ -78,11 +79,12 @@ export const RulePageFooter = (props: RulePageFooterProps) => {
if (isEdit) {
return onSave();
}
- if (actions.length === 0) {
+ const canReadConnectors = !!application.capabilities.actions?.show;
+ if (actions.length === 0 && canReadConnectors) {
return setShowCreateConfirmation(true);
}
onSave();
- }, [actions, isEdit, onSave]);
+ }, [actions, isEdit, application, onSave]);
const onCreateConfirmClick = useCallback(() => {
setShowCreateConfirmation(false);
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/translations.ts b/packages/kbn-alerts-ui-shared/src/rule_form/translations.ts
index 20e87c66f10f..fca2e30b9443 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/translations.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/translations.ts
@@ -194,7 +194,7 @@ export const RULE_TYPE_REQUIRED_TEXT = i18n.translate(
export const RULE_ALERT_DELAY_BELOW_MINIMUM_TEXT = i18n.translate(
'alertsUIShared.ruleForm.error.belowMinimumAlertDelayText',
{
- defaultMessage: 'Alert delay must be greater than 1.',
+ defaultMessage: 'Alert delay must be 1 or greater.',
}
);
@@ -498,6 +498,34 @@ export const RULE_FORM_RETURN_TITLE = i18n.translate('alertsUIShared.ruleForm.re
defaultMessage: 'Return',
});
+export const RULE_FORM_CANCEL_MODAL_TITLE = i18n.translate(
+ 'alertsUIShared.ruleForm.ruleFormCancelModalTitle',
+ {
+ defaultMessage: 'Discard unsaved changes to rule?',
+ }
+);
+
+export const RULE_FORM_CANCEL_MODAL_DESCRIPTION = i18n.translate(
+ 'alertsUIShared.ruleForm.ruleFormCancelModalDescription',
+ {
+ defaultMessage: "You can't recover unsaved changes.",
+ }
+);
+
+export const RULE_FORM_CANCEL_MODAL_CONFIRM = i18n.translate(
+ 'alertsUIShared.ruleForm.ruleFormCancelModalConfirm',
+ {
+ defaultMessage: 'Discard changes',
+ }
+);
+
+export const RULE_FORM_CANCEL_MODAL_CANCEL = i18n.translate(
+ 'alertsUIShared.ruleForm.ruleFormCancelModalCancel',
+ {
+ defaultMessage: 'Cancel',
+ }
+);
+
export const MODAL_SEARCH_PLACEHOLDER = i18n.translate(
'alertsUIShared.ruleForm.modalSearchPlaceholder',
{
@@ -586,3 +614,10 @@ export const TECH_PREVIEW_DESCRIPTION = i18n.translate(
'This functionality is in technical preview and may be changed or removed completely in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.',
}
);
+
+export const DISABLED_ACTIONS_WARNING_TITLE = i18n.translate(
+ 'alertsUIShared.disabledActionsWarningTitle',
+ {
+ defaultMessage: 'This rule has actions that are disabled',
+ }
+);
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/types.ts b/packages/kbn-alerts-ui-shared/src/rule_form/types.ts
index d33c74da528d..4b45f64d3ead 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/types.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/types.ts
@@ -72,6 +72,7 @@ export interface RuleFormState {
connectors: ActionConnector[];
connectorTypes: ActionType[];
aadTemplateFields: ActionVariable[];
+ availableRuleTypes: RuleTypeWithDescription[];
baseErrors?: RuleFormBaseErrors;
paramsErrors?: RuleFormParamsErrors;
actionsErrors?: Record;
@@ -83,8 +84,9 @@ export interface RuleFormState {
metadata?: Record;
minimumScheduleInterval?: MinimumScheduleInterval;
canShowConsumerSelection?: boolean;
- validConsumers?: RuleCreationValidConsumer[];
+ validConsumers: RuleCreationValidConsumer[];
flappingSettings?: RulesSettingsFlapping;
+ touched?: boolean;
}
export type InitialRule = Partial &
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/utils/get_authorized_consumers.ts b/packages/kbn-alerts-ui-shared/src/rule_form/utils/get_authorized_consumers.ts
index 217bb18328d0..0b5234c66944 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/utils/get_authorized_consumers.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/utils/get_authorized_consumers.ts
@@ -17,9 +17,6 @@ export const getAuthorizedConsumers = ({
ruleType: RuleTypeWithDescription;
validConsumers: RuleCreationValidConsumer[];
}) => {
- if (!ruleType.authorizedConsumers) {
- return [];
- }
return Object.entries(ruleType.authorizedConsumers).reduce(
(result, [authorizedConsumer, privilege]) => {
if (
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/assets/service_assets.ts b/packages/kbn-alerts-ui-shared/src/rule_form/utils/get_default_params.ts
similarity index 52%
rename from packages/kbn-apm-synthtrace-client/src/lib/assets/service_assets.ts
rename to packages/kbn-alerts-ui-shared/src/rule_form/utils/get_default_params.ts
index c3ae21bf6bf4..d2aab787d6eb 100644
--- a/packages/kbn-apm-synthtrace-client/src/lib/assets/service_assets.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/utils/get_default_params.ts
@@ -6,18 +6,20 @@
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/
+import { ActionTypeModel, RuleTypeWithDescription } from '../../common/types';
-import { Asset, AssetDocument } from './asset';
-
-export interface ServiceAssetDocument extends AssetDocument {
- 'service.language.name'?: string;
- 'service.name': string;
- 'service.node.name'?: string;
- 'service.environment'?: string;
-}
-
-export class ServiceAsset extends Asset {
- constructor(fields: Omit) {
- super({ 'asset.type': 'service', ...fields });
+export const getDefaultParams = ({
+ group,
+ ruleType,
+ actionTypeModel,
+}: {
+ group: string;
+ actionTypeModel: ActionTypeModel;
+ ruleType: RuleTypeWithDescription;
+}) => {
+ if (group === ruleType.recoveryActionGroup.id) {
+ return actionTypeModel.defaultRecoveredActionParams;
+ } else {
+ return actionTypeModel.defaultActionParams;
}
-}
+};
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/utils/index.ts b/packages/kbn-alerts-ui-shared/src/rule_form/utils/index.ts
index f5b583a1a9c6..53c9aedda754 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/utils/index.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/utils/index.ts
@@ -17,3 +17,4 @@ export * from './get_initial_schedule';
export * from './has_fields_for_aad';
export * from './get_selected_action_group';
export * from './get_initial_consumer';
+export * from './get_default_params';
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/validation/validate_form.ts b/packages/kbn-alerts-ui-shared/src/rule_form/validation/validate_form.ts
index d65e9c589393..57afe66b53ed 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/validation/validate_form.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/validation/validate_form.ts
@@ -35,7 +35,10 @@ export const validateAction = ({ action }: { action: RuleUiAction }): RuleFormAc
if ('alertsFilter' in action) {
const query = action?.alertsFilter?.query;
- if (query && !query.kql) {
+ if (!query) {
+ return errors;
+ }
+ if (!query.filters.length && !query.kql) {
errors.filterQuery.push(
i18n.translate('alertsUIShared.ruleForm.actionsForm.requiredFilterQuery', {
defaultMessage: 'A custom query is required.',
@@ -43,7 +46,6 @@ export const validateAction = ({ action }: { action: RuleUiAction }): RuleFormAc
);
}
}
-
return errors;
};
@@ -88,11 +90,7 @@ export function validateRuleBase({
errors.ruleTypeId.push(RULE_TYPE_REQUIRED_TEXT);
}
- if (
- formData.alertDelay &&
- !isNaN(formData.alertDelay?.active) &&
- formData.alertDelay?.active < 1
- ) {
+ if (!formData.alertDelay || isNaN(formData.alertDelay.active) || formData.alertDelay.active < 1) {
errors.alertDelay.push(RULE_ALERT_DELAY_BELOW_MINIMUM_TEXT);
}
@@ -111,34 +109,41 @@ export const validateRuleParams = ({
return ruleTypeModel.validate(formData.params, isServerless).errors;
};
-const hasRuleBaseErrors = (errors: RuleFormBaseErrors) => {
+export const hasRuleBaseErrors = (errors: RuleFormBaseErrors) => {
return Object.values(errors).some((error: string[]) => error.length > 0);
};
-const hasActionsError = (actionsErrors: Record) => {
+export const hasActionsError = (actionsErrors: Record) => {
return Object.values(actionsErrors).some((errors: RuleFormActionsErrors) => {
return Object.values(errors).some((error: string[]) => error.length > 0);
});
};
-const hasParamsErrors = (errors: RuleFormParamsErrors): boolean => {
- const values = Object.values(errors);
+export const hasParamsErrors = (errors: RuleFormParamsErrors | string | string[]): boolean => {
let hasError = false;
- for (const value of values) {
- if (Array.isArray(value) && value.length > 0) {
- return true;
- }
- if (typeof value === 'string' && value.trim() !== '') {
- return true;
- }
- if (isObject(value)) {
- hasError = hasParamsErrors(value as RuleFormParamsErrors);
- }
+
+ if (typeof errors === 'string' && errors.trim() !== '') {
+ hasError = true;
}
+
+ if (Array.isArray(errors)) {
+ errors.forEach((error) => {
+ hasError = hasError || hasParamsErrors(error);
+ });
+ }
+
+ if (isObject(errors)) {
+ Object.entries(errors).forEach(([_, value]) => {
+ hasError = hasError || hasParamsErrors(value);
+ });
+ }
+
return hasError;
};
-const hasActionsParamsErrors = (actionsParamsErrors: Record) => {
+export const hasActionsParamsErrors = (
+ actionsParamsErrors: Record
+) => {
return Object.values(actionsParamsErrors).some((errors: RuleFormParamsErrors) => {
return hasParamsErrors(errors);
});
diff --git a/packages/kbn-alerts-ui-shared/src/rule_settings/rule_settings_flapping_form.tsx b/packages/kbn-alerts-ui-shared/src/rule_settings/rule_settings_flapping_form.tsx
index 99f64f0a3977..030cde8127b0 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_settings/rule_settings_flapping_form.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_settings/rule_settings_flapping_form.tsx
@@ -218,15 +218,17 @@ export const RuleSettingsFlappingForm = (props: RuleSettingsFlappingFormProps) =
direction={isDesktop ? 'row' : 'column'}
alignItems={isDesktop ? 'center' : undefined}
>
-
+
{flappingLabel}
-
+
{enabled ? flappingOnLabel : flappingOffLabel}
{flappingSettings && enabled && (
- {flappingOverrideLabel}
+
+ {flappingOverrideLabel}
+
)}
@@ -236,6 +238,7 @@ export const RuleSettingsFlappingForm = (props: RuleSettingsFlappingFormProps) =
compressed
checked={!!flappingSettings}
label={flappingOverrideConfiguration}
+ disabled={!canWriteFlappingSettingsUI}
onChange={onFlappingToggle}
/>
)}
@@ -256,6 +259,7 @@ export const RuleSettingsFlappingForm = (props: RuleSettingsFlappingFormProps) =
spaceFlappingSettings,
flappingSettings,
flappingOffTooltip,
+ canWriteFlappingSettingsUI,
onFlappingToggle,
]);
@@ -273,12 +277,14 @@ export const RuleSettingsFlappingForm = (props: RuleSettingsFlappingFormProps) =
statusChangeThreshold={flappingSettings.statusChangeThreshold}
onLookBackWindowChange={onLookBackWindowChange}
onStatusChangeThresholdChange={onStatusChangeThresholdChange}
+ isDisabled={!canWriteFlappingSettingsUI}
/>
);
}, [
flappingSettings,
spaceFlappingSettings,
+ canWriteFlappingSettingsUI,
onLookBackWindowChange,
onStatusChangeThresholdChange,
]);
diff --git a/packages/kbn-alerts-ui-shared/src/rule_settings/rule_settings_flapping_title_tooltip.tsx b/packages/kbn-alerts-ui-shared/src/rule_settings/rule_settings_flapping_title_tooltip.tsx
index 2a5cc4186013..149eb5b792c1 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_settings/rule_settings_flapping_title_tooltip.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_settings/rule_settings_flapping_title_tooltip.tsx
@@ -80,6 +80,7 @@ export const RuleSettingsFlappingTitleTooltip = (props: RuleSettingsFlappingTitl
panelStyle={{
width: 500,
}}
+ closePopover={() => setIsPopoverOpen(false)}
button={
{
spanSubtype: 'http',
'http.request.method': httpMethod,
'url.original': httpUrl,
- 'transaction.type': 'mobile',
+ 'processor.event': 'span',
};
if (this.networkConnection) {
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/assets/asset.ts b/packages/kbn-apm-synthtrace-client/src/lib/assets/asset.ts
deleted file mode 100644
index f5968fff23e3..000000000000
--- a/packages/kbn-apm-synthtrace-client/src/lib/assets/asset.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { Fields } from '../entity';
-import { Serializable } from '../serializable';
-
-type AssetType = 'host' | 'pod' | 'container' | 'service' | 'aws_rds';
-
-export interface AssetDocument extends Fields {
- 'asset.id': string;
- 'asset.type': AssetType;
- 'asset.first_seen': string;
- 'asset.last_seen': string;
- 'asset.identifying_metadata': string[];
- 'asset.signalTypes': {
- 'asset.traces'?: boolean;
- 'asset.logs'?: boolean;
- };
-}
-
-export class Asset extends Serializable {}
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/assets/index.ts b/packages/kbn-apm-synthtrace-client/src/lib/assets/index.ts
deleted file mode 100644
index 2704d210b079..000000000000
--- a/packages/kbn-apm-synthtrace-client/src/lib/assets/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { ServiceAssetDocument } from './service_assets';
-
-export type AssetDocument = ServiceAssetDocument;
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/entities/container_entity.ts b/packages/kbn-apm-synthtrace-client/src/lib/entities/container_entity.ts
new file mode 100644
index 000000000000..6f9dfb4aabca
--- /dev/null
+++ b/packages/kbn-apm-synthtrace-client/src/lib/entities/container_entity.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { EntityDataStreamType, EntityFields } from '.';
+import { Serializable } from '../serializable';
+
+class ContainerEntity extends Serializable {
+ constructor(fields: EntityFields) {
+ super({
+ ...fields,
+ 'entity.type': 'container',
+ 'entity.definitionId': 'latest',
+ });
+ }
+}
+
+export function containerEntity({
+ agentName,
+ dataStreamType,
+ dataStreamDataset,
+ containerId,
+ entityId,
+}: {
+ agentName: string[];
+ dataStreamType: EntityDataStreamType[];
+ dataStreamDataset: string;
+ containerId: string;
+ entityId: string;
+}) {
+ return new ContainerEntity({
+ 'source_data_stream.type': dataStreamType,
+ 'source_data_stream.dataset': dataStreamDataset,
+ 'agent.name': agentName,
+ 'container.id': containerId,
+ 'entity.id': entityId,
+ });
+}
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/entities/host_entity.ts b/packages/kbn-apm-synthtrace-client/src/lib/entities/host_entity.ts
new file mode 100644
index 000000000000..47ffdd67dcbd
--- /dev/null
+++ b/packages/kbn-apm-synthtrace-client/src/lib/entities/host_entity.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { EntityDataStreamType, EntityFields } from '.';
+import { Serializable } from '../serializable';
+
+class HostEntity extends Serializable {
+ constructor(fields: EntityFields) {
+ super({
+ ...fields,
+ 'entity.type': 'host',
+ 'entity.definitionId': 'latest',
+ });
+ }
+}
+
+export function hostEntity({
+ agentName,
+ dataStreamType,
+ dataStreamDataset,
+ hostName,
+ entityId,
+}: {
+ agentName: string[];
+ dataStreamType: EntityDataStreamType[];
+ dataStreamDataset: string;
+ hostName: string;
+ entityId: string;
+}) {
+ return new HostEntity({
+ 'source_data_stream.type': dataStreamType,
+ 'source_data_stream.dataset': dataStreamDataset,
+ 'agent.name': agentName,
+ 'host.name': hostName,
+ 'entity.id': entityId,
+ });
+}
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/entities/index.ts b/packages/kbn-apm-synthtrace-client/src/lib/entities/index.ts
new file mode 100644
index 000000000000..10cf982ff41e
--- /dev/null
+++ b/packages/kbn-apm-synthtrace-client/src/lib/entities/index.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { Fields } from '../entity';
+import { serviceEntity } from './service_entity';
+import { hostEntity } from './host_entity';
+import { containerEntity } from './container_entity';
+
+export type EntityDataStreamType = 'metrics' | 'logs' | 'traces';
+
+export type EntityFields = Fields &
+ Partial<{
+ 'agent.name': string[];
+ 'source_data_stream.type': string | string[];
+ 'source_data_stream.dataset': string | string[];
+ 'event.ingested': string;
+ sourceIndex: string;
+ 'entity.lastSeenTimestamp': string;
+ 'entity.schemaVersion': string;
+ 'entity.definitionVersion': string;
+ 'entity.displayName': string;
+ 'entity.identityFields': string | string[];
+ 'entity.id': string;
+ 'entity.type': string;
+ 'entity.definitionId': string;
+ [key: string]: any;
+ }>;
+
+export const entities = { serviceEntity, hostEntity, containerEntity };
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/entities/service_entity.ts b/packages/kbn-apm-synthtrace-client/src/lib/entities/service_entity.ts
new file mode 100644
index 000000000000..2d304ecd21b9
--- /dev/null
+++ b/packages/kbn-apm-synthtrace-client/src/lib/entities/service_entity.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { EntityDataStreamType, EntityFields } from '.';
+import { Serializable } from '../serializable';
+
+class ServiceEntity extends Serializable {
+ constructor(fields: EntityFields) {
+ super({
+ ...fields,
+ 'entity.type': 'service',
+ 'entity.definitionId': 'latest',
+ });
+ }
+}
+
+export function serviceEntity({
+ agentName,
+ dataStreamType,
+ serviceName,
+ environment,
+ entityId,
+}: {
+ agentName: string[];
+ serviceName: string;
+ dataStreamType: EntityDataStreamType[];
+ environment?: string;
+ entityId: string;
+}) {
+ return new ServiceEntity({
+ 'service.name': serviceName,
+ 'service.environment': environment,
+ 'source_data_stream.type': dataStreamType,
+ 'agent.name': agentName,
+ 'entity.id': entityId,
+ });
+}
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/otel/error.ts b/packages/kbn-apm-synthtrace-client/src/lib/otel/error.ts
new file mode 100644
index 000000000000..63265d45fe88
--- /dev/null
+++ b/packages/kbn-apm-synthtrace-client/src/lib/otel/error.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import type { OtelDocument } from '../../..';
+import { Serializable } from '../serializable';
+
+export interface OtelErrorDocument extends OtelDocument {
+ 'event.name'?: string;
+ attributes?: {
+ 'exception.message'?: string;
+ 'error.stack_trace'?: string;
+ 'exception.handled'?: boolean;
+ 'exception.type'?: string;
+ 'processor.event'?: string;
+ 'timestamp.us'?: number;
+ 'event.name'?: string;
+ 'error.id'?: string;
+ };
+}
+
+export class OtelError extends Serializable {
+ constructor(fields: OtelErrorDocument) {
+ super({
+ ...fields,
+ });
+ }
+}
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/otel/index.ts b/packages/kbn-apm-synthtrace-client/src/lib/otel/index.ts
new file mode 100644
index 000000000000..86bb74dd94ff
--- /dev/null
+++ b/packages/kbn-apm-synthtrace-client/src/lib/otel/index.ts
@@ -0,0 +1,213 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { Fields } from '../entity';
+import { Serializable } from '../serializable';
+import { OtelError } from './error';
+import { OtelMetric } from './metric';
+import { OtelTransaction } from './transaction';
+
+interface OtelSharedResourceAttributes {
+ 'service.name'?: string;
+ 'agent.name'?: string;
+ 'agent.version'?: string;
+ 'metricset.interval'?: string;
+ 'service.instance.id'?: string;
+ 'telemetry.sdk.language'?: string;
+ 'telemetry.sdk.name'?: string;
+ 'telemetry.sdk.version'?: string;
+ 'some.resource.attribute'?: string;
+}
+
+export interface OtelDocument extends Fields {
+ data_stream?: {
+ dataset: string;
+ namespace: string;
+ type: string;
+ };
+ attributes?: {
+ 'timestamp.us'?: number;
+ 'metricset.name'?: string;
+ [key: string]: any;
+ };
+ resource?: {
+ attributes?: OtelSharedResourceAttributes;
+ dropped_attributes_count?: number;
+ schema_url?: string;
+ };
+ scope?: {
+ attributes?: {
+ 'service.framework.name'?: string;
+ 'service.framework.version'?: string;
+ };
+ dropped_attributes_count?: number;
+ name?: string;
+ };
+ name?: string;
+ trace_id?: string;
+ trace?: { id: string };
+ span_id?: string;
+ span?: { id: string };
+ dropped_attributes_count?: number;
+ dropped_events_count?: number;
+ dropped_links_count?: number;
+ timestamp_us?: number;
+}
+
+class Otel extends Serializable {
+ constructor(fields: OtelDocument) {
+ super({
+ ...fields,
+ });
+ }
+
+ error(spanId: string) {
+ return new OtelError({
+ ...this.fields,
+ attributes: {
+ 'exception.message': 'boom',
+ 'exception.handled': false,
+ 'exception.type': '*errors.errorString',
+ 'error.stack_trace': 'Error: INTERNAL: Boom',
+ 'processor.event': 'error',
+ 'timestamp.us': 1726580752010657,
+ 'event.name': 'exception',
+ 'error.id': `error-${spanId}`,
+ },
+ data_stream: {
+ dataset: 'generic.otel',
+ namespace: 'default',
+ type: 'logs',
+ },
+ 'event.name': 'exception',
+ dropped_attributes_count: 0,
+ resource: {
+ attributes: {
+ 'agent.name': 'opentelemetry/go',
+ 'agent.version': '1.28.0',
+ 'service.name': 'sendotlp-synth',
+ 'service.instance.id': '89117ac1-0dbf-4488-9e17-4c2c3b76943a',
+ },
+ dropped_attributes_count: 0,
+ schema_url: 'https://opentelemetry.io/schemas/1.26.0',
+ },
+ scope: {
+ attributes: {
+ 'service.framework.name': 'sendotlp-synth',
+ 'service.framework.version': '',
+ },
+ dropped_attributes_count: 0,
+ name: 'sendotlp-synth',
+ },
+ span_id: spanId,
+ });
+ }
+
+ metric() {
+ return new OtelMetric({
+ ...this.fields,
+ attributes: {
+ 'metricset.name': 'service_destination',
+ 'processor.event': 'metric',
+ 'event.outcome': 'success',
+ 'service.target.name': 'foo_service',
+ 'service.target.type': 'http',
+ 'span.name': 'child1',
+ 'span.destination.service.resource': 'foo_service:8080',
+ },
+ data_stream: {
+ dataset: 'service_destination.10m.otel',
+ namespace: 'default',
+ type: 'metrics',
+ },
+ metrics: {
+ service_summary: 2,
+ },
+ resource: {
+ attributes: {
+ 'agent.name': 'otlp',
+ 'agent.version': '1.28.0',
+ 'service.instance.id': '89117ac1-0dbf-4488-9e17-4c2c3b76943a',
+ 'service.name': 'sendotlp-synth',
+ 'metricset.interval': '10m',
+ },
+ dropped_attributes_count: 0,
+ },
+ scope: {
+ dropped_attributes_count: 0,
+ name: 'github.com/elastic/opentelemetry-collector-components/connector/spanmetricsconnectorv2',
+ },
+ });
+ }
+
+ // In Otel we have only spans (https://opentelemetry.io/docs/concepts/signals/traces/#spans)
+ // we call the root span a transaction to match our data model
+ transaction(id: string) {
+ return new OtelTransaction({
+ ...this.fields,
+ attributes: {
+ 'event.outcome': 'success',
+ 'event.success_count': 1,
+ 'processor.event': 'transaction',
+ 'timestamp.us': 1726580752010657,
+ 'transaction.duration.us': 15202,
+ 'transaction.id': id,
+ 'transaction.name': 'parent-synth',
+ 'transaction.representative_count': 1,
+ 'transaction.result': 'HTTP 2xx',
+ 'transaction.root': true,
+ 'transaction.sampled': true,
+ 'transaction.type': 'unknown',
+ },
+ data_stream: {
+ dataset: 'generic.otel',
+ namespace: 'default',
+ type: 'traces',
+ },
+ duration: 11742370,
+ kind: 'Internal',
+ name: 'parent-synth',
+ resource: {
+ attributes: {
+ 'agent.name': 'otlp',
+ 'agent.version': '1.28.0',
+ 'service.instance.id': '89117ac1-0dbf-4488-9e17-4c2c3b76943a',
+ 'service.name': 'sendotlp-synth',
+ },
+ dropped_attributes_count: 0,
+ schema_url: 'https://opentelemetry.io/schemas/1.26.0',
+ },
+ scope: {
+ attributes: {
+ 'service.framework.name': 'sendotlp-synth',
+ 'service.framework.version': '',
+ },
+ dropped_attributes_count: 0,
+ name: 'sendotlp-synth',
+ },
+ span_id: id,
+ status: {
+ code: 'Unset',
+ },
+ });
+ }
+}
+
+export function create(id: string): Otel {
+ return new Otel({
+ trace_id: id,
+ dropped_attributes_count: 0,
+ dropped_events_count: 0,
+ dropped_links_count: 0,
+ });
+}
+
+export const otel = {
+ create,
+};
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/otel/metric.ts b/packages/kbn-apm-synthtrace-client/src/lib/otel/metric.ts
new file mode 100644
index 000000000000..2f238b36c5ac
--- /dev/null
+++ b/packages/kbn-apm-synthtrace-client/src/lib/otel/metric.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { OtelDocument } from '.';
+import { Serializable } from '../serializable';
+
+export interface OtelMetricDocument extends OtelDocument {
+ attributes?: {
+ 'metricset.name'?: string;
+ 'processor.event'?: string;
+ 'event.outcome'?: string;
+ 'service.target.name'?: string;
+ 'service.target.type'?: string;
+ 'span.name'?: string;
+ 'span.destination.service.resource'?: string;
+ };
+ metrics?: {
+ service_summary?: number;
+ };
+}
+export class OtelMetric extends Serializable {
+ constructor(fields: OtelMetricDocument) {
+ super({
+ ...fields,
+ });
+ }
+}
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/otel/transaction.ts b/packages/kbn-apm-synthtrace-client/src/lib/otel/transaction.ts
new file mode 100644
index 000000000000..d6f7c7111b18
--- /dev/null
+++ b/packages/kbn-apm-synthtrace-client/src/lib/otel/transaction.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { OtelDocument } from '.';
+import { Serializable } from '../serializable';
+
+export interface OtelTransactionDocument extends OtelDocument {
+ attributes?: {
+ 'event.outcome'?: string;
+ 'event.success_count'?: number;
+ 'processor.event'?: string;
+ 'timestamp.us'?: number;
+ 'transaction.duration.us'?: number;
+ 'transaction.id'?: string;
+ 'transaction.name'?: string;
+ 'transaction.representative_count'?: number;
+ 'transaction.result'?: string;
+ 'transaction.root'?: boolean;
+ 'transaction.sampled'?: boolean;
+ 'transaction.type'?: string;
+ };
+ status?: {
+ code?: string;
+ };
+ dropped_events_count?: number;
+ dropped_links_count?: number;
+ duration?: number;
+ kind?: string;
+ name?: string;
+}
+
+export class OtelTransaction extends Serializable {
+ constructor(fields: OtelTransactionDocument) {
+ super({
+ ...fields,
+ });
+ }
+}
diff --git a/packages/kbn-apm-synthtrace/index.ts b/packages/kbn-apm-synthtrace/index.ts
index b717b9a45af9..1eaab89a8930 100644
--- a/packages/kbn-apm-synthtrace/index.ts
+++ b/packages/kbn-apm-synthtrace/index.ts
@@ -15,8 +15,9 @@ export { InfraSynthtraceEsClient } from './src/lib/infra/infra_synthtrace_es_cli
export { InfraSynthtraceKibanaClient } from './src/lib/infra/infra_synthtrace_kibana_client';
export { MonitoringSynthtraceEsClient } from './src/lib/monitoring/monitoring_synthtrace_es_client';
export { LogsSynthtraceEsClient } from './src/lib/logs/logs_synthtrace_es_client';
-export { AssetsSynthtraceEsClient } from './src/lib/assets/assets_synthtrace_es_client';
+export { EntitiesSynthtraceEsClient } from './src/lib/entities/entities_synthtrace_es_client';
export { SyntheticsSynthtraceEsClient } from './src/lib/synthetics/synthetics_synthtrace_es_client';
+export { OtelSynthtraceEsClient } from './src/lib/otel/otel_synthtrace_es_client';
export {
addObserverVersionTransform,
deleteSummaryFieldTransform,
diff --git a/packages/kbn-apm-synthtrace/src/cli/scenario.ts b/packages/kbn-apm-synthtrace/src/cli/scenario.ts
index 85b0ee56fc9e..09bed89648f8 100644
--- a/packages/kbn-apm-synthtrace/src/cli/scenario.ts
+++ b/packages/kbn-apm-synthtrace/src/cli/scenario.ts
@@ -13,18 +13,25 @@ import {
InfraSynthtraceEsClient,
LogsSynthtraceEsClient,
SyntheticsSynthtraceEsClient,
+ OtelSynthtraceEsClient,
+ EntitiesSynthtraceEsClient,
} from '../..';
-import { AssetsSynthtraceEsClient } from '../lib/assets/assets_synthtrace_es_client';
import { Logger } from '../lib/utils/create_logger';
import { ScenarioReturnType } from '../lib/utils/with_client';
import { RunOptions } from './utils/parse_run_cli_flags';
+import { EntitiesSynthtraceKibanaClient } from '../lib/apm/client/entities_synthtrace_kibana_client';
interface EsClients {
apmEsClient: ApmSynthtraceEsClient;
logsEsClient: LogsSynthtraceEsClient;
infraEsClient: InfraSynthtraceEsClient;
- assetsEsClient: AssetsSynthtraceEsClient;
syntheticsEsClient: SyntheticsSynthtraceEsClient;
+ otelEsClient: OtelSynthtraceEsClient;
+ entitiesEsClient: EntitiesSynthtraceEsClient;
+}
+
+interface KibanaClients {
+ entitiesKibanaClient: EntitiesSynthtraceKibanaClient;
}
type Generate = (options: {
@@ -33,6 +40,6 @@ type Generate = (options: {
}) => ScenarioReturnType | Array>;
export type Scenario = (options: RunOptions & { logger: Logger }) => Promise<{
- bootstrap?: (options: EsClients) => Promise;
+ bootstrap?: (options: EsClients & KibanaClients) => Promise;
generate: Generate;
}>;
diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/bootstrap.ts b/packages/kbn-apm-synthtrace/src/cli/utils/bootstrap.ts
index 6c6b065dabfc..a305e4354c14 100644
--- a/packages/kbn-apm-synthtrace/src/cli/utils/bootstrap.ts
+++ b/packages/kbn-apm-synthtrace/src/cli/utils/bootstrap.ts
@@ -14,8 +14,10 @@ import { getInfraEsClient } from './get_infra_es_client';
import { getKibanaClient } from './get_kibana_client';
import { getServiceUrls } from './get_service_urls';
import { RunOptions } from './parse_run_cli_flags';
-import { getAssetsEsClient } from './get_assets_es_client';
import { getSyntheticsEsClient } from './get_synthetics_es_client';
+import { getOtelSynthtraceEsClient } from './get_otel_es_client';
+import { getEntitiesEsClient } from './get_entities_es_client';
+import { getEntitiesKibanaClient } from './get_entites_kibana_client';
export async function bootstrap(runOptions: RunOptions) {
const logger = createLogger(runOptions.logLevel);
@@ -57,24 +59,35 @@ export async function bootstrap(runOptions: RunOptions) {
concurrency: runOptions.concurrency,
});
- const assetsEsClient = getAssetsEsClient({
+ const entitiesEsClient = getEntitiesEsClient({
target: esUrl,
logger,
concurrency: runOptions.concurrency,
});
+ const entitiesKibanaClient = getEntitiesKibanaClient({
+ target: kibanaUrl,
+ logger,
+ });
+
const syntheticsEsClient = getSyntheticsEsClient({
target: esUrl,
logger,
concurrency: runOptions.concurrency,
});
+ const otelEsClient = getOtelSynthtraceEsClient({
+ target: esUrl,
+ logger,
+ concurrency: runOptions.concurrency,
+ });
if (runOptions.clean) {
await apmEsClient.clean();
await logsEsClient.clean();
await infraEsClient.clean();
- await assetsEsClient.clean();
+ await entitiesEsClient.clean();
await syntheticsEsClient.clean();
+ await otelEsClient.clean();
}
return {
@@ -82,10 +95,12 @@ export async function bootstrap(runOptions: RunOptions) {
apmEsClient,
logsEsClient,
infraEsClient,
- assetsEsClient,
+ entitiesEsClient,
syntheticsEsClient,
+ otelEsClient,
version,
kibanaUrl,
esUrl,
+ entitiesKibanaClient,
};
}
diff --git a/packages/kbn-spec-to-console/lib/convert/parts.js b/packages/kbn-apm-synthtrace/src/cli/utils/get_entites_kibana_client.ts
similarity index 56%
rename from packages/kbn-spec-to-console/lib/convert/parts.js
rename to packages/kbn-apm-synthtrace/src/cli/utils/get_entites_kibana_client.ts
index 475069cdf043..e89a4beaf3a0 100644
--- a/packages/kbn-spec-to-console/lib/convert/parts.js
+++ b/packages/kbn-apm-synthtrace/src/cli/utils/get_entites_kibana_client.ts
@@ -7,18 +7,14 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-const replacePattern = require('../replace_pattern');
+import { EntitiesSynthtraceKibanaClient } from '../../lib/apm/client/entities_synthtrace_kibana_client';
+import { Logger } from '../../lib/utils/create_logger';
-module.exports = (parts) => {
- const result = {};
- Object.keys(parts).forEach((part) => {
- const key = replacePattern(part);
- const options = parts[part].options;
- if (options && options.length) {
- result[key] = options.sort();
- } else {
- result[key] = null;
- }
+export function getEntitiesKibanaClient({ target, logger }: { target: string; logger: Logger }) {
+ const kibanaClient = new EntitiesSynthtraceKibanaClient({
+ logger,
+ target,
});
- return result;
-};
+
+ return kibanaClient;
+}
diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/get_assets_es_client.ts b/packages/kbn-apm-synthtrace/src/cli/utils/get_entities_es_client.ts
similarity index 84%
rename from packages/kbn-apm-synthtrace/src/cli/utils/get_assets_es_client.ts
rename to packages/kbn-apm-synthtrace/src/cli/utils/get_entities_es_client.ts
index 9f30e40fab73..b52908b47055 100644
--- a/packages/kbn-apm-synthtrace/src/cli/utils/get_assets_es_client.ts
+++ b/packages/kbn-apm-synthtrace/src/cli/utils/get_entities_es_client.ts
@@ -8,12 +8,12 @@
*/
import { Client } from '@elastic/elasticsearch';
-import { AssetsSynthtraceEsClient } from '../../lib/assets/assets_synthtrace_es_client';
+import { EntitiesSynthtraceEsClient } from '../../lib/entities/entities_synthtrace_es_client';
import { Logger } from '../../lib/utils/create_logger';
import { RunOptions } from './parse_run_cli_flags';
import { getEsClientTlsSettings } from './ssl';
-export function getAssetsEsClient({
+export function getEntitiesEsClient({
target,
logger,
concurrency,
@@ -26,7 +26,7 @@ export function getAssetsEsClient({
tls: getEsClientTlsSettings(target),
});
- return new AssetsSynthtraceEsClient({
+ return new EntitiesSynthtraceEsClient({
client,
logger,
concurrency,
diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/get_otel_es_client.ts b/packages/kbn-apm-synthtrace/src/cli/utils/get_otel_es_client.ts
new file mode 100644
index 000000000000..0671ea66c472
--- /dev/null
+++ b/packages/kbn-apm-synthtrace/src/cli/utils/get_otel_es_client.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { Client } from '@elastic/elasticsearch';
+import { Logger } from '../../lib/utils/create_logger';
+import { RunOptions } from './parse_run_cli_flags';
+import { getEsClientTlsSettings } from './ssl';
+import { OtelSynthtraceEsClient } from '../../lib/otel/otel_synthtrace_es_client';
+
+export function getOtelSynthtraceEsClient({
+ target,
+ logger,
+ concurrency,
+}: Pick & {
+ target: string;
+ logger: Logger;
+}) {
+ const client = new Client({
+ node: target,
+ tls: getEsClientTlsSettings(target),
+ });
+
+ return new OtelSynthtraceEsClient({
+ client,
+ logger,
+ concurrency,
+ });
+}
diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/start_historical_data_upload.ts b/packages/kbn-apm-synthtrace/src/cli/utils/start_historical_data_upload.ts
index 433f58041ef2..0f0d20c6865a 100644
--- a/packages/kbn-apm-synthtrace/src/cli/utils/start_historical_data_upload.ts
+++ b/packages/kbn-apm-synthtrace/src/cli/utils/start_historical_data_upload.ts
@@ -26,7 +26,7 @@ export async function startHistoricalDataUpload({
from: Date;
to: Date;
}) {
- const { logger, esUrl, version } = await bootstrap(runOptions);
+ const { logger, esUrl, version, kibanaUrl } = await bootstrap(runOptions);
const cores = cpus().length;
@@ -93,6 +93,7 @@ export async function startHistoricalDataUpload({
workerId: workerIndex.toString(),
esUrl,
version,
+ kibanaUrl,
};
const worker = new Worker(Path.join(__dirname, './worker.js'), {
workerData,
diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/start_live_data_upload.ts b/packages/kbn-apm-synthtrace/src/cli/utils/start_live_data_upload.ts
index 90fa0189469a..38404be15161 100644
--- a/packages/kbn-apm-synthtrace/src/cli/utils/start_live_data_upload.ts
+++ b/packages/kbn-apm-synthtrace/src/cli/utils/start_live_data_upload.ts
@@ -26,11 +26,31 @@ export async function startLiveDataUpload({
}) {
const file = runOptions.file;
- const { logger, apmEsClient, logsEsClient, infraEsClient, assetsEsClient, syntheticsEsClient } =
- await bootstrap(runOptions);
+ const {
+ logger,
+ apmEsClient,
+ logsEsClient,
+ infraEsClient,
+ syntheticsEsClient,
+ otelEsClient,
+ entitiesEsClient,
+ entitiesKibanaClient,
+ } = await bootstrap(runOptions);
const scenario = await getScenario({ file, logger });
- const { generate } = await scenario({ ...runOptions, logger });
+ const { generate, bootstrap: scenarioBootsrap } = await scenario({ ...runOptions, logger });
+
+ if (scenarioBootsrap) {
+ await scenarioBootsrap({
+ apmEsClient,
+ logsEsClient,
+ infraEsClient,
+ otelEsClient,
+ syntheticsEsClient,
+ entitiesEsClient,
+ entitiesKibanaClient,
+ });
+ }
const bucketSizeInMs = 1000 * 60;
let requestedUntil = start;
@@ -65,7 +85,14 @@ export async function startLiveDataUpload({
const generatorsAndClients = generate({
range: timerange(bucketFrom.getTime(), bucketTo.getTime()),
- clients: { logsEsClient, apmEsClient, infraEsClient, assetsEsClient, syntheticsEsClient },
+ clients: {
+ logsEsClient,
+ apmEsClient,
+ infraEsClient,
+ entitiesEsClient,
+ syntheticsEsClient,
+ otelEsClient,
+ },
});
const generatorsAndClientsArray = castArray(generatorsAndClients);
diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/synthtrace_worker.ts b/packages/kbn-apm-synthtrace/src/cli/utils/synthtrace_worker.ts
index a5defe4b6e1b..72644bd8f110 100644
--- a/packages/kbn-apm-synthtrace/src/cli/utils/synthtrace_worker.ts
+++ b/packages/kbn-apm-synthtrace/src/cli/utils/synthtrace_worker.ts
@@ -7,19 +7,21 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import { parentPort, workerData } from 'worker_threads';
-import pidusage from 'pidusage';
+import { timerange } from '@kbn/apm-synthtrace-client';
import { castArray } from 'lodash';
+import pidusage from 'pidusage';
import { memoryUsage } from 'process';
-import { timerange } from '@kbn/apm-synthtrace-client';
+import { parentPort, workerData } from 'worker_threads';
import { getApmEsClient } from './get_apm_es_client';
+import { getEntitiesKibanaClient } from './get_entites_kibana_client';
+import { getEntitiesEsClient } from './get_entities_es_client';
+import { getInfraEsClient } from './get_infra_es_client';
+import { getLogsEsClient } from './get_logs_es_client';
+import { getOtelSynthtraceEsClient } from './get_otel_es_client';
import { getScenario } from './get_scenario';
+import { getSyntheticsEsClient } from './get_synthetics_es_client';
import { loggerProxy } from './logger_proxy';
import { RunOptions } from './parse_run_cli_flags';
-import { getLogsEsClient } from './get_logs_es_client';
-import { getInfraEsClient } from './get_infra_es_client';
-import { getAssetsEsClient } from './get_assets_es_client';
-import { getSyntheticsEsClient } from './get_synthetics_es_client';
export interface WorkerData {
bucketFrom: Date;
@@ -28,18 +30,24 @@ export interface WorkerData {
workerId: string;
esUrl: string;
version: string;
+ kibanaUrl: string;
}
-const { bucketFrom, bucketTo, runOptions, esUrl, version } = workerData as WorkerData;
+const { bucketFrom, bucketTo, runOptions, esUrl, version, kibanaUrl } = workerData as WorkerData;
async function start() {
const logger = loggerProxy;
- const assetsEsClient = getAssetsEsClient({
+ const entitiesEsClient = getEntitiesEsClient({
concurrency: runOptions.concurrency,
target: esUrl,
logger,
});
+ const entitiesKibanaClient = getEntitiesKibanaClient({
+ target: kibanaUrl,
+ logger,
+ });
+
const apmEsClient = getApmEsClient({
concurrency: runOptions.concurrency,
target: esUrl,
@@ -65,6 +73,12 @@ async function start() {
logger,
});
+ const otelEsClient = getOtelSynthtraceEsClient({
+ concurrency: runOptions.concurrency,
+ target: esUrl,
+ logger,
+ });
+
const file = runOptions.file;
const scenario = await logger.perf('get_scenario', () => getScenario({ file, logger }));
@@ -78,8 +92,10 @@ async function start() {
apmEsClient,
logsEsClient,
infraEsClient,
- assetsEsClient,
syntheticsEsClient,
+ otelEsClient,
+ entitiesEsClient,
+ entitiesKibanaClient,
});
}
@@ -88,7 +104,14 @@ async function start() {
const generatorsAndClients = logger.perf('generate_scenario', () =>
generate({
range: timerange(bucketFrom, bucketTo),
- clients: { logsEsClient, apmEsClient, infraEsClient, assetsEsClient, syntheticsEsClient },
+ clients: {
+ logsEsClient,
+ apmEsClient,
+ infraEsClient,
+ entitiesEsClient,
+ syntheticsEsClient,
+ otelEsClient,
+ },
})
);
diff --git a/packages/kbn-apm-synthtrace/src/lib/apm/client/apm_synthtrace_kibana_client.ts b/packages/kbn-apm-synthtrace/src/lib/apm/client/apm_synthtrace_kibana_client.ts
index 9533ded24dec..307f43932e94 100644
--- a/packages/kbn-apm-synthtrace/src/lib/apm/client/apm_synthtrace_kibana_client.ts
+++ b/packages/kbn-apm-synthtrace/src/lib/apm/client/apm_synthtrace_kibana_client.ts
@@ -32,24 +32,40 @@ export class ApmSynthtraceKibanaClient {
async fetchLatestApmPackageVersion() {
this.logger.debug(`Fetching latest APM package version`);
- const url = `${this.getFleetApmPackagePath()}?prerelease=true`;
- const response = await fetch(url, {
- method: 'GET',
- headers: kibanaHeaders(),
- agent: getFetchAgent(url),
- });
- const responseJson = await response.json();
+ const fetchPackageVersion = async ({ prerelease }: { prerelease: boolean }) => {
+ const url = `${this.getFleetApmPackagePath()}?prerelease=${prerelease}`;
+ this.logger.debug(`Fetching from URL: ${url}`);
- if (response.status !== 200) {
- throw new Error(
- `Failed to fetch latest APM package version, received HTTP ${response.status} and message: ${responseJson.message}`
- );
- }
+ const response = await fetch(url, {
+ method: 'GET',
+ headers: kibanaHeaders(),
+ agent: getFetchAgent(url),
+ });
+
+ const responseJson = await response.json();
- const { latestVersion } = responseJson.item;
+ if (response.status !== 200) {
+ throw new Error(
+ `Failed to fetch APM package version, received HTTP ${response.status} and message: ${responseJson.message}`
+ );
+ }
+
+ return responseJson.item.latestVersion as string;
+ };
- return latestVersion as string;
+ try {
+ return await fetchPackageVersion({ prerelease: true });
+ } catch (error) {
+ this.logger.debug(
+ 'Fetching latestes prerelease version failed, retrying with latest GA version'
+ );
+ const retryResult = await fetchPackageVersion({ prerelease: false }).catch((retryError) => {
+ throw retryError;
+ });
+
+ return retryResult;
+ }
}
async installApmPackage(packageVersion?: string) {
diff --git a/packages/kbn-apm-synthtrace/src/lib/apm/client/entities_synthtrace_kibana_client.ts b/packages/kbn-apm-synthtrace/src/lib/apm/client/entities_synthtrace_kibana_client.ts
new file mode 100644
index 000000000000..358a66570c9b
--- /dev/null
+++ b/packages/kbn-apm-synthtrace/src/lib/apm/client/entities_synthtrace_kibana_client.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import fetch from 'node-fetch';
+import { Logger } from '../../utils/create_logger';
+import { kibanaHeaders } from '../../shared/client_headers';
+import { getFetchAgent } from '../../../cli/utils/ssl';
+
+interface EntityDefinitionResponse {
+ definitions: Array<{ type: string; state: { installed: boolean; running: boolean } }>;
+}
+
+export class EntitiesSynthtraceKibanaClient {
+ private readonly logger: Logger;
+ private target: string;
+
+ constructor(options: { logger: Logger; target: string }) {
+ this.logger = options.logger;
+ this.target = options.target;
+ }
+
+ async installEntityIndexPatterns() {
+ const url = `${this.target}/internal/entities/definition?includeState=true`;
+ const response = await fetch(url, {
+ method: 'GET',
+ headers: kibanaHeaders(),
+ agent: getFetchAgent(url),
+ });
+ const entityDefinition: EntityDefinitionResponse = await response.json();
+
+ const hasEntityDefinitionsInstalled = entityDefinition.definitions.find(
+ (definition) => definition.type === 'service'
+ )?.state.installed;
+
+ if (hasEntityDefinitionsInstalled === true) {
+ this.logger.debug('Entity definitions are already defined');
+ } else {
+ this.logger.debug('Installing Entity definitions');
+ const entityEnablementUrl = `${this.target}/internal/entities/managed/enablement?installOnly=true`;
+ await fetch(entityEnablementUrl, {
+ method: 'PUT',
+ headers: kibanaHeaders(),
+ agent: getFetchAgent(url),
+ });
+ }
+ }
+
+ async uninstallEntityIndexPatterns() {
+ const url = `${this.target}/internal/entities/managed/enablement`;
+ await fetch(url, {
+ method: 'DELETE',
+ headers: kibanaHeaders(),
+ agent: getFetchAgent(url),
+ });
+ }
+}
diff --git a/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_logs_assets_aggregator.ts b/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_logs_assets_aggregator.ts
deleted file mode 100644
index 3dc71a6e9aec..000000000000
--- a/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_logs_assets_aggregator.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { LogDocument } from '@kbn/apm-synthtrace-client';
-import { createAssetsAggregatorFactory } from '../../utils/create_assets_aggregator_factory';
-
-export const createLogsAssetsAggregator = createAssetsAggregatorFactory();
diff --git a/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_logs_service_assets_aggregator.ts b/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_logs_service_assets_aggregator.ts
deleted file mode 100644
index 71ece2d4367d..000000000000
--- a/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_logs_service_assets_aggregator.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { hashKeysOf, LogDocument } from '@kbn/apm-synthtrace-client';
-import { ServiceAssetDocument } from '@kbn/apm-synthtrace-client/src/lib/assets/service_assets';
-import { identity, noop } from 'lodash';
-import { createLogsAssetsAggregator } from './create_logs_assets_aggregator';
-
-const KEY_FIELDS: Array = ['service.name'];
-
-export function createLogsServiceAssetsAggregator() {
- return createLogsAssetsAggregator(
- {
- filter: (event) => event['input.type'] === 'logs',
- getAggregateKey: (event) => {
- // see https://github.com/elastic/apm-server/blob/main/x-pack/apm-server/aggregation/txmetrics/aggregator.go
- return hashKeysOf(event as LogDocument, KEY_FIELDS as Array);
- },
- init: (event, firstSeen, lastSeen) => {
- return {
- 'asset.id': event['service.name']!,
- 'asset.type': 'service',
- 'asset.identifying_metadata': ['service.name'],
- 'asset.first_seen': firstSeen,
- 'asset.last_seen': lastSeen,
- 'asset.signalTypes': {
- 'asset.logs': true,
- },
- 'service.name': event['service.name']!,
- };
- },
- },
- noop,
- identity
- );
-}
diff --git a/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_traces_assets_aggregator.ts b/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_traces_assets_aggregator.ts
deleted file mode 100644
index dd173b97785e..000000000000
--- a/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_traces_assets_aggregator.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { ApmFields } from '@kbn/apm-synthtrace-client';
-import { createAssetsAggregatorFactory } from '../../utils/create_assets_aggregator_factory';
-
-export const createTracesAssetsAggregator = createAssetsAggregatorFactory();
diff --git a/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_traces_service_assets_aggregator.ts b/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_traces_service_assets_aggregator.ts
deleted file mode 100644
index ab2e6a4cd950..000000000000
--- a/packages/kbn-apm-synthtrace/src/lib/assets/aggregators/create_traces_service_assets_aggregator.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { ApmFields, hashKeysOf } from '@kbn/apm-synthtrace-client';
-import { ServiceAssetDocument } from '@kbn/apm-synthtrace-client/src/lib/assets/service_assets';
-import { identity, noop } from 'lodash';
-import { createTracesAssetsAggregator } from './create_traces_assets_aggregator';
-
-const KEY_FIELDS: Array = ['service.name'];
-
-export function createTracesServiceAssetsAggregator() {
- return createTracesAssetsAggregator(
- {
- filter: (event) => event['processor.event'] === 'transaction',
- getAggregateKey: (event) => {
- // see https://github.com/elastic/apm-server/blob/main/x-pack/apm-server/aggregation/txmetrics/aggregator.go
- return hashKeysOf(event as ApmFields, KEY_FIELDS as Array);
- },
- init: (event, firstSeen, lastSeen) => {
- return {
- 'asset.id': event['service.name']!,
- 'asset.type': 'service',
- 'asset.identifying_metadata': ['service.name'],
- 'asset.first_seen': firstSeen,
- 'asset.last_seen': lastSeen,
- 'asset.signalTypes': {
- 'asset.traces': true,
- },
- 'service.environment': event['service.environment'],
- 'service.name': event['service.name']!,
- 'service.node.name': event['service.node.name'],
- 'service.language.name': event['service.language.name'],
- };
- },
- },
- noop,
- identity
- );
-}
diff --git a/packages/kbn-apm-synthtrace/src/lib/assets/assets_synthtrace_es_client.ts b/packages/kbn-apm-synthtrace/src/lib/assets/assets_synthtrace_es_client.ts
deleted file mode 100644
index c01653c6e7ee..000000000000
--- a/packages/kbn-apm-synthtrace/src/lib/assets/assets_synthtrace_es_client.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { Client } from '@elastic/elasticsearch';
-import {
- ApmFields,
- AssetDocument,
- ESDocumentWithOperation,
- LogDocument,
-} from '@kbn/apm-synthtrace-client';
-import { merge } from 'lodash';
-import { PassThrough, pipeline, Readable, Transform } from 'stream';
-import { SynthtraceEsClient, SynthtraceEsClientOptions } from '../shared/base_client';
-import { getDedotTransform } from '../shared/get_dedot_transform';
-import { getSerializeTransform } from '../shared/get_serialize_transform';
-import { Logger } from '../utils/create_logger';
-import { fork } from '../utils/stream_utils';
-import { createLogsServiceAssetsAggregator } from './aggregators/create_logs_service_assets_aggregator';
-import { createTracesServiceAssetsAggregator } from './aggregators/create_traces_service_assets_aggregator';
-
-export type AssetsSynthtraceEsClientOptions = Omit;
-
-export class AssetsSynthtraceEsClient extends SynthtraceEsClient {
- constructor(options: { client: Client; logger: Logger } & AssetsSynthtraceEsClientOptions) {
- super({
- ...options,
- pipeline: assetsPipeline(),
- });
- this.indices = ['assets'];
- }
-}
-
-function assetsPipeline() {
- return (base: Readable) => {
- const aggregators = [
- createTracesServiceAssetsAggregator(),
- createLogsServiceAssetsAggregator(),
- ];
- return pipeline(
- base,
- getSerializeTransform(),
- fork(new PassThrough({ objectMode: true }), ...aggregators),
- getAssetsFilterTransform(),
- getMergeAssetsTransform(),
- getRoutingTransform(),
- getDedotTransform(),
- (err: unknown) => {
- if (err) {
- throw err;
- }
- }
- );
- };
-}
-
-function getAssetsFilterTransform() {
- return new Transform({
- objectMode: true,
- transform(
- document: ESDocumentWithOperation,
- encoding,
- callback
- ) {
- if ('asset.id' in document) {
- callback(null, document);
- } else {
- callback();
- }
- },
- });
-}
-
-function getMergeAssetsTransform() {
- const mergedDocuments: Record = {};
- return new Transform({
- objectMode: true,
- transform(nextDocument: ESDocumentWithOperation, encoding, callback) {
- const assetId = nextDocument['asset.id'];
- if (!mergedDocuments[assetId]) {
- mergedDocuments[assetId] = { ...nextDocument };
- } else {
- const mergedDocument = mergedDocuments[assetId];
- mergedDocument['asset.signalTypes'] = merge(
- mergedDocument['asset.signalTypes'],
- nextDocument['asset.signalTypes']
- );
- }
- callback();
- },
- flush(callback) {
- Object.values(mergedDocuments).forEach((item) => this.push(item));
- callback();
- },
- });
-}
-
-function getRoutingTransform() {
- return new Transform({
- objectMode: true,
- transform(document: ESDocumentWithOperation, encoding, callback) {
- if ('asset.type' in document) {
- document._index = `assets`;
- } else {
- throw new Error(`Cannot determine index for event ${JSON.stringify(document)}`);
- }
-
- callback(null, document);
- },
- });
-}
diff --git a/packages/kbn-apm-synthtrace/src/lib/entities/entities_synthtrace_es_client.ts b/packages/kbn-apm-synthtrace/src/lib/entities/entities_synthtrace_es_client.ts
new file mode 100644
index 000000000000..ea9c7a7f0e4a
--- /dev/null
+++ b/packages/kbn-apm-synthtrace/src/lib/entities/entities_synthtrace_es_client.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { Client } from '@elastic/elasticsearch';
+import { EntityFields, ESDocumentWithOperation } from '@kbn/apm-synthtrace-client';
+import { pipeline, Readable, Transform } from 'stream';
+import { SynthtraceEsClient, SynthtraceEsClientOptions } from '../shared/base_client';
+import { getDedotTransform } from '../shared/get_dedot_transform';
+import { getSerializeTransform } from '../shared/get_serialize_transform';
+import { Logger } from '../utils/create_logger';
+
+export type EntitiesSynthtraceEsClientOptions = Omit;
+
+export class EntitiesSynthtraceEsClient extends SynthtraceEsClient {
+ constructor(options: { client: Client; logger: Logger } & EntitiesSynthtraceEsClientOptions) {
+ super({
+ ...options,
+ pipeline: entitiesPipeline(),
+ });
+ this.indices = ['.entities.v1.latest.builtin*'];
+ }
+}
+
+function entitiesPipeline() {
+ return (base: Readable) => {
+ return pipeline(
+ base,
+ getSerializeTransform(),
+ lastSeenTimestampTransform(),
+ getRoutingTransform(),
+ getDedotTransform(),
+ (err: unknown) => {
+ if (err) {
+ throw err;
+ }
+ }
+ );
+ };
+}
+
+function lastSeenTimestampTransform() {
+ return new Transform({
+ objectMode: true,
+ transform(document: ESDocumentWithOperation, encoding, callback) {
+ const timestamp = document['@timestamp'];
+ if (timestamp) {
+ const isoString = new Date(timestamp).toISOString();
+ document['entity.lastSeenTimestamp'] = isoString;
+ document['event.ingested'] = isoString;
+ delete document['@timestamp'];
+ }
+ callback(null, document);
+ },
+ });
+}
+
+function getRoutingTransform() {
+ return new Transform({
+ objectMode: true,
+ transform(document: ESDocumentWithOperation, encoding, callback) {
+ const entityType: string | undefined = document['entity.type'];
+ if (entityType === undefined) {
+ throw new Error(`entity.type was not defined: ${JSON.stringify(document)}`);
+ }
+ const entityIndexName = `${entityType}s`;
+ document._action = {
+ index: {
+ _index: `.entities.v1.latest.builtin_${entityIndexName}_from_ecs_data`,
+ _id: document['entity.id'],
+ },
+ };
+
+ callback(null, document);
+ },
+ });
+}
diff --git a/packages/kbn-apm-synthtrace/src/lib/logs/logs_synthtrace_es_client.ts b/packages/kbn-apm-synthtrace/src/lib/logs/logs_synthtrace_es_client.ts
index 9673d1678132..9e10bd538863 100644
--- a/packages/kbn-apm-synthtrace/src/lib/logs/logs_synthtrace_es_client.ts
+++ b/packages/kbn-apm-synthtrace/src/lib/logs/logs_synthtrace_es_client.ts
@@ -48,6 +48,33 @@ export class LogsSynthtraceEsClient extends SynthtraceEsClient {
}
}
+ async createComponentTemplate(name: string, mappings: MappingTypeMapping) {
+ const isTemplateExisting = await this.client.cluster.existsComponentTemplate({ name });
+
+ if (isTemplateExisting) return this.logger.info(`Component template already exists: ${name}`);
+
+ try {
+ await this.client.cluster.putComponentTemplate({
+ name,
+ template: {
+ mappings,
+ },
+ });
+ this.logger.info(`Component template successfully created: ${name}`);
+ } catch (err) {
+ this.logger.error(`Component template creation failed: ${name} - ${err.message}`);
+ }
+ }
+
+ async deleteComponentTemplate(name: string) {
+ try {
+ await this.client.cluster.deleteComponentTemplate({ name });
+ this.logger.info(`Component template successfully deleted: ${name}`);
+ } catch (err) {
+ this.logger.error(`Component template deletion failed: ${name} - ${err.message}`);
+ }
+ }
+
async createIndex(index: string, mappings?: MappingTypeMapping) {
try {
const isIndexExisting = await this.client.indices.exists({ index });
diff --git a/packages/kbn-apm-synthtrace/src/lib/otel/otel_synthtrace_es_client.ts b/packages/kbn-apm-synthtrace/src/lib/otel/otel_synthtrace_es_client.ts
new file mode 100644
index 000000000000..e2162925e3c7
--- /dev/null
+++ b/packages/kbn-apm-synthtrace/src/lib/otel/otel_synthtrace_es_client.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { Client } from '@elastic/elasticsearch';
+import { ESDocumentWithOperation } from '@kbn/apm-synthtrace-client';
+import { OtelDocument } from '@kbn/apm-synthtrace-client';
+import { pipeline, Readable, Transform } from 'stream';
+import { SynthtraceEsClient, SynthtraceEsClientOptions } from '../shared/base_client';
+import { getDedotTransform } from '../shared/get_dedot_transform';
+import { getSerializeTransform } from '../shared/get_serialize_transform';
+import { Logger } from '../utils/create_logger';
+
+export type OtelSynthtraceEsClientOptions = Omit;
+
+export class OtelSynthtraceEsClient extends SynthtraceEsClient {
+ constructor(options: { client: Client; logger: Logger } & OtelSynthtraceEsClientOptions) {
+ super({
+ ...options,
+ pipeline: otelPipeline(),
+ });
+ this.dataStreams = ['metrics-generic.otel*', 'traces-generic.otel*', 'logs-generic.otel*'];
+ }
+}
+
+function otelPipeline() {
+ return (base: Readable) => {
+ return pipeline(
+ base,
+ getSerializeTransform(),
+ getRoutingTransform(),
+ getDedotTransform(),
+ (err: unknown) => {
+ if (err) {
+ throw err;
+ }
+ }
+ );
+ };
+}
+
+export function getRoutingTransform() {
+ return new Transform({
+ objectMode: true,
+ transform(document: ESDocumentWithOperation, encoding, callback) {
+ const namespace = 'default';
+ let index: string | undefined;
+
+ switch (document?.attributes?.['processor.event']) {
+ case 'transaction':
+ case 'span':
+ index = `traces-generic.otel-${namespace}-synth`;
+ break;
+
+ case 'error':
+ index = `logs-generic.otel-${namespace}-synth`;
+ break;
+
+ case 'metric':
+ const metricsetName = document?.attributes?.['metricset.name'];
+ if (
+ metricsetName === 'transaction' ||
+ metricsetName === 'service_transaction' ||
+ metricsetName === 'service_destination' ||
+ metricsetName === 'service_summary'
+ ) {
+ index = `metrics-generic.otel.${metricsetName}.${document.attributes[
+ 'metricset.interval'
+ ]!}-${namespace}-synth`;
+ } else {
+ index = `metrics-generic.otel.internal-${namespace}-synth`;
+ }
+ break;
+ default:
+ if (document?.attributes?.['event.action'] != null) {
+ index = `logs-generic.otel-${namespace}-synth`;
+ }
+ break;
+ }
+
+ if (!index) {
+ const error = new Error('Cannot determine index for event');
+ Object.assign(error, { document });
+ }
+
+ document._index = index;
+
+ callback(null, document);
+ },
+ });
+}
diff --git a/packages/kbn-apm-synthtrace/src/lib/shared/base_client.ts b/packages/kbn-apm-synthtrace/src/lib/shared/base_client.ts
index a7bc682697eb..ed6d1b813184 100644
--- a/packages/kbn-apm-synthtrace/src/lib/shared/base_client.ts
+++ b/packages/kbn-apm-synthtrace/src/lib/shared/base_client.ts
@@ -48,11 +48,7 @@ export class SynthtraceEsClient {
}
async clean() {
- this.logger.info(
- `Cleaning data streams "${this.dataStreams.join(',')}" and indices "${this.indices.join(
- ','
- )}"`
- );
+ this.logger.info(`Cleaning data streams: "${this.dataStreams.join(',')}"`);
const resolvedIndices = this.indices.length
? (
@@ -65,6 +61,10 @@ export class SynthtraceEsClient {
).indices.map((index: { name: string }) => index.name)
: [];
+ if (resolvedIndices.length) {
+ this.logger.info(`Cleaning indices: "${resolvedIndices.join(',')}"`);
+ }
+
await Promise.all([
...(this.dataStreams.length
? [
diff --git a/packages/kbn-apm-synthtrace/src/lib/utils/create_assets_aggregator_factory.ts b/packages/kbn-apm-synthtrace/src/lib/utils/create_assets_aggregator_factory.ts
deleted file mode 100644
index fa0c8d315513..000000000000
--- a/packages/kbn-apm-synthtrace/src/lib/utils/create_assets_aggregator_factory.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { appendHash, AssetDocument, Fields } from '@kbn/apm-synthtrace-client';
-import { Duplex, PassThrough } from 'stream';
-
-export function createAssetsAggregatorFactory() {
- return function (
- {
- filter,
- getAggregateKey,
- init,
- }: {
- filter: (event: TFields) => boolean;
- getAggregateKey: (event: TFields) => string;
- init: (event: TFields, firstSeen: string, lastSeen: string) => TAsset;
- },
- reduce: (asset: TAsset, event: TFields) => void,
- serialize: (asset: TAsset) => TAsset
- ) {
- const assets: Map = new Map();
- let toFlush: TAsset[] = [];
- let cb: (() => void) | undefined;
-
- function flush(stream: Duplex, includeCurrentAssets: boolean, callback?: () => void) {
- const allItems = [...toFlush];
-
- toFlush = [];
-
- if (includeCurrentAssets) {
- allItems.push(...assets.values());
- assets.clear();
- }
-
- while (allItems.length) {
- const next = allItems.shift()!;
- const serialized = serialize(next);
- const shouldWriteNext = stream.push(serialized);
- if (!shouldWriteNext) {
- toFlush = allItems;
- cb = callback;
- return;
- }
- }
-
- const next = cb;
- cb = undefined;
- next?.();
- callback?.();
- }
-
- const timeRanges: number[] = [];
-
- return new PassThrough({
- objectMode: true,
- read() {
- flush(this, false, cb);
- },
- final(callback) {
- flush(this, true, callback);
- },
- write(event: TFields, encoding, callback) {
- if (!filter(event)) {
- callback();
- return;
- }
- timeRanges.push(event['@timestamp']!);
- const firstSeen = new Date(Math.min(...timeRanges)).toISOString();
- const lastSeen = new Date(Math.max(...timeRanges)).toISOString();
-
- const key = appendHash(getAggregateKey(event), '');
-
- let asset = assets.get(key);
-
- if (asset) {
- // @ts-ignore
- asset['asset.last_seen'] = lastSeen;
- } else {
- asset = init({ ...event }, firstSeen, lastSeen);
- assets.set(key, asset);
- }
-
- reduce(asset, event);
- callback();
- },
- });
- };
-}
diff --git a/packages/kbn-apm-synthtrace/src/scenarios/otel_simple_trace.ts b/packages/kbn-apm-synthtrace/src/scenarios/otel_simple_trace.ts
new file mode 100644
index 000000000000..7721a8651905
--- /dev/null
+++ b/packages/kbn-apm-synthtrace/src/scenarios/otel_simple_trace.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { otel, generateShortId, OtelDocument } from '@kbn/apm-synthtrace-client';
+import { times } from 'lodash';
+import { Scenario } from '../cli/scenario';
+import { withClient } from '../lib/utils/with_client';
+
+const scenario: Scenario = async (runOptions) => {
+ return {
+ generate: ({ range, clients: { otelEsClient } }) => {
+ const { numOtelTraces = 5 } = runOptions.scenarioOpts || {};
+ const { logger } = runOptions;
+ const traceId = generateShortId();
+ const spanId = generateShortId();
+
+ const otelDocs = times(numOtelTraces / 2).map((index) => otel.create(traceId));
+
+ const otelWithMetricsAndErrors = range
+ .interval('30s')
+ .rate(1)
+ .generator((timestamp) =>
+ otelDocs.flatMap((oteld) => {
+ return [
+ oteld.metric().timestamp(timestamp),
+ oteld.transaction(spanId).timestamp(timestamp),
+ oteld.error(spanId).timestamp(timestamp),
+ ];
+ })
+ );
+
+ return [
+ withClient(
+ otelEsClient,
+ logger.perf('generating_otel_trace', () => otelWithMetricsAndErrors)
+ ),
+ ];
+ },
+ };
+};
+
+export default scenario;
diff --git a/packages/kbn-apm-synthtrace/src/scenarios/traces_logs_assets.ts b/packages/kbn-apm-synthtrace/src/scenarios/traces_logs_entities.ts
similarity index 63%
rename from packages/kbn-apm-synthtrace/src/scenarios/traces_logs_assets.ts
rename to packages/kbn-apm-synthtrace/src/scenarios/traces_logs_entities.ts
index d7b22b11bb4c..2e860a525c60 100644
--- a/packages/kbn-apm-synthtrace/src/scenarios/traces_logs_assets.ts
+++ b/packages/kbn-apm-synthtrace/src/scenarios/traces_logs_entities.ts
@@ -9,72 +9,54 @@
import {
apm,
- ApmFields,
generateLongId,
generateShortId,
- infra,
Instance,
log,
- Serializable,
+ entities,
+ EntityFields,
} from '@kbn/apm-synthtrace-client';
-import { random } from 'lodash';
import { Readable } from 'stream';
import { Scenario } from '../cli/scenario';
-import { IndexTemplateName } from '../lib/logs/custom_logsdb_index_templates';
import { getSynthtraceEnvironment } from '../lib/utils/get_synthtrace_environment';
import { withClient } from '../lib/utils/with_client';
import { parseLogsScenarioOpts } from './helpers/logs_scenario_opts_parser';
+import { IndexTemplateName } from '../lib/logs/custom_logsdb_index_templates';
const ENVIRONMENT = getSynthtraceEnvironment(__filename);
-const scenario: Scenario = async (runOptions) => {
- const { logger, scenarioOpts } = runOptions;
- const { numServices = 3, numHosts = 10 } = runOptions.scenarioOpts || {};
- const { isLogsDb } = parseLogsScenarioOpts(scenarioOpts);
+const MESSAGE_LOG_LEVELS = [
+ { message: 'A simple log with something random in the middle', level: 'info' },
+ { message: 'Yet another debug log', level: 'debug' },
+ { message: 'Error with certificate: "ca_trusted_fingerprint"', level: 'error' },
+];
+
+const SYNTH_JAVA_TRACE_ENTITY_ID = generateShortId();
+const SYNTH_NODE_TRACES_LOGS_ENTITY_ID = generateShortId();
+const SYNTH_GO_LOGS_ENTITY_ID = generateShortId();
+
+const scenario: Scenario> = async (runOptions) => {
+ const { logger } = runOptions;
+ const { isLogsDb } = parseLogsScenarioOpts(runOptions.scenarioOpts);
return {
- bootstrap: async ({ logsEsClient }) => {
+ bootstrap: async ({ entitiesKibanaClient, logsEsClient }) => {
+ await entitiesKibanaClient.installEntityIndexPatterns();
if (isLogsDb) await logsEsClient.createIndexTemplate(IndexTemplateName.LogsDb);
},
- generate: ({
- range,
- clients: { apmEsClient, assetsEsClient, logsEsClient, infraEsClient },
- }) => {
+ generate: ({ range, clients: { entitiesEsClient, logsEsClient, apmEsClient } }) => {
const transactionName = '240rpm/75% 1000ms';
+ const entityHistoryTimestamps = range.interval('1m').rate(1);
const successfulTimestamps = range.interval('1m').rate(1);
const failedTimestamps = range.interval('1m').rate(1);
- const serviceNames = [...Array(numServices).keys()].map((index) => `apm-only-${index}`);
- serviceNames.push('multi-signal-service');
- const HOSTS = Array(numHosts)
- .fill(0)
- .map((_, idx) => infra.host(`my-host-${idx}`));
-
- const hosts = range
- .interval('30s')
- .rate(1)
- .generator((timestamp) =>
- HOSTS.flatMap((host) => [
- host.cpu().timestamp(timestamp),
- host.memory().timestamp(timestamp),
- host.network().timestamp(timestamp),
- host.load().timestamp(timestamp),
- host.filesystem().timestamp(timestamp),
- host.diskio().timestamp(timestamp),
- ])
- );
- const instances = serviceNames.map((serviceName) =>
- apm
- .service({ name: serviceName, environment: ENVIRONMENT, agentName: 'nodejs' })
- .instance('instance')
- );
- const instanceSpans = (instance: Instance, index: number) => {
+ const instanceSpans = (instance: Instance) => {
const successfulTraceEvents = successfulTimestamps.generator((timestamp) =>
instance
.transaction({ transactionName })
.timestamp(timestamp)
- .duration(random(100, (index % 4) * 1000, false))
+ .duration(1000)
.success()
.children(
instance
@@ -128,13 +110,25 @@ const scenario: Scenario = async (runOptions) => {
return [...successfulTraceEvents, ...failedTraceEvents, ...metricsets];
};
- const MESSAGE_LOG_LEVELS = [
- { message: 'A simple log with something random in the middle', level: 'info' },
- { message: 'Yet another debug log', level: 'debug' },
- { message: 'Error with certificate: "ca_trusted_fingerprint"', level: 'error' },
- ];
+ const SYNTH_JAVA_TRACE = 'synth-java-trace';
+ const apmOnlyInstance = apm
+ .service({ name: SYNTH_JAVA_TRACE, agentName: 'java', environment: ENVIRONMENT })
+ .instance('intance');
+ const apmOnlyEvents = instanceSpans(apmOnlyInstance);
+ const synthJavaTraces = entities.serviceEntity({
+ serviceName: SYNTH_JAVA_TRACE,
+ agentName: ['java'],
+ dataStreamType: ['traces'],
+ environment: ENVIRONMENT,
+ entityId: SYNTH_JAVA_TRACE_ENTITY_ID,
+ });
- const logsWithTraces = range
+ const SYNTH_NODE_TRACE_LOGS = 'synth-node-trace-logs';
+ const apmAndLogsInstance = apm
+ .service({ name: SYNTH_NODE_TRACE_LOGS, agentName: 'nodejs', environment: ENVIRONMENT })
+ .instance('intance');
+ const apmAndLogsApmEvents = instanceSpans(apmAndLogsInstance);
+ const apmAndLogsLogsEvents = range
.interval('1m')
.rate(1)
.generator((timestamp) => {
@@ -153,14 +147,14 @@ const scenario: Scenario = async (runOptions) => {
.create({ isLogsDb })
.message(message.replace('', generateShortId()))
.logLevel(level)
- .service('multi-signal-service')
+ .service(SYNTH_NODE_TRACE_LOGS)
.defaults({
'trace.id': generateShortId(),
'agent.name': 'nodejs',
'orchestrator.cluster.name': CLUSTER.clusterName,
'orchestrator.cluster.id': CLUSTER.clusterId,
'orchestrator.namespace': CLUSTER.namespace,
- 'container.name': `${serviceNames[0]}-${generateShortId()}`,
+ 'container.name': `${SYNTH_NODE_TRACE_LOGS}-${generateShortId()}`,
'orchestrator.resource.id': generateShortId(),
'cloud.provider': 'gcp',
'cloud.region': 'eu-central-1',
@@ -173,8 +167,16 @@ const scenario: Scenario = async (runOptions) => {
.timestamp(timestamp);
});
});
+ const synthNodeTracesLogs = entities.serviceEntity({
+ serviceName: SYNTH_NODE_TRACE_LOGS,
+ agentName: ['nodejs'],
+ dataStreamType: ['traces', 'logs'],
+ environment: ENVIRONMENT,
+ entityId: SYNTH_NODE_TRACES_LOGS_ENTITY_ID,
+ });
- const logsOnly = range
+ const SYNTH_GO_LOGS = 'synth-go-logs';
+ const logsEvents = range
.interval('1m')
.rate(1)
.generator((timestamp) => {
@@ -193,57 +195,67 @@ const scenario: Scenario = async (runOptions) => {
.create({ isLogsDb })
.message(message.replace('', generateShortId()))
.logLevel(level)
- .service('logs-only-services')
+ .service(SYNTH_GO_LOGS)
.defaults({
'trace.id': generateShortId(),
'agent.name': 'nodejs',
'orchestrator.cluster.name': CLUSTER.clusterName,
'orchestrator.cluster.id': CLUSTER.clusterId,
'orchestrator.namespace': CLUSTER.namespace,
- 'container.name': `logs-only-${generateShortId()}`,
+ 'container.name': `${SYNTH_GO_LOGS}-${generateShortId()}`,
'orchestrator.resource.id': generateShortId(),
'cloud.provider': 'gcp',
'cloud.region': 'eu-central-1',
'cloud.availability_zone': 'eu-central-1a',
+ 'log.level': 'error',
'cloud.project.id': generateShortId(),
'cloud.instance.id': generateShortId(),
'log.file.path': `/logs/${generateLongId()}/error.txt`,
- 'log.level': 'error',
})
.timestamp(timestamp);
});
});
+ const synthGoTraces = entities.serviceEntity({
+ serviceName: SYNTH_GO_LOGS,
+ agentName: ['go'],
+ dataStreamType: ['logs'],
+ environment: ENVIRONMENT,
+ entityId: SYNTH_GO_LOGS_ENTITY_ID,
+ });
- function* createGeneratorFromArray(arr: Array>) {
- yield* arr;
- }
-
- const logsValuesArray = [...logsWithTraces, ...logsOnly];
- const logsGen = createGeneratorFromArray(logsValuesArray);
- const logsGenAssets = createGeneratorFromArray(logsValuesArray);
+ const entitiesEvents = entityHistoryTimestamps.generator((timestamp) => {
+ return [
+ synthNodeTracesLogs.timestamp(timestamp),
+ synthJavaTraces.timestamp(timestamp),
+ synthGoTraces.timestamp(timestamp),
+ ];
+ });
- const traces = instances.flatMap((instance, index) => instanceSpans(instance, index));
- const tracesGen = createGeneratorFromArray(traces);
- const tracesGenAssets = createGeneratorFromArray(traces);
+ const apmPython = apm
+ .service({ name: 'synth-python', agentName: 'python', environment: ENVIRONMENT })
+ .instance('intance');
+ const apmPythonEvents = instanceSpans(apmPython);
return [
withClient(
- assetsEsClient,
- logger.perf('generating_assets_events', () =>
- Readable.from(Array.from(logsGenAssets).concat(Array.from(tracesGenAssets)))
- )
+ entitiesEsClient,
+ logger.perf('generating_entities_events', () => entitiesEvents)
),
withClient(
logsEsClient,
- logger.perf('generating_logs', () => logsGen)
+ logger.perf('generating_logs', () =>
+ Readable.from(Array.from(apmAndLogsLogsEvents).concat(Array.from(logsEvents)))
+ )
),
withClient(
apmEsClient,
- logger.perf('generating_apm_events', () => tracesGen)
- ),
- withClient(
- infraEsClient,
- logger.perf('generating_infra_hosts', () => hosts)
+ logger.perf('generating_apm_events', () =>
+ Readable.from(
+ Array.from(apmOnlyEvents).concat(
+ Array.from(apmAndLogsApmEvents).concat(Array.from(apmPythonEvents))
+ )
+ )
+ )
),
];
},
diff --git a/packages/kbn-apm-types/src/es_fields/apm.ts b/packages/kbn-apm-types/src/es_fields/apm.ts
index 6b0a68379f5d..5d5083316197 100644
--- a/packages/kbn-apm-types/src/es_fields/apm.ts
+++ b/packages/kbn-apm-types/src/es_fields/apm.ts
@@ -7,7 +7,8 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-export const TIMESTAMP = 'timestamp.us';
+export const TIMESTAMP_US = 'timestamp.us';
+export const AT_TIMESTAMP = '@timestamp';
export const AGENT = 'agent';
export const AGENT_NAME = 'agent.name';
export const AGENT_VERSION = 'agent.version';
@@ -21,9 +22,11 @@ export const CLOUD_PROVIDER = 'cloud.provider';
export const CLOUD_REGION = 'cloud.region';
export const CLOUD_MACHINE_TYPE = 'cloud.machine.type';
export const CLOUD_ACCOUNT_ID = 'cloud.account.id';
+export const CLOUD_ACCOUNT_NAME = 'cloud.account.name';
export const CLOUD_INSTANCE_ID = 'cloud.instance.id';
export const CLOUD_INSTANCE_NAME = 'cloud.instance.name';
export const CLOUD_SERVICE_NAME = 'cloud.service.name';
+export const CLOUD_PROJECT_NAME = 'cloud.project.name';
export const EVENT_SUCCESS_COUNT = 'event.success_count';
@@ -48,10 +51,14 @@ export const USER_ID = 'user.id';
export const USER_AGENT_ORIGINAL = 'user_agent.original';
export const USER_AGENT_NAME = 'user_agent.name';
+export const OBSERVER_VERSION = 'observer.version';
+export const OBSERVER_VERSION_MAJOR = 'observer.version_major';
export const OBSERVER_HOSTNAME = 'observer.hostname';
export const OBSERVER_LISTENING = 'observer.listening';
export const PROCESSOR_EVENT = 'processor.event';
+export const PROCESSOR_NAME = 'processor.name';
+export const TRANSACTION_AGENT_MARKS = 'transaction.agent.marks';
export const TRANSACTION_DURATION = 'transaction.duration.us';
export const TRANSACTION_DURATION_HISTOGRAM = 'transaction.duration.histogram';
export const TRANSACTION_DURATION_SUMMARY = 'transaction.duration.summary';
@@ -95,6 +102,7 @@ export const SPAN_COMPOSITE_SUM = 'span.composite.sum.us';
export const SPAN_COMPOSITE_COMPRESSION_STRATEGY = 'span.composite.compression_strategy';
export const SPAN_SYNC = 'span.sync';
+export const SPAN_STACKTRACE = 'span.stacktrace';
// Parent ID for a transaction or span
export const PARENT_ID = 'parent.id';
@@ -110,6 +118,7 @@ export const ERROR_EXC_MESSAGE = 'error.exception.message'; // only to be used i
export const ERROR_EXC_HANDLED = 'error.exception.handled'; // only to be used in es queries, since error.exception is now an array
export const ERROR_EXC_TYPE = 'error.exception.type';
export const ERROR_PAGE_URL = 'error.page.url';
+export const ERROR_STACK_TRACE = 'error.stack_trace';
export const ERROR_TYPE = 'error.type';
// METRICS
@@ -153,6 +162,12 @@ export const CONTAINER_IMAGE = 'container.image.name';
export const KUBERNETES = 'kubernetes';
export const KUBERNETES_POD_NAME = 'kubernetes.pod.name';
export const KUBERNETES_POD_UID = 'kubernetes.pod.uid';
+export const KUBERNETES_NAMESPACE = 'kubernetes.namespace';
+export const KUBERNETES_NODE_NAME = 'kubernetes.node.name';
+export const KUBERNETES_CONTAINER_NAME = 'kubernetes.container.name';
+export const KUBERNETES_CONTAINER_ID = 'kubernetes.container.id';
+export const KUBERNETES_DEPLOYMENT_NAME = 'kubernetes.deployment.name';
+export const KUBERNETES_REPLICASET_NAME = 'kubernetes.replicaset.name';
export const FAAS_ID = 'faas.id';
export const FAAS_NAME = 'faas.name';
@@ -198,3 +213,7 @@ export const CLIENT_GEO_REGION_NAME = 'client.geo.region_name';
export const CHILD_ID = 'child.id';
export const LOG_LEVEL = 'log.level';
+
+// Process
+export const PROCESS_ARGS = 'process.args';
+export const PROCESS_PID = 'process.pid';
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/apm_base_doc.ts b/packages/kbn-apm-types/src/es_schemas/raw/apm_base_doc.ts
index b3a606663134..14d26354e44e 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/apm_base_doc.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/apm_base_doc.ts
@@ -14,10 +14,10 @@ export interface APMBaseDoc {
'@timestamp': string;
agent: {
name: string;
- version: string;
+ version?: string;
};
- parent?: { id: string }; // parent ID is not available on root transactions
- trace?: { id: string };
+ parent?: { id?: string }; // parent ID is not available on root transactions
+ trace?: { id?: string };
labels?: {
[key: string]: string | number | boolean;
};
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/cloud.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/cloud.ts
index 7ee972faf768..290be75091e1 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/cloud.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/cloud.ts
@@ -10,26 +10,26 @@
export interface Cloud {
availability_zone?: string;
instance?: {
- name: string;
- id: string;
+ name?: string;
+ id?: string;
};
machine?: {
- type: string;
+ type?: string;
};
project?: {
- id: string;
- name: string;
+ id?: string;
+ name?: string;
};
provider?: string;
region?: string;
account?: {
- id: string;
- name: string;
+ id?: string;
+ name?: string;
};
image?: {
- id: string;
+ id?: string;
};
service?: {
- name: string;
+ name?: string;
};
}
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/container.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/container.ts
index 64dd497710b9..4c8d1ed4e52b 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/container.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/container.ts
@@ -9,5 +9,7 @@
export interface Container {
id?: string | null;
- image?: string | null;
+ image?: {
+ name?: string;
+ };
}
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/http.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/http.ts
index 458731f69083..f3c62298ca8c 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/http.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/http.ts
@@ -8,7 +8,7 @@
*/
export interface Http {
- request?: { method: string; [key: string]: unknown };
- response?: { status_code: number; [key: string]: unknown };
+ request?: { method?: string };
+ response?: { status_code?: number };
version?: string;
}
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/kubernetes.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/kubernetes.ts
index 704d77f19f85..2a4f1465db9a 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/kubernetes.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/kubernetes.ts
@@ -8,7 +8,7 @@
*/
export interface Kubernetes {
- pod?: { uid?: string | null; [key: string]: unknown };
+ pod?: { uid?: string | null; name?: string };
namespace?: string;
replicaset?: {
name?: string;
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/observer.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/observer.ts
index 067ecb9436ff..7d286d4c3581 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/observer.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/observer.ts
@@ -13,6 +13,6 @@ export interface Observer {
id?: string;
name?: string;
type?: string;
- version: string;
- version_major: number;
+ version?: string;
+ version_major?: number;
}
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/page.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/page.ts
index 6cc058ef7564..a18f3c5578eb 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/page.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/page.ts
@@ -9,5 +9,5 @@
// only for RUM agent: shared by error and transaction
export interface Page {
- url: string;
+ url?: string;
}
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/service.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/service.ts
index bcd9af08706e..bd52784576dc 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/service.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/service.ts
@@ -11,18 +11,18 @@ export interface Service {
name: string;
environment?: string;
framework?: {
- name: string;
+ name?: string;
version?: string;
};
node?: {
name?: string;
};
runtime?: {
- name: string;
- version: string;
+ name?: string;
+ version?: string;
};
language?: {
- name: string;
+ name?: string;
version?: string;
};
version?: string;
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/url.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/url.ts
index 3703763724f3..0f8cd3c81431 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/url.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/url.ts
@@ -9,6 +9,6 @@
export interface Url {
domain?: string;
- full: string;
+ full?: string;
original?: string;
}
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/fields/user.ts b/packages/kbn-apm-types/src/es_schemas/raw/fields/user.ts
index 1c2235288a66..962ed1060b82 100644
--- a/packages/kbn-apm-types/src/es_schemas/raw/fields/user.ts
+++ b/packages/kbn-apm-types/src/es_schemas/raw/fields/user.ts
@@ -8,5 +8,5 @@
*/
export interface User {
- id: string;
+ id?: string;
}
diff --git a/packages/kbn-apm-types/src/es_schemas/ui/fields/agent.ts b/packages/kbn-apm-types/src/es_schemas/ui/fields/agent.ts
index ea3ebf39555d..e8734de141e8 100644
--- a/packages/kbn-apm-types/src/es_schemas/ui/fields/agent.ts
+++ b/packages/kbn-apm-types/src/es_schemas/ui/fields/agent.ts
@@ -14,5 +14,5 @@ export type { ElasticAgentName, OpenTelemetryAgentName, AgentName } from '@kbn/e
export interface Agent {
ephemeral_id?: string;
name: AgentName;
- version: string;
+ version?: string;
}
diff --git a/packages/kbn-discover-utils/src/components/custom_control_columns/degraded_docs_control.tsx b/packages/kbn-discover-utils/src/components/custom_control_columns/degraded_docs_control.tsx
index f3ea72fcc878..27a71954ac70 100644
--- a/packages/kbn-discover-utils/src/components/custom_control_columns/degraded_docs_control.tsx
+++ b/packages/kbn-discover-utils/src/components/custom_control_columns/degraded_docs_control.tsx
@@ -7,9 +7,11 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import { i18n } from '@kbn/i18n';
import React from 'react';
-import { EuiCode, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { EuiCode } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { euiThemeVars } from '@kbn/ui-theme';
import {
RowControlColumn,
RowControlComponent,
@@ -20,6 +22,7 @@ import { DEGRADED_DOCS_FIELDS } from '../../field_constants';
interface DegradedDocsControlProps extends Partial {
enabled?: boolean;
+ addIgnoredMetadataToQuery?: () => void;
}
/**
@@ -52,17 +55,28 @@ const degradedDocButtonLabelWhenNotPresent = i18n.translate(
{ defaultMessage: 'All fields in this document were parsed correctly' }
);
-const degradedDocButtonLabelWhenDisabled = i18n.translate(
- 'discover.customControl.degradedDocDisabled',
- {
- defaultMessage:
- 'Degraded document field detection is currently disabled for this search. To enable it, include the METADATA directive for the `_ignored` field in your ES|QL query. For example:',
- }
+const directive = METADATA _ignored;
+
+const formattedCTAMessage = (
+
+);
+
+const formattedCTAMessageWithAction = (
+
);
const DegradedDocs = ({
Control,
enabled = true,
+ addIgnoredMetadataToQuery,
rowProps: { record },
...props
}: {
@@ -70,31 +84,35 @@ const DegradedDocs = ({
rowProps: RowControlRowProps;
} & DegradedDocsControlProps) => {
const isDegradedDocumentExists = DEGRADED_DOCS_FIELDS.some(
- (field) => field in record.raw && record.raw[field] !== null
+ (field) => field in record.raw && record.raw[field] !== null && record.raw[field] !== undefined
);
if (!enabled) {
- const codeSample = 'FROM logs-* METADATA _ignored';
-
- const tooltipContent = (
-
- {degradedDocButtonLabelWhenDisabled}
-
- {codeSample}
-
- );
-
- return (
-
- );
+ if (addIgnoredMetadataToQuery) {
+ return (
+
+ );
+ } else {
+ // Control without click action for saved searches in dashboards
+ return (
+
+ );
+ }
}
return isDegradedDocumentExists ? (
diff --git a/packages/kbn-discover-utils/src/components/custom_control_columns/types.ts b/packages/kbn-discover-utils/src/components/custom_control_columns/types.ts
index 601cd9ebdcfc..6d7d11a6c7d3 100644
--- a/packages/kbn-discover-utils/src/components/custom_control_columns/types.ts
+++ b/packages/kbn-discover-utils/src/components/custom_control_columns/types.ts
@@ -8,6 +8,7 @@
*/
import { EuiButtonIconProps, EuiDataGridControlColumn, IconType } from '@elastic/eui';
+import type { Interpolation, Theme } from '@emotion/react';
import React, { FC, ReactElement } from 'react';
import { DataTableRecord } from '../../types';
@@ -17,11 +18,12 @@ export interface RowControlRowProps {
}
export interface RowControlProps {
- 'data-test-subj'?: string;
color?: EuiButtonIconProps['color'];
+ css?: Interpolation;
+ 'data-test-subj'?: string;
disabled?: boolean;
- label: string;
iconType: IconType;
+ label: string;
onClick: ((props: RowControlRowProps) => void) | undefined;
tooltipContent?: React.ReactNode;
}
diff --git a/packages/kbn-discover-utils/src/field_constants.ts b/packages/kbn-discover-utils/src/field_constants.ts
index cbc9a0d112b0..a2a68d139ad0 100644
--- a/packages/kbn-discover-utils/src/field_constants.ts
+++ b/packages/kbn-discover-utils/src/field_constants.ts
@@ -35,7 +35,9 @@ export const CONTAINER_NAME_FIELD = 'container.name';
export const CONTAINER_ID_FIELD = 'container.id';
// Degraded Docs
-export const DEGRADED_DOCS_FIELDS = ['ignored_field_values', '_ignored'] as const;
+export const IGNORED_FIELD = '_ignored';
+export const IGNORED_FIELD_VALUES_FIELD = 'ignored_field_values';
+export const DEGRADED_DOCS_FIELDS = [IGNORED_FIELD, IGNORED_FIELD_VALUES_FIELD] as const;
// Error Stacktrace
export const ERROR_STACK_TRACE = 'error.stack_trace';
diff --git a/packages/kbn-discover-utils/tsconfig.json b/packages/kbn-discover-utils/tsconfig.json
index 724051e5863c..90235fada49c 100644
--- a/packages/kbn-discover-utils/tsconfig.json
+++ b/packages/kbn-discover-utils/tsconfig.json
@@ -27,6 +27,7 @@
"@kbn/core-ui-settings-browser",
"@kbn/ui-theme",
"@kbn/expressions-plugin",
- "@kbn/logs-data-access-plugin"
+ "@kbn/logs-data-access-plugin",
+ "@kbn/i18n-react"
]
}
diff --git a/packages/kbn-es-query/src/filters/helpers/update_filter.ts b/packages/kbn-es-query/src/filters/helpers/update_filter.ts
index 069c70ca19a0..05936047b960 100644
--- a/packages/kbn-es-query/src/filters/helpers/update_filter.ts
+++ b/packages/kbn-es-query/src/filters/helpers/update_filter.ts
@@ -17,7 +17,7 @@ export const updateFilter = (
operator?: FilterMeta,
params?: Filter['meta']['params'],
fieldType?: string
-) => {
+): Filter => {
if (!field || !operator) {
return updateField(filter, field);
}
@@ -35,7 +35,7 @@ export const updateFilter = (
return updateWithIsOperator(filter, operator, params, fieldType);
};
-function updateField(filter: Filter, field?: string) {
+function updateField(filter: Filter, field?: string): Filter {
return {
...filter,
meta: {
@@ -48,7 +48,7 @@ function updateField(filter: Filter, field?: string) {
type: undefined,
},
query: undefined,
- };
+ } as Filter; // need the casting because `field` shouldn't be there
}
function updateWithExistsOperator(filter: Filter, operator?: FilterMeta) {
@@ -104,7 +104,7 @@ function updateWithRangeOperator(
operator: FilterMeta,
rawParams: Filter['meta']['params'] | undefined,
field: string
-) {
+): Filter {
if (isRangeFilterParams(rawParams)) {
const { from, to } = rawParams;
const params = {
@@ -148,7 +148,7 @@ function updateWithRangeOperator(
},
},
};
- return updatedFilter;
+ return updatedFilter as Filter; // need the casting because it doesn't like the types of `params.gte|lt`
}
}
diff --git a/packages/kbn-es/src/serverless_resources/project_roles/security/roles.yml b/packages/kbn-es/src/serverless_resources/project_roles/security/roles.yml
index 3c008407d5c4..e9223cd5d73e 100644
--- a/packages/kbn-es/src/serverless_resources/project_roles/security/roles.yml
+++ b/packages/kbn-es/src/serverless_resources/project_roles/security/roles.yml
@@ -55,6 +55,7 @@ viewer:
- feature_dashboard.all
- feature_maps.all
- feature_visualize.all
+ - feature_dataQuality.all
resources: '*'
run_as: []
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.g4 b/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
index da58f29b5527..80a30301d080 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
@@ -68,7 +68,6 @@ FROM : 'from' -> pushMode(FROM_MODE);
GROK : 'grok' -> pushMode(EXPRESSION_MODE);
KEEP : 'keep' -> pushMode(PROJECT_MODE);
LIMIT : 'limit' -> pushMode(EXPRESSION_MODE);
-META : 'meta' -> pushMode(META_MODE);
MV_EXPAND : 'mv_expand' -> pushMode(MVEXPAND_MODE);
RENAME : 'rename' -> pushMode(RENAME_MODE);
ROW : 'row' -> pushMode(EXPRESSION_MODE);
@@ -309,6 +308,8 @@ mode PROJECT_MODE;
PROJECT_PIPE : PIPE -> type(PIPE), popMode;
PROJECT_DOT: DOT -> type(DOT);
PROJECT_COMMA : COMMA -> type(COMMA);
+PROJECT_PARAM : PARAM -> type(PARAM);
+PROJECT_NAMED_OR_POSITIONAL_PARAM : NAMED_OR_POSITIONAL_PARAM -> type(NAMED_OR_POSITIONAL_PARAM);
fragment UNQUOTED_ID_BODY_WITH_PATTERN
: (LETTER | DIGIT | UNDERSCORE | ASTERISK)
@@ -342,6 +343,8 @@ RENAME_PIPE : PIPE -> type(PIPE), popMode;
RENAME_ASSIGN : ASSIGN -> type(ASSIGN);
RENAME_COMMA : COMMA -> type(COMMA);
RENAME_DOT: DOT -> type(DOT);
+RENAME_PARAM : PARAM -> type(PARAM);
+RENAME_NAMED_OR_POSITIONAL_PARAM : NAMED_OR_POSITIONAL_PARAM -> type(NAMED_OR_POSITIONAL_PARAM);
AS : 'as';
@@ -413,6 +416,9 @@ ENRICH_FIELD_QUOTED_IDENTIFIER
: QUOTED_IDENTIFIER -> type(QUOTED_IDENTIFIER)
;
+ENRICH_FIELD_PARAM : PARAM -> type(PARAM);
+ENRICH_FIELD_NAMED_OR_POSITIONAL_PARAM : NAMED_OR_POSITIONAL_PARAM -> type(NAMED_OR_POSITIONAL_PARAM);
+
ENRICH_FIELD_LINE_COMMENT
: LINE_COMMENT -> channel(HIDDEN)
;
@@ -428,6 +434,8 @@ ENRICH_FIELD_WS
mode MVEXPAND_MODE;
MVEXPAND_PIPE : PIPE -> type(PIPE), popMode;
MVEXPAND_DOT: DOT -> type(DOT);
+MVEXPAND_PARAM : PARAM -> type(PARAM);
+MVEXPAND_NAMED_OR_POSITIONAL_PARAM : NAMED_OR_POSITIONAL_PARAM -> type(NAMED_OR_POSITIONAL_PARAM);
MVEXPAND_QUOTED_IDENTIFIER
: QUOTED_IDENTIFIER -> type(QUOTED_IDENTIFIER)
@@ -469,26 +477,6 @@ SHOW_WS
: WS -> channel(HIDDEN)
;
-//
-// META commands
-//
-mode META_MODE;
-META_PIPE : PIPE -> type(PIPE), popMode;
-
-FUNCTIONS : 'functions';
-
-META_LINE_COMMENT
- : LINE_COMMENT -> channel(HIDDEN)
- ;
-
-META_MULTILINE_COMMENT
- : MULTILINE_COMMENT -> channel(HIDDEN)
- ;
-
-META_WS
- : WS -> channel(HIDDEN)
- ;
-
mode SETTING_MODE;
SETTING_CLOSING_BRACKET : CLOSING_BRACKET -> type(CLOSING_BRACKET), popMode;
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.interp b/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
index 8122a5688428..b5ca44826c05 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
@@ -9,7 +9,6 @@ null
'grok'
'keep'
'limit'
-'meta'
'mv_expand'
'rename'
'row'
@@ -104,10 +103,6 @@ null
null
null
null
-'functions'
-null
-null
-null
':'
null
null
@@ -137,7 +132,6 @@ FROM
GROK
KEEP
LIMIT
-META
MV_EXPAND
RENAME
ROW
@@ -232,10 +226,6 @@ INFO
SHOW_LINE_COMMENT
SHOW_MULTILINE_COMMENT
SHOW_WS
-FUNCTIONS
-META_LINE_COMMENT
-META_MULTILINE_COMMENT
-META_WS
COLON
SETTING
SETTING_LINE_COMMENT
@@ -264,7 +254,6 @@ FROM
GROK
KEEP
LIMIT
-META
MV_EXPAND
RENAME
ROW
@@ -361,6 +350,8 @@ FROM_WS
PROJECT_PIPE
PROJECT_DOT
PROJECT_COMMA
+PROJECT_PARAM
+PROJECT_NAMED_OR_POSITIONAL_PARAM
UNQUOTED_ID_BODY_WITH_PATTERN
UNQUOTED_ID_PATTERN
ID_PATTERN
@@ -371,6 +362,8 @@ RENAME_PIPE
RENAME_ASSIGN
RENAME_COMMA
RENAME_DOT
+RENAME_PARAM
+RENAME_NAMED_OR_POSITIONAL_PARAM
AS
RENAME_ID_PATTERN
RENAME_LINE_COMMENT
@@ -393,11 +386,15 @@ ENRICH_FIELD_DOT
ENRICH_FIELD_WITH
ENRICH_FIELD_ID_PATTERN
ENRICH_FIELD_QUOTED_IDENTIFIER
+ENRICH_FIELD_PARAM
+ENRICH_FIELD_NAMED_OR_POSITIONAL_PARAM
ENRICH_FIELD_LINE_COMMENT
ENRICH_FIELD_MULTILINE_COMMENT
ENRICH_FIELD_WS
MVEXPAND_PIPE
MVEXPAND_DOT
+MVEXPAND_PARAM
+MVEXPAND_NAMED_OR_POSITIONAL_PARAM
MVEXPAND_QUOTED_IDENTIFIER
MVEXPAND_UNQUOTED_IDENTIFIER
MVEXPAND_LINE_COMMENT
@@ -408,11 +405,6 @@ INFO
SHOW_LINE_COMMENT
SHOW_MULTILINE_COMMENT
SHOW_WS
-META_PIPE
-FUNCTIONS
-META_LINE_COMMENT
-META_MULTILINE_COMMENT
-META_WS
SETTING_CLOSING_BRACKET
COLON
SETTING
@@ -467,7 +459,6 @@ ENRICH_MODE
ENRICH_FIELD_MODE
MVEXPAND_MODE
SHOW_MODE
-META_MODE
SETTING_MODE
LOOKUP_MODE
LOOKUP_FIELD_MODE
@@ -475,4 +466,4 @@ METRICS_MODE
CLOSING_METRICS_MODE
atn:
-[4, 0, 125, 1474, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 2, 81, 7, 81, 2, 82, 7, 82, 2, 83, 7, 83, 2, 84, 7, 84, 2, 85, 7, 85, 2, 86, 7, 86, 2, 87, 7, 87, 2, 88, 7, 88, 2, 89, 7, 89, 2, 90, 7, 90, 2, 91, 7, 91, 2, 92, 7, 92, 2, 93, 7, 93, 2, 94, 7, 94, 2, 95, 7, 95, 2, 96, 7, 96, 2, 97, 7, 97, 2, 98, 7, 98, 2, 99, 7, 99, 2, 100, 7, 100, 2, 101, 7, 101, 2, 102, 7, 102, 2, 103, 7, 103, 2, 104, 7, 104, 2, 105, 7, 105, 2, 106, 7, 106, 2, 107, 7, 107, 2, 108, 7, 108, 2, 109, 7, 109, 2, 110, 7, 110, 2, 111, 7, 111, 2, 112, 7, 112, 2, 113, 7, 113, 2, 114, 7, 114, 2, 115, 7, 115, 2, 116, 7, 116, 2, 117, 7, 117, 2, 118, 7, 118, 2, 119, 7, 119, 2, 120, 7, 120, 2, 121, 7, 121, 2, 122, 7, 122, 2, 123, 7, 123, 2, 124, 7, 124, 2, 125, 7, 125, 2, 126, 7, 126, 2, 127, 7, 127, 2, 128, 7, 128, 2, 129, 7, 129, 2, 130, 7, 130, 2, 131, 7, 131, 2, 132, 7, 132, 2, 133, 7, 133, 2, 134, 7, 134, 2, 135, 7, 135, 2, 136, 7, 136, 2, 137, 7, 137, 2, 138, 7, 138, 2, 139, 7, 139, 2, 140, 7, 140, 2, 141, 7, 141, 2, 142, 7, 142, 2, 143, 7, 143, 2, 144, 7, 144, 2, 145, 7, 145, 2, 146, 7, 146, 2, 147, 7, 147, 2, 148, 7, 148, 2, 149, 7, 149, 2, 150, 7, 150, 2, 151, 7, 151, 2, 152, 7, 152, 2, 153, 7, 153, 2, 154, 7, 154, 2, 155, 7, 155, 2, 156, 7, 156, 2, 157, 7, 157, 2, 158, 7, 158, 2, 159, 7, 159, 2, 160, 7, 160, 2, 161, 7, 161, 2, 162, 7, 162, 2, 163, 7, 163, 2, 164, 7, 164, 2, 165, 7, 165, 2, 166, 7, 166, 2, 167, 7, 167, 2, 168, 7, 168, 2, 169, 7, 169, 2, 170, 7, 170, 2, 171, 7, 171, 2, 172, 7, 172, 2, 173, 7, 173, 2, 174, 7, 174, 2, 175, 7, 175, 2, 176, 7, 176, 2, 177, 7, 177, 2, 178, 7, 178, 2, 179, 7, 179, 2, 180, 7, 180, 2, 181, 7, 181, 2, 182, 7, 182, 2, 183, 7, 183, 2, 184, 7, 184, 2, 185, 7, 185, 2, 186, 7, 186, 2, 187, 7, 187, 2, 188, 7, 188, 2, 189, 7, 189, 2, 190, 7, 190, 2, 191, 7, 191, 2, 192, 7, 192, 2, 193, 7, 193, 2, 194, 7, 194, 2, 195, 7, 195, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 4, 21, 591, 8, 21, 11, 21, 12, 21, 592, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 5, 22, 601, 8, 22, 10, 22, 12, 22, 604, 9, 22, 1, 22, 3, 22, 607, 8, 22, 1, 22, 3, 22, 610, 8, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 5, 23, 619, 8, 23, 10, 23, 12, 23, 622, 9, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24, 4, 24, 630, 8, 24, 11, 24, 12, 24, 631, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 3, 30, 651, 8, 30, 1, 30, 4, 30, 654, 8, 30, 11, 30, 12, 30, 655, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 3, 33, 665, 8, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 3, 35, 672, 8, 35, 1, 36, 1, 36, 1, 36, 5, 36, 677, 8, 36, 10, 36, 12, 36, 680, 9, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 5, 36, 688, 8, 36, 10, 36, 12, 36, 691, 9, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 3, 36, 698, 8, 36, 1, 36, 3, 36, 701, 8, 36, 3, 36, 703, 8, 36, 1, 37, 4, 37, 706, 8, 37, 11, 37, 12, 37, 707, 1, 38, 4, 38, 711, 8, 38, 11, 38, 12, 38, 712, 1, 38, 1, 38, 5, 38, 717, 8, 38, 10, 38, 12, 38, 720, 9, 38, 1, 38, 1, 38, 4, 38, 724, 8, 38, 11, 38, 12, 38, 725, 1, 38, 4, 38, 729, 8, 38, 11, 38, 12, 38, 730, 1, 38, 1, 38, 5, 38, 735, 8, 38, 10, 38, 12, 38, 738, 9, 38, 3, 38, 740, 8, 38, 1, 38, 1, 38, 1, 38, 1, 38, 4, 38, 746, 8, 38, 11, 38, 12, 38, 747, 1, 38, 1, 38, 3, 38, 752, 8, 38, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 1, 56, 1, 56, 1, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 63, 1, 63, 1, 63, 1, 64, 1, 64, 1, 64, 1, 65, 1, 65, 1, 66, 1, 66, 1, 66, 1, 67, 1, 67, 1, 68, 1, 68, 1, 68, 1, 69, 1, 69, 1, 70, 1, 70, 1, 71, 1, 71, 1, 72, 1, 72, 1, 73, 1, 73, 1, 74, 1, 74, 1, 74, 1, 74, 1, 74, 1, 75, 1, 75, 1, 75, 3, 75, 879, 8, 75, 1, 75, 5, 75, 882, 8, 75, 10, 75, 12, 75, 885, 9, 75, 1, 75, 1, 75, 4, 75, 889, 8, 75, 11, 75, 12, 75, 890, 3, 75, 893, 8, 75, 1, 76, 1, 76, 1, 76, 1, 76, 1, 76, 1, 77, 1, 77, 1, 77, 1, 77, 1, 77, 1, 78, 1, 78, 5, 78, 907, 8, 78, 10, 78, 12, 78, 910, 9, 78, 1, 78, 1, 78, 3, 78, 914, 8, 78, 1, 78, 4, 78, 917, 8, 78, 11, 78, 12, 78, 918, 3, 78, 921, 8, 78, 1, 79, 1, 79, 4, 79, 925, 8, 79, 11, 79, 12, 79, 926, 1, 79, 1, 79, 1, 80, 1, 80, 1, 81, 1, 81, 1, 81, 1, 81, 1, 82, 1, 82, 1, 82, 1, 82, 1, 83, 1, 83, 1, 83, 1, 83, 1, 84, 1, 84, 1, 84, 1, 84, 1, 84, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 86, 1, 86, 1, 86, 1, 86, 1, 87, 1, 87, 1, 87, 1, 87, 1, 88, 1, 88, 1, 88, 1, 88, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 90, 1, 90, 1, 90, 1, 90, 1, 91, 1, 91, 1, 91, 1, 91, 1, 92, 1, 92, 1, 92, 1, 92, 1, 93, 1, 93, 1, 93, 1, 93, 1, 94, 1, 94, 1, 94, 1, 94, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 96, 1, 96, 1, 96, 3, 96, 1004, 8, 96, 1, 97, 4, 97, 1007, 8, 97, 11, 97, 12, 97, 1008, 1, 98, 1, 98, 1, 98, 1, 98, 1, 99, 1, 99, 1, 99, 1, 99, 1, 100, 1, 100, 1, 100, 1, 100, 1, 101, 1, 101, 1, 101, 1, 101, 1, 102, 1, 102, 1, 102, 1, 102, 1, 103, 1, 103, 1, 103, 1, 103, 1, 103, 1, 104, 1, 104, 1, 104, 1, 104, 1, 105, 1, 105, 1, 105, 1, 105, 1, 106, 1, 106, 1, 106, 1, 106, 3, 106, 1048, 8, 106, 1, 107, 1, 107, 3, 107, 1052, 8, 107, 1, 107, 5, 107, 1055, 8, 107, 10, 107, 12, 107, 1058, 9, 107, 1, 107, 1, 107, 3, 107, 1062, 8, 107, 1, 107, 4, 107, 1065, 8, 107, 11, 107, 12, 107, 1066, 3, 107, 1069, 8, 107, 1, 108, 1, 108, 4, 108, 1073, 8, 108, 11, 108, 12, 108, 1074, 1, 109, 1, 109, 1, 109, 1, 109, 1, 110, 1, 110, 1, 110, 1, 110, 1, 111, 1, 111, 1, 111, 1, 111, 1, 112, 1, 112, 1, 112, 1, 112, 1, 112, 1, 113, 1, 113, 1, 113, 1, 113, 1, 114, 1, 114, 1, 114, 1, 114, 1, 115, 1, 115, 1, 115, 1, 115, 1, 116, 1, 116, 1, 116, 1, 117, 1, 117, 1, 117, 1, 117, 1, 118, 1, 118, 1, 118, 1, 118, 1, 119, 1, 119, 1, 119, 1, 119, 1, 120, 1, 120, 1, 120, 1, 120, 1, 121, 1, 121, 1, 121, 1, 121, 1, 121, 1, 122, 1, 122, 1, 122, 1, 122, 1, 122, 1, 123, 1, 123, 1, 123, 1, 123, 1, 123, 1, 124, 1, 124, 1, 124, 1, 124, 1, 124, 1, 124, 1, 124, 1, 125, 1, 125, 1, 126, 4, 126, 1150, 8, 126, 11, 126, 12, 126, 1151, 1, 126, 1, 126, 3, 126, 1156, 8, 126, 1, 126, 4, 126, 1159, 8, 126, 11, 126, 12, 126, 1160, 1, 127, 1, 127, 1, 127, 1, 127, 1, 128, 1, 128, 1, 128, 1, 128, 1, 129, 1, 129, 1, 129, 1, 129, 1, 130, 1, 130, 1, 130, 1, 130, 1, 131, 1, 131, 1, 131, 1, 131, 1, 131, 1, 131, 1, 132, 1, 132, 1, 132, 1, 132, 1, 133, 1, 133, 1, 133, 1, 133, 1, 134, 1, 134, 1, 134, 1, 134, 1, 135, 1, 135, 1, 135, 1, 135, 1, 136, 1, 136, 1, 136, 1, 136, 1, 137, 1, 137, 1, 137, 1, 137, 1, 138, 1, 138, 1, 138, 1, 138, 1, 139, 1, 139, 1, 139, 1, 139, 1, 140, 1, 140, 1, 140, 1, 140, 1, 141, 1, 141, 1, 141, 1, 141, 1, 141, 1, 142, 1, 142, 1, 142, 1, 142, 1, 143, 1, 143, 1, 143, 1, 143, 1, 144, 1, 144, 1, 144, 1, 144, 1, 145, 1, 145, 1, 145, 1, 145, 1, 146, 1, 146, 1, 146, 1, 146, 1, 147, 1, 147, 1, 147, 1, 147, 1, 148, 1, 148, 1, 148, 1, 148, 1, 148, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 150, 1, 150, 1, 150, 1, 150, 1, 151, 1, 151, 1, 151, 1, 151, 1, 152, 1, 152, 1, 152, 1, 152, 1, 153, 1, 153, 1, 153, 1, 153, 1, 153, 1, 154, 1, 154, 1, 154, 1, 154, 1, 154, 1, 154, 1, 154, 1, 154, 1, 154, 1, 154, 1, 155, 1, 155, 1, 155, 1, 155, 1, 156, 1, 156, 1, 156, 1, 156, 1, 157, 1, 157, 1, 157, 1, 157, 1, 158, 1, 158, 1, 158, 1, 158, 1, 158, 1, 159, 1, 159, 1, 160, 1, 160, 1, 160, 1, 160, 1, 160, 4, 160, 1311, 8, 160, 11, 160, 12, 160, 1312, 1, 161, 1, 161, 1, 161, 1, 161, 1, 162, 1, 162, 1, 162, 1, 162, 1, 163, 1, 163, 1, 163, 1, 163, 1, 164, 1, 164, 1, 164, 1, 164, 1, 164, 1, 165, 1, 165, 1, 165, 1, 165, 1, 166, 1, 166, 1, 166, 1, 166, 1, 167, 1, 167, 1, 167, 1, 167, 1, 168, 1, 168, 1, 168, 1, 168, 1, 168, 1, 169, 1, 169, 1, 169, 1, 169, 1, 170, 1, 170, 1, 170, 1, 170, 1, 171, 1, 171, 1, 171, 1, 171, 1, 172, 1, 172, 1, 172, 1, 172, 1, 173, 1, 173, 1, 173, 1, 173, 1, 174, 1, 174, 1, 174, 1, 174, 1, 174, 1, 174, 1, 175, 1, 175, 1, 175, 1, 175, 1, 176, 1, 176, 1, 176, 1, 176, 1, 177, 1, 177, 1, 177, 1, 177, 1, 178, 1, 178, 1, 178, 1, 178, 1, 179, 1, 179, 1, 179, 1, 179, 1, 180, 1, 180, 1, 180, 1, 180, 1, 181, 1, 181, 1, 181, 1, 181, 1, 181, 1, 182, 1, 182, 1, 182, 1, 182, 1, 182, 1, 182, 1, 183, 1, 183, 1, 183, 1, 183, 1, 183, 1, 183, 1, 184, 1, 184, 1, 184, 1, 184, 1, 185, 1, 185, 1, 185, 1, 185, 1, 186, 1, 186, 1, 186, 1, 186, 1, 187, 1, 187, 1, 187, 1, 187, 1, 187, 1, 187, 1, 188, 1, 188, 1, 188, 1, 188, 1, 188, 1, 188, 1, 189, 1, 189, 1, 189, 1, 189, 1, 190, 1, 190, 1, 190, 1, 190, 1, 191, 1, 191, 1, 191, 1, 191, 1, 192, 1, 192, 1, 192, 1, 192, 1, 192, 1, 192, 1, 193, 1, 193, 1, 193, 1, 193, 1, 193, 1, 193, 1, 194, 1, 194, 1, 194, 1, 194, 1, 194, 1, 194, 1, 195, 1, 195, 1, 195, 1, 195, 1, 195, 2, 620, 689, 0, 196, 16, 1, 18, 2, 20, 3, 22, 4, 24, 5, 26, 6, 28, 7, 30, 8, 32, 9, 34, 10, 36, 11, 38, 12, 40, 13, 42, 14, 44, 15, 46, 16, 48, 17, 50, 18, 52, 19, 54, 20, 56, 21, 58, 22, 60, 23, 62, 24, 64, 25, 66, 26, 68, 0, 70, 0, 72, 0, 74, 0, 76, 0, 78, 0, 80, 0, 82, 0, 84, 0, 86, 0, 88, 27, 90, 28, 92, 29, 94, 30, 96, 31, 98, 32, 100, 33, 102, 34, 104, 35, 106, 36, 108, 37, 110, 38, 112, 39, 114, 40, 116, 41, 118, 42, 120, 43, 122, 44, 124, 45, 126, 46, 128, 47, 130, 48, 132, 49, 134, 50, 136, 51, 138, 52, 140, 53, 142, 54, 144, 55, 146, 56, 148, 57, 150, 58, 152, 59, 154, 60, 156, 61, 158, 62, 160, 63, 162, 64, 164, 0, 166, 65, 168, 66, 170, 67, 172, 68, 174, 0, 176, 69, 178, 70, 180, 71, 182, 72, 184, 0, 186, 0, 188, 73, 190, 74, 192, 75, 194, 0, 196, 0, 198, 0, 200, 0, 202, 0, 204, 0, 206, 76, 208, 0, 210, 77, 212, 0, 214, 0, 216, 78, 218, 79, 220, 80, 222, 0, 224, 0, 226, 0, 228, 0, 230, 0, 232, 81, 234, 82, 236, 83, 238, 84, 240, 0, 242, 0, 244, 0, 246, 0, 248, 85, 250, 0, 252, 86, 254, 87, 256, 88, 258, 0, 260, 0, 262, 89, 264, 90, 266, 0, 268, 91, 270, 0, 272, 92, 274, 93, 276, 94, 278, 0, 280, 0, 282, 0, 284, 0, 286, 0, 288, 0, 290, 0, 292, 95, 294, 96, 296, 97, 298, 0, 300, 0, 302, 0, 304, 0, 306, 98, 308, 99, 310, 100, 312, 0, 314, 101, 316, 102, 318, 103, 320, 104, 322, 0, 324, 105, 326, 106, 328, 107, 330, 108, 332, 0, 334, 109, 336, 110, 338, 111, 340, 112, 342, 113, 344, 0, 346, 0, 348, 0, 350, 0, 352, 0, 354, 0, 356, 0, 358, 114, 360, 115, 362, 116, 364, 0, 366, 0, 368, 0, 370, 0, 372, 117, 374, 118, 376, 119, 378, 0, 380, 0, 382, 0, 384, 120, 386, 121, 388, 122, 390, 0, 392, 0, 394, 123, 396, 124, 398, 125, 400, 0, 402, 0, 404, 0, 406, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 35, 2, 0, 68, 68, 100, 100, 2, 0, 73, 73, 105, 105, 2, 0, 83, 83, 115, 115, 2, 0, 69, 69, 101, 101, 2, 0, 67, 67, 99, 99, 2, 0, 84, 84, 116, 116, 2, 0, 82, 82, 114, 114, 2, 0, 79, 79, 111, 111, 2, 0, 80, 80, 112, 112, 2, 0, 78, 78, 110, 110, 2, 0, 72, 72, 104, 104, 2, 0, 86, 86, 118, 118, 2, 0, 65, 65, 97, 97, 2, 0, 76, 76, 108, 108, 2, 0, 88, 88, 120, 120, 2, 0, 70, 70, 102, 102, 2, 0, 77, 77, 109, 109, 2, 0, 71, 71, 103, 103, 2, 0, 75, 75, 107, 107, 2, 0, 87, 87, 119, 119, 2, 0, 85, 85, 117, 117, 6, 0, 9, 10, 13, 13, 32, 32, 47, 47, 91, 91, 93, 93, 2, 0, 10, 10, 13, 13, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 2, 0, 65, 90, 97, 122, 8, 0, 34, 34, 78, 78, 82, 82, 84, 84, 92, 92, 110, 110, 114, 114, 116, 116, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 2, 0, 43, 43, 45, 45, 1, 0, 96, 96, 2, 0, 66, 66, 98, 98, 2, 0, 89, 89, 121, 121, 11, 0, 9, 10, 13, 13, 32, 32, 34, 34, 44, 44, 47, 47, 58, 58, 61, 61, 91, 91, 93, 93, 124, 124, 2, 0, 42, 42, 47, 47, 11, 0, 9, 10, 13, 13, 32, 32, 34, 35, 44, 44, 47, 47, 58, 58, 60, 60, 62, 63, 92, 92, 124, 124, 1501, 0, 16, 1, 0, 0, 0, 0, 18, 1, 0, 0, 0, 0, 20, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 24, 1, 0, 0, 0, 0, 26, 1, 0, 0, 0, 0, 28, 1, 0, 0, 0, 0, 30, 1, 0, 0, 0, 0, 32, 1, 0, 0, 0, 0, 34, 1, 0, 0, 0, 0, 36, 1, 0, 0, 0, 0, 38, 1, 0, 0, 0, 0, 40, 1, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 46, 1, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 50, 1, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 54, 1, 0, 0, 0, 0, 56, 1, 0, 0, 0, 0, 58, 1, 0, 0, 0, 0, 60, 1, 0, 0, 0, 0, 62, 1, 0, 0, 0, 0, 64, 1, 0, 0, 0, 1, 66, 1, 0, 0, 0, 1, 88, 1, 0, 0, 0, 1, 90, 1, 0, 0, 0, 1, 92, 1, 0, 0, 0, 1, 94, 1, 0, 0, 0, 1, 96, 1, 0, 0, 0, 1, 98, 1, 0, 0, 0, 1, 100, 1, 0, 0, 0, 1, 102, 1, 0, 0, 0, 1, 104, 1, 0, 0, 0, 1, 106, 1, 0, 0, 0, 1, 108, 1, 0, 0, 0, 1, 110, 1, 0, 0, 0, 1, 112, 1, 0, 0, 0, 1, 114, 1, 0, 0, 0, 1, 116, 1, 0, 0, 0, 1, 118, 1, 0, 0, 0, 1, 120, 1, 0, 0, 0, 1, 122, 1, 0, 0, 0, 1, 124, 1, 0, 0, 0, 1, 126, 1, 0, 0, 0, 1, 128, 1, 0, 0, 0, 1, 130, 1, 0, 0, 0, 1, 132, 1, 0, 0, 0, 1, 134, 1, 0, 0, 0, 1, 136, 1, 0, 0, 0, 1, 138, 1, 0, 0, 0, 1, 140, 1, 0, 0, 0, 1, 142, 1, 0, 0, 0, 1, 144, 1, 0, 0, 0, 1, 146, 1, 0, 0, 0, 1, 148, 1, 0, 0, 0, 1, 150, 1, 0, 0, 0, 1, 152, 1, 0, 0, 0, 1, 154, 1, 0, 0, 0, 1, 156, 1, 0, 0, 0, 1, 158, 1, 0, 0, 0, 1, 160, 1, 0, 0, 0, 1, 162, 1, 0, 0, 0, 1, 164, 1, 0, 0, 0, 1, 166, 1, 0, 0, 0, 1, 168, 1, 0, 0, 0, 1, 170, 1, 0, 0, 0, 1, 172, 1, 0, 0, 0, 1, 176, 1, 0, 0, 0, 1, 178, 1, 0, 0, 0, 1, 180, 1, 0, 0, 0, 1, 182, 1, 0, 0, 0, 2, 184, 1, 0, 0, 0, 2, 186, 1, 0, 0, 0, 2, 188, 1, 0, 0, 0, 2, 190, 1, 0, 0, 0, 2, 192, 1, 0, 0, 0, 3, 194, 1, 0, 0, 0, 3, 196, 1, 0, 0, 0, 3, 198, 1, 0, 0, 0, 3, 200, 1, 0, 0, 0, 3, 202, 1, 0, 0, 0, 3, 204, 1, 0, 0, 0, 3, 206, 1, 0, 0, 0, 3, 210, 1, 0, 0, 0, 3, 212, 1, 0, 0, 0, 3, 214, 1, 0, 0, 0, 3, 216, 1, 0, 0, 0, 3, 218, 1, 0, 0, 0, 3, 220, 1, 0, 0, 0, 4, 222, 1, 0, 0, 0, 4, 224, 1, 0, 0, 0, 4, 226, 1, 0, 0, 0, 4, 232, 1, 0, 0, 0, 4, 234, 1, 0, 0, 0, 4, 236, 1, 0, 0, 0, 4, 238, 1, 0, 0, 0, 5, 240, 1, 0, 0, 0, 5, 242, 1, 0, 0, 0, 5, 244, 1, 0, 0, 0, 5, 246, 1, 0, 0, 0, 5, 248, 1, 0, 0, 0, 5, 250, 1, 0, 0, 0, 5, 252, 1, 0, 0, 0, 5, 254, 1, 0, 0, 0, 5, 256, 1, 0, 0, 0, 6, 258, 1, 0, 0, 0, 6, 260, 1, 0, 0, 0, 6, 262, 1, 0, 0, 0, 6, 264, 1, 0, 0, 0, 6, 268, 1, 0, 0, 0, 6, 270, 1, 0, 0, 0, 6, 272, 1, 0, 0, 0, 6, 274, 1, 0, 0, 0, 6, 276, 1, 0, 0, 0, 7, 278, 1, 0, 0, 0, 7, 280, 1, 0, 0, 0, 7, 282, 1, 0, 0, 0, 7, 284, 1, 0, 0, 0, 7, 286, 1, 0, 0, 0, 7, 288, 1, 0, 0, 0, 7, 290, 1, 0, 0, 0, 7, 292, 1, 0, 0, 0, 7, 294, 1, 0, 0, 0, 7, 296, 1, 0, 0, 0, 8, 298, 1, 0, 0, 0, 8, 300, 1, 0, 0, 0, 8, 302, 1, 0, 0, 0, 8, 304, 1, 0, 0, 0, 8, 306, 1, 0, 0, 0, 8, 308, 1, 0, 0, 0, 8, 310, 1, 0, 0, 0, 9, 312, 1, 0, 0, 0, 9, 314, 1, 0, 0, 0, 9, 316, 1, 0, 0, 0, 9, 318, 1, 0, 0, 0, 9, 320, 1, 0, 0, 0, 10, 322, 1, 0, 0, 0, 10, 324, 1, 0, 0, 0, 10, 326, 1, 0, 0, 0, 10, 328, 1, 0, 0, 0, 10, 330, 1, 0, 0, 0, 11, 332, 1, 0, 0, 0, 11, 334, 1, 0, 0, 0, 11, 336, 1, 0, 0, 0, 11, 338, 1, 0, 0, 0, 11, 340, 1, 0, 0, 0, 11, 342, 1, 0, 0, 0, 12, 344, 1, 0, 0, 0, 12, 346, 1, 0, 0, 0, 12, 348, 1, 0, 0, 0, 12, 350, 1, 0, 0, 0, 12, 352, 1, 0, 0, 0, 12, 354, 1, 0, 0, 0, 12, 356, 1, 0, 0, 0, 12, 358, 1, 0, 0, 0, 12, 360, 1, 0, 0, 0, 12, 362, 1, 0, 0, 0, 13, 364, 1, 0, 0, 0, 13, 366, 1, 0, 0, 0, 13, 368, 1, 0, 0, 0, 13, 370, 1, 0, 0, 0, 13, 372, 1, 0, 0, 0, 13, 374, 1, 0, 0, 0, 13, 376, 1, 0, 0, 0, 14, 378, 1, 0, 0, 0, 14, 380, 1, 0, 0, 0, 14, 382, 1, 0, 0, 0, 14, 384, 1, 0, 0, 0, 14, 386, 1, 0, 0, 0, 14, 388, 1, 0, 0, 0, 15, 390, 1, 0, 0, 0, 15, 392, 1, 0, 0, 0, 15, 394, 1, 0, 0, 0, 15, 396, 1, 0, 0, 0, 15, 398, 1, 0, 0, 0, 15, 400, 1, 0, 0, 0, 15, 402, 1, 0, 0, 0, 15, 404, 1, 0, 0, 0, 15, 406, 1, 0, 0, 0, 16, 408, 1, 0, 0, 0, 18, 418, 1, 0, 0, 0, 20, 425, 1, 0, 0, 0, 22, 434, 1, 0, 0, 0, 24, 441, 1, 0, 0, 0, 26, 451, 1, 0, 0, 0, 28, 458, 1, 0, 0, 0, 30, 465, 1, 0, 0, 0, 32, 472, 1, 0, 0, 0, 34, 480, 1, 0, 0, 0, 36, 487, 1, 0, 0, 0, 38, 499, 1, 0, 0, 0, 40, 508, 1, 0, 0, 0, 42, 514, 1, 0, 0, 0, 44, 521, 1, 0, 0, 0, 46, 528, 1, 0, 0, 0, 48, 536, 1, 0, 0, 0, 50, 544, 1, 0, 0, 0, 52, 559, 1, 0, 0, 0, 54, 569, 1, 0, 0, 0, 56, 578, 1, 0, 0, 0, 58, 590, 1, 0, 0, 0, 60, 596, 1, 0, 0, 0, 62, 613, 1, 0, 0, 0, 64, 629, 1, 0, 0, 0, 66, 635, 1, 0, 0, 0, 68, 639, 1, 0, 0, 0, 70, 641, 1, 0, 0, 0, 72, 643, 1, 0, 0, 0, 74, 646, 1, 0, 0, 0, 76, 648, 1, 0, 0, 0, 78, 657, 1, 0, 0, 0, 80, 659, 1, 0, 0, 0, 82, 664, 1, 0, 0, 0, 84, 666, 1, 0, 0, 0, 86, 671, 1, 0, 0, 0, 88, 702, 1, 0, 0, 0, 90, 705, 1, 0, 0, 0, 92, 751, 1, 0, 0, 0, 94, 753, 1, 0, 0, 0, 96, 756, 1, 0, 0, 0, 98, 760, 1, 0, 0, 0, 100, 764, 1, 0, 0, 0, 102, 766, 1, 0, 0, 0, 104, 769, 1, 0, 0, 0, 106, 771, 1, 0, 0, 0, 108, 776, 1, 0, 0, 0, 110, 778, 1, 0, 0, 0, 112, 784, 1, 0, 0, 0, 114, 790, 1, 0, 0, 0, 116, 793, 1, 0, 0, 0, 118, 796, 1, 0, 0, 0, 120, 801, 1, 0, 0, 0, 122, 806, 1, 0, 0, 0, 124, 808, 1, 0, 0, 0, 126, 812, 1, 0, 0, 0, 128, 817, 1, 0, 0, 0, 130, 823, 1, 0, 0, 0, 132, 826, 1, 0, 0, 0, 134, 828, 1, 0, 0, 0, 136, 834, 1, 0, 0, 0, 138, 836, 1, 0, 0, 0, 140, 841, 1, 0, 0, 0, 142, 844, 1, 0, 0, 0, 144, 847, 1, 0, 0, 0, 146, 850, 1, 0, 0, 0, 148, 852, 1, 0, 0, 0, 150, 855, 1, 0, 0, 0, 152, 857, 1, 0, 0, 0, 154, 860, 1, 0, 0, 0, 156, 862, 1, 0, 0, 0, 158, 864, 1, 0, 0, 0, 160, 866, 1, 0, 0, 0, 162, 868, 1, 0, 0, 0, 164, 870, 1, 0, 0, 0, 166, 892, 1, 0, 0, 0, 168, 894, 1, 0, 0, 0, 170, 899, 1, 0, 0, 0, 172, 920, 1, 0, 0, 0, 174, 922, 1, 0, 0, 0, 176, 930, 1, 0, 0, 0, 178, 932, 1, 0, 0, 0, 180, 936, 1, 0, 0, 0, 182, 940, 1, 0, 0, 0, 184, 944, 1, 0, 0, 0, 186, 949, 1, 0, 0, 0, 188, 954, 1, 0, 0, 0, 190, 958, 1, 0, 0, 0, 192, 962, 1, 0, 0, 0, 194, 966, 1, 0, 0, 0, 196, 971, 1, 0, 0, 0, 198, 975, 1, 0, 0, 0, 200, 979, 1, 0, 0, 0, 202, 983, 1, 0, 0, 0, 204, 987, 1, 0, 0, 0, 206, 991, 1, 0, 0, 0, 208, 1003, 1, 0, 0, 0, 210, 1006, 1, 0, 0, 0, 212, 1010, 1, 0, 0, 0, 214, 1014, 1, 0, 0, 0, 216, 1018, 1, 0, 0, 0, 218, 1022, 1, 0, 0, 0, 220, 1026, 1, 0, 0, 0, 222, 1030, 1, 0, 0, 0, 224, 1035, 1, 0, 0, 0, 226, 1039, 1, 0, 0, 0, 228, 1047, 1, 0, 0, 0, 230, 1068, 1, 0, 0, 0, 232, 1072, 1, 0, 0, 0, 234, 1076, 1, 0, 0, 0, 236, 1080, 1, 0, 0, 0, 238, 1084, 1, 0, 0, 0, 240, 1088, 1, 0, 0, 0, 242, 1093, 1, 0, 0, 0, 244, 1097, 1, 0, 0, 0, 246, 1101, 1, 0, 0, 0, 248, 1105, 1, 0, 0, 0, 250, 1108, 1, 0, 0, 0, 252, 1112, 1, 0, 0, 0, 254, 1116, 1, 0, 0, 0, 256, 1120, 1, 0, 0, 0, 258, 1124, 1, 0, 0, 0, 260, 1129, 1, 0, 0, 0, 262, 1134, 1, 0, 0, 0, 264, 1139, 1, 0, 0, 0, 266, 1146, 1, 0, 0, 0, 268, 1155, 1, 0, 0, 0, 270, 1162, 1, 0, 0, 0, 272, 1166, 1, 0, 0, 0, 274, 1170, 1, 0, 0, 0, 276, 1174, 1, 0, 0, 0, 278, 1178, 1, 0, 0, 0, 280, 1184, 1, 0, 0, 0, 282, 1188, 1, 0, 0, 0, 284, 1192, 1, 0, 0, 0, 286, 1196, 1, 0, 0, 0, 288, 1200, 1, 0, 0, 0, 290, 1204, 1, 0, 0, 0, 292, 1208, 1, 0, 0, 0, 294, 1212, 1, 0, 0, 0, 296, 1216, 1, 0, 0, 0, 298, 1220, 1, 0, 0, 0, 300, 1225, 1, 0, 0, 0, 302, 1229, 1, 0, 0, 0, 304, 1233, 1, 0, 0, 0, 306, 1237, 1, 0, 0, 0, 308, 1241, 1, 0, 0, 0, 310, 1245, 1, 0, 0, 0, 312, 1249, 1, 0, 0, 0, 314, 1254, 1, 0, 0, 0, 316, 1259, 1, 0, 0, 0, 318, 1263, 1, 0, 0, 0, 320, 1267, 1, 0, 0, 0, 322, 1271, 1, 0, 0, 0, 324, 1276, 1, 0, 0, 0, 326, 1286, 1, 0, 0, 0, 328, 1290, 1, 0, 0, 0, 330, 1294, 1, 0, 0, 0, 332, 1298, 1, 0, 0, 0, 334, 1303, 1, 0, 0, 0, 336, 1310, 1, 0, 0, 0, 338, 1314, 1, 0, 0, 0, 340, 1318, 1, 0, 0, 0, 342, 1322, 1, 0, 0, 0, 344, 1326, 1, 0, 0, 0, 346, 1331, 1, 0, 0, 0, 348, 1335, 1, 0, 0, 0, 350, 1339, 1, 0, 0, 0, 352, 1343, 1, 0, 0, 0, 354, 1348, 1, 0, 0, 0, 356, 1352, 1, 0, 0, 0, 358, 1356, 1, 0, 0, 0, 360, 1360, 1, 0, 0, 0, 362, 1364, 1, 0, 0, 0, 364, 1368, 1, 0, 0, 0, 366, 1374, 1, 0, 0, 0, 368, 1378, 1, 0, 0, 0, 370, 1382, 1, 0, 0, 0, 372, 1386, 1, 0, 0, 0, 374, 1390, 1, 0, 0, 0, 376, 1394, 1, 0, 0, 0, 378, 1398, 1, 0, 0, 0, 380, 1403, 1, 0, 0, 0, 382, 1409, 1, 0, 0, 0, 384, 1415, 1, 0, 0, 0, 386, 1419, 1, 0, 0, 0, 388, 1423, 1, 0, 0, 0, 390, 1427, 1, 0, 0, 0, 392, 1433, 1, 0, 0, 0, 394, 1439, 1, 0, 0, 0, 396, 1443, 1, 0, 0, 0, 398, 1447, 1, 0, 0, 0, 400, 1451, 1, 0, 0, 0, 402, 1457, 1, 0, 0, 0, 404, 1463, 1, 0, 0, 0, 406, 1469, 1, 0, 0, 0, 408, 409, 7, 0, 0, 0, 409, 410, 7, 1, 0, 0, 410, 411, 7, 2, 0, 0, 411, 412, 7, 2, 0, 0, 412, 413, 7, 3, 0, 0, 413, 414, 7, 4, 0, 0, 414, 415, 7, 5, 0, 0, 415, 416, 1, 0, 0, 0, 416, 417, 6, 0, 0, 0, 417, 17, 1, 0, 0, 0, 418, 419, 7, 0, 0, 0, 419, 420, 7, 6, 0, 0, 420, 421, 7, 7, 0, 0, 421, 422, 7, 8, 0, 0, 422, 423, 1, 0, 0, 0, 423, 424, 6, 1, 1, 0, 424, 19, 1, 0, 0, 0, 425, 426, 7, 3, 0, 0, 426, 427, 7, 9, 0, 0, 427, 428, 7, 6, 0, 0, 428, 429, 7, 1, 0, 0, 429, 430, 7, 4, 0, 0, 430, 431, 7, 10, 0, 0, 431, 432, 1, 0, 0, 0, 432, 433, 6, 2, 2, 0, 433, 21, 1, 0, 0, 0, 434, 435, 7, 3, 0, 0, 435, 436, 7, 11, 0, 0, 436, 437, 7, 12, 0, 0, 437, 438, 7, 13, 0, 0, 438, 439, 1, 0, 0, 0, 439, 440, 6, 3, 0, 0, 440, 23, 1, 0, 0, 0, 441, 442, 7, 3, 0, 0, 442, 443, 7, 14, 0, 0, 443, 444, 7, 8, 0, 0, 444, 445, 7, 13, 0, 0, 445, 446, 7, 12, 0, 0, 446, 447, 7, 1, 0, 0, 447, 448, 7, 9, 0, 0, 448, 449, 1, 0, 0, 0, 449, 450, 6, 4, 3, 0, 450, 25, 1, 0, 0, 0, 451, 452, 7, 15, 0, 0, 452, 453, 7, 6, 0, 0, 453, 454, 7, 7, 0, 0, 454, 455, 7, 16, 0, 0, 455, 456, 1, 0, 0, 0, 456, 457, 6, 5, 4, 0, 457, 27, 1, 0, 0, 0, 458, 459, 7, 17, 0, 0, 459, 460, 7, 6, 0, 0, 460, 461, 7, 7, 0, 0, 461, 462, 7, 18, 0, 0, 462, 463, 1, 0, 0, 0, 463, 464, 6, 6, 0, 0, 464, 29, 1, 0, 0, 0, 465, 466, 7, 18, 0, 0, 466, 467, 7, 3, 0, 0, 467, 468, 7, 3, 0, 0, 468, 469, 7, 8, 0, 0, 469, 470, 1, 0, 0, 0, 470, 471, 6, 7, 1, 0, 471, 31, 1, 0, 0, 0, 472, 473, 7, 13, 0, 0, 473, 474, 7, 1, 0, 0, 474, 475, 7, 16, 0, 0, 475, 476, 7, 1, 0, 0, 476, 477, 7, 5, 0, 0, 477, 478, 1, 0, 0, 0, 478, 479, 6, 8, 0, 0, 479, 33, 1, 0, 0, 0, 480, 481, 7, 16, 0, 0, 481, 482, 7, 3, 0, 0, 482, 483, 7, 5, 0, 0, 483, 484, 7, 12, 0, 0, 484, 485, 1, 0, 0, 0, 485, 486, 6, 9, 5, 0, 486, 35, 1, 0, 0, 0, 487, 488, 7, 16, 0, 0, 488, 489, 7, 11, 0, 0, 489, 490, 5, 95, 0, 0, 490, 491, 7, 3, 0, 0, 491, 492, 7, 14, 0, 0, 492, 493, 7, 8, 0, 0, 493, 494, 7, 12, 0, 0, 494, 495, 7, 9, 0, 0, 495, 496, 7, 0, 0, 0, 496, 497, 1, 0, 0, 0, 497, 498, 6, 10, 6, 0, 498, 37, 1, 0, 0, 0, 499, 500, 7, 6, 0, 0, 500, 501, 7, 3, 0, 0, 501, 502, 7, 9, 0, 0, 502, 503, 7, 12, 0, 0, 503, 504, 7, 16, 0, 0, 504, 505, 7, 3, 0, 0, 505, 506, 1, 0, 0, 0, 506, 507, 6, 11, 7, 0, 507, 39, 1, 0, 0, 0, 508, 509, 7, 6, 0, 0, 509, 510, 7, 7, 0, 0, 510, 511, 7, 19, 0, 0, 511, 512, 1, 0, 0, 0, 512, 513, 6, 12, 0, 0, 513, 41, 1, 0, 0, 0, 514, 515, 7, 2, 0, 0, 515, 516, 7, 10, 0, 0, 516, 517, 7, 7, 0, 0, 517, 518, 7, 19, 0, 0, 518, 519, 1, 0, 0, 0, 519, 520, 6, 13, 8, 0, 520, 43, 1, 0, 0, 0, 521, 522, 7, 2, 0, 0, 522, 523, 7, 7, 0, 0, 523, 524, 7, 6, 0, 0, 524, 525, 7, 5, 0, 0, 525, 526, 1, 0, 0, 0, 526, 527, 6, 14, 0, 0, 527, 45, 1, 0, 0, 0, 528, 529, 7, 2, 0, 0, 529, 530, 7, 5, 0, 0, 530, 531, 7, 12, 0, 0, 531, 532, 7, 5, 0, 0, 532, 533, 7, 2, 0, 0, 533, 534, 1, 0, 0, 0, 534, 535, 6, 15, 0, 0, 535, 47, 1, 0, 0, 0, 536, 537, 7, 19, 0, 0, 537, 538, 7, 10, 0, 0, 538, 539, 7, 3, 0, 0, 539, 540, 7, 6, 0, 0, 540, 541, 7, 3, 0, 0, 541, 542, 1, 0, 0, 0, 542, 543, 6, 16, 0, 0, 543, 49, 1, 0, 0, 0, 544, 545, 4, 17, 0, 0, 545, 546, 7, 1, 0, 0, 546, 547, 7, 9, 0, 0, 547, 548, 7, 13, 0, 0, 548, 549, 7, 1, 0, 0, 549, 550, 7, 9, 0, 0, 550, 551, 7, 3, 0, 0, 551, 552, 7, 2, 0, 0, 552, 553, 7, 5, 0, 0, 553, 554, 7, 12, 0, 0, 554, 555, 7, 5, 0, 0, 555, 556, 7, 2, 0, 0, 556, 557, 1, 0, 0, 0, 557, 558, 6, 17, 0, 0, 558, 51, 1, 0, 0, 0, 559, 560, 4, 18, 1, 0, 560, 561, 7, 13, 0, 0, 561, 562, 7, 7, 0, 0, 562, 563, 7, 7, 0, 0, 563, 564, 7, 18, 0, 0, 564, 565, 7, 20, 0, 0, 565, 566, 7, 8, 0, 0, 566, 567, 1, 0, 0, 0, 567, 568, 6, 18, 9, 0, 568, 53, 1, 0, 0, 0, 569, 570, 4, 19, 2, 0, 570, 571, 7, 16, 0, 0, 571, 572, 7, 12, 0, 0, 572, 573, 7, 5, 0, 0, 573, 574, 7, 4, 0, 0, 574, 575, 7, 10, 0, 0, 575, 576, 1, 0, 0, 0, 576, 577, 6, 19, 0, 0, 577, 55, 1, 0, 0, 0, 578, 579, 4, 20, 3, 0, 579, 580, 7, 16, 0, 0, 580, 581, 7, 3, 0, 0, 581, 582, 7, 5, 0, 0, 582, 583, 7, 6, 0, 0, 583, 584, 7, 1, 0, 0, 584, 585, 7, 4, 0, 0, 585, 586, 7, 2, 0, 0, 586, 587, 1, 0, 0, 0, 587, 588, 6, 20, 10, 0, 588, 57, 1, 0, 0, 0, 589, 591, 8, 21, 0, 0, 590, 589, 1, 0, 0, 0, 591, 592, 1, 0, 0, 0, 592, 590, 1, 0, 0, 0, 592, 593, 1, 0, 0, 0, 593, 594, 1, 0, 0, 0, 594, 595, 6, 21, 0, 0, 595, 59, 1, 0, 0, 0, 596, 597, 5, 47, 0, 0, 597, 598, 5, 47, 0, 0, 598, 602, 1, 0, 0, 0, 599, 601, 8, 22, 0, 0, 600, 599, 1, 0, 0, 0, 601, 604, 1, 0, 0, 0, 602, 600, 1, 0, 0, 0, 602, 603, 1, 0, 0, 0, 603, 606, 1, 0, 0, 0, 604, 602, 1, 0, 0, 0, 605, 607, 5, 13, 0, 0, 606, 605, 1, 0, 0, 0, 606, 607, 1, 0, 0, 0, 607, 609, 1, 0, 0, 0, 608, 610, 5, 10, 0, 0, 609, 608, 1, 0, 0, 0, 609, 610, 1, 0, 0, 0, 610, 611, 1, 0, 0, 0, 611, 612, 6, 22, 11, 0, 612, 61, 1, 0, 0, 0, 613, 614, 5, 47, 0, 0, 614, 615, 5, 42, 0, 0, 615, 620, 1, 0, 0, 0, 616, 619, 3, 62, 23, 0, 617, 619, 9, 0, 0, 0, 618, 616, 1, 0, 0, 0, 618, 617, 1, 0, 0, 0, 619, 622, 1, 0, 0, 0, 620, 621, 1, 0, 0, 0, 620, 618, 1, 0, 0, 0, 621, 623, 1, 0, 0, 0, 622, 620, 1, 0, 0, 0, 623, 624, 5, 42, 0, 0, 624, 625, 5, 47, 0, 0, 625, 626, 1, 0, 0, 0, 626, 627, 6, 23, 11, 0, 627, 63, 1, 0, 0, 0, 628, 630, 7, 23, 0, 0, 629, 628, 1, 0, 0, 0, 630, 631, 1, 0, 0, 0, 631, 629, 1, 0, 0, 0, 631, 632, 1, 0, 0, 0, 632, 633, 1, 0, 0, 0, 633, 634, 6, 24, 11, 0, 634, 65, 1, 0, 0, 0, 635, 636, 5, 124, 0, 0, 636, 637, 1, 0, 0, 0, 637, 638, 6, 25, 12, 0, 638, 67, 1, 0, 0, 0, 639, 640, 7, 24, 0, 0, 640, 69, 1, 0, 0, 0, 641, 642, 7, 25, 0, 0, 642, 71, 1, 0, 0, 0, 643, 644, 5, 92, 0, 0, 644, 645, 7, 26, 0, 0, 645, 73, 1, 0, 0, 0, 646, 647, 8, 27, 0, 0, 647, 75, 1, 0, 0, 0, 648, 650, 7, 3, 0, 0, 649, 651, 7, 28, 0, 0, 650, 649, 1, 0, 0, 0, 650, 651, 1, 0, 0, 0, 651, 653, 1, 0, 0, 0, 652, 654, 3, 68, 26, 0, 653, 652, 1, 0, 0, 0, 654, 655, 1, 0, 0, 0, 655, 653, 1, 0, 0, 0, 655, 656, 1, 0, 0, 0, 656, 77, 1, 0, 0, 0, 657, 658, 5, 64, 0, 0, 658, 79, 1, 0, 0, 0, 659, 660, 5, 96, 0, 0, 660, 81, 1, 0, 0, 0, 661, 665, 8, 29, 0, 0, 662, 663, 5, 96, 0, 0, 663, 665, 5, 96, 0, 0, 664, 661, 1, 0, 0, 0, 664, 662, 1, 0, 0, 0, 665, 83, 1, 0, 0, 0, 666, 667, 5, 95, 0, 0, 667, 85, 1, 0, 0, 0, 668, 672, 3, 70, 27, 0, 669, 672, 3, 68, 26, 0, 670, 672, 3, 84, 34, 0, 671, 668, 1, 0, 0, 0, 671, 669, 1, 0, 0, 0, 671, 670, 1, 0, 0, 0, 672, 87, 1, 0, 0, 0, 673, 678, 5, 34, 0, 0, 674, 677, 3, 72, 28, 0, 675, 677, 3, 74, 29, 0, 676, 674, 1, 0, 0, 0, 676, 675, 1, 0, 0, 0, 677, 680, 1, 0, 0, 0, 678, 676, 1, 0, 0, 0, 678, 679, 1, 0, 0, 0, 679, 681, 1, 0, 0, 0, 680, 678, 1, 0, 0, 0, 681, 703, 5, 34, 0, 0, 682, 683, 5, 34, 0, 0, 683, 684, 5, 34, 0, 0, 684, 685, 5, 34, 0, 0, 685, 689, 1, 0, 0, 0, 686, 688, 8, 22, 0, 0, 687, 686, 1, 0, 0, 0, 688, 691, 1, 0, 0, 0, 689, 690, 1, 0, 0, 0, 689, 687, 1, 0, 0, 0, 690, 692, 1, 0, 0, 0, 691, 689, 1, 0, 0, 0, 692, 693, 5, 34, 0, 0, 693, 694, 5, 34, 0, 0, 694, 695, 5, 34, 0, 0, 695, 697, 1, 0, 0, 0, 696, 698, 5, 34, 0, 0, 697, 696, 1, 0, 0, 0, 697, 698, 1, 0, 0, 0, 698, 700, 1, 0, 0, 0, 699, 701, 5, 34, 0, 0, 700, 699, 1, 0, 0, 0, 700, 701, 1, 0, 0, 0, 701, 703, 1, 0, 0, 0, 702, 673, 1, 0, 0, 0, 702, 682, 1, 0, 0, 0, 703, 89, 1, 0, 0, 0, 704, 706, 3, 68, 26, 0, 705, 704, 1, 0, 0, 0, 706, 707, 1, 0, 0, 0, 707, 705, 1, 0, 0, 0, 707, 708, 1, 0, 0, 0, 708, 91, 1, 0, 0, 0, 709, 711, 3, 68, 26, 0, 710, 709, 1, 0, 0, 0, 711, 712, 1, 0, 0, 0, 712, 710, 1, 0, 0, 0, 712, 713, 1, 0, 0, 0, 713, 714, 1, 0, 0, 0, 714, 718, 3, 108, 46, 0, 715, 717, 3, 68, 26, 0, 716, 715, 1, 0, 0, 0, 717, 720, 1, 0, 0, 0, 718, 716, 1, 0, 0, 0, 718, 719, 1, 0, 0, 0, 719, 752, 1, 0, 0, 0, 720, 718, 1, 0, 0, 0, 721, 723, 3, 108, 46, 0, 722, 724, 3, 68, 26, 0, 723, 722, 1, 0, 0, 0, 724, 725, 1, 0, 0, 0, 725, 723, 1, 0, 0, 0, 725, 726, 1, 0, 0, 0, 726, 752, 1, 0, 0, 0, 727, 729, 3, 68, 26, 0, 728, 727, 1, 0, 0, 0, 729, 730, 1, 0, 0, 0, 730, 728, 1, 0, 0, 0, 730, 731, 1, 0, 0, 0, 731, 739, 1, 0, 0, 0, 732, 736, 3, 108, 46, 0, 733, 735, 3, 68, 26, 0, 734, 733, 1, 0, 0, 0, 735, 738, 1, 0, 0, 0, 736, 734, 1, 0, 0, 0, 736, 737, 1, 0, 0, 0, 737, 740, 1, 0, 0, 0, 738, 736, 1, 0, 0, 0, 739, 732, 1, 0, 0, 0, 739, 740, 1, 0, 0, 0, 740, 741, 1, 0, 0, 0, 741, 742, 3, 76, 30, 0, 742, 752, 1, 0, 0, 0, 743, 745, 3, 108, 46, 0, 744, 746, 3, 68, 26, 0, 745, 744, 1, 0, 0, 0, 746, 747, 1, 0, 0, 0, 747, 745, 1, 0, 0, 0, 747, 748, 1, 0, 0, 0, 748, 749, 1, 0, 0, 0, 749, 750, 3, 76, 30, 0, 750, 752, 1, 0, 0, 0, 751, 710, 1, 0, 0, 0, 751, 721, 1, 0, 0, 0, 751, 728, 1, 0, 0, 0, 751, 743, 1, 0, 0, 0, 752, 93, 1, 0, 0, 0, 753, 754, 7, 30, 0, 0, 754, 755, 7, 31, 0, 0, 755, 95, 1, 0, 0, 0, 756, 757, 7, 12, 0, 0, 757, 758, 7, 9, 0, 0, 758, 759, 7, 0, 0, 0, 759, 97, 1, 0, 0, 0, 760, 761, 7, 12, 0, 0, 761, 762, 7, 2, 0, 0, 762, 763, 7, 4, 0, 0, 763, 99, 1, 0, 0, 0, 764, 765, 5, 61, 0, 0, 765, 101, 1, 0, 0, 0, 766, 767, 5, 58, 0, 0, 767, 768, 5, 58, 0, 0, 768, 103, 1, 0, 0, 0, 769, 770, 5, 44, 0, 0, 770, 105, 1, 0, 0, 0, 771, 772, 7, 0, 0, 0, 772, 773, 7, 3, 0, 0, 773, 774, 7, 2, 0, 0, 774, 775, 7, 4, 0, 0, 775, 107, 1, 0, 0, 0, 776, 777, 5, 46, 0, 0, 777, 109, 1, 0, 0, 0, 778, 779, 7, 15, 0, 0, 779, 780, 7, 12, 0, 0, 780, 781, 7, 13, 0, 0, 781, 782, 7, 2, 0, 0, 782, 783, 7, 3, 0, 0, 783, 111, 1, 0, 0, 0, 784, 785, 7, 15, 0, 0, 785, 786, 7, 1, 0, 0, 786, 787, 7, 6, 0, 0, 787, 788, 7, 2, 0, 0, 788, 789, 7, 5, 0, 0, 789, 113, 1, 0, 0, 0, 790, 791, 7, 1, 0, 0, 791, 792, 7, 9, 0, 0, 792, 115, 1, 0, 0, 0, 793, 794, 7, 1, 0, 0, 794, 795, 7, 2, 0, 0, 795, 117, 1, 0, 0, 0, 796, 797, 7, 13, 0, 0, 797, 798, 7, 12, 0, 0, 798, 799, 7, 2, 0, 0, 799, 800, 7, 5, 0, 0, 800, 119, 1, 0, 0, 0, 801, 802, 7, 13, 0, 0, 802, 803, 7, 1, 0, 0, 803, 804, 7, 18, 0, 0, 804, 805, 7, 3, 0, 0, 805, 121, 1, 0, 0, 0, 806, 807, 5, 40, 0, 0, 807, 123, 1, 0, 0, 0, 808, 809, 7, 9, 0, 0, 809, 810, 7, 7, 0, 0, 810, 811, 7, 5, 0, 0, 811, 125, 1, 0, 0, 0, 812, 813, 7, 9, 0, 0, 813, 814, 7, 20, 0, 0, 814, 815, 7, 13, 0, 0, 815, 816, 7, 13, 0, 0, 816, 127, 1, 0, 0, 0, 817, 818, 7, 9, 0, 0, 818, 819, 7, 20, 0, 0, 819, 820, 7, 13, 0, 0, 820, 821, 7, 13, 0, 0, 821, 822, 7, 2, 0, 0, 822, 129, 1, 0, 0, 0, 823, 824, 7, 7, 0, 0, 824, 825, 7, 6, 0, 0, 825, 131, 1, 0, 0, 0, 826, 827, 5, 63, 0, 0, 827, 133, 1, 0, 0, 0, 828, 829, 7, 6, 0, 0, 829, 830, 7, 13, 0, 0, 830, 831, 7, 1, 0, 0, 831, 832, 7, 18, 0, 0, 832, 833, 7, 3, 0, 0, 833, 135, 1, 0, 0, 0, 834, 835, 5, 41, 0, 0, 835, 137, 1, 0, 0, 0, 836, 837, 7, 5, 0, 0, 837, 838, 7, 6, 0, 0, 838, 839, 7, 20, 0, 0, 839, 840, 7, 3, 0, 0, 840, 139, 1, 0, 0, 0, 841, 842, 5, 61, 0, 0, 842, 843, 5, 61, 0, 0, 843, 141, 1, 0, 0, 0, 844, 845, 5, 61, 0, 0, 845, 846, 5, 126, 0, 0, 846, 143, 1, 0, 0, 0, 847, 848, 5, 33, 0, 0, 848, 849, 5, 61, 0, 0, 849, 145, 1, 0, 0, 0, 850, 851, 5, 60, 0, 0, 851, 147, 1, 0, 0, 0, 852, 853, 5, 60, 0, 0, 853, 854, 5, 61, 0, 0, 854, 149, 1, 0, 0, 0, 855, 856, 5, 62, 0, 0, 856, 151, 1, 0, 0, 0, 857, 858, 5, 62, 0, 0, 858, 859, 5, 61, 0, 0, 859, 153, 1, 0, 0, 0, 860, 861, 5, 43, 0, 0, 861, 155, 1, 0, 0, 0, 862, 863, 5, 45, 0, 0, 863, 157, 1, 0, 0, 0, 864, 865, 5, 42, 0, 0, 865, 159, 1, 0, 0, 0, 866, 867, 5, 47, 0, 0, 867, 161, 1, 0, 0, 0, 868, 869, 5, 37, 0, 0, 869, 163, 1, 0, 0, 0, 870, 871, 4, 74, 4, 0, 871, 872, 3, 54, 19, 0, 872, 873, 1, 0, 0, 0, 873, 874, 6, 74, 13, 0, 874, 165, 1, 0, 0, 0, 875, 878, 3, 132, 58, 0, 876, 879, 3, 70, 27, 0, 877, 879, 3, 84, 34, 0, 878, 876, 1, 0, 0, 0, 878, 877, 1, 0, 0, 0, 879, 883, 1, 0, 0, 0, 880, 882, 3, 86, 35, 0, 881, 880, 1, 0, 0, 0, 882, 885, 1, 0, 0, 0, 883, 881, 1, 0, 0, 0, 883, 884, 1, 0, 0, 0, 884, 893, 1, 0, 0, 0, 885, 883, 1, 0, 0, 0, 886, 888, 3, 132, 58, 0, 887, 889, 3, 68, 26, 0, 888, 887, 1, 0, 0, 0, 889, 890, 1, 0, 0, 0, 890, 888, 1, 0, 0, 0, 890, 891, 1, 0, 0, 0, 891, 893, 1, 0, 0, 0, 892, 875, 1, 0, 0, 0, 892, 886, 1, 0, 0, 0, 893, 167, 1, 0, 0, 0, 894, 895, 5, 91, 0, 0, 895, 896, 1, 0, 0, 0, 896, 897, 6, 76, 0, 0, 897, 898, 6, 76, 0, 0, 898, 169, 1, 0, 0, 0, 899, 900, 5, 93, 0, 0, 900, 901, 1, 0, 0, 0, 901, 902, 6, 77, 12, 0, 902, 903, 6, 77, 12, 0, 903, 171, 1, 0, 0, 0, 904, 908, 3, 70, 27, 0, 905, 907, 3, 86, 35, 0, 906, 905, 1, 0, 0, 0, 907, 910, 1, 0, 0, 0, 908, 906, 1, 0, 0, 0, 908, 909, 1, 0, 0, 0, 909, 921, 1, 0, 0, 0, 910, 908, 1, 0, 0, 0, 911, 914, 3, 84, 34, 0, 912, 914, 3, 78, 31, 0, 913, 911, 1, 0, 0, 0, 913, 912, 1, 0, 0, 0, 914, 916, 1, 0, 0, 0, 915, 917, 3, 86, 35, 0, 916, 915, 1, 0, 0, 0, 917, 918, 1, 0, 0, 0, 918, 916, 1, 0, 0, 0, 918, 919, 1, 0, 0, 0, 919, 921, 1, 0, 0, 0, 920, 904, 1, 0, 0, 0, 920, 913, 1, 0, 0, 0, 921, 173, 1, 0, 0, 0, 922, 924, 3, 80, 32, 0, 923, 925, 3, 82, 33, 0, 924, 923, 1, 0, 0, 0, 925, 926, 1, 0, 0, 0, 926, 924, 1, 0, 0, 0, 926, 927, 1, 0, 0, 0, 927, 928, 1, 0, 0, 0, 928, 929, 3, 80, 32, 0, 929, 175, 1, 0, 0, 0, 930, 931, 3, 174, 79, 0, 931, 177, 1, 0, 0, 0, 932, 933, 3, 60, 22, 0, 933, 934, 1, 0, 0, 0, 934, 935, 6, 81, 11, 0, 935, 179, 1, 0, 0, 0, 936, 937, 3, 62, 23, 0, 937, 938, 1, 0, 0, 0, 938, 939, 6, 82, 11, 0, 939, 181, 1, 0, 0, 0, 940, 941, 3, 64, 24, 0, 941, 942, 1, 0, 0, 0, 942, 943, 6, 83, 11, 0, 943, 183, 1, 0, 0, 0, 944, 945, 3, 168, 76, 0, 945, 946, 1, 0, 0, 0, 946, 947, 6, 84, 14, 0, 947, 948, 6, 84, 15, 0, 948, 185, 1, 0, 0, 0, 949, 950, 3, 66, 25, 0, 950, 951, 1, 0, 0, 0, 951, 952, 6, 85, 16, 0, 952, 953, 6, 85, 12, 0, 953, 187, 1, 0, 0, 0, 954, 955, 3, 64, 24, 0, 955, 956, 1, 0, 0, 0, 956, 957, 6, 86, 11, 0, 957, 189, 1, 0, 0, 0, 958, 959, 3, 60, 22, 0, 959, 960, 1, 0, 0, 0, 960, 961, 6, 87, 11, 0, 961, 191, 1, 0, 0, 0, 962, 963, 3, 62, 23, 0, 963, 964, 1, 0, 0, 0, 964, 965, 6, 88, 11, 0, 965, 193, 1, 0, 0, 0, 966, 967, 3, 66, 25, 0, 967, 968, 1, 0, 0, 0, 968, 969, 6, 89, 16, 0, 969, 970, 6, 89, 12, 0, 970, 195, 1, 0, 0, 0, 971, 972, 3, 168, 76, 0, 972, 973, 1, 0, 0, 0, 973, 974, 6, 90, 14, 0, 974, 197, 1, 0, 0, 0, 975, 976, 3, 170, 77, 0, 976, 977, 1, 0, 0, 0, 977, 978, 6, 91, 17, 0, 978, 199, 1, 0, 0, 0, 979, 980, 3, 334, 159, 0, 980, 981, 1, 0, 0, 0, 981, 982, 6, 92, 18, 0, 982, 201, 1, 0, 0, 0, 983, 984, 3, 104, 44, 0, 984, 985, 1, 0, 0, 0, 985, 986, 6, 93, 19, 0, 986, 203, 1, 0, 0, 0, 987, 988, 3, 100, 42, 0, 988, 989, 1, 0, 0, 0, 989, 990, 6, 94, 20, 0, 990, 205, 1, 0, 0, 0, 991, 992, 7, 16, 0, 0, 992, 993, 7, 3, 0, 0, 993, 994, 7, 5, 0, 0, 994, 995, 7, 12, 0, 0, 995, 996, 7, 0, 0, 0, 996, 997, 7, 12, 0, 0, 997, 998, 7, 5, 0, 0, 998, 999, 7, 12, 0, 0, 999, 207, 1, 0, 0, 0, 1000, 1004, 8, 32, 0, 0, 1001, 1002, 5, 47, 0, 0, 1002, 1004, 8, 33, 0, 0, 1003, 1000, 1, 0, 0, 0, 1003, 1001, 1, 0, 0, 0, 1004, 209, 1, 0, 0, 0, 1005, 1007, 3, 208, 96, 0, 1006, 1005, 1, 0, 0, 0, 1007, 1008, 1, 0, 0, 0, 1008, 1006, 1, 0, 0, 0, 1008, 1009, 1, 0, 0, 0, 1009, 211, 1, 0, 0, 0, 1010, 1011, 3, 210, 97, 0, 1011, 1012, 1, 0, 0, 0, 1012, 1013, 6, 98, 21, 0, 1013, 213, 1, 0, 0, 0, 1014, 1015, 3, 88, 36, 0, 1015, 1016, 1, 0, 0, 0, 1016, 1017, 6, 99, 22, 0, 1017, 215, 1, 0, 0, 0, 1018, 1019, 3, 60, 22, 0, 1019, 1020, 1, 0, 0, 0, 1020, 1021, 6, 100, 11, 0, 1021, 217, 1, 0, 0, 0, 1022, 1023, 3, 62, 23, 0, 1023, 1024, 1, 0, 0, 0, 1024, 1025, 6, 101, 11, 0, 1025, 219, 1, 0, 0, 0, 1026, 1027, 3, 64, 24, 0, 1027, 1028, 1, 0, 0, 0, 1028, 1029, 6, 102, 11, 0, 1029, 221, 1, 0, 0, 0, 1030, 1031, 3, 66, 25, 0, 1031, 1032, 1, 0, 0, 0, 1032, 1033, 6, 103, 16, 0, 1033, 1034, 6, 103, 12, 0, 1034, 223, 1, 0, 0, 0, 1035, 1036, 3, 108, 46, 0, 1036, 1037, 1, 0, 0, 0, 1037, 1038, 6, 104, 23, 0, 1038, 225, 1, 0, 0, 0, 1039, 1040, 3, 104, 44, 0, 1040, 1041, 1, 0, 0, 0, 1041, 1042, 6, 105, 19, 0, 1042, 227, 1, 0, 0, 0, 1043, 1048, 3, 70, 27, 0, 1044, 1048, 3, 68, 26, 0, 1045, 1048, 3, 84, 34, 0, 1046, 1048, 3, 158, 71, 0, 1047, 1043, 1, 0, 0, 0, 1047, 1044, 1, 0, 0, 0, 1047, 1045, 1, 0, 0, 0, 1047, 1046, 1, 0, 0, 0, 1048, 229, 1, 0, 0, 0, 1049, 1052, 3, 70, 27, 0, 1050, 1052, 3, 158, 71, 0, 1051, 1049, 1, 0, 0, 0, 1051, 1050, 1, 0, 0, 0, 1052, 1056, 1, 0, 0, 0, 1053, 1055, 3, 228, 106, 0, 1054, 1053, 1, 0, 0, 0, 1055, 1058, 1, 0, 0, 0, 1056, 1054, 1, 0, 0, 0, 1056, 1057, 1, 0, 0, 0, 1057, 1069, 1, 0, 0, 0, 1058, 1056, 1, 0, 0, 0, 1059, 1062, 3, 84, 34, 0, 1060, 1062, 3, 78, 31, 0, 1061, 1059, 1, 0, 0, 0, 1061, 1060, 1, 0, 0, 0, 1062, 1064, 1, 0, 0, 0, 1063, 1065, 3, 228, 106, 0, 1064, 1063, 1, 0, 0, 0, 1065, 1066, 1, 0, 0, 0, 1066, 1064, 1, 0, 0, 0, 1066, 1067, 1, 0, 0, 0, 1067, 1069, 1, 0, 0, 0, 1068, 1051, 1, 0, 0, 0, 1068, 1061, 1, 0, 0, 0, 1069, 231, 1, 0, 0, 0, 1070, 1073, 3, 230, 107, 0, 1071, 1073, 3, 174, 79, 0, 1072, 1070, 1, 0, 0, 0, 1072, 1071, 1, 0, 0, 0, 1073, 1074, 1, 0, 0, 0, 1074, 1072, 1, 0, 0, 0, 1074, 1075, 1, 0, 0, 0, 1075, 233, 1, 0, 0, 0, 1076, 1077, 3, 60, 22, 0, 1077, 1078, 1, 0, 0, 0, 1078, 1079, 6, 109, 11, 0, 1079, 235, 1, 0, 0, 0, 1080, 1081, 3, 62, 23, 0, 1081, 1082, 1, 0, 0, 0, 1082, 1083, 6, 110, 11, 0, 1083, 237, 1, 0, 0, 0, 1084, 1085, 3, 64, 24, 0, 1085, 1086, 1, 0, 0, 0, 1086, 1087, 6, 111, 11, 0, 1087, 239, 1, 0, 0, 0, 1088, 1089, 3, 66, 25, 0, 1089, 1090, 1, 0, 0, 0, 1090, 1091, 6, 112, 16, 0, 1091, 1092, 6, 112, 12, 0, 1092, 241, 1, 0, 0, 0, 1093, 1094, 3, 100, 42, 0, 1094, 1095, 1, 0, 0, 0, 1095, 1096, 6, 113, 20, 0, 1096, 243, 1, 0, 0, 0, 1097, 1098, 3, 104, 44, 0, 1098, 1099, 1, 0, 0, 0, 1099, 1100, 6, 114, 19, 0, 1100, 245, 1, 0, 0, 0, 1101, 1102, 3, 108, 46, 0, 1102, 1103, 1, 0, 0, 0, 1103, 1104, 6, 115, 23, 0, 1104, 247, 1, 0, 0, 0, 1105, 1106, 7, 12, 0, 0, 1106, 1107, 7, 2, 0, 0, 1107, 249, 1, 0, 0, 0, 1108, 1109, 3, 232, 108, 0, 1109, 1110, 1, 0, 0, 0, 1110, 1111, 6, 117, 24, 0, 1111, 251, 1, 0, 0, 0, 1112, 1113, 3, 60, 22, 0, 1113, 1114, 1, 0, 0, 0, 1114, 1115, 6, 118, 11, 0, 1115, 253, 1, 0, 0, 0, 1116, 1117, 3, 62, 23, 0, 1117, 1118, 1, 0, 0, 0, 1118, 1119, 6, 119, 11, 0, 1119, 255, 1, 0, 0, 0, 1120, 1121, 3, 64, 24, 0, 1121, 1122, 1, 0, 0, 0, 1122, 1123, 6, 120, 11, 0, 1123, 257, 1, 0, 0, 0, 1124, 1125, 3, 66, 25, 0, 1125, 1126, 1, 0, 0, 0, 1126, 1127, 6, 121, 16, 0, 1127, 1128, 6, 121, 12, 0, 1128, 259, 1, 0, 0, 0, 1129, 1130, 3, 168, 76, 0, 1130, 1131, 1, 0, 0, 0, 1131, 1132, 6, 122, 14, 0, 1132, 1133, 6, 122, 25, 0, 1133, 261, 1, 0, 0, 0, 1134, 1135, 7, 7, 0, 0, 1135, 1136, 7, 9, 0, 0, 1136, 1137, 1, 0, 0, 0, 1137, 1138, 6, 123, 26, 0, 1138, 263, 1, 0, 0, 0, 1139, 1140, 7, 19, 0, 0, 1140, 1141, 7, 1, 0, 0, 1141, 1142, 7, 5, 0, 0, 1142, 1143, 7, 10, 0, 0, 1143, 1144, 1, 0, 0, 0, 1144, 1145, 6, 124, 26, 0, 1145, 265, 1, 0, 0, 0, 1146, 1147, 8, 34, 0, 0, 1147, 267, 1, 0, 0, 0, 1148, 1150, 3, 266, 125, 0, 1149, 1148, 1, 0, 0, 0, 1150, 1151, 1, 0, 0, 0, 1151, 1149, 1, 0, 0, 0, 1151, 1152, 1, 0, 0, 0, 1152, 1153, 1, 0, 0, 0, 1153, 1154, 3, 334, 159, 0, 1154, 1156, 1, 0, 0, 0, 1155, 1149, 1, 0, 0, 0, 1155, 1156, 1, 0, 0, 0, 1156, 1158, 1, 0, 0, 0, 1157, 1159, 3, 266, 125, 0, 1158, 1157, 1, 0, 0, 0, 1159, 1160, 1, 0, 0, 0, 1160, 1158, 1, 0, 0, 0, 1160, 1161, 1, 0, 0, 0, 1161, 269, 1, 0, 0, 0, 1162, 1163, 3, 268, 126, 0, 1163, 1164, 1, 0, 0, 0, 1164, 1165, 6, 127, 27, 0, 1165, 271, 1, 0, 0, 0, 1166, 1167, 3, 60, 22, 0, 1167, 1168, 1, 0, 0, 0, 1168, 1169, 6, 128, 11, 0, 1169, 273, 1, 0, 0, 0, 1170, 1171, 3, 62, 23, 0, 1171, 1172, 1, 0, 0, 0, 1172, 1173, 6, 129, 11, 0, 1173, 275, 1, 0, 0, 0, 1174, 1175, 3, 64, 24, 0, 1175, 1176, 1, 0, 0, 0, 1176, 1177, 6, 130, 11, 0, 1177, 277, 1, 0, 0, 0, 1178, 1179, 3, 66, 25, 0, 1179, 1180, 1, 0, 0, 0, 1180, 1181, 6, 131, 16, 0, 1181, 1182, 6, 131, 12, 0, 1182, 1183, 6, 131, 12, 0, 1183, 279, 1, 0, 0, 0, 1184, 1185, 3, 100, 42, 0, 1185, 1186, 1, 0, 0, 0, 1186, 1187, 6, 132, 20, 0, 1187, 281, 1, 0, 0, 0, 1188, 1189, 3, 104, 44, 0, 1189, 1190, 1, 0, 0, 0, 1190, 1191, 6, 133, 19, 0, 1191, 283, 1, 0, 0, 0, 1192, 1193, 3, 108, 46, 0, 1193, 1194, 1, 0, 0, 0, 1194, 1195, 6, 134, 23, 0, 1195, 285, 1, 0, 0, 0, 1196, 1197, 3, 264, 124, 0, 1197, 1198, 1, 0, 0, 0, 1198, 1199, 6, 135, 28, 0, 1199, 287, 1, 0, 0, 0, 1200, 1201, 3, 232, 108, 0, 1201, 1202, 1, 0, 0, 0, 1202, 1203, 6, 136, 24, 0, 1203, 289, 1, 0, 0, 0, 1204, 1205, 3, 176, 80, 0, 1205, 1206, 1, 0, 0, 0, 1206, 1207, 6, 137, 29, 0, 1207, 291, 1, 0, 0, 0, 1208, 1209, 3, 60, 22, 0, 1209, 1210, 1, 0, 0, 0, 1210, 1211, 6, 138, 11, 0, 1211, 293, 1, 0, 0, 0, 1212, 1213, 3, 62, 23, 0, 1213, 1214, 1, 0, 0, 0, 1214, 1215, 6, 139, 11, 0, 1215, 295, 1, 0, 0, 0, 1216, 1217, 3, 64, 24, 0, 1217, 1218, 1, 0, 0, 0, 1218, 1219, 6, 140, 11, 0, 1219, 297, 1, 0, 0, 0, 1220, 1221, 3, 66, 25, 0, 1221, 1222, 1, 0, 0, 0, 1222, 1223, 6, 141, 16, 0, 1223, 1224, 6, 141, 12, 0, 1224, 299, 1, 0, 0, 0, 1225, 1226, 3, 108, 46, 0, 1226, 1227, 1, 0, 0, 0, 1227, 1228, 6, 142, 23, 0, 1228, 301, 1, 0, 0, 0, 1229, 1230, 3, 176, 80, 0, 1230, 1231, 1, 0, 0, 0, 1231, 1232, 6, 143, 29, 0, 1232, 303, 1, 0, 0, 0, 1233, 1234, 3, 172, 78, 0, 1234, 1235, 1, 0, 0, 0, 1235, 1236, 6, 144, 30, 0, 1236, 305, 1, 0, 0, 0, 1237, 1238, 3, 60, 22, 0, 1238, 1239, 1, 0, 0, 0, 1239, 1240, 6, 145, 11, 0, 1240, 307, 1, 0, 0, 0, 1241, 1242, 3, 62, 23, 0, 1242, 1243, 1, 0, 0, 0, 1243, 1244, 6, 146, 11, 0, 1244, 309, 1, 0, 0, 0, 1245, 1246, 3, 64, 24, 0, 1246, 1247, 1, 0, 0, 0, 1247, 1248, 6, 147, 11, 0, 1248, 311, 1, 0, 0, 0, 1249, 1250, 3, 66, 25, 0, 1250, 1251, 1, 0, 0, 0, 1251, 1252, 6, 148, 16, 0, 1252, 1253, 6, 148, 12, 0, 1253, 313, 1, 0, 0, 0, 1254, 1255, 7, 1, 0, 0, 1255, 1256, 7, 9, 0, 0, 1256, 1257, 7, 15, 0, 0, 1257, 1258, 7, 7, 0, 0, 1258, 315, 1, 0, 0, 0, 1259, 1260, 3, 60, 22, 0, 1260, 1261, 1, 0, 0, 0, 1261, 1262, 6, 150, 11, 0, 1262, 317, 1, 0, 0, 0, 1263, 1264, 3, 62, 23, 0, 1264, 1265, 1, 0, 0, 0, 1265, 1266, 6, 151, 11, 0, 1266, 319, 1, 0, 0, 0, 1267, 1268, 3, 64, 24, 0, 1268, 1269, 1, 0, 0, 0, 1269, 1270, 6, 152, 11, 0, 1270, 321, 1, 0, 0, 0, 1271, 1272, 3, 66, 25, 0, 1272, 1273, 1, 0, 0, 0, 1273, 1274, 6, 153, 16, 0, 1274, 1275, 6, 153, 12, 0, 1275, 323, 1, 0, 0, 0, 1276, 1277, 7, 15, 0, 0, 1277, 1278, 7, 20, 0, 0, 1278, 1279, 7, 9, 0, 0, 1279, 1280, 7, 4, 0, 0, 1280, 1281, 7, 5, 0, 0, 1281, 1282, 7, 1, 0, 0, 1282, 1283, 7, 7, 0, 0, 1283, 1284, 7, 9, 0, 0, 1284, 1285, 7, 2, 0, 0, 1285, 325, 1, 0, 0, 0, 1286, 1287, 3, 60, 22, 0, 1287, 1288, 1, 0, 0, 0, 1288, 1289, 6, 155, 11, 0, 1289, 327, 1, 0, 0, 0, 1290, 1291, 3, 62, 23, 0, 1291, 1292, 1, 0, 0, 0, 1292, 1293, 6, 156, 11, 0, 1293, 329, 1, 0, 0, 0, 1294, 1295, 3, 64, 24, 0, 1295, 1296, 1, 0, 0, 0, 1296, 1297, 6, 157, 11, 0, 1297, 331, 1, 0, 0, 0, 1298, 1299, 3, 170, 77, 0, 1299, 1300, 1, 0, 0, 0, 1300, 1301, 6, 158, 17, 0, 1301, 1302, 6, 158, 12, 0, 1302, 333, 1, 0, 0, 0, 1303, 1304, 5, 58, 0, 0, 1304, 335, 1, 0, 0, 0, 1305, 1311, 3, 78, 31, 0, 1306, 1311, 3, 68, 26, 0, 1307, 1311, 3, 108, 46, 0, 1308, 1311, 3, 70, 27, 0, 1309, 1311, 3, 84, 34, 0, 1310, 1305, 1, 0, 0, 0, 1310, 1306, 1, 0, 0, 0, 1310, 1307, 1, 0, 0, 0, 1310, 1308, 1, 0, 0, 0, 1310, 1309, 1, 0, 0, 0, 1311, 1312, 1, 0, 0, 0, 1312, 1310, 1, 0, 0, 0, 1312, 1313, 1, 0, 0, 0, 1313, 337, 1, 0, 0, 0, 1314, 1315, 3, 60, 22, 0, 1315, 1316, 1, 0, 0, 0, 1316, 1317, 6, 161, 11, 0, 1317, 339, 1, 0, 0, 0, 1318, 1319, 3, 62, 23, 0, 1319, 1320, 1, 0, 0, 0, 1320, 1321, 6, 162, 11, 0, 1321, 341, 1, 0, 0, 0, 1322, 1323, 3, 64, 24, 0, 1323, 1324, 1, 0, 0, 0, 1324, 1325, 6, 163, 11, 0, 1325, 343, 1, 0, 0, 0, 1326, 1327, 3, 66, 25, 0, 1327, 1328, 1, 0, 0, 0, 1328, 1329, 6, 164, 16, 0, 1329, 1330, 6, 164, 12, 0, 1330, 345, 1, 0, 0, 0, 1331, 1332, 3, 334, 159, 0, 1332, 1333, 1, 0, 0, 0, 1333, 1334, 6, 165, 18, 0, 1334, 347, 1, 0, 0, 0, 1335, 1336, 3, 104, 44, 0, 1336, 1337, 1, 0, 0, 0, 1337, 1338, 6, 166, 19, 0, 1338, 349, 1, 0, 0, 0, 1339, 1340, 3, 108, 46, 0, 1340, 1341, 1, 0, 0, 0, 1341, 1342, 6, 167, 23, 0, 1342, 351, 1, 0, 0, 0, 1343, 1344, 3, 262, 123, 0, 1344, 1345, 1, 0, 0, 0, 1345, 1346, 6, 168, 31, 0, 1346, 1347, 6, 168, 32, 0, 1347, 353, 1, 0, 0, 0, 1348, 1349, 3, 210, 97, 0, 1349, 1350, 1, 0, 0, 0, 1350, 1351, 6, 169, 21, 0, 1351, 355, 1, 0, 0, 0, 1352, 1353, 3, 88, 36, 0, 1353, 1354, 1, 0, 0, 0, 1354, 1355, 6, 170, 22, 0, 1355, 357, 1, 0, 0, 0, 1356, 1357, 3, 60, 22, 0, 1357, 1358, 1, 0, 0, 0, 1358, 1359, 6, 171, 11, 0, 1359, 359, 1, 0, 0, 0, 1360, 1361, 3, 62, 23, 0, 1361, 1362, 1, 0, 0, 0, 1362, 1363, 6, 172, 11, 0, 1363, 361, 1, 0, 0, 0, 1364, 1365, 3, 64, 24, 0, 1365, 1366, 1, 0, 0, 0, 1366, 1367, 6, 173, 11, 0, 1367, 363, 1, 0, 0, 0, 1368, 1369, 3, 66, 25, 0, 1369, 1370, 1, 0, 0, 0, 1370, 1371, 6, 174, 16, 0, 1371, 1372, 6, 174, 12, 0, 1372, 1373, 6, 174, 12, 0, 1373, 365, 1, 0, 0, 0, 1374, 1375, 3, 104, 44, 0, 1375, 1376, 1, 0, 0, 0, 1376, 1377, 6, 175, 19, 0, 1377, 367, 1, 0, 0, 0, 1378, 1379, 3, 108, 46, 0, 1379, 1380, 1, 0, 0, 0, 1380, 1381, 6, 176, 23, 0, 1381, 369, 1, 0, 0, 0, 1382, 1383, 3, 232, 108, 0, 1383, 1384, 1, 0, 0, 0, 1384, 1385, 6, 177, 24, 0, 1385, 371, 1, 0, 0, 0, 1386, 1387, 3, 60, 22, 0, 1387, 1388, 1, 0, 0, 0, 1388, 1389, 6, 178, 11, 0, 1389, 373, 1, 0, 0, 0, 1390, 1391, 3, 62, 23, 0, 1391, 1392, 1, 0, 0, 0, 1392, 1393, 6, 179, 11, 0, 1393, 375, 1, 0, 0, 0, 1394, 1395, 3, 64, 24, 0, 1395, 1396, 1, 0, 0, 0, 1396, 1397, 6, 180, 11, 0, 1397, 377, 1, 0, 0, 0, 1398, 1399, 3, 66, 25, 0, 1399, 1400, 1, 0, 0, 0, 1400, 1401, 6, 181, 16, 0, 1401, 1402, 6, 181, 12, 0, 1402, 379, 1, 0, 0, 0, 1403, 1404, 3, 210, 97, 0, 1404, 1405, 1, 0, 0, 0, 1405, 1406, 6, 182, 21, 0, 1406, 1407, 6, 182, 12, 0, 1407, 1408, 6, 182, 33, 0, 1408, 381, 1, 0, 0, 0, 1409, 1410, 3, 88, 36, 0, 1410, 1411, 1, 0, 0, 0, 1411, 1412, 6, 183, 22, 0, 1412, 1413, 6, 183, 12, 0, 1413, 1414, 6, 183, 33, 0, 1414, 383, 1, 0, 0, 0, 1415, 1416, 3, 60, 22, 0, 1416, 1417, 1, 0, 0, 0, 1417, 1418, 6, 184, 11, 0, 1418, 385, 1, 0, 0, 0, 1419, 1420, 3, 62, 23, 0, 1420, 1421, 1, 0, 0, 0, 1421, 1422, 6, 185, 11, 0, 1422, 387, 1, 0, 0, 0, 1423, 1424, 3, 64, 24, 0, 1424, 1425, 1, 0, 0, 0, 1425, 1426, 6, 186, 11, 0, 1426, 389, 1, 0, 0, 0, 1427, 1428, 3, 334, 159, 0, 1428, 1429, 1, 0, 0, 0, 1429, 1430, 6, 187, 18, 0, 1430, 1431, 6, 187, 12, 0, 1431, 1432, 6, 187, 10, 0, 1432, 391, 1, 0, 0, 0, 1433, 1434, 3, 104, 44, 0, 1434, 1435, 1, 0, 0, 0, 1435, 1436, 6, 188, 19, 0, 1436, 1437, 6, 188, 12, 0, 1437, 1438, 6, 188, 10, 0, 1438, 393, 1, 0, 0, 0, 1439, 1440, 3, 60, 22, 0, 1440, 1441, 1, 0, 0, 0, 1441, 1442, 6, 189, 11, 0, 1442, 395, 1, 0, 0, 0, 1443, 1444, 3, 62, 23, 0, 1444, 1445, 1, 0, 0, 0, 1445, 1446, 6, 190, 11, 0, 1446, 397, 1, 0, 0, 0, 1447, 1448, 3, 64, 24, 0, 1448, 1449, 1, 0, 0, 0, 1449, 1450, 6, 191, 11, 0, 1450, 399, 1, 0, 0, 0, 1451, 1452, 3, 176, 80, 0, 1452, 1453, 1, 0, 0, 0, 1453, 1454, 6, 192, 12, 0, 1454, 1455, 6, 192, 0, 0, 1455, 1456, 6, 192, 29, 0, 1456, 401, 1, 0, 0, 0, 1457, 1458, 3, 172, 78, 0, 1458, 1459, 1, 0, 0, 0, 1459, 1460, 6, 193, 12, 0, 1460, 1461, 6, 193, 0, 0, 1461, 1462, 6, 193, 30, 0, 1462, 403, 1, 0, 0, 0, 1463, 1464, 3, 94, 39, 0, 1464, 1465, 1, 0, 0, 0, 1465, 1466, 6, 194, 12, 0, 1466, 1467, 6, 194, 0, 0, 1467, 1468, 6, 194, 34, 0, 1468, 405, 1, 0, 0, 0, 1469, 1470, 3, 66, 25, 0, 1470, 1471, 1, 0, 0, 0, 1471, 1472, 6, 195, 16, 0, 1472, 1473, 6, 195, 12, 0, 1473, 407, 1, 0, 0, 0, 66, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 592, 602, 606, 609, 618, 620, 631, 650, 655, 664, 671, 676, 678, 689, 697, 700, 702, 707, 712, 718, 725, 730, 736, 739, 747, 751, 878, 883, 890, 892, 908, 913, 918, 920, 926, 1003, 1008, 1047, 1051, 1056, 1061, 1066, 1068, 1072, 1074, 1151, 1155, 1160, 1310, 1312, 35, 5, 1, 0, 5, 4, 0, 5, 6, 0, 5, 2, 0, 5, 3, 0, 5, 10, 0, 5, 8, 0, 5, 5, 0, 5, 9, 0, 5, 12, 0, 5, 14, 0, 0, 1, 0, 4, 0, 0, 7, 20, 0, 7, 66, 0, 5, 0, 0, 7, 26, 0, 7, 67, 0, 7, 109, 0, 7, 35, 0, 7, 33, 0, 7, 77, 0, 7, 27, 0, 7, 37, 0, 7, 81, 0, 5, 11, 0, 5, 7, 0, 7, 91, 0, 7, 90, 0, 7, 69, 0, 7, 68, 0, 7, 89, 0, 5, 13, 0, 5, 15, 0, 7, 30, 0]
\ No newline at end of file
+[4, 0, 120, 1475, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 2, 81, 7, 81, 2, 82, 7, 82, 2, 83, 7, 83, 2, 84, 7, 84, 2, 85, 7, 85, 2, 86, 7, 86, 2, 87, 7, 87, 2, 88, 7, 88, 2, 89, 7, 89, 2, 90, 7, 90, 2, 91, 7, 91, 2, 92, 7, 92, 2, 93, 7, 93, 2, 94, 7, 94, 2, 95, 7, 95, 2, 96, 7, 96, 2, 97, 7, 97, 2, 98, 7, 98, 2, 99, 7, 99, 2, 100, 7, 100, 2, 101, 7, 101, 2, 102, 7, 102, 2, 103, 7, 103, 2, 104, 7, 104, 2, 105, 7, 105, 2, 106, 7, 106, 2, 107, 7, 107, 2, 108, 7, 108, 2, 109, 7, 109, 2, 110, 7, 110, 2, 111, 7, 111, 2, 112, 7, 112, 2, 113, 7, 113, 2, 114, 7, 114, 2, 115, 7, 115, 2, 116, 7, 116, 2, 117, 7, 117, 2, 118, 7, 118, 2, 119, 7, 119, 2, 120, 7, 120, 2, 121, 7, 121, 2, 122, 7, 122, 2, 123, 7, 123, 2, 124, 7, 124, 2, 125, 7, 125, 2, 126, 7, 126, 2, 127, 7, 127, 2, 128, 7, 128, 2, 129, 7, 129, 2, 130, 7, 130, 2, 131, 7, 131, 2, 132, 7, 132, 2, 133, 7, 133, 2, 134, 7, 134, 2, 135, 7, 135, 2, 136, 7, 136, 2, 137, 7, 137, 2, 138, 7, 138, 2, 139, 7, 139, 2, 140, 7, 140, 2, 141, 7, 141, 2, 142, 7, 142, 2, 143, 7, 143, 2, 144, 7, 144, 2, 145, 7, 145, 2, 146, 7, 146, 2, 147, 7, 147, 2, 148, 7, 148, 2, 149, 7, 149, 2, 150, 7, 150, 2, 151, 7, 151, 2, 152, 7, 152, 2, 153, 7, 153, 2, 154, 7, 154, 2, 155, 7, 155, 2, 156, 7, 156, 2, 157, 7, 157, 2, 158, 7, 158, 2, 159, 7, 159, 2, 160, 7, 160, 2, 161, 7, 161, 2, 162, 7, 162, 2, 163, 7, 163, 2, 164, 7, 164, 2, 165, 7, 165, 2, 166, 7, 166, 2, 167, 7, 167, 2, 168, 7, 168, 2, 169, 7, 169, 2, 170, 7, 170, 2, 171, 7, 171, 2, 172, 7, 172, 2, 173, 7, 173, 2, 174, 7, 174, 2, 175, 7, 175, 2, 176, 7, 176, 2, 177, 7, 177, 2, 178, 7, 178, 2, 179, 7, 179, 2, 180, 7, 180, 2, 181, 7, 181, 2, 182, 7, 182, 2, 183, 7, 183, 2, 184, 7, 184, 2, 185, 7, 185, 2, 186, 7, 186, 2, 187, 7, 187, 2, 188, 7, 188, 2, 189, 7, 189, 2, 190, 7, 190, 2, 191, 7, 191, 2, 192, 7, 192, 2, 193, 7, 193, 2, 194, 7, 194, 2, 195, 7, 195, 2, 196, 7, 196, 2, 197, 7, 197, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 4, 20, 587, 8, 20, 11, 20, 12, 20, 588, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 5, 21, 597, 8, 21, 10, 21, 12, 21, 600, 9, 21, 1, 21, 3, 21, 603, 8, 21, 1, 21, 3, 21, 606, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 5, 22, 615, 8, 22, 10, 22, 12, 22, 618, 9, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 4, 23, 626, 8, 23, 11, 23, 12, 23, 627, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 3, 29, 647, 8, 29, 1, 29, 4, 29, 650, 8, 29, 11, 29, 12, 29, 651, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 3, 32, 661, 8, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 3, 34, 668, 8, 34, 1, 35, 1, 35, 1, 35, 5, 35, 673, 8, 35, 10, 35, 12, 35, 676, 9, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 5, 35, 684, 8, 35, 10, 35, 12, 35, 687, 9, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 3, 35, 694, 8, 35, 1, 35, 3, 35, 697, 8, 35, 3, 35, 699, 8, 35, 1, 36, 4, 36, 702, 8, 36, 11, 36, 12, 36, 703, 1, 37, 4, 37, 707, 8, 37, 11, 37, 12, 37, 708, 1, 37, 1, 37, 5, 37, 713, 8, 37, 10, 37, 12, 37, 716, 9, 37, 1, 37, 1, 37, 4, 37, 720, 8, 37, 11, 37, 12, 37, 721, 1, 37, 4, 37, 725, 8, 37, 11, 37, 12, 37, 726, 1, 37, 1, 37, 5, 37, 731, 8, 37, 10, 37, 12, 37, 734, 9, 37, 3, 37, 736, 8, 37, 1, 37, 1, 37, 1, 37, 1, 37, 4, 37, 742, 8, 37, 11, 37, 12, 37, 743, 1, 37, 1, 37, 3, 37, 748, 8, 37, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 58, 1, 58, 1, 58, 1, 59, 1, 59, 1, 60, 1, 60, 1, 60, 1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 63, 1, 63, 1, 63, 1, 64, 1, 64, 1, 65, 1, 65, 1, 65, 1, 66, 1, 66, 1, 67, 1, 67, 1, 67, 1, 68, 1, 68, 1, 69, 1, 69, 1, 70, 1, 70, 1, 71, 1, 71, 1, 72, 1, 72, 1, 73, 1, 73, 1, 73, 1, 73, 1, 73, 1, 74, 1, 74, 1, 74, 3, 74, 875, 8, 74, 1, 74, 5, 74, 878, 8, 74, 10, 74, 12, 74, 881, 9, 74, 1, 74, 1, 74, 4, 74, 885, 8, 74, 11, 74, 12, 74, 886, 3, 74, 889, 8, 74, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 76, 1, 76, 1, 76, 1, 76, 1, 76, 1, 77, 1, 77, 5, 77, 903, 8, 77, 10, 77, 12, 77, 906, 9, 77, 1, 77, 1, 77, 3, 77, 910, 8, 77, 1, 77, 4, 77, 913, 8, 77, 11, 77, 12, 77, 914, 3, 77, 917, 8, 77, 1, 78, 1, 78, 4, 78, 921, 8, 78, 11, 78, 12, 78, 922, 1, 78, 1, 78, 1, 79, 1, 79, 1, 80, 1, 80, 1, 80, 1, 80, 1, 81, 1, 81, 1, 81, 1, 81, 1, 82, 1, 82, 1, 82, 1, 82, 1, 83, 1, 83, 1, 83, 1, 83, 1, 83, 1, 84, 1, 84, 1, 84, 1, 84, 1, 84, 1, 85, 1, 85, 1, 85, 1, 85, 1, 86, 1, 86, 1, 86, 1, 86, 1, 87, 1, 87, 1, 87, 1, 87, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 89, 1, 89, 1, 89, 1, 89, 1, 90, 1, 90, 1, 90, 1, 90, 1, 91, 1, 91, 1, 91, 1, 91, 1, 92, 1, 92, 1, 92, 1, 92, 1, 93, 1, 93, 1, 93, 1, 93, 1, 94, 1, 94, 1, 94, 1, 94, 1, 94, 1, 94, 1, 94, 1, 94, 1, 94, 1, 95, 1, 95, 1, 95, 3, 95, 1000, 8, 95, 1, 96, 4, 96, 1003, 8, 96, 11, 96, 12, 96, 1004, 1, 97, 1, 97, 1, 97, 1, 97, 1, 98, 1, 98, 1, 98, 1, 98, 1, 99, 1, 99, 1, 99, 1, 99, 1, 100, 1, 100, 1, 100, 1, 100, 1, 101, 1, 101, 1, 101, 1, 101, 1, 102, 1, 102, 1, 102, 1, 102, 1, 102, 1, 103, 1, 103, 1, 103, 1, 103, 1, 104, 1, 104, 1, 104, 1, 104, 1, 105, 1, 105, 1, 105, 1, 105, 1, 106, 1, 106, 1, 106, 1, 106, 1, 107, 1, 107, 1, 107, 1, 107, 3, 107, 1052, 8, 107, 1, 108, 1, 108, 3, 108, 1056, 8, 108, 1, 108, 5, 108, 1059, 8, 108, 10, 108, 12, 108, 1062, 9, 108, 1, 108, 1, 108, 3, 108, 1066, 8, 108, 1, 108, 4, 108, 1069, 8, 108, 11, 108, 12, 108, 1070, 3, 108, 1073, 8, 108, 1, 109, 1, 109, 4, 109, 1077, 8, 109, 11, 109, 12, 109, 1078, 1, 110, 1, 110, 1, 110, 1, 110, 1, 111, 1, 111, 1, 111, 1, 111, 1, 112, 1, 112, 1, 112, 1, 112, 1, 113, 1, 113, 1, 113, 1, 113, 1, 113, 1, 114, 1, 114, 1, 114, 1, 114, 1, 115, 1, 115, 1, 115, 1, 115, 1, 116, 1, 116, 1, 116, 1, 116, 1, 117, 1, 117, 1, 117, 1, 117, 1, 118, 1, 118, 1, 118, 1, 118, 1, 119, 1, 119, 1, 119, 1, 120, 1, 120, 1, 120, 1, 120, 1, 121, 1, 121, 1, 121, 1, 121, 1, 122, 1, 122, 1, 122, 1, 122, 1, 123, 1, 123, 1, 123, 1, 123, 1, 124, 1, 124, 1, 124, 1, 124, 1, 124, 1, 125, 1, 125, 1, 125, 1, 125, 1, 125, 1, 126, 1, 126, 1, 126, 1, 126, 1, 126, 1, 127, 1, 127, 1, 127, 1, 127, 1, 127, 1, 127, 1, 127, 1, 128, 1, 128, 1, 129, 4, 129, 1162, 8, 129, 11, 129, 12, 129, 1163, 1, 129, 1, 129, 3, 129, 1168, 8, 129, 1, 129, 4, 129, 1171, 8, 129, 11, 129, 12, 129, 1172, 1, 130, 1, 130, 1, 130, 1, 130, 1, 131, 1, 131, 1, 131, 1, 131, 1, 132, 1, 132, 1, 132, 1, 132, 1, 133, 1, 133, 1, 133, 1, 133, 1, 134, 1, 134, 1, 134, 1, 134, 1, 134, 1, 134, 1, 135, 1, 135, 1, 135, 1, 135, 1, 136, 1, 136, 1, 136, 1, 136, 1, 137, 1, 137, 1, 137, 1, 137, 1, 138, 1, 138, 1, 138, 1, 138, 1, 139, 1, 139, 1, 139, 1, 139, 1, 140, 1, 140, 1, 140, 1, 140, 1, 141, 1, 141, 1, 141, 1, 141, 1, 142, 1, 142, 1, 142, 1, 142, 1, 143, 1, 143, 1, 143, 1, 143, 1, 144, 1, 144, 1, 144, 1, 144, 1, 145, 1, 145, 1, 145, 1, 145, 1, 146, 1, 146, 1, 146, 1, 146, 1, 146, 1, 147, 1, 147, 1, 147, 1, 147, 1, 148, 1, 148, 1, 148, 1, 148, 1, 149, 1, 149, 1, 149, 1, 149, 1, 150, 1, 150, 1, 150, 1, 150, 1, 151, 1, 151, 1, 151, 1, 151, 1, 152, 1, 152, 1, 152, 1, 152, 1, 153, 1, 153, 1, 153, 1, 153, 1, 154, 1, 154, 1, 154, 1, 154, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 157, 1, 157, 1, 157, 1, 157, 1, 158, 1, 158, 1, 158, 1, 158, 1, 159, 1, 159, 1, 159, 1, 159, 1, 160, 1, 160, 1, 160, 1, 160, 1, 160, 1, 161, 1, 161, 1, 162, 1, 162, 1, 162, 1, 162, 1, 162, 4, 162, 1312, 8, 162, 11, 162, 12, 162, 1313, 1, 163, 1, 163, 1, 163, 1, 163, 1, 164, 1, 164, 1, 164, 1, 164, 1, 165, 1, 165, 1, 165, 1, 165, 1, 166, 1, 166, 1, 166, 1, 166, 1, 166, 1, 167, 1, 167, 1, 167, 1, 167, 1, 168, 1, 168, 1, 168, 1, 168, 1, 169, 1, 169, 1, 169, 1, 169, 1, 170, 1, 170, 1, 170, 1, 170, 1, 170, 1, 171, 1, 171, 1, 171, 1, 171, 1, 172, 1, 172, 1, 172, 1, 172, 1, 173, 1, 173, 1, 173, 1, 173, 1, 174, 1, 174, 1, 174, 1, 174, 1, 175, 1, 175, 1, 175, 1, 175, 1, 176, 1, 176, 1, 176, 1, 176, 1, 176, 1, 176, 1, 177, 1, 177, 1, 177, 1, 177, 1, 178, 1, 178, 1, 178, 1, 178, 1, 179, 1, 179, 1, 179, 1, 179, 1, 180, 1, 180, 1, 180, 1, 180, 1, 181, 1, 181, 1, 181, 1, 181, 1, 182, 1, 182, 1, 182, 1, 182, 1, 183, 1, 183, 1, 183, 1, 183, 1, 183, 1, 184, 1, 184, 1, 184, 1, 184, 1, 184, 1, 184, 1, 185, 1, 185, 1, 185, 1, 185, 1, 185, 1, 185, 1, 186, 1, 186, 1, 186, 1, 186, 1, 187, 1, 187, 1, 187, 1, 187, 1, 188, 1, 188, 1, 188, 1, 188, 1, 189, 1, 189, 1, 189, 1, 189, 1, 189, 1, 189, 1, 190, 1, 190, 1, 190, 1, 190, 1, 190, 1, 190, 1, 191, 1, 191, 1, 191, 1, 191, 1, 192, 1, 192, 1, 192, 1, 192, 1, 193, 1, 193, 1, 193, 1, 193, 1, 194, 1, 194, 1, 194, 1, 194, 1, 194, 1, 194, 1, 195, 1, 195, 1, 195, 1, 195, 1, 195, 1, 195, 1, 196, 1, 196, 1, 196, 1, 196, 1, 196, 1, 196, 1, 197, 1, 197, 1, 197, 1, 197, 1, 197, 2, 616, 685, 0, 198, 15, 1, 17, 2, 19, 3, 21, 4, 23, 5, 25, 6, 27, 7, 29, 8, 31, 9, 33, 10, 35, 11, 37, 12, 39, 13, 41, 14, 43, 15, 45, 16, 47, 17, 49, 18, 51, 19, 53, 20, 55, 21, 57, 22, 59, 23, 61, 24, 63, 25, 65, 0, 67, 0, 69, 0, 71, 0, 73, 0, 75, 0, 77, 0, 79, 0, 81, 0, 83, 0, 85, 26, 87, 27, 89, 28, 91, 29, 93, 30, 95, 31, 97, 32, 99, 33, 101, 34, 103, 35, 105, 36, 107, 37, 109, 38, 111, 39, 113, 40, 115, 41, 117, 42, 119, 43, 121, 44, 123, 45, 125, 46, 127, 47, 129, 48, 131, 49, 133, 50, 135, 51, 137, 52, 139, 53, 141, 54, 143, 55, 145, 56, 147, 57, 149, 58, 151, 59, 153, 60, 155, 61, 157, 62, 159, 63, 161, 0, 163, 64, 165, 65, 167, 66, 169, 67, 171, 0, 173, 68, 175, 69, 177, 70, 179, 71, 181, 0, 183, 0, 185, 72, 187, 73, 189, 74, 191, 0, 193, 0, 195, 0, 197, 0, 199, 0, 201, 0, 203, 75, 205, 0, 207, 76, 209, 0, 211, 0, 213, 77, 215, 78, 217, 79, 219, 0, 221, 0, 223, 0, 225, 0, 227, 0, 229, 0, 231, 0, 233, 80, 235, 81, 237, 82, 239, 83, 241, 0, 243, 0, 245, 0, 247, 0, 249, 0, 251, 0, 253, 84, 255, 0, 257, 85, 259, 86, 261, 87, 263, 0, 265, 0, 267, 88, 269, 89, 271, 0, 273, 90, 275, 0, 277, 91, 279, 92, 281, 93, 283, 0, 285, 0, 287, 0, 289, 0, 291, 0, 293, 0, 295, 0, 297, 0, 299, 0, 301, 94, 303, 95, 305, 96, 307, 0, 309, 0, 311, 0, 313, 0, 315, 0, 317, 0, 319, 97, 321, 98, 323, 99, 325, 0, 327, 100, 329, 101, 331, 102, 333, 103, 335, 0, 337, 104, 339, 105, 341, 106, 343, 107, 345, 108, 347, 0, 349, 0, 351, 0, 353, 0, 355, 0, 357, 0, 359, 0, 361, 109, 363, 110, 365, 111, 367, 0, 369, 0, 371, 0, 373, 0, 375, 112, 377, 113, 379, 114, 381, 0, 383, 0, 385, 0, 387, 115, 389, 116, 391, 117, 393, 0, 395, 0, 397, 118, 399, 119, 401, 120, 403, 0, 405, 0, 407, 0, 409, 0, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 35, 2, 0, 68, 68, 100, 100, 2, 0, 73, 73, 105, 105, 2, 0, 83, 83, 115, 115, 2, 0, 69, 69, 101, 101, 2, 0, 67, 67, 99, 99, 2, 0, 84, 84, 116, 116, 2, 0, 82, 82, 114, 114, 2, 0, 79, 79, 111, 111, 2, 0, 80, 80, 112, 112, 2, 0, 78, 78, 110, 110, 2, 0, 72, 72, 104, 104, 2, 0, 86, 86, 118, 118, 2, 0, 65, 65, 97, 97, 2, 0, 76, 76, 108, 108, 2, 0, 88, 88, 120, 120, 2, 0, 70, 70, 102, 102, 2, 0, 77, 77, 109, 109, 2, 0, 71, 71, 103, 103, 2, 0, 75, 75, 107, 107, 2, 0, 87, 87, 119, 119, 2, 0, 85, 85, 117, 117, 6, 0, 9, 10, 13, 13, 32, 32, 47, 47, 91, 91, 93, 93, 2, 0, 10, 10, 13, 13, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 2, 0, 65, 90, 97, 122, 8, 0, 34, 34, 78, 78, 82, 82, 84, 84, 92, 92, 110, 110, 114, 114, 116, 116, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 2, 0, 43, 43, 45, 45, 1, 0, 96, 96, 2, 0, 66, 66, 98, 98, 2, 0, 89, 89, 121, 121, 11, 0, 9, 10, 13, 13, 32, 32, 34, 34, 44, 44, 47, 47, 58, 58, 61, 61, 91, 91, 93, 93, 124, 124, 2, 0, 42, 42, 47, 47, 11, 0, 9, 10, 13, 13, 32, 32, 34, 35, 44, 44, 47, 47, 58, 58, 60, 60, 62, 63, 92, 92, 124, 124, 1503, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 1, 63, 1, 0, 0, 0, 1, 85, 1, 0, 0, 0, 1, 87, 1, 0, 0, 0, 1, 89, 1, 0, 0, 0, 1, 91, 1, 0, 0, 0, 1, 93, 1, 0, 0, 0, 1, 95, 1, 0, 0, 0, 1, 97, 1, 0, 0, 0, 1, 99, 1, 0, 0, 0, 1, 101, 1, 0, 0, 0, 1, 103, 1, 0, 0, 0, 1, 105, 1, 0, 0, 0, 1, 107, 1, 0, 0, 0, 1, 109, 1, 0, 0, 0, 1, 111, 1, 0, 0, 0, 1, 113, 1, 0, 0, 0, 1, 115, 1, 0, 0, 0, 1, 117, 1, 0, 0, 0, 1, 119, 1, 0, 0, 0, 1, 121, 1, 0, 0, 0, 1, 123, 1, 0, 0, 0, 1, 125, 1, 0, 0, 0, 1, 127, 1, 0, 0, 0, 1, 129, 1, 0, 0, 0, 1, 131, 1, 0, 0, 0, 1, 133, 1, 0, 0, 0, 1, 135, 1, 0, 0, 0, 1, 137, 1, 0, 0, 0, 1, 139, 1, 0, 0, 0, 1, 141, 1, 0, 0, 0, 1, 143, 1, 0, 0, 0, 1, 145, 1, 0, 0, 0, 1, 147, 1, 0, 0, 0, 1, 149, 1, 0, 0, 0, 1, 151, 1, 0, 0, 0, 1, 153, 1, 0, 0, 0, 1, 155, 1, 0, 0, 0, 1, 157, 1, 0, 0, 0, 1, 159, 1, 0, 0, 0, 1, 161, 1, 0, 0, 0, 1, 163, 1, 0, 0, 0, 1, 165, 1, 0, 0, 0, 1, 167, 1, 0, 0, 0, 1, 169, 1, 0, 0, 0, 1, 173, 1, 0, 0, 0, 1, 175, 1, 0, 0, 0, 1, 177, 1, 0, 0, 0, 1, 179, 1, 0, 0, 0, 2, 181, 1, 0, 0, 0, 2, 183, 1, 0, 0, 0, 2, 185, 1, 0, 0, 0, 2, 187, 1, 0, 0, 0, 2, 189, 1, 0, 0, 0, 3, 191, 1, 0, 0, 0, 3, 193, 1, 0, 0, 0, 3, 195, 1, 0, 0, 0, 3, 197, 1, 0, 0, 0, 3, 199, 1, 0, 0, 0, 3, 201, 1, 0, 0, 0, 3, 203, 1, 0, 0, 0, 3, 207, 1, 0, 0, 0, 3, 209, 1, 0, 0, 0, 3, 211, 1, 0, 0, 0, 3, 213, 1, 0, 0, 0, 3, 215, 1, 0, 0, 0, 3, 217, 1, 0, 0, 0, 4, 219, 1, 0, 0, 0, 4, 221, 1, 0, 0, 0, 4, 223, 1, 0, 0, 0, 4, 225, 1, 0, 0, 0, 4, 227, 1, 0, 0, 0, 4, 233, 1, 0, 0, 0, 4, 235, 1, 0, 0, 0, 4, 237, 1, 0, 0, 0, 4, 239, 1, 0, 0, 0, 5, 241, 1, 0, 0, 0, 5, 243, 1, 0, 0, 0, 5, 245, 1, 0, 0, 0, 5, 247, 1, 0, 0, 0, 5, 249, 1, 0, 0, 0, 5, 251, 1, 0, 0, 0, 5, 253, 1, 0, 0, 0, 5, 255, 1, 0, 0, 0, 5, 257, 1, 0, 0, 0, 5, 259, 1, 0, 0, 0, 5, 261, 1, 0, 0, 0, 6, 263, 1, 0, 0, 0, 6, 265, 1, 0, 0, 0, 6, 267, 1, 0, 0, 0, 6, 269, 1, 0, 0, 0, 6, 273, 1, 0, 0, 0, 6, 275, 1, 0, 0, 0, 6, 277, 1, 0, 0, 0, 6, 279, 1, 0, 0, 0, 6, 281, 1, 0, 0, 0, 7, 283, 1, 0, 0, 0, 7, 285, 1, 0, 0, 0, 7, 287, 1, 0, 0, 0, 7, 289, 1, 0, 0, 0, 7, 291, 1, 0, 0, 0, 7, 293, 1, 0, 0, 0, 7, 295, 1, 0, 0, 0, 7, 297, 1, 0, 0, 0, 7, 299, 1, 0, 0, 0, 7, 301, 1, 0, 0, 0, 7, 303, 1, 0, 0, 0, 7, 305, 1, 0, 0, 0, 8, 307, 1, 0, 0, 0, 8, 309, 1, 0, 0, 0, 8, 311, 1, 0, 0, 0, 8, 313, 1, 0, 0, 0, 8, 315, 1, 0, 0, 0, 8, 317, 1, 0, 0, 0, 8, 319, 1, 0, 0, 0, 8, 321, 1, 0, 0, 0, 8, 323, 1, 0, 0, 0, 9, 325, 1, 0, 0, 0, 9, 327, 1, 0, 0, 0, 9, 329, 1, 0, 0, 0, 9, 331, 1, 0, 0, 0, 9, 333, 1, 0, 0, 0, 10, 335, 1, 0, 0, 0, 10, 337, 1, 0, 0, 0, 10, 339, 1, 0, 0, 0, 10, 341, 1, 0, 0, 0, 10, 343, 1, 0, 0, 0, 10, 345, 1, 0, 0, 0, 11, 347, 1, 0, 0, 0, 11, 349, 1, 0, 0, 0, 11, 351, 1, 0, 0, 0, 11, 353, 1, 0, 0, 0, 11, 355, 1, 0, 0, 0, 11, 357, 1, 0, 0, 0, 11, 359, 1, 0, 0, 0, 11, 361, 1, 0, 0, 0, 11, 363, 1, 0, 0, 0, 11, 365, 1, 0, 0, 0, 12, 367, 1, 0, 0, 0, 12, 369, 1, 0, 0, 0, 12, 371, 1, 0, 0, 0, 12, 373, 1, 0, 0, 0, 12, 375, 1, 0, 0, 0, 12, 377, 1, 0, 0, 0, 12, 379, 1, 0, 0, 0, 13, 381, 1, 0, 0, 0, 13, 383, 1, 0, 0, 0, 13, 385, 1, 0, 0, 0, 13, 387, 1, 0, 0, 0, 13, 389, 1, 0, 0, 0, 13, 391, 1, 0, 0, 0, 14, 393, 1, 0, 0, 0, 14, 395, 1, 0, 0, 0, 14, 397, 1, 0, 0, 0, 14, 399, 1, 0, 0, 0, 14, 401, 1, 0, 0, 0, 14, 403, 1, 0, 0, 0, 14, 405, 1, 0, 0, 0, 14, 407, 1, 0, 0, 0, 14, 409, 1, 0, 0, 0, 15, 411, 1, 0, 0, 0, 17, 421, 1, 0, 0, 0, 19, 428, 1, 0, 0, 0, 21, 437, 1, 0, 0, 0, 23, 444, 1, 0, 0, 0, 25, 454, 1, 0, 0, 0, 27, 461, 1, 0, 0, 0, 29, 468, 1, 0, 0, 0, 31, 475, 1, 0, 0, 0, 33, 483, 1, 0, 0, 0, 35, 495, 1, 0, 0, 0, 37, 504, 1, 0, 0, 0, 39, 510, 1, 0, 0, 0, 41, 517, 1, 0, 0, 0, 43, 524, 1, 0, 0, 0, 45, 532, 1, 0, 0, 0, 47, 540, 1, 0, 0, 0, 49, 555, 1, 0, 0, 0, 51, 565, 1, 0, 0, 0, 53, 574, 1, 0, 0, 0, 55, 586, 1, 0, 0, 0, 57, 592, 1, 0, 0, 0, 59, 609, 1, 0, 0, 0, 61, 625, 1, 0, 0, 0, 63, 631, 1, 0, 0, 0, 65, 635, 1, 0, 0, 0, 67, 637, 1, 0, 0, 0, 69, 639, 1, 0, 0, 0, 71, 642, 1, 0, 0, 0, 73, 644, 1, 0, 0, 0, 75, 653, 1, 0, 0, 0, 77, 655, 1, 0, 0, 0, 79, 660, 1, 0, 0, 0, 81, 662, 1, 0, 0, 0, 83, 667, 1, 0, 0, 0, 85, 698, 1, 0, 0, 0, 87, 701, 1, 0, 0, 0, 89, 747, 1, 0, 0, 0, 91, 749, 1, 0, 0, 0, 93, 752, 1, 0, 0, 0, 95, 756, 1, 0, 0, 0, 97, 760, 1, 0, 0, 0, 99, 762, 1, 0, 0, 0, 101, 765, 1, 0, 0, 0, 103, 767, 1, 0, 0, 0, 105, 772, 1, 0, 0, 0, 107, 774, 1, 0, 0, 0, 109, 780, 1, 0, 0, 0, 111, 786, 1, 0, 0, 0, 113, 789, 1, 0, 0, 0, 115, 792, 1, 0, 0, 0, 117, 797, 1, 0, 0, 0, 119, 802, 1, 0, 0, 0, 121, 804, 1, 0, 0, 0, 123, 808, 1, 0, 0, 0, 125, 813, 1, 0, 0, 0, 127, 819, 1, 0, 0, 0, 129, 822, 1, 0, 0, 0, 131, 824, 1, 0, 0, 0, 133, 830, 1, 0, 0, 0, 135, 832, 1, 0, 0, 0, 137, 837, 1, 0, 0, 0, 139, 840, 1, 0, 0, 0, 141, 843, 1, 0, 0, 0, 143, 846, 1, 0, 0, 0, 145, 848, 1, 0, 0, 0, 147, 851, 1, 0, 0, 0, 149, 853, 1, 0, 0, 0, 151, 856, 1, 0, 0, 0, 153, 858, 1, 0, 0, 0, 155, 860, 1, 0, 0, 0, 157, 862, 1, 0, 0, 0, 159, 864, 1, 0, 0, 0, 161, 866, 1, 0, 0, 0, 163, 888, 1, 0, 0, 0, 165, 890, 1, 0, 0, 0, 167, 895, 1, 0, 0, 0, 169, 916, 1, 0, 0, 0, 171, 918, 1, 0, 0, 0, 173, 926, 1, 0, 0, 0, 175, 928, 1, 0, 0, 0, 177, 932, 1, 0, 0, 0, 179, 936, 1, 0, 0, 0, 181, 940, 1, 0, 0, 0, 183, 945, 1, 0, 0, 0, 185, 950, 1, 0, 0, 0, 187, 954, 1, 0, 0, 0, 189, 958, 1, 0, 0, 0, 191, 962, 1, 0, 0, 0, 193, 967, 1, 0, 0, 0, 195, 971, 1, 0, 0, 0, 197, 975, 1, 0, 0, 0, 199, 979, 1, 0, 0, 0, 201, 983, 1, 0, 0, 0, 203, 987, 1, 0, 0, 0, 205, 999, 1, 0, 0, 0, 207, 1002, 1, 0, 0, 0, 209, 1006, 1, 0, 0, 0, 211, 1010, 1, 0, 0, 0, 213, 1014, 1, 0, 0, 0, 215, 1018, 1, 0, 0, 0, 217, 1022, 1, 0, 0, 0, 219, 1026, 1, 0, 0, 0, 221, 1031, 1, 0, 0, 0, 223, 1035, 1, 0, 0, 0, 225, 1039, 1, 0, 0, 0, 227, 1043, 1, 0, 0, 0, 229, 1051, 1, 0, 0, 0, 231, 1072, 1, 0, 0, 0, 233, 1076, 1, 0, 0, 0, 235, 1080, 1, 0, 0, 0, 237, 1084, 1, 0, 0, 0, 239, 1088, 1, 0, 0, 0, 241, 1092, 1, 0, 0, 0, 243, 1097, 1, 0, 0, 0, 245, 1101, 1, 0, 0, 0, 247, 1105, 1, 0, 0, 0, 249, 1109, 1, 0, 0, 0, 251, 1113, 1, 0, 0, 0, 253, 1117, 1, 0, 0, 0, 255, 1120, 1, 0, 0, 0, 257, 1124, 1, 0, 0, 0, 259, 1128, 1, 0, 0, 0, 261, 1132, 1, 0, 0, 0, 263, 1136, 1, 0, 0, 0, 265, 1141, 1, 0, 0, 0, 267, 1146, 1, 0, 0, 0, 269, 1151, 1, 0, 0, 0, 271, 1158, 1, 0, 0, 0, 273, 1167, 1, 0, 0, 0, 275, 1174, 1, 0, 0, 0, 277, 1178, 1, 0, 0, 0, 279, 1182, 1, 0, 0, 0, 281, 1186, 1, 0, 0, 0, 283, 1190, 1, 0, 0, 0, 285, 1196, 1, 0, 0, 0, 287, 1200, 1, 0, 0, 0, 289, 1204, 1, 0, 0, 0, 291, 1208, 1, 0, 0, 0, 293, 1212, 1, 0, 0, 0, 295, 1216, 1, 0, 0, 0, 297, 1220, 1, 0, 0, 0, 299, 1224, 1, 0, 0, 0, 301, 1228, 1, 0, 0, 0, 303, 1232, 1, 0, 0, 0, 305, 1236, 1, 0, 0, 0, 307, 1240, 1, 0, 0, 0, 309, 1245, 1, 0, 0, 0, 311, 1249, 1, 0, 0, 0, 313, 1253, 1, 0, 0, 0, 315, 1257, 1, 0, 0, 0, 317, 1261, 1, 0, 0, 0, 319, 1265, 1, 0, 0, 0, 321, 1269, 1, 0, 0, 0, 323, 1273, 1, 0, 0, 0, 325, 1277, 1, 0, 0, 0, 327, 1282, 1, 0, 0, 0, 329, 1287, 1, 0, 0, 0, 331, 1291, 1, 0, 0, 0, 333, 1295, 1, 0, 0, 0, 335, 1299, 1, 0, 0, 0, 337, 1304, 1, 0, 0, 0, 339, 1311, 1, 0, 0, 0, 341, 1315, 1, 0, 0, 0, 343, 1319, 1, 0, 0, 0, 345, 1323, 1, 0, 0, 0, 347, 1327, 1, 0, 0, 0, 349, 1332, 1, 0, 0, 0, 351, 1336, 1, 0, 0, 0, 353, 1340, 1, 0, 0, 0, 355, 1344, 1, 0, 0, 0, 357, 1349, 1, 0, 0, 0, 359, 1353, 1, 0, 0, 0, 361, 1357, 1, 0, 0, 0, 363, 1361, 1, 0, 0, 0, 365, 1365, 1, 0, 0, 0, 367, 1369, 1, 0, 0, 0, 369, 1375, 1, 0, 0, 0, 371, 1379, 1, 0, 0, 0, 373, 1383, 1, 0, 0, 0, 375, 1387, 1, 0, 0, 0, 377, 1391, 1, 0, 0, 0, 379, 1395, 1, 0, 0, 0, 381, 1399, 1, 0, 0, 0, 383, 1404, 1, 0, 0, 0, 385, 1410, 1, 0, 0, 0, 387, 1416, 1, 0, 0, 0, 389, 1420, 1, 0, 0, 0, 391, 1424, 1, 0, 0, 0, 393, 1428, 1, 0, 0, 0, 395, 1434, 1, 0, 0, 0, 397, 1440, 1, 0, 0, 0, 399, 1444, 1, 0, 0, 0, 401, 1448, 1, 0, 0, 0, 403, 1452, 1, 0, 0, 0, 405, 1458, 1, 0, 0, 0, 407, 1464, 1, 0, 0, 0, 409, 1470, 1, 0, 0, 0, 411, 412, 7, 0, 0, 0, 412, 413, 7, 1, 0, 0, 413, 414, 7, 2, 0, 0, 414, 415, 7, 2, 0, 0, 415, 416, 7, 3, 0, 0, 416, 417, 7, 4, 0, 0, 417, 418, 7, 5, 0, 0, 418, 419, 1, 0, 0, 0, 419, 420, 6, 0, 0, 0, 420, 16, 1, 0, 0, 0, 421, 422, 7, 0, 0, 0, 422, 423, 7, 6, 0, 0, 423, 424, 7, 7, 0, 0, 424, 425, 7, 8, 0, 0, 425, 426, 1, 0, 0, 0, 426, 427, 6, 1, 1, 0, 427, 18, 1, 0, 0, 0, 428, 429, 7, 3, 0, 0, 429, 430, 7, 9, 0, 0, 430, 431, 7, 6, 0, 0, 431, 432, 7, 1, 0, 0, 432, 433, 7, 4, 0, 0, 433, 434, 7, 10, 0, 0, 434, 435, 1, 0, 0, 0, 435, 436, 6, 2, 2, 0, 436, 20, 1, 0, 0, 0, 437, 438, 7, 3, 0, 0, 438, 439, 7, 11, 0, 0, 439, 440, 7, 12, 0, 0, 440, 441, 7, 13, 0, 0, 441, 442, 1, 0, 0, 0, 442, 443, 6, 3, 0, 0, 443, 22, 1, 0, 0, 0, 444, 445, 7, 3, 0, 0, 445, 446, 7, 14, 0, 0, 446, 447, 7, 8, 0, 0, 447, 448, 7, 13, 0, 0, 448, 449, 7, 12, 0, 0, 449, 450, 7, 1, 0, 0, 450, 451, 7, 9, 0, 0, 451, 452, 1, 0, 0, 0, 452, 453, 6, 4, 3, 0, 453, 24, 1, 0, 0, 0, 454, 455, 7, 15, 0, 0, 455, 456, 7, 6, 0, 0, 456, 457, 7, 7, 0, 0, 457, 458, 7, 16, 0, 0, 458, 459, 1, 0, 0, 0, 459, 460, 6, 5, 4, 0, 460, 26, 1, 0, 0, 0, 461, 462, 7, 17, 0, 0, 462, 463, 7, 6, 0, 0, 463, 464, 7, 7, 0, 0, 464, 465, 7, 18, 0, 0, 465, 466, 1, 0, 0, 0, 466, 467, 6, 6, 0, 0, 467, 28, 1, 0, 0, 0, 468, 469, 7, 18, 0, 0, 469, 470, 7, 3, 0, 0, 470, 471, 7, 3, 0, 0, 471, 472, 7, 8, 0, 0, 472, 473, 1, 0, 0, 0, 473, 474, 6, 7, 1, 0, 474, 30, 1, 0, 0, 0, 475, 476, 7, 13, 0, 0, 476, 477, 7, 1, 0, 0, 477, 478, 7, 16, 0, 0, 478, 479, 7, 1, 0, 0, 479, 480, 7, 5, 0, 0, 480, 481, 1, 0, 0, 0, 481, 482, 6, 8, 0, 0, 482, 32, 1, 0, 0, 0, 483, 484, 7, 16, 0, 0, 484, 485, 7, 11, 0, 0, 485, 486, 5, 95, 0, 0, 486, 487, 7, 3, 0, 0, 487, 488, 7, 14, 0, 0, 488, 489, 7, 8, 0, 0, 489, 490, 7, 12, 0, 0, 490, 491, 7, 9, 0, 0, 491, 492, 7, 0, 0, 0, 492, 493, 1, 0, 0, 0, 493, 494, 6, 9, 5, 0, 494, 34, 1, 0, 0, 0, 495, 496, 7, 6, 0, 0, 496, 497, 7, 3, 0, 0, 497, 498, 7, 9, 0, 0, 498, 499, 7, 12, 0, 0, 499, 500, 7, 16, 0, 0, 500, 501, 7, 3, 0, 0, 501, 502, 1, 0, 0, 0, 502, 503, 6, 10, 6, 0, 503, 36, 1, 0, 0, 0, 504, 505, 7, 6, 0, 0, 505, 506, 7, 7, 0, 0, 506, 507, 7, 19, 0, 0, 507, 508, 1, 0, 0, 0, 508, 509, 6, 11, 0, 0, 509, 38, 1, 0, 0, 0, 510, 511, 7, 2, 0, 0, 511, 512, 7, 10, 0, 0, 512, 513, 7, 7, 0, 0, 513, 514, 7, 19, 0, 0, 514, 515, 1, 0, 0, 0, 515, 516, 6, 12, 7, 0, 516, 40, 1, 0, 0, 0, 517, 518, 7, 2, 0, 0, 518, 519, 7, 7, 0, 0, 519, 520, 7, 6, 0, 0, 520, 521, 7, 5, 0, 0, 521, 522, 1, 0, 0, 0, 522, 523, 6, 13, 0, 0, 523, 42, 1, 0, 0, 0, 524, 525, 7, 2, 0, 0, 525, 526, 7, 5, 0, 0, 526, 527, 7, 12, 0, 0, 527, 528, 7, 5, 0, 0, 528, 529, 7, 2, 0, 0, 529, 530, 1, 0, 0, 0, 530, 531, 6, 14, 0, 0, 531, 44, 1, 0, 0, 0, 532, 533, 7, 19, 0, 0, 533, 534, 7, 10, 0, 0, 534, 535, 7, 3, 0, 0, 535, 536, 7, 6, 0, 0, 536, 537, 7, 3, 0, 0, 537, 538, 1, 0, 0, 0, 538, 539, 6, 15, 0, 0, 539, 46, 1, 0, 0, 0, 540, 541, 4, 16, 0, 0, 541, 542, 7, 1, 0, 0, 542, 543, 7, 9, 0, 0, 543, 544, 7, 13, 0, 0, 544, 545, 7, 1, 0, 0, 545, 546, 7, 9, 0, 0, 546, 547, 7, 3, 0, 0, 547, 548, 7, 2, 0, 0, 548, 549, 7, 5, 0, 0, 549, 550, 7, 12, 0, 0, 550, 551, 7, 5, 0, 0, 551, 552, 7, 2, 0, 0, 552, 553, 1, 0, 0, 0, 553, 554, 6, 16, 0, 0, 554, 48, 1, 0, 0, 0, 555, 556, 4, 17, 1, 0, 556, 557, 7, 13, 0, 0, 557, 558, 7, 7, 0, 0, 558, 559, 7, 7, 0, 0, 559, 560, 7, 18, 0, 0, 560, 561, 7, 20, 0, 0, 561, 562, 7, 8, 0, 0, 562, 563, 1, 0, 0, 0, 563, 564, 6, 17, 8, 0, 564, 50, 1, 0, 0, 0, 565, 566, 4, 18, 2, 0, 566, 567, 7, 16, 0, 0, 567, 568, 7, 12, 0, 0, 568, 569, 7, 5, 0, 0, 569, 570, 7, 4, 0, 0, 570, 571, 7, 10, 0, 0, 571, 572, 1, 0, 0, 0, 572, 573, 6, 18, 0, 0, 573, 52, 1, 0, 0, 0, 574, 575, 4, 19, 3, 0, 575, 576, 7, 16, 0, 0, 576, 577, 7, 3, 0, 0, 577, 578, 7, 5, 0, 0, 578, 579, 7, 6, 0, 0, 579, 580, 7, 1, 0, 0, 580, 581, 7, 4, 0, 0, 581, 582, 7, 2, 0, 0, 582, 583, 1, 0, 0, 0, 583, 584, 6, 19, 9, 0, 584, 54, 1, 0, 0, 0, 585, 587, 8, 21, 0, 0, 586, 585, 1, 0, 0, 0, 587, 588, 1, 0, 0, 0, 588, 586, 1, 0, 0, 0, 588, 589, 1, 0, 0, 0, 589, 590, 1, 0, 0, 0, 590, 591, 6, 20, 0, 0, 591, 56, 1, 0, 0, 0, 592, 593, 5, 47, 0, 0, 593, 594, 5, 47, 0, 0, 594, 598, 1, 0, 0, 0, 595, 597, 8, 22, 0, 0, 596, 595, 1, 0, 0, 0, 597, 600, 1, 0, 0, 0, 598, 596, 1, 0, 0, 0, 598, 599, 1, 0, 0, 0, 599, 602, 1, 0, 0, 0, 600, 598, 1, 0, 0, 0, 601, 603, 5, 13, 0, 0, 602, 601, 1, 0, 0, 0, 602, 603, 1, 0, 0, 0, 603, 605, 1, 0, 0, 0, 604, 606, 5, 10, 0, 0, 605, 604, 1, 0, 0, 0, 605, 606, 1, 0, 0, 0, 606, 607, 1, 0, 0, 0, 607, 608, 6, 21, 10, 0, 608, 58, 1, 0, 0, 0, 609, 610, 5, 47, 0, 0, 610, 611, 5, 42, 0, 0, 611, 616, 1, 0, 0, 0, 612, 615, 3, 59, 22, 0, 613, 615, 9, 0, 0, 0, 614, 612, 1, 0, 0, 0, 614, 613, 1, 0, 0, 0, 615, 618, 1, 0, 0, 0, 616, 617, 1, 0, 0, 0, 616, 614, 1, 0, 0, 0, 617, 619, 1, 0, 0, 0, 618, 616, 1, 0, 0, 0, 619, 620, 5, 42, 0, 0, 620, 621, 5, 47, 0, 0, 621, 622, 1, 0, 0, 0, 622, 623, 6, 22, 10, 0, 623, 60, 1, 0, 0, 0, 624, 626, 7, 23, 0, 0, 625, 624, 1, 0, 0, 0, 626, 627, 1, 0, 0, 0, 627, 625, 1, 0, 0, 0, 627, 628, 1, 0, 0, 0, 628, 629, 1, 0, 0, 0, 629, 630, 6, 23, 10, 0, 630, 62, 1, 0, 0, 0, 631, 632, 5, 124, 0, 0, 632, 633, 1, 0, 0, 0, 633, 634, 6, 24, 11, 0, 634, 64, 1, 0, 0, 0, 635, 636, 7, 24, 0, 0, 636, 66, 1, 0, 0, 0, 637, 638, 7, 25, 0, 0, 638, 68, 1, 0, 0, 0, 639, 640, 5, 92, 0, 0, 640, 641, 7, 26, 0, 0, 641, 70, 1, 0, 0, 0, 642, 643, 8, 27, 0, 0, 643, 72, 1, 0, 0, 0, 644, 646, 7, 3, 0, 0, 645, 647, 7, 28, 0, 0, 646, 645, 1, 0, 0, 0, 646, 647, 1, 0, 0, 0, 647, 649, 1, 0, 0, 0, 648, 650, 3, 65, 25, 0, 649, 648, 1, 0, 0, 0, 650, 651, 1, 0, 0, 0, 651, 649, 1, 0, 0, 0, 651, 652, 1, 0, 0, 0, 652, 74, 1, 0, 0, 0, 653, 654, 5, 64, 0, 0, 654, 76, 1, 0, 0, 0, 655, 656, 5, 96, 0, 0, 656, 78, 1, 0, 0, 0, 657, 661, 8, 29, 0, 0, 658, 659, 5, 96, 0, 0, 659, 661, 5, 96, 0, 0, 660, 657, 1, 0, 0, 0, 660, 658, 1, 0, 0, 0, 661, 80, 1, 0, 0, 0, 662, 663, 5, 95, 0, 0, 663, 82, 1, 0, 0, 0, 664, 668, 3, 67, 26, 0, 665, 668, 3, 65, 25, 0, 666, 668, 3, 81, 33, 0, 667, 664, 1, 0, 0, 0, 667, 665, 1, 0, 0, 0, 667, 666, 1, 0, 0, 0, 668, 84, 1, 0, 0, 0, 669, 674, 5, 34, 0, 0, 670, 673, 3, 69, 27, 0, 671, 673, 3, 71, 28, 0, 672, 670, 1, 0, 0, 0, 672, 671, 1, 0, 0, 0, 673, 676, 1, 0, 0, 0, 674, 672, 1, 0, 0, 0, 674, 675, 1, 0, 0, 0, 675, 677, 1, 0, 0, 0, 676, 674, 1, 0, 0, 0, 677, 699, 5, 34, 0, 0, 678, 679, 5, 34, 0, 0, 679, 680, 5, 34, 0, 0, 680, 681, 5, 34, 0, 0, 681, 685, 1, 0, 0, 0, 682, 684, 8, 22, 0, 0, 683, 682, 1, 0, 0, 0, 684, 687, 1, 0, 0, 0, 685, 686, 1, 0, 0, 0, 685, 683, 1, 0, 0, 0, 686, 688, 1, 0, 0, 0, 687, 685, 1, 0, 0, 0, 688, 689, 5, 34, 0, 0, 689, 690, 5, 34, 0, 0, 690, 691, 5, 34, 0, 0, 691, 693, 1, 0, 0, 0, 692, 694, 5, 34, 0, 0, 693, 692, 1, 0, 0, 0, 693, 694, 1, 0, 0, 0, 694, 696, 1, 0, 0, 0, 695, 697, 5, 34, 0, 0, 696, 695, 1, 0, 0, 0, 696, 697, 1, 0, 0, 0, 697, 699, 1, 0, 0, 0, 698, 669, 1, 0, 0, 0, 698, 678, 1, 0, 0, 0, 699, 86, 1, 0, 0, 0, 700, 702, 3, 65, 25, 0, 701, 700, 1, 0, 0, 0, 702, 703, 1, 0, 0, 0, 703, 701, 1, 0, 0, 0, 703, 704, 1, 0, 0, 0, 704, 88, 1, 0, 0, 0, 705, 707, 3, 65, 25, 0, 706, 705, 1, 0, 0, 0, 707, 708, 1, 0, 0, 0, 708, 706, 1, 0, 0, 0, 708, 709, 1, 0, 0, 0, 709, 710, 1, 0, 0, 0, 710, 714, 3, 105, 45, 0, 711, 713, 3, 65, 25, 0, 712, 711, 1, 0, 0, 0, 713, 716, 1, 0, 0, 0, 714, 712, 1, 0, 0, 0, 714, 715, 1, 0, 0, 0, 715, 748, 1, 0, 0, 0, 716, 714, 1, 0, 0, 0, 717, 719, 3, 105, 45, 0, 718, 720, 3, 65, 25, 0, 719, 718, 1, 0, 0, 0, 720, 721, 1, 0, 0, 0, 721, 719, 1, 0, 0, 0, 721, 722, 1, 0, 0, 0, 722, 748, 1, 0, 0, 0, 723, 725, 3, 65, 25, 0, 724, 723, 1, 0, 0, 0, 725, 726, 1, 0, 0, 0, 726, 724, 1, 0, 0, 0, 726, 727, 1, 0, 0, 0, 727, 735, 1, 0, 0, 0, 728, 732, 3, 105, 45, 0, 729, 731, 3, 65, 25, 0, 730, 729, 1, 0, 0, 0, 731, 734, 1, 0, 0, 0, 732, 730, 1, 0, 0, 0, 732, 733, 1, 0, 0, 0, 733, 736, 1, 0, 0, 0, 734, 732, 1, 0, 0, 0, 735, 728, 1, 0, 0, 0, 735, 736, 1, 0, 0, 0, 736, 737, 1, 0, 0, 0, 737, 738, 3, 73, 29, 0, 738, 748, 1, 0, 0, 0, 739, 741, 3, 105, 45, 0, 740, 742, 3, 65, 25, 0, 741, 740, 1, 0, 0, 0, 742, 743, 1, 0, 0, 0, 743, 741, 1, 0, 0, 0, 743, 744, 1, 0, 0, 0, 744, 745, 1, 0, 0, 0, 745, 746, 3, 73, 29, 0, 746, 748, 1, 0, 0, 0, 747, 706, 1, 0, 0, 0, 747, 717, 1, 0, 0, 0, 747, 724, 1, 0, 0, 0, 747, 739, 1, 0, 0, 0, 748, 90, 1, 0, 0, 0, 749, 750, 7, 30, 0, 0, 750, 751, 7, 31, 0, 0, 751, 92, 1, 0, 0, 0, 752, 753, 7, 12, 0, 0, 753, 754, 7, 9, 0, 0, 754, 755, 7, 0, 0, 0, 755, 94, 1, 0, 0, 0, 756, 757, 7, 12, 0, 0, 757, 758, 7, 2, 0, 0, 758, 759, 7, 4, 0, 0, 759, 96, 1, 0, 0, 0, 760, 761, 5, 61, 0, 0, 761, 98, 1, 0, 0, 0, 762, 763, 5, 58, 0, 0, 763, 764, 5, 58, 0, 0, 764, 100, 1, 0, 0, 0, 765, 766, 5, 44, 0, 0, 766, 102, 1, 0, 0, 0, 767, 768, 7, 0, 0, 0, 768, 769, 7, 3, 0, 0, 769, 770, 7, 2, 0, 0, 770, 771, 7, 4, 0, 0, 771, 104, 1, 0, 0, 0, 772, 773, 5, 46, 0, 0, 773, 106, 1, 0, 0, 0, 774, 775, 7, 15, 0, 0, 775, 776, 7, 12, 0, 0, 776, 777, 7, 13, 0, 0, 777, 778, 7, 2, 0, 0, 778, 779, 7, 3, 0, 0, 779, 108, 1, 0, 0, 0, 780, 781, 7, 15, 0, 0, 781, 782, 7, 1, 0, 0, 782, 783, 7, 6, 0, 0, 783, 784, 7, 2, 0, 0, 784, 785, 7, 5, 0, 0, 785, 110, 1, 0, 0, 0, 786, 787, 7, 1, 0, 0, 787, 788, 7, 9, 0, 0, 788, 112, 1, 0, 0, 0, 789, 790, 7, 1, 0, 0, 790, 791, 7, 2, 0, 0, 791, 114, 1, 0, 0, 0, 792, 793, 7, 13, 0, 0, 793, 794, 7, 12, 0, 0, 794, 795, 7, 2, 0, 0, 795, 796, 7, 5, 0, 0, 796, 116, 1, 0, 0, 0, 797, 798, 7, 13, 0, 0, 798, 799, 7, 1, 0, 0, 799, 800, 7, 18, 0, 0, 800, 801, 7, 3, 0, 0, 801, 118, 1, 0, 0, 0, 802, 803, 5, 40, 0, 0, 803, 120, 1, 0, 0, 0, 804, 805, 7, 9, 0, 0, 805, 806, 7, 7, 0, 0, 806, 807, 7, 5, 0, 0, 807, 122, 1, 0, 0, 0, 808, 809, 7, 9, 0, 0, 809, 810, 7, 20, 0, 0, 810, 811, 7, 13, 0, 0, 811, 812, 7, 13, 0, 0, 812, 124, 1, 0, 0, 0, 813, 814, 7, 9, 0, 0, 814, 815, 7, 20, 0, 0, 815, 816, 7, 13, 0, 0, 816, 817, 7, 13, 0, 0, 817, 818, 7, 2, 0, 0, 818, 126, 1, 0, 0, 0, 819, 820, 7, 7, 0, 0, 820, 821, 7, 6, 0, 0, 821, 128, 1, 0, 0, 0, 822, 823, 5, 63, 0, 0, 823, 130, 1, 0, 0, 0, 824, 825, 7, 6, 0, 0, 825, 826, 7, 13, 0, 0, 826, 827, 7, 1, 0, 0, 827, 828, 7, 18, 0, 0, 828, 829, 7, 3, 0, 0, 829, 132, 1, 0, 0, 0, 830, 831, 5, 41, 0, 0, 831, 134, 1, 0, 0, 0, 832, 833, 7, 5, 0, 0, 833, 834, 7, 6, 0, 0, 834, 835, 7, 20, 0, 0, 835, 836, 7, 3, 0, 0, 836, 136, 1, 0, 0, 0, 837, 838, 5, 61, 0, 0, 838, 839, 5, 61, 0, 0, 839, 138, 1, 0, 0, 0, 840, 841, 5, 61, 0, 0, 841, 842, 5, 126, 0, 0, 842, 140, 1, 0, 0, 0, 843, 844, 5, 33, 0, 0, 844, 845, 5, 61, 0, 0, 845, 142, 1, 0, 0, 0, 846, 847, 5, 60, 0, 0, 847, 144, 1, 0, 0, 0, 848, 849, 5, 60, 0, 0, 849, 850, 5, 61, 0, 0, 850, 146, 1, 0, 0, 0, 851, 852, 5, 62, 0, 0, 852, 148, 1, 0, 0, 0, 853, 854, 5, 62, 0, 0, 854, 855, 5, 61, 0, 0, 855, 150, 1, 0, 0, 0, 856, 857, 5, 43, 0, 0, 857, 152, 1, 0, 0, 0, 858, 859, 5, 45, 0, 0, 859, 154, 1, 0, 0, 0, 860, 861, 5, 42, 0, 0, 861, 156, 1, 0, 0, 0, 862, 863, 5, 47, 0, 0, 863, 158, 1, 0, 0, 0, 864, 865, 5, 37, 0, 0, 865, 160, 1, 0, 0, 0, 866, 867, 4, 73, 4, 0, 867, 868, 3, 51, 18, 0, 868, 869, 1, 0, 0, 0, 869, 870, 6, 73, 12, 0, 870, 162, 1, 0, 0, 0, 871, 874, 3, 129, 57, 0, 872, 875, 3, 67, 26, 0, 873, 875, 3, 81, 33, 0, 874, 872, 1, 0, 0, 0, 874, 873, 1, 0, 0, 0, 875, 879, 1, 0, 0, 0, 876, 878, 3, 83, 34, 0, 877, 876, 1, 0, 0, 0, 878, 881, 1, 0, 0, 0, 879, 877, 1, 0, 0, 0, 879, 880, 1, 0, 0, 0, 880, 889, 1, 0, 0, 0, 881, 879, 1, 0, 0, 0, 882, 884, 3, 129, 57, 0, 883, 885, 3, 65, 25, 0, 884, 883, 1, 0, 0, 0, 885, 886, 1, 0, 0, 0, 886, 884, 1, 0, 0, 0, 886, 887, 1, 0, 0, 0, 887, 889, 1, 0, 0, 0, 888, 871, 1, 0, 0, 0, 888, 882, 1, 0, 0, 0, 889, 164, 1, 0, 0, 0, 890, 891, 5, 91, 0, 0, 891, 892, 1, 0, 0, 0, 892, 893, 6, 75, 0, 0, 893, 894, 6, 75, 0, 0, 894, 166, 1, 0, 0, 0, 895, 896, 5, 93, 0, 0, 896, 897, 1, 0, 0, 0, 897, 898, 6, 76, 11, 0, 898, 899, 6, 76, 11, 0, 899, 168, 1, 0, 0, 0, 900, 904, 3, 67, 26, 0, 901, 903, 3, 83, 34, 0, 902, 901, 1, 0, 0, 0, 903, 906, 1, 0, 0, 0, 904, 902, 1, 0, 0, 0, 904, 905, 1, 0, 0, 0, 905, 917, 1, 0, 0, 0, 906, 904, 1, 0, 0, 0, 907, 910, 3, 81, 33, 0, 908, 910, 3, 75, 30, 0, 909, 907, 1, 0, 0, 0, 909, 908, 1, 0, 0, 0, 910, 912, 1, 0, 0, 0, 911, 913, 3, 83, 34, 0, 912, 911, 1, 0, 0, 0, 913, 914, 1, 0, 0, 0, 914, 912, 1, 0, 0, 0, 914, 915, 1, 0, 0, 0, 915, 917, 1, 0, 0, 0, 916, 900, 1, 0, 0, 0, 916, 909, 1, 0, 0, 0, 917, 170, 1, 0, 0, 0, 918, 920, 3, 77, 31, 0, 919, 921, 3, 79, 32, 0, 920, 919, 1, 0, 0, 0, 921, 922, 1, 0, 0, 0, 922, 920, 1, 0, 0, 0, 922, 923, 1, 0, 0, 0, 923, 924, 1, 0, 0, 0, 924, 925, 3, 77, 31, 0, 925, 172, 1, 0, 0, 0, 926, 927, 3, 171, 78, 0, 927, 174, 1, 0, 0, 0, 928, 929, 3, 57, 21, 0, 929, 930, 1, 0, 0, 0, 930, 931, 6, 80, 10, 0, 931, 176, 1, 0, 0, 0, 932, 933, 3, 59, 22, 0, 933, 934, 1, 0, 0, 0, 934, 935, 6, 81, 10, 0, 935, 178, 1, 0, 0, 0, 936, 937, 3, 61, 23, 0, 937, 938, 1, 0, 0, 0, 938, 939, 6, 82, 10, 0, 939, 180, 1, 0, 0, 0, 940, 941, 3, 165, 75, 0, 941, 942, 1, 0, 0, 0, 942, 943, 6, 83, 13, 0, 943, 944, 6, 83, 14, 0, 944, 182, 1, 0, 0, 0, 945, 946, 3, 63, 24, 0, 946, 947, 1, 0, 0, 0, 947, 948, 6, 84, 15, 0, 948, 949, 6, 84, 11, 0, 949, 184, 1, 0, 0, 0, 950, 951, 3, 61, 23, 0, 951, 952, 1, 0, 0, 0, 952, 953, 6, 85, 10, 0, 953, 186, 1, 0, 0, 0, 954, 955, 3, 57, 21, 0, 955, 956, 1, 0, 0, 0, 956, 957, 6, 86, 10, 0, 957, 188, 1, 0, 0, 0, 958, 959, 3, 59, 22, 0, 959, 960, 1, 0, 0, 0, 960, 961, 6, 87, 10, 0, 961, 190, 1, 0, 0, 0, 962, 963, 3, 63, 24, 0, 963, 964, 1, 0, 0, 0, 964, 965, 6, 88, 15, 0, 965, 966, 6, 88, 11, 0, 966, 192, 1, 0, 0, 0, 967, 968, 3, 165, 75, 0, 968, 969, 1, 0, 0, 0, 969, 970, 6, 89, 13, 0, 970, 194, 1, 0, 0, 0, 971, 972, 3, 167, 76, 0, 972, 973, 1, 0, 0, 0, 973, 974, 6, 90, 16, 0, 974, 196, 1, 0, 0, 0, 975, 976, 3, 337, 161, 0, 976, 977, 1, 0, 0, 0, 977, 978, 6, 91, 17, 0, 978, 198, 1, 0, 0, 0, 979, 980, 3, 101, 43, 0, 980, 981, 1, 0, 0, 0, 981, 982, 6, 92, 18, 0, 982, 200, 1, 0, 0, 0, 983, 984, 3, 97, 41, 0, 984, 985, 1, 0, 0, 0, 985, 986, 6, 93, 19, 0, 986, 202, 1, 0, 0, 0, 987, 988, 7, 16, 0, 0, 988, 989, 7, 3, 0, 0, 989, 990, 7, 5, 0, 0, 990, 991, 7, 12, 0, 0, 991, 992, 7, 0, 0, 0, 992, 993, 7, 12, 0, 0, 993, 994, 7, 5, 0, 0, 994, 995, 7, 12, 0, 0, 995, 204, 1, 0, 0, 0, 996, 1000, 8, 32, 0, 0, 997, 998, 5, 47, 0, 0, 998, 1000, 8, 33, 0, 0, 999, 996, 1, 0, 0, 0, 999, 997, 1, 0, 0, 0, 1000, 206, 1, 0, 0, 0, 1001, 1003, 3, 205, 95, 0, 1002, 1001, 1, 0, 0, 0, 1003, 1004, 1, 0, 0, 0, 1004, 1002, 1, 0, 0, 0, 1004, 1005, 1, 0, 0, 0, 1005, 208, 1, 0, 0, 0, 1006, 1007, 3, 207, 96, 0, 1007, 1008, 1, 0, 0, 0, 1008, 1009, 6, 97, 20, 0, 1009, 210, 1, 0, 0, 0, 1010, 1011, 3, 85, 35, 0, 1011, 1012, 1, 0, 0, 0, 1012, 1013, 6, 98, 21, 0, 1013, 212, 1, 0, 0, 0, 1014, 1015, 3, 57, 21, 0, 1015, 1016, 1, 0, 0, 0, 1016, 1017, 6, 99, 10, 0, 1017, 214, 1, 0, 0, 0, 1018, 1019, 3, 59, 22, 0, 1019, 1020, 1, 0, 0, 0, 1020, 1021, 6, 100, 10, 0, 1021, 216, 1, 0, 0, 0, 1022, 1023, 3, 61, 23, 0, 1023, 1024, 1, 0, 0, 0, 1024, 1025, 6, 101, 10, 0, 1025, 218, 1, 0, 0, 0, 1026, 1027, 3, 63, 24, 0, 1027, 1028, 1, 0, 0, 0, 1028, 1029, 6, 102, 15, 0, 1029, 1030, 6, 102, 11, 0, 1030, 220, 1, 0, 0, 0, 1031, 1032, 3, 105, 45, 0, 1032, 1033, 1, 0, 0, 0, 1033, 1034, 6, 103, 22, 0, 1034, 222, 1, 0, 0, 0, 1035, 1036, 3, 101, 43, 0, 1036, 1037, 1, 0, 0, 0, 1037, 1038, 6, 104, 18, 0, 1038, 224, 1, 0, 0, 0, 1039, 1040, 3, 129, 57, 0, 1040, 1041, 1, 0, 0, 0, 1041, 1042, 6, 105, 23, 0, 1042, 226, 1, 0, 0, 0, 1043, 1044, 3, 163, 74, 0, 1044, 1045, 1, 0, 0, 0, 1045, 1046, 6, 106, 24, 0, 1046, 228, 1, 0, 0, 0, 1047, 1052, 3, 67, 26, 0, 1048, 1052, 3, 65, 25, 0, 1049, 1052, 3, 81, 33, 0, 1050, 1052, 3, 155, 70, 0, 1051, 1047, 1, 0, 0, 0, 1051, 1048, 1, 0, 0, 0, 1051, 1049, 1, 0, 0, 0, 1051, 1050, 1, 0, 0, 0, 1052, 230, 1, 0, 0, 0, 1053, 1056, 3, 67, 26, 0, 1054, 1056, 3, 155, 70, 0, 1055, 1053, 1, 0, 0, 0, 1055, 1054, 1, 0, 0, 0, 1056, 1060, 1, 0, 0, 0, 1057, 1059, 3, 229, 107, 0, 1058, 1057, 1, 0, 0, 0, 1059, 1062, 1, 0, 0, 0, 1060, 1058, 1, 0, 0, 0, 1060, 1061, 1, 0, 0, 0, 1061, 1073, 1, 0, 0, 0, 1062, 1060, 1, 0, 0, 0, 1063, 1066, 3, 81, 33, 0, 1064, 1066, 3, 75, 30, 0, 1065, 1063, 1, 0, 0, 0, 1065, 1064, 1, 0, 0, 0, 1066, 1068, 1, 0, 0, 0, 1067, 1069, 3, 229, 107, 0, 1068, 1067, 1, 0, 0, 0, 1069, 1070, 1, 0, 0, 0, 1070, 1068, 1, 0, 0, 0, 1070, 1071, 1, 0, 0, 0, 1071, 1073, 1, 0, 0, 0, 1072, 1055, 1, 0, 0, 0, 1072, 1065, 1, 0, 0, 0, 1073, 232, 1, 0, 0, 0, 1074, 1077, 3, 231, 108, 0, 1075, 1077, 3, 171, 78, 0, 1076, 1074, 1, 0, 0, 0, 1076, 1075, 1, 0, 0, 0, 1077, 1078, 1, 0, 0, 0, 1078, 1076, 1, 0, 0, 0, 1078, 1079, 1, 0, 0, 0, 1079, 234, 1, 0, 0, 0, 1080, 1081, 3, 57, 21, 0, 1081, 1082, 1, 0, 0, 0, 1082, 1083, 6, 110, 10, 0, 1083, 236, 1, 0, 0, 0, 1084, 1085, 3, 59, 22, 0, 1085, 1086, 1, 0, 0, 0, 1086, 1087, 6, 111, 10, 0, 1087, 238, 1, 0, 0, 0, 1088, 1089, 3, 61, 23, 0, 1089, 1090, 1, 0, 0, 0, 1090, 1091, 6, 112, 10, 0, 1091, 240, 1, 0, 0, 0, 1092, 1093, 3, 63, 24, 0, 1093, 1094, 1, 0, 0, 0, 1094, 1095, 6, 113, 15, 0, 1095, 1096, 6, 113, 11, 0, 1096, 242, 1, 0, 0, 0, 1097, 1098, 3, 97, 41, 0, 1098, 1099, 1, 0, 0, 0, 1099, 1100, 6, 114, 19, 0, 1100, 244, 1, 0, 0, 0, 1101, 1102, 3, 101, 43, 0, 1102, 1103, 1, 0, 0, 0, 1103, 1104, 6, 115, 18, 0, 1104, 246, 1, 0, 0, 0, 1105, 1106, 3, 105, 45, 0, 1106, 1107, 1, 0, 0, 0, 1107, 1108, 6, 116, 22, 0, 1108, 248, 1, 0, 0, 0, 1109, 1110, 3, 129, 57, 0, 1110, 1111, 1, 0, 0, 0, 1111, 1112, 6, 117, 23, 0, 1112, 250, 1, 0, 0, 0, 1113, 1114, 3, 163, 74, 0, 1114, 1115, 1, 0, 0, 0, 1115, 1116, 6, 118, 24, 0, 1116, 252, 1, 0, 0, 0, 1117, 1118, 7, 12, 0, 0, 1118, 1119, 7, 2, 0, 0, 1119, 254, 1, 0, 0, 0, 1120, 1121, 3, 233, 109, 0, 1121, 1122, 1, 0, 0, 0, 1122, 1123, 6, 120, 25, 0, 1123, 256, 1, 0, 0, 0, 1124, 1125, 3, 57, 21, 0, 1125, 1126, 1, 0, 0, 0, 1126, 1127, 6, 121, 10, 0, 1127, 258, 1, 0, 0, 0, 1128, 1129, 3, 59, 22, 0, 1129, 1130, 1, 0, 0, 0, 1130, 1131, 6, 122, 10, 0, 1131, 260, 1, 0, 0, 0, 1132, 1133, 3, 61, 23, 0, 1133, 1134, 1, 0, 0, 0, 1134, 1135, 6, 123, 10, 0, 1135, 262, 1, 0, 0, 0, 1136, 1137, 3, 63, 24, 0, 1137, 1138, 1, 0, 0, 0, 1138, 1139, 6, 124, 15, 0, 1139, 1140, 6, 124, 11, 0, 1140, 264, 1, 0, 0, 0, 1141, 1142, 3, 165, 75, 0, 1142, 1143, 1, 0, 0, 0, 1143, 1144, 6, 125, 13, 0, 1144, 1145, 6, 125, 26, 0, 1145, 266, 1, 0, 0, 0, 1146, 1147, 7, 7, 0, 0, 1147, 1148, 7, 9, 0, 0, 1148, 1149, 1, 0, 0, 0, 1149, 1150, 6, 126, 27, 0, 1150, 268, 1, 0, 0, 0, 1151, 1152, 7, 19, 0, 0, 1152, 1153, 7, 1, 0, 0, 1153, 1154, 7, 5, 0, 0, 1154, 1155, 7, 10, 0, 0, 1155, 1156, 1, 0, 0, 0, 1156, 1157, 6, 127, 27, 0, 1157, 270, 1, 0, 0, 0, 1158, 1159, 8, 34, 0, 0, 1159, 272, 1, 0, 0, 0, 1160, 1162, 3, 271, 128, 0, 1161, 1160, 1, 0, 0, 0, 1162, 1163, 1, 0, 0, 0, 1163, 1161, 1, 0, 0, 0, 1163, 1164, 1, 0, 0, 0, 1164, 1165, 1, 0, 0, 0, 1165, 1166, 3, 337, 161, 0, 1166, 1168, 1, 0, 0, 0, 1167, 1161, 1, 0, 0, 0, 1167, 1168, 1, 0, 0, 0, 1168, 1170, 1, 0, 0, 0, 1169, 1171, 3, 271, 128, 0, 1170, 1169, 1, 0, 0, 0, 1171, 1172, 1, 0, 0, 0, 1172, 1170, 1, 0, 0, 0, 1172, 1173, 1, 0, 0, 0, 1173, 274, 1, 0, 0, 0, 1174, 1175, 3, 273, 129, 0, 1175, 1176, 1, 0, 0, 0, 1176, 1177, 6, 130, 28, 0, 1177, 276, 1, 0, 0, 0, 1178, 1179, 3, 57, 21, 0, 1179, 1180, 1, 0, 0, 0, 1180, 1181, 6, 131, 10, 0, 1181, 278, 1, 0, 0, 0, 1182, 1183, 3, 59, 22, 0, 1183, 1184, 1, 0, 0, 0, 1184, 1185, 6, 132, 10, 0, 1185, 280, 1, 0, 0, 0, 1186, 1187, 3, 61, 23, 0, 1187, 1188, 1, 0, 0, 0, 1188, 1189, 6, 133, 10, 0, 1189, 282, 1, 0, 0, 0, 1190, 1191, 3, 63, 24, 0, 1191, 1192, 1, 0, 0, 0, 1192, 1193, 6, 134, 15, 0, 1193, 1194, 6, 134, 11, 0, 1194, 1195, 6, 134, 11, 0, 1195, 284, 1, 0, 0, 0, 1196, 1197, 3, 97, 41, 0, 1197, 1198, 1, 0, 0, 0, 1198, 1199, 6, 135, 19, 0, 1199, 286, 1, 0, 0, 0, 1200, 1201, 3, 101, 43, 0, 1201, 1202, 1, 0, 0, 0, 1202, 1203, 6, 136, 18, 0, 1203, 288, 1, 0, 0, 0, 1204, 1205, 3, 105, 45, 0, 1205, 1206, 1, 0, 0, 0, 1206, 1207, 6, 137, 22, 0, 1207, 290, 1, 0, 0, 0, 1208, 1209, 3, 269, 127, 0, 1209, 1210, 1, 0, 0, 0, 1210, 1211, 6, 138, 29, 0, 1211, 292, 1, 0, 0, 0, 1212, 1213, 3, 233, 109, 0, 1213, 1214, 1, 0, 0, 0, 1214, 1215, 6, 139, 25, 0, 1215, 294, 1, 0, 0, 0, 1216, 1217, 3, 173, 79, 0, 1217, 1218, 1, 0, 0, 0, 1218, 1219, 6, 140, 30, 0, 1219, 296, 1, 0, 0, 0, 1220, 1221, 3, 129, 57, 0, 1221, 1222, 1, 0, 0, 0, 1222, 1223, 6, 141, 23, 0, 1223, 298, 1, 0, 0, 0, 1224, 1225, 3, 163, 74, 0, 1225, 1226, 1, 0, 0, 0, 1226, 1227, 6, 142, 24, 0, 1227, 300, 1, 0, 0, 0, 1228, 1229, 3, 57, 21, 0, 1229, 1230, 1, 0, 0, 0, 1230, 1231, 6, 143, 10, 0, 1231, 302, 1, 0, 0, 0, 1232, 1233, 3, 59, 22, 0, 1233, 1234, 1, 0, 0, 0, 1234, 1235, 6, 144, 10, 0, 1235, 304, 1, 0, 0, 0, 1236, 1237, 3, 61, 23, 0, 1237, 1238, 1, 0, 0, 0, 1238, 1239, 6, 145, 10, 0, 1239, 306, 1, 0, 0, 0, 1240, 1241, 3, 63, 24, 0, 1241, 1242, 1, 0, 0, 0, 1242, 1243, 6, 146, 15, 0, 1243, 1244, 6, 146, 11, 0, 1244, 308, 1, 0, 0, 0, 1245, 1246, 3, 105, 45, 0, 1246, 1247, 1, 0, 0, 0, 1247, 1248, 6, 147, 22, 0, 1248, 310, 1, 0, 0, 0, 1249, 1250, 3, 129, 57, 0, 1250, 1251, 1, 0, 0, 0, 1251, 1252, 6, 148, 23, 0, 1252, 312, 1, 0, 0, 0, 1253, 1254, 3, 163, 74, 0, 1254, 1255, 1, 0, 0, 0, 1255, 1256, 6, 149, 24, 0, 1256, 314, 1, 0, 0, 0, 1257, 1258, 3, 173, 79, 0, 1258, 1259, 1, 0, 0, 0, 1259, 1260, 6, 150, 30, 0, 1260, 316, 1, 0, 0, 0, 1261, 1262, 3, 169, 77, 0, 1262, 1263, 1, 0, 0, 0, 1263, 1264, 6, 151, 31, 0, 1264, 318, 1, 0, 0, 0, 1265, 1266, 3, 57, 21, 0, 1266, 1267, 1, 0, 0, 0, 1267, 1268, 6, 152, 10, 0, 1268, 320, 1, 0, 0, 0, 1269, 1270, 3, 59, 22, 0, 1270, 1271, 1, 0, 0, 0, 1271, 1272, 6, 153, 10, 0, 1272, 322, 1, 0, 0, 0, 1273, 1274, 3, 61, 23, 0, 1274, 1275, 1, 0, 0, 0, 1275, 1276, 6, 154, 10, 0, 1276, 324, 1, 0, 0, 0, 1277, 1278, 3, 63, 24, 0, 1278, 1279, 1, 0, 0, 0, 1279, 1280, 6, 155, 15, 0, 1280, 1281, 6, 155, 11, 0, 1281, 326, 1, 0, 0, 0, 1282, 1283, 7, 1, 0, 0, 1283, 1284, 7, 9, 0, 0, 1284, 1285, 7, 15, 0, 0, 1285, 1286, 7, 7, 0, 0, 1286, 328, 1, 0, 0, 0, 1287, 1288, 3, 57, 21, 0, 1288, 1289, 1, 0, 0, 0, 1289, 1290, 6, 157, 10, 0, 1290, 330, 1, 0, 0, 0, 1291, 1292, 3, 59, 22, 0, 1292, 1293, 1, 0, 0, 0, 1293, 1294, 6, 158, 10, 0, 1294, 332, 1, 0, 0, 0, 1295, 1296, 3, 61, 23, 0, 1296, 1297, 1, 0, 0, 0, 1297, 1298, 6, 159, 10, 0, 1298, 334, 1, 0, 0, 0, 1299, 1300, 3, 167, 76, 0, 1300, 1301, 1, 0, 0, 0, 1301, 1302, 6, 160, 16, 0, 1302, 1303, 6, 160, 11, 0, 1303, 336, 1, 0, 0, 0, 1304, 1305, 5, 58, 0, 0, 1305, 338, 1, 0, 0, 0, 1306, 1312, 3, 75, 30, 0, 1307, 1312, 3, 65, 25, 0, 1308, 1312, 3, 105, 45, 0, 1309, 1312, 3, 67, 26, 0, 1310, 1312, 3, 81, 33, 0, 1311, 1306, 1, 0, 0, 0, 1311, 1307, 1, 0, 0, 0, 1311, 1308, 1, 0, 0, 0, 1311, 1309, 1, 0, 0, 0, 1311, 1310, 1, 0, 0, 0, 1312, 1313, 1, 0, 0, 0, 1313, 1311, 1, 0, 0, 0, 1313, 1314, 1, 0, 0, 0, 1314, 340, 1, 0, 0, 0, 1315, 1316, 3, 57, 21, 0, 1316, 1317, 1, 0, 0, 0, 1317, 1318, 6, 163, 10, 0, 1318, 342, 1, 0, 0, 0, 1319, 1320, 3, 59, 22, 0, 1320, 1321, 1, 0, 0, 0, 1321, 1322, 6, 164, 10, 0, 1322, 344, 1, 0, 0, 0, 1323, 1324, 3, 61, 23, 0, 1324, 1325, 1, 0, 0, 0, 1325, 1326, 6, 165, 10, 0, 1326, 346, 1, 0, 0, 0, 1327, 1328, 3, 63, 24, 0, 1328, 1329, 1, 0, 0, 0, 1329, 1330, 6, 166, 15, 0, 1330, 1331, 6, 166, 11, 0, 1331, 348, 1, 0, 0, 0, 1332, 1333, 3, 337, 161, 0, 1333, 1334, 1, 0, 0, 0, 1334, 1335, 6, 167, 17, 0, 1335, 350, 1, 0, 0, 0, 1336, 1337, 3, 101, 43, 0, 1337, 1338, 1, 0, 0, 0, 1338, 1339, 6, 168, 18, 0, 1339, 352, 1, 0, 0, 0, 1340, 1341, 3, 105, 45, 0, 1341, 1342, 1, 0, 0, 0, 1342, 1343, 6, 169, 22, 0, 1343, 354, 1, 0, 0, 0, 1344, 1345, 3, 267, 126, 0, 1345, 1346, 1, 0, 0, 0, 1346, 1347, 6, 170, 32, 0, 1347, 1348, 6, 170, 33, 0, 1348, 356, 1, 0, 0, 0, 1349, 1350, 3, 207, 96, 0, 1350, 1351, 1, 0, 0, 0, 1351, 1352, 6, 171, 20, 0, 1352, 358, 1, 0, 0, 0, 1353, 1354, 3, 85, 35, 0, 1354, 1355, 1, 0, 0, 0, 1355, 1356, 6, 172, 21, 0, 1356, 360, 1, 0, 0, 0, 1357, 1358, 3, 57, 21, 0, 1358, 1359, 1, 0, 0, 0, 1359, 1360, 6, 173, 10, 0, 1360, 362, 1, 0, 0, 0, 1361, 1362, 3, 59, 22, 0, 1362, 1363, 1, 0, 0, 0, 1363, 1364, 6, 174, 10, 0, 1364, 364, 1, 0, 0, 0, 1365, 1366, 3, 61, 23, 0, 1366, 1367, 1, 0, 0, 0, 1367, 1368, 6, 175, 10, 0, 1368, 366, 1, 0, 0, 0, 1369, 1370, 3, 63, 24, 0, 1370, 1371, 1, 0, 0, 0, 1371, 1372, 6, 176, 15, 0, 1372, 1373, 6, 176, 11, 0, 1373, 1374, 6, 176, 11, 0, 1374, 368, 1, 0, 0, 0, 1375, 1376, 3, 101, 43, 0, 1376, 1377, 1, 0, 0, 0, 1377, 1378, 6, 177, 18, 0, 1378, 370, 1, 0, 0, 0, 1379, 1380, 3, 105, 45, 0, 1380, 1381, 1, 0, 0, 0, 1381, 1382, 6, 178, 22, 0, 1382, 372, 1, 0, 0, 0, 1383, 1384, 3, 233, 109, 0, 1384, 1385, 1, 0, 0, 0, 1385, 1386, 6, 179, 25, 0, 1386, 374, 1, 0, 0, 0, 1387, 1388, 3, 57, 21, 0, 1388, 1389, 1, 0, 0, 0, 1389, 1390, 6, 180, 10, 0, 1390, 376, 1, 0, 0, 0, 1391, 1392, 3, 59, 22, 0, 1392, 1393, 1, 0, 0, 0, 1393, 1394, 6, 181, 10, 0, 1394, 378, 1, 0, 0, 0, 1395, 1396, 3, 61, 23, 0, 1396, 1397, 1, 0, 0, 0, 1397, 1398, 6, 182, 10, 0, 1398, 380, 1, 0, 0, 0, 1399, 1400, 3, 63, 24, 0, 1400, 1401, 1, 0, 0, 0, 1401, 1402, 6, 183, 15, 0, 1402, 1403, 6, 183, 11, 0, 1403, 382, 1, 0, 0, 0, 1404, 1405, 3, 207, 96, 0, 1405, 1406, 1, 0, 0, 0, 1406, 1407, 6, 184, 20, 0, 1407, 1408, 6, 184, 11, 0, 1408, 1409, 6, 184, 34, 0, 1409, 384, 1, 0, 0, 0, 1410, 1411, 3, 85, 35, 0, 1411, 1412, 1, 0, 0, 0, 1412, 1413, 6, 185, 21, 0, 1413, 1414, 6, 185, 11, 0, 1414, 1415, 6, 185, 34, 0, 1415, 386, 1, 0, 0, 0, 1416, 1417, 3, 57, 21, 0, 1417, 1418, 1, 0, 0, 0, 1418, 1419, 6, 186, 10, 0, 1419, 388, 1, 0, 0, 0, 1420, 1421, 3, 59, 22, 0, 1421, 1422, 1, 0, 0, 0, 1422, 1423, 6, 187, 10, 0, 1423, 390, 1, 0, 0, 0, 1424, 1425, 3, 61, 23, 0, 1425, 1426, 1, 0, 0, 0, 1426, 1427, 6, 188, 10, 0, 1427, 392, 1, 0, 0, 0, 1428, 1429, 3, 337, 161, 0, 1429, 1430, 1, 0, 0, 0, 1430, 1431, 6, 189, 17, 0, 1431, 1432, 6, 189, 11, 0, 1432, 1433, 6, 189, 9, 0, 1433, 394, 1, 0, 0, 0, 1434, 1435, 3, 101, 43, 0, 1435, 1436, 1, 0, 0, 0, 1436, 1437, 6, 190, 18, 0, 1437, 1438, 6, 190, 11, 0, 1438, 1439, 6, 190, 9, 0, 1439, 396, 1, 0, 0, 0, 1440, 1441, 3, 57, 21, 0, 1441, 1442, 1, 0, 0, 0, 1442, 1443, 6, 191, 10, 0, 1443, 398, 1, 0, 0, 0, 1444, 1445, 3, 59, 22, 0, 1445, 1446, 1, 0, 0, 0, 1446, 1447, 6, 192, 10, 0, 1447, 400, 1, 0, 0, 0, 1448, 1449, 3, 61, 23, 0, 1449, 1450, 1, 0, 0, 0, 1450, 1451, 6, 193, 10, 0, 1451, 402, 1, 0, 0, 0, 1452, 1453, 3, 173, 79, 0, 1453, 1454, 1, 0, 0, 0, 1454, 1455, 6, 194, 11, 0, 1455, 1456, 6, 194, 0, 0, 1456, 1457, 6, 194, 30, 0, 1457, 404, 1, 0, 0, 0, 1458, 1459, 3, 169, 77, 0, 1459, 1460, 1, 0, 0, 0, 1460, 1461, 6, 195, 11, 0, 1461, 1462, 6, 195, 0, 0, 1462, 1463, 6, 195, 31, 0, 1463, 406, 1, 0, 0, 0, 1464, 1465, 3, 91, 38, 0, 1465, 1466, 1, 0, 0, 0, 1466, 1467, 6, 196, 11, 0, 1467, 1468, 6, 196, 0, 0, 1468, 1469, 6, 196, 35, 0, 1469, 408, 1, 0, 0, 0, 1470, 1471, 3, 63, 24, 0, 1471, 1472, 1, 0, 0, 0, 1472, 1473, 6, 197, 15, 0, 1473, 1474, 6, 197, 11, 0, 1474, 410, 1, 0, 0, 0, 65, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 588, 598, 602, 605, 614, 616, 627, 646, 651, 660, 667, 672, 674, 685, 693, 696, 698, 703, 708, 714, 721, 726, 732, 735, 743, 747, 874, 879, 886, 888, 904, 909, 914, 916, 922, 999, 1004, 1051, 1055, 1060, 1065, 1070, 1072, 1076, 1078, 1163, 1167, 1172, 1311, 1313, 36, 5, 1, 0, 5, 4, 0, 5, 6, 0, 5, 2, 0, 5, 3, 0, 5, 8, 0, 5, 5, 0, 5, 9, 0, 5, 11, 0, 5, 13, 0, 0, 1, 0, 4, 0, 0, 7, 19, 0, 7, 65, 0, 5, 0, 0, 7, 25, 0, 7, 66, 0, 7, 104, 0, 7, 34, 0, 7, 32, 0, 7, 76, 0, 7, 26, 0, 7, 36, 0, 7, 48, 0, 7, 64, 0, 7, 80, 0, 5, 10, 0, 5, 7, 0, 7, 90, 0, 7, 89, 0, 7, 68, 0, 7, 67, 0, 7, 88, 0, 5, 12, 0, 5, 14, 0, 7, 29, 0]
\ No newline at end of file
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens b/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
index 747fbbc64cf5..4fd37ab9900f 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
@@ -7,122 +7,117 @@ FROM=6
GROK=7
KEEP=8
LIMIT=9
-META=10
-MV_EXPAND=11
-RENAME=12
-ROW=13
-SHOW=14
-SORT=15
-STATS=16
-WHERE=17
-DEV_INLINESTATS=18
-DEV_LOOKUP=19
-DEV_MATCH=20
-DEV_METRICS=21
-UNKNOWN_CMD=22
-LINE_COMMENT=23
-MULTILINE_COMMENT=24
-WS=25
-PIPE=26
-QUOTED_STRING=27
-INTEGER_LITERAL=28
-DECIMAL_LITERAL=29
-BY=30
-AND=31
-ASC=32
-ASSIGN=33
-CAST_OP=34
-COMMA=35
-DESC=36
-DOT=37
-FALSE=38
-FIRST=39
-IN=40
-IS=41
-LAST=42
-LIKE=43
-LP=44
-NOT=45
-NULL=46
-NULLS=47
-OR=48
-PARAM=49
-RLIKE=50
-RP=51
-TRUE=52
-EQ=53
-CIEQ=54
-NEQ=55
-LT=56
-LTE=57
-GT=58
-GTE=59
-PLUS=60
-MINUS=61
-ASTERISK=62
-SLASH=63
-PERCENT=64
-NAMED_OR_POSITIONAL_PARAM=65
-OPENING_BRACKET=66
-CLOSING_BRACKET=67
-UNQUOTED_IDENTIFIER=68
-QUOTED_IDENTIFIER=69
-EXPR_LINE_COMMENT=70
-EXPR_MULTILINE_COMMENT=71
-EXPR_WS=72
-EXPLAIN_WS=73
-EXPLAIN_LINE_COMMENT=74
-EXPLAIN_MULTILINE_COMMENT=75
-METADATA=76
-UNQUOTED_SOURCE=77
-FROM_LINE_COMMENT=78
-FROM_MULTILINE_COMMENT=79
-FROM_WS=80
-ID_PATTERN=81
-PROJECT_LINE_COMMENT=82
-PROJECT_MULTILINE_COMMENT=83
-PROJECT_WS=84
-AS=85
-RENAME_LINE_COMMENT=86
-RENAME_MULTILINE_COMMENT=87
-RENAME_WS=88
-ON=89
-WITH=90
-ENRICH_POLICY_NAME=91
-ENRICH_LINE_COMMENT=92
-ENRICH_MULTILINE_COMMENT=93
-ENRICH_WS=94
-ENRICH_FIELD_LINE_COMMENT=95
-ENRICH_FIELD_MULTILINE_COMMENT=96
-ENRICH_FIELD_WS=97
-MVEXPAND_LINE_COMMENT=98
-MVEXPAND_MULTILINE_COMMENT=99
-MVEXPAND_WS=100
-INFO=101
-SHOW_LINE_COMMENT=102
-SHOW_MULTILINE_COMMENT=103
-SHOW_WS=104
-FUNCTIONS=105
-META_LINE_COMMENT=106
-META_MULTILINE_COMMENT=107
-META_WS=108
-COLON=109
-SETTING=110
-SETTING_LINE_COMMENT=111
-SETTTING_MULTILINE_COMMENT=112
-SETTING_WS=113
-LOOKUP_LINE_COMMENT=114
-LOOKUP_MULTILINE_COMMENT=115
-LOOKUP_WS=116
-LOOKUP_FIELD_LINE_COMMENT=117
-LOOKUP_FIELD_MULTILINE_COMMENT=118
-LOOKUP_FIELD_WS=119
-METRICS_LINE_COMMENT=120
-METRICS_MULTILINE_COMMENT=121
-METRICS_WS=122
-CLOSING_METRICS_LINE_COMMENT=123
-CLOSING_METRICS_MULTILINE_COMMENT=124
-CLOSING_METRICS_WS=125
+MV_EXPAND=10
+RENAME=11
+ROW=12
+SHOW=13
+SORT=14
+STATS=15
+WHERE=16
+DEV_INLINESTATS=17
+DEV_LOOKUP=18
+DEV_MATCH=19
+DEV_METRICS=20
+UNKNOWN_CMD=21
+LINE_COMMENT=22
+MULTILINE_COMMENT=23
+WS=24
+PIPE=25
+QUOTED_STRING=26
+INTEGER_LITERAL=27
+DECIMAL_LITERAL=28
+BY=29
+AND=30
+ASC=31
+ASSIGN=32
+CAST_OP=33
+COMMA=34
+DESC=35
+DOT=36
+FALSE=37
+FIRST=38
+IN=39
+IS=40
+LAST=41
+LIKE=42
+LP=43
+NOT=44
+NULL=45
+NULLS=46
+OR=47
+PARAM=48
+RLIKE=49
+RP=50
+TRUE=51
+EQ=52
+CIEQ=53
+NEQ=54
+LT=55
+LTE=56
+GT=57
+GTE=58
+PLUS=59
+MINUS=60
+ASTERISK=61
+SLASH=62
+PERCENT=63
+NAMED_OR_POSITIONAL_PARAM=64
+OPENING_BRACKET=65
+CLOSING_BRACKET=66
+UNQUOTED_IDENTIFIER=67
+QUOTED_IDENTIFIER=68
+EXPR_LINE_COMMENT=69
+EXPR_MULTILINE_COMMENT=70
+EXPR_WS=71
+EXPLAIN_WS=72
+EXPLAIN_LINE_COMMENT=73
+EXPLAIN_MULTILINE_COMMENT=74
+METADATA=75
+UNQUOTED_SOURCE=76
+FROM_LINE_COMMENT=77
+FROM_MULTILINE_COMMENT=78
+FROM_WS=79
+ID_PATTERN=80
+PROJECT_LINE_COMMENT=81
+PROJECT_MULTILINE_COMMENT=82
+PROJECT_WS=83
+AS=84
+RENAME_LINE_COMMENT=85
+RENAME_MULTILINE_COMMENT=86
+RENAME_WS=87
+ON=88
+WITH=89
+ENRICH_POLICY_NAME=90
+ENRICH_LINE_COMMENT=91
+ENRICH_MULTILINE_COMMENT=92
+ENRICH_WS=93
+ENRICH_FIELD_LINE_COMMENT=94
+ENRICH_FIELD_MULTILINE_COMMENT=95
+ENRICH_FIELD_WS=96
+MVEXPAND_LINE_COMMENT=97
+MVEXPAND_MULTILINE_COMMENT=98
+MVEXPAND_WS=99
+INFO=100
+SHOW_LINE_COMMENT=101
+SHOW_MULTILINE_COMMENT=102
+SHOW_WS=103
+COLON=104
+SETTING=105
+SETTING_LINE_COMMENT=106
+SETTTING_MULTILINE_COMMENT=107
+SETTING_WS=108
+LOOKUP_LINE_COMMENT=109
+LOOKUP_MULTILINE_COMMENT=110
+LOOKUP_WS=111
+LOOKUP_FIELD_LINE_COMMENT=112
+LOOKUP_FIELD_MULTILINE_COMMENT=113
+LOOKUP_FIELD_WS=114
+METRICS_LINE_COMMENT=115
+METRICS_MULTILINE_COMMENT=116
+METRICS_WS=117
+CLOSING_METRICS_LINE_COMMENT=118
+CLOSING_METRICS_MULTILINE_COMMENT=119
+CLOSING_METRICS_WS=120
'dissect'=1
'drop'=2
'enrich'=3
@@ -132,55 +127,53 @@ CLOSING_METRICS_WS=125
'grok'=7
'keep'=8
'limit'=9
-'meta'=10
-'mv_expand'=11
-'rename'=12
-'row'=13
-'show'=14
-'sort'=15
-'stats'=16
-'where'=17
-'|'=26
-'by'=30
-'and'=31
-'asc'=32
-'='=33
-'::'=34
-','=35
-'desc'=36
-'.'=37
-'false'=38
-'first'=39
-'in'=40
-'is'=41
-'last'=42
-'like'=43
-'('=44
-'not'=45
-'null'=46
-'nulls'=47
-'or'=48
-'?'=49
-'rlike'=50
-')'=51
-'true'=52
-'=='=53
-'=~'=54
-'!='=55
-'<'=56
-'<='=57
-'>'=58
-'>='=59
-'+'=60
-'-'=61
-'*'=62
-'/'=63
-'%'=64
-']'=67
-'metadata'=76
-'as'=85
-'on'=89
-'with'=90
-'info'=101
-'functions'=105
-':'=109
+'mv_expand'=10
+'rename'=11
+'row'=12
+'show'=13
+'sort'=14
+'stats'=15
+'where'=16
+'|'=25
+'by'=29
+'and'=30
+'asc'=31
+'='=32
+'::'=33
+','=34
+'desc'=35
+'.'=36
+'false'=37
+'first'=38
+'in'=39
+'is'=40
+'last'=41
+'like'=42
+'('=43
+'not'=44
+'null'=45
+'nulls'=46
+'or'=47
+'?'=48
+'rlike'=49
+')'=50
+'true'=51
+'=='=52
+'=~'=53
+'!='=54
+'<'=55
+'<='=56
+'>'=57
+'>='=58
+'+'=59
+'-'=60
+'*'=61
+'/'=62
+'%'=63
+']'=66
+'metadata'=75
+'as'=84
+'on'=88
+'with'=89
+'info'=100
+':'=104
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.ts b/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
index a3be12402651..bbd8286b61d7 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
@@ -32,122 +32,117 @@ export default class esql_lexer extends lexer_config {
public static readonly GROK = 7;
public static readonly KEEP = 8;
public static readonly LIMIT = 9;
- public static readonly META = 10;
- public static readonly MV_EXPAND = 11;
- public static readonly RENAME = 12;
- public static readonly ROW = 13;
- public static readonly SHOW = 14;
- public static readonly SORT = 15;
- public static readonly STATS = 16;
- public static readonly WHERE = 17;
- public static readonly DEV_INLINESTATS = 18;
- public static readonly DEV_LOOKUP = 19;
- public static readonly DEV_MATCH = 20;
- public static readonly DEV_METRICS = 21;
- public static readonly UNKNOWN_CMD = 22;
- public static readonly LINE_COMMENT = 23;
- public static readonly MULTILINE_COMMENT = 24;
- public static readonly WS = 25;
- public static readonly PIPE = 26;
- public static readonly QUOTED_STRING = 27;
- public static readonly INTEGER_LITERAL = 28;
- public static readonly DECIMAL_LITERAL = 29;
- public static readonly BY = 30;
- public static readonly AND = 31;
- public static readonly ASC = 32;
- public static readonly ASSIGN = 33;
- public static readonly CAST_OP = 34;
- public static readonly COMMA = 35;
- public static readonly DESC = 36;
- public static readonly DOT = 37;
- public static readonly FALSE = 38;
- public static readonly FIRST = 39;
- public static readonly IN = 40;
- public static readonly IS = 41;
- public static readonly LAST = 42;
- public static readonly LIKE = 43;
- public static readonly LP = 44;
- public static readonly NOT = 45;
- public static readonly NULL = 46;
- public static readonly NULLS = 47;
- public static readonly OR = 48;
- public static readonly PARAM = 49;
- public static readonly RLIKE = 50;
- public static readonly RP = 51;
- public static readonly TRUE = 52;
- public static readonly EQ = 53;
- public static readonly CIEQ = 54;
- public static readonly NEQ = 55;
- public static readonly LT = 56;
- public static readonly LTE = 57;
- public static readonly GT = 58;
- public static readonly GTE = 59;
- public static readonly PLUS = 60;
- public static readonly MINUS = 61;
- public static readonly ASTERISK = 62;
- public static readonly SLASH = 63;
- public static readonly PERCENT = 64;
- public static readonly NAMED_OR_POSITIONAL_PARAM = 65;
- public static readonly OPENING_BRACKET = 66;
- public static readonly CLOSING_BRACKET = 67;
- public static readonly UNQUOTED_IDENTIFIER = 68;
- public static readonly QUOTED_IDENTIFIER = 69;
- public static readonly EXPR_LINE_COMMENT = 70;
- public static readonly EXPR_MULTILINE_COMMENT = 71;
- public static readonly EXPR_WS = 72;
- public static readonly EXPLAIN_WS = 73;
- public static readonly EXPLAIN_LINE_COMMENT = 74;
- public static readonly EXPLAIN_MULTILINE_COMMENT = 75;
- public static readonly METADATA = 76;
- public static readonly UNQUOTED_SOURCE = 77;
- public static readonly FROM_LINE_COMMENT = 78;
- public static readonly FROM_MULTILINE_COMMENT = 79;
- public static readonly FROM_WS = 80;
- public static readonly ID_PATTERN = 81;
- public static readonly PROJECT_LINE_COMMENT = 82;
- public static readonly PROJECT_MULTILINE_COMMENT = 83;
- public static readonly PROJECT_WS = 84;
- public static readonly AS = 85;
- public static readonly RENAME_LINE_COMMENT = 86;
- public static readonly RENAME_MULTILINE_COMMENT = 87;
- public static readonly RENAME_WS = 88;
- public static readonly ON = 89;
- public static readonly WITH = 90;
- public static readonly ENRICH_POLICY_NAME = 91;
- public static readonly ENRICH_LINE_COMMENT = 92;
- public static readonly ENRICH_MULTILINE_COMMENT = 93;
- public static readonly ENRICH_WS = 94;
- public static readonly ENRICH_FIELD_LINE_COMMENT = 95;
- public static readonly ENRICH_FIELD_MULTILINE_COMMENT = 96;
- public static readonly ENRICH_FIELD_WS = 97;
- public static readonly MVEXPAND_LINE_COMMENT = 98;
- public static readonly MVEXPAND_MULTILINE_COMMENT = 99;
- public static readonly MVEXPAND_WS = 100;
- public static readonly INFO = 101;
- public static readonly SHOW_LINE_COMMENT = 102;
- public static readonly SHOW_MULTILINE_COMMENT = 103;
- public static readonly SHOW_WS = 104;
- public static readonly FUNCTIONS = 105;
- public static readonly META_LINE_COMMENT = 106;
- public static readonly META_MULTILINE_COMMENT = 107;
- public static readonly META_WS = 108;
- public static readonly COLON = 109;
- public static readonly SETTING = 110;
- public static readonly SETTING_LINE_COMMENT = 111;
- public static readonly SETTTING_MULTILINE_COMMENT = 112;
- public static readonly SETTING_WS = 113;
- public static readonly LOOKUP_LINE_COMMENT = 114;
- public static readonly LOOKUP_MULTILINE_COMMENT = 115;
- public static readonly LOOKUP_WS = 116;
- public static readonly LOOKUP_FIELD_LINE_COMMENT = 117;
- public static readonly LOOKUP_FIELD_MULTILINE_COMMENT = 118;
- public static readonly LOOKUP_FIELD_WS = 119;
- public static readonly METRICS_LINE_COMMENT = 120;
- public static readonly METRICS_MULTILINE_COMMENT = 121;
- public static readonly METRICS_WS = 122;
- public static readonly CLOSING_METRICS_LINE_COMMENT = 123;
- public static readonly CLOSING_METRICS_MULTILINE_COMMENT = 124;
- public static readonly CLOSING_METRICS_WS = 125;
+ public static readonly MV_EXPAND = 10;
+ public static readonly RENAME = 11;
+ public static readonly ROW = 12;
+ public static readonly SHOW = 13;
+ public static readonly SORT = 14;
+ public static readonly STATS = 15;
+ public static readonly WHERE = 16;
+ public static readonly DEV_INLINESTATS = 17;
+ public static readonly DEV_LOOKUP = 18;
+ public static readonly DEV_MATCH = 19;
+ public static readonly DEV_METRICS = 20;
+ public static readonly UNKNOWN_CMD = 21;
+ public static readonly LINE_COMMENT = 22;
+ public static readonly MULTILINE_COMMENT = 23;
+ public static readonly WS = 24;
+ public static readonly PIPE = 25;
+ public static readonly QUOTED_STRING = 26;
+ public static readonly INTEGER_LITERAL = 27;
+ public static readonly DECIMAL_LITERAL = 28;
+ public static readonly BY = 29;
+ public static readonly AND = 30;
+ public static readonly ASC = 31;
+ public static readonly ASSIGN = 32;
+ public static readonly CAST_OP = 33;
+ public static readonly COMMA = 34;
+ public static readonly DESC = 35;
+ public static readonly DOT = 36;
+ public static readonly FALSE = 37;
+ public static readonly FIRST = 38;
+ public static readonly IN = 39;
+ public static readonly IS = 40;
+ public static readonly LAST = 41;
+ public static readonly LIKE = 42;
+ public static readonly LP = 43;
+ public static readonly NOT = 44;
+ public static readonly NULL = 45;
+ public static readonly NULLS = 46;
+ public static readonly OR = 47;
+ public static readonly PARAM = 48;
+ public static readonly RLIKE = 49;
+ public static readonly RP = 50;
+ public static readonly TRUE = 51;
+ public static readonly EQ = 52;
+ public static readonly CIEQ = 53;
+ public static readonly NEQ = 54;
+ public static readonly LT = 55;
+ public static readonly LTE = 56;
+ public static readonly GT = 57;
+ public static readonly GTE = 58;
+ public static readonly PLUS = 59;
+ public static readonly MINUS = 60;
+ public static readonly ASTERISK = 61;
+ public static readonly SLASH = 62;
+ public static readonly PERCENT = 63;
+ public static readonly NAMED_OR_POSITIONAL_PARAM = 64;
+ public static readonly OPENING_BRACKET = 65;
+ public static readonly CLOSING_BRACKET = 66;
+ public static readonly UNQUOTED_IDENTIFIER = 67;
+ public static readonly QUOTED_IDENTIFIER = 68;
+ public static readonly EXPR_LINE_COMMENT = 69;
+ public static readonly EXPR_MULTILINE_COMMENT = 70;
+ public static readonly EXPR_WS = 71;
+ public static readonly EXPLAIN_WS = 72;
+ public static readonly EXPLAIN_LINE_COMMENT = 73;
+ public static readonly EXPLAIN_MULTILINE_COMMENT = 74;
+ public static readonly METADATA = 75;
+ public static readonly UNQUOTED_SOURCE = 76;
+ public static readonly FROM_LINE_COMMENT = 77;
+ public static readonly FROM_MULTILINE_COMMENT = 78;
+ public static readonly FROM_WS = 79;
+ public static readonly ID_PATTERN = 80;
+ public static readonly PROJECT_LINE_COMMENT = 81;
+ public static readonly PROJECT_MULTILINE_COMMENT = 82;
+ public static readonly PROJECT_WS = 83;
+ public static readonly AS = 84;
+ public static readonly RENAME_LINE_COMMENT = 85;
+ public static readonly RENAME_MULTILINE_COMMENT = 86;
+ public static readonly RENAME_WS = 87;
+ public static readonly ON = 88;
+ public static readonly WITH = 89;
+ public static readonly ENRICH_POLICY_NAME = 90;
+ public static readonly ENRICH_LINE_COMMENT = 91;
+ public static readonly ENRICH_MULTILINE_COMMENT = 92;
+ public static readonly ENRICH_WS = 93;
+ public static readonly ENRICH_FIELD_LINE_COMMENT = 94;
+ public static readonly ENRICH_FIELD_MULTILINE_COMMENT = 95;
+ public static readonly ENRICH_FIELD_WS = 96;
+ public static readonly MVEXPAND_LINE_COMMENT = 97;
+ public static readonly MVEXPAND_MULTILINE_COMMENT = 98;
+ public static readonly MVEXPAND_WS = 99;
+ public static readonly INFO = 100;
+ public static readonly SHOW_LINE_COMMENT = 101;
+ public static readonly SHOW_MULTILINE_COMMENT = 102;
+ public static readonly SHOW_WS = 103;
+ public static readonly COLON = 104;
+ public static readonly SETTING = 105;
+ public static readonly SETTING_LINE_COMMENT = 106;
+ public static readonly SETTTING_MULTILINE_COMMENT = 107;
+ public static readonly SETTING_WS = 108;
+ public static readonly LOOKUP_LINE_COMMENT = 109;
+ public static readonly LOOKUP_MULTILINE_COMMENT = 110;
+ public static readonly LOOKUP_WS = 111;
+ public static readonly LOOKUP_FIELD_LINE_COMMENT = 112;
+ public static readonly LOOKUP_FIELD_MULTILINE_COMMENT = 113;
+ public static readonly LOOKUP_FIELD_WS = 114;
+ public static readonly METRICS_LINE_COMMENT = 115;
+ public static readonly METRICS_MULTILINE_COMMENT = 116;
+ public static readonly METRICS_WS = 117;
+ public static readonly CLOSING_METRICS_LINE_COMMENT = 118;
+ public static readonly CLOSING_METRICS_MULTILINE_COMMENT = 119;
+ public static readonly CLOSING_METRICS_WS = 120;
public static readonly EOF = Token.EOF;
public static readonly EXPRESSION_MODE = 1;
public static readonly EXPLAIN_MODE = 2;
@@ -158,12 +153,11 @@ export default class esql_lexer extends lexer_config {
public static readonly ENRICH_FIELD_MODE = 7;
public static readonly MVEXPAND_MODE = 8;
public static readonly SHOW_MODE = 9;
- public static readonly META_MODE = 10;
- public static readonly SETTING_MODE = 11;
- public static readonly LOOKUP_MODE = 12;
- public static readonly LOOKUP_FIELD_MODE = 13;
- public static readonly METRICS_MODE = 14;
- public static readonly CLOSING_METRICS_MODE = 15;
+ public static readonly SETTING_MODE = 10;
+ public static readonly LOOKUP_MODE = 11;
+ public static readonly LOOKUP_FIELD_MODE = 12;
+ public static readonly METRICS_MODE = 13;
+ public static readonly CLOSING_METRICS_MODE = 14;
public static readonly channelNames: string[] = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ];
public static readonly literalNames: (string | null)[] = [ null, "'dissect'",
@@ -171,7 +165,7 @@ export default class esql_lexer extends lexer_config {
"'eval'", "'explain'",
"'from'", "'grok'",
"'keep'", "'limit'",
- "'meta'", "'mv_expand'",
+ "'mv_expand'",
"'rename'",
"'row'", "'show'",
"'sort'", "'stats'",
@@ -219,15 +213,13 @@ export default class esql_lexer extends lexer_config {
null, null,
"'info'", null,
null, null,
- "'functions'",
- null, null,
- null, "':'" ];
+ "':'" ];
public static readonly symbolicNames: (string | null)[] = [ null, "DISSECT",
"DROP", "ENRICH",
"EVAL", "EXPLAIN",
"FROM", "GROK",
"KEEP", "LIMIT",
- "META", "MV_EXPAND",
+ "MV_EXPAND",
"RENAME", "ROW",
"SHOW", "SORT",
"STATS", "WHERE",
@@ -297,10 +289,6 @@ export default class esql_lexer extends lexer_config {
"INFO", "SHOW_LINE_COMMENT",
"SHOW_MULTILINE_COMMENT",
"SHOW_WS",
- "FUNCTIONS",
- "META_LINE_COMMENT",
- "META_MULTILINE_COMMENT",
- "META_WS",
"COLON", "SETTING",
"SETTING_LINE_COMMENT",
"SETTTING_MULTILINE_COMMENT",
@@ -322,17 +310,17 @@ export default class esql_lexer extends lexer_config {
"PROJECT_MODE", "RENAME_MODE",
"ENRICH_MODE", "ENRICH_FIELD_MODE",
"MVEXPAND_MODE", "SHOW_MODE",
- "META_MODE", "SETTING_MODE",
- "LOOKUP_MODE", "LOOKUP_FIELD_MODE",
- "METRICS_MODE", "CLOSING_METRICS_MODE", ];
+ "SETTING_MODE", "LOOKUP_MODE",
+ "LOOKUP_FIELD_MODE", "METRICS_MODE",
+ "CLOSING_METRICS_MODE", ];
public static readonly ruleNames: string[] = [
"DISSECT", "DROP", "ENRICH", "EVAL", "EXPLAIN", "FROM", "GROK", "KEEP",
- "LIMIT", "META", "MV_EXPAND", "RENAME", "ROW", "SHOW", "SORT", "STATS",
- "WHERE", "DEV_INLINESTATS", "DEV_LOOKUP", "DEV_MATCH", "DEV_METRICS",
- "UNKNOWN_CMD", "LINE_COMMENT", "MULTILINE_COMMENT", "WS", "PIPE", "DIGIT",
- "LETTER", "ESCAPE_SEQUENCE", "UNESCAPED_CHARS", "EXPONENT", "ASPERAND",
- "BACKQUOTE", "BACKQUOTE_BLOCK", "UNDERSCORE", "UNQUOTED_ID_BODY", "QUOTED_STRING",
+ "LIMIT", "MV_EXPAND", "RENAME", "ROW", "SHOW", "SORT", "STATS", "WHERE",
+ "DEV_INLINESTATS", "DEV_LOOKUP", "DEV_MATCH", "DEV_METRICS", "UNKNOWN_CMD",
+ "LINE_COMMENT", "MULTILINE_COMMENT", "WS", "PIPE", "DIGIT", "LETTER",
+ "ESCAPE_SEQUENCE", "UNESCAPED_CHARS", "EXPONENT", "ASPERAND", "BACKQUOTE",
+ "BACKQUOTE_BLOCK", "UNDERSCORE", "UNQUOTED_ID_BODY", "QUOTED_STRING",
"INTEGER_LITERAL", "DECIMAL_LITERAL", "BY", "AND", "ASC", "ASSIGN", "CAST_OP",
"COMMA", "DESC", "DOT", "FALSE", "FIRST", "IN", "IS", "LAST", "LIKE",
"LP", "NOT", "NULL", "NULLS", "OR", "PARAM", "RLIKE", "RP", "TRUE", "EQ",
@@ -344,24 +332,27 @@ export default class esql_lexer extends lexer_config {
"FROM_PIPE", "FROM_OPENING_BRACKET", "FROM_CLOSING_BRACKET", "FROM_COLON",
"FROM_COMMA", "FROM_ASSIGN", "METADATA", "UNQUOTED_SOURCE_PART", "UNQUOTED_SOURCE",
"FROM_UNQUOTED_SOURCE", "FROM_QUOTED_SOURCE", "FROM_LINE_COMMENT", "FROM_MULTILINE_COMMENT",
- "FROM_WS", "PROJECT_PIPE", "PROJECT_DOT", "PROJECT_COMMA", "UNQUOTED_ID_BODY_WITH_PATTERN",
+ "FROM_WS", "PROJECT_PIPE", "PROJECT_DOT", "PROJECT_COMMA", "PROJECT_PARAM",
+ "PROJECT_NAMED_OR_POSITIONAL_PARAM", "UNQUOTED_ID_BODY_WITH_PATTERN",
"UNQUOTED_ID_PATTERN", "ID_PATTERN", "PROJECT_LINE_COMMENT", "PROJECT_MULTILINE_COMMENT",
"PROJECT_WS", "RENAME_PIPE", "RENAME_ASSIGN", "RENAME_COMMA", "RENAME_DOT",
- "AS", "RENAME_ID_PATTERN", "RENAME_LINE_COMMENT", "RENAME_MULTILINE_COMMENT",
- "RENAME_WS", "ENRICH_PIPE", "ENRICH_OPENING_BRACKET", "ON", "WITH", "ENRICH_POLICY_NAME_BODY",
- "ENRICH_POLICY_NAME", "ENRICH_MODE_UNQUOTED_VALUE", "ENRICH_LINE_COMMENT",
- "ENRICH_MULTILINE_COMMENT", "ENRICH_WS", "ENRICH_FIELD_PIPE", "ENRICH_FIELD_ASSIGN",
- "ENRICH_FIELD_COMMA", "ENRICH_FIELD_DOT", "ENRICH_FIELD_WITH", "ENRICH_FIELD_ID_PATTERN",
- "ENRICH_FIELD_QUOTED_IDENTIFIER", "ENRICH_FIELD_LINE_COMMENT", "ENRICH_FIELD_MULTILINE_COMMENT",
- "ENRICH_FIELD_WS", "MVEXPAND_PIPE", "MVEXPAND_DOT", "MVEXPAND_QUOTED_IDENTIFIER",
- "MVEXPAND_UNQUOTED_IDENTIFIER", "MVEXPAND_LINE_COMMENT", "MVEXPAND_MULTILINE_COMMENT",
- "MVEXPAND_WS", "SHOW_PIPE", "INFO", "SHOW_LINE_COMMENT", "SHOW_MULTILINE_COMMENT",
- "SHOW_WS", "META_PIPE", "FUNCTIONS", "META_LINE_COMMENT", "META_MULTILINE_COMMENT",
- "META_WS", "SETTING_CLOSING_BRACKET", "COLON", "SETTING", "SETTING_LINE_COMMENT",
- "SETTTING_MULTILINE_COMMENT", "SETTING_WS", "LOOKUP_PIPE", "LOOKUP_COLON",
- "LOOKUP_COMMA", "LOOKUP_DOT", "LOOKUP_ON", "LOOKUP_UNQUOTED_SOURCE", "LOOKUP_QUOTED_SOURCE",
- "LOOKUP_LINE_COMMENT", "LOOKUP_MULTILINE_COMMENT", "LOOKUP_WS", "LOOKUP_FIELD_PIPE",
- "LOOKUP_FIELD_COMMA", "LOOKUP_FIELD_DOT", "LOOKUP_FIELD_ID_PATTERN", "LOOKUP_FIELD_LINE_COMMENT",
+ "RENAME_PARAM", "RENAME_NAMED_OR_POSITIONAL_PARAM", "AS", "RENAME_ID_PATTERN",
+ "RENAME_LINE_COMMENT", "RENAME_MULTILINE_COMMENT", "RENAME_WS", "ENRICH_PIPE",
+ "ENRICH_OPENING_BRACKET", "ON", "WITH", "ENRICH_POLICY_NAME_BODY", "ENRICH_POLICY_NAME",
+ "ENRICH_MODE_UNQUOTED_VALUE", "ENRICH_LINE_COMMENT", "ENRICH_MULTILINE_COMMENT",
+ "ENRICH_WS", "ENRICH_FIELD_PIPE", "ENRICH_FIELD_ASSIGN", "ENRICH_FIELD_COMMA",
+ "ENRICH_FIELD_DOT", "ENRICH_FIELD_WITH", "ENRICH_FIELD_ID_PATTERN", "ENRICH_FIELD_QUOTED_IDENTIFIER",
+ "ENRICH_FIELD_PARAM", "ENRICH_FIELD_NAMED_OR_POSITIONAL_PARAM", "ENRICH_FIELD_LINE_COMMENT",
+ "ENRICH_FIELD_MULTILINE_COMMENT", "ENRICH_FIELD_WS", "MVEXPAND_PIPE",
+ "MVEXPAND_DOT", "MVEXPAND_PARAM", "MVEXPAND_NAMED_OR_POSITIONAL_PARAM",
+ "MVEXPAND_QUOTED_IDENTIFIER", "MVEXPAND_UNQUOTED_IDENTIFIER", "MVEXPAND_LINE_COMMENT",
+ "MVEXPAND_MULTILINE_COMMENT", "MVEXPAND_WS", "SHOW_PIPE", "INFO", "SHOW_LINE_COMMENT",
+ "SHOW_MULTILINE_COMMENT", "SHOW_WS", "SETTING_CLOSING_BRACKET", "COLON",
+ "SETTING", "SETTING_LINE_COMMENT", "SETTTING_MULTILINE_COMMENT", "SETTING_WS",
+ "LOOKUP_PIPE", "LOOKUP_COLON", "LOOKUP_COMMA", "LOOKUP_DOT", "LOOKUP_ON",
+ "LOOKUP_UNQUOTED_SOURCE", "LOOKUP_QUOTED_SOURCE", "LOOKUP_LINE_COMMENT",
+ "LOOKUP_MULTILINE_COMMENT", "LOOKUP_WS", "LOOKUP_FIELD_PIPE", "LOOKUP_FIELD_COMMA",
+ "LOOKUP_FIELD_DOT", "LOOKUP_FIELD_ID_PATTERN", "LOOKUP_FIELD_LINE_COMMENT",
"LOOKUP_FIELD_MULTILINE_COMMENT", "LOOKUP_FIELD_WS", "METRICS_PIPE", "METRICS_UNQUOTED_SOURCE",
"METRICS_QUOTED_SOURCE", "METRICS_LINE_COMMENT", "METRICS_MULTILINE_COMMENT",
"METRICS_WS", "CLOSING_METRICS_COLON", "CLOSING_METRICS_COMMA", "CLOSING_METRICS_LINE_COMMENT",
@@ -390,15 +381,15 @@ export default class esql_lexer extends lexer_config {
// @Override
public sempred(localctx: RuleContext, ruleIndex: number, predIndex: number): boolean {
switch (ruleIndex) {
- case 17:
+ case 16:
return this.DEV_INLINESTATS_sempred(localctx, predIndex);
- case 18:
+ case 17:
return this.DEV_LOOKUP_sempred(localctx, predIndex);
- case 19:
+ case 18:
return this.DEV_MATCH_sempred(localctx, predIndex);
- case 20:
+ case 19:
return this.DEV_METRICS_sempred(localctx, predIndex);
- case 74:
+ case 73:
return this.DEV_MATCH_OP_sempred(localctx, predIndex);
}
return true;
@@ -439,22 +430,22 @@ export default class esql_lexer extends lexer_config {
return true;
}
- public static readonly _serializedATN: number[] = [4,0,125,1474,6,-1,6,
- -1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,
- 2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,
- 2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,
- 7,16,2,17,7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,
- 23,2,24,7,24,2,25,7,25,2,26,7,26,2,27,7,27,2,28,7,28,2,29,7,29,2,30,7,30,
- 2,31,7,31,2,32,7,32,2,33,7,33,2,34,7,34,2,35,7,35,2,36,7,36,2,37,7,37,2,
- 38,7,38,2,39,7,39,2,40,7,40,2,41,7,41,2,42,7,42,2,43,7,43,2,44,7,44,2,45,
- 7,45,2,46,7,46,2,47,7,47,2,48,7,48,2,49,7,49,2,50,7,50,2,51,7,51,2,52,7,
- 52,2,53,7,53,2,54,7,54,2,55,7,55,2,56,7,56,2,57,7,57,2,58,7,58,2,59,7,59,
- 2,60,7,60,2,61,7,61,2,62,7,62,2,63,7,63,2,64,7,64,2,65,7,65,2,66,7,66,2,
- 67,7,67,2,68,7,68,2,69,7,69,2,70,7,70,2,71,7,71,2,72,7,72,2,73,7,73,2,74,
- 7,74,2,75,7,75,2,76,7,76,2,77,7,77,2,78,7,78,2,79,7,79,2,80,7,80,2,81,7,
- 81,2,82,7,82,2,83,7,83,2,84,7,84,2,85,7,85,2,86,7,86,2,87,7,87,2,88,7,88,
- 2,89,7,89,2,90,7,90,2,91,7,91,2,92,7,92,2,93,7,93,2,94,7,94,2,95,7,95,2,
- 96,7,96,2,97,7,97,2,98,7,98,2,99,7,99,2,100,7,100,2,101,7,101,2,102,7,102,
+ public static readonly _serializedATN: number[] = [4,0,120,1475,6,-1,6,
+ -1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,2,0,
+ 7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,
+ 7,9,2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,
+ 16,2,17,7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,
+ 2,24,7,24,2,25,7,25,2,26,7,26,2,27,7,27,2,28,7,28,2,29,7,29,2,30,7,30,2,
+ 31,7,31,2,32,7,32,2,33,7,33,2,34,7,34,2,35,7,35,2,36,7,36,2,37,7,37,2,38,
+ 7,38,2,39,7,39,2,40,7,40,2,41,7,41,2,42,7,42,2,43,7,43,2,44,7,44,2,45,7,
+ 45,2,46,7,46,2,47,7,47,2,48,7,48,2,49,7,49,2,50,7,50,2,51,7,51,2,52,7,52,
+ 2,53,7,53,2,54,7,54,2,55,7,55,2,56,7,56,2,57,7,57,2,58,7,58,2,59,7,59,2,
+ 60,7,60,2,61,7,61,2,62,7,62,2,63,7,63,2,64,7,64,2,65,7,65,2,66,7,66,2,67,
+ 7,67,2,68,7,68,2,69,7,69,2,70,7,70,2,71,7,71,2,72,7,72,2,73,7,73,2,74,7,
+ 74,2,75,7,75,2,76,7,76,2,77,7,77,2,78,7,78,2,79,7,79,2,80,7,80,2,81,7,81,
+ 2,82,7,82,2,83,7,83,2,84,7,84,2,85,7,85,2,86,7,86,2,87,7,87,2,88,7,88,2,
+ 89,7,89,2,90,7,90,2,91,7,91,2,92,7,92,2,93,7,93,2,94,7,94,2,95,7,95,2,96,
+ 7,96,2,97,7,97,2,98,7,98,2,99,7,99,2,100,7,100,2,101,7,101,2,102,7,102,
2,103,7,103,2,104,7,104,2,105,7,105,2,106,7,106,2,107,7,107,2,108,7,108,
2,109,7,109,2,110,7,110,2,111,7,111,2,112,7,112,2,113,7,113,2,114,7,114,
2,115,7,115,2,116,7,116,2,117,7,117,2,118,7,118,2,119,7,119,2,120,7,120,
@@ -470,110 +461,110 @@ export default class esql_lexer extends lexer_config {
2,175,7,175,2,176,7,176,2,177,7,177,2,178,7,178,2,179,7,179,2,180,7,180,
2,181,7,181,2,182,7,182,2,183,7,183,2,184,7,184,2,185,7,185,2,186,7,186,
2,187,7,187,2,188,7,188,2,189,7,189,2,190,7,190,2,191,7,191,2,192,7,192,
- 2,193,7,193,2,194,7,194,2,195,7,195,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,
- 1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,3,
- 1,3,1,3,1,3,1,3,1,3,1,3,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,5,1,5,
- 1,5,1,5,1,5,1,5,1,5,1,6,1,6,1,6,1,6,1,6,1,6,1,6,1,7,1,7,1,7,1,7,1,7,1,7,
- 1,7,1,8,1,8,1,8,1,8,1,8,1,8,1,8,1,8,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,10,1,
- 10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,11,1,11,1,11,1,11,
- 1,11,1,11,1,11,1,11,1,11,1,12,1,12,1,12,1,12,1,12,1,12,1,13,1,13,1,13,1,
- 13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,1,15,
- 1,15,1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,17,1,17,1,
- 17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,18,1,18,
- 1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,19,1,19,1,19,1,19,1,19,1,19,1,
- 19,1,19,1,19,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,20,1,21,
- 4,21,591,8,21,11,21,12,21,592,1,21,1,21,1,22,1,22,1,22,1,22,5,22,601,8,
- 22,10,22,12,22,604,9,22,1,22,3,22,607,8,22,1,22,3,22,610,8,22,1,22,1,22,
- 1,23,1,23,1,23,1,23,1,23,5,23,619,8,23,10,23,12,23,622,9,23,1,23,1,23,1,
- 23,1,23,1,23,1,24,4,24,630,8,24,11,24,12,24,631,1,24,1,24,1,25,1,25,1,25,
- 1,25,1,26,1,26,1,27,1,27,1,28,1,28,1,28,1,29,1,29,1,30,1,30,3,30,651,8,
- 30,1,30,4,30,654,8,30,11,30,12,30,655,1,31,1,31,1,32,1,32,1,33,1,33,1,33,
- 3,33,665,8,33,1,34,1,34,1,35,1,35,1,35,3,35,672,8,35,1,36,1,36,1,36,5,36,
- 677,8,36,10,36,12,36,680,9,36,1,36,1,36,1,36,1,36,1,36,1,36,5,36,688,8,
- 36,10,36,12,36,691,9,36,1,36,1,36,1,36,1,36,1,36,3,36,698,8,36,1,36,3,36,
- 701,8,36,3,36,703,8,36,1,37,4,37,706,8,37,11,37,12,37,707,1,38,4,38,711,
- 8,38,11,38,12,38,712,1,38,1,38,5,38,717,8,38,10,38,12,38,720,9,38,1,38,
- 1,38,4,38,724,8,38,11,38,12,38,725,1,38,4,38,729,8,38,11,38,12,38,730,1,
- 38,1,38,5,38,735,8,38,10,38,12,38,738,9,38,3,38,740,8,38,1,38,1,38,1,38,
- 1,38,4,38,746,8,38,11,38,12,38,747,1,38,1,38,3,38,752,8,38,1,39,1,39,1,
- 39,1,40,1,40,1,40,1,40,1,41,1,41,1,41,1,41,1,42,1,42,1,43,1,43,1,43,1,44,
- 1,44,1,45,1,45,1,45,1,45,1,45,1,46,1,46,1,47,1,47,1,47,1,47,1,47,1,47,1,
- 48,1,48,1,48,1,48,1,48,1,48,1,49,1,49,1,49,1,50,1,50,1,50,1,51,1,51,1,51,
- 1,51,1,51,1,52,1,52,1,52,1,52,1,52,1,53,1,53,1,54,1,54,1,54,1,54,1,55,1,
- 55,1,55,1,55,1,55,1,56,1,56,1,56,1,56,1,56,1,56,1,57,1,57,1,57,1,58,1,58,
- 1,59,1,59,1,59,1,59,1,59,1,59,1,60,1,60,1,61,1,61,1,61,1,61,1,61,1,62,1,
- 62,1,62,1,63,1,63,1,63,1,64,1,64,1,64,1,65,1,65,1,66,1,66,1,66,1,67,1,67,
- 1,68,1,68,1,68,1,69,1,69,1,70,1,70,1,71,1,71,1,72,1,72,1,73,1,73,1,74,1,
- 74,1,74,1,74,1,74,1,75,1,75,1,75,3,75,879,8,75,1,75,5,75,882,8,75,10,75,
- 12,75,885,9,75,1,75,1,75,4,75,889,8,75,11,75,12,75,890,3,75,893,8,75,1,
- 76,1,76,1,76,1,76,1,76,1,77,1,77,1,77,1,77,1,77,1,78,1,78,5,78,907,8,78,
- 10,78,12,78,910,9,78,1,78,1,78,3,78,914,8,78,1,78,4,78,917,8,78,11,78,12,
- 78,918,3,78,921,8,78,1,79,1,79,4,79,925,8,79,11,79,12,79,926,1,79,1,79,
- 1,80,1,80,1,81,1,81,1,81,1,81,1,82,1,82,1,82,1,82,1,83,1,83,1,83,1,83,1,
- 84,1,84,1,84,1,84,1,84,1,85,1,85,1,85,1,85,1,85,1,86,1,86,1,86,1,86,1,87,
- 1,87,1,87,1,87,1,88,1,88,1,88,1,88,1,89,1,89,1,89,1,89,1,89,1,90,1,90,1,
- 90,1,90,1,91,1,91,1,91,1,91,1,92,1,92,1,92,1,92,1,93,1,93,1,93,1,93,1,94,
- 1,94,1,94,1,94,1,95,1,95,1,95,1,95,1,95,1,95,1,95,1,95,1,95,1,96,1,96,1,
- 96,3,96,1004,8,96,1,97,4,97,1007,8,97,11,97,12,97,1008,1,98,1,98,1,98,1,
- 98,1,99,1,99,1,99,1,99,1,100,1,100,1,100,1,100,1,101,1,101,1,101,1,101,
- 1,102,1,102,1,102,1,102,1,103,1,103,1,103,1,103,1,103,1,104,1,104,1,104,
- 1,104,1,105,1,105,1,105,1,105,1,106,1,106,1,106,1,106,3,106,1048,8,106,
- 1,107,1,107,3,107,1052,8,107,1,107,5,107,1055,8,107,10,107,12,107,1058,
- 9,107,1,107,1,107,3,107,1062,8,107,1,107,4,107,1065,8,107,11,107,12,107,
- 1066,3,107,1069,8,107,1,108,1,108,4,108,1073,8,108,11,108,12,108,1074,1,
- 109,1,109,1,109,1,109,1,110,1,110,1,110,1,110,1,111,1,111,1,111,1,111,1,
- 112,1,112,1,112,1,112,1,112,1,113,1,113,1,113,1,113,1,114,1,114,1,114,1,
- 114,1,115,1,115,1,115,1,115,1,116,1,116,1,116,1,117,1,117,1,117,1,117,1,
- 118,1,118,1,118,1,118,1,119,1,119,1,119,1,119,1,120,1,120,1,120,1,120,1,
- 121,1,121,1,121,1,121,1,121,1,122,1,122,1,122,1,122,1,122,1,123,1,123,1,
- 123,1,123,1,123,1,124,1,124,1,124,1,124,1,124,1,124,1,124,1,125,1,125,1,
- 126,4,126,1150,8,126,11,126,12,126,1151,1,126,1,126,3,126,1156,8,126,1,
- 126,4,126,1159,8,126,11,126,12,126,1160,1,127,1,127,1,127,1,127,1,128,1,
- 128,1,128,1,128,1,129,1,129,1,129,1,129,1,130,1,130,1,130,1,130,1,131,1,
- 131,1,131,1,131,1,131,1,131,1,132,1,132,1,132,1,132,1,133,1,133,1,133,1,
- 133,1,134,1,134,1,134,1,134,1,135,1,135,1,135,1,135,1,136,1,136,1,136,1,
- 136,1,137,1,137,1,137,1,137,1,138,1,138,1,138,1,138,1,139,1,139,1,139,1,
- 139,1,140,1,140,1,140,1,140,1,141,1,141,1,141,1,141,1,141,1,142,1,142,1,
- 142,1,142,1,143,1,143,1,143,1,143,1,144,1,144,1,144,1,144,1,145,1,145,1,
- 145,1,145,1,146,1,146,1,146,1,146,1,147,1,147,1,147,1,147,1,148,1,148,1,
- 148,1,148,1,148,1,149,1,149,1,149,1,149,1,149,1,150,1,150,1,150,1,150,1,
- 151,1,151,1,151,1,151,1,152,1,152,1,152,1,152,1,153,1,153,1,153,1,153,1,
- 153,1,154,1,154,1,154,1,154,1,154,1,154,1,154,1,154,1,154,1,154,1,155,1,
- 155,1,155,1,155,1,156,1,156,1,156,1,156,1,157,1,157,1,157,1,157,1,158,1,
- 158,1,158,1,158,1,158,1,159,1,159,1,160,1,160,1,160,1,160,1,160,4,160,1311,
- 8,160,11,160,12,160,1312,1,161,1,161,1,161,1,161,1,162,1,162,1,162,1,162,
- 1,163,1,163,1,163,1,163,1,164,1,164,1,164,1,164,1,164,1,165,1,165,1,165,
- 1,165,1,166,1,166,1,166,1,166,1,167,1,167,1,167,1,167,1,168,1,168,1,168,
- 1,168,1,168,1,169,1,169,1,169,1,169,1,170,1,170,1,170,1,170,1,171,1,171,
- 1,171,1,171,1,172,1,172,1,172,1,172,1,173,1,173,1,173,1,173,1,174,1,174,
- 1,174,1,174,1,174,1,174,1,175,1,175,1,175,1,175,1,176,1,176,1,176,1,176,
- 1,177,1,177,1,177,1,177,1,178,1,178,1,178,1,178,1,179,1,179,1,179,1,179,
- 1,180,1,180,1,180,1,180,1,181,1,181,1,181,1,181,1,181,1,182,1,182,1,182,
- 1,182,1,182,1,182,1,183,1,183,1,183,1,183,1,183,1,183,1,184,1,184,1,184,
- 1,184,1,185,1,185,1,185,1,185,1,186,1,186,1,186,1,186,1,187,1,187,1,187,
- 1,187,1,187,1,187,1,188,1,188,1,188,1,188,1,188,1,188,1,189,1,189,1,189,
- 1,189,1,190,1,190,1,190,1,190,1,191,1,191,1,191,1,191,1,192,1,192,1,192,
- 1,192,1,192,1,192,1,193,1,193,1,193,1,193,1,193,1,193,1,194,1,194,1,194,
- 1,194,1,194,1,194,1,195,1,195,1,195,1,195,1,195,2,620,689,0,196,16,1,18,
- 2,20,3,22,4,24,5,26,6,28,7,30,8,32,9,34,10,36,11,38,12,40,13,42,14,44,15,
- 46,16,48,17,50,18,52,19,54,20,56,21,58,22,60,23,62,24,64,25,66,26,68,0,
- 70,0,72,0,74,0,76,0,78,0,80,0,82,0,84,0,86,0,88,27,90,28,92,29,94,30,96,
- 31,98,32,100,33,102,34,104,35,106,36,108,37,110,38,112,39,114,40,116,41,
- 118,42,120,43,122,44,124,45,126,46,128,47,130,48,132,49,134,50,136,51,138,
- 52,140,53,142,54,144,55,146,56,148,57,150,58,152,59,154,60,156,61,158,62,
- 160,63,162,64,164,0,166,65,168,66,170,67,172,68,174,0,176,69,178,70,180,
- 71,182,72,184,0,186,0,188,73,190,74,192,75,194,0,196,0,198,0,200,0,202,
- 0,204,0,206,76,208,0,210,77,212,0,214,0,216,78,218,79,220,80,222,0,224,
- 0,226,0,228,0,230,0,232,81,234,82,236,83,238,84,240,0,242,0,244,0,246,0,
- 248,85,250,0,252,86,254,87,256,88,258,0,260,0,262,89,264,90,266,0,268,91,
- 270,0,272,92,274,93,276,94,278,0,280,0,282,0,284,0,286,0,288,0,290,0,292,
- 95,294,96,296,97,298,0,300,0,302,0,304,0,306,98,308,99,310,100,312,0,314,
- 101,316,102,318,103,320,104,322,0,324,105,326,106,328,107,330,108,332,0,
- 334,109,336,110,338,111,340,112,342,113,344,0,346,0,348,0,350,0,352,0,354,
- 0,356,0,358,114,360,115,362,116,364,0,366,0,368,0,370,0,372,117,374,118,
- 376,119,378,0,380,0,382,0,384,120,386,121,388,122,390,0,392,0,394,123,396,
- 124,398,125,400,0,402,0,404,0,406,0,16,0,1,2,3,4,5,6,7,8,9,10,11,12,13,
- 14,15,35,2,0,68,68,100,100,2,0,73,73,105,105,2,0,83,83,115,115,2,0,69,69,
+ 2,193,7,193,2,194,7,194,2,195,7,195,2,196,7,196,2,197,7,197,1,0,1,0,1,0,
+ 1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,2,1,2,
+ 1,2,1,2,1,2,1,2,1,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,4,1,4,1,4,1,4,1,4,1,4,
+ 1,4,1,4,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,1,6,1,6,1,6,1,6,1,6,1,6,1,6,
+ 1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,8,1,8,1,8,1,8,1,8,1,8,1,8,1,8,1,9,1,9,1,9,
+ 1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,10,1,10,1,10,1,10,1,10,1,10,1,10,
+ 1,10,1,10,1,11,1,11,1,11,1,11,1,11,1,11,1,12,1,12,1,12,1,12,1,12,1,12,1,
+ 12,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,14,1,14,
+ 1,14,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,16,1,
+ 16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,
+ 1,17,1,17,1,17,1,17,1,17,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,18,1,
+ 19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,20,4,20,587,8,20,
+ 11,20,12,20,588,1,20,1,20,1,21,1,21,1,21,1,21,5,21,597,8,21,10,21,12,21,
+ 600,9,21,1,21,3,21,603,8,21,1,21,3,21,606,8,21,1,21,1,21,1,22,1,22,1,22,
+ 1,22,1,22,5,22,615,8,22,10,22,12,22,618,9,22,1,22,1,22,1,22,1,22,1,22,1,
+ 23,4,23,626,8,23,11,23,12,23,627,1,23,1,23,1,24,1,24,1,24,1,24,1,25,1,25,
+ 1,26,1,26,1,27,1,27,1,27,1,28,1,28,1,29,1,29,3,29,647,8,29,1,29,4,29,650,
+ 8,29,11,29,12,29,651,1,30,1,30,1,31,1,31,1,32,1,32,1,32,3,32,661,8,32,1,
+ 33,1,33,1,34,1,34,1,34,3,34,668,8,34,1,35,1,35,1,35,5,35,673,8,35,10,35,
+ 12,35,676,9,35,1,35,1,35,1,35,1,35,1,35,1,35,5,35,684,8,35,10,35,12,35,
+ 687,9,35,1,35,1,35,1,35,1,35,1,35,3,35,694,8,35,1,35,3,35,697,8,35,3,35,
+ 699,8,35,1,36,4,36,702,8,36,11,36,12,36,703,1,37,4,37,707,8,37,11,37,12,
+ 37,708,1,37,1,37,5,37,713,8,37,10,37,12,37,716,9,37,1,37,1,37,4,37,720,
+ 8,37,11,37,12,37,721,1,37,4,37,725,8,37,11,37,12,37,726,1,37,1,37,5,37,
+ 731,8,37,10,37,12,37,734,9,37,3,37,736,8,37,1,37,1,37,1,37,1,37,4,37,742,
+ 8,37,11,37,12,37,743,1,37,1,37,3,37,748,8,37,1,38,1,38,1,38,1,39,1,39,1,
+ 39,1,39,1,40,1,40,1,40,1,40,1,41,1,41,1,42,1,42,1,42,1,43,1,43,1,44,1,44,
+ 1,44,1,44,1,44,1,45,1,45,1,46,1,46,1,46,1,46,1,46,1,46,1,47,1,47,1,47,1,
+ 47,1,47,1,47,1,48,1,48,1,48,1,49,1,49,1,49,1,50,1,50,1,50,1,50,1,50,1,51,
+ 1,51,1,51,1,51,1,51,1,52,1,52,1,53,1,53,1,53,1,53,1,54,1,54,1,54,1,54,1,
+ 54,1,55,1,55,1,55,1,55,1,55,1,55,1,56,1,56,1,56,1,57,1,57,1,58,1,58,1,58,
+ 1,58,1,58,1,58,1,59,1,59,1,60,1,60,1,60,1,60,1,60,1,61,1,61,1,61,1,62,1,
+ 62,1,62,1,63,1,63,1,63,1,64,1,64,1,65,1,65,1,65,1,66,1,66,1,67,1,67,1,67,
+ 1,68,1,68,1,69,1,69,1,70,1,70,1,71,1,71,1,72,1,72,1,73,1,73,1,73,1,73,1,
+ 73,1,74,1,74,1,74,3,74,875,8,74,1,74,5,74,878,8,74,10,74,12,74,881,9,74,
+ 1,74,1,74,4,74,885,8,74,11,74,12,74,886,3,74,889,8,74,1,75,1,75,1,75,1,
+ 75,1,75,1,76,1,76,1,76,1,76,1,76,1,77,1,77,5,77,903,8,77,10,77,12,77,906,
+ 9,77,1,77,1,77,3,77,910,8,77,1,77,4,77,913,8,77,11,77,12,77,914,3,77,917,
+ 8,77,1,78,1,78,4,78,921,8,78,11,78,12,78,922,1,78,1,78,1,79,1,79,1,80,1,
+ 80,1,80,1,80,1,81,1,81,1,81,1,81,1,82,1,82,1,82,1,82,1,83,1,83,1,83,1,83,
+ 1,83,1,84,1,84,1,84,1,84,1,84,1,85,1,85,1,85,1,85,1,86,1,86,1,86,1,86,1,
+ 87,1,87,1,87,1,87,1,88,1,88,1,88,1,88,1,88,1,89,1,89,1,89,1,89,1,90,1,90,
+ 1,90,1,90,1,91,1,91,1,91,1,91,1,92,1,92,1,92,1,92,1,93,1,93,1,93,1,93,1,
+ 94,1,94,1,94,1,94,1,94,1,94,1,94,1,94,1,94,1,95,1,95,1,95,3,95,1000,8,95,
+ 1,96,4,96,1003,8,96,11,96,12,96,1004,1,97,1,97,1,97,1,97,1,98,1,98,1,98,
+ 1,98,1,99,1,99,1,99,1,99,1,100,1,100,1,100,1,100,1,101,1,101,1,101,1,101,
+ 1,102,1,102,1,102,1,102,1,102,1,103,1,103,1,103,1,103,1,104,1,104,1,104,
+ 1,104,1,105,1,105,1,105,1,105,1,106,1,106,1,106,1,106,1,107,1,107,1,107,
+ 1,107,3,107,1052,8,107,1,108,1,108,3,108,1056,8,108,1,108,5,108,1059,8,
+ 108,10,108,12,108,1062,9,108,1,108,1,108,3,108,1066,8,108,1,108,4,108,1069,
+ 8,108,11,108,12,108,1070,3,108,1073,8,108,1,109,1,109,4,109,1077,8,109,
+ 11,109,12,109,1078,1,110,1,110,1,110,1,110,1,111,1,111,1,111,1,111,1,112,
+ 1,112,1,112,1,112,1,113,1,113,1,113,1,113,1,113,1,114,1,114,1,114,1,114,
+ 1,115,1,115,1,115,1,115,1,116,1,116,1,116,1,116,1,117,1,117,1,117,1,117,
+ 1,118,1,118,1,118,1,118,1,119,1,119,1,119,1,120,1,120,1,120,1,120,1,121,
+ 1,121,1,121,1,121,1,122,1,122,1,122,1,122,1,123,1,123,1,123,1,123,1,124,
+ 1,124,1,124,1,124,1,124,1,125,1,125,1,125,1,125,1,125,1,126,1,126,1,126,
+ 1,126,1,126,1,127,1,127,1,127,1,127,1,127,1,127,1,127,1,128,1,128,1,129,
+ 4,129,1162,8,129,11,129,12,129,1163,1,129,1,129,3,129,1168,8,129,1,129,
+ 4,129,1171,8,129,11,129,12,129,1172,1,130,1,130,1,130,1,130,1,131,1,131,
+ 1,131,1,131,1,132,1,132,1,132,1,132,1,133,1,133,1,133,1,133,1,134,1,134,
+ 1,134,1,134,1,134,1,134,1,135,1,135,1,135,1,135,1,136,1,136,1,136,1,136,
+ 1,137,1,137,1,137,1,137,1,138,1,138,1,138,1,138,1,139,1,139,1,139,1,139,
+ 1,140,1,140,1,140,1,140,1,141,1,141,1,141,1,141,1,142,1,142,1,142,1,142,
+ 1,143,1,143,1,143,1,143,1,144,1,144,1,144,1,144,1,145,1,145,1,145,1,145,
+ 1,146,1,146,1,146,1,146,1,146,1,147,1,147,1,147,1,147,1,148,1,148,1,148,
+ 1,148,1,149,1,149,1,149,1,149,1,150,1,150,1,150,1,150,1,151,1,151,1,151,
+ 1,151,1,152,1,152,1,152,1,152,1,153,1,153,1,153,1,153,1,154,1,154,1,154,
+ 1,154,1,155,1,155,1,155,1,155,1,155,1,156,1,156,1,156,1,156,1,156,1,157,
+ 1,157,1,157,1,157,1,158,1,158,1,158,1,158,1,159,1,159,1,159,1,159,1,160,
+ 1,160,1,160,1,160,1,160,1,161,1,161,1,162,1,162,1,162,1,162,1,162,4,162,
+ 1312,8,162,11,162,12,162,1313,1,163,1,163,1,163,1,163,1,164,1,164,1,164,
+ 1,164,1,165,1,165,1,165,1,165,1,166,1,166,1,166,1,166,1,166,1,167,1,167,
+ 1,167,1,167,1,168,1,168,1,168,1,168,1,169,1,169,1,169,1,169,1,170,1,170,
+ 1,170,1,170,1,170,1,171,1,171,1,171,1,171,1,172,1,172,1,172,1,172,1,173,
+ 1,173,1,173,1,173,1,174,1,174,1,174,1,174,1,175,1,175,1,175,1,175,1,176,
+ 1,176,1,176,1,176,1,176,1,176,1,177,1,177,1,177,1,177,1,178,1,178,1,178,
+ 1,178,1,179,1,179,1,179,1,179,1,180,1,180,1,180,1,180,1,181,1,181,1,181,
+ 1,181,1,182,1,182,1,182,1,182,1,183,1,183,1,183,1,183,1,183,1,184,1,184,
+ 1,184,1,184,1,184,1,184,1,185,1,185,1,185,1,185,1,185,1,185,1,186,1,186,
+ 1,186,1,186,1,187,1,187,1,187,1,187,1,188,1,188,1,188,1,188,1,189,1,189,
+ 1,189,1,189,1,189,1,189,1,190,1,190,1,190,1,190,1,190,1,190,1,191,1,191,
+ 1,191,1,191,1,192,1,192,1,192,1,192,1,193,1,193,1,193,1,193,1,194,1,194,
+ 1,194,1,194,1,194,1,194,1,195,1,195,1,195,1,195,1,195,1,195,1,196,1,196,
+ 1,196,1,196,1,196,1,196,1,197,1,197,1,197,1,197,1,197,2,616,685,0,198,15,
+ 1,17,2,19,3,21,4,23,5,25,6,27,7,29,8,31,9,33,10,35,11,37,12,39,13,41,14,
+ 43,15,45,16,47,17,49,18,51,19,53,20,55,21,57,22,59,23,61,24,63,25,65,0,
+ 67,0,69,0,71,0,73,0,75,0,77,0,79,0,81,0,83,0,85,26,87,27,89,28,91,29,93,
+ 30,95,31,97,32,99,33,101,34,103,35,105,36,107,37,109,38,111,39,113,40,115,
+ 41,117,42,119,43,121,44,123,45,125,46,127,47,129,48,131,49,133,50,135,51,
+ 137,52,139,53,141,54,143,55,145,56,147,57,149,58,151,59,153,60,155,61,157,
+ 62,159,63,161,0,163,64,165,65,167,66,169,67,171,0,173,68,175,69,177,70,
+ 179,71,181,0,183,0,185,72,187,73,189,74,191,0,193,0,195,0,197,0,199,0,201,
+ 0,203,75,205,0,207,76,209,0,211,0,213,77,215,78,217,79,219,0,221,0,223,
+ 0,225,0,227,0,229,0,231,0,233,80,235,81,237,82,239,83,241,0,243,0,245,0,
+ 247,0,249,0,251,0,253,84,255,0,257,85,259,86,261,87,263,0,265,0,267,88,
+ 269,89,271,0,273,90,275,0,277,91,279,92,281,93,283,0,285,0,287,0,289,0,
+ 291,0,293,0,295,0,297,0,299,0,301,94,303,95,305,96,307,0,309,0,311,0,313,
+ 0,315,0,317,0,319,97,321,98,323,99,325,0,327,100,329,101,331,102,333,103,
+ 335,0,337,104,339,105,341,106,343,107,345,108,347,0,349,0,351,0,353,0,355,
+ 0,357,0,359,0,361,109,363,110,365,111,367,0,369,0,371,0,373,0,375,112,377,
+ 113,379,114,381,0,383,0,385,0,387,115,389,116,391,117,393,0,395,0,397,118,
+ 399,119,401,120,403,0,405,0,407,0,409,0,15,0,1,2,3,4,5,6,7,8,9,10,11,12,
+ 13,14,35,2,0,68,68,100,100,2,0,73,73,105,105,2,0,83,83,115,115,2,0,69,69,
101,101,2,0,67,67,99,99,2,0,84,84,116,116,2,0,82,82,114,114,2,0,79,79,111,
111,2,0,80,80,112,112,2,0,78,78,110,110,2,0,72,72,104,104,2,0,86,86,118,
118,2,0,65,65,97,97,2,0,76,76,108,108,2,0,88,88,120,120,2,0,70,70,102,102,
@@ -583,368 +574,369 @@ export default class esql_lexer extends lexer_config {
84,92,92,110,110,114,114,116,116,4,0,10,10,13,13,34,34,92,92,2,0,43,43,
45,45,1,0,96,96,2,0,66,66,98,98,2,0,89,89,121,121,11,0,9,10,13,13,32,32,
34,34,44,44,47,47,58,58,61,61,91,91,93,93,124,124,2,0,42,42,47,47,11,0,
- 9,10,13,13,32,32,34,35,44,44,47,47,58,58,60,60,62,63,92,92,124,124,1501,
- 0,16,1,0,0,0,0,18,1,0,0,0,0,20,1,0,0,0,0,22,1,0,0,0,0,24,1,0,0,0,0,26,1,
- 0,0,0,0,28,1,0,0,0,0,30,1,0,0,0,0,32,1,0,0,0,0,34,1,0,0,0,0,36,1,0,0,0,
- 0,38,1,0,0,0,0,40,1,0,0,0,0,42,1,0,0,0,0,44,1,0,0,0,0,46,1,0,0,0,0,48,1,
- 0,0,0,0,50,1,0,0,0,0,52,1,0,0,0,0,54,1,0,0,0,0,56,1,0,0,0,0,58,1,0,0,0,
- 0,60,1,0,0,0,0,62,1,0,0,0,0,64,1,0,0,0,1,66,1,0,0,0,1,88,1,0,0,0,1,90,1,
- 0,0,0,1,92,1,0,0,0,1,94,1,0,0,0,1,96,1,0,0,0,1,98,1,0,0,0,1,100,1,0,0,0,
- 1,102,1,0,0,0,1,104,1,0,0,0,1,106,1,0,0,0,1,108,1,0,0,0,1,110,1,0,0,0,1,
- 112,1,0,0,0,1,114,1,0,0,0,1,116,1,0,0,0,1,118,1,0,0,0,1,120,1,0,0,0,1,122,
- 1,0,0,0,1,124,1,0,0,0,1,126,1,0,0,0,1,128,1,0,0,0,1,130,1,0,0,0,1,132,1,
- 0,0,0,1,134,1,0,0,0,1,136,1,0,0,0,1,138,1,0,0,0,1,140,1,0,0,0,1,142,1,0,
- 0,0,1,144,1,0,0,0,1,146,1,0,0,0,1,148,1,0,0,0,1,150,1,0,0,0,1,152,1,0,0,
- 0,1,154,1,0,0,0,1,156,1,0,0,0,1,158,1,0,0,0,1,160,1,0,0,0,1,162,1,0,0,0,
- 1,164,1,0,0,0,1,166,1,0,0,0,1,168,1,0,0,0,1,170,1,0,0,0,1,172,1,0,0,0,1,
- 176,1,0,0,0,1,178,1,0,0,0,1,180,1,0,0,0,1,182,1,0,0,0,2,184,1,0,0,0,2,186,
- 1,0,0,0,2,188,1,0,0,0,2,190,1,0,0,0,2,192,1,0,0,0,3,194,1,0,0,0,3,196,1,
- 0,0,0,3,198,1,0,0,0,3,200,1,0,0,0,3,202,1,0,0,0,3,204,1,0,0,0,3,206,1,0,
- 0,0,3,210,1,0,0,0,3,212,1,0,0,0,3,214,1,0,0,0,3,216,1,0,0,0,3,218,1,0,0,
- 0,3,220,1,0,0,0,4,222,1,0,0,0,4,224,1,0,0,0,4,226,1,0,0,0,4,232,1,0,0,0,
- 4,234,1,0,0,0,4,236,1,0,0,0,4,238,1,0,0,0,5,240,1,0,0,0,5,242,1,0,0,0,5,
- 244,1,0,0,0,5,246,1,0,0,0,5,248,1,0,0,0,5,250,1,0,0,0,5,252,1,0,0,0,5,254,
- 1,0,0,0,5,256,1,0,0,0,6,258,1,0,0,0,6,260,1,0,0,0,6,262,1,0,0,0,6,264,1,
- 0,0,0,6,268,1,0,0,0,6,270,1,0,0,0,6,272,1,0,0,0,6,274,1,0,0,0,6,276,1,0,
- 0,0,7,278,1,0,0,0,7,280,1,0,0,0,7,282,1,0,0,0,7,284,1,0,0,0,7,286,1,0,0,
- 0,7,288,1,0,0,0,7,290,1,0,0,0,7,292,1,0,0,0,7,294,1,0,0,0,7,296,1,0,0,0,
- 8,298,1,0,0,0,8,300,1,0,0,0,8,302,1,0,0,0,8,304,1,0,0,0,8,306,1,0,0,0,8,
- 308,1,0,0,0,8,310,1,0,0,0,9,312,1,0,0,0,9,314,1,0,0,0,9,316,1,0,0,0,9,318,
- 1,0,0,0,9,320,1,0,0,0,10,322,1,0,0,0,10,324,1,0,0,0,10,326,1,0,0,0,10,328,
- 1,0,0,0,10,330,1,0,0,0,11,332,1,0,0,0,11,334,1,0,0,0,11,336,1,0,0,0,11,
- 338,1,0,0,0,11,340,1,0,0,0,11,342,1,0,0,0,12,344,1,0,0,0,12,346,1,0,0,0,
- 12,348,1,0,0,0,12,350,1,0,0,0,12,352,1,0,0,0,12,354,1,0,0,0,12,356,1,0,
- 0,0,12,358,1,0,0,0,12,360,1,0,0,0,12,362,1,0,0,0,13,364,1,0,0,0,13,366,
- 1,0,0,0,13,368,1,0,0,0,13,370,1,0,0,0,13,372,1,0,0,0,13,374,1,0,0,0,13,
- 376,1,0,0,0,14,378,1,0,0,0,14,380,1,0,0,0,14,382,1,0,0,0,14,384,1,0,0,0,
- 14,386,1,0,0,0,14,388,1,0,0,0,15,390,1,0,0,0,15,392,1,0,0,0,15,394,1,0,
- 0,0,15,396,1,0,0,0,15,398,1,0,0,0,15,400,1,0,0,0,15,402,1,0,0,0,15,404,
- 1,0,0,0,15,406,1,0,0,0,16,408,1,0,0,0,18,418,1,0,0,0,20,425,1,0,0,0,22,
- 434,1,0,0,0,24,441,1,0,0,0,26,451,1,0,0,0,28,458,1,0,0,0,30,465,1,0,0,0,
- 32,472,1,0,0,0,34,480,1,0,0,0,36,487,1,0,0,0,38,499,1,0,0,0,40,508,1,0,
- 0,0,42,514,1,0,0,0,44,521,1,0,0,0,46,528,1,0,0,0,48,536,1,0,0,0,50,544,
- 1,0,0,0,52,559,1,0,0,0,54,569,1,0,0,0,56,578,1,0,0,0,58,590,1,0,0,0,60,
- 596,1,0,0,0,62,613,1,0,0,0,64,629,1,0,0,0,66,635,1,0,0,0,68,639,1,0,0,0,
- 70,641,1,0,0,0,72,643,1,0,0,0,74,646,1,0,0,0,76,648,1,0,0,0,78,657,1,0,
- 0,0,80,659,1,0,0,0,82,664,1,0,0,0,84,666,1,0,0,0,86,671,1,0,0,0,88,702,
- 1,0,0,0,90,705,1,0,0,0,92,751,1,0,0,0,94,753,1,0,0,0,96,756,1,0,0,0,98,
- 760,1,0,0,0,100,764,1,0,0,0,102,766,1,0,0,0,104,769,1,0,0,0,106,771,1,0,
- 0,0,108,776,1,0,0,0,110,778,1,0,0,0,112,784,1,0,0,0,114,790,1,0,0,0,116,
- 793,1,0,0,0,118,796,1,0,0,0,120,801,1,0,0,0,122,806,1,0,0,0,124,808,1,0,
- 0,0,126,812,1,0,0,0,128,817,1,0,0,0,130,823,1,0,0,0,132,826,1,0,0,0,134,
- 828,1,0,0,0,136,834,1,0,0,0,138,836,1,0,0,0,140,841,1,0,0,0,142,844,1,0,
- 0,0,144,847,1,0,0,0,146,850,1,0,0,0,148,852,1,0,0,0,150,855,1,0,0,0,152,
- 857,1,0,0,0,154,860,1,0,0,0,156,862,1,0,0,0,158,864,1,0,0,0,160,866,1,0,
- 0,0,162,868,1,0,0,0,164,870,1,0,0,0,166,892,1,0,0,0,168,894,1,0,0,0,170,
- 899,1,0,0,0,172,920,1,0,0,0,174,922,1,0,0,0,176,930,1,0,0,0,178,932,1,0,
- 0,0,180,936,1,0,0,0,182,940,1,0,0,0,184,944,1,0,0,0,186,949,1,0,0,0,188,
- 954,1,0,0,0,190,958,1,0,0,0,192,962,1,0,0,0,194,966,1,0,0,0,196,971,1,0,
- 0,0,198,975,1,0,0,0,200,979,1,0,0,0,202,983,1,0,0,0,204,987,1,0,0,0,206,
- 991,1,0,0,0,208,1003,1,0,0,0,210,1006,1,0,0,0,212,1010,1,0,0,0,214,1014,
- 1,0,0,0,216,1018,1,0,0,0,218,1022,1,0,0,0,220,1026,1,0,0,0,222,1030,1,0,
- 0,0,224,1035,1,0,0,0,226,1039,1,0,0,0,228,1047,1,0,0,0,230,1068,1,0,0,0,
- 232,1072,1,0,0,0,234,1076,1,0,0,0,236,1080,1,0,0,0,238,1084,1,0,0,0,240,
- 1088,1,0,0,0,242,1093,1,0,0,0,244,1097,1,0,0,0,246,1101,1,0,0,0,248,1105,
- 1,0,0,0,250,1108,1,0,0,0,252,1112,1,0,0,0,254,1116,1,0,0,0,256,1120,1,0,
- 0,0,258,1124,1,0,0,0,260,1129,1,0,0,0,262,1134,1,0,0,0,264,1139,1,0,0,0,
- 266,1146,1,0,0,0,268,1155,1,0,0,0,270,1162,1,0,0,0,272,1166,1,0,0,0,274,
- 1170,1,0,0,0,276,1174,1,0,0,0,278,1178,1,0,0,0,280,1184,1,0,0,0,282,1188,
- 1,0,0,0,284,1192,1,0,0,0,286,1196,1,0,0,0,288,1200,1,0,0,0,290,1204,1,0,
- 0,0,292,1208,1,0,0,0,294,1212,1,0,0,0,296,1216,1,0,0,0,298,1220,1,0,0,0,
- 300,1225,1,0,0,0,302,1229,1,0,0,0,304,1233,1,0,0,0,306,1237,1,0,0,0,308,
- 1241,1,0,0,0,310,1245,1,0,0,0,312,1249,1,0,0,0,314,1254,1,0,0,0,316,1259,
- 1,0,0,0,318,1263,1,0,0,0,320,1267,1,0,0,0,322,1271,1,0,0,0,324,1276,1,0,
- 0,0,326,1286,1,0,0,0,328,1290,1,0,0,0,330,1294,1,0,0,0,332,1298,1,0,0,0,
- 334,1303,1,0,0,0,336,1310,1,0,0,0,338,1314,1,0,0,0,340,1318,1,0,0,0,342,
- 1322,1,0,0,0,344,1326,1,0,0,0,346,1331,1,0,0,0,348,1335,1,0,0,0,350,1339,
- 1,0,0,0,352,1343,1,0,0,0,354,1348,1,0,0,0,356,1352,1,0,0,0,358,1356,1,0,
- 0,0,360,1360,1,0,0,0,362,1364,1,0,0,0,364,1368,1,0,0,0,366,1374,1,0,0,0,
- 368,1378,1,0,0,0,370,1382,1,0,0,0,372,1386,1,0,0,0,374,1390,1,0,0,0,376,
- 1394,1,0,0,0,378,1398,1,0,0,0,380,1403,1,0,0,0,382,1409,1,0,0,0,384,1415,
- 1,0,0,0,386,1419,1,0,0,0,388,1423,1,0,0,0,390,1427,1,0,0,0,392,1433,1,0,
- 0,0,394,1439,1,0,0,0,396,1443,1,0,0,0,398,1447,1,0,0,0,400,1451,1,0,0,0,
- 402,1457,1,0,0,0,404,1463,1,0,0,0,406,1469,1,0,0,0,408,409,7,0,0,0,409,
- 410,7,1,0,0,410,411,7,2,0,0,411,412,7,2,0,0,412,413,7,3,0,0,413,414,7,4,
- 0,0,414,415,7,5,0,0,415,416,1,0,0,0,416,417,6,0,0,0,417,17,1,0,0,0,418,
- 419,7,0,0,0,419,420,7,6,0,0,420,421,7,7,0,0,421,422,7,8,0,0,422,423,1,0,
- 0,0,423,424,6,1,1,0,424,19,1,0,0,0,425,426,7,3,0,0,426,427,7,9,0,0,427,
- 428,7,6,0,0,428,429,7,1,0,0,429,430,7,4,0,0,430,431,7,10,0,0,431,432,1,
- 0,0,0,432,433,6,2,2,0,433,21,1,0,0,0,434,435,7,3,0,0,435,436,7,11,0,0,436,
- 437,7,12,0,0,437,438,7,13,0,0,438,439,1,0,0,0,439,440,6,3,0,0,440,23,1,
- 0,0,0,441,442,7,3,0,0,442,443,7,14,0,0,443,444,7,8,0,0,444,445,7,13,0,0,
- 445,446,7,12,0,0,446,447,7,1,0,0,447,448,7,9,0,0,448,449,1,0,0,0,449,450,
- 6,4,3,0,450,25,1,0,0,0,451,452,7,15,0,0,452,453,7,6,0,0,453,454,7,7,0,0,
- 454,455,7,16,0,0,455,456,1,0,0,0,456,457,6,5,4,0,457,27,1,0,0,0,458,459,
- 7,17,0,0,459,460,7,6,0,0,460,461,7,7,0,0,461,462,7,18,0,0,462,463,1,0,0,
- 0,463,464,6,6,0,0,464,29,1,0,0,0,465,466,7,18,0,0,466,467,7,3,0,0,467,468,
- 7,3,0,0,468,469,7,8,0,0,469,470,1,0,0,0,470,471,6,7,1,0,471,31,1,0,0,0,
- 472,473,7,13,0,0,473,474,7,1,0,0,474,475,7,16,0,0,475,476,7,1,0,0,476,477,
- 7,5,0,0,477,478,1,0,0,0,478,479,6,8,0,0,479,33,1,0,0,0,480,481,7,16,0,0,
- 481,482,7,3,0,0,482,483,7,5,0,0,483,484,7,12,0,0,484,485,1,0,0,0,485,486,
- 6,9,5,0,486,35,1,0,0,0,487,488,7,16,0,0,488,489,7,11,0,0,489,490,5,95,0,
- 0,490,491,7,3,0,0,491,492,7,14,0,0,492,493,7,8,0,0,493,494,7,12,0,0,494,
- 495,7,9,0,0,495,496,7,0,0,0,496,497,1,0,0,0,497,498,6,10,6,0,498,37,1,0,
- 0,0,499,500,7,6,0,0,500,501,7,3,0,0,501,502,7,9,0,0,502,503,7,12,0,0,503,
- 504,7,16,0,0,504,505,7,3,0,0,505,506,1,0,0,0,506,507,6,11,7,0,507,39,1,
- 0,0,0,508,509,7,6,0,0,509,510,7,7,0,0,510,511,7,19,0,0,511,512,1,0,0,0,
- 512,513,6,12,0,0,513,41,1,0,0,0,514,515,7,2,0,0,515,516,7,10,0,0,516,517,
- 7,7,0,0,517,518,7,19,0,0,518,519,1,0,0,0,519,520,6,13,8,0,520,43,1,0,0,
- 0,521,522,7,2,0,0,522,523,7,7,0,0,523,524,7,6,0,0,524,525,7,5,0,0,525,526,
- 1,0,0,0,526,527,6,14,0,0,527,45,1,0,0,0,528,529,7,2,0,0,529,530,7,5,0,0,
- 530,531,7,12,0,0,531,532,7,5,0,0,532,533,7,2,0,0,533,534,1,0,0,0,534,535,
- 6,15,0,0,535,47,1,0,0,0,536,537,7,19,0,0,537,538,7,10,0,0,538,539,7,3,0,
- 0,539,540,7,6,0,0,540,541,7,3,0,0,541,542,1,0,0,0,542,543,6,16,0,0,543,
- 49,1,0,0,0,544,545,4,17,0,0,545,546,7,1,0,0,546,547,7,9,0,0,547,548,7,13,
- 0,0,548,549,7,1,0,0,549,550,7,9,0,0,550,551,7,3,0,0,551,552,7,2,0,0,552,
- 553,7,5,0,0,553,554,7,12,0,0,554,555,7,5,0,0,555,556,7,2,0,0,556,557,1,
- 0,0,0,557,558,6,17,0,0,558,51,1,0,0,0,559,560,4,18,1,0,560,561,7,13,0,0,
- 561,562,7,7,0,0,562,563,7,7,0,0,563,564,7,18,0,0,564,565,7,20,0,0,565,566,
- 7,8,0,0,566,567,1,0,0,0,567,568,6,18,9,0,568,53,1,0,0,0,569,570,4,19,2,
- 0,570,571,7,16,0,0,571,572,7,12,0,0,572,573,7,5,0,0,573,574,7,4,0,0,574,
- 575,7,10,0,0,575,576,1,0,0,0,576,577,6,19,0,0,577,55,1,0,0,0,578,579,4,
- 20,3,0,579,580,7,16,0,0,580,581,7,3,0,0,581,582,7,5,0,0,582,583,7,6,0,0,
- 583,584,7,1,0,0,584,585,7,4,0,0,585,586,7,2,0,0,586,587,1,0,0,0,587,588,
- 6,20,10,0,588,57,1,0,0,0,589,591,8,21,0,0,590,589,1,0,0,0,591,592,1,0,0,
- 0,592,590,1,0,0,0,592,593,1,0,0,0,593,594,1,0,0,0,594,595,6,21,0,0,595,
- 59,1,0,0,0,596,597,5,47,0,0,597,598,5,47,0,0,598,602,1,0,0,0,599,601,8,
- 22,0,0,600,599,1,0,0,0,601,604,1,0,0,0,602,600,1,0,0,0,602,603,1,0,0,0,
- 603,606,1,0,0,0,604,602,1,0,0,0,605,607,5,13,0,0,606,605,1,0,0,0,606,607,
- 1,0,0,0,607,609,1,0,0,0,608,610,5,10,0,0,609,608,1,0,0,0,609,610,1,0,0,
- 0,610,611,1,0,0,0,611,612,6,22,11,0,612,61,1,0,0,0,613,614,5,47,0,0,614,
- 615,5,42,0,0,615,620,1,0,0,0,616,619,3,62,23,0,617,619,9,0,0,0,618,616,
- 1,0,0,0,618,617,1,0,0,0,619,622,1,0,0,0,620,621,1,0,0,0,620,618,1,0,0,0,
- 621,623,1,0,0,0,622,620,1,0,0,0,623,624,5,42,0,0,624,625,5,47,0,0,625,626,
- 1,0,0,0,626,627,6,23,11,0,627,63,1,0,0,0,628,630,7,23,0,0,629,628,1,0,0,
- 0,630,631,1,0,0,0,631,629,1,0,0,0,631,632,1,0,0,0,632,633,1,0,0,0,633,634,
- 6,24,11,0,634,65,1,0,0,0,635,636,5,124,0,0,636,637,1,0,0,0,637,638,6,25,
- 12,0,638,67,1,0,0,0,639,640,7,24,0,0,640,69,1,0,0,0,641,642,7,25,0,0,642,
- 71,1,0,0,0,643,644,5,92,0,0,644,645,7,26,0,0,645,73,1,0,0,0,646,647,8,27,
- 0,0,647,75,1,0,0,0,648,650,7,3,0,0,649,651,7,28,0,0,650,649,1,0,0,0,650,
- 651,1,0,0,0,651,653,1,0,0,0,652,654,3,68,26,0,653,652,1,0,0,0,654,655,1,
- 0,0,0,655,653,1,0,0,0,655,656,1,0,0,0,656,77,1,0,0,0,657,658,5,64,0,0,658,
- 79,1,0,0,0,659,660,5,96,0,0,660,81,1,0,0,0,661,665,8,29,0,0,662,663,5,96,
- 0,0,663,665,5,96,0,0,664,661,1,0,0,0,664,662,1,0,0,0,665,83,1,0,0,0,666,
- 667,5,95,0,0,667,85,1,0,0,0,668,672,3,70,27,0,669,672,3,68,26,0,670,672,
- 3,84,34,0,671,668,1,0,0,0,671,669,1,0,0,0,671,670,1,0,0,0,672,87,1,0,0,
- 0,673,678,5,34,0,0,674,677,3,72,28,0,675,677,3,74,29,0,676,674,1,0,0,0,
- 676,675,1,0,0,0,677,680,1,0,0,0,678,676,1,0,0,0,678,679,1,0,0,0,679,681,
- 1,0,0,0,680,678,1,0,0,0,681,703,5,34,0,0,682,683,5,34,0,0,683,684,5,34,
- 0,0,684,685,5,34,0,0,685,689,1,0,0,0,686,688,8,22,0,0,687,686,1,0,0,0,688,
- 691,1,0,0,0,689,690,1,0,0,0,689,687,1,0,0,0,690,692,1,0,0,0,691,689,1,0,
- 0,0,692,693,5,34,0,0,693,694,5,34,0,0,694,695,5,34,0,0,695,697,1,0,0,0,
- 696,698,5,34,0,0,697,696,1,0,0,0,697,698,1,0,0,0,698,700,1,0,0,0,699,701,
- 5,34,0,0,700,699,1,0,0,0,700,701,1,0,0,0,701,703,1,0,0,0,702,673,1,0,0,
- 0,702,682,1,0,0,0,703,89,1,0,0,0,704,706,3,68,26,0,705,704,1,0,0,0,706,
- 707,1,0,0,0,707,705,1,0,0,0,707,708,1,0,0,0,708,91,1,0,0,0,709,711,3,68,
- 26,0,710,709,1,0,0,0,711,712,1,0,0,0,712,710,1,0,0,0,712,713,1,0,0,0,713,
- 714,1,0,0,0,714,718,3,108,46,0,715,717,3,68,26,0,716,715,1,0,0,0,717,720,
- 1,0,0,0,718,716,1,0,0,0,718,719,1,0,0,0,719,752,1,0,0,0,720,718,1,0,0,0,
- 721,723,3,108,46,0,722,724,3,68,26,0,723,722,1,0,0,0,724,725,1,0,0,0,725,
- 723,1,0,0,0,725,726,1,0,0,0,726,752,1,0,0,0,727,729,3,68,26,0,728,727,1,
- 0,0,0,729,730,1,0,0,0,730,728,1,0,0,0,730,731,1,0,0,0,731,739,1,0,0,0,732,
- 736,3,108,46,0,733,735,3,68,26,0,734,733,1,0,0,0,735,738,1,0,0,0,736,734,
- 1,0,0,0,736,737,1,0,0,0,737,740,1,0,0,0,738,736,1,0,0,0,739,732,1,0,0,0,
- 739,740,1,0,0,0,740,741,1,0,0,0,741,742,3,76,30,0,742,752,1,0,0,0,743,745,
- 3,108,46,0,744,746,3,68,26,0,745,744,1,0,0,0,746,747,1,0,0,0,747,745,1,
- 0,0,0,747,748,1,0,0,0,748,749,1,0,0,0,749,750,3,76,30,0,750,752,1,0,0,0,
- 751,710,1,0,0,0,751,721,1,0,0,0,751,728,1,0,0,0,751,743,1,0,0,0,752,93,
- 1,0,0,0,753,754,7,30,0,0,754,755,7,31,0,0,755,95,1,0,0,0,756,757,7,12,0,
- 0,757,758,7,9,0,0,758,759,7,0,0,0,759,97,1,0,0,0,760,761,7,12,0,0,761,762,
- 7,2,0,0,762,763,7,4,0,0,763,99,1,0,0,0,764,765,5,61,0,0,765,101,1,0,0,0,
- 766,767,5,58,0,0,767,768,5,58,0,0,768,103,1,0,0,0,769,770,5,44,0,0,770,
- 105,1,0,0,0,771,772,7,0,0,0,772,773,7,3,0,0,773,774,7,2,0,0,774,775,7,4,
- 0,0,775,107,1,0,0,0,776,777,5,46,0,0,777,109,1,0,0,0,778,779,7,15,0,0,779,
- 780,7,12,0,0,780,781,7,13,0,0,781,782,7,2,0,0,782,783,7,3,0,0,783,111,1,
- 0,0,0,784,785,7,15,0,0,785,786,7,1,0,0,786,787,7,6,0,0,787,788,7,2,0,0,
- 788,789,7,5,0,0,789,113,1,0,0,0,790,791,7,1,0,0,791,792,7,9,0,0,792,115,
- 1,0,0,0,793,794,7,1,0,0,794,795,7,2,0,0,795,117,1,0,0,0,796,797,7,13,0,
- 0,797,798,7,12,0,0,798,799,7,2,0,0,799,800,7,5,0,0,800,119,1,0,0,0,801,
- 802,7,13,0,0,802,803,7,1,0,0,803,804,7,18,0,0,804,805,7,3,0,0,805,121,1,
- 0,0,0,806,807,5,40,0,0,807,123,1,0,0,0,808,809,7,9,0,0,809,810,7,7,0,0,
- 810,811,7,5,0,0,811,125,1,0,0,0,812,813,7,9,0,0,813,814,7,20,0,0,814,815,
- 7,13,0,0,815,816,7,13,0,0,816,127,1,0,0,0,817,818,7,9,0,0,818,819,7,20,
- 0,0,819,820,7,13,0,0,820,821,7,13,0,0,821,822,7,2,0,0,822,129,1,0,0,0,823,
- 824,7,7,0,0,824,825,7,6,0,0,825,131,1,0,0,0,826,827,5,63,0,0,827,133,1,
- 0,0,0,828,829,7,6,0,0,829,830,7,13,0,0,830,831,7,1,0,0,831,832,7,18,0,0,
- 832,833,7,3,0,0,833,135,1,0,0,0,834,835,5,41,0,0,835,137,1,0,0,0,836,837,
- 7,5,0,0,837,838,7,6,0,0,838,839,7,20,0,0,839,840,7,3,0,0,840,139,1,0,0,
- 0,841,842,5,61,0,0,842,843,5,61,0,0,843,141,1,0,0,0,844,845,5,61,0,0,845,
- 846,5,126,0,0,846,143,1,0,0,0,847,848,5,33,0,0,848,849,5,61,0,0,849,145,
- 1,0,0,0,850,851,5,60,0,0,851,147,1,0,0,0,852,853,5,60,0,0,853,854,5,61,
- 0,0,854,149,1,0,0,0,855,856,5,62,0,0,856,151,1,0,0,0,857,858,5,62,0,0,858,
- 859,5,61,0,0,859,153,1,0,0,0,860,861,5,43,0,0,861,155,1,0,0,0,862,863,5,
- 45,0,0,863,157,1,0,0,0,864,865,5,42,0,0,865,159,1,0,0,0,866,867,5,47,0,
- 0,867,161,1,0,0,0,868,869,5,37,0,0,869,163,1,0,0,0,870,871,4,74,4,0,871,
- 872,3,54,19,0,872,873,1,0,0,0,873,874,6,74,13,0,874,165,1,0,0,0,875,878,
- 3,132,58,0,876,879,3,70,27,0,877,879,3,84,34,0,878,876,1,0,0,0,878,877,
- 1,0,0,0,879,883,1,0,0,0,880,882,3,86,35,0,881,880,1,0,0,0,882,885,1,0,0,
- 0,883,881,1,0,0,0,883,884,1,0,0,0,884,893,1,0,0,0,885,883,1,0,0,0,886,888,
- 3,132,58,0,887,889,3,68,26,0,888,887,1,0,0,0,889,890,1,0,0,0,890,888,1,
- 0,0,0,890,891,1,0,0,0,891,893,1,0,0,0,892,875,1,0,0,0,892,886,1,0,0,0,893,
- 167,1,0,0,0,894,895,5,91,0,0,895,896,1,0,0,0,896,897,6,76,0,0,897,898,6,
- 76,0,0,898,169,1,0,0,0,899,900,5,93,0,0,900,901,1,0,0,0,901,902,6,77,12,
- 0,902,903,6,77,12,0,903,171,1,0,0,0,904,908,3,70,27,0,905,907,3,86,35,0,
- 906,905,1,0,0,0,907,910,1,0,0,0,908,906,1,0,0,0,908,909,1,0,0,0,909,921,
- 1,0,0,0,910,908,1,0,0,0,911,914,3,84,34,0,912,914,3,78,31,0,913,911,1,0,
- 0,0,913,912,1,0,0,0,914,916,1,0,0,0,915,917,3,86,35,0,916,915,1,0,0,0,917,
- 918,1,0,0,0,918,916,1,0,0,0,918,919,1,0,0,0,919,921,1,0,0,0,920,904,1,0,
- 0,0,920,913,1,0,0,0,921,173,1,0,0,0,922,924,3,80,32,0,923,925,3,82,33,0,
- 924,923,1,0,0,0,925,926,1,0,0,0,926,924,1,0,0,0,926,927,1,0,0,0,927,928,
- 1,0,0,0,928,929,3,80,32,0,929,175,1,0,0,0,930,931,3,174,79,0,931,177,1,
- 0,0,0,932,933,3,60,22,0,933,934,1,0,0,0,934,935,6,81,11,0,935,179,1,0,0,
- 0,936,937,3,62,23,0,937,938,1,0,0,0,938,939,6,82,11,0,939,181,1,0,0,0,940,
- 941,3,64,24,0,941,942,1,0,0,0,942,943,6,83,11,0,943,183,1,0,0,0,944,945,
- 3,168,76,0,945,946,1,0,0,0,946,947,6,84,14,0,947,948,6,84,15,0,948,185,
- 1,0,0,0,949,950,3,66,25,0,950,951,1,0,0,0,951,952,6,85,16,0,952,953,6,85,
- 12,0,953,187,1,0,0,0,954,955,3,64,24,0,955,956,1,0,0,0,956,957,6,86,11,
- 0,957,189,1,0,0,0,958,959,3,60,22,0,959,960,1,0,0,0,960,961,6,87,11,0,961,
- 191,1,0,0,0,962,963,3,62,23,0,963,964,1,0,0,0,964,965,6,88,11,0,965,193,
- 1,0,0,0,966,967,3,66,25,0,967,968,1,0,0,0,968,969,6,89,16,0,969,970,6,89,
- 12,0,970,195,1,0,0,0,971,972,3,168,76,0,972,973,1,0,0,0,973,974,6,90,14,
- 0,974,197,1,0,0,0,975,976,3,170,77,0,976,977,1,0,0,0,977,978,6,91,17,0,
- 978,199,1,0,0,0,979,980,3,334,159,0,980,981,1,0,0,0,981,982,6,92,18,0,982,
- 201,1,0,0,0,983,984,3,104,44,0,984,985,1,0,0,0,985,986,6,93,19,0,986,203,
- 1,0,0,0,987,988,3,100,42,0,988,989,1,0,0,0,989,990,6,94,20,0,990,205,1,
- 0,0,0,991,992,7,16,0,0,992,993,7,3,0,0,993,994,7,5,0,0,994,995,7,12,0,0,
- 995,996,7,0,0,0,996,997,7,12,0,0,997,998,7,5,0,0,998,999,7,12,0,0,999,207,
- 1,0,0,0,1000,1004,8,32,0,0,1001,1002,5,47,0,0,1002,1004,8,33,0,0,1003,1000,
- 1,0,0,0,1003,1001,1,0,0,0,1004,209,1,0,0,0,1005,1007,3,208,96,0,1006,1005,
- 1,0,0,0,1007,1008,1,0,0,0,1008,1006,1,0,0,0,1008,1009,1,0,0,0,1009,211,
- 1,0,0,0,1010,1011,3,210,97,0,1011,1012,1,0,0,0,1012,1013,6,98,21,0,1013,
- 213,1,0,0,0,1014,1015,3,88,36,0,1015,1016,1,0,0,0,1016,1017,6,99,22,0,1017,
- 215,1,0,0,0,1018,1019,3,60,22,0,1019,1020,1,0,0,0,1020,1021,6,100,11,0,
- 1021,217,1,0,0,0,1022,1023,3,62,23,0,1023,1024,1,0,0,0,1024,1025,6,101,
- 11,0,1025,219,1,0,0,0,1026,1027,3,64,24,0,1027,1028,1,0,0,0,1028,1029,6,
- 102,11,0,1029,221,1,0,0,0,1030,1031,3,66,25,0,1031,1032,1,0,0,0,1032,1033,
- 6,103,16,0,1033,1034,6,103,12,0,1034,223,1,0,0,0,1035,1036,3,108,46,0,1036,
- 1037,1,0,0,0,1037,1038,6,104,23,0,1038,225,1,0,0,0,1039,1040,3,104,44,0,
- 1040,1041,1,0,0,0,1041,1042,6,105,19,0,1042,227,1,0,0,0,1043,1048,3,70,
- 27,0,1044,1048,3,68,26,0,1045,1048,3,84,34,0,1046,1048,3,158,71,0,1047,
- 1043,1,0,0,0,1047,1044,1,0,0,0,1047,1045,1,0,0,0,1047,1046,1,0,0,0,1048,
- 229,1,0,0,0,1049,1052,3,70,27,0,1050,1052,3,158,71,0,1051,1049,1,0,0,0,
- 1051,1050,1,0,0,0,1052,1056,1,0,0,0,1053,1055,3,228,106,0,1054,1053,1,0,
- 0,0,1055,1058,1,0,0,0,1056,1054,1,0,0,0,1056,1057,1,0,0,0,1057,1069,1,0,
- 0,0,1058,1056,1,0,0,0,1059,1062,3,84,34,0,1060,1062,3,78,31,0,1061,1059,
- 1,0,0,0,1061,1060,1,0,0,0,1062,1064,1,0,0,0,1063,1065,3,228,106,0,1064,
- 1063,1,0,0,0,1065,1066,1,0,0,0,1066,1064,1,0,0,0,1066,1067,1,0,0,0,1067,
- 1069,1,0,0,0,1068,1051,1,0,0,0,1068,1061,1,0,0,0,1069,231,1,0,0,0,1070,
- 1073,3,230,107,0,1071,1073,3,174,79,0,1072,1070,1,0,0,0,1072,1071,1,0,0,
- 0,1073,1074,1,0,0,0,1074,1072,1,0,0,0,1074,1075,1,0,0,0,1075,233,1,0,0,
- 0,1076,1077,3,60,22,0,1077,1078,1,0,0,0,1078,1079,6,109,11,0,1079,235,1,
- 0,0,0,1080,1081,3,62,23,0,1081,1082,1,0,0,0,1082,1083,6,110,11,0,1083,237,
- 1,0,0,0,1084,1085,3,64,24,0,1085,1086,1,0,0,0,1086,1087,6,111,11,0,1087,
- 239,1,0,0,0,1088,1089,3,66,25,0,1089,1090,1,0,0,0,1090,1091,6,112,16,0,
- 1091,1092,6,112,12,0,1092,241,1,0,0,0,1093,1094,3,100,42,0,1094,1095,1,
- 0,0,0,1095,1096,6,113,20,0,1096,243,1,0,0,0,1097,1098,3,104,44,0,1098,1099,
- 1,0,0,0,1099,1100,6,114,19,0,1100,245,1,0,0,0,1101,1102,3,108,46,0,1102,
- 1103,1,0,0,0,1103,1104,6,115,23,0,1104,247,1,0,0,0,1105,1106,7,12,0,0,1106,
- 1107,7,2,0,0,1107,249,1,0,0,0,1108,1109,3,232,108,0,1109,1110,1,0,0,0,1110,
- 1111,6,117,24,0,1111,251,1,0,0,0,1112,1113,3,60,22,0,1113,1114,1,0,0,0,
- 1114,1115,6,118,11,0,1115,253,1,0,0,0,1116,1117,3,62,23,0,1117,1118,1,0,
- 0,0,1118,1119,6,119,11,0,1119,255,1,0,0,0,1120,1121,3,64,24,0,1121,1122,
- 1,0,0,0,1122,1123,6,120,11,0,1123,257,1,0,0,0,1124,1125,3,66,25,0,1125,
- 1126,1,0,0,0,1126,1127,6,121,16,0,1127,1128,6,121,12,0,1128,259,1,0,0,0,
- 1129,1130,3,168,76,0,1130,1131,1,0,0,0,1131,1132,6,122,14,0,1132,1133,6,
- 122,25,0,1133,261,1,0,0,0,1134,1135,7,7,0,0,1135,1136,7,9,0,0,1136,1137,
- 1,0,0,0,1137,1138,6,123,26,0,1138,263,1,0,0,0,1139,1140,7,19,0,0,1140,1141,
- 7,1,0,0,1141,1142,7,5,0,0,1142,1143,7,10,0,0,1143,1144,1,0,0,0,1144,1145,
- 6,124,26,0,1145,265,1,0,0,0,1146,1147,8,34,0,0,1147,267,1,0,0,0,1148,1150,
- 3,266,125,0,1149,1148,1,0,0,0,1150,1151,1,0,0,0,1151,1149,1,0,0,0,1151,
- 1152,1,0,0,0,1152,1153,1,0,0,0,1153,1154,3,334,159,0,1154,1156,1,0,0,0,
- 1155,1149,1,0,0,0,1155,1156,1,0,0,0,1156,1158,1,0,0,0,1157,1159,3,266,125,
- 0,1158,1157,1,0,0,0,1159,1160,1,0,0,0,1160,1158,1,0,0,0,1160,1161,1,0,0,
- 0,1161,269,1,0,0,0,1162,1163,3,268,126,0,1163,1164,1,0,0,0,1164,1165,6,
- 127,27,0,1165,271,1,0,0,0,1166,1167,3,60,22,0,1167,1168,1,0,0,0,1168,1169,
- 6,128,11,0,1169,273,1,0,0,0,1170,1171,3,62,23,0,1171,1172,1,0,0,0,1172,
- 1173,6,129,11,0,1173,275,1,0,0,0,1174,1175,3,64,24,0,1175,1176,1,0,0,0,
- 1176,1177,6,130,11,0,1177,277,1,0,0,0,1178,1179,3,66,25,0,1179,1180,1,0,
- 0,0,1180,1181,6,131,16,0,1181,1182,6,131,12,0,1182,1183,6,131,12,0,1183,
- 279,1,0,0,0,1184,1185,3,100,42,0,1185,1186,1,0,0,0,1186,1187,6,132,20,0,
- 1187,281,1,0,0,0,1188,1189,3,104,44,0,1189,1190,1,0,0,0,1190,1191,6,133,
- 19,0,1191,283,1,0,0,0,1192,1193,3,108,46,0,1193,1194,1,0,0,0,1194,1195,
- 6,134,23,0,1195,285,1,0,0,0,1196,1197,3,264,124,0,1197,1198,1,0,0,0,1198,
- 1199,6,135,28,0,1199,287,1,0,0,0,1200,1201,3,232,108,0,1201,1202,1,0,0,
- 0,1202,1203,6,136,24,0,1203,289,1,0,0,0,1204,1205,3,176,80,0,1205,1206,
- 1,0,0,0,1206,1207,6,137,29,0,1207,291,1,0,0,0,1208,1209,3,60,22,0,1209,
- 1210,1,0,0,0,1210,1211,6,138,11,0,1211,293,1,0,0,0,1212,1213,3,62,23,0,
- 1213,1214,1,0,0,0,1214,1215,6,139,11,0,1215,295,1,0,0,0,1216,1217,3,64,
- 24,0,1217,1218,1,0,0,0,1218,1219,6,140,11,0,1219,297,1,0,0,0,1220,1221,
- 3,66,25,0,1221,1222,1,0,0,0,1222,1223,6,141,16,0,1223,1224,6,141,12,0,1224,
- 299,1,0,0,0,1225,1226,3,108,46,0,1226,1227,1,0,0,0,1227,1228,6,142,23,0,
- 1228,301,1,0,0,0,1229,1230,3,176,80,0,1230,1231,1,0,0,0,1231,1232,6,143,
- 29,0,1232,303,1,0,0,0,1233,1234,3,172,78,0,1234,1235,1,0,0,0,1235,1236,
- 6,144,30,0,1236,305,1,0,0,0,1237,1238,3,60,22,0,1238,1239,1,0,0,0,1239,
- 1240,6,145,11,0,1240,307,1,0,0,0,1241,1242,3,62,23,0,1242,1243,1,0,0,0,
- 1243,1244,6,146,11,0,1244,309,1,0,0,0,1245,1246,3,64,24,0,1246,1247,1,0,
- 0,0,1247,1248,6,147,11,0,1248,311,1,0,0,0,1249,1250,3,66,25,0,1250,1251,
- 1,0,0,0,1251,1252,6,148,16,0,1252,1253,6,148,12,0,1253,313,1,0,0,0,1254,
- 1255,7,1,0,0,1255,1256,7,9,0,0,1256,1257,7,15,0,0,1257,1258,7,7,0,0,1258,
- 315,1,0,0,0,1259,1260,3,60,22,0,1260,1261,1,0,0,0,1261,1262,6,150,11,0,
- 1262,317,1,0,0,0,1263,1264,3,62,23,0,1264,1265,1,0,0,0,1265,1266,6,151,
- 11,0,1266,319,1,0,0,0,1267,1268,3,64,24,0,1268,1269,1,0,0,0,1269,1270,6,
- 152,11,0,1270,321,1,0,0,0,1271,1272,3,66,25,0,1272,1273,1,0,0,0,1273,1274,
- 6,153,16,0,1274,1275,6,153,12,0,1275,323,1,0,0,0,1276,1277,7,15,0,0,1277,
- 1278,7,20,0,0,1278,1279,7,9,0,0,1279,1280,7,4,0,0,1280,1281,7,5,0,0,1281,
- 1282,7,1,0,0,1282,1283,7,7,0,0,1283,1284,7,9,0,0,1284,1285,7,2,0,0,1285,
- 325,1,0,0,0,1286,1287,3,60,22,0,1287,1288,1,0,0,0,1288,1289,6,155,11,0,
- 1289,327,1,0,0,0,1290,1291,3,62,23,0,1291,1292,1,0,0,0,1292,1293,6,156,
- 11,0,1293,329,1,0,0,0,1294,1295,3,64,24,0,1295,1296,1,0,0,0,1296,1297,6,
- 157,11,0,1297,331,1,0,0,0,1298,1299,3,170,77,0,1299,1300,1,0,0,0,1300,1301,
- 6,158,17,0,1301,1302,6,158,12,0,1302,333,1,0,0,0,1303,1304,5,58,0,0,1304,
- 335,1,0,0,0,1305,1311,3,78,31,0,1306,1311,3,68,26,0,1307,1311,3,108,46,
- 0,1308,1311,3,70,27,0,1309,1311,3,84,34,0,1310,1305,1,0,0,0,1310,1306,1,
- 0,0,0,1310,1307,1,0,0,0,1310,1308,1,0,0,0,1310,1309,1,0,0,0,1311,1312,1,
- 0,0,0,1312,1310,1,0,0,0,1312,1313,1,0,0,0,1313,337,1,0,0,0,1314,1315,3,
- 60,22,0,1315,1316,1,0,0,0,1316,1317,6,161,11,0,1317,339,1,0,0,0,1318,1319,
- 3,62,23,0,1319,1320,1,0,0,0,1320,1321,6,162,11,0,1321,341,1,0,0,0,1322,
- 1323,3,64,24,0,1323,1324,1,0,0,0,1324,1325,6,163,11,0,1325,343,1,0,0,0,
- 1326,1327,3,66,25,0,1327,1328,1,0,0,0,1328,1329,6,164,16,0,1329,1330,6,
- 164,12,0,1330,345,1,0,0,0,1331,1332,3,334,159,0,1332,1333,1,0,0,0,1333,
- 1334,6,165,18,0,1334,347,1,0,0,0,1335,1336,3,104,44,0,1336,1337,1,0,0,0,
- 1337,1338,6,166,19,0,1338,349,1,0,0,0,1339,1340,3,108,46,0,1340,1341,1,
- 0,0,0,1341,1342,6,167,23,0,1342,351,1,0,0,0,1343,1344,3,262,123,0,1344,
- 1345,1,0,0,0,1345,1346,6,168,31,0,1346,1347,6,168,32,0,1347,353,1,0,0,0,
- 1348,1349,3,210,97,0,1349,1350,1,0,0,0,1350,1351,6,169,21,0,1351,355,1,
- 0,0,0,1352,1353,3,88,36,0,1353,1354,1,0,0,0,1354,1355,6,170,22,0,1355,357,
- 1,0,0,0,1356,1357,3,60,22,0,1357,1358,1,0,0,0,1358,1359,6,171,11,0,1359,
- 359,1,0,0,0,1360,1361,3,62,23,0,1361,1362,1,0,0,0,1362,1363,6,172,11,0,
- 1363,361,1,0,0,0,1364,1365,3,64,24,0,1365,1366,1,0,0,0,1366,1367,6,173,
- 11,0,1367,363,1,0,0,0,1368,1369,3,66,25,0,1369,1370,1,0,0,0,1370,1371,6,
- 174,16,0,1371,1372,6,174,12,0,1372,1373,6,174,12,0,1373,365,1,0,0,0,1374,
- 1375,3,104,44,0,1375,1376,1,0,0,0,1376,1377,6,175,19,0,1377,367,1,0,0,0,
- 1378,1379,3,108,46,0,1379,1380,1,0,0,0,1380,1381,6,176,23,0,1381,369,1,
- 0,0,0,1382,1383,3,232,108,0,1383,1384,1,0,0,0,1384,1385,6,177,24,0,1385,
- 371,1,0,0,0,1386,1387,3,60,22,0,1387,1388,1,0,0,0,1388,1389,6,178,11,0,
- 1389,373,1,0,0,0,1390,1391,3,62,23,0,1391,1392,1,0,0,0,1392,1393,6,179,
- 11,0,1393,375,1,0,0,0,1394,1395,3,64,24,0,1395,1396,1,0,0,0,1396,1397,6,
- 180,11,0,1397,377,1,0,0,0,1398,1399,3,66,25,0,1399,1400,1,0,0,0,1400,1401,
- 6,181,16,0,1401,1402,6,181,12,0,1402,379,1,0,0,0,1403,1404,3,210,97,0,1404,
- 1405,1,0,0,0,1405,1406,6,182,21,0,1406,1407,6,182,12,0,1407,1408,6,182,
- 33,0,1408,381,1,0,0,0,1409,1410,3,88,36,0,1410,1411,1,0,0,0,1411,1412,6,
- 183,22,0,1412,1413,6,183,12,0,1413,1414,6,183,33,0,1414,383,1,0,0,0,1415,
- 1416,3,60,22,0,1416,1417,1,0,0,0,1417,1418,6,184,11,0,1418,385,1,0,0,0,
- 1419,1420,3,62,23,0,1420,1421,1,0,0,0,1421,1422,6,185,11,0,1422,387,1,0,
- 0,0,1423,1424,3,64,24,0,1424,1425,1,0,0,0,1425,1426,6,186,11,0,1426,389,
- 1,0,0,0,1427,1428,3,334,159,0,1428,1429,1,0,0,0,1429,1430,6,187,18,0,1430,
- 1431,6,187,12,0,1431,1432,6,187,10,0,1432,391,1,0,0,0,1433,1434,3,104,44,
- 0,1434,1435,1,0,0,0,1435,1436,6,188,19,0,1436,1437,6,188,12,0,1437,1438,
- 6,188,10,0,1438,393,1,0,0,0,1439,1440,3,60,22,0,1440,1441,1,0,0,0,1441,
- 1442,6,189,11,0,1442,395,1,0,0,0,1443,1444,3,62,23,0,1444,1445,1,0,0,0,
- 1445,1446,6,190,11,0,1446,397,1,0,0,0,1447,1448,3,64,24,0,1448,1449,1,0,
- 0,0,1449,1450,6,191,11,0,1450,399,1,0,0,0,1451,1452,3,176,80,0,1452,1453,
- 1,0,0,0,1453,1454,6,192,12,0,1454,1455,6,192,0,0,1455,1456,6,192,29,0,1456,
- 401,1,0,0,0,1457,1458,3,172,78,0,1458,1459,1,0,0,0,1459,1460,6,193,12,0,
- 1460,1461,6,193,0,0,1461,1462,6,193,30,0,1462,403,1,0,0,0,1463,1464,3,94,
- 39,0,1464,1465,1,0,0,0,1465,1466,6,194,12,0,1466,1467,6,194,0,0,1467,1468,
- 6,194,34,0,1468,405,1,0,0,0,1469,1470,3,66,25,0,1470,1471,1,0,0,0,1471,
- 1472,6,195,16,0,1472,1473,6,195,12,0,1473,407,1,0,0,0,66,0,1,2,3,4,5,6,
- 7,8,9,10,11,12,13,14,15,592,602,606,609,618,620,631,650,655,664,671,676,
- 678,689,697,700,702,707,712,718,725,730,736,739,747,751,878,883,890,892,
- 908,913,918,920,926,1003,1008,1047,1051,1056,1061,1066,1068,1072,1074,1151,
- 1155,1160,1310,1312,35,5,1,0,5,4,0,5,6,0,5,2,0,5,3,0,5,10,0,5,8,0,5,5,0,
- 5,9,0,5,12,0,5,14,0,0,1,0,4,0,0,7,20,0,7,66,0,5,0,0,7,26,0,7,67,0,7,109,
- 0,7,35,0,7,33,0,7,77,0,7,27,0,7,37,0,7,81,0,5,11,0,5,7,0,7,91,0,7,90,0,
- 7,69,0,7,68,0,7,89,0,5,13,0,5,15,0,7,30,0];
+ 9,10,13,13,32,32,34,35,44,44,47,47,58,58,60,60,62,63,92,92,124,124,1503,
+ 0,15,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,
+ 0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,0,0,0,0,33,1,0,0,0,0,35,1,0,0,0,
+ 0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,0,43,1,0,0,0,0,45,1,0,0,0,0,47,1,
+ 0,0,0,0,49,1,0,0,0,0,51,1,0,0,0,0,53,1,0,0,0,0,55,1,0,0,0,0,57,1,0,0,0,
+ 0,59,1,0,0,0,0,61,1,0,0,0,1,63,1,0,0,0,1,85,1,0,0,0,1,87,1,0,0,0,1,89,1,
+ 0,0,0,1,91,1,0,0,0,1,93,1,0,0,0,1,95,1,0,0,0,1,97,1,0,0,0,1,99,1,0,0,0,
+ 1,101,1,0,0,0,1,103,1,0,0,0,1,105,1,0,0,0,1,107,1,0,0,0,1,109,1,0,0,0,1,
+ 111,1,0,0,0,1,113,1,0,0,0,1,115,1,0,0,0,1,117,1,0,0,0,1,119,1,0,0,0,1,121,
+ 1,0,0,0,1,123,1,0,0,0,1,125,1,0,0,0,1,127,1,0,0,0,1,129,1,0,0,0,1,131,1,
+ 0,0,0,1,133,1,0,0,0,1,135,1,0,0,0,1,137,1,0,0,0,1,139,1,0,0,0,1,141,1,0,
+ 0,0,1,143,1,0,0,0,1,145,1,0,0,0,1,147,1,0,0,0,1,149,1,0,0,0,1,151,1,0,0,
+ 0,1,153,1,0,0,0,1,155,1,0,0,0,1,157,1,0,0,0,1,159,1,0,0,0,1,161,1,0,0,0,
+ 1,163,1,0,0,0,1,165,1,0,0,0,1,167,1,0,0,0,1,169,1,0,0,0,1,173,1,0,0,0,1,
+ 175,1,0,0,0,1,177,1,0,0,0,1,179,1,0,0,0,2,181,1,0,0,0,2,183,1,0,0,0,2,185,
+ 1,0,0,0,2,187,1,0,0,0,2,189,1,0,0,0,3,191,1,0,0,0,3,193,1,0,0,0,3,195,1,
+ 0,0,0,3,197,1,0,0,0,3,199,1,0,0,0,3,201,1,0,0,0,3,203,1,0,0,0,3,207,1,0,
+ 0,0,3,209,1,0,0,0,3,211,1,0,0,0,3,213,1,0,0,0,3,215,1,0,0,0,3,217,1,0,0,
+ 0,4,219,1,0,0,0,4,221,1,0,0,0,4,223,1,0,0,0,4,225,1,0,0,0,4,227,1,0,0,0,
+ 4,233,1,0,0,0,4,235,1,0,0,0,4,237,1,0,0,0,4,239,1,0,0,0,5,241,1,0,0,0,5,
+ 243,1,0,0,0,5,245,1,0,0,0,5,247,1,0,0,0,5,249,1,0,0,0,5,251,1,0,0,0,5,253,
+ 1,0,0,0,5,255,1,0,0,0,5,257,1,0,0,0,5,259,1,0,0,0,5,261,1,0,0,0,6,263,1,
+ 0,0,0,6,265,1,0,0,0,6,267,1,0,0,0,6,269,1,0,0,0,6,273,1,0,0,0,6,275,1,0,
+ 0,0,6,277,1,0,0,0,6,279,1,0,0,0,6,281,1,0,0,0,7,283,1,0,0,0,7,285,1,0,0,
+ 0,7,287,1,0,0,0,7,289,1,0,0,0,7,291,1,0,0,0,7,293,1,0,0,0,7,295,1,0,0,0,
+ 7,297,1,0,0,0,7,299,1,0,0,0,7,301,1,0,0,0,7,303,1,0,0,0,7,305,1,0,0,0,8,
+ 307,1,0,0,0,8,309,1,0,0,0,8,311,1,0,0,0,8,313,1,0,0,0,8,315,1,0,0,0,8,317,
+ 1,0,0,0,8,319,1,0,0,0,8,321,1,0,0,0,8,323,1,0,0,0,9,325,1,0,0,0,9,327,1,
+ 0,0,0,9,329,1,0,0,0,9,331,1,0,0,0,9,333,1,0,0,0,10,335,1,0,0,0,10,337,1,
+ 0,0,0,10,339,1,0,0,0,10,341,1,0,0,0,10,343,1,0,0,0,10,345,1,0,0,0,11,347,
+ 1,0,0,0,11,349,1,0,0,0,11,351,1,0,0,0,11,353,1,0,0,0,11,355,1,0,0,0,11,
+ 357,1,0,0,0,11,359,1,0,0,0,11,361,1,0,0,0,11,363,1,0,0,0,11,365,1,0,0,0,
+ 12,367,1,0,0,0,12,369,1,0,0,0,12,371,1,0,0,0,12,373,1,0,0,0,12,375,1,0,
+ 0,0,12,377,1,0,0,0,12,379,1,0,0,0,13,381,1,0,0,0,13,383,1,0,0,0,13,385,
+ 1,0,0,0,13,387,1,0,0,0,13,389,1,0,0,0,13,391,1,0,0,0,14,393,1,0,0,0,14,
+ 395,1,0,0,0,14,397,1,0,0,0,14,399,1,0,0,0,14,401,1,0,0,0,14,403,1,0,0,0,
+ 14,405,1,0,0,0,14,407,1,0,0,0,14,409,1,0,0,0,15,411,1,0,0,0,17,421,1,0,
+ 0,0,19,428,1,0,0,0,21,437,1,0,0,0,23,444,1,0,0,0,25,454,1,0,0,0,27,461,
+ 1,0,0,0,29,468,1,0,0,0,31,475,1,0,0,0,33,483,1,0,0,0,35,495,1,0,0,0,37,
+ 504,1,0,0,0,39,510,1,0,0,0,41,517,1,0,0,0,43,524,1,0,0,0,45,532,1,0,0,0,
+ 47,540,1,0,0,0,49,555,1,0,0,0,51,565,1,0,0,0,53,574,1,0,0,0,55,586,1,0,
+ 0,0,57,592,1,0,0,0,59,609,1,0,0,0,61,625,1,0,0,0,63,631,1,0,0,0,65,635,
+ 1,0,0,0,67,637,1,0,0,0,69,639,1,0,0,0,71,642,1,0,0,0,73,644,1,0,0,0,75,
+ 653,1,0,0,0,77,655,1,0,0,0,79,660,1,0,0,0,81,662,1,0,0,0,83,667,1,0,0,0,
+ 85,698,1,0,0,0,87,701,1,0,0,0,89,747,1,0,0,0,91,749,1,0,0,0,93,752,1,0,
+ 0,0,95,756,1,0,0,0,97,760,1,0,0,0,99,762,1,0,0,0,101,765,1,0,0,0,103,767,
+ 1,0,0,0,105,772,1,0,0,0,107,774,1,0,0,0,109,780,1,0,0,0,111,786,1,0,0,0,
+ 113,789,1,0,0,0,115,792,1,0,0,0,117,797,1,0,0,0,119,802,1,0,0,0,121,804,
+ 1,0,0,0,123,808,1,0,0,0,125,813,1,0,0,0,127,819,1,0,0,0,129,822,1,0,0,0,
+ 131,824,1,0,0,0,133,830,1,0,0,0,135,832,1,0,0,0,137,837,1,0,0,0,139,840,
+ 1,0,0,0,141,843,1,0,0,0,143,846,1,0,0,0,145,848,1,0,0,0,147,851,1,0,0,0,
+ 149,853,1,0,0,0,151,856,1,0,0,0,153,858,1,0,0,0,155,860,1,0,0,0,157,862,
+ 1,0,0,0,159,864,1,0,0,0,161,866,1,0,0,0,163,888,1,0,0,0,165,890,1,0,0,0,
+ 167,895,1,0,0,0,169,916,1,0,0,0,171,918,1,0,0,0,173,926,1,0,0,0,175,928,
+ 1,0,0,0,177,932,1,0,0,0,179,936,1,0,0,0,181,940,1,0,0,0,183,945,1,0,0,0,
+ 185,950,1,0,0,0,187,954,1,0,0,0,189,958,1,0,0,0,191,962,1,0,0,0,193,967,
+ 1,0,0,0,195,971,1,0,0,0,197,975,1,0,0,0,199,979,1,0,0,0,201,983,1,0,0,0,
+ 203,987,1,0,0,0,205,999,1,0,0,0,207,1002,1,0,0,0,209,1006,1,0,0,0,211,1010,
+ 1,0,0,0,213,1014,1,0,0,0,215,1018,1,0,0,0,217,1022,1,0,0,0,219,1026,1,0,
+ 0,0,221,1031,1,0,0,0,223,1035,1,0,0,0,225,1039,1,0,0,0,227,1043,1,0,0,0,
+ 229,1051,1,0,0,0,231,1072,1,0,0,0,233,1076,1,0,0,0,235,1080,1,0,0,0,237,
+ 1084,1,0,0,0,239,1088,1,0,0,0,241,1092,1,0,0,0,243,1097,1,0,0,0,245,1101,
+ 1,0,0,0,247,1105,1,0,0,0,249,1109,1,0,0,0,251,1113,1,0,0,0,253,1117,1,0,
+ 0,0,255,1120,1,0,0,0,257,1124,1,0,0,0,259,1128,1,0,0,0,261,1132,1,0,0,0,
+ 263,1136,1,0,0,0,265,1141,1,0,0,0,267,1146,1,0,0,0,269,1151,1,0,0,0,271,
+ 1158,1,0,0,0,273,1167,1,0,0,0,275,1174,1,0,0,0,277,1178,1,0,0,0,279,1182,
+ 1,0,0,0,281,1186,1,0,0,0,283,1190,1,0,0,0,285,1196,1,0,0,0,287,1200,1,0,
+ 0,0,289,1204,1,0,0,0,291,1208,1,0,0,0,293,1212,1,0,0,0,295,1216,1,0,0,0,
+ 297,1220,1,0,0,0,299,1224,1,0,0,0,301,1228,1,0,0,0,303,1232,1,0,0,0,305,
+ 1236,1,0,0,0,307,1240,1,0,0,0,309,1245,1,0,0,0,311,1249,1,0,0,0,313,1253,
+ 1,0,0,0,315,1257,1,0,0,0,317,1261,1,0,0,0,319,1265,1,0,0,0,321,1269,1,0,
+ 0,0,323,1273,1,0,0,0,325,1277,1,0,0,0,327,1282,1,0,0,0,329,1287,1,0,0,0,
+ 331,1291,1,0,0,0,333,1295,1,0,0,0,335,1299,1,0,0,0,337,1304,1,0,0,0,339,
+ 1311,1,0,0,0,341,1315,1,0,0,0,343,1319,1,0,0,0,345,1323,1,0,0,0,347,1327,
+ 1,0,0,0,349,1332,1,0,0,0,351,1336,1,0,0,0,353,1340,1,0,0,0,355,1344,1,0,
+ 0,0,357,1349,1,0,0,0,359,1353,1,0,0,0,361,1357,1,0,0,0,363,1361,1,0,0,0,
+ 365,1365,1,0,0,0,367,1369,1,0,0,0,369,1375,1,0,0,0,371,1379,1,0,0,0,373,
+ 1383,1,0,0,0,375,1387,1,0,0,0,377,1391,1,0,0,0,379,1395,1,0,0,0,381,1399,
+ 1,0,0,0,383,1404,1,0,0,0,385,1410,1,0,0,0,387,1416,1,0,0,0,389,1420,1,0,
+ 0,0,391,1424,1,0,0,0,393,1428,1,0,0,0,395,1434,1,0,0,0,397,1440,1,0,0,0,
+ 399,1444,1,0,0,0,401,1448,1,0,0,0,403,1452,1,0,0,0,405,1458,1,0,0,0,407,
+ 1464,1,0,0,0,409,1470,1,0,0,0,411,412,7,0,0,0,412,413,7,1,0,0,413,414,7,
+ 2,0,0,414,415,7,2,0,0,415,416,7,3,0,0,416,417,7,4,0,0,417,418,7,5,0,0,418,
+ 419,1,0,0,0,419,420,6,0,0,0,420,16,1,0,0,0,421,422,7,0,0,0,422,423,7,6,
+ 0,0,423,424,7,7,0,0,424,425,7,8,0,0,425,426,1,0,0,0,426,427,6,1,1,0,427,
+ 18,1,0,0,0,428,429,7,3,0,0,429,430,7,9,0,0,430,431,7,6,0,0,431,432,7,1,
+ 0,0,432,433,7,4,0,0,433,434,7,10,0,0,434,435,1,0,0,0,435,436,6,2,2,0,436,
+ 20,1,0,0,0,437,438,7,3,0,0,438,439,7,11,0,0,439,440,7,12,0,0,440,441,7,
+ 13,0,0,441,442,1,0,0,0,442,443,6,3,0,0,443,22,1,0,0,0,444,445,7,3,0,0,445,
+ 446,7,14,0,0,446,447,7,8,0,0,447,448,7,13,0,0,448,449,7,12,0,0,449,450,
+ 7,1,0,0,450,451,7,9,0,0,451,452,1,0,0,0,452,453,6,4,3,0,453,24,1,0,0,0,
+ 454,455,7,15,0,0,455,456,7,6,0,0,456,457,7,7,0,0,457,458,7,16,0,0,458,459,
+ 1,0,0,0,459,460,6,5,4,0,460,26,1,0,0,0,461,462,7,17,0,0,462,463,7,6,0,0,
+ 463,464,7,7,0,0,464,465,7,18,0,0,465,466,1,0,0,0,466,467,6,6,0,0,467,28,
+ 1,0,0,0,468,469,7,18,0,0,469,470,7,3,0,0,470,471,7,3,0,0,471,472,7,8,0,
+ 0,472,473,1,0,0,0,473,474,6,7,1,0,474,30,1,0,0,0,475,476,7,13,0,0,476,477,
+ 7,1,0,0,477,478,7,16,0,0,478,479,7,1,0,0,479,480,7,5,0,0,480,481,1,0,0,
+ 0,481,482,6,8,0,0,482,32,1,0,0,0,483,484,7,16,0,0,484,485,7,11,0,0,485,
+ 486,5,95,0,0,486,487,7,3,0,0,487,488,7,14,0,0,488,489,7,8,0,0,489,490,7,
+ 12,0,0,490,491,7,9,0,0,491,492,7,0,0,0,492,493,1,0,0,0,493,494,6,9,5,0,
+ 494,34,1,0,0,0,495,496,7,6,0,0,496,497,7,3,0,0,497,498,7,9,0,0,498,499,
+ 7,12,0,0,499,500,7,16,0,0,500,501,7,3,0,0,501,502,1,0,0,0,502,503,6,10,
+ 6,0,503,36,1,0,0,0,504,505,7,6,0,0,505,506,7,7,0,0,506,507,7,19,0,0,507,
+ 508,1,0,0,0,508,509,6,11,0,0,509,38,1,0,0,0,510,511,7,2,0,0,511,512,7,10,
+ 0,0,512,513,7,7,0,0,513,514,7,19,0,0,514,515,1,0,0,0,515,516,6,12,7,0,516,
+ 40,1,0,0,0,517,518,7,2,0,0,518,519,7,7,0,0,519,520,7,6,0,0,520,521,7,5,
+ 0,0,521,522,1,0,0,0,522,523,6,13,0,0,523,42,1,0,0,0,524,525,7,2,0,0,525,
+ 526,7,5,0,0,526,527,7,12,0,0,527,528,7,5,0,0,528,529,7,2,0,0,529,530,1,
+ 0,0,0,530,531,6,14,0,0,531,44,1,0,0,0,532,533,7,19,0,0,533,534,7,10,0,0,
+ 534,535,7,3,0,0,535,536,7,6,0,0,536,537,7,3,0,0,537,538,1,0,0,0,538,539,
+ 6,15,0,0,539,46,1,0,0,0,540,541,4,16,0,0,541,542,7,1,0,0,542,543,7,9,0,
+ 0,543,544,7,13,0,0,544,545,7,1,0,0,545,546,7,9,0,0,546,547,7,3,0,0,547,
+ 548,7,2,0,0,548,549,7,5,0,0,549,550,7,12,0,0,550,551,7,5,0,0,551,552,7,
+ 2,0,0,552,553,1,0,0,0,553,554,6,16,0,0,554,48,1,0,0,0,555,556,4,17,1,0,
+ 556,557,7,13,0,0,557,558,7,7,0,0,558,559,7,7,0,0,559,560,7,18,0,0,560,561,
+ 7,20,0,0,561,562,7,8,0,0,562,563,1,0,0,0,563,564,6,17,8,0,564,50,1,0,0,
+ 0,565,566,4,18,2,0,566,567,7,16,0,0,567,568,7,12,0,0,568,569,7,5,0,0,569,
+ 570,7,4,0,0,570,571,7,10,0,0,571,572,1,0,0,0,572,573,6,18,0,0,573,52,1,
+ 0,0,0,574,575,4,19,3,0,575,576,7,16,0,0,576,577,7,3,0,0,577,578,7,5,0,0,
+ 578,579,7,6,0,0,579,580,7,1,0,0,580,581,7,4,0,0,581,582,7,2,0,0,582,583,
+ 1,0,0,0,583,584,6,19,9,0,584,54,1,0,0,0,585,587,8,21,0,0,586,585,1,0,0,
+ 0,587,588,1,0,0,0,588,586,1,0,0,0,588,589,1,0,0,0,589,590,1,0,0,0,590,591,
+ 6,20,0,0,591,56,1,0,0,0,592,593,5,47,0,0,593,594,5,47,0,0,594,598,1,0,0,
+ 0,595,597,8,22,0,0,596,595,1,0,0,0,597,600,1,0,0,0,598,596,1,0,0,0,598,
+ 599,1,0,0,0,599,602,1,0,0,0,600,598,1,0,0,0,601,603,5,13,0,0,602,601,1,
+ 0,0,0,602,603,1,0,0,0,603,605,1,0,0,0,604,606,5,10,0,0,605,604,1,0,0,0,
+ 605,606,1,0,0,0,606,607,1,0,0,0,607,608,6,21,10,0,608,58,1,0,0,0,609,610,
+ 5,47,0,0,610,611,5,42,0,0,611,616,1,0,0,0,612,615,3,59,22,0,613,615,9,0,
+ 0,0,614,612,1,0,0,0,614,613,1,0,0,0,615,618,1,0,0,0,616,617,1,0,0,0,616,
+ 614,1,0,0,0,617,619,1,0,0,0,618,616,1,0,0,0,619,620,5,42,0,0,620,621,5,
+ 47,0,0,621,622,1,0,0,0,622,623,6,22,10,0,623,60,1,0,0,0,624,626,7,23,0,
+ 0,625,624,1,0,0,0,626,627,1,0,0,0,627,625,1,0,0,0,627,628,1,0,0,0,628,629,
+ 1,0,0,0,629,630,6,23,10,0,630,62,1,0,0,0,631,632,5,124,0,0,632,633,1,0,
+ 0,0,633,634,6,24,11,0,634,64,1,0,0,0,635,636,7,24,0,0,636,66,1,0,0,0,637,
+ 638,7,25,0,0,638,68,1,0,0,0,639,640,5,92,0,0,640,641,7,26,0,0,641,70,1,
+ 0,0,0,642,643,8,27,0,0,643,72,1,0,0,0,644,646,7,3,0,0,645,647,7,28,0,0,
+ 646,645,1,0,0,0,646,647,1,0,0,0,647,649,1,0,0,0,648,650,3,65,25,0,649,648,
+ 1,0,0,0,650,651,1,0,0,0,651,649,1,0,0,0,651,652,1,0,0,0,652,74,1,0,0,0,
+ 653,654,5,64,0,0,654,76,1,0,0,0,655,656,5,96,0,0,656,78,1,0,0,0,657,661,
+ 8,29,0,0,658,659,5,96,0,0,659,661,5,96,0,0,660,657,1,0,0,0,660,658,1,0,
+ 0,0,661,80,1,0,0,0,662,663,5,95,0,0,663,82,1,0,0,0,664,668,3,67,26,0,665,
+ 668,3,65,25,0,666,668,3,81,33,0,667,664,1,0,0,0,667,665,1,0,0,0,667,666,
+ 1,0,0,0,668,84,1,0,0,0,669,674,5,34,0,0,670,673,3,69,27,0,671,673,3,71,
+ 28,0,672,670,1,0,0,0,672,671,1,0,0,0,673,676,1,0,0,0,674,672,1,0,0,0,674,
+ 675,1,0,0,0,675,677,1,0,0,0,676,674,1,0,0,0,677,699,5,34,0,0,678,679,5,
+ 34,0,0,679,680,5,34,0,0,680,681,5,34,0,0,681,685,1,0,0,0,682,684,8,22,0,
+ 0,683,682,1,0,0,0,684,687,1,0,0,0,685,686,1,0,0,0,685,683,1,0,0,0,686,688,
+ 1,0,0,0,687,685,1,0,0,0,688,689,5,34,0,0,689,690,5,34,0,0,690,691,5,34,
+ 0,0,691,693,1,0,0,0,692,694,5,34,0,0,693,692,1,0,0,0,693,694,1,0,0,0,694,
+ 696,1,0,0,0,695,697,5,34,0,0,696,695,1,0,0,0,696,697,1,0,0,0,697,699,1,
+ 0,0,0,698,669,1,0,0,0,698,678,1,0,0,0,699,86,1,0,0,0,700,702,3,65,25,0,
+ 701,700,1,0,0,0,702,703,1,0,0,0,703,701,1,0,0,0,703,704,1,0,0,0,704,88,
+ 1,0,0,0,705,707,3,65,25,0,706,705,1,0,0,0,707,708,1,0,0,0,708,706,1,0,0,
+ 0,708,709,1,0,0,0,709,710,1,0,0,0,710,714,3,105,45,0,711,713,3,65,25,0,
+ 712,711,1,0,0,0,713,716,1,0,0,0,714,712,1,0,0,0,714,715,1,0,0,0,715,748,
+ 1,0,0,0,716,714,1,0,0,0,717,719,3,105,45,0,718,720,3,65,25,0,719,718,1,
+ 0,0,0,720,721,1,0,0,0,721,719,1,0,0,0,721,722,1,0,0,0,722,748,1,0,0,0,723,
+ 725,3,65,25,0,724,723,1,0,0,0,725,726,1,0,0,0,726,724,1,0,0,0,726,727,1,
+ 0,0,0,727,735,1,0,0,0,728,732,3,105,45,0,729,731,3,65,25,0,730,729,1,0,
+ 0,0,731,734,1,0,0,0,732,730,1,0,0,0,732,733,1,0,0,0,733,736,1,0,0,0,734,
+ 732,1,0,0,0,735,728,1,0,0,0,735,736,1,0,0,0,736,737,1,0,0,0,737,738,3,73,
+ 29,0,738,748,1,0,0,0,739,741,3,105,45,0,740,742,3,65,25,0,741,740,1,0,0,
+ 0,742,743,1,0,0,0,743,741,1,0,0,0,743,744,1,0,0,0,744,745,1,0,0,0,745,746,
+ 3,73,29,0,746,748,1,0,0,0,747,706,1,0,0,0,747,717,1,0,0,0,747,724,1,0,0,
+ 0,747,739,1,0,0,0,748,90,1,0,0,0,749,750,7,30,0,0,750,751,7,31,0,0,751,
+ 92,1,0,0,0,752,753,7,12,0,0,753,754,7,9,0,0,754,755,7,0,0,0,755,94,1,0,
+ 0,0,756,757,7,12,0,0,757,758,7,2,0,0,758,759,7,4,0,0,759,96,1,0,0,0,760,
+ 761,5,61,0,0,761,98,1,0,0,0,762,763,5,58,0,0,763,764,5,58,0,0,764,100,1,
+ 0,0,0,765,766,5,44,0,0,766,102,1,0,0,0,767,768,7,0,0,0,768,769,7,3,0,0,
+ 769,770,7,2,0,0,770,771,7,4,0,0,771,104,1,0,0,0,772,773,5,46,0,0,773,106,
+ 1,0,0,0,774,775,7,15,0,0,775,776,7,12,0,0,776,777,7,13,0,0,777,778,7,2,
+ 0,0,778,779,7,3,0,0,779,108,1,0,0,0,780,781,7,15,0,0,781,782,7,1,0,0,782,
+ 783,7,6,0,0,783,784,7,2,0,0,784,785,7,5,0,0,785,110,1,0,0,0,786,787,7,1,
+ 0,0,787,788,7,9,0,0,788,112,1,0,0,0,789,790,7,1,0,0,790,791,7,2,0,0,791,
+ 114,1,0,0,0,792,793,7,13,0,0,793,794,7,12,0,0,794,795,7,2,0,0,795,796,7,
+ 5,0,0,796,116,1,0,0,0,797,798,7,13,0,0,798,799,7,1,0,0,799,800,7,18,0,0,
+ 800,801,7,3,0,0,801,118,1,0,0,0,802,803,5,40,0,0,803,120,1,0,0,0,804,805,
+ 7,9,0,0,805,806,7,7,0,0,806,807,7,5,0,0,807,122,1,0,0,0,808,809,7,9,0,0,
+ 809,810,7,20,0,0,810,811,7,13,0,0,811,812,7,13,0,0,812,124,1,0,0,0,813,
+ 814,7,9,0,0,814,815,7,20,0,0,815,816,7,13,0,0,816,817,7,13,0,0,817,818,
+ 7,2,0,0,818,126,1,0,0,0,819,820,7,7,0,0,820,821,7,6,0,0,821,128,1,0,0,0,
+ 822,823,5,63,0,0,823,130,1,0,0,0,824,825,7,6,0,0,825,826,7,13,0,0,826,827,
+ 7,1,0,0,827,828,7,18,0,0,828,829,7,3,0,0,829,132,1,0,0,0,830,831,5,41,0,
+ 0,831,134,1,0,0,0,832,833,7,5,0,0,833,834,7,6,0,0,834,835,7,20,0,0,835,
+ 836,7,3,0,0,836,136,1,0,0,0,837,838,5,61,0,0,838,839,5,61,0,0,839,138,1,
+ 0,0,0,840,841,5,61,0,0,841,842,5,126,0,0,842,140,1,0,0,0,843,844,5,33,0,
+ 0,844,845,5,61,0,0,845,142,1,0,0,0,846,847,5,60,0,0,847,144,1,0,0,0,848,
+ 849,5,60,0,0,849,850,5,61,0,0,850,146,1,0,0,0,851,852,5,62,0,0,852,148,
+ 1,0,0,0,853,854,5,62,0,0,854,855,5,61,0,0,855,150,1,0,0,0,856,857,5,43,
+ 0,0,857,152,1,0,0,0,858,859,5,45,0,0,859,154,1,0,0,0,860,861,5,42,0,0,861,
+ 156,1,0,0,0,862,863,5,47,0,0,863,158,1,0,0,0,864,865,5,37,0,0,865,160,1,
+ 0,0,0,866,867,4,73,4,0,867,868,3,51,18,0,868,869,1,0,0,0,869,870,6,73,12,
+ 0,870,162,1,0,0,0,871,874,3,129,57,0,872,875,3,67,26,0,873,875,3,81,33,
+ 0,874,872,1,0,0,0,874,873,1,0,0,0,875,879,1,0,0,0,876,878,3,83,34,0,877,
+ 876,1,0,0,0,878,881,1,0,0,0,879,877,1,0,0,0,879,880,1,0,0,0,880,889,1,0,
+ 0,0,881,879,1,0,0,0,882,884,3,129,57,0,883,885,3,65,25,0,884,883,1,0,0,
+ 0,885,886,1,0,0,0,886,884,1,0,0,0,886,887,1,0,0,0,887,889,1,0,0,0,888,871,
+ 1,0,0,0,888,882,1,0,0,0,889,164,1,0,0,0,890,891,5,91,0,0,891,892,1,0,0,
+ 0,892,893,6,75,0,0,893,894,6,75,0,0,894,166,1,0,0,0,895,896,5,93,0,0,896,
+ 897,1,0,0,0,897,898,6,76,11,0,898,899,6,76,11,0,899,168,1,0,0,0,900,904,
+ 3,67,26,0,901,903,3,83,34,0,902,901,1,0,0,0,903,906,1,0,0,0,904,902,1,0,
+ 0,0,904,905,1,0,0,0,905,917,1,0,0,0,906,904,1,0,0,0,907,910,3,81,33,0,908,
+ 910,3,75,30,0,909,907,1,0,0,0,909,908,1,0,0,0,910,912,1,0,0,0,911,913,3,
+ 83,34,0,912,911,1,0,0,0,913,914,1,0,0,0,914,912,1,0,0,0,914,915,1,0,0,0,
+ 915,917,1,0,0,0,916,900,1,0,0,0,916,909,1,0,0,0,917,170,1,0,0,0,918,920,
+ 3,77,31,0,919,921,3,79,32,0,920,919,1,0,0,0,921,922,1,0,0,0,922,920,1,0,
+ 0,0,922,923,1,0,0,0,923,924,1,0,0,0,924,925,3,77,31,0,925,172,1,0,0,0,926,
+ 927,3,171,78,0,927,174,1,0,0,0,928,929,3,57,21,0,929,930,1,0,0,0,930,931,
+ 6,80,10,0,931,176,1,0,0,0,932,933,3,59,22,0,933,934,1,0,0,0,934,935,6,81,
+ 10,0,935,178,1,0,0,0,936,937,3,61,23,0,937,938,1,0,0,0,938,939,6,82,10,
+ 0,939,180,1,0,0,0,940,941,3,165,75,0,941,942,1,0,0,0,942,943,6,83,13,0,
+ 943,944,6,83,14,0,944,182,1,0,0,0,945,946,3,63,24,0,946,947,1,0,0,0,947,
+ 948,6,84,15,0,948,949,6,84,11,0,949,184,1,0,0,0,950,951,3,61,23,0,951,952,
+ 1,0,0,0,952,953,6,85,10,0,953,186,1,0,0,0,954,955,3,57,21,0,955,956,1,0,
+ 0,0,956,957,6,86,10,0,957,188,1,0,0,0,958,959,3,59,22,0,959,960,1,0,0,0,
+ 960,961,6,87,10,0,961,190,1,0,0,0,962,963,3,63,24,0,963,964,1,0,0,0,964,
+ 965,6,88,15,0,965,966,6,88,11,0,966,192,1,0,0,0,967,968,3,165,75,0,968,
+ 969,1,0,0,0,969,970,6,89,13,0,970,194,1,0,0,0,971,972,3,167,76,0,972,973,
+ 1,0,0,0,973,974,6,90,16,0,974,196,1,0,0,0,975,976,3,337,161,0,976,977,1,
+ 0,0,0,977,978,6,91,17,0,978,198,1,0,0,0,979,980,3,101,43,0,980,981,1,0,
+ 0,0,981,982,6,92,18,0,982,200,1,0,0,0,983,984,3,97,41,0,984,985,1,0,0,0,
+ 985,986,6,93,19,0,986,202,1,0,0,0,987,988,7,16,0,0,988,989,7,3,0,0,989,
+ 990,7,5,0,0,990,991,7,12,0,0,991,992,7,0,0,0,992,993,7,12,0,0,993,994,7,
+ 5,0,0,994,995,7,12,0,0,995,204,1,0,0,0,996,1000,8,32,0,0,997,998,5,47,0,
+ 0,998,1000,8,33,0,0,999,996,1,0,0,0,999,997,1,0,0,0,1000,206,1,0,0,0,1001,
+ 1003,3,205,95,0,1002,1001,1,0,0,0,1003,1004,1,0,0,0,1004,1002,1,0,0,0,1004,
+ 1005,1,0,0,0,1005,208,1,0,0,0,1006,1007,3,207,96,0,1007,1008,1,0,0,0,1008,
+ 1009,6,97,20,0,1009,210,1,0,0,0,1010,1011,3,85,35,0,1011,1012,1,0,0,0,1012,
+ 1013,6,98,21,0,1013,212,1,0,0,0,1014,1015,3,57,21,0,1015,1016,1,0,0,0,1016,
+ 1017,6,99,10,0,1017,214,1,0,0,0,1018,1019,3,59,22,0,1019,1020,1,0,0,0,1020,
+ 1021,6,100,10,0,1021,216,1,0,0,0,1022,1023,3,61,23,0,1023,1024,1,0,0,0,
+ 1024,1025,6,101,10,0,1025,218,1,0,0,0,1026,1027,3,63,24,0,1027,1028,1,0,
+ 0,0,1028,1029,6,102,15,0,1029,1030,6,102,11,0,1030,220,1,0,0,0,1031,1032,
+ 3,105,45,0,1032,1033,1,0,0,0,1033,1034,6,103,22,0,1034,222,1,0,0,0,1035,
+ 1036,3,101,43,0,1036,1037,1,0,0,0,1037,1038,6,104,18,0,1038,224,1,0,0,0,
+ 1039,1040,3,129,57,0,1040,1041,1,0,0,0,1041,1042,6,105,23,0,1042,226,1,
+ 0,0,0,1043,1044,3,163,74,0,1044,1045,1,0,0,0,1045,1046,6,106,24,0,1046,
+ 228,1,0,0,0,1047,1052,3,67,26,0,1048,1052,3,65,25,0,1049,1052,3,81,33,0,
+ 1050,1052,3,155,70,0,1051,1047,1,0,0,0,1051,1048,1,0,0,0,1051,1049,1,0,
+ 0,0,1051,1050,1,0,0,0,1052,230,1,0,0,0,1053,1056,3,67,26,0,1054,1056,3,
+ 155,70,0,1055,1053,1,0,0,0,1055,1054,1,0,0,0,1056,1060,1,0,0,0,1057,1059,
+ 3,229,107,0,1058,1057,1,0,0,0,1059,1062,1,0,0,0,1060,1058,1,0,0,0,1060,
+ 1061,1,0,0,0,1061,1073,1,0,0,0,1062,1060,1,0,0,0,1063,1066,3,81,33,0,1064,
+ 1066,3,75,30,0,1065,1063,1,0,0,0,1065,1064,1,0,0,0,1066,1068,1,0,0,0,1067,
+ 1069,3,229,107,0,1068,1067,1,0,0,0,1069,1070,1,0,0,0,1070,1068,1,0,0,0,
+ 1070,1071,1,0,0,0,1071,1073,1,0,0,0,1072,1055,1,0,0,0,1072,1065,1,0,0,0,
+ 1073,232,1,0,0,0,1074,1077,3,231,108,0,1075,1077,3,171,78,0,1076,1074,1,
+ 0,0,0,1076,1075,1,0,0,0,1077,1078,1,0,0,0,1078,1076,1,0,0,0,1078,1079,1,
+ 0,0,0,1079,234,1,0,0,0,1080,1081,3,57,21,0,1081,1082,1,0,0,0,1082,1083,
+ 6,110,10,0,1083,236,1,0,0,0,1084,1085,3,59,22,0,1085,1086,1,0,0,0,1086,
+ 1087,6,111,10,0,1087,238,1,0,0,0,1088,1089,3,61,23,0,1089,1090,1,0,0,0,
+ 1090,1091,6,112,10,0,1091,240,1,0,0,0,1092,1093,3,63,24,0,1093,1094,1,0,
+ 0,0,1094,1095,6,113,15,0,1095,1096,6,113,11,0,1096,242,1,0,0,0,1097,1098,
+ 3,97,41,0,1098,1099,1,0,0,0,1099,1100,6,114,19,0,1100,244,1,0,0,0,1101,
+ 1102,3,101,43,0,1102,1103,1,0,0,0,1103,1104,6,115,18,0,1104,246,1,0,0,0,
+ 1105,1106,3,105,45,0,1106,1107,1,0,0,0,1107,1108,6,116,22,0,1108,248,1,
+ 0,0,0,1109,1110,3,129,57,0,1110,1111,1,0,0,0,1111,1112,6,117,23,0,1112,
+ 250,1,0,0,0,1113,1114,3,163,74,0,1114,1115,1,0,0,0,1115,1116,6,118,24,0,
+ 1116,252,1,0,0,0,1117,1118,7,12,0,0,1118,1119,7,2,0,0,1119,254,1,0,0,0,
+ 1120,1121,3,233,109,0,1121,1122,1,0,0,0,1122,1123,6,120,25,0,1123,256,1,
+ 0,0,0,1124,1125,3,57,21,0,1125,1126,1,0,0,0,1126,1127,6,121,10,0,1127,258,
+ 1,0,0,0,1128,1129,3,59,22,0,1129,1130,1,0,0,0,1130,1131,6,122,10,0,1131,
+ 260,1,0,0,0,1132,1133,3,61,23,0,1133,1134,1,0,0,0,1134,1135,6,123,10,0,
+ 1135,262,1,0,0,0,1136,1137,3,63,24,0,1137,1138,1,0,0,0,1138,1139,6,124,
+ 15,0,1139,1140,6,124,11,0,1140,264,1,0,0,0,1141,1142,3,165,75,0,1142,1143,
+ 1,0,0,0,1143,1144,6,125,13,0,1144,1145,6,125,26,0,1145,266,1,0,0,0,1146,
+ 1147,7,7,0,0,1147,1148,7,9,0,0,1148,1149,1,0,0,0,1149,1150,6,126,27,0,1150,
+ 268,1,0,0,0,1151,1152,7,19,0,0,1152,1153,7,1,0,0,1153,1154,7,5,0,0,1154,
+ 1155,7,10,0,0,1155,1156,1,0,0,0,1156,1157,6,127,27,0,1157,270,1,0,0,0,1158,
+ 1159,8,34,0,0,1159,272,1,0,0,0,1160,1162,3,271,128,0,1161,1160,1,0,0,0,
+ 1162,1163,1,0,0,0,1163,1161,1,0,0,0,1163,1164,1,0,0,0,1164,1165,1,0,0,0,
+ 1165,1166,3,337,161,0,1166,1168,1,0,0,0,1167,1161,1,0,0,0,1167,1168,1,0,
+ 0,0,1168,1170,1,0,0,0,1169,1171,3,271,128,0,1170,1169,1,0,0,0,1171,1172,
+ 1,0,0,0,1172,1170,1,0,0,0,1172,1173,1,0,0,0,1173,274,1,0,0,0,1174,1175,
+ 3,273,129,0,1175,1176,1,0,0,0,1176,1177,6,130,28,0,1177,276,1,0,0,0,1178,
+ 1179,3,57,21,0,1179,1180,1,0,0,0,1180,1181,6,131,10,0,1181,278,1,0,0,0,
+ 1182,1183,3,59,22,0,1183,1184,1,0,0,0,1184,1185,6,132,10,0,1185,280,1,0,
+ 0,0,1186,1187,3,61,23,0,1187,1188,1,0,0,0,1188,1189,6,133,10,0,1189,282,
+ 1,0,0,0,1190,1191,3,63,24,0,1191,1192,1,0,0,0,1192,1193,6,134,15,0,1193,
+ 1194,6,134,11,0,1194,1195,6,134,11,0,1195,284,1,0,0,0,1196,1197,3,97,41,
+ 0,1197,1198,1,0,0,0,1198,1199,6,135,19,0,1199,286,1,0,0,0,1200,1201,3,101,
+ 43,0,1201,1202,1,0,0,0,1202,1203,6,136,18,0,1203,288,1,0,0,0,1204,1205,
+ 3,105,45,0,1205,1206,1,0,0,0,1206,1207,6,137,22,0,1207,290,1,0,0,0,1208,
+ 1209,3,269,127,0,1209,1210,1,0,0,0,1210,1211,6,138,29,0,1211,292,1,0,0,
+ 0,1212,1213,3,233,109,0,1213,1214,1,0,0,0,1214,1215,6,139,25,0,1215,294,
+ 1,0,0,0,1216,1217,3,173,79,0,1217,1218,1,0,0,0,1218,1219,6,140,30,0,1219,
+ 296,1,0,0,0,1220,1221,3,129,57,0,1221,1222,1,0,0,0,1222,1223,6,141,23,0,
+ 1223,298,1,0,0,0,1224,1225,3,163,74,0,1225,1226,1,0,0,0,1226,1227,6,142,
+ 24,0,1227,300,1,0,0,0,1228,1229,3,57,21,0,1229,1230,1,0,0,0,1230,1231,6,
+ 143,10,0,1231,302,1,0,0,0,1232,1233,3,59,22,0,1233,1234,1,0,0,0,1234,1235,
+ 6,144,10,0,1235,304,1,0,0,0,1236,1237,3,61,23,0,1237,1238,1,0,0,0,1238,
+ 1239,6,145,10,0,1239,306,1,0,0,0,1240,1241,3,63,24,0,1241,1242,1,0,0,0,
+ 1242,1243,6,146,15,0,1243,1244,6,146,11,0,1244,308,1,0,0,0,1245,1246,3,
+ 105,45,0,1246,1247,1,0,0,0,1247,1248,6,147,22,0,1248,310,1,0,0,0,1249,1250,
+ 3,129,57,0,1250,1251,1,0,0,0,1251,1252,6,148,23,0,1252,312,1,0,0,0,1253,
+ 1254,3,163,74,0,1254,1255,1,0,0,0,1255,1256,6,149,24,0,1256,314,1,0,0,0,
+ 1257,1258,3,173,79,0,1258,1259,1,0,0,0,1259,1260,6,150,30,0,1260,316,1,
+ 0,0,0,1261,1262,3,169,77,0,1262,1263,1,0,0,0,1263,1264,6,151,31,0,1264,
+ 318,1,0,0,0,1265,1266,3,57,21,0,1266,1267,1,0,0,0,1267,1268,6,152,10,0,
+ 1268,320,1,0,0,0,1269,1270,3,59,22,0,1270,1271,1,0,0,0,1271,1272,6,153,
+ 10,0,1272,322,1,0,0,0,1273,1274,3,61,23,0,1274,1275,1,0,0,0,1275,1276,6,
+ 154,10,0,1276,324,1,0,0,0,1277,1278,3,63,24,0,1278,1279,1,0,0,0,1279,1280,
+ 6,155,15,0,1280,1281,6,155,11,0,1281,326,1,0,0,0,1282,1283,7,1,0,0,1283,
+ 1284,7,9,0,0,1284,1285,7,15,0,0,1285,1286,7,7,0,0,1286,328,1,0,0,0,1287,
+ 1288,3,57,21,0,1288,1289,1,0,0,0,1289,1290,6,157,10,0,1290,330,1,0,0,0,
+ 1291,1292,3,59,22,0,1292,1293,1,0,0,0,1293,1294,6,158,10,0,1294,332,1,0,
+ 0,0,1295,1296,3,61,23,0,1296,1297,1,0,0,0,1297,1298,6,159,10,0,1298,334,
+ 1,0,0,0,1299,1300,3,167,76,0,1300,1301,1,0,0,0,1301,1302,6,160,16,0,1302,
+ 1303,6,160,11,0,1303,336,1,0,0,0,1304,1305,5,58,0,0,1305,338,1,0,0,0,1306,
+ 1312,3,75,30,0,1307,1312,3,65,25,0,1308,1312,3,105,45,0,1309,1312,3,67,
+ 26,0,1310,1312,3,81,33,0,1311,1306,1,0,0,0,1311,1307,1,0,0,0,1311,1308,
+ 1,0,0,0,1311,1309,1,0,0,0,1311,1310,1,0,0,0,1312,1313,1,0,0,0,1313,1311,
+ 1,0,0,0,1313,1314,1,0,0,0,1314,340,1,0,0,0,1315,1316,3,57,21,0,1316,1317,
+ 1,0,0,0,1317,1318,6,163,10,0,1318,342,1,0,0,0,1319,1320,3,59,22,0,1320,
+ 1321,1,0,0,0,1321,1322,6,164,10,0,1322,344,1,0,0,0,1323,1324,3,61,23,0,
+ 1324,1325,1,0,0,0,1325,1326,6,165,10,0,1326,346,1,0,0,0,1327,1328,3,63,
+ 24,0,1328,1329,1,0,0,0,1329,1330,6,166,15,0,1330,1331,6,166,11,0,1331,348,
+ 1,0,0,0,1332,1333,3,337,161,0,1333,1334,1,0,0,0,1334,1335,6,167,17,0,1335,
+ 350,1,0,0,0,1336,1337,3,101,43,0,1337,1338,1,0,0,0,1338,1339,6,168,18,0,
+ 1339,352,1,0,0,0,1340,1341,3,105,45,0,1341,1342,1,0,0,0,1342,1343,6,169,
+ 22,0,1343,354,1,0,0,0,1344,1345,3,267,126,0,1345,1346,1,0,0,0,1346,1347,
+ 6,170,32,0,1347,1348,6,170,33,0,1348,356,1,0,0,0,1349,1350,3,207,96,0,1350,
+ 1351,1,0,0,0,1351,1352,6,171,20,0,1352,358,1,0,0,0,1353,1354,3,85,35,0,
+ 1354,1355,1,0,0,0,1355,1356,6,172,21,0,1356,360,1,0,0,0,1357,1358,3,57,
+ 21,0,1358,1359,1,0,0,0,1359,1360,6,173,10,0,1360,362,1,0,0,0,1361,1362,
+ 3,59,22,0,1362,1363,1,0,0,0,1363,1364,6,174,10,0,1364,364,1,0,0,0,1365,
+ 1366,3,61,23,0,1366,1367,1,0,0,0,1367,1368,6,175,10,0,1368,366,1,0,0,0,
+ 1369,1370,3,63,24,0,1370,1371,1,0,0,0,1371,1372,6,176,15,0,1372,1373,6,
+ 176,11,0,1373,1374,6,176,11,0,1374,368,1,0,0,0,1375,1376,3,101,43,0,1376,
+ 1377,1,0,0,0,1377,1378,6,177,18,0,1378,370,1,0,0,0,1379,1380,3,105,45,0,
+ 1380,1381,1,0,0,0,1381,1382,6,178,22,0,1382,372,1,0,0,0,1383,1384,3,233,
+ 109,0,1384,1385,1,0,0,0,1385,1386,6,179,25,0,1386,374,1,0,0,0,1387,1388,
+ 3,57,21,0,1388,1389,1,0,0,0,1389,1390,6,180,10,0,1390,376,1,0,0,0,1391,
+ 1392,3,59,22,0,1392,1393,1,0,0,0,1393,1394,6,181,10,0,1394,378,1,0,0,0,
+ 1395,1396,3,61,23,0,1396,1397,1,0,0,0,1397,1398,6,182,10,0,1398,380,1,0,
+ 0,0,1399,1400,3,63,24,0,1400,1401,1,0,0,0,1401,1402,6,183,15,0,1402,1403,
+ 6,183,11,0,1403,382,1,0,0,0,1404,1405,3,207,96,0,1405,1406,1,0,0,0,1406,
+ 1407,6,184,20,0,1407,1408,6,184,11,0,1408,1409,6,184,34,0,1409,384,1,0,
+ 0,0,1410,1411,3,85,35,0,1411,1412,1,0,0,0,1412,1413,6,185,21,0,1413,1414,
+ 6,185,11,0,1414,1415,6,185,34,0,1415,386,1,0,0,0,1416,1417,3,57,21,0,1417,
+ 1418,1,0,0,0,1418,1419,6,186,10,0,1419,388,1,0,0,0,1420,1421,3,59,22,0,
+ 1421,1422,1,0,0,0,1422,1423,6,187,10,0,1423,390,1,0,0,0,1424,1425,3,61,
+ 23,0,1425,1426,1,0,0,0,1426,1427,6,188,10,0,1427,392,1,0,0,0,1428,1429,
+ 3,337,161,0,1429,1430,1,0,0,0,1430,1431,6,189,17,0,1431,1432,6,189,11,0,
+ 1432,1433,6,189,9,0,1433,394,1,0,0,0,1434,1435,3,101,43,0,1435,1436,1,0,
+ 0,0,1436,1437,6,190,18,0,1437,1438,6,190,11,0,1438,1439,6,190,9,0,1439,
+ 396,1,0,0,0,1440,1441,3,57,21,0,1441,1442,1,0,0,0,1442,1443,6,191,10,0,
+ 1443,398,1,0,0,0,1444,1445,3,59,22,0,1445,1446,1,0,0,0,1446,1447,6,192,
+ 10,0,1447,400,1,0,0,0,1448,1449,3,61,23,0,1449,1450,1,0,0,0,1450,1451,6,
+ 193,10,0,1451,402,1,0,0,0,1452,1453,3,173,79,0,1453,1454,1,0,0,0,1454,1455,
+ 6,194,11,0,1455,1456,6,194,0,0,1456,1457,6,194,30,0,1457,404,1,0,0,0,1458,
+ 1459,3,169,77,0,1459,1460,1,0,0,0,1460,1461,6,195,11,0,1461,1462,6,195,
+ 0,0,1462,1463,6,195,31,0,1463,406,1,0,0,0,1464,1465,3,91,38,0,1465,1466,
+ 1,0,0,0,1466,1467,6,196,11,0,1467,1468,6,196,0,0,1468,1469,6,196,35,0,1469,
+ 408,1,0,0,0,1470,1471,3,63,24,0,1471,1472,1,0,0,0,1472,1473,6,197,15,0,
+ 1473,1474,6,197,11,0,1474,410,1,0,0,0,65,0,1,2,3,4,5,6,7,8,9,10,11,12,13,
+ 14,588,598,602,605,614,616,627,646,651,660,667,672,674,685,693,696,698,
+ 703,708,714,721,726,732,735,743,747,874,879,886,888,904,909,914,916,922,
+ 999,1004,1051,1055,1060,1065,1070,1072,1076,1078,1163,1167,1172,1311,1313,
+ 36,5,1,0,5,4,0,5,6,0,5,2,0,5,3,0,5,8,0,5,5,0,5,9,0,5,11,0,5,13,0,0,1,0,
+ 4,0,0,7,19,0,7,65,0,5,0,0,7,25,0,7,66,0,7,104,0,7,34,0,7,32,0,7,76,0,7,
+ 26,0,7,36,0,7,48,0,7,64,0,7,80,0,5,10,0,5,7,0,7,90,0,7,89,0,7,68,0,7,67,
+ 0,7,88,0,5,12,0,5,14,0,7,29,0];
private static __ATN: ATN;
public static get _ATN(): ATN {
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.g4 b/packages/kbn-esql-ast/src/antlr/esql_parser.g4
index 9fbfefb0a7c7..9d52d84dcc58 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.g4
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.g4
@@ -34,7 +34,6 @@ query
sourceCommand
: explainCommand
| fromCommand
- | metaCommand
| rowCommand
| showCommand
// in development
@@ -104,7 +103,7 @@ primaryExpression
;
functionExpression
- : identifier LP (ASTERISK | (booleanExpression (COMMA booleanExpression)*))? RP
+ : identifierOrParameter LP (ASTERISK | (booleanExpression (COMMA booleanExpression)*))? RP
;
dataType
@@ -168,7 +167,7 @@ statsCommand
;
qualifiedName
- : identifier (DOT identifier)*
+ : identifierOrParameter (DOT identifierOrParameter)*
;
qualifiedNamePattern
@@ -186,6 +185,7 @@ identifier
identifierPattern
: ID_PATTERN
+ | parameter
;
constant
@@ -194,18 +194,23 @@ constant
| decimalValue #decimalLiteral
| integerValue #integerLiteral
| booleanValue #booleanLiteral
- | params #inputParams
+ | parameter #inputParameter
| string #stringLiteral
| OPENING_BRACKET numericValue (COMMA numericValue)* CLOSING_BRACKET #numericArrayLiteral
| OPENING_BRACKET booleanValue (COMMA booleanValue)* CLOSING_BRACKET #booleanArrayLiteral
| OPENING_BRACKET string (COMMA string)* CLOSING_BRACKET #stringArrayLiteral
;
-params
+parameter
: PARAM #inputParam
| NAMED_OR_POSITIONAL_PARAM #inputNamedOrPositionalParam
;
+identifierOrParameter
+ : identifier
+ | parameter
+ ;
+
limitCommand
: LIMIT INTEGER_LITERAL
;
@@ -291,10 +296,6 @@ showCommand
: SHOW INFO #showInfo
;
-metaCommand
- : META FUNCTIONS #metaFunctions
- ;
-
enrichCommand
: ENRICH policyName=ENRICH_POLICY_NAME (ON matchField=qualifiedNamePattern)? (WITH enrichWithClause (COMMA enrichWithClause)*)?
;
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.interp b/packages/kbn-esql-ast/src/antlr/esql_parser.interp
index f7eed3e9be79..eb3c70385d62 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.interp
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.interp
@@ -9,7 +9,6 @@ null
'grok'
'keep'
'limit'
-'meta'
'mv_expand'
'rename'
'row'
@@ -104,10 +103,6 @@ null
null
null
null
-'functions'
-null
-null
-null
':'
null
null
@@ -137,7 +132,6 @@ FROM
GROK
KEEP
LIMIT
-META
MV_EXPAND
RENAME
ROW
@@ -232,10 +226,6 @@ INFO
SHOW_LINE_COMMENT
SHOW_MULTILINE_COMMENT
SHOW_WS
-FUNCTIONS
-META_LINE_COMMENT
-META_MULTILINE_COMMENT
-META_WS
COLON
SETTING
SETTING_LINE_COMMENT
@@ -287,7 +277,8 @@ qualifiedNamePatterns
identifier
identifierPattern
constant
-params
+parameter
+identifierOrParameter
limitCommand
sortCommand
orderExpression
@@ -309,7 +300,6 @@ comparisonOperator
explainCommand
subqueryExpression
showCommand
-metaCommand
enrichCommand
enrichWithClause
lookupCommand
@@ -317,4 +307,4 @@ inlinestatsCommand
atn:
-[4, 1, 125, 578, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 128, 8, 1, 10, 1, 12, 1, 131, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 140, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 158, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 170, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 177, 8, 5, 10, 5, 12, 5, 180, 9, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 187, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 193, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 201, 8, 5, 10, 5, 12, 5, 204, 9, 5, 1, 6, 1, 6, 3, 6, 208, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 215, 8, 6, 1, 6, 1, 6, 1, 6, 3, 6, 220, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 231, 8, 8, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 237, 8, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 5, 9, 245, 8, 9, 10, 9, 12, 9, 248, 9, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 258, 8, 10, 1, 10, 1, 10, 1, 10, 5, 10, 263, 8, 10, 10, 10, 12, 10, 266, 9, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 5, 11, 274, 8, 11, 10, 11, 12, 11, 277, 9, 11, 3, 11, 279, 8, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 5, 14, 291, 8, 14, 10, 14, 12, 14, 294, 9, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 301, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 307, 8, 16, 10, 16, 12, 16, 310, 9, 16, 1, 16, 3, 16, 313, 8, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 3, 17, 320, 8, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 328, 8, 20, 1, 21, 1, 21, 1, 21, 1, 21, 5, 21, 334, 8, 21, 10, 21, 12, 21, 337, 9, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 5, 23, 347, 8, 23, 10, 23, 12, 23, 350, 9, 23, 1, 23, 3, 23, 353, 8, 23, 1, 23, 1, 23, 3, 23, 357, 8, 23, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 3, 25, 364, 8, 25, 1, 25, 1, 25, 3, 25, 368, 8, 25, 1, 26, 1, 26, 1, 26, 5, 26, 373, 8, 26, 10, 26, 12, 26, 376, 9, 26, 1, 27, 1, 27, 1, 27, 5, 27, 381, 8, 27, 10, 27, 12, 27, 384, 9, 27, 1, 28, 1, 28, 1, 28, 5, 28, 389, 8, 28, 10, 28, 12, 28, 392, 9, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 411, 8, 31, 10, 31, 12, 31, 414, 9, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 422, 8, 31, 10, 31, 12, 31, 425, 9, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 433, 8, 31, 10, 31, 12, 31, 436, 9, 31, 1, 31, 1, 31, 3, 31, 440, 8, 31, 1, 32, 1, 32, 3, 32, 444, 8, 32, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 5, 34, 453, 8, 34, 10, 34, 12, 34, 456, 9, 34, 1, 35, 1, 35, 3, 35, 460, 8, 35, 1, 35, 1, 35, 3, 35, 464, 8, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 5, 38, 476, 8, 38, 10, 38, 12, 38, 479, 9, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 3, 40, 489, 8, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 5, 43, 501, 8, 43, 10, 43, 12, 43, 504, 9, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 3, 46, 514, 8, 46, 1, 47, 3, 47, 517, 8, 47, 1, 47, 1, 47, 1, 48, 3, 48, 522, 8, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 3, 55, 547, 8, 55, 1, 55, 1, 55, 1, 55, 1, 55, 5, 55, 553, 8, 55, 10, 55, 12, 55, 556, 9, 55, 3, 55, 558, 8, 55, 1, 56, 1, 56, 1, 56, 3, 56, 563, 8, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 58, 3, 58, 576, 8, 58, 1, 58, 0, 4, 2, 10, 18, 20, 59, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 0, 8, 1, 0, 60, 61, 1, 0, 62, 64, 2, 0, 27, 27, 77, 77, 1, 0, 68, 69, 2, 0, 32, 32, 36, 36, 2, 0, 39, 39, 42, 42, 2, 0, 38, 38, 52, 52, 2, 0, 53, 53, 55, 59, 603, 0, 118, 1, 0, 0, 0, 2, 121, 1, 0, 0, 0, 4, 139, 1, 0, 0, 0, 6, 157, 1, 0, 0, 0, 8, 159, 1, 0, 0, 0, 10, 192, 1, 0, 0, 0, 12, 219, 1, 0, 0, 0, 14, 221, 1, 0, 0, 0, 16, 230, 1, 0, 0, 0, 18, 236, 1, 0, 0, 0, 20, 257, 1, 0, 0, 0, 22, 267, 1, 0, 0, 0, 24, 282, 1, 0, 0, 0, 26, 284, 1, 0, 0, 0, 28, 287, 1, 0, 0, 0, 30, 300, 1, 0, 0, 0, 32, 302, 1, 0, 0, 0, 34, 319, 1, 0, 0, 0, 36, 321, 1, 0, 0, 0, 38, 323, 1, 0, 0, 0, 40, 327, 1, 0, 0, 0, 42, 329, 1, 0, 0, 0, 44, 338, 1, 0, 0, 0, 46, 342, 1, 0, 0, 0, 48, 358, 1, 0, 0, 0, 50, 361, 1, 0, 0, 0, 52, 369, 1, 0, 0, 0, 54, 377, 1, 0, 0, 0, 56, 385, 1, 0, 0, 0, 58, 393, 1, 0, 0, 0, 60, 395, 1, 0, 0, 0, 62, 439, 1, 0, 0, 0, 64, 443, 1, 0, 0, 0, 66, 445, 1, 0, 0, 0, 68, 448, 1, 0, 0, 0, 70, 457, 1, 0, 0, 0, 72, 465, 1, 0, 0, 0, 74, 468, 1, 0, 0, 0, 76, 471, 1, 0, 0, 0, 78, 480, 1, 0, 0, 0, 80, 484, 1, 0, 0, 0, 82, 490, 1, 0, 0, 0, 84, 494, 1, 0, 0, 0, 86, 497, 1, 0, 0, 0, 88, 505, 1, 0, 0, 0, 90, 509, 1, 0, 0, 0, 92, 513, 1, 0, 0, 0, 94, 516, 1, 0, 0, 0, 96, 521, 1, 0, 0, 0, 98, 525, 1, 0, 0, 0, 100, 527, 1, 0, 0, 0, 102, 529, 1, 0, 0, 0, 104, 532, 1, 0, 0, 0, 106, 536, 1, 0, 0, 0, 108, 539, 1, 0, 0, 0, 110, 542, 1, 0, 0, 0, 112, 562, 1, 0, 0, 0, 114, 566, 1, 0, 0, 0, 116, 571, 1, 0, 0, 0, 118, 119, 3, 2, 1, 0, 119, 120, 5, 0, 0, 1, 120, 1, 1, 0, 0, 0, 121, 122, 6, 1, -1, 0, 122, 123, 3, 4, 2, 0, 123, 129, 1, 0, 0, 0, 124, 125, 10, 1, 0, 0, 125, 126, 5, 26, 0, 0, 126, 128, 3, 6, 3, 0, 127, 124, 1, 0, 0, 0, 128, 131, 1, 0, 0, 0, 129, 127, 1, 0, 0, 0, 129, 130, 1, 0, 0, 0, 130, 3, 1, 0, 0, 0, 131, 129, 1, 0, 0, 0, 132, 140, 3, 102, 51, 0, 133, 140, 3, 32, 16, 0, 134, 140, 3, 108, 54, 0, 135, 140, 3, 26, 13, 0, 136, 140, 3, 106, 53, 0, 137, 138, 4, 2, 1, 0, 138, 140, 3, 46, 23, 0, 139, 132, 1, 0, 0, 0, 139, 133, 1, 0, 0, 0, 139, 134, 1, 0, 0, 0, 139, 135, 1, 0, 0, 0, 139, 136, 1, 0, 0, 0, 139, 137, 1, 0, 0, 0, 140, 5, 1, 0, 0, 0, 141, 158, 3, 48, 24, 0, 142, 158, 3, 8, 4, 0, 143, 158, 3, 72, 36, 0, 144, 158, 3, 66, 33, 0, 145, 158, 3, 50, 25, 0, 146, 158, 3, 68, 34, 0, 147, 158, 3, 74, 37, 0, 148, 158, 3, 76, 38, 0, 149, 158, 3, 80, 40, 0, 150, 158, 3, 82, 41, 0, 151, 158, 3, 110, 55, 0, 152, 158, 3, 84, 42, 0, 153, 154, 4, 3, 2, 0, 154, 158, 3, 116, 58, 0, 155, 156, 4, 3, 3, 0, 156, 158, 3, 114, 57, 0, 157, 141, 1, 0, 0, 0, 157, 142, 1, 0, 0, 0, 157, 143, 1, 0, 0, 0, 157, 144, 1, 0, 0, 0, 157, 145, 1, 0, 0, 0, 157, 146, 1, 0, 0, 0, 157, 147, 1, 0, 0, 0, 157, 148, 1, 0, 0, 0, 157, 149, 1, 0, 0, 0, 157, 150, 1, 0, 0, 0, 157, 151, 1, 0, 0, 0, 157, 152, 1, 0, 0, 0, 157, 153, 1, 0, 0, 0, 157, 155, 1, 0, 0, 0, 158, 7, 1, 0, 0, 0, 159, 160, 5, 17, 0, 0, 160, 161, 3, 10, 5, 0, 161, 9, 1, 0, 0, 0, 162, 163, 6, 5, -1, 0, 163, 164, 5, 45, 0, 0, 164, 193, 3, 10, 5, 8, 165, 193, 3, 16, 8, 0, 166, 193, 3, 12, 6, 0, 167, 169, 3, 16, 8, 0, 168, 170, 5, 45, 0, 0, 169, 168, 1, 0, 0, 0, 169, 170, 1, 0, 0, 0, 170, 171, 1, 0, 0, 0, 171, 172, 5, 40, 0, 0, 172, 173, 5, 44, 0, 0, 173, 178, 3, 16, 8, 0, 174, 175, 5, 35, 0, 0, 175, 177, 3, 16, 8, 0, 176, 174, 1, 0, 0, 0, 177, 180, 1, 0, 0, 0, 178, 176, 1, 0, 0, 0, 178, 179, 1, 0, 0, 0, 179, 181, 1, 0, 0, 0, 180, 178, 1, 0, 0, 0, 181, 182, 5, 51, 0, 0, 182, 193, 1, 0, 0, 0, 183, 184, 3, 16, 8, 0, 184, 186, 5, 41, 0, 0, 185, 187, 5, 45, 0, 0, 186, 185, 1, 0, 0, 0, 186, 187, 1, 0, 0, 0, 187, 188, 1, 0, 0, 0, 188, 189, 5, 46, 0, 0, 189, 193, 1, 0, 0, 0, 190, 191, 4, 5, 4, 0, 191, 193, 3, 14, 7, 0, 192, 162, 1, 0, 0, 0, 192, 165, 1, 0, 0, 0, 192, 166, 1, 0, 0, 0, 192, 167, 1, 0, 0, 0, 192, 183, 1, 0, 0, 0, 192, 190, 1, 0, 0, 0, 193, 202, 1, 0, 0, 0, 194, 195, 10, 5, 0, 0, 195, 196, 5, 31, 0, 0, 196, 201, 3, 10, 5, 6, 197, 198, 10, 4, 0, 0, 198, 199, 5, 48, 0, 0, 199, 201, 3, 10, 5, 5, 200, 194, 1, 0, 0, 0, 200, 197, 1, 0, 0, 0, 201, 204, 1, 0, 0, 0, 202, 200, 1, 0, 0, 0, 202, 203, 1, 0, 0, 0, 203, 11, 1, 0, 0, 0, 204, 202, 1, 0, 0, 0, 205, 207, 3, 16, 8, 0, 206, 208, 5, 45, 0, 0, 207, 206, 1, 0, 0, 0, 207, 208, 1, 0, 0, 0, 208, 209, 1, 0, 0, 0, 209, 210, 5, 43, 0, 0, 210, 211, 3, 98, 49, 0, 211, 220, 1, 0, 0, 0, 212, 214, 3, 16, 8, 0, 213, 215, 5, 45, 0, 0, 214, 213, 1, 0, 0, 0, 214, 215, 1, 0, 0, 0, 215, 216, 1, 0, 0, 0, 216, 217, 5, 50, 0, 0, 217, 218, 3, 98, 49, 0, 218, 220, 1, 0, 0, 0, 219, 205, 1, 0, 0, 0, 219, 212, 1, 0, 0, 0, 220, 13, 1, 0, 0, 0, 221, 222, 3, 16, 8, 0, 222, 223, 5, 20, 0, 0, 223, 224, 3, 98, 49, 0, 224, 15, 1, 0, 0, 0, 225, 231, 3, 18, 9, 0, 226, 227, 3, 18, 9, 0, 227, 228, 3, 100, 50, 0, 228, 229, 3, 18, 9, 0, 229, 231, 1, 0, 0, 0, 230, 225, 1, 0, 0, 0, 230, 226, 1, 0, 0, 0, 231, 17, 1, 0, 0, 0, 232, 233, 6, 9, -1, 0, 233, 237, 3, 20, 10, 0, 234, 235, 7, 0, 0, 0, 235, 237, 3, 18, 9, 3, 236, 232, 1, 0, 0, 0, 236, 234, 1, 0, 0, 0, 237, 246, 1, 0, 0, 0, 238, 239, 10, 2, 0, 0, 239, 240, 7, 1, 0, 0, 240, 245, 3, 18, 9, 3, 241, 242, 10, 1, 0, 0, 242, 243, 7, 0, 0, 0, 243, 245, 3, 18, 9, 2, 244, 238, 1, 0, 0, 0, 244, 241, 1, 0, 0, 0, 245, 248, 1, 0, 0, 0, 246, 244, 1, 0, 0, 0, 246, 247, 1, 0, 0, 0, 247, 19, 1, 0, 0, 0, 248, 246, 1, 0, 0, 0, 249, 250, 6, 10, -1, 0, 250, 258, 3, 62, 31, 0, 251, 258, 3, 52, 26, 0, 252, 258, 3, 22, 11, 0, 253, 254, 5, 44, 0, 0, 254, 255, 3, 10, 5, 0, 255, 256, 5, 51, 0, 0, 256, 258, 1, 0, 0, 0, 257, 249, 1, 0, 0, 0, 257, 251, 1, 0, 0, 0, 257, 252, 1, 0, 0, 0, 257, 253, 1, 0, 0, 0, 258, 264, 1, 0, 0, 0, 259, 260, 10, 1, 0, 0, 260, 261, 5, 34, 0, 0, 261, 263, 3, 24, 12, 0, 262, 259, 1, 0, 0, 0, 263, 266, 1, 0, 0, 0, 264, 262, 1, 0, 0, 0, 264, 265, 1, 0, 0, 0, 265, 21, 1, 0, 0, 0, 266, 264, 1, 0, 0, 0, 267, 268, 3, 58, 29, 0, 268, 278, 5, 44, 0, 0, 269, 279, 5, 62, 0, 0, 270, 275, 3, 10, 5, 0, 271, 272, 5, 35, 0, 0, 272, 274, 3, 10, 5, 0, 273, 271, 1, 0, 0, 0, 274, 277, 1, 0, 0, 0, 275, 273, 1, 0, 0, 0, 275, 276, 1, 0, 0, 0, 276, 279, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 278, 269, 1, 0, 0, 0, 278, 270, 1, 0, 0, 0, 278, 279, 1, 0, 0, 0, 279, 280, 1, 0, 0, 0, 280, 281, 5, 51, 0, 0, 281, 23, 1, 0, 0, 0, 282, 283, 3, 58, 29, 0, 283, 25, 1, 0, 0, 0, 284, 285, 5, 13, 0, 0, 285, 286, 3, 28, 14, 0, 286, 27, 1, 0, 0, 0, 287, 292, 3, 30, 15, 0, 288, 289, 5, 35, 0, 0, 289, 291, 3, 30, 15, 0, 290, 288, 1, 0, 0, 0, 291, 294, 1, 0, 0, 0, 292, 290, 1, 0, 0, 0, 292, 293, 1, 0, 0, 0, 293, 29, 1, 0, 0, 0, 294, 292, 1, 0, 0, 0, 295, 301, 3, 10, 5, 0, 296, 297, 3, 52, 26, 0, 297, 298, 5, 33, 0, 0, 298, 299, 3, 10, 5, 0, 299, 301, 1, 0, 0, 0, 300, 295, 1, 0, 0, 0, 300, 296, 1, 0, 0, 0, 301, 31, 1, 0, 0, 0, 302, 303, 5, 6, 0, 0, 303, 308, 3, 34, 17, 0, 304, 305, 5, 35, 0, 0, 305, 307, 3, 34, 17, 0, 306, 304, 1, 0, 0, 0, 307, 310, 1, 0, 0, 0, 308, 306, 1, 0, 0, 0, 308, 309, 1, 0, 0, 0, 309, 312, 1, 0, 0, 0, 310, 308, 1, 0, 0, 0, 311, 313, 3, 40, 20, 0, 312, 311, 1, 0, 0, 0, 312, 313, 1, 0, 0, 0, 313, 33, 1, 0, 0, 0, 314, 315, 3, 36, 18, 0, 315, 316, 5, 109, 0, 0, 316, 317, 3, 38, 19, 0, 317, 320, 1, 0, 0, 0, 318, 320, 3, 38, 19, 0, 319, 314, 1, 0, 0, 0, 319, 318, 1, 0, 0, 0, 320, 35, 1, 0, 0, 0, 321, 322, 5, 77, 0, 0, 322, 37, 1, 0, 0, 0, 323, 324, 7, 2, 0, 0, 324, 39, 1, 0, 0, 0, 325, 328, 3, 42, 21, 0, 326, 328, 3, 44, 22, 0, 327, 325, 1, 0, 0, 0, 327, 326, 1, 0, 0, 0, 328, 41, 1, 0, 0, 0, 329, 330, 5, 76, 0, 0, 330, 335, 5, 77, 0, 0, 331, 332, 5, 35, 0, 0, 332, 334, 5, 77, 0, 0, 333, 331, 1, 0, 0, 0, 334, 337, 1, 0, 0, 0, 335, 333, 1, 0, 0, 0, 335, 336, 1, 0, 0, 0, 336, 43, 1, 0, 0, 0, 337, 335, 1, 0, 0, 0, 338, 339, 5, 66, 0, 0, 339, 340, 3, 42, 21, 0, 340, 341, 5, 67, 0, 0, 341, 45, 1, 0, 0, 0, 342, 343, 5, 21, 0, 0, 343, 348, 3, 34, 17, 0, 344, 345, 5, 35, 0, 0, 345, 347, 3, 34, 17, 0, 346, 344, 1, 0, 0, 0, 347, 350, 1, 0, 0, 0, 348, 346, 1, 0, 0, 0, 348, 349, 1, 0, 0, 0, 349, 352, 1, 0, 0, 0, 350, 348, 1, 0, 0, 0, 351, 353, 3, 28, 14, 0, 352, 351, 1, 0, 0, 0, 352, 353, 1, 0, 0, 0, 353, 356, 1, 0, 0, 0, 354, 355, 5, 30, 0, 0, 355, 357, 3, 28, 14, 0, 356, 354, 1, 0, 0, 0, 356, 357, 1, 0, 0, 0, 357, 47, 1, 0, 0, 0, 358, 359, 5, 4, 0, 0, 359, 360, 3, 28, 14, 0, 360, 49, 1, 0, 0, 0, 361, 363, 5, 16, 0, 0, 362, 364, 3, 28, 14, 0, 363, 362, 1, 0, 0, 0, 363, 364, 1, 0, 0, 0, 364, 367, 1, 0, 0, 0, 365, 366, 5, 30, 0, 0, 366, 368, 3, 28, 14, 0, 367, 365, 1, 0, 0, 0, 367, 368, 1, 0, 0, 0, 368, 51, 1, 0, 0, 0, 369, 374, 3, 58, 29, 0, 370, 371, 5, 37, 0, 0, 371, 373, 3, 58, 29, 0, 372, 370, 1, 0, 0, 0, 373, 376, 1, 0, 0, 0, 374, 372, 1, 0, 0, 0, 374, 375, 1, 0, 0, 0, 375, 53, 1, 0, 0, 0, 376, 374, 1, 0, 0, 0, 377, 382, 3, 60, 30, 0, 378, 379, 5, 37, 0, 0, 379, 381, 3, 60, 30, 0, 380, 378, 1, 0, 0, 0, 381, 384, 1, 0, 0, 0, 382, 380, 1, 0, 0, 0, 382, 383, 1, 0, 0, 0, 383, 55, 1, 0, 0, 0, 384, 382, 1, 0, 0, 0, 385, 390, 3, 54, 27, 0, 386, 387, 5, 35, 0, 0, 387, 389, 3, 54, 27, 0, 388, 386, 1, 0, 0, 0, 389, 392, 1, 0, 0, 0, 390, 388, 1, 0, 0, 0, 390, 391, 1, 0, 0, 0, 391, 57, 1, 0, 0, 0, 392, 390, 1, 0, 0, 0, 393, 394, 7, 3, 0, 0, 394, 59, 1, 0, 0, 0, 395, 396, 5, 81, 0, 0, 396, 61, 1, 0, 0, 0, 397, 440, 5, 46, 0, 0, 398, 399, 3, 96, 48, 0, 399, 400, 5, 68, 0, 0, 400, 440, 1, 0, 0, 0, 401, 440, 3, 94, 47, 0, 402, 440, 3, 96, 48, 0, 403, 440, 3, 90, 45, 0, 404, 440, 3, 64, 32, 0, 405, 440, 3, 98, 49, 0, 406, 407, 5, 66, 0, 0, 407, 412, 3, 92, 46, 0, 408, 409, 5, 35, 0, 0, 409, 411, 3, 92, 46, 0, 410, 408, 1, 0, 0, 0, 411, 414, 1, 0, 0, 0, 412, 410, 1, 0, 0, 0, 412, 413, 1, 0, 0, 0, 413, 415, 1, 0, 0, 0, 414, 412, 1, 0, 0, 0, 415, 416, 5, 67, 0, 0, 416, 440, 1, 0, 0, 0, 417, 418, 5, 66, 0, 0, 418, 423, 3, 90, 45, 0, 419, 420, 5, 35, 0, 0, 420, 422, 3, 90, 45, 0, 421, 419, 1, 0, 0, 0, 422, 425, 1, 0, 0, 0, 423, 421, 1, 0, 0, 0, 423, 424, 1, 0, 0, 0, 424, 426, 1, 0, 0, 0, 425, 423, 1, 0, 0, 0, 426, 427, 5, 67, 0, 0, 427, 440, 1, 0, 0, 0, 428, 429, 5, 66, 0, 0, 429, 434, 3, 98, 49, 0, 430, 431, 5, 35, 0, 0, 431, 433, 3, 98, 49, 0, 432, 430, 1, 0, 0, 0, 433, 436, 1, 0, 0, 0, 434, 432, 1, 0, 0, 0, 434, 435, 1, 0, 0, 0, 435, 437, 1, 0, 0, 0, 436, 434, 1, 0, 0, 0, 437, 438, 5, 67, 0, 0, 438, 440, 1, 0, 0, 0, 439, 397, 1, 0, 0, 0, 439, 398, 1, 0, 0, 0, 439, 401, 1, 0, 0, 0, 439, 402, 1, 0, 0, 0, 439, 403, 1, 0, 0, 0, 439, 404, 1, 0, 0, 0, 439, 405, 1, 0, 0, 0, 439, 406, 1, 0, 0, 0, 439, 417, 1, 0, 0, 0, 439, 428, 1, 0, 0, 0, 440, 63, 1, 0, 0, 0, 441, 444, 5, 49, 0, 0, 442, 444, 5, 65, 0, 0, 443, 441, 1, 0, 0, 0, 443, 442, 1, 0, 0, 0, 444, 65, 1, 0, 0, 0, 445, 446, 5, 9, 0, 0, 446, 447, 5, 28, 0, 0, 447, 67, 1, 0, 0, 0, 448, 449, 5, 15, 0, 0, 449, 454, 3, 70, 35, 0, 450, 451, 5, 35, 0, 0, 451, 453, 3, 70, 35, 0, 452, 450, 1, 0, 0, 0, 453, 456, 1, 0, 0, 0, 454, 452, 1, 0, 0, 0, 454, 455, 1, 0, 0, 0, 455, 69, 1, 0, 0, 0, 456, 454, 1, 0, 0, 0, 457, 459, 3, 10, 5, 0, 458, 460, 7, 4, 0, 0, 459, 458, 1, 0, 0, 0, 459, 460, 1, 0, 0, 0, 460, 463, 1, 0, 0, 0, 461, 462, 5, 47, 0, 0, 462, 464, 7, 5, 0, 0, 463, 461, 1, 0, 0, 0, 463, 464, 1, 0, 0, 0, 464, 71, 1, 0, 0, 0, 465, 466, 5, 8, 0, 0, 466, 467, 3, 56, 28, 0, 467, 73, 1, 0, 0, 0, 468, 469, 5, 2, 0, 0, 469, 470, 3, 56, 28, 0, 470, 75, 1, 0, 0, 0, 471, 472, 5, 12, 0, 0, 472, 477, 3, 78, 39, 0, 473, 474, 5, 35, 0, 0, 474, 476, 3, 78, 39, 0, 475, 473, 1, 0, 0, 0, 476, 479, 1, 0, 0, 0, 477, 475, 1, 0, 0, 0, 477, 478, 1, 0, 0, 0, 478, 77, 1, 0, 0, 0, 479, 477, 1, 0, 0, 0, 480, 481, 3, 54, 27, 0, 481, 482, 5, 85, 0, 0, 482, 483, 3, 54, 27, 0, 483, 79, 1, 0, 0, 0, 484, 485, 5, 1, 0, 0, 485, 486, 3, 20, 10, 0, 486, 488, 3, 98, 49, 0, 487, 489, 3, 86, 43, 0, 488, 487, 1, 0, 0, 0, 488, 489, 1, 0, 0, 0, 489, 81, 1, 0, 0, 0, 490, 491, 5, 7, 0, 0, 491, 492, 3, 20, 10, 0, 492, 493, 3, 98, 49, 0, 493, 83, 1, 0, 0, 0, 494, 495, 5, 11, 0, 0, 495, 496, 3, 52, 26, 0, 496, 85, 1, 0, 0, 0, 497, 502, 3, 88, 44, 0, 498, 499, 5, 35, 0, 0, 499, 501, 3, 88, 44, 0, 500, 498, 1, 0, 0, 0, 501, 504, 1, 0, 0, 0, 502, 500, 1, 0, 0, 0, 502, 503, 1, 0, 0, 0, 503, 87, 1, 0, 0, 0, 504, 502, 1, 0, 0, 0, 505, 506, 3, 58, 29, 0, 506, 507, 5, 33, 0, 0, 507, 508, 3, 62, 31, 0, 508, 89, 1, 0, 0, 0, 509, 510, 7, 6, 0, 0, 510, 91, 1, 0, 0, 0, 511, 514, 3, 94, 47, 0, 512, 514, 3, 96, 48, 0, 513, 511, 1, 0, 0, 0, 513, 512, 1, 0, 0, 0, 514, 93, 1, 0, 0, 0, 515, 517, 7, 0, 0, 0, 516, 515, 1, 0, 0, 0, 516, 517, 1, 0, 0, 0, 517, 518, 1, 0, 0, 0, 518, 519, 5, 29, 0, 0, 519, 95, 1, 0, 0, 0, 520, 522, 7, 0, 0, 0, 521, 520, 1, 0, 0, 0, 521, 522, 1, 0, 0, 0, 522, 523, 1, 0, 0, 0, 523, 524, 5, 28, 0, 0, 524, 97, 1, 0, 0, 0, 525, 526, 5, 27, 0, 0, 526, 99, 1, 0, 0, 0, 527, 528, 7, 7, 0, 0, 528, 101, 1, 0, 0, 0, 529, 530, 5, 5, 0, 0, 530, 531, 3, 104, 52, 0, 531, 103, 1, 0, 0, 0, 532, 533, 5, 66, 0, 0, 533, 534, 3, 2, 1, 0, 534, 535, 5, 67, 0, 0, 535, 105, 1, 0, 0, 0, 536, 537, 5, 14, 0, 0, 537, 538, 5, 101, 0, 0, 538, 107, 1, 0, 0, 0, 539, 540, 5, 10, 0, 0, 540, 541, 5, 105, 0, 0, 541, 109, 1, 0, 0, 0, 542, 543, 5, 3, 0, 0, 543, 546, 5, 91, 0, 0, 544, 545, 5, 89, 0, 0, 545, 547, 3, 54, 27, 0, 546, 544, 1, 0, 0, 0, 546, 547, 1, 0, 0, 0, 547, 557, 1, 0, 0, 0, 548, 549, 5, 90, 0, 0, 549, 554, 3, 112, 56, 0, 550, 551, 5, 35, 0, 0, 551, 553, 3, 112, 56, 0, 552, 550, 1, 0, 0, 0, 553, 556, 1, 0, 0, 0, 554, 552, 1, 0, 0, 0, 554, 555, 1, 0, 0, 0, 555, 558, 1, 0, 0, 0, 556, 554, 1, 0, 0, 0, 557, 548, 1, 0, 0, 0, 557, 558, 1, 0, 0, 0, 558, 111, 1, 0, 0, 0, 559, 560, 3, 54, 27, 0, 560, 561, 5, 33, 0, 0, 561, 563, 1, 0, 0, 0, 562, 559, 1, 0, 0, 0, 562, 563, 1, 0, 0, 0, 563, 564, 1, 0, 0, 0, 564, 565, 3, 54, 27, 0, 565, 113, 1, 0, 0, 0, 566, 567, 5, 19, 0, 0, 567, 568, 3, 34, 17, 0, 568, 569, 5, 89, 0, 0, 569, 570, 3, 56, 28, 0, 570, 115, 1, 0, 0, 0, 571, 572, 5, 18, 0, 0, 572, 575, 3, 28, 14, 0, 573, 574, 5, 30, 0, 0, 574, 576, 3, 28, 14, 0, 575, 573, 1, 0, 0, 0, 575, 576, 1, 0, 0, 0, 576, 117, 1, 0, 0, 0, 54, 129, 139, 157, 169, 178, 186, 192, 200, 202, 207, 214, 219, 230, 236, 244, 246, 257, 264, 275, 278, 292, 300, 308, 312, 319, 327, 335, 348, 352, 356, 363, 367, 374, 382, 390, 412, 423, 434, 439, 443, 454, 459, 463, 477, 488, 502, 513, 516, 521, 546, 554, 557, 562, 575]
\ No newline at end of file
+[4, 1, 120, 580, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 128, 8, 1, 10, 1, 12, 1, 131, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 139, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 157, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 169, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 176, 8, 5, 10, 5, 12, 5, 179, 9, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 186, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 192, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 200, 8, 5, 10, 5, 12, 5, 203, 9, 5, 1, 6, 1, 6, 3, 6, 207, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 214, 8, 6, 1, 6, 1, 6, 1, 6, 3, 6, 219, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 230, 8, 8, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 236, 8, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 5, 9, 244, 8, 9, 10, 9, 12, 9, 247, 9, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 257, 8, 10, 1, 10, 1, 10, 1, 10, 5, 10, 262, 8, 10, 10, 10, 12, 10, 265, 9, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 5, 11, 273, 8, 11, 10, 11, 12, 11, 276, 9, 11, 3, 11, 278, 8, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 5, 14, 290, 8, 14, 10, 14, 12, 14, 293, 9, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 300, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 306, 8, 16, 10, 16, 12, 16, 309, 9, 16, 1, 16, 3, 16, 312, 8, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 3, 17, 319, 8, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 327, 8, 20, 1, 21, 1, 21, 1, 21, 1, 21, 5, 21, 333, 8, 21, 10, 21, 12, 21, 336, 9, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 5, 23, 346, 8, 23, 10, 23, 12, 23, 349, 9, 23, 1, 23, 3, 23, 352, 8, 23, 1, 23, 1, 23, 3, 23, 356, 8, 23, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 3, 25, 363, 8, 25, 1, 25, 1, 25, 3, 25, 367, 8, 25, 1, 26, 1, 26, 1, 26, 5, 26, 372, 8, 26, 10, 26, 12, 26, 375, 9, 26, 1, 27, 1, 27, 1, 27, 5, 27, 380, 8, 27, 10, 27, 12, 27, 383, 9, 27, 1, 28, 1, 28, 1, 28, 5, 28, 388, 8, 28, 10, 28, 12, 28, 391, 9, 28, 1, 29, 1, 29, 1, 30, 1, 30, 3, 30, 397, 8, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 412, 8, 31, 10, 31, 12, 31, 415, 9, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 423, 8, 31, 10, 31, 12, 31, 426, 9, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 434, 8, 31, 10, 31, 12, 31, 437, 9, 31, 1, 31, 1, 31, 3, 31, 441, 8, 31, 1, 32, 1, 32, 3, 32, 445, 8, 32, 1, 33, 1, 33, 3, 33, 449, 8, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 35, 5, 35, 458, 8, 35, 10, 35, 12, 35, 461, 9, 35, 1, 36, 1, 36, 3, 36, 465, 8, 36, 1, 36, 1, 36, 3, 36, 469, 8, 36, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 5, 39, 481, 8, 39, 10, 39, 12, 39, 484, 9, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 3, 41, 494, 8, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 44, 5, 44, 506, 8, 44, 10, 44, 12, 44, 509, 9, 44, 1, 45, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 47, 1, 47, 3, 47, 519, 8, 47, 1, 48, 3, 48, 522, 8, 48, 1, 48, 1, 48, 1, 49, 3, 49, 527, 8, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 3, 55, 549, 8, 55, 1, 55, 1, 55, 1, 55, 1, 55, 5, 55, 555, 8, 55, 10, 55, 12, 55, 558, 9, 55, 3, 55, 560, 8, 55, 1, 56, 1, 56, 1, 56, 3, 56, 565, 8, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 58, 3, 58, 578, 8, 58, 1, 58, 0, 4, 2, 10, 18, 20, 59, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 0, 8, 1, 0, 59, 60, 1, 0, 61, 63, 2, 0, 26, 26, 76, 76, 1, 0, 67, 68, 2, 0, 31, 31, 35, 35, 2, 0, 38, 38, 41, 41, 2, 0, 37, 37, 51, 51, 2, 0, 52, 52, 54, 58, 606, 0, 118, 1, 0, 0, 0, 2, 121, 1, 0, 0, 0, 4, 138, 1, 0, 0, 0, 6, 156, 1, 0, 0, 0, 8, 158, 1, 0, 0, 0, 10, 191, 1, 0, 0, 0, 12, 218, 1, 0, 0, 0, 14, 220, 1, 0, 0, 0, 16, 229, 1, 0, 0, 0, 18, 235, 1, 0, 0, 0, 20, 256, 1, 0, 0, 0, 22, 266, 1, 0, 0, 0, 24, 281, 1, 0, 0, 0, 26, 283, 1, 0, 0, 0, 28, 286, 1, 0, 0, 0, 30, 299, 1, 0, 0, 0, 32, 301, 1, 0, 0, 0, 34, 318, 1, 0, 0, 0, 36, 320, 1, 0, 0, 0, 38, 322, 1, 0, 0, 0, 40, 326, 1, 0, 0, 0, 42, 328, 1, 0, 0, 0, 44, 337, 1, 0, 0, 0, 46, 341, 1, 0, 0, 0, 48, 357, 1, 0, 0, 0, 50, 360, 1, 0, 0, 0, 52, 368, 1, 0, 0, 0, 54, 376, 1, 0, 0, 0, 56, 384, 1, 0, 0, 0, 58, 392, 1, 0, 0, 0, 60, 396, 1, 0, 0, 0, 62, 440, 1, 0, 0, 0, 64, 444, 1, 0, 0, 0, 66, 448, 1, 0, 0, 0, 68, 450, 1, 0, 0, 0, 70, 453, 1, 0, 0, 0, 72, 462, 1, 0, 0, 0, 74, 470, 1, 0, 0, 0, 76, 473, 1, 0, 0, 0, 78, 476, 1, 0, 0, 0, 80, 485, 1, 0, 0, 0, 82, 489, 1, 0, 0, 0, 84, 495, 1, 0, 0, 0, 86, 499, 1, 0, 0, 0, 88, 502, 1, 0, 0, 0, 90, 510, 1, 0, 0, 0, 92, 514, 1, 0, 0, 0, 94, 518, 1, 0, 0, 0, 96, 521, 1, 0, 0, 0, 98, 526, 1, 0, 0, 0, 100, 530, 1, 0, 0, 0, 102, 532, 1, 0, 0, 0, 104, 534, 1, 0, 0, 0, 106, 537, 1, 0, 0, 0, 108, 541, 1, 0, 0, 0, 110, 544, 1, 0, 0, 0, 112, 564, 1, 0, 0, 0, 114, 568, 1, 0, 0, 0, 116, 573, 1, 0, 0, 0, 118, 119, 3, 2, 1, 0, 119, 120, 5, 0, 0, 1, 120, 1, 1, 0, 0, 0, 121, 122, 6, 1, -1, 0, 122, 123, 3, 4, 2, 0, 123, 129, 1, 0, 0, 0, 124, 125, 10, 1, 0, 0, 125, 126, 5, 25, 0, 0, 126, 128, 3, 6, 3, 0, 127, 124, 1, 0, 0, 0, 128, 131, 1, 0, 0, 0, 129, 127, 1, 0, 0, 0, 129, 130, 1, 0, 0, 0, 130, 3, 1, 0, 0, 0, 131, 129, 1, 0, 0, 0, 132, 139, 3, 104, 52, 0, 133, 139, 3, 32, 16, 0, 134, 139, 3, 26, 13, 0, 135, 139, 3, 108, 54, 0, 136, 137, 4, 2, 1, 0, 137, 139, 3, 46, 23, 0, 138, 132, 1, 0, 0, 0, 138, 133, 1, 0, 0, 0, 138, 134, 1, 0, 0, 0, 138, 135, 1, 0, 0, 0, 138, 136, 1, 0, 0, 0, 139, 5, 1, 0, 0, 0, 140, 157, 3, 48, 24, 0, 141, 157, 3, 8, 4, 0, 142, 157, 3, 74, 37, 0, 143, 157, 3, 68, 34, 0, 144, 157, 3, 50, 25, 0, 145, 157, 3, 70, 35, 0, 146, 157, 3, 76, 38, 0, 147, 157, 3, 78, 39, 0, 148, 157, 3, 82, 41, 0, 149, 157, 3, 84, 42, 0, 150, 157, 3, 110, 55, 0, 151, 157, 3, 86, 43, 0, 152, 153, 4, 3, 2, 0, 153, 157, 3, 116, 58, 0, 154, 155, 4, 3, 3, 0, 155, 157, 3, 114, 57, 0, 156, 140, 1, 0, 0, 0, 156, 141, 1, 0, 0, 0, 156, 142, 1, 0, 0, 0, 156, 143, 1, 0, 0, 0, 156, 144, 1, 0, 0, 0, 156, 145, 1, 0, 0, 0, 156, 146, 1, 0, 0, 0, 156, 147, 1, 0, 0, 0, 156, 148, 1, 0, 0, 0, 156, 149, 1, 0, 0, 0, 156, 150, 1, 0, 0, 0, 156, 151, 1, 0, 0, 0, 156, 152, 1, 0, 0, 0, 156, 154, 1, 0, 0, 0, 157, 7, 1, 0, 0, 0, 158, 159, 5, 16, 0, 0, 159, 160, 3, 10, 5, 0, 160, 9, 1, 0, 0, 0, 161, 162, 6, 5, -1, 0, 162, 163, 5, 44, 0, 0, 163, 192, 3, 10, 5, 8, 164, 192, 3, 16, 8, 0, 165, 192, 3, 12, 6, 0, 166, 168, 3, 16, 8, 0, 167, 169, 5, 44, 0, 0, 168, 167, 1, 0, 0, 0, 168, 169, 1, 0, 0, 0, 169, 170, 1, 0, 0, 0, 170, 171, 5, 39, 0, 0, 171, 172, 5, 43, 0, 0, 172, 177, 3, 16, 8, 0, 173, 174, 5, 34, 0, 0, 174, 176, 3, 16, 8, 0, 175, 173, 1, 0, 0, 0, 176, 179, 1, 0, 0, 0, 177, 175, 1, 0, 0, 0, 177, 178, 1, 0, 0, 0, 178, 180, 1, 0, 0, 0, 179, 177, 1, 0, 0, 0, 180, 181, 5, 50, 0, 0, 181, 192, 1, 0, 0, 0, 182, 183, 3, 16, 8, 0, 183, 185, 5, 40, 0, 0, 184, 186, 5, 44, 0, 0, 185, 184, 1, 0, 0, 0, 185, 186, 1, 0, 0, 0, 186, 187, 1, 0, 0, 0, 187, 188, 5, 45, 0, 0, 188, 192, 1, 0, 0, 0, 189, 190, 4, 5, 4, 0, 190, 192, 3, 14, 7, 0, 191, 161, 1, 0, 0, 0, 191, 164, 1, 0, 0, 0, 191, 165, 1, 0, 0, 0, 191, 166, 1, 0, 0, 0, 191, 182, 1, 0, 0, 0, 191, 189, 1, 0, 0, 0, 192, 201, 1, 0, 0, 0, 193, 194, 10, 5, 0, 0, 194, 195, 5, 30, 0, 0, 195, 200, 3, 10, 5, 6, 196, 197, 10, 4, 0, 0, 197, 198, 5, 47, 0, 0, 198, 200, 3, 10, 5, 5, 199, 193, 1, 0, 0, 0, 199, 196, 1, 0, 0, 0, 200, 203, 1, 0, 0, 0, 201, 199, 1, 0, 0, 0, 201, 202, 1, 0, 0, 0, 202, 11, 1, 0, 0, 0, 203, 201, 1, 0, 0, 0, 204, 206, 3, 16, 8, 0, 205, 207, 5, 44, 0, 0, 206, 205, 1, 0, 0, 0, 206, 207, 1, 0, 0, 0, 207, 208, 1, 0, 0, 0, 208, 209, 5, 42, 0, 0, 209, 210, 3, 100, 50, 0, 210, 219, 1, 0, 0, 0, 211, 213, 3, 16, 8, 0, 212, 214, 5, 44, 0, 0, 213, 212, 1, 0, 0, 0, 213, 214, 1, 0, 0, 0, 214, 215, 1, 0, 0, 0, 215, 216, 5, 49, 0, 0, 216, 217, 3, 100, 50, 0, 217, 219, 1, 0, 0, 0, 218, 204, 1, 0, 0, 0, 218, 211, 1, 0, 0, 0, 219, 13, 1, 0, 0, 0, 220, 221, 3, 16, 8, 0, 221, 222, 5, 19, 0, 0, 222, 223, 3, 100, 50, 0, 223, 15, 1, 0, 0, 0, 224, 230, 3, 18, 9, 0, 225, 226, 3, 18, 9, 0, 226, 227, 3, 102, 51, 0, 227, 228, 3, 18, 9, 0, 228, 230, 1, 0, 0, 0, 229, 224, 1, 0, 0, 0, 229, 225, 1, 0, 0, 0, 230, 17, 1, 0, 0, 0, 231, 232, 6, 9, -1, 0, 232, 236, 3, 20, 10, 0, 233, 234, 7, 0, 0, 0, 234, 236, 3, 18, 9, 3, 235, 231, 1, 0, 0, 0, 235, 233, 1, 0, 0, 0, 236, 245, 1, 0, 0, 0, 237, 238, 10, 2, 0, 0, 238, 239, 7, 1, 0, 0, 239, 244, 3, 18, 9, 3, 240, 241, 10, 1, 0, 0, 241, 242, 7, 0, 0, 0, 242, 244, 3, 18, 9, 2, 243, 237, 1, 0, 0, 0, 243, 240, 1, 0, 0, 0, 244, 247, 1, 0, 0, 0, 245, 243, 1, 0, 0, 0, 245, 246, 1, 0, 0, 0, 246, 19, 1, 0, 0, 0, 247, 245, 1, 0, 0, 0, 248, 249, 6, 10, -1, 0, 249, 257, 3, 62, 31, 0, 250, 257, 3, 52, 26, 0, 251, 257, 3, 22, 11, 0, 252, 253, 5, 43, 0, 0, 253, 254, 3, 10, 5, 0, 254, 255, 5, 50, 0, 0, 255, 257, 1, 0, 0, 0, 256, 248, 1, 0, 0, 0, 256, 250, 1, 0, 0, 0, 256, 251, 1, 0, 0, 0, 256, 252, 1, 0, 0, 0, 257, 263, 1, 0, 0, 0, 258, 259, 10, 1, 0, 0, 259, 260, 5, 33, 0, 0, 260, 262, 3, 24, 12, 0, 261, 258, 1, 0, 0, 0, 262, 265, 1, 0, 0, 0, 263, 261, 1, 0, 0, 0, 263, 264, 1, 0, 0, 0, 264, 21, 1, 0, 0, 0, 265, 263, 1, 0, 0, 0, 266, 267, 3, 66, 33, 0, 267, 277, 5, 43, 0, 0, 268, 278, 5, 61, 0, 0, 269, 274, 3, 10, 5, 0, 270, 271, 5, 34, 0, 0, 271, 273, 3, 10, 5, 0, 272, 270, 1, 0, 0, 0, 273, 276, 1, 0, 0, 0, 274, 272, 1, 0, 0, 0, 274, 275, 1, 0, 0, 0, 275, 278, 1, 0, 0, 0, 276, 274, 1, 0, 0, 0, 277, 268, 1, 0, 0, 0, 277, 269, 1, 0, 0, 0, 277, 278, 1, 0, 0, 0, 278, 279, 1, 0, 0, 0, 279, 280, 5, 50, 0, 0, 280, 23, 1, 0, 0, 0, 281, 282, 3, 58, 29, 0, 282, 25, 1, 0, 0, 0, 283, 284, 5, 12, 0, 0, 284, 285, 3, 28, 14, 0, 285, 27, 1, 0, 0, 0, 286, 291, 3, 30, 15, 0, 287, 288, 5, 34, 0, 0, 288, 290, 3, 30, 15, 0, 289, 287, 1, 0, 0, 0, 290, 293, 1, 0, 0, 0, 291, 289, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 29, 1, 0, 0, 0, 293, 291, 1, 0, 0, 0, 294, 300, 3, 10, 5, 0, 295, 296, 3, 52, 26, 0, 296, 297, 5, 32, 0, 0, 297, 298, 3, 10, 5, 0, 298, 300, 1, 0, 0, 0, 299, 294, 1, 0, 0, 0, 299, 295, 1, 0, 0, 0, 300, 31, 1, 0, 0, 0, 301, 302, 5, 6, 0, 0, 302, 307, 3, 34, 17, 0, 303, 304, 5, 34, 0, 0, 304, 306, 3, 34, 17, 0, 305, 303, 1, 0, 0, 0, 306, 309, 1, 0, 0, 0, 307, 305, 1, 0, 0, 0, 307, 308, 1, 0, 0, 0, 308, 311, 1, 0, 0, 0, 309, 307, 1, 0, 0, 0, 310, 312, 3, 40, 20, 0, 311, 310, 1, 0, 0, 0, 311, 312, 1, 0, 0, 0, 312, 33, 1, 0, 0, 0, 313, 314, 3, 36, 18, 0, 314, 315, 5, 104, 0, 0, 315, 316, 3, 38, 19, 0, 316, 319, 1, 0, 0, 0, 317, 319, 3, 38, 19, 0, 318, 313, 1, 0, 0, 0, 318, 317, 1, 0, 0, 0, 319, 35, 1, 0, 0, 0, 320, 321, 5, 76, 0, 0, 321, 37, 1, 0, 0, 0, 322, 323, 7, 2, 0, 0, 323, 39, 1, 0, 0, 0, 324, 327, 3, 42, 21, 0, 325, 327, 3, 44, 22, 0, 326, 324, 1, 0, 0, 0, 326, 325, 1, 0, 0, 0, 327, 41, 1, 0, 0, 0, 328, 329, 5, 75, 0, 0, 329, 334, 5, 76, 0, 0, 330, 331, 5, 34, 0, 0, 331, 333, 5, 76, 0, 0, 332, 330, 1, 0, 0, 0, 333, 336, 1, 0, 0, 0, 334, 332, 1, 0, 0, 0, 334, 335, 1, 0, 0, 0, 335, 43, 1, 0, 0, 0, 336, 334, 1, 0, 0, 0, 337, 338, 5, 65, 0, 0, 338, 339, 3, 42, 21, 0, 339, 340, 5, 66, 0, 0, 340, 45, 1, 0, 0, 0, 341, 342, 5, 20, 0, 0, 342, 347, 3, 34, 17, 0, 343, 344, 5, 34, 0, 0, 344, 346, 3, 34, 17, 0, 345, 343, 1, 0, 0, 0, 346, 349, 1, 0, 0, 0, 347, 345, 1, 0, 0, 0, 347, 348, 1, 0, 0, 0, 348, 351, 1, 0, 0, 0, 349, 347, 1, 0, 0, 0, 350, 352, 3, 28, 14, 0, 351, 350, 1, 0, 0, 0, 351, 352, 1, 0, 0, 0, 352, 355, 1, 0, 0, 0, 353, 354, 5, 29, 0, 0, 354, 356, 3, 28, 14, 0, 355, 353, 1, 0, 0, 0, 355, 356, 1, 0, 0, 0, 356, 47, 1, 0, 0, 0, 357, 358, 5, 4, 0, 0, 358, 359, 3, 28, 14, 0, 359, 49, 1, 0, 0, 0, 360, 362, 5, 15, 0, 0, 361, 363, 3, 28, 14, 0, 362, 361, 1, 0, 0, 0, 362, 363, 1, 0, 0, 0, 363, 366, 1, 0, 0, 0, 364, 365, 5, 29, 0, 0, 365, 367, 3, 28, 14, 0, 366, 364, 1, 0, 0, 0, 366, 367, 1, 0, 0, 0, 367, 51, 1, 0, 0, 0, 368, 373, 3, 66, 33, 0, 369, 370, 5, 36, 0, 0, 370, 372, 3, 66, 33, 0, 371, 369, 1, 0, 0, 0, 372, 375, 1, 0, 0, 0, 373, 371, 1, 0, 0, 0, 373, 374, 1, 0, 0, 0, 374, 53, 1, 0, 0, 0, 375, 373, 1, 0, 0, 0, 376, 381, 3, 60, 30, 0, 377, 378, 5, 36, 0, 0, 378, 380, 3, 60, 30, 0, 379, 377, 1, 0, 0, 0, 380, 383, 1, 0, 0, 0, 381, 379, 1, 0, 0, 0, 381, 382, 1, 0, 0, 0, 382, 55, 1, 0, 0, 0, 383, 381, 1, 0, 0, 0, 384, 389, 3, 54, 27, 0, 385, 386, 5, 34, 0, 0, 386, 388, 3, 54, 27, 0, 387, 385, 1, 0, 0, 0, 388, 391, 1, 0, 0, 0, 389, 387, 1, 0, 0, 0, 389, 390, 1, 0, 0, 0, 390, 57, 1, 0, 0, 0, 391, 389, 1, 0, 0, 0, 392, 393, 7, 3, 0, 0, 393, 59, 1, 0, 0, 0, 394, 397, 5, 80, 0, 0, 395, 397, 3, 64, 32, 0, 396, 394, 1, 0, 0, 0, 396, 395, 1, 0, 0, 0, 397, 61, 1, 0, 0, 0, 398, 441, 5, 45, 0, 0, 399, 400, 3, 98, 49, 0, 400, 401, 5, 67, 0, 0, 401, 441, 1, 0, 0, 0, 402, 441, 3, 96, 48, 0, 403, 441, 3, 98, 49, 0, 404, 441, 3, 92, 46, 0, 405, 441, 3, 64, 32, 0, 406, 441, 3, 100, 50, 0, 407, 408, 5, 65, 0, 0, 408, 413, 3, 94, 47, 0, 409, 410, 5, 34, 0, 0, 410, 412, 3, 94, 47, 0, 411, 409, 1, 0, 0, 0, 412, 415, 1, 0, 0, 0, 413, 411, 1, 0, 0, 0, 413, 414, 1, 0, 0, 0, 414, 416, 1, 0, 0, 0, 415, 413, 1, 0, 0, 0, 416, 417, 5, 66, 0, 0, 417, 441, 1, 0, 0, 0, 418, 419, 5, 65, 0, 0, 419, 424, 3, 92, 46, 0, 420, 421, 5, 34, 0, 0, 421, 423, 3, 92, 46, 0, 422, 420, 1, 0, 0, 0, 423, 426, 1, 0, 0, 0, 424, 422, 1, 0, 0, 0, 424, 425, 1, 0, 0, 0, 425, 427, 1, 0, 0, 0, 426, 424, 1, 0, 0, 0, 427, 428, 5, 66, 0, 0, 428, 441, 1, 0, 0, 0, 429, 430, 5, 65, 0, 0, 430, 435, 3, 100, 50, 0, 431, 432, 5, 34, 0, 0, 432, 434, 3, 100, 50, 0, 433, 431, 1, 0, 0, 0, 434, 437, 1, 0, 0, 0, 435, 433, 1, 0, 0, 0, 435, 436, 1, 0, 0, 0, 436, 438, 1, 0, 0, 0, 437, 435, 1, 0, 0, 0, 438, 439, 5, 66, 0, 0, 439, 441, 1, 0, 0, 0, 440, 398, 1, 0, 0, 0, 440, 399, 1, 0, 0, 0, 440, 402, 1, 0, 0, 0, 440, 403, 1, 0, 0, 0, 440, 404, 1, 0, 0, 0, 440, 405, 1, 0, 0, 0, 440, 406, 1, 0, 0, 0, 440, 407, 1, 0, 0, 0, 440, 418, 1, 0, 0, 0, 440, 429, 1, 0, 0, 0, 441, 63, 1, 0, 0, 0, 442, 445, 5, 48, 0, 0, 443, 445, 5, 64, 0, 0, 444, 442, 1, 0, 0, 0, 444, 443, 1, 0, 0, 0, 445, 65, 1, 0, 0, 0, 446, 449, 3, 58, 29, 0, 447, 449, 3, 64, 32, 0, 448, 446, 1, 0, 0, 0, 448, 447, 1, 0, 0, 0, 449, 67, 1, 0, 0, 0, 450, 451, 5, 9, 0, 0, 451, 452, 5, 27, 0, 0, 452, 69, 1, 0, 0, 0, 453, 454, 5, 14, 0, 0, 454, 459, 3, 72, 36, 0, 455, 456, 5, 34, 0, 0, 456, 458, 3, 72, 36, 0, 457, 455, 1, 0, 0, 0, 458, 461, 1, 0, 0, 0, 459, 457, 1, 0, 0, 0, 459, 460, 1, 0, 0, 0, 460, 71, 1, 0, 0, 0, 461, 459, 1, 0, 0, 0, 462, 464, 3, 10, 5, 0, 463, 465, 7, 4, 0, 0, 464, 463, 1, 0, 0, 0, 464, 465, 1, 0, 0, 0, 465, 468, 1, 0, 0, 0, 466, 467, 5, 46, 0, 0, 467, 469, 7, 5, 0, 0, 468, 466, 1, 0, 0, 0, 468, 469, 1, 0, 0, 0, 469, 73, 1, 0, 0, 0, 470, 471, 5, 8, 0, 0, 471, 472, 3, 56, 28, 0, 472, 75, 1, 0, 0, 0, 473, 474, 5, 2, 0, 0, 474, 475, 3, 56, 28, 0, 475, 77, 1, 0, 0, 0, 476, 477, 5, 11, 0, 0, 477, 482, 3, 80, 40, 0, 478, 479, 5, 34, 0, 0, 479, 481, 3, 80, 40, 0, 480, 478, 1, 0, 0, 0, 481, 484, 1, 0, 0, 0, 482, 480, 1, 0, 0, 0, 482, 483, 1, 0, 0, 0, 483, 79, 1, 0, 0, 0, 484, 482, 1, 0, 0, 0, 485, 486, 3, 54, 27, 0, 486, 487, 5, 84, 0, 0, 487, 488, 3, 54, 27, 0, 488, 81, 1, 0, 0, 0, 489, 490, 5, 1, 0, 0, 490, 491, 3, 20, 10, 0, 491, 493, 3, 100, 50, 0, 492, 494, 3, 88, 44, 0, 493, 492, 1, 0, 0, 0, 493, 494, 1, 0, 0, 0, 494, 83, 1, 0, 0, 0, 495, 496, 5, 7, 0, 0, 496, 497, 3, 20, 10, 0, 497, 498, 3, 100, 50, 0, 498, 85, 1, 0, 0, 0, 499, 500, 5, 10, 0, 0, 500, 501, 3, 52, 26, 0, 501, 87, 1, 0, 0, 0, 502, 507, 3, 90, 45, 0, 503, 504, 5, 34, 0, 0, 504, 506, 3, 90, 45, 0, 505, 503, 1, 0, 0, 0, 506, 509, 1, 0, 0, 0, 507, 505, 1, 0, 0, 0, 507, 508, 1, 0, 0, 0, 508, 89, 1, 0, 0, 0, 509, 507, 1, 0, 0, 0, 510, 511, 3, 58, 29, 0, 511, 512, 5, 32, 0, 0, 512, 513, 3, 62, 31, 0, 513, 91, 1, 0, 0, 0, 514, 515, 7, 6, 0, 0, 515, 93, 1, 0, 0, 0, 516, 519, 3, 96, 48, 0, 517, 519, 3, 98, 49, 0, 518, 516, 1, 0, 0, 0, 518, 517, 1, 0, 0, 0, 519, 95, 1, 0, 0, 0, 520, 522, 7, 0, 0, 0, 521, 520, 1, 0, 0, 0, 521, 522, 1, 0, 0, 0, 522, 523, 1, 0, 0, 0, 523, 524, 5, 28, 0, 0, 524, 97, 1, 0, 0, 0, 525, 527, 7, 0, 0, 0, 526, 525, 1, 0, 0, 0, 526, 527, 1, 0, 0, 0, 527, 528, 1, 0, 0, 0, 528, 529, 5, 27, 0, 0, 529, 99, 1, 0, 0, 0, 530, 531, 5, 26, 0, 0, 531, 101, 1, 0, 0, 0, 532, 533, 7, 7, 0, 0, 533, 103, 1, 0, 0, 0, 534, 535, 5, 5, 0, 0, 535, 536, 3, 106, 53, 0, 536, 105, 1, 0, 0, 0, 537, 538, 5, 65, 0, 0, 538, 539, 3, 2, 1, 0, 539, 540, 5, 66, 0, 0, 540, 107, 1, 0, 0, 0, 541, 542, 5, 13, 0, 0, 542, 543, 5, 100, 0, 0, 543, 109, 1, 0, 0, 0, 544, 545, 5, 3, 0, 0, 545, 548, 5, 90, 0, 0, 546, 547, 5, 88, 0, 0, 547, 549, 3, 54, 27, 0, 548, 546, 1, 0, 0, 0, 548, 549, 1, 0, 0, 0, 549, 559, 1, 0, 0, 0, 550, 551, 5, 89, 0, 0, 551, 556, 3, 112, 56, 0, 552, 553, 5, 34, 0, 0, 553, 555, 3, 112, 56, 0, 554, 552, 1, 0, 0, 0, 555, 558, 1, 0, 0, 0, 556, 554, 1, 0, 0, 0, 556, 557, 1, 0, 0, 0, 557, 560, 1, 0, 0, 0, 558, 556, 1, 0, 0, 0, 559, 550, 1, 0, 0, 0, 559, 560, 1, 0, 0, 0, 560, 111, 1, 0, 0, 0, 561, 562, 3, 54, 27, 0, 562, 563, 5, 32, 0, 0, 563, 565, 1, 0, 0, 0, 564, 561, 1, 0, 0, 0, 564, 565, 1, 0, 0, 0, 565, 566, 1, 0, 0, 0, 566, 567, 3, 54, 27, 0, 567, 113, 1, 0, 0, 0, 568, 569, 5, 18, 0, 0, 569, 570, 3, 34, 17, 0, 570, 571, 5, 88, 0, 0, 571, 572, 3, 56, 28, 0, 572, 115, 1, 0, 0, 0, 573, 574, 5, 17, 0, 0, 574, 577, 3, 28, 14, 0, 575, 576, 5, 29, 0, 0, 576, 578, 3, 28, 14, 0, 577, 575, 1, 0, 0, 0, 577, 578, 1, 0, 0, 0, 578, 117, 1, 0, 0, 0, 56, 129, 138, 156, 168, 177, 185, 191, 199, 201, 206, 213, 218, 229, 235, 243, 245, 256, 263, 274, 277, 291, 299, 307, 311, 318, 326, 334, 347, 351, 355, 362, 366, 373, 381, 389, 396, 413, 424, 435, 440, 444, 448, 459, 464, 468, 482, 493, 507, 518, 521, 526, 548, 556, 559, 564, 577]
\ No newline at end of file
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.tokens b/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
index 747fbbc64cf5..4fd37ab9900f 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
@@ -7,122 +7,117 @@ FROM=6
GROK=7
KEEP=8
LIMIT=9
-META=10
-MV_EXPAND=11
-RENAME=12
-ROW=13
-SHOW=14
-SORT=15
-STATS=16
-WHERE=17
-DEV_INLINESTATS=18
-DEV_LOOKUP=19
-DEV_MATCH=20
-DEV_METRICS=21
-UNKNOWN_CMD=22
-LINE_COMMENT=23
-MULTILINE_COMMENT=24
-WS=25
-PIPE=26
-QUOTED_STRING=27
-INTEGER_LITERAL=28
-DECIMAL_LITERAL=29
-BY=30
-AND=31
-ASC=32
-ASSIGN=33
-CAST_OP=34
-COMMA=35
-DESC=36
-DOT=37
-FALSE=38
-FIRST=39
-IN=40
-IS=41
-LAST=42
-LIKE=43
-LP=44
-NOT=45
-NULL=46
-NULLS=47
-OR=48
-PARAM=49
-RLIKE=50
-RP=51
-TRUE=52
-EQ=53
-CIEQ=54
-NEQ=55
-LT=56
-LTE=57
-GT=58
-GTE=59
-PLUS=60
-MINUS=61
-ASTERISK=62
-SLASH=63
-PERCENT=64
-NAMED_OR_POSITIONAL_PARAM=65
-OPENING_BRACKET=66
-CLOSING_BRACKET=67
-UNQUOTED_IDENTIFIER=68
-QUOTED_IDENTIFIER=69
-EXPR_LINE_COMMENT=70
-EXPR_MULTILINE_COMMENT=71
-EXPR_WS=72
-EXPLAIN_WS=73
-EXPLAIN_LINE_COMMENT=74
-EXPLAIN_MULTILINE_COMMENT=75
-METADATA=76
-UNQUOTED_SOURCE=77
-FROM_LINE_COMMENT=78
-FROM_MULTILINE_COMMENT=79
-FROM_WS=80
-ID_PATTERN=81
-PROJECT_LINE_COMMENT=82
-PROJECT_MULTILINE_COMMENT=83
-PROJECT_WS=84
-AS=85
-RENAME_LINE_COMMENT=86
-RENAME_MULTILINE_COMMENT=87
-RENAME_WS=88
-ON=89
-WITH=90
-ENRICH_POLICY_NAME=91
-ENRICH_LINE_COMMENT=92
-ENRICH_MULTILINE_COMMENT=93
-ENRICH_WS=94
-ENRICH_FIELD_LINE_COMMENT=95
-ENRICH_FIELD_MULTILINE_COMMENT=96
-ENRICH_FIELD_WS=97
-MVEXPAND_LINE_COMMENT=98
-MVEXPAND_MULTILINE_COMMENT=99
-MVEXPAND_WS=100
-INFO=101
-SHOW_LINE_COMMENT=102
-SHOW_MULTILINE_COMMENT=103
-SHOW_WS=104
-FUNCTIONS=105
-META_LINE_COMMENT=106
-META_MULTILINE_COMMENT=107
-META_WS=108
-COLON=109
-SETTING=110
-SETTING_LINE_COMMENT=111
-SETTTING_MULTILINE_COMMENT=112
-SETTING_WS=113
-LOOKUP_LINE_COMMENT=114
-LOOKUP_MULTILINE_COMMENT=115
-LOOKUP_WS=116
-LOOKUP_FIELD_LINE_COMMENT=117
-LOOKUP_FIELD_MULTILINE_COMMENT=118
-LOOKUP_FIELD_WS=119
-METRICS_LINE_COMMENT=120
-METRICS_MULTILINE_COMMENT=121
-METRICS_WS=122
-CLOSING_METRICS_LINE_COMMENT=123
-CLOSING_METRICS_MULTILINE_COMMENT=124
-CLOSING_METRICS_WS=125
+MV_EXPAND=10
+RENAME=11
+ROW=12
+SHOW=13
+SORT=14
+STATS=15
+WHERE=16
+DEV_INLINESTATS=17
+DEV_LOOKUP=18
+DEV_MATCH=19
+DEV_METRICS=20
+UNKNOWN_CMD=21
+LINE_COMMENT=22
+MULTILINE_COMMENT=23
+WS=24
+PIPE=25
+QUOTED_STRING=26
+INTEGER_LITERAL=27
+DECIMAL_LITERAL=28
+BY=29
+AND=30
+ASC=31
+ASSIGN=32
+CAST_OP=33
+COMMA=34
+DESC=35
+DOT=36
+FALSE=37
+FIRST=38
+IN=39
+IS=40
+LAST=41
+LIKE=42
+LP=43
+NOT=44
+NULL=45
+NULLS=46
+OR=47
+PARAM=48
+RLIKE=49
+RP=50
+TRUE=51
+EQ=52
+CIEQ=53
+NEQ=54
+LT=55
+LTE=56
+GT=57
+GTE=58
+PLUS=59
+MINUS=60
+ASTERISK=61
+SLASH=62
+PERCENT=63
+NAMED_OR_POSITIONAL_PARAM=64
+OPENING_BRACKET=65
+CLOSING_BRACKET=66
+UNQUOTED_IDENTIFIER=67
+QUOTED_IDENTIFIER=68
+EXPR_LINE_COMMENT=69
+EXPR_MULTILINE_COMMENT=70
+EXPR_WS=71
+EXPLAIN_WS=72
+EXPLAIN_LINE_COMMENT=73
+EXPLAIN_MULTILINE_COMMENT=74
+METADATA=75
+UNQUOTED_SOURCE=76
+FROM_LINE_COMMENT=77
+FROM_MULTILINE_COMMENT=78
+FROM_WS=79
+ID_PATTERN=80
+PROJECT_LINE_COMMENT=81
+PROJECT_MULTILINE_COMMENT=82
+PROJECT_WS=83
+AS=84
+RENAME_LINE_COMMENT=85
+RENAME_MULTILINE_COMMENT=86
+RENAME_WS=87
+ON=88
+WITH=89
+ENRICH_POLICY_NAME=90
+ENRICH_LINE_COMMENT=91
+ENRICH_MULTILINE_COMMENT=92
+ENRICH_WS=93
+ENRICH_FIELD_LINE_COMMENT=94
+ENRICH_FIELD_MULTILINE_COMMENT=95
+ENRICH_FIELD_WS=96
+MVEXPAND_LINE_COMMENT=97
+MVEXPAND_MULTILINE_COMMENT=98
+MVEXPAND_WS=99
+INFO=100
+SHOW_LINE_COMMENT=101
+SHOW_MULTILINE_COMMENT=102
+SHOW_WS=103
+COLON=104
+SETTING=105
+SETTING_LINE_COMMENT=106
+SETTTING_MULTILINE_COMMENT=107
+SETTING_WS=108
+LOOKUP_LINE_COMMENT=109
+LOOKUP_MULTILINE_COMMENT=110
+LOOKUP_WS=111
+LOOKUP_FIELD_LINE_COMMENT=112
+LOOKUP_FIELD_MULTILINE_COMMENT=113
+LOOKUP_FIELD_WS=114
+METRICS_LINE_COMMENT=115
+METRICS_MULTILINE_COMMENT=116
+METRICS_WS=117
+CLOSING_METRICS_LINE_COMMENT=118
+CLOSING_METRICS_MULTILINE_COMMENT=119
+CLOSING_METRICS_WS=120
'dissect'=1
'drop'=2
'enrich'=3
@@ -132,55 +127,53 @@ CLOSING_METRICS_WS=125
'grok'=7
'keep'=8
'limit'=9
-'meta'=10
-'mv_expand'=11
-'rename'=12
-'row'=13
-'show'=14
-'sort'=15
-'stats'=16
-'where'=17
-'|'=26
-'by'=30
-'and'=31
-'asc'=32
-'='=33
-'::'=34
-','=35
-'desc'=36
-'.'=37
-'false'=38
-'first'=39
-'in'=40
-'is'=41
-'last'=42
-'like'=43
-'('=44
-'not'=45
-'null'=46
-'nulls'=47
-'or'=48
-'?'=49
-'rlike'=50
-')'=51
-'true'=52
-'=='=53
-'=~'=54
-'!='=55
-'<'=56
-'<='=57
-'>'=58
-'>='=59
-'+'=60
-'-'=61
-'*'=62
-'/'=63
-'%'=64
-']'=67
-'metadata'=76
-'as'=85
-'on'=89
-'with'=90
-'info'=101
-'functions'=105
-':'=109
+'mv_expand'=10
+'rename'=11
+'row'=12
+'show'=13
+'sort'=14
+'stats'=15
+'where'=16
+'|'=25
+'by'=29
+'and'=30
+'asc'=31
+'='=32
+'::'=33
+','=34
+'desc'=35
+'.'=36
+'false'=37
+'first'=38
+'in'=39
+'is'=40
+'last'=41
+'like'=42
+'('=43
+'not'=44
+'null'=45
+'nulls'=46
+'or'=47
+'?'=48
+'rlike'=49
+')'=50
+'true'=51
+'=='=52
+'=~'=53
+'!='=54
+'<'=55
+'<='=56
+'>'=57
+'>='=58
+'+'=59
+'-'=60
+'*'=61
+'/'=62
+'%'=63
+']'=66
+'metadata'=75
+'as'=84
+'on'=88
+'with'=89
+'info'=100
+':'=104
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.ts b/packages/kbn-esql-ast/src/antlr/esql_parser.ts
index fd0107260078..41aea98166c9 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.ts
@@ -37,122 +37,117 @@ export default class esql_parser extends parser_config {
public static readonly GROK = 7;
public static readonly KEEP = 8;
public static readonly LIMIT = 9;
- public static readonly META = 10;
- public static readonly MV_EXPAND = 11;
- public static readonly RENAME = 12;
- public static readonly ROW = 13;
- public static readonly SHOW = 14;
- public static readonly SORT = 15;
- public static readonly STATS = 16;
- public static readonly WHERE = 17;
- public static readonly DEV_INLINESTATS = 18;
- public static readonly DEV_LOOKUP = 19;
- public static readonly DEV_MATCH = 20;
- public static readonly DEV_METRICS = 21;
- public static readonly UNKNOWN_CMD = 22;
- public static readonly LINE_COMMENT = 23;
- public static readonly MULTILINE_COMMENT = 24;
- public static readonly WS = 25;
- public static readonly PIPE = 26;
- public static readonly QUOTED_STRING = 27;
- public static readonly INTEGER_LITERAL = 28;
- public static readonly DECIMAL_LITERAL = 29;
- public static readonly BY = 30;
- public static readonly AND = 31;
- public static readonly ASC = 32;
- public static readonly ASSIGN = 33;
- public static readonly CAST_OP = 34;
- public static readonly COMMA = 35;
- public static readonly DESC = 36;
- public static readonly DOT = 37;
- public static readonly FALSE = 38;
- public static readonly FIRST = 39;
- public static readonly IN = 40;
- public static readonly IS = 41;
- public static readonly LAST = 42;
- public static readonly LIKE = 43;
- public static readonly LP = 44;
- public static readonly NOT = 45;
- public static readonly NULL = 46;
- public static readonly NULLS = 47;
- public static readonly OR = 48;
- public static readonly PARAM = 49;
- public static readonly RLIKE = 50;
- public static readonly RP = 51;
- public static readonly TRUE = 52;
- public static readonly EQ = 53;
- public static readonly CIEQ = 54;
- public static readonly NEQ = 55;
- public static readonly LT = 56;
- public static readonly LTE = 57;
- public static readonly GT = 58;
- public static readonly GTE = 59;
- public static readonly PLUS = 60;
- public static readonly MINUS = 61;
- public static readonly ASTERISK = 62;
- public static readonly SLASH = 63;
- public static readonly PERCENT = 64;
- public static readonly NAMED_OR_POSITIONAL_PARAM = 65;
- public static readonly OPENING_BRACKET = 66;
- public static readonly CLOSING_BRACKET = 67;
- public static readonly UNQUOTED_IDENTIFIER = 68;
- public static readonly QUOTED_IDENTIFIER = 69;
- public static readonly EXPR_LINE_COMMENT = 70;
- public static readonly EXPR_MULTILINE_COMMENT = 71;
- public static readonly EXPR_WS = 72;
- public static readonly EXPLAIN_WS = 73;
- public static readonly EXPLAIN_LINE_COMMENT = 74;
- public static readonly EXPLAIN_MULTILINE_COMMENT = 75;
- public static readonly METADATA = 76;
- public static readonly UNQUOTED_SOURCE = 77;
- public static readonly FROM_LINE_COMMENT = 78;
- public static readonly FROM_MULTILINE_COMMENT = 79;
- public static readonly FROM_WS = 80;
- public static readonly ID_PATTERN = 81;
- public static readonly PROJECT_LINE_COMMENT = 82;
- public static readonly PROJECT_MULTILINE_COMMENT = 83;
- public static readonly PROJECT_WS = 84;
- public static readonly AS = 85;
- public static readonly RENAME_LINE_COMMENT = 86;
- public static readonly RENAME_MULTILINE_COMMENT = 87;
- public static readonly RENAME_WS = 88;
- public static readonly ON = 89;
- public static readonly WITH = 90;
- public static readonly ENRICH_POLICY_NAME = 91;
- public static readonly ENRICH_LINE_COMMENT = 92;
- public static readonly ENRICH_MULTILINE_COMMENT = 93;
- public static readonly ENRICH_WS = 94;
- public static readonly ENRICH_FIELD_LINE_COMMENT = 95;
- public static readonly ENRICH_FIELD_MULTILINE_COMMENT = 96;
- public static readonly ENRICH_FIELD_WS = 97;
- public static readonly MVEXPAND_LINE_COMMENT = 98;
- public static readonly MVEXPAND_MULTILINE_COMMENT = 99;
- public static readonly MVEXPAND_WS = 100;
- public static readonly INFO = 101;
- public static readonly SHOW_LINE_COMMENT = 102;
- public static readonly SHOW_MULTILINE_COMMENT = 103;
- public static readonly SHOW_WS = 104;
- public static readonly FUNCTIONS = 105;
- public static readonly META_LINE_COMMENT = 106;
- public static readonly META_MULTILINE_COMMENT = 107;
- public static readonly META_WS = 108;
- public static readonly COLON = 109;
- public static readonly SETTING = 110;
- public static readonly SETTING_LINE_COMMENT = 111;
- public static readonly SETTTING_MULTILINE_COMMENT = 112;
- public static readonly SETTING_WS = 113;
- public static readonly LOOKUP_LINE_COMMENT = 114;
- public static readonly LOOKUP_MULTILINE_COMMENT = 115;
- public static readonly LOOKUP_WS = 116;
- public static readonly LOOKUP_FIELD_LINE_COMMENT = 117;
- public static readonly LOOKUP_FIELD_MULTILINE_COMMENT = 118;
- public static readonly LOOKUP_FIELD_WS = 119;
- public static readonly METRICS_LINE_COMMENT = 120;
- public static readonly METRICS_MULTILINE_COMMENT = 121;
- public static readonly METRICS_WS = 122;
- public static readonly CLOSING_METRICS_LINE_COMMENT = 123;
- public static readonly CLOSING_METRICS_MULTILINE_COMMENT = 124;
- public static readonly CLOSING_METRICS_WS = 125;
+ public static readonly MV_EXPAND = 10;
+ public static readonly RENAME = 11;
+ public static readonly ROW = 12;
+ public static readonly SHOW = 13;
+ public static readonly SORT = 14;
+ public static readonly STATS = 15;
+ public static readonly WHERE = 16;
+ public static readonly DEV_INLINESTATS = 17;
+ public static readonly DEV_LOOKUP = 18;
+ public static readonly DEV_MATCH = 19;
+ public static readonly DEV_METRICS = 20;
+ public static readonly UNKNOWN_CMD = 21;
+ public static readonly LINE_COMMENT = 22;
+ public static readonly MULTILINE_COMMENT = 23;
+ public static readonly WS = 24;
+ public static readonly PIPE = 25;
+ public static readonly QUOTED_STRING = 26;
+ public static readonly INTEGER_LITERAL = 27;
+ public static readonly DECIMAL_LITERAL = 28;
+ public static readonly BY = 29;
+ public static readonly AND = 30;
+ public static readonly ASC = 31;
+ public static readonly ASSIGN = 32;
+ public static readonly CAST_OP = 33;
+ public static readonly COMMA = 34;
+ public static readonly DESC = 35;
+ public static readonly DOT = 36;
+ public static readonly FALSE = 37;
+ public static readonly FIRST = 38;
+ public static readonly IN = 39;
+ public static readonly IS = 40;
+ public static readonly LAST = 41;
+ public static readonly LIKE = 42;
+ public static readonly LP = 43;
+ public static readonly NOT = 44;
+ public static readonly NULL = 45;
+ public static readonly NULLS = 46;
+ public static readonly OR = 47;
+ public static readonly PARAM = 48;
+ public static readonly RLIKE = 49;
+ public static readonly RP = 50;
+ public static readonly TRUE = 51;
+ public static readonly EQ = 52;
+ public static readonly CIEQ = 53;
+ public static readonly NEQ = 54;
+ public static readonly LT = 55;
+ public static readonly LTE = 56;
+ public static readonly GT = 57;
+ public static readonly GTE = 58;
+ public static readonly PLUS = 59;
+ public static readonly MINUS = 60;
+ public static readonly ASTERISK = 61;
+ public static readonly SLASH = 62;
+ public static readonly PERCENT = 63;
+ public static readonly NAMED_OR_POSITIONAL_PARAM = 64;
+ public static readonly OPENING_BRACKET = 65;
+ public static readonly CLOSING_BRACKET = 66;
+ public static readonly UNQUOTED_IDENTIFIER = 67;
+ public static readonly QUOTED_IDENTIFIER = 68;
+ public static readonly EXPR_LINE_COMMENT = 69;
+ public static readonly EXPR_MULTILINE_COMMENT = 70;
+ public static readonly EXPR_WS = 71;
+ public static readonly EXPLAIN_WS = 72;
+ public static readonly EXPLAIN_LINE_COMMENT = 73;
+ public static readonly EXPLAIN_MULTILINE_COMMENT = 74;
+ public static readonly METADATA = 75;
+ public static readonly UNQUOTED_SOURCE = 76;
+ public static readonly FROM_LINE_COMMENT = 77;
+ public static readonly FROM_MULTILINE_COMMENT = 78;
+ public static readonly FROM_WS = 79;
+ public static readonly ID_PATTERN = 80;
+ public static readonly PROJECT_LINE_COMMENT = 81;
+ public static readonly PROJECT_MULTILINE_COMMENT = 82;
+ public static readonly PROJECT_WS = 83;
+ public static readonly AS = 84;
+ public static readonly RENAME_LINE_COMMENT = 85;
+ public static readonly RENAME_MULTILINE_COMMENT = 86;
+ public static readonly RENAME_WS = 87;
+ public static readonly ON = 88;
+ public static readonly WITH = 89;
+ public static readonly ENRICH_POLICY_NAME = 90;
+ public static readonly ENRICH_LINE_COMMENT = 91;
+ public static readonly ENRICH_MULTILINE_COMMENT = 92;
+ public static readonly ENRICH_WS = 93;
+ public static readonly ENRICH_FIELD_LINE_COMMENT = 94;
+ public static readonly ENRICH_FIELD_MULTILINE_COMMENT = 95;
+ public static readonly ENRICH_FIELD_WS = 96;
+ public static readonly MVEXPAND_LINE_COMMENT = 97;
+ public static readonly MVEXPAND_MULTILINE_COMMENT = 98;
+ public static readonly MVEXPAND_WS = 99;
+ public static readonly INFO = 100;
+ public static readonly SHOW_LINE_COMMENT = 101;
+ public static readonly SHOW_MULTILINE_COMMENT = 102;
+ public static readonly SHOW_WS = 103;
+ public static readonly COLON = 104;
+ public static readonly SETTING = 105;
+ public static readonly SETTING_LINE_COMMENT = 106;
+ public static readonly SETTTING_MULTILINE_COMMENT = 107;
+ public static readonly SETTING_WS = 108;
+ public static readonly LOOKUP_LINE_COMMENT = 109;
+ public static readonly LOOKUP_MULTILINE_COMMENT = 110;
+ public static readonly LOOKUP_WS = 111;
+ public static readonly LOOKUP_FIELD_LINE_COMMENT = 112;
+ public static readonly LOOKUP_FIELD_MULTILINE_COMMENT = 113;
+ public static readonly LOOKUP_FIELD_WS = 114;
+ public static readonly METRICS_LINE_COMMENT = 115;
+ public static readonly METRICS_MULTILINE_COMMENT = 116;
+ public static readonly METRICS_WS = 117;
+ public static readonly CLOSING_METRICS_LINE_COMMENT = 118;
+ public static readonly CLOSING_METRICS_MULTILINE_COMMENT = 119;
+ public static readonly CLOSING_METRICS_WS = 120;
public static override readonly EOF = Token.EOF;
public static readonly RULE_singleStatement = 0;
public static readonly RULE_query = 1;
@@ -186,29 +181,29 @@ export default class esql_parser extends parser_config {
public static readonly RULE_identifier = 29;
public static readonly RULE_identifierPattern = 30;
public static readonly RULE_constant = 31;
- public static readonly RULE_params = 32;
- public static readonly RULE_limitCommand = 33;
- public static readonly RULE_sortCommand = 34;
- public static readonly RULE_orderExpression = 35;
- public static readonly RULE_keepCommand = 36;
- public static readonly RULE_dropCommand = 37;
- public static readonly RULE_renameCommand = 38;
- public static readonly RULE_renameClause = 39;
- public static readonly RULE_dissectCommand = 40;
- public static readonly RULE_grokCommand = 41;
- public static readonly RULE_mvExpandCommand = 42;
- public static readonly RULE_commandOptions = 43;
- public static readonly RULE_commandOption = 44;
- public static readonly RULE_booleanValue = 45;
- public static readonly RULE_numericValue = 46;
- public static readonly RULE_decimalValue = 47;
- public static readonly RULE_integerValue = 48;
- public static readonly RULE_string = 49;
- public static readonly RULE_comparisonOperator = 50;
- public static readonly RULE_explainCommand = 51;
- public static readonly RULE_subqueryExpression = 52;
- public static readonly RULE_showCommand = 53;
- public static readonly RULE_metaCommand = 54;
+ public static readonly RULE_parameter = 32;
+ public static readonly RULE_identifierOrParameter = 33;
+ public static readonly RULE_limitCommand = 34;
+ public static readonly RULE_sortCommand = 35;
+ public static readonly RULE_orderExpression = 36;
+ public static readonly RULE_keepCommand = 37;
+ public static readonly RULE_dropCommand = 38;
+ public static readonly RULE_renameCommand = 39;
+ public static readonly RULE_renameClause = 40;
+ public static readonly RULE_dissectCommand = 41;
+ public static readonly RULE_grokCommand = 42;
+ public static readonly RULE_mvExpandCommand = 43;
+ public static readonly RULE_commandOptions = 44;
+ public static readonly RULE_commandOption = 45;
+ public static readonly RULE_booleanValue = 46;
+ public static readonly RULE_numericValue = 47;
+ public static readonly RULE_decimalValue = 48;
+ public static readonly RULE_integerValue = 49;
+ public static readonly RULE_string = 50;
+ public static readonly RULE_comparisonOperator = 51;
+ public static readonly RULE_explainCommand = 52;
+ public static readonly RULE_subqueryExpression = 53;
+ public static readonly RULE_showCommand = 54;
public static readonly RULE_enrichCommand = 55;
public static readonly RULE_enrichWithClause = 56;
public static readonly RULE_lookupCommand = 57;
@@ -218,7 +213,7 @@ export default class esql_parser extends parser_config {
"'eval'", "'explain'",
"'from'", "'grok'",
"'keep'", "'limit'",
- "'meta'", "'mv_expand'",
+ "'mv_expand'",
"'rename'",
"'row'", "'show'",
"'sort'", "'stats'",
@@ -266,15 +261,13 @@ export default class esql_parser extends parser_config {
null, null,
"'info'", null,
null, null,
- "'functions'",
- null, null,
- null, "':'" ];
+ "':'" ];
public static readonly symbolicNames: (string | null)[] = [ null, "DISSECT",
"DROP", "ENRICH",
"EVAL", "EXPLAIN",
"FROM", "GROK",
"KEEP", "LIMIT",
- "META", "MV_EXPAND",
+ "MV_EXPAND",
"RENAME", "ROW",
"SHOW", "SORT",
"STATS", "WHERE",
@@ -344,10 +337,6 @@ export default class esql_parser extends parser_config {
"INFO", "SHOW_LINE_COMMENT",
"SHOW_MULTILINE_COMMENT",
"SHOW_WS",
- "FUNCTIONS",
- "META_LINE_COMMENT",
- "META_MULTILINE_COMMENT",
- "META_WS",
"COLON", "SETTING",
"SETTING_LINE_COMMENT",
"SETTTING_MULTILINE_COMMENT",
@@ -373,12 +362,12 @@ export default class esql_parser extends parser_config {
"clusterString", "indexString", "metadata", "metadataOption", "deprecated_metadata",
"metricsCommand", "evalCommand", "statsCommand", "qualifiedName", "qualifiedNamePattern",
"qualifiedNamePatterns", "identifier", "identifierPattern", "constant",
- "params", "limitCommand", "sortCommand", "orderExpression", "keepCommand",
- "dropCommand", "renameCommand", "renameClause", "dissectCommand", "grokCommand",
- "mvExpandCommand", "commandOptions", "commandOption", "booleanValue",
+ "parameter", "identifierOrParameter", "limitCommand", "sortCommand", "orderExpression",
+ "keepCommand", "dropCommand", "renameCommand", "renameClause", "dissectCommand",
+ "grokCommand", "mvExpandCommand", "commandOptions", "commandOption", "booleanValue",
"numericValue", "decimalValue", "integerValue", "string", "comparisonOperator",
- "explainCommand", "subqueryExpression", "showCommand", "metaCommand",
- "enrichCommand", "enrichWithClause", "lookupCommand", "inlinestatsCommand",
+ "explainCommand", "subqueryExpression", "showCommand", "enrichCommand",
+ "enrichWithClause", "lookupCommand", "inlinestatsCommand",
];
public get grammarFileName(): string { return "esql_parser.g4"; }
public get literalNames(): (string | null)[] { return esql_parser.literalNames; }
@@ -498,7 +487,7 @@ export default class esql_parser extends parser_config {
let localctx: SourceCommandContext = new SourceCommandContext(this, this._ctx, this.state);
this.enterRule(localctx, 4, esql_parser.RULE_sourceCommand);
try {
- this.state = 139;
+ this.state = 138;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 1, this._ctx) ) {
case 1:
@@ -519,31 +508,24 @@ export default class esql_parser extends parser_config {
this.enterOuterAlt(localctx, 3);
{
this.state = 134;
- this.metaCommand();
+ this.rowCommand();
}
break;
case 4:
this.enterOuterAlt(localctx, 4);
{
this.state = 135;
- this.rowCommand();
+ this.showCommand();
}
break;
case 5:
this.enterOuterAlt(localctx, 5);
{
this.state = 136;
- this.showCommand();
- }
- break;
- case 6:
- this.enterOuterAlt(localctx, 6);
- {
- this.state = 137;
if (!(this.isDevVersion())) {
throw this.createFailedPredicateException("this.isDevVersion()");
}
- this.state = 138;
+ this.state = 137;
this.metricsCommand();
}
break;
@@ -568,112 +550,112 @@ export default class esql_parser extends parser_config {
let localctx: ProcessingCommandContext = new ProcessingCommandContext(this, this._ctx, this.state);
this.enterRule(localctx, 6, esql_parser.RULE_processingCommand);
try {
- this.state = 157;
+ this.state = 156;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 2, this._ctx) ) {
case 1:
this.enterOuterAlt(localctx, 1);
{
- this.state = 141;
+ this.state = 140;
this.evalCommand();
}
break;
case 2:
this.enterOuterAlt(localctx, 2);
{
- this.state = 142;
+ this.state = 141;
this.whereCommand();
}
break;
case 3:
this.enterOuterAlt(localctx, 3);
{
- this.state = 143;
+ this.state = 142;
this.keepCommand();
}
break;
case 4:
this.enterOuterAlt(localctx, 4);
{
- this.state = 144;
+ this.state = 143;
this.limitCommand();
}
break;
case 5:
this.enterOuterAlt(localctx, 5);
{
- this.state = 145;
+ this.state = 144;
this.statsCommand();
}
break;
case 6:
this.enterOuterAlt(localctx, 6);
{
- this.state = 146;
+ this.state = 145;
this.sortCommand();
}
break;
case 7:
this.enterOuterAlt(localctx, 7);
{
- this.state = 147;
+ this.state = 146;
this.dropCommand();
}
break;
case 8:
this.enterOuterAlt(localctx, 8);
{
- this.state = 148;
+ this.state = 147;
this.renameCommand();
}
break;
case 9:
this.enterOuterAlt(localctx, 9);
{
- this.state = 149;
+ this.state = 148;
this.dissectCommand();
}
break;
case 10:
this.enterOuterAlt(localctx, 10);
{
- this.state = 150;
+ this.state = 149;
this.grokCommand();
}
break;
case 11:
this.enterOuterAlt(localctx, 11);
{
- this.state = 151;
+ this.state = 150;
this.enrichCommand();
}
break;
case 12:
this.enterOuterAlt(localctx, 12);
{
- this.state = 152;
+ this.state = 151;
this.mvExpandCommand();
}
break;
case 13:
this.enterOuterAlt(localctx, 13);
{
- this.state = 153;
+ this.state = 152;
if (!(this.isDevVersion())) {
throw this.createFailedPredicateException("this.isDevVersion()");
}
- this.state = 154;
+ this.state = 153;
this.inlinestatsCommand();
}
break;
case 14:
this.enterOuterAlt(localctx, 14);
{
- this.state = 155;
+ this.state = 154;
if (!(this.isDevVersion())) {
throw this.createFailedPredicateException("this.isDevVersion()");
}
- this.state = 156;
+ this.state = 155;
this.lookupCommand();
}
break;
@@ -700,9 +682,9 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 159;
+ this.state = 158;
this.match(esql_parser.WHERE);
- this.state = 160;
+ this.state = 159;
this.booleanExpression(0);
}
}
@@ -740,7 +722,7 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 192;
+ this.state = 191;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 6, this._ctx) ) {
case 1:
@@ -749,9 +731,9 @@ export default class esql_parser extends parser_config {
this._ctx = localctx;
_prevctx = localctx;
- this.state = 163;
+ this.state = 162;
this.match(esql_parser.NOT);
- this.state = 164;
+ this.state = 163;
this.booleanExpression(8);
}
break;
@@ -760,7 +742,7 @@ export default class esql_parser extends parser_config {
localctx = new BooleanDefaultContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 165;
+ this.state = 164;
this.valueExpression();
}
break;
@@ -769,7 +751,7 @@ export default class esql_parser extends parser_config {
localctx = new RegexExpressionContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 166;
+ this.state = 165;
this.regexBooleanExpression();
}
break;
@@ -778,41 +760,41 @@ export default class esql_parser extends parser_config {
localctx = new LogicalInContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 167;
+ this.state = 166;
this.valueExpression();
- this.state = 169;
+ this.state = 168;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===45) {
+ if (_la===44) {
{
- this.state = 168;
+ this.state = 167;
this.match(esql_parser.NOT);
}
}
- this.state = 171;
+ this.state = 170;
this.match(esql_parser.IN);
- this.state = 172;
+ this.state = 171;
this.match(esql_parser.LP);
- this.state = 173;
+ this.state = 172;
this.valueExpression();
- this.state = 178;
+ this.state = 177;
this._errHandler.sync(this);
_la = this._input.LA(1);
- while (_la===35) {
+ while (_la===34) {
{
{
- this.state = 174;
+ this.state = 173;
this.match(esql_parser.COMMA);
- this.state = 175;
+ this.state = 174;
this.valueExpression();
}
}
- this.state = 180;
+ this.state = 179;
this._errHandler.sync(this);
_la = this._input.LA(1);
}
- this.state = 181;
+ this.state = 180;
this.match(esql_parser.RP);
}
break;
@@ -821,21 +803,21 @@ export default class esql_parser extends parser_config {
localctx = new IsNullContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 183;
+ this.state = 182;
this.valueExpression();
- this.state = 184;
+ this.state = 183;
this.match(esql_parser.IS);
- this.state = 186;
+ this.state = 185;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===45) {
+ if (_la===44) {
{
- this.state = 185;
+ this.state = 184;
this.match(esql_parser.NOT);
}
}
- this.state = 188;
+ this.state = 187;
this.match(esql_parser.NULL);
}
break;
@@ -844,17 +826,17 @@ export default class esql_parser extends parser_config {
localctx = new MatchExpressionContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 190;
+ this.state = 189;
if (!(this.isDevVersion())) {
throw this.createFailedPredicateException("this.isDevVersion()");
}
- this.state = 191;
+ this.state = 190;
this.matchBooleanExpression();
}
break;
}
this._ctx.stop = this._input.LT(-1);
- this.state = 202;
+ this.state = 201;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 8, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -864,7 +846,7 @@ export default class esql_parser extends parser_config {
}
_prevctx = localctx;
{
- this.state = 200;
+ this.state = 199;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 7, this._ctx) ) {
case 1:
@@ -872,13 +854,13 @@ export default class esql_parser extends parser_config {
localctx = new LogicalBinaryContext(this, new BooleanExpressionContext(this, _parentctx, _parentState));
(localctx as LogicalBinaryContext)._left = _prevctx;
this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_booleanExpression);
- this.state = 194;
+ this.state = 193;
if (!(this.precpred(this._ctx, 5))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 5)");
}
- this.state = 195;
+ this.state = 194;
(localctx as LogicalBinaryContext)._operator = this.match(esql_parser.AND);
- this.state = 196;
+ this.state = 195;
(localctx as LogicalBinaryContext)._right = this.booleanExpression(6);
}
break;
@@ -887,20 +869,20 @@ export default class esql_parser extends parser_config {
localctx = new LogicalBinaryContext(this, new BooleanExpressionContext(this, _parentctx, _parentState));
(localctx as LogicalBinaryContext)._left = _prevctx;
this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_booleanExpression);
- this.state = 197;
+ this.state = 196;
if (!(this.precpred(this._ctx, 4))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 4)");
}
- this.state = 198;
+ this.state = 197;
(localctx as LogicalBinaryContext)._operator = this.match(esql_parser.OR);
- this.state = 199;
+ this.state = 198;
(localctx as LogicalBinaryContext)._right = this.booleanExpression(5);
}
break;
}
}
}
- this.state = 204;
+ this.state = 203;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 8, this._ctx);
}
@@ -926,48 +908,48 @@ export default class esql_parser extends parser_config {
this.enterRule(localctx, 12, esql_parser.RULE_regexBooleanExpression);
let _la: number;
try {
- this.state = 219;
+ this.state = 218;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 11, this._ctx) ) {
case 1:
this.enterOuterAlt(localctx, 1);
{
- this.state = 205;
+ this.state = 204;
this.valueExpression();
- this.state = 207;
+ this.state = 206;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===45) {
+ if (_la===44) {
{
- this.state = 206;
+ this.state = 205;
this.match(esql_parser.NOT);
}
}
- this.state = 209;
+ this.state = 208;
localctx._kind = this.match(esql_parser.LIKE);
- this.state = 210;
+ this.state = 209;
localctx._pattern = this.string_();
}
break;
case 2:
this.enterOuterAlt(localctx, 2);
{
- this.state = 212;
+ this.state = 211;
this.valueExpression();
- this.state = 214;
+ this.state = 213;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===45) {
+ if (_la===44) {
{
- this.state = 213;
+ this.state = 212;
this.match(esql_parser.NOT);
}
}
- this.state = 216;
+ this.state = 215;
localctx._kind = this.match(esql_parser.RLIKE);
- this.state = 217;
+ this.state = 216;
localctx._pattern = this.string_();
}
break;
@@ -994,11 +976,11 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 221;
+ this.state = 220;
this.valueExpression();
- this.state = 222;
+ this.state = 221;
this.match(esql_parser.DEV_MATCH);
- this.state = 223;
+ this.state = 222;
localctx._queryString = this.string_();
}
}
@@ -1021,14 +1003,14 @@ export default class esql_parser extends parser_config {
let localctx: ValueExpressionContext = new ValueExpressionContext(this, this._ctx, this.state);
this.enterRule(localctx, 16, esql_parser.RULE_valueExpression);
try {
- this.state = 230;
+ this.state = 229;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 12, this._ctx) ) {
case 1:
localctx = new ValueExpressionDefaultContext(this, localctx);
this.enterOuterAlt(localctx, 1);
{
- this.state = 225;
+ this.state = 224;
this.operatorExpression(0);
}
break;
@@ -1036,11 +1018,11 @@ export default class esql_parser extends parser_config {
localctx = new ComparisonContext(this, localctx);
this.enterOuterAlt(localctx, 2);
{
- this.state = 226;
+ this.state = 225;
(localctx as ComparisonContext)._left = this.operatorExpression(0);
- this.state = 227;
+ this.state = 226;
this.comparisonOperator();
- this.state = 228;
+ this.state = 227;
(localctx as ComparisonContext)._right = this.operatorExpression(0);
}
break;
@@ -1080,7 +1062,7 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 236;
+ this.state = 235;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 13, this._ctx) ) {
case 1:
@@ -1089,7 +1071,7 @@ export default class esql_parser extends parser_config {
this._ctx = localctx;
_prevctx = localctx;
- this.state = 233;
+ this.state = 232;
this.primaryExpression(0);
}
break;
@@ -1098,23 +1080,23 @@ export default class esql_parser extends parser_config {
localctx = new ArithmeticUnaryContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 234;
+ this.state = 233;
(localctx as ArithmeticUnaryContext)._operator = this._input.LT(1);
_la = this._input.LA(1);
- if(!(_la===60 || _la===61)) {
+ if(!(_la===59 || _la===60)) {
(localctx as ArithmeticUnaryContext)._operator = this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 235;
+ this.state = 234;
this.operatorExpression(3);
}
break;
}
this._ctx.stop = this._input.LT(-1);
- this.state = 246;
+ this.state = 245;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 15, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -1124,7 +1106,7 @@ export default class esql_parser extends parser_config {
}
_prevctx = localctx;
{
- this.state = 244;
+ this.state = 243;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 14, this._ctx) ) {
case 1:
@@ -1132,21 +1114,21 @@ export default class esql_parser extends parser_config {
localctx = new ArithmeticBinaryContext(this, new OperatorExpressionContext(this, _parentctx, _parentState));
(localctx as ArithmeticBinaryContext)._left = _prevctx;
this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_operatorExpression);
- this.state = 238;
+ this.state = 237;
if (!(this.precpred(this._ctx, 2))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 2)");
}
- this.state = 239;
+ this.state = 238;
(localctx as ArithmeticBinaryContext)._operator = this._input.LT(1);
_la = this._input.LA(1);
- if(!(((((_la - 62)) & ~0x1F) === 0 && ((1 << (_la - 62)) & 7) !== 0))) {
+ if(!(((((_la - 61)) & ~0x1F) === 0 && ((1 << (_la - 61)) & 7) !== 0))) {
(localctx as ArithmeticBinaryContext)._operator = this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 240;
+ this.state = 239;
(localctx as ArithmeticBinaryContext)._right = this.operatorExpression(3);
}
break;
@@ -1155,28 +1137,28 @@ export default class esql_parser extends parser_config {
localctx = new ArithmeticBinaryContext(this, new OperatorExpressionContext(this, _parentctx, _parentState));
(localctx as ArithmeticBinaryContext)._left = _prevctx;
this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_operatorExpression);
- this.state = 241;
+ this.state = 240;
if (!(this.precpred(this._ctx, 1))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 1)");
}
- this.state = 242;
+ this.state = 241;
(localctx as ArithmeticBinaryContext)._operator = this._input.LT(1);
_la = this._input.LA(1);
- if(!(_la===60 || _la===61)) {
+ if(!(_la===59 || _la===60)) {
(localctx as ArithmeticBinaryContext)._operator = this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 243;
+ this.state = 242;
(localctx as ArithmeticBinaryContext)._right = this.operatorExpression(2);
}
break;
}
}
}
- this.state = 248;
+ this.state = 247;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 15, this._ctx);
}
@@ -1215,7 +1197,7 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 257;
+ this.state = 256;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 16, this._ctx) ) {
case 1:
@@ -1224,7 +1206,7 @@ export default class esql_parser extends parser_config {
this._ctx = localctx;
_prevctx = localctx;
- this.state = 250;
+ this.state = 249;
this.constant();
}
break;
@@ -1233,7 +1215,7 @@ export default class esql_parser extends parser_config {
localctx = new DereferenceContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 251;
+ this.state = 250;
this.qualifiedName();
}
break;
@@ -1242,7 +1224,7 @@ export default class esql_parser extends parser_config {
localctx = new FunctionContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 252;
+ this.state = 251;
this.functionExpression();
}
break;
@@ -1251,17 +1233,17 @@ export default class esql_parser extends parser_config {
localctx = new ParenthesizedExpressionContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 253;
+ this.state = 252;
this.match(esql_parser.LP);
- this.state = 254;
+ this.state = 253;
this.booleanExpression(0);
- this.state = 255;
+ this.state = 254;
this.match(esql_parser.RP);
}
break;
}
this._ctx.stop = this._input.LT(-1);
- this.state = 264;
+ this.state = 263;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 17, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -1274,18 +1256,18 @@ export default class esql_parser extends parser_config {
{
localctx = new InlineCastContext(this, new PrimaryExpressionContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_primaryExpression);
- this.state = 259;
+ this.state = 258;
if (!(this.precpred(this._ctx, 1))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 1)");
}
- this.state = 260;
+ this.state = 259;
this.match(esql_parser.CAST_OP);
- this.state = 261;
+ this.state = 260;
this.dataType();
}
}
}
- this.state = 266;
+ this.state = 265;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 17, this._ctx);
}
@@ -1313,37 +1295,37 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
+ this.state = 266;
+ this.identifierOrParameter();
this.state = 267;
- this.identifier();
- this.state = 268;
this.match(esql_parser.LP);
- this.state = 278;
+ this.state = 277;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 19, this._ctx) ) {
case 1:
{
- this.state = 269;
+ this.state = 268;
this.match(esql_parser.ASTERISK);
}
break;
case 2:
{
{
- this.state = 270;
+ this.state = 269;
this.booleanExpression(0);
- this.state = 275;
+ this.state = 274;
this._errHandler.sync(this);
_la = this._input.LA(1);
- while (_la===35) {
+ while (_la===34) {
{
{
- this.state = 271;
+ this.state = 270;
this.match(esql_parser.COMMA);
- this.state = 272;
+ this.state = 271;
this.booleanExpression(0);
}
}
- this.state = 277;
+ this.state = 276;
this._errHandler.sync(this);
_la = this._input.LA(1);
}
@@ -1351,7 +1333,7 @@ export default class esql_parser extends parser_config {
}
break;
}
- this.state = 280;
+ this.state = 279;
this.match(esql_parser.RP);
}
}
@@ -1377,7 +1359,7 @@ export default class esql_parser extends parser_config {
localctx = new ToDataTypeContext(this, localctx);
this.enterOuterAlt(localctx, 1);
{
- this.state = 282;
+ this.state = 281;
this.identifier();
}
}
@@ -1402,9 +1384,9 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 284;
+ this.state = 283;
this.match(esql_parser.ROW);
- this.state = 285;
+ this.state = 284;
this.fields();
}
}
@@ -1430,23 +1412,23 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 287;
+ this.state = 286;
this.field();
- this.state = 292;
+ this.state = 291;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 20, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 288;
+ this.state = 287;
this.match(esql_parser.COMMA);
- this.state = 289;
+ this.state = 288;
this.field();
}
}
}
- this.state = 294;
+ this.state = 293;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 20, this._ctx);
}
@@ -1471,24 +1453,24 @@ export default class esql_parser extends parser_config {
let localctx: FieldContext = new FieldContext(this, this._ctx, this.state);
this.enterRule(localctx, 30, esql_parser.RULE_field);
try {
- this.state = 300;
+ this.state = 299;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 21, this._ctx) ) {
case 1:
this.enterOuterAlt(localctx, 1);
{
- this.state = 295;
+ this.state = 294;
this.booleanExpression(0);
}
break;
case 2:
this.enterOuterAlt(localctx, 2);
{
- this.state = 296;
+ this.state = 295;
this.qualifiedName();
- this.state = 297;
+ this.state = 296;
this.match(esql_parser.ASSIGN);
- this.state = 298;
+ this.state = 297;
this.booleanExpression(0);
}
break;
@@ -1516,34 +1498,34 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 302;
+ this.state = 301;
this.match(esql_parser.FROM);
- this.state = 303;
+ this.state = 302;
this.indexPattern();
- this.state = 308;
+ this.state = 307;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 22, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 304;
+ this.state = 303;
this.match(esql_parser.COMMA);
- this.state = 305;
+ this.state = 304;
this.indexPattern();
}
}
}
- this.state = 310;
+ this.state = 309;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 22, this._ctx);
}
- this.state = 312;
+ this.state = 311;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 23, this._ctx) ) {
case 1:
{
- this.state = 311;
+ this.state = 310;
this.metadata();
}
break;
@@ -1569,24 +1551,24 @@ export default class esql_parser extends parser_config {
let localctx: IndexPatternContext = new IndexPatternContext(this, this._ctx, this.state);
this.enterRule(localctx, 34, esql_parser.RULE_indexPattern);
try {
- this.state = 319;
+ this.state = 318;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 24, this._ctx) ) {
case 1:
this.enterOuterAlt(localctx, 1);
{
- this.state = 314;
+ this.state = 313;
this.clusterString();
- this.state = 315;
+ this.state = 314;
this.match(esql_parser.COLON);
- this.state = 316;
+ this.state = 315;
this.indexString();
}
break;
case 2:
this.enterOuterAlt(localctx, 2);
{
- this.state = 318;
+ this.state = 317;
this.indexString();
}
break;
@@ -1613,7 +1595,7 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 321;
+ this.state = 320;
this.match(esql_parser.UNQUOTED_SOURCE);
}
}
@@ -1639,9 +1621,9 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 323;
+ this.state = 322;
_la = this._input.LA(1);
- if(!(_la===27 || _la===77)) {
+ if(!(_la===26 || _la===76)) {
this._errHandler.recoverInline(this);
}
else {
@@ -1669,20 +1651,20 @@ export default class esql_parser extends parser_config {
let localctx: MetadataContext = new MetadataContext(this, this._ctx, this.state);
this.enterRule(localctx, 40, esql_parser.RULE_metadata);
try {
- this.state = 327;
+ this.state = 326;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 76:
+ case 75:
this.enterOuterAlt(localctx, 1);
{
- this.state = 325;
+ this.state = 324;
this.metadataOption();
}
break;
- case 66:
+ case 65:
this.enterOuterAlt(localctx, 2);
{
- this.state = 326;
+ this.state = 325;
this.deprecated_metadata();
}
break;
@@ -1712,25 +1694,25 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 329;
+ this.state = 328;
this.match(esql_parser.METADATA);
- this.state = 330;
+ this.state = 329;
this.match(esql_parser.UNQUOTED_SOURCE);
- this.state = 335;
+ this.state = 334;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 331;
+ this.state = 330;
this.match(esql_parser.COMMA);
- this.state = 332;
+ this.state = 331;
this.match(esql_parser.UNQUOTED_SOURCE);
}
}
}
- this.state = 337;
+ this.state = 336;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
}
@@ -1757,11 +1739,11 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 338;
+ this.state = 337;
this.match(esql_parser.OPENING_BRACKET);
- this.state = 339;
+ this.state = 338;
this.metadataOption();
- this.state = 340;
+ this.state = 339;
this.match(esql_parser.CLOSING_BRACKET);
}
}
@@ -1787,46 +1769,46 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 342;
+ this.state = 341;
this.match(esql_parser.DEV_METRICS);
- this.state = 343;
+ this.state = 342;
this.indexPattern();
- this.state = 348;
+ this.state = 347;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 27, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 344;
+ this.state = 343;
this.match(esql_parser.COMMA);
- this.state = 345;
+ this.state = 344;
this.indexPattern();
}
}
}
- this.state = 350;
+ this.state = 349;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 27, this._ctx);
}
- this.state = 352;
+ this.state = 351;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 28, this._ctx) ) {
case 1:
{
- this.state = 351;
+ this.state = 350;
localctx._aggregates = this.fields();
}
break;
}
- this.state = 356;
+ this.state = 355;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 29, this._ctx) ) {
case 1:
{
- this.state = 354;
+ this.state = 353;
this.match(esql_parser.BY);
- this.state = 355;
+ this.state = 354;
localctx._grouping = this.fields();
}
break;
@@ -1854,9 +1836,9 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 358;
+ this.state = 357;
this.match(esql_parser.EVAL);
- this.state = 359;
+ this.state = 358;
this.fields();
}
}
@@ -1881,26 +1863,26 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 361;
+ this.state = 360;
this.match(esql_parser.STATS);
- this.state = 363;
+ this.state = 362;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 30, this._ctx) ) {
case 1:
{
- this.state = 362;
+ this.state = 361;
localctx._stats = this.fields();
}
break;
}
- this.state = 367;
+ this.state = 366;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 31, this._ctx) ) {
case 1:
{
- this.state = 365;
+ this.state = 364;
this.match(esql_parser.BY);
- this.state = 366;
+ this.state = 365;
localctx._grouping = this.fields();
}
break;
@@ -1929,23 +1911,23 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 369;
- this.identifier();
- this.state = 374;
+ this.state = 368;
+ this.identifierOrParameter();
+ this.state = 373;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 32, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 370;
+ this.state = 369;
this.match(esql_parser.DOT);
- this.state = 371;
- this.identifier();
+ this.state = 370;
+ this.identifierOrParameter();
}
}
}
- this.state = 376;
+ this.state = 375;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 32, this._ctx);
}
@@ -1973,23 +1955,23 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 377;
+ this.state = 376;
this.identifierPattern();
- this.state = 382;
+ this.state = 381;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 378;
+ this.state = 377;
this.match(esql_parser.DOT);
- this.state = 379;
+ this.state = 378;
this.identifierPattern();
}
}
}
- this.state = 384;
+ this.state = 383;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
}
@@ -2017,23 +1999,23 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 385;
+ this.state = 384;
this.qualifiedNamePattern();
- this.state = 390;
+ this.state = 389;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 34, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 386;
+ this.state = 385;
this.match(esql_parser.COMMA);
- this.state = 387;
+ this.state = 386;
this.qualifiedNamePattern();
}
}
}
- this.state = 392;
+ this.state = 391;
this._errHandler.sync(this);
_alt = this._interp.adaptivePredict(this._input, 34, this._ctx);
}
@@ -2061,9 +2043,9 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 393;
+ this.state = 392;
_la = this._input.LA(1);
- if(!(_la===68 || _la===69)) {
+ if(!(_la===67 || _la===68)) {
this._errHandler.recoverInline(this);
}
else {
@@ -2091,10 +2073,26 @@ export default class esql_parser extends parser_config {
let localctx: IdentifierPatternContext = new IdentifierPatternContext(this, this._ctx, this.state);
this.enterRule(localctx, 60, esql_parser.RULE_identifierPattern);
try {
- this.enterOuterAlt(localctx, 1);
- {
- this.state = 395;
- this.match(esql_parser.ID_PATTERN);
+ this.state = 396;
+ this._errHandler.sync(this);
+ switch (this._input.LA(1)) {
+ case 80:
+ this.enterOuterAlt(localctx, 1);
+ {
+ this.state = 394;
+ this.match(esql_parser.ID_PATTERN);
+ }
+ break;
+ case 48:
+ case 64:
+ this.enterOuterAlt(localctx, 2);
+ {
+ this.state = 395;
+ this.parameter();
+ }
+ break;
+ default:
+ throw new NoViableAltException(this);
}
}
catch (re) {
@@ -2117,14 +2115,14 @@ export default class esql_parser extends parser_config {
this.enterRule(localctx, 62, esql_parser.RULE_constant);
let _la: number;
try {
- this.state = 439;
+ this.state = 440;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 38, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 39, this._ctx) ) {
case 1:
localctx = new NullLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 1);
{
- this.state = 397;
+ this.state = 398;
this.match(esql_parser.NULL);
}
break;
@@ -2132,9 +2130,9 @@ export default class esql_parser extends parser_config {
localctx = new QualifiedIntegerLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 2);
{
- this.state = 398;
- this.integerValue();
this.state = 399;
+ this.integerValue();
+ this.state = 400;
this.match(esql_parser.UNQUOTED_IDENTIFIER);
}
break;
@@ -2142,7 +2140,7 @@ export default class esql_parser extends parser_config {
localctx = new DecimalLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 3);
{
- this.state = 401;
+ this.state = 402;
this.decimalValue();
}
break;
@@ -2150,7 +2148,7 @@ export default class esql_parser extends parser_config {
localctx = new IntegerLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 4);
{
- this.state = 402;
+ this.state = 403;
this.integerValue();
}
break;
@@ -2158,23 +2156,23 @@ export default class esql_parser extends parser_config {
localctx = new BooleanLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 5);
{
- this.state = 403;
+ this.state = 404;
this.booleanValue();
}
break;
case 6:
- localctx = new InputParamsContext(this, localctx);
+ localctx = new InputParameterContext(this, localctx);
this.enterOuterAlt(localctx, 6);
{
- this.state = 404;
- this.params();
+ this.state = 405;
+ this.parameter();
}
break;
case 7:
localctx = new StringLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 7);
{
- this.state = 405;
+ this.state = 406;
this.string_();
}
break;
@@ -2182,27 +2180,27 @@ export default class esql_parser extends parser_config {
localctx = new NumericArrayLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 8);
{
- this.state = 406;
- this.match(esql_parser.OPENING_BRACKET);
this.state = 407;
+ this.match(esql_parser.OPENING_BRACKET);
+ this.state = 408;
this.numericValue();
- this.state = 412;
+ this.state = 413;
this._errHandler.sync(this);
_la = this._input.LA(1);
- while (_la===35) {
+ while (_la===34) {
{
{
- this.state = 408;
- this.match(esql_parser.COMMA);
this.state = 409;
+ this.match(esql_parser.COMMA);
+ this.state = 410;
this.numericValue();
}
}
- this.state = 414;
+ this.state = 415;
this._errHandler.sync(this);
_la = this._input.LA(1);
}
- this.state = 415;
+ this.state = 416;
this.match(esql_parser.CLOSING_BRACKET);
}
break;
@@ -2210,27 +2208,27 @@ export default class esql_parser extends parser_config {
localctx = new BooleanArrayLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 9);
{
- this.state = 417;
- this.match(esql_parser.OPENING_BRACKET);
this.state = 418;
+ this.match(esql_parser.OPENING_BRACKET);
+ this.state = 419;
this.booleanValue();
- this.state = 423;
+ this.state = 424;
this._errHandler.sync(this);
_la = this._input.LA(1);
- while (_la===35) {
+ while (_la===34) {
{
{
- this.state = 419;
- this.match(esql_parser.COMMA);
this.state = 420;
+ this.match(esql_parser.COMMA);
+ this.state = 421;
this.booleanValue();
}
}
- this.state = 425;
+ this.state = 426;
this._errHandler.sync(this);
_la = this._input.LA(1);
}
- this.state = 426;
+ this.state = 427;
this.match(esql_parser.CLOSING_BRACKET);
}
break;
@@ -2238,27 +2236,27 @@ export default class esql_parser extends parser_config {
localctx = new StringArrayLiteralContext(this, localctx);
this.enterOuterAlt(localctx, 10);
{
- this.state = 428;
- this.match(esql_parser.OPENING_BRACKET);
this.state = 429;
+ this.match(esql_parser.OPENING_BRACKET);
+ this.state = 430;
this.string_();
- this.state = 434;
+ this.state = 435;
this._errHandler.sync(this);
_la = this._input.LA(1);
- while (_la===35) {
+ while (_la===34) {
{
{
- this.state = 430;
- this.match(esql_parser.COMMA);
this.state = 431;
+ this.match(esql_parser.COMMA);
+ this.state = 432;
this.string_();
}
}
- this.state = 436;
+ this.state = 437;
this._errHandler.sync(this);
_la = this._input.LA(1);
}
- this.state = 437;
+ this.state = 438;
this.match(esql_parser.CLOSING_BRACKET);
}
break;
@@ -2279,26 +2277,26 @@ export default class esql_parser extends parser_config {
return localctx;
}
// @RuleVersion(0)
- public params(): ParamsContext {
- let localctx: ParamsContext = new ParamsContext(this, this._ctx, this.state);
- this.enterRule(localctx, 64, esql_parser.RULE_params);
+ public parameter(): ParameterContext {
+ let localctx: ParameterContext = new ParameterContext(this, this._ctx, this.state);
+ this.enterRule(localctx, 64, esql_parser.RULE_parameter);
try {
- this.state = 443;
+ this.state = 444;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 49:
+ case 48:
localctx = new InputParamContext(this, localctx);
this.enterOuterAlt(localctx, 1);
{
- this.state = 441;
+ this.state = 442;
this.match(esql_parser.PARAM);
}
break;
- case 65:
+ case 64:
localctx = new InputNamedOrPositionalParamContext(this, localctx);
this.enterOuterAlt(localctx, 2);
{
- this.state = 442;
+ this.state = 443;
this.match(esql_parser.NAMED_OR_POSITIONAL_PARAM);
}
break;
@@ -2321,15 +2319,57 @@ export default class esql_parser extends parser_config {
return localctx;
}
// @RuleVersion(0)
+ public identifierOrParameter(): IdentifierOrParameterContext {
+ let localctx: IdentifierOrParameterContext = new IdentifierOrParameterContext(this, this._ctx, this.state);
+ this.enterRule(localctx, 66, esql_parser.RULE_identifierOrParameter);
+ try {
+ this.state = 448;
+ this._errHandler.sync(this);
+ switch (this._input.LA(1)) {
+ case 67:
+ case 68:
+ this.enterOuterAlt(localctx, 1);
+ {
+ this.state = 446;
+ this.identifier();
+ }
+ break;
+ case 48:
+ case 64:
+ this.enterOuterAlt(localctx, 2);
+ {
+ this.state = 447;
+ this.parameter();
+ }
+ break;
+ default:
+ throw new NoViableAltException(this);
+ }
+ }
+ catch (re) {
+ if (re instanceof RecognitionException) {
+ localctx.exception = re;
+ this._errHandler.reportError(this, re);
+ this._errHandler.recover(this, re);
+ } else {
+ throw re;
+ }
+ }
+ finally {
+ this.exitRule();
+ }
+ return localctx;
+ }
+ // @RuleVersion(0)
public limitCommand(): LimitCommandContext {
let localctx: LimitCommandContext = new LimitCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 66, esql_parser.RULE_limitCommand);
+ this.enterRule(localctx, 68, esql_parser.RULE_limitCommand);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 445;
+ this.state = 450;
this.match(esql_parser.LIMIT);
- this.state = 446;
+ this.state = 451;
this.match(esql_parser.INTEGER_LITERAL);
}
}
@@ -2350,32 +2390,32 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public sortCommand(): SortCommandContext {
let localctx: SortCommandContext = new SortCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 68, esql_parser.RULE_sortCommand);
+ this.enterRule(localctx, 70, esql_parser.RULE_sortCommand);
try {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 448;
+ this.state = 453;
this.match(esql_parser.SORT);
- this.state = 449;
- this.orderExpression();
this.state = 454;
+ this.orderExpression();
+ this.state = 459;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 40, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 42, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 450;
+ this.state = 455;
this.match(esql_parser.COMMA);
- this.state = 451;
+ this.state = 456;
this.orderExpression();
}
}
}
- this.state = 456;
+ this.state = 461;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 40, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 42, this._ctx);
}
}
}
@@ -2396,22 +2436,22 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public orderExpression(): OrderExpressionContext {
let localctx: OrderExpressionContext = new OrderExpressionContext(this, this._ctx, this.state);
- this.enterRule(localctx, 70, esql_parser.RULE_orderExpression);
+ this.enterRule(localctx, 72, esql_parser.RULE_orderExpression);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 457;
+ this.state = 462;
this.booleanExpression(0);
- this.state = 459;
+ this.state = 464;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 41, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 43, this._ctx) ) {
case 1:
{
- this.state = 458;
+ this.state = 463;
localctx._ordering = this._input.LT(1);
_la = this._input.LA(1);
- if(!(_la===32 || _la===36)) {
+ if(!(_la===31 || _la===35)) {
localctx._ordering = this._errHandler.recoverInline(this);
}
else {
@@ -2421,17 +2461,17 @@ export default class esql_parser extends parser_config {
}
break;
}
- this.state = 463;
+ this.state = 468;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 42, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 44, this._ctx) ) {
case 1:
{
- this.state = 461;
+ this.state = 466;
this.match(esql_parser.NULLS);
- this.state = 462;
+ this.state = 467;
localctx._nullOrdering = this._input.LT(1);
_la = this._input.LA(1);
- if(!(_la===39 || _la===42)) {
+ if(!(_la===38 || _la===41)) {
localctx._nullOrdering = this._errHandler.recoverInline(this);
}
else {
@@ -2460,13 +2500,13 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public keepCommand(): KeepCommandContext {
let localctx: KeepCommandContext = new KeepCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 72, esql_parser.RULE_keepCommand);
+ this.enterRule(localctx, 74, esql_parser.RULE_keepCommand);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 465;
+ this.state = 470;
this.match(esql_parser.KEEP);
- this.state = 466;
+ this.state = 471;
this.qualifiedNamePatterns();
}
}
@@ -2487,13 +2527,13 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public dropCommand(): DropCommandContext {
let localctx: DropCommandContext = new DropCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 74, esql_parser.RULE_dropCommand);
+ this.enterRule(localctx, 76, esql_parser.RULE_dropCommand);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 468;
+ this.state = 473;
this.match(esql_parser.DROP);
- this.state = 469;
+ this.state = 474;
this.qualifiedNamePatterns();
}
}
@@ -2514,32 +2554,32 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public renameCommand(): RenameCommandContext {
let localctx: RenameCommandContext = new RenameCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 76, esql_parser.RULE_renameCommand);
+ this.enterRule(localctx, 78, esql_parser.RULE_renameCommand);
try {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 471;
+ this.state = 476;
this.match(esql_parser.RENAME);
- this.state = 472;
- this.renameClause();
this.state = 477;
+ this.renameClause();
+ this.state = 482;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 43, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 45, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 473;
+ this.state = 478;
this.match(esql_parser.COMMA);
- this.state = 474;
+ this.state = 479;
this.renameClause();
}
}
}
- this.state = 479;
+ this.state = 484;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 43, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 45, this._ctx);
}
}
}
@@ -2560,15 +2600,15 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public renameClause(): RenameClauseContext {
let localctx: RenameClauseContext = new RenameClauseContext(this, this._ctx, this.state);
- this.enterRule(localctx, 78, esql_parser.RULE_renameClause);
+ this.enterRule(localctx, 80, esql_parser.RULE_renameClause);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 480;
+ this.state = 485;
localctx._oldName = this.qualifiedNamePattern();
- this.state = 481;
+ this.state = 486;
this.match(esql_parser.AS);
- this.state = 482;
+ this.state = 487;
localctx._newName = this.qualifiedNamePattern();
}
}
@@ -2589,22 +2629,22 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public dissectCommand(): DissectCommandContext {
let localctx: DissectCommandContext = new DissectCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 80, esql_parser.RULE_dissectCommand);
+ this.enterRule(localctx, 82, esql_parser.RULE_dissectCommand);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 484;
+ this.state = 489;
this.match(esql_parser.DISSECT);
- this.state = 485;
+ this.state = 490;
this.primaryExpression(0);
- this.state = 486;
+ this.state = 491;
this.string_();
- this.state = 488;
+ this.state = 493;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 44, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 46, this._ctx) ) {
case 1:
{
- this.state = 487;
+ this.state = 492;
this.commandOptions();
}
break;
@@ -2628,15 +2668,15 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public grokCommand(): GrokCommandContext {
let localctx: GrokCommandContext = new GrokCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 82, esql_parser.RULE_grokCommand);
+ this.enterRule(localctx, 84, esql_parser.RULE_grokCommand);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 490;
+ this.state = 495;
this.match(esql_parser.GROK);
- this.state = 491;
+ this.state = 496;
this.primaryExpression(0);
- this.state = 492;
+ this.state = 497;
this.string_();
}
}
@@ -2657,13 +2697,13 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public mvExpandCommand(): MvExpandCommandContext {
let localctx: MvExpandCommandContext = new MvExpandCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 84, esql_parser.RULE_mvExpandCommand);
+ this.enterRule(localctx, 86, esql_parser.RULE_mvExpandCommand);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 494;
+ this.state = 499;
this.match(esql_parser.MV_EXPAND);
- this.state = 495;
+ this.state = 500;
this.qualifiedName();
}
}
@@ -2684,30 +2724,30 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public commandOptions(): CommandOptionsContext {
let localctx: CommandOptionsContext = new CommandOptionsContext(this, this._ctx, this.state);
- this.enterRule(localctx, 86, esql_parser.RULE_commandOptions);
+ this.enterRule(localctx, 88, esql_parser.RULE_commandOptions);
try {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 497;
- this.commandOption();
this.state = 502;
+ this.commandOption();
+ this.state = 507;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 45, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 47, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 498;
+ this.state = 503;
this.match(esql_parser.COMMA);
- this.state = 499;
+ this.state = 504;
this.commandOption();
}
}
}
- this.state = 504;
+ this.state = 509;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 45, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 47, this._ctx);
}
}
}
@@ -2728,15 +2768,15 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public commandOption(): CommandOptionContext {
let localctx: CommandOptionContext = new CommandOptionContext(this, this._ctx, this.state);
- this.enterRule(localctx, 88, esql_parser.RULE_commandOption);
+ this.enterRule(localctx, 90, esql_parser.RULE_commandOption);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 505;
+ this.state = 510;
this.identifier();
- this.state = 506;
+ this.state = 511;
this.match(esql_parser.ASSIGN);
- this.state = 507;
+ this.state = 512;
this.constant();
}
}
@@ -2757,14 +2797,14 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public booleanValue(): BooleanValueContext {
let localctx: BooleanValueContext = new BooleanValueContext(this, this._ctx, this.state);
- this.enterRule(localctx, 90, esql_parser.RULE_booleanValue);
+ this.enterRule(localctx, 92, esql_parser.RULE_booleanValue);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 509;
+ this.state = 514;
_la = this._input.LA(1);
- if(!(_la===38 || _la===52)) {
+ if(!(_la===37 || _la===51)) {
this._errHandler.recoverInline(this);
}
else {
@@ -2790,22 +2830,22 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public numericValue(): NumericValueContext {
let localctx: NumericValueContext = new NumericValueContext(this, this._ctx, this.state);
- this.enterRule(localctx, 92, esql_parser.RULE_numericValue);
+ this.enterRule(localctx, 94, esql_parser.RULE_numericValue);
try {
- this.state = 513;
+ this.state = 518;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 46, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 48, this._ctx) ) {
case 1:
this.enterOuterAlt(localctx, 1);
{
- this.state = 511;
+ this.state = 516;
this.decimalValue();
}
break;
case 2:
this.enterOuterAlt(localctx, 2);
{
- this.state = 512;
+ this.state = 517;
this.integerValue();
}
break;
@@ -2828,19 +2868,19 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public decimalValue(): DecimalValueContext {
let localctx: DecimalValueContext = new DecimalValueContext(this, this._ctx, this.state);
- this.enterRule(localctx, 94, esql_parser.RULE_decimalValue);
+ this.enterRule(localctx, 96, esql_parser.RULE_decimalValue);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 516;
+ this.state = 521;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===60 || _la===61) {
+ if (_la===59 || _la===60) {
{
- this.state = 515;
+ this.state = 520;
_la = this._input.LA(1);
- if(!(_la===60 || _la===61)) {
+ if(!(_la===59 || _la===60)) {
this._errHandler.recoverInline(this);
}
else {
@@ -2850,7 +2890,7 @@ export default class esql_parser extends parser_config {
}
}
- this.state = 518;
+ this.state = 523;
this.match(esql_parser.DECIMAL_LITERAL);
}
}
@@ -2871,19 +2911,19 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public integerValue(): IntegerValueContext {
let localctx: IntegerValueContext = new IntegerValueContext(this, this._ctx, this.state);
- this.enterRule(localctx, 96, esql_parser.RULE_integerValue);
+ this.enterRule(localctx, 98, esql_parser.RULE_integerValue);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 521;
+ this.state = 526;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===60 || _la===61) {
+ if (_la===59 || _la===60) {
{
- this.state = 520;
+ this.state = 525;
_la = this._input.LA(1);
- if(!(_la===60 || _la===61)) {
+ if(!(_la===59 || _la===60)) {
this._errHandler.recoverInline(this);
}
else {
@@ -2893,7 +2933,7 @@ export default class esql_parser extends parser_config {
}
}
- this.state = 523;
+ this.state = 528;
this.match(esql_parser.INTEGER_LITERAL);
}
}
@@ -2914,11 +2954,11 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public string_(): StringContext {
let localctx: StringContext = new StringContext(this, this._ctx, this.state);
- this.enterRule(localctx, 98, esql_parser.RULE_string);
+ this.enterRule(localctx, 100, esql_parser.RULE_string);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 525;
+ this.state = 530;
this.match(esql_parser.QUOTED_STRING);
}
}
@@ -2939,14 +2979,14 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public comparisonOperator(): ComparisonOperatorContext {
let localctx: ComparisonOperatorContext = new ComparisonOperatorContext(this, this._ctx, this.state);
- this.enterRule(localctx, 100, esql_parser.RULE_comparisonOperator);
+ this.enterRule(localctx, 102, esql_parser.RULE_comparisonOperator);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 527;
+ this.state = 532;
_la = this._input.LA(1);
- if(!(((((_la - 53)) & ~0x1F) === 0 && ((1 << (_la - 53)) & 125) !== 0))) {
+ if(!(((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & 125) !== 0))) {
this._errHandler.recoverInline(this);
}
else {
@@ -2972,13 +3012,13 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public explainCommand(): ExplainCommandContext {
let localctx: ExplainCommandContext = new ExplainCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 102, esql_parser.RULE_explainCommand);
+ this.enterRule(localctx, 104, esql_parser.RULE_explainCommand);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 529;
+ this.state = 534;
this.match(esql_parser.EXPLAIN);
- this.state = 530;
+ this.state = 535;
this.subqueryExpression();
}
}
@@ -2999,15 +3039,15 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public subqueryExpression(): SubqueryExpressionContext {
let localctx: SubqueryExpressionContext = new SubqueryExpressionContext(this, this._ctx, this.state);
- this.enterRule(localctx, 104, esql_parser.RULE_subqueryExpression);
+ this.enterRule(localctx, 106, esql_parser.RULE_subqueryExpression);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 532;
+ this.state = 537;
this.match(esql_parser.OPENING_BRACKET);
- this.state = 533;
+ this.state = 538;
this.query(0);
- this.state = 534;
+ this.state = 539;
this.match(esql_parser.CLOSING_BRACKET);
}
}
@@ -3028,14 +3068,14 @@ export default class esql_parser extends parser_config {
// @RuleVersion(0)
public showCommand(): ShowCommandContext {
let localctx: ShowCommandContext = new ShowCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 106, esql_parser.RULE_showCommand);
+ this.enterRule(localctx, 108, esql_parser.RULE_showCommand);
try {
localctx = new ShowInfoContext(this, localctx);
this.enterOuterAlt(localctx, 1);
{
- this.state = 536;
+ this.state = 541;
this.match(esql_parser.SHOW);
- this.state = 537;
+ this.state = 542;
this.match(esql_parser.INFO);
}
}
@@ -3054,34 +3094,6 @@ export default class esql_parser extends parser_config {
return localctx;
}
// @RuleVersion(0)
- public metaCommand(): MetaCommandContext {
- let localctx: MetaCommandContext = new MetaCommandContext(this, this._ctx, this.state);
- this.enterRule(localctx, 108, esql_parser.RULE_metaCommand);
- try {
- localctx = new MetaFunctionsContext(this, localctx);
- this.enterOuterAlt(localctx, 1);
- {
- this.state = 539;
- this.match(esql_parser.META);
- this.state = 540;
- this.match(esql_parser.FUNCTIONS);
- }
- }
- catch (re) {
- if (re instanceof RecognitionException) {
- localctx.exception = re;
- this._errHandler.reportError(this, re);
- this._errHandler.recover(this, re);
- } else {
- throw re;
- }
- }
- finally {
- this.exitRule();
- }
- return localctx;
- }
- // @RuleVersion(0)
public enrichCommand(): EnrichCommandContext {
let localctx: EnrichCommandContext = new EnrichCommandContext(this, this._ctx, this.state);
this.enterRule(localctx, 110, esql_parser.RULE_enrichCommand);
@@ -3089,48 +3101,48 @@ export default class esql_parser extends parser_config {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 542;
+ this.state = 544;
this.match(esql_parser.ENRICH);
- this.state = 543;
+ this.state = 545;
localctx._policyName = this.match(esql_parser.ENRICH_POLICY_NAME);
- this.state = 546;
+ this.state = 548;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 49, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 51, this._ctx) ) {
case 1:
{
- this.state = 544;
+ this.state = 546;
this.match(esql_parser.ON);
- this.state = 545;
+ this.state = 547;
localctx._matchField = this.qualifiedNamePattern();
}
break;
}
- this.state = 557;
+ this.state = 559;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 51, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 53, this._ctx) ) {
case 1:
{
- this.state = 548;
+ this.state = 550;
this.match(esql_parser.WITH);
- this.state = 549;
+ this.state = 551;
this.enrichWithClause();
- this.state = 554;
+ this.state = 556;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 50, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 52, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
{
{
- this.state = 550;
+ this.state = 552;
this.match(esql_parser.COMMA);
- this.state = 551;
+ this.state = 553;
this.enrichWithClause();
}
}
}
- this.state = 556;
+ this.state = 558;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 50, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 52, this._ctx);
}
}
break;
@@ -3158,19 +3170,19 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 562;
+ this.state = 564;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 52, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 54, this._ctx) ) {
case 1:
{
- this.state = 559;
+ this.state = 561;
localctx._newName = this.qualifiedNamePattern();
- this.state = 560;
+ this.state = 562;
this.match(esql_parser.ASSIGN);
}
break;
}
- this.state = 564;
+ this.state = 566;
localctx._enrichField = this.qualifiedNamePattern();
}
}
@@ -3195,13 +3207,13 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 566;
+ this.state = 568;
this.match(esql_parser.DEV_LOOKUP);
- this.state = 567;
+ this.state = 569;
localctx._tableName = this.indexPattern();
- this.state = 568;
+ this.state = 570;
this.match(esql_parser.ON);
- this.state = 569;
+ this.state = 571;
localctx._matchFields = this.qualifiedNamePatterns();
}
}
@@ -3226,18 +3238,18 @@ export default class esql_parser extends parser_config {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 571;
+ this.state = 573;
this.match(esql_parser.DEV_INLINESTATS);
- this.state = 572;
+ this.state = 574;
localctx._stats = this.fields();
- this.state = 575;
+ this.state = 577;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 53, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 55, this._ctx) ) {
case 1:
{
- this.state = 573;
+ this.state = 575;
this.match(esql_parser.BY);
- this.state = 574;
+ this.state = 576;
localctx._grouping = this.fields();
}
break;
@@ -3327,7 +3339,7 @@ export default class esql_parser extends parser_config {
return true;
}
- public static readonly _serializedATN: number[] = [4,1,125,578,2,0,7,0,
+ public static readonly _serializedATN: number[] = [4,1,120,580,2,0,7,0,
2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,
2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,
17,7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,
@@ -3337,184 +3349,186 @@ export default class esql_parser extends parser_config {
46,7,46,2,47,7,47,2,48,7,48,2,49,7,49,2,50,7,50,2,51,7,51,2,52,7,52,2,53,
7,53,2,54,7,54,2,55,7,55,2,56,7,56,2,57,7,57,2,58,7,58,1,0,1,0,1,0,1,1,
1,1,1,1,1,1,1,1,1,1,5,1,128,8,1,10,1,12,1,131,9,1,1,2,1,2,1,2,1,2,1,2,1,
- 2,1,2,3,2,140,8,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,
- 3,1,3,1,3,3,3,158,8,3,1,4,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,3,5,170,8,
- 5,1,5,1,5,1,5,1,5,1,5,5,5,177,8,5,10,5,12,5,180,9,5,1,5,1,5,1,5,1,5,1,5,
- 3,5,187,8,5,1,5,1,5,1,5,1,5,3,5,193,8,5,1,5,1,5,1,5,1,5,1,5,1,5,5,5,201,
- 8,5,10,5,12,5,204,9,5,1,6,1,6,3,6,208,8,6,1,6,1,6,1,6,1,6,1,6,3,6,215,8,
- 6,1,6,1,6,1,6,3,6,220,8,6,1,7,1,7,1,7,1,7,1,8,1,8,1,8,1,8,1,8,3,8,231,8,
- 8,1,9,1,9,1,9,1,9,3,9,237,8,9,1,9,1,9,1,9,1,9,1,9,1,9,5,9,245,8,9,10,9,
- 12,9,248,9,9,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,3,10,258,8,10,1,10,
- 1,10,1,10,5,10,263,8,10,10,10,12,10,266,9,10,1,11,1,11,1,11,1,11,1,11,1,
- 11,5,11,274,8,11,10,11,12,11,277,9,11,3,11,279,8,11,1,11,1,11,1,12,1,12,
- 1,13,1,13,1,13,1,14,1,14,1,14,5,14,291,8,14,10,14,12,14,294,9,14,1,15,1,
- 15,1,15,1,15,1,15,3,15,301,8,15,1,16,1,16,1,16,1,16,5,16,307,8,16,10,16,
- 12,16,310,9,16,1,16,3,16,313,8,16,1,17,1,17,1,17,1,17,1,17,3,17,320,8,17,
- 1,18,1,18,1,19,1,19,1,20,1,20,3,20,328,8,20,1,21,1,21,1,21,1,21,5,21,334,
- 8,21,10,21,12,21,337,9,21,1,22,1,22,1,22,1,22,1,23,1,23,1,23,1,23,5,23,
- 347,8,23,10,23,12,23,350,9,23,1,23,3,23,353,8,23,1,23,1,23,3,23,357,8,23,
- 1,24,1,24,1,24,1,25,1,25,3,25,364,8,25,1,25,1,25,3,25,368,8,25,1,26,1,26,
- 1,26,5,26,373,8,26,10,26,12,26,376,9,26,1,27,1,27,1,27,5,27,381,8,27,10,
- 27,12,27,384,9,27,1,28,1,28,1,28,5,28,389,8,28,10,28,12,28,392,9,28,1,29,
- 1,29,1,30,1,30,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,
- 31,1,31,5,31,411,8,31,10,31,12,31,414,9,31,1,31,1,31,1,31,1,31,1,31,1,31,
- 5,31,422,8,31,10,31,12,31,425,9,31,1,31,1,31,1,31,1,31,1,31,1,31,5,31,433,
- 8,31,10,31,12,31,436,9,31,1,31,1,31,3,31,440,8,31,1,32,1,32,3,32,444,8,
- 32,1,33,1,33,1,33,1,34,1,34,1,34,1,34,5,34,453,8,34,10,34,12,34,456,9,34,
- 1,35,1,35,3,35,460,8,35,1,35,1,35,3,35,464,8,35,1,36,1,36,1,36,1,37,1,37,
- 1,37,1,38,1,38,1,38,1,38,5,38,476,8,38,10,38,12,38,479,9,38,1,39,1,39,1,
- 39,1,39,1,40,1,40,1,40,1,40,3,40,489,8,40,1,41,1,41,1,41,1,41,1,42,1,42,
- 1,42,1,43,1,43,1,43,5,43,501,8,43,10,43,12,43,504,9,43,1,44,1,44,1,44,1,
- 44,1,45,1,45,1,46,1,46,3,46,514,8,46,1,47,3,47,517,8,47,1,47,1,47,1,48,
- 3,48,522,8,48,1,48,1,48,1,49,1,49,1,50,1,50,1,51,1,51,1,51,1,52,1,52,1,
- 52,1,52,1,53,1,53,1,53,1,54,1,54,1,54,1,55,1,55,1,55,1,55,3,55,547,8,55,
- 1,55,1,55,1,55,1,55,5,55,553,8,55,10,55,12,55,556,9,55,3,55,558,8,55,1,
- 56,1,56,1,56,3,56,563,8,56,1,56,1,56,1,57,1,57,1,57,1,57,1,57,1,58,1,58,
- 1,58,1,58,3,58,576,8,58,1,58,0,4,2,10,18,20,59,0,2,4,6,8,10,12,14,16,18,
- 20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,
- 68,70,72,74,76,78,80,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,
- 112,114,116,0,8,1,0,60,61,1,0,62,64,2,0,27,27,77,77,1,0,68,69,2,0,32,32,
- 36,36,2,0,39,39,42,42,2,0,38,38,52,52,2,0,53,53,55,59,603,0,118,1,0,0,0,
- 2,121,1,0,0,0,4,139,1,0,0,0,6,157,1,0,0,0,8,159,1,0,0,0,10,192,1,0,0,0,
- 12,219,1,0,0,0,14,221,1,0,0,0,16,230,1,0,0,0,18,236,1,0,0,0,20,257,1,0,
- 0,0,22,267,1,0,0,0,24,282,1,0,0,0,26,284,1,0,0,0,28,287,1,0,0,0,30,300,
- 1,0,0,0,32,302,1,0,0,0,34,319,1,0,0,0,36,321,1,0,0,0,38,323,1,0,0,0,40,
- 327,1,0,0,0,42,329,1,0,0,0,44,338,1,0,0,0,46,342,1,0,0,0,48,358,1,0,0,0,
- 50,361,1,0,0,0,52,369,1,0,0,0,54,377,1,0,0,0,56,385,1,0,0,0,58,393,1,0,
- 0,0,60,395,1,0,0,0,62,439,1,0,0,0,64,443,1,0,0,0,66,445,1,0,0,0,68,448,
- 1,0,0,0,70,457,1,0,0,0,72,465,1,0,0,0,74,468,1,0,0,0,76,471,1,0,0,0,78,
- 480,1,0,0,0,80,484,1,0,0,0,82,490,1,0,0,0,84,494,1,0,0,0,86,497,1,0,0,0,
- 88,505,1,0,0,0,90,509,1,0,0,0,92,513,1,0,0,0,94,516,1,0,0,0,96,521,1,0,
- 0,0,98,525,1,0,0,0,100,527,1,0,0,0,102,529,1,0,0,0,104,532,1,0,0,0,106,
- 536,1,0,0,0,108,539,1,0,0,0,110,542,1,0,0,0,112,562,1,0,0,0,114,566,1,0,
- 0,0,116,571,1,0,0,0,118,119,3,2,1,0,119,120,5,0,0,1,120,1,1,0,0,0,121,122,
- 6,1,-1,0,122,123,3,4,2,0,123,129,1,0,0,0,124,125,10,1,0,0,125,126,5,26,
- 0,0,126,128,3,6,3,0,127,124,1,0,0,0,128,131,1,0,0,0,129,127,1,0,0,0,129,
- 130,1,0,0,0,130,3,1,0,0,0,131,129,1,0,0,0,132,140,3,102,51,0,133,140,3,
- 32,16,0,134,140,3,108,54,0,135,140,3,26,13,0,136,140,3,106,53,0,137,138,
- 4,2,1,0,138,140,3,46,23,0,139,132,1,0,0,0,139,133,1,0,0,0,139,134,1,0,0,
- 0,139,135,1,0,0,0,139,136,1,0,0,0,139,137,1,0,0,0,140,5,1,0,0,0,141,158,
- 3,48,24,0,142,158,3,8,4,0,143,158,3,72,36,0,144,158,3,66,33,0,145,158,3,
- 50,25,0,146,158,3,68,34,0,147,158,3,74,37,0,148,158,3,76,38,0,149,158,3,
- 80,40,0,150,158,3,82,41,0,151,158,3,110,55,0,152,158,3,84,42,0,153,154,
- 4,3,2,0,154,158,3,116,58,0,155,156,4,3,3,0,156,158,3,114,57,0,157,141,1,
- 0,0,0,157,142,1,0,0,0,157,143,1,0,0,0,157,144,1,0,0,0,157,145,1,0,0,0,157,
- 146,1,0,0,0,157,147,1,0,0,0,157,148,1,0,0,0,157,149,1,0,0,0,157,150,1,0,
- 0,0,157,151,1,0,0,0,157,152,1,0,0,0,157,153,1,0,0,0,157,155,1,0,0,0,158,
- 7,1,0,0,0,159,160,5,17,0,0,160,161,3,10,5,0,161,9,1,0,0,0,162,163,6,5,-1,
- 0,163,164,5,45,0,0,164,193,3,10,5,8,165,193,3,16,8,0,166,193,3,12,6,0,167,
- 169,3,16,8,0,168,170,5,45,0,0,169,168,1,0,0,0,169,170,1,0,0,0,170,171,1,
- 0,0,0,171,172,5,40,0,0,172,173,5,44,0,0,173,178,3,16,8,0,174,175,5,35,0,
- 0,175,177,3,16,8,0,176,174,1,0,0,0,177,180,1,0,0,0,178,176,1,0,0,0,178,
- 179,1,0,0,0,179,181,1,0,0,0,180,178,1,0,0,0,181,182,5,51,0,0,182,193,1,
- 0,0,0,183,184,3,16,8,0,184,186,5,41,0,0,185,187,5,45,0,0,186,185,1,0,0,
- 0,186,187,1,0,0,0,187,188,1,0,0,0,188,189,5,46,0,0,189,193,1,0,0,0,190,
- 191,4,5,4,0,191,193,3,14,7,0,192,162,1,0,0,0,192,165,1,0,0,0,192,166,1,
- 0,0,0,192,167,1,0,0,0,192,183,1,0,0,0,192,190,1,0,0,0,193,202,1,0,0,0,194,
- 195,10,5,0,0,195,196,5,31,0,0,196,201,3,10,5,6,197,198,10,4,0,0,198,199,
- 5,48,0,0,199,201,3,10,5,5,200,194,1,0,0,0,200,197,1,0,0,0,201,204,1,0,0,
- 0,202,200,1,0,0,0,202,203,1,0,0,0,203,11,1,0,0,0,204,202,1,0,0,0,205,207,
- 3,16,8,0,206,208,5,45,0,0,207,206,1,0,0,0,207,208,1,0,0,0,208,209,1,0,0,
- 0,209,210,5,43,0,0,210,211,3,98,49,0,211,220,1,0,0,0,212,214,3,16,8,0,213,
- 215,5,45,0,0,214,213,1,0,0,0,214,215,1,0,0,0,215,216,1,0,0,0,216,217,5,
- 50,0,0,217,218,3,98,49,0,218,220,1,0,0,0,219,205,1,0,0,0,219,212,1,0,0,
- 0,220,13,1,0,0,0,221,222,3,16,8,0,222,223,5,20,0,0,223,224,3,98,49,0,224,
- 15,1,0,0,0,225,231,3,18,9,0,226,227,3,18,9,0,227,228,3,100,50,0,228,229,
- 3,18,9,0,229,231,1,0,0,0,230,225,1,0,0,0,230,226,1,0,0,0,231,17,1,0,0,0,
- 232,233,6,9,-1,0,233,237,3,20,10,0,234,235,7,0,0,0,235,237,3,18,9,3,236,
- 232,1,0,0,0,236,234,1,0,0,0,237,246,1,0,0,0,238,239,10,2,0,0,239,240,7,
- 1,0,0,240,245,3,18,9,3,241,242,10,1,0,0,242,243,7,0,0,0,243,245,3,18,9,
- 2,244,238,1,0,0,0,244,241,1,0,0,0,245,248,1,0,0,0,246,244,1,0,0,0,246,247,
- 1,0,0,0,247,19,1,0,0,0,248,246,1,0,0,0,249,250,6,10,-1,0,250,258,3,62,31,
- 0,251,258,3,52,26,0,252,258,3,22,11,0,253,254,5,44,0,0,254,255,3,10,5,0,
- 255,256,5,51,0,0,256,258,1,0,0,0,257,249,1,0,0,0,257,251,1,0,0,0,257,252,
- 1,0,0,0,257,253,1,0,0,0,258,264,1,0,0,0,259,260,10,1,0,0,260,261,5,34,0,
- 0,261,263,3,24,12,0,262,259,1,0,0,0,263,266,1,0,0,0,264,262,1,0,0,0,264,
- 265,1,0,0,0,265,21,1,0,0,0,266,264,1,0,0,0,267,268,3,58,29,0,268,278,5,
- 44,0,0,269,279,5,62,0,0,270,275,3,10,5,0,271,272,5,35,0,0,272,274,3,10,
- 5,0,273,271,1,0,0,0,274,277,1,0,0,0,275,273,1,0,0,0,275,276,1,0,0,0,276,
- 279,1,0,0,0,277,275,1,0,0,0,278,269,1,0,0,0,278,270,1,0,0,0,278,279,1,0,
- 0,0,279,280,1,0,0,0,280,281,5,51,0,0,281,23,1,0,0,0,282,283,3,58,29,0,283,
- 25,1,0,0,0,284,285,5,13,0,0,285,286,3,28,14,0,286,27,1,0,0,0,287,292,3,
- 30,15,0,288,289,5,35,0,0,289,291,3,30,15,0,290,288,1,0,0,0,291,294,1,0,
- 0,0,292,290,1,0,0,0,292,293,1,0,0,0,293,29,1,0,0,0,294,292,1,0,0,0,295,
- 301,3,10,5,0,296,297,3,52,26,0,297,298,5,33,0,0,298,299,3,10,5,0,299,301,
- 1,0,0,0,300,295,1,0,0,0,300,296,1,0,0,0,301,31,1,0,0,0,302,303,5,6,0,0,
- 303,308,3,34,17,0,304,305,5,35,0,0,305,307,3,34,17,0,306,304,1,0,0,0,307,
- 310,1,0,0,0,308,306,1,0,0,0,308,309,1,0,0,0,309,312,1,0,0,0,310,308,1,0,
- 0,0,311,313,3,40,20,0,312,311,1,0,0,0,312,313,1,0,0,0,313,33,1,0,0,0,314,
- 315,3,36,18,0,315,316,5,109,0,0,316,317,3,38,19,0,317,320,1,0,0,0,318,320,
- 3,38,19,0,319,314,1,0,0,0,319,318,1,0,0,0,320,35,1,0,0,0,321,322,5,77,0,
- 0,322,37,1,0,0,0,323,324,7,2,0,0,324,39,1,0,0,0,325,328,3,42,21,0,326,328,
- 3,44,22,0,327,325,1,0,0,0,327,326,1,0,0,0,328,41,1,0,0,0,329,330,5,76,0,
- 0,330,335,5,77,0,0,331,332,5,35,0,0,332,334,5,77,0,0,333,331,1,0,0,0,334,
- 337,1,0,0,0,335,333,1,0,0,0,335,336,1,0,0,0,336,43,1,0,0,0,337,335,1,0,
- 0,0,338,339,5,66,0,0,339,340,3,42,21,0,340,341,5,67,0,0,341,45,1,0,0,0,
- 342,343,5,21,0,0,343,348,3,34,17,0,344,345,5,35,0,0,345,347,3,34,17,0,346,
- 344,1,0,0,0,347,350,1,0,0,0,348,346,1,0,0,0,348,349,1,0,0,0,349,352,1,0,
- 0,0,350,348,1,0,0,0,351,353,3,28,14,0,352,351,1,0,0,0,352,353,1,0,0,0,353,
- 356,1,0,0,0,354,355,5,30,0,0,355,357,3,28,14,0,356,354,1,0,0,0,356,357,
- 1,0,0,0,357,47,1,0,0,0,358,359,5,4,0,0,359,360,3,28,14,0,360,49,1,0,0,0,
- 361,363,5,16,0,0,362,364,3,28,14,0,363,362,1,0,0,0,363,364,1,0,0,0,364,
- 367,1,0,0,0,365,366,5,30,0,0,366,368,3,28,14,0,367,365,1,0,0,0,367,368,
- 1,0,0,0,368,51,1,0,0,0,369,374,3,58,29,0,370,371,5,37,0,0,371,373,3,58,
- 29,0,372,370,1,0,0,0,373,376,1,0,0,0,374,372,1,0,0,0,374,375,1,0,0,0,375,
- 53,1,0,0,0,376,374,1,0,0,0,377,382,3,60,30,0,378,379,5,37,0,0,379,381,3,
- 60,30,0,380,378,1,0,0,0,381,384,1,0,0,0,382,380,1,0,0,0,382,383,1,0,0,0,
- 383,55,1,0,0,0,384,382,1,0,0,0,385,390,3,54,27,0,386,387,5,35,0,0,387,389,
- 3,54,27,0,388,386,1,0,0,0,389,392,1,0,0,0,390,388,1,0,0,0,390,391,1,0,0,
- 0,391,57,1,0,0,0,392,390,1,0,0,0,393,394,7,3,0,0,394,59,1,0,0,0,395,396,
- 5,81,0,0,396,61,1,0,0,0,397,440,5,46,0,0,398,399,3,96,48,0,399,400,5,68,
- 0,0,400,440,1,0,0,0,401,440,3,94,47,0,402,440,3,96,48,0,403,440,3,90,45,
- 0,404,440,3,64,32,0,405,440,3,98,49,0,406,407,5,66,0,0,407,412,3,92,46,
- 0,408,409,5,35,0,0,409,411,3,92,46,0,410,408,1,0,0,0,411,414,1,0,0,0,412,
- 410,1,0,0,0,412,413,1,0,0,0,413,415,1,0,0,0,414,412,1,0,0,0,415,416,5,67,
- 0,0,416,440,1,0,0,0,417,418,5,66,0,0,418,423,3,90,45,0,419,420,5,35,0,0,
- 420,422,3,90,45,0,421,419,1,0,0,0,422,425,1,0,0,0,423,421,1,0,0,0,423,424,
- 1,0,0,0,424,426,1,0,0,0,425,423,1,0,0,0,426,427,5,67,0,0,427,440,1,0,0,
- 0,428,429,5,66,0,0,429,434,3,98,49,0,430,431,5,35,0,0,431,433,3,98,49,0,
- 432,430,1,0,0,0,433,436,1,0,0,0,434,432,1,0,0,0,434,435,1,0,0,0,435,437,
- 1,0,0,0,436,434,1,0,0,0,437,438,5,67,0,0,438,440,1,0,0,0,439,397,1,0,0,
- 0,439,398,1,0,0,0,439,401,1,0,0,0,439,402,1,0,0,0,439,403,1,0,0,0,439,404,
- 1,0,0,0,439,405,1,0,0,0,439,406,1,0,0,0,439,417,1,0,0,0,439,428,1,0,0,0,
- 440,63,1,0,0,0,441,444,5,49,0,0,442,444,5,65,0,0,443,441,1,0,0,0,443,442,
- 1,0,0,0,444,65,1,0,0,0,445,446,5,9,0,0,446,447,5,28,0,0,447,67,1,0,0,0,
- 448,449,5,15,0,0,449,454,3,70,35,0,450,451,5,35,0,0,451,453,3,70,35,0,452,
- 450,1,0,0,0,453,456,1,0,0,0,454,452,1,0,0,0,454,455,1,0,0,0,455,69,1,0,
- 0,0,456,454,1,0,0,0,457,459,3,10,5,0,458,460,7,4,0,0,459,458,1,0,0,0,459,
- 460,1,0,0,0,460,463,1,0,0,0,461,462,5,47,0,0,462,464,7,5,0,0,463,461,1,
- 0,0,0,463,464,1,0,0,0,464,71,1,0,0,0,465,466,5,8,0,0,466,467,3,56,28,0,
- 467,73,1,0,0,0,468,469,5,2,0,0,469,470,3,56,28,0,470,75,1,0,0,0,471,472,
- 5,12,0,0,472,477,3,78,39,0,473,474,5,35,0,0,474,476,3,78,39,0,475,473,1,
- 0,0,0,476,479,1,0,0,0,477,475,1,0,0,0,477,478,1,0,0,0,478,77,1,0,0,0,479,
- 477,1,0,0,0,480,481,3,54,27,0,481,482,5,85,0,0,482,483,3,54,27,0,483,79,
- 1,0,0,0,484,485,5,1,0,0,485,486,3,20,10,0,486,488,3,98,49,0,487,489,3,86,
- 43,0,488,487,1,0,0,0,488,489,1,0,0,0,489,81,1,0,0,0,490,491,5,7,0,0,491,
- 492,3,20,10,0,492,493,3,98,49,0,493,83,1,0,0,0,494,495,5,11,0,0,495,496,
- 3,52,26,0,496,85,1,0,0,0,497,502,3,88,44,0,498,499,5,35,0,0,499,501,3,88,
- 44,0,500,498,1,0,0,0,501,504,1,0,0,0,502,500,1,0,0,0,502,503,1,0,0,0,503,
- 87,1,0,0,0,504,502,1,0,0,0,505,506,3,58,29,0,506,507,5,33,0,0,507,508,3,
- 62,31,0,508,89,1,0,0,0,509,510,7,6,0,0,510,91,1,0,0,0,511,514,3,94,47,0,
- 512,514,3,96,48,0,513,511,1,0,0,0,513,512,1,0,0,0,514,93,1,0,0,0,515,517,
- 7,0,0,0,516,515,1,0,0,0,516,517,1,0,0,0,517,518,1,0,0,0,518,519,5,29,0,
- 0,519,95,1,0,0,0,520,522,7,0,0,0,521,520,1,0,0,0,521,522,1,0,0,0,522,523,
- 1,0,0,0,523,524,5,28,0,0,524,97,1,0,0,0,525,526,5,27,0,0,526,99,1,0,0,0,
- 527,528,7,7,0,0,528,101,1,0,0,0,529,530,5,5,0,0,530,531,3,104,52,0,531,
- 103,1,0,0,0,532,533,5,66,0,0,533,534,3,2,1,0,534,535,5,67,0,0,535,105,1,
- 0,0,0,536,537,5,14,0,0,537,538,5,101,0,0,538,107,1,0,0,0,539,540,5,10,0,
- 0,540,541,5,105,0,0,541,109,1,0,0,0,542,543,5,3,0,0,543,546,5,91,0,0,544,
- 545,5,89,0,0,545,547,3,54,27,0,546,544,1,0,0,0,546,547,1,0,0,0,547,557,
- 1,0,0,0,548,549,5,90,0,0,549,554,3,112,56,0,550,551,5,35,0,0,551,553,3,
- 112,56,0,552,550,1,0,0,0,553,556,1,0,0,0,554,552,1,0,0,0,554,555,1,0,0,
- 0,555,558,1,0,0,0,556,554,1,0,0,0,557,548,1,0,0,0,557,558,1,0,0,0,558,111,
- 1,0,0,0,559,560,3,54,27,0,560,561,5,33,0,0,561,563,1,0,0,0,562,559,1,0,
- 0,0,562,563,1,0,0,0,563,564,1,0,0,0,564,565,3,54,27,0,565,113,1,0,0,0,566,
- 567,5,19,0,0,567,568,3,34,17,0,568,569,5,89,0,0,569,570,3,56,28,0,570,115,
- 1,0,0,0,571,572,5,18,0,0,572,575,3,28,14,0,573,574,5,30,0,0,574,576,3,28,
- 14,0,575,573,1,0,0,0,575,576,1,0,0,0,576,117,1,0,0,0,54,129,139,157,169,
- 178,186,192,200,202,207,214,219,230,236,244,246,257,264,275,278,292,300,
- 308,312,319,327,335,348,352,356,363,367,374,382,390,412,423,434,439,443,
- 454,459,463,477,488,502,513,516,521,546,554,557,562,575];
+ 2,3,2,139,8,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,
+ 3,1,3,3,3,157,8,3,1,4,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,3,5,169,8,5,1,
+ 5,1,5,1,5,1,5,1,5,5,5,176,8,5,10,5,12,5,179,9,5,1,5,1,5,1,5,1,5,1,5,3,5,
+ 186,8,5,1,5,1,5,1,5,1,5,3,5,192,8,5,1,5,1,5,1,5,1,5,1,5,1,5,5,5,200,8,5,
+ 10,5,12,5,203,9,5,1,6,1,6,3,6,207,8,6,1,6,1,6,1,6,1,6,1,6,3,6,214,8,6,1,
+ 6,1,6,1,6,3,6,219,8,6,1,7,1,7,1,7,1,7,1,8,1,8,1,8,1,8,1,8,3,8,230,8,8,1,
+ 9,1,9,1,9,1,9,3,9,236,8,9,1,9,1,9,1,9,1,9,1,9,1,9,5,9,244,8,9,10,9,12,9,
+ 247,9,9,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,3,10,257,8,10,1,10,1,10,
+ 1,10,5,10,262,8,10,10,10,12,10,265,9,10,1,11,1,11,1,11,1,11,1,11,1,11,5,
+ 11,273,8,11,10,11,12,11,276,9,11,3,11,278,8,11,1,11,1,11,1,12,1,12,1,13,
+ 1,13,1,13,1,14,1,14,1,14,5,14,290,8,14,10,14,12,14,293,9,14,1,15,1,15,1,
+ 15,1,15,1,15,3,15,300,8,15,1,16,1,16,1,16,1,16,5,16,306,8,16,10,16,12,16,
+ 309,9,16,1,16,3,16,312,8,16,1,17,1,17,1,17,1,17,1,17,3,17,319,8,17,1,18,
+ 1,18,1,19,1,19,1,20,1,20,3,20,327,8,20,1,21,1,21,1,21,1,21,5,21,333,8,21,
+ 10,21,12,21,336,9,21,1,22,1,22,1,22,1,22,1,23,1,23,1,23,1,23,5,23,346,8,
+ 23,10,23,12,23,349,9,23,1,23,3,23,352,8,23,1,23,1,23,3,23,356,8,23,1,24,
+ 1,24,1,24,1,25,1,25,3,25,363,8,25,1,25,1,25,3,25,367,8,25,1,26,1,26,1,26,
+ 5,26,372,8,26,10,26,12,26,375,9,26,1,27,1,27,1,27,5,27,380,8,27,10,27,12,
+ 27,383,9,27,1,28,1,28,1,28,5,28,388,8,28,10,28,12,28,391,9,28,1,29,1,29,
+ 1,30,1,30,3,30,397,8,30,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,
+ 31,1,31,1,31,1,31,5,31,412,8,31,10,31,12,31,415,9,31,1,31,1,31,1,31,1,31,
+ 1,31,1,31,5,31,423,8,31,10,31,12,31,426,9,31,1,31,1,31,1,31,1,31,1,31,1,
+ 31,5,31,434,8,31,10,31,12,31,437,9,31,1,31,1,31,3,31,441,8,31,1,32,1,32,
+ 3,32,445,8,32,1,33,1,33,3,33,449,8,33,1,34,1,34,1,34,1,35,1,35,1,35,1,35,
+ 5,35,458,8,35,10,35,12,35,461,9,35,1,36,1,36,3,36,465,8,36,1,36,1,36,3,
+ 36,469,8,36,1,37,1,37,1,37,1,38,1,38,1,38,1,39,1,39,1,39,1,39,5,39,481,
+ 8,39,10,39,12,39,484,9,39,1,40,1,40,1,40,1,40,1,41,1,41,1,41,1,41,3,41,
+ 494,8,41,1,42,1,42,1,42,1,42,1,43,1,43,1,43,1,44,1,44,1,44,5,44,506,8,44,
+ 10,44,12,44,509,9,44,1,45,1,45,1,45,1,45,1,46,1,46,1,47,1,47,3,47,519,8,
+ 47,1,48,3,48,522,8,48,1,48,1,48,1,49,3,49,527,8,49,1,49,1,49,1,50,1,50,
+ 1,51,1,51,1,52,1,52,1,52,1,53,1,53,1,53,1,53,1,54,1,54,1,54,1,55,1,55,1,
+ 55,1,55,3,55,549,8,55,1,55,1,55,1,55,1,55,5,55,555,8,55,10,55,12,55,558,
+ 9,55,3,55,560,8,55,1,56,1,56,1,56,3,56,565,8,56,1,56,1,56,1,57,1,57,1,57,
+ 1,57,1,57,1,58,1,58,1,58,1,58,3,58,578,8,58,1,58,0,4,2,10,18,20,59,0,2,
+ 4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,
+ 54,56,58,60,62,64,66,68,70,72,74,76,78,80,82,84,86,88,90,92,94,96,98,100,
+ 102,104,106,108,110,112,114,116,0,8,1,0,59,60,1,0,61,63,2,0,26,26,76,76,
+ 1,0,67,68,2,0,31,31,35,35,2,0,38,38,41,41,2,0,37,37,51,51,2,0,52,52,54,
+ 58,606,0,118,1,0,0,0,2,121,1,0,0,0,4,138,1,0,0,0,6,156,1,0,0,0,8,158,1,
+ 0,0,0,10,191,1,0,0,0,12,218,1,0,0,0,14,220,1,0,0,0,16,229,1,0,0,0,18,235,
+ 1,0,0,0,20,256,1,0,0,0,22,266,1,0,0,0,24,281,1,0,0,0,26,283,1,0,0,0,28,
+ 286,1,0,0,0,30,299,1,0,0,0,32,301,1,0,0,0,34,318,1,0,0,0,36,320,1,0,0,0,
+ 38,322,1,0,0,0,40,326,1,0,0,0,42,328,1,0,0,0,44,337,1,0,0,0,46,341,1,0,
+ 0,0,48,357,1,0,0,0,50,360,1,0,0,0,52,368,1,0,0,0,54,376,1,0,0,0,56,384,
+ 1,0,0,0,58,392,1,0,0,0,60,396,1,0,0,0,62,440,1,0,0,0,64,444,1,0,0,0,66,
+ 448,1,0,0,0,68,450,1,0,0,0,70,453,1,0,0,0,72,462,1,0,0,0,74,470,1,0,0,0,
+ 76,473,1,0,0,0,78,476,1,0,0,0,80,485,1,0,0,0,82,489,1,0,0,0,84,495,1,0,
+ 0,0,86,499,1,0,0,0,88,502,1,0,0,0,90,510,1,0,0,0,92,514,1,0,0,0,94,518,
+ 1,0,0,0,96,521,1,0,0,0,98,526,1,0,0,0,100,530,1,0,0,0,102,532,1,0,0,0,104,
+ 534,1,0,0,0,106,537,1,0,0,0,108,541,1,0,0,0,110,544,1,0,0,0,112,564,1,0,
+ 0,0,114,568,1,0,0,0,116,573,1,0,0,0,118,119,3,2,1,0,119,120,5,0,0,1,120,
+ 1,1,0,0,0,121,122,6,1,-1,0,122,123,3,4,2,0,123,129,1,0,0,0,124,125,10,1,
+ 0,0,125,126,5,25,0,0,126,128,3,6,3,0,127,124,1,0,0,0,128,131,1,0,0,0,129,
+ 127,1,0,0,0,129,130,1,0,0,0,130,3,1,0,0,0,131,129,1,0,0,0,132,139,3,104,
+ 52,0,133,139,3,32,16,0,134,139,3,26,13,0,135,139,3,108,54,0,136,137,4,2,
+ 1,0,137,139,3,46,23,0,138,132,1,0,0,0,138,133,1,0,0,0,138,134,1,0,0,0,138,
+ 135,1,0,0,0,138,136,1,0,0,0,139,5,1,0,0,0,140,157,3,48,24,0,141,157,3,8,
+ 4,0,142,157,3,74,37,0,143,157,3,68,34,0,144,157,3,50,25,0,145,157,3,70,
+ 35,0,146,157,3,76,38,0,147,157,3,78,39,0,148,157,3,82,41,0,149,157,3,84,
+ 42,0,150,157,3,110,55,0,151,157,3,86,43,0,152,153,4,3,2,0,153,157,3,116,
+ 58,0,154,155,4,3,3,0,155,157,3,114,57,0,156,140,1,0,0,0,156,141,1,0,0,0,
+ 156,142,1,0,0,0,156,143,1,0,0,0,156,144,1,0,0,0,156,145,1,0,0,0,156,146,
+ 1,0,0,0,156,147,1,0,0,0,156,148,1,0,0,0,156,149,1,0,0,0,156,150,1,0,0,0,
+ 156,151,1,0,0,0,156,152,1,0,0,0,156,154,1,0,0,0,157,7,1,0,0,0,158,159,5,
+ 16,0,0,159,160,3,10,5,0,160,9,1,0,0,0,161,162,6,5,-1,0,162,163,5,44,0,0,
+ 163,192,3,10,5,8,164,192,3,16,8,0,165,192,3,12,6,0,166,168,3,16,8,0,167,
+ 169,5,44,0,0,168,167,1,0,0,0,168,169,1,0,0,0,169,170,1,0,0,0,170,171,5,
+ 39,0,0,171,172,5,43,0,0,172,177,3,16,8,0,173,174,5,34,0,0,174,176,3,16,
+ 8,0,175,173,1,0,0,0,176,179,1,0,0,0,177,175,1,0,0,0,177,178,1,0,0,0,178,
+ 180,1,0,0,0,179,177,1,0,0,0,180,181,5,50,0,0,181,192,1,0,0,0,182,183,3,
+ 16,8,0,183,185,5,40,0,0,184,186,5,44,0,0,185,184,1,0,0,0,185,186,1,0,0,
+ 0,186,187,1,0,0,0,187,188,5,45,0,0,188,192,1,0,0,0,189,190,4,5,4,0,190,
+ 192,3,14,7,0,191,161,1,0,0,0,191,164,1,0,0,0,191,165,1,0,0,0,191,166,1,
+ 0,0,0,191,182,1,0,0,0,191,189,1,0,0,0,192,201,1,0,0,0,193,194,10,5,0,0,
+ 194,195,5,30,0,0,195,200,3,10,5,6,196,197,10,4,0,0,197,198,5,47,0,0,198,
+ 200,3,10,5,5,199,193,1,0,0,0,199,196,1,0,0,0,200,203,1,0,0,0,201,199,1,
+ 0,0,0,201,202,1,0,0,0,202,11,1,0,0,0,203,201,1,0,0,0,204,206,3,16,8,0,205,
+ 207,5,44,0,0,206,205,1,0,0,0,206,207,1,0,0,0,207,208,1,0,0,0,208,209,5,
+ 42,0,0,209,210,3,100,50,0,210,219,1,0,0,0,211,213,3,16,8,0,212,214,5,44,
+ 0,0,213,212,1,0,0,0,213,214,1,0,0,0,214,215,1,0,0,0,215,216,5,49,0,0,216,
+ 217,3,100,50,0,217,219,1,0,0,0,218,204,1,0,0,0,218,211,1,0,0,0,219,13,1,
+ 0,0,0,220,221,3,16,8,0,221,222,5,19,0,0,222,223,3,100,50,0,223,15,1,0,0,
+ 0,224,230,3,18,9,0,225,226,3,18,9,0,226,227,3,102,51,0,227,228,3,18,9,0,
+ 228,230,1,0,0,0,229,224,1,0,0,0,229,225,1,0,0,0,230,17,1,0,0,0,231,232,
+ 6,9,-1,0,232,236,3,20,10,0,233,234,7,0,0,0,234,236,3,18,9,3,235,231,1,0,
+ 0,0,235,233,1,0,0,0,236,245,1,0,0,0,237,238,10,2,0,0,238,239,7,1,0,0,239,
+ 244,3,18,9,3,240,241,10,1,0,0,241,242,7,0,0,0,242,244,3,18,9,2,243,237,
+ 1,0,0,0,243,240,1,0,0,0,244,247,1,0,0,0,245,243,1,0,0,0,245,246,1,0,0,0,
+ 246,19,1,0,0,0,247,245,1,0,0,0,248,249,6,10,-1,0,249,257,3,62,31,0,250,
+ 257,3,52,26,0,251,257,3,22,11,0,252,253,5,43,0,0,253,254,3,10,5,0,254,255,
+ 5,50,0,0,255,257,1,0,0,0,256,248,1,0,0,0,256,250,1,0,0,0,256,251,1,0,0,
+ 0,256,252,1,0,0,0,257,263,1,0,0,0,258,259,10,1,0,0,259,260,5,33,0,0,260,
+ 262,3,24,12,0,261,258,1,0,0,0,262,265,1,0,0,0,263,261,1,0,0,0,263,264,1,
+ 0,0,0,264,21,1,0,0,0,265,263,1,0,0,0,266,267,3,66,33,0,267,277,5,43,0,0,
+ 268,278,5,61,0,0,269,274,3,10,5,0,270,271,5,34,0,0,271,273,3,10,5,0,272,
+ 270,1,0,0,0,273,276,1,0,0,0,274,272,1,0,0,0,274,275,1,0,0,0,275,278,1,0,
+ 0,0,276,274,1,0,0,0,277,268,1,0,0,0,277,269,1,0,0,0,277,278,1,0,0,0,278,
+ 279,1,0,0,0,279,280,5,50,0,0,280,23,1,0,0,0,281,282,3,58,29,0,282,25,1,
+ 0,0,0,283,284,5,12,0,0,284,285,3,28,14,0,285,27,1,0,0,0,286,291,3,30,15,
+ 0,287,288,5,34,0,0,288,290,3,30,15,0,289,287,1,0,0,0,290,293,1,0,0,0,291,
+ 289,1,0,0,0,291,292,1,0,0,0,292,29,1,0,0,0,293,291,1,0,0,0,294,300,3,10,
+ 5,0,295,296,3,52,26,0,296,297,5,32,0,0,297,298,3,10,5,0,298,300,1,0,0,0,
+ 299,294,1,0,0,0,299,295,1,0,0,0,300,31,1,0,0,0,301,302,5,6,0,0,302,307,
+ 3,34,17,0,303,304,5,34,0,0,304,306,3,34,17,0,305,303,1,0,0,0,306,309,1,
+ 0,0,0,307,305,1,0,0,0,307,308,1,0,0,0,308,311,1,0,0,0,309,307,1,0,0,0,310,
+ 312,3,40,20,0,311,310,1,0,0,0,311,312,1,0,0,0,312,33,1,0,0,0,313,314,3,
+ 36,18,0,314,315,5,104,0,0,315,316,3,38,19,0,316,319,1,0,0,0,317,319,3,38,
+ 19,0,318,313,1,0,0,0,318,317,1,0,0,0,319,35,1,0,0,0,320,321,5,76,0,0,321,
+ 37,1,0,0,0,322,323,7,2,0,0,323,39,1,0,0,0,324,327,3,42,21,0,325,327,3,44,
+ 22,0,326,324,1,0,0,0,326,325,1,0,0,0,327,41,1,0,0,0,328,329,5,75,0,0,329,
+ 334,5,76,0,0,330,331,5,34,0,0,331,333,5,76,0,0,332,330,1,0,0,0,333,336,
+ 1,0,0,0,334,332,1,0,0,0,334,335,1,0,0,0,335,43,1,0,0,0,336,334,1,0,0,0,
+ 337,338,5,65,0,0,338,339,3,42,21,0,339,340,5,66,0,0,340,45,1,0,0,0,341,
+ 342,5,20,0,0,342,347,3,34,17,0,343,344,5,34,0,0,344,346,3,34,17,0,345,343,
+ 1,0,0,0,346,349,1,0,0,0,347,345,1,0,0,0,347,348,1,0,0,0,348,351,1,0,0,0,
+ 349,347,1,0,0,0,350,352,3,28,14,0,351,350,1,0,0,0,351,352,1,0,0,0,352,355,
+ 1,0,0,0,353,354,5,29,0,0,354,356,3,28,14,0,355,353,1,0,0,0,355,356,1,0,
+ 0,0,356,47,1,0,0,0,357,358,5,4,0,0,358,359,3,28,14,0,359,49,1,0,0,0,360,
+ 362,5,15,0,0,361,363,3,28,14,0,362,361,1,0,0,0,362,363,1,0,0,0,363,366,
+ 1,0,0,0,364,365,5,29,0,0,365,367,3,28,14,0,366,364,1,0,0,0,366,367,1,0,
+ 0,0,367,51,1,0,0,0,368,373,3,66,33,0,369,370,5,36,0,0,370,372,3,66,33,0,
+ 371,369,1,0,0,0,372,375,1,0,0,0,373,371,1,0,0,0,373,374,1,0,0,0,374,53,
+ 1,0,0,0,375,373,1,0,0,0,376,381,3,60,30,0,377,378,5,36,0,0,378,380,3,60,
+ 30,0,379,377,1,0,0,0,380,383,1,0,0,0,381,379,1,0,0,0,381,382,1,0,0,0,382,
+ 55,1,0,0,0,383,381,1,0,0,0,384,389,3,54,27,0,385,386,5,34,0,0,386,388,3,
+ 54,27,0,387,385,1,0,0,0,388,391,1,0,0,0,389,387,1,0,0,0,389,390,1,0,0,0,
+ 390,57,1,0,0,0,391,389,1,0,0,0,392,393,7,3,0,0,393,59,1,0,0,0,394,397,5,
+ 80,0,0,395,397,3,64,32,0,396,394,1,0,0,0,396,395,1,0,0,0,397,61,1,0,0,0,
+ 398,441,5,45,0,0,399,400,3,98,49,0,400,401,5,67,0,0,401,441,1,0,0,0,402,
+ 441,3,96,48,0,403,441,3,98,49,0,404,441,3,92,46,0,405,441,3,64,32,0,406,
+ 441,3,100,50,0,407,408,5,65,0,0,408,413,3,94,47,0,409,410,5,34,0,0,410,
+ 412,3,94,47,0,411,409,1,0,0,0,412,415,1,0,0,0,413,411,1,0,0,0,413,414,1,
+ 0,0,0,414,416,1,0,0,0,415,413,1,0,0,0,416,417,5,66,0,0,417,441,1,0,0,0,
+ 418,419,5,65,0,0,419,424,3,92,46,0,420,421,5,34,0,0,421,423,3,92,46,0,422,
+ 420,1,0,0,0,423,426,1,0,0,0,424,422,1,0,0,0,424,425,1,0,0,0,425,427,1,0,
+ 0,0,426,424,1,0,0,0,427,428,5,66,0,0,428,441,1,0,0,0,429,430,5,65,0,0,430,
+ 435,3,100,50,0,431,432,5,34,0,0,432,434,3,100,50,0,433,431,1,0,0,0,434,
+ 437,1,0,0,0,435,433,1,0,0,0,435,436,1,0,0,0,436,438,1,0,0,0,437,435,1,0,
+ 0,0,438,439,5,66,0,0,439,441,1,0,0,0,440,398,1,0,0,0,440,399,1,0,0,0,440,
+ 402,1,0,0,0,440,403,1,0,0,0,440,404,1,0,0,0,440,405,1,0,0,0,440,406,1,0,
+ 0,0,440,407,1,0,0,0,440,418,1,0,0,0,440,429,1,0,0,0,441,63,1,0,0,0,442,
+ 445,5,48,0,0,443,445,5,64,0,0,444,442,1,0,0,0,444,443,1,0,0,0,445,65,1,
+ 0,0,0,446,449,3,58,29,0,447,449,3,64,32,0,448,446,1,0,0,0,448,447,1,0,0,
+ 0,449,67,1,0,0,0,450,451,5,9,0,0,451,452,5,27,0,0,452,69,1,0,0,0,453,454,
+ 5,14,0,0,454,459,3,72,36,0,455,456,5,34,0,0,456,458,3,72,36,0,457,455,1,
+ 0,0,0,458,461,1,0,0,0,459,457,1,0,0,0,459,460,1,0,0,0,460,71,1,0,0,0,461,
+ 459,1,0,0,0,462,464,3,10,5,0,463,465,7,4,0,0,464,463,1,0,0,0,464,465,1,
+ 0,0,0,465,468,1,0,0,0,466,467,5,46,0,0,467,469,7,5,0,0,468,466,1,0,0,0,
+ 468,469,1,0,0,0,469,73,1,0,0,0,470,471,5,8,0,0,471,472,3,56,28,0,472,75,
+ 1,0,0,0,473,474,5,2,0,0,474,475,3,56,28,0,475,77,1,0,0,0,476,477,5,11,0,
+ 0,477,482,3,80,40,0,478,479,5,34,0,0,479,481,3,80,40,0,480,478,1,0,0,0,
+ 481,484,1,0,0,0,482,480,1,0,0,0,482,483,1,0,0,0,483,79,1,0,0,0,484,482,
+ 1,0,0,0,485,486,3,54,27,0,486,487,5,84,0,0,487,488,3,54,27,0,488,81,1,0,
+ 0,0,489,490,5,1,0,0,490,491,3,20,10,0,491,493,3,100,50,0,492,494,3,88,44,
+ 0,493,492,1,0,0,0,493,494,1,0,0,0,494,83,1,0,0,0,495,496,5,7,0,0,496,497,
+ 3,20,10,0,497,498,3,100,50,0,498,85,1,0,0,0,499,500,5,10,0,0,500,501,3,
+ 52,26,0,501,87,1,0,0,0,502,507,3,90,45,0,503,504,5,34,0,0,504,506,3,90,
+ 45,0,505,503,1,0,0,0,506,509,1,0,0,0,507,505,1,0,0,0,507,508,1,0,0,0,508,
+ 89,1,0,0,0,509,507,1,0,0,0,510,511,3,58,29,0,511,512,5,32,0,0,512,513,3,
+ 62,31,0,513,91,1,0,0,0,514,515,7,6,0,0,515,93,1,0,0,0,516,519,3,96,48,0,
+ 517,519,3,98,49,0,518,516,1,0,0,0,518,517,1,0,0,0,519,95,1,0,0,0,520,522,
+ 7,0,0,0,521,520,1,0,0,0,521,522,1,0,0,0,522,523,1,0,0,0,523,524,5,28,0,
+ 0,524,97,1,0,0,0,525,527,7,0,0,0,526,525,1,0,0,0,526,527,1,0,0,0,527,528,
+ 1,0,0,0,528,529,5,27,0,0,529,99,1,0,0,0,530,531,5,26,0,0,531,101,1,0,0,
+ 0,532,533,7,7,0,0,533,103,1,0,0,0,534,535,5,5,0,0,535,536,3,106,53,0,536,
+ 105,1,0,0,0,537,538,5,65,0,0,538,539,3,2,1,0,539,540,5,66,0,0,540,107,1,
+ 0,0,0,541,542,5,13,0,0,542,543,5,100,0,0,543,109,1,0,0,0,544,545,5,3,0,
+ 0,545,548,5,90,0,0,546,547,5,88,0,0,547,549,3,54,27,0,548,546,1,0,0,0,548,
+ 549,1,0,0,0,549,559,1,0,0,0,550,551,5,89,0,0,551,556,3,112,56,0,552,553,
+ 5,34,0,0,553,555,3,112,56,0,554,552,1,0,0,0,555,558,1,0,0,0,556,554,1,0,
+ 0,0,556,557,1,0,0,0,557,560,1,0,0,0,558,556,1,0,0,0,559,550,1,0,0,0,559,
+ 560,1,0,0,0,560,111,1,0,0,0,561,562,3,54,27,0,562,563,5,32,0,0,563,565,
+ 1,0,0,0,564,561,1,0,0,0,564,565,1,0,0,0,565,566,1,0,0,0,566,567,3,54,27,
+ 0,567,113,1,0,0,0,568,569,5,18,0,0,569,570,3,34,17,0,570,571,5,88,0,0,571,
+ 572,3,56,28,0,572,115,1,0,0,0,573,574,5,17,0,0,574,577,3,28,14,0,575,576,
+ 5,29,0,0,576,578,3,28,14,0,577,575,1,0,0,0,577,578,1,0,0,0,578,117,1,0,
+ 0,0,56,129,138,156,168,177,185,191,199,201,206,213,218,229,235,243,245,
+ 256,263,274,277,291,299,307,311,318,326,334,347,351,355,362,366,373,381,
+ 389,396,413,424,435,440,444,448,459,464,468,482,493,507,518,521,526,548,
+ 556,559,564,577];
private static __ATN: ATN;
public static get _ATN(): ATN {
@@ -3626,9 +3640,6 @@ export class SourceCommandContext extends ParserRuleContext {
public fromCommand(): FromCommandContext {
return this.getTypedRuleContext(FromCommandContext, 0) as FromCommandContext;
}
- public metaCommand(): MetaCommandContext {
- return this.getTypedRuleContext(MetaCommandContext, 0) as MetaCommandContext;
- }
public rowCommand(): RowCommandContext {
return this.getTypedRuleContext(RowCommandContext, 0) as RowCommandContext;
}
@@ -4290,8 +4301,8 @@ export class FunctionExpressionContext extends ParserRuleContext {
super(parent, invokingState);
this.parser = parser;
}
- public identifier(): IdentifierContext {
- return this.getTypedRuleContext(IdentifierContext, 0) as IdentifierContext;
+ public identifierOrParameter(): IdentifierOrParameterContext {
+ return this.getTypedRuleContext(IdentifierOrParameterContext, 0) as IdentifierOrParameterContext;
}
public LP(): TerminalNode {
return this.getToken(esql_parser.LP, 0);
@@ -4780,11 +4791,11 @@ export class QualifiedNameContext extends ParserRuleContext {
super(parent, invokingState);
this.parser = parser;
}
- public identifier_list(): IdentifierContext[] {
- return this.getTypedRuleContexts(IdentifierContext) as IdentifierContext[];
+ public identifierOrParameter_list(): IdentifierOrParameterContext[] {
+ return this.getTypedRuleContexts(IdentifierOrParameterContext) as IdentifierOrParameterContext[];
}
- public identifier(i: number): IdentifierContext {
- return this.getTypedRuleContext(IdentifierContext, i) as IdentifierContext;
+ public identifierOrParameter(i: number): IdentifierOrParameterContext {
+ return this.getTypedRuleContext(IdentifierOrParameterContext, i) as IdentifierOrParameterContext;
}
public DOT_list(): TerminalNode[] {
return this.getTokens(esql_parser.DOT);
@@ -4909,6 +4920,9 @@ export class IdentifierPatternContext extends ParserRuleContext {
public ID_PATTERN(): TerminalNode {
return this.getToken(esql_parser.ID_PATTERN, 0);
}
+ public parameter(): ParameterContext {
+ return this.getTypedRuleContext(ParameterContext, 0) as ParameterContext;
+ }
public get ruleIndex(): number {
return esql_parser.RULE_identifierPattern;
}
@@ -5065,6 +5079,25 @@ export class StringArrayLiteralContext extends ConstantContext {
}
}
}
+export class InputParameterContext extends ConstantContext {
+ constructor(parser: esql_parser, ctx: ConstantContext) {
+ super(parser, ctx.parentCtx, ctx.invokingState);
+ super.copyFrom(ctx);
+ }
+ public parameter(): ParameterContext {
+ return this.getTypedRuleContext(ParameterContext, 0) as ParameterContext;
+ }
+ public enterRule(listener: esql_parserListener): void {
+ if(listener.enterInputParameter) {
+ listener.enterInputParameter(this);
+ }
+ }
+ public exitRule(listener: esql_parserListener): void {
+ if(listener.exitInputParameter) {
+ listener.exitInputParameter(this);
+ }
+ }
+}
export class StringLiteralContext extends ConstantContext {
constructor(parser: esql_parser, ctx: ConstantContext) {
super(parser, ctx.parentCtx, ctx.invokingState);
@@ -5118,25 +5151,6 @@ export class NumericArrayLiteralContext extends ConstantContext {
}
}
}
-export class InputParamsContext extends ConstantContext {
- constructor(parser: esql_parser, ctx: ConstantContext) {
- super(parser, ctx.parentCtx, ctx.invokingState);
- super.copyFrom(ctx);
- }
- public params(): ParamsContext {
- return this.getTypedRuleContext(ParamsContext, 0) as ParamsContext;
- }
- public enterRule(listener: esql_parserListener): void {
- if(listener.enterInputParams) {
- listener.enterInputParams(this);
- }
- }
- public exitRule(listener: esql_parserListener): void {
- if(listener.exitInputParams) {
- listener.exitInputParams(this);
- }
- }
-}
export class IntegerLiteralContext extends ConstantContext {
constructor(parser: esql_parser, ctx: ConstantContext) {
super(parser, ctx.parentCtx, ctx.invokingState);
@@ -5177,20 +5191,20 @@ export class BooleanLiteralContext extends ConstantContext {
}
-export class ParamsContext extends ParserRuleContext {
+export class ParameterContext extends ParserRuleContext {
constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
super(parent, invokingState);
this.parser = parser;
}
public get ruleIndex(): number {
- return esql_parser.RULE_params;
+ return esql_parser.RULE_parameter;
}
- public override copyFrom(ctx: ParamsContext): void {
+ public override copyFrom(ctx: ParameterContext): void {
super.copyFrom(ctx);
}
}
-export class InputNamedOrPositionalParamContext extends ParamsContext {
- constructor(parser: esql_parser, ctx: ParamsContext) {
+export class InputNamedOrPositionalParamContext extends ParameterContext {
+ constructor(parser: esql_parser, ctx: ParameterContext) {
super(parser, ctx.parentCtx, ctx.invokingState);
super.copyFrom(ctx);
}
@@ -5208,8 +5222,8 @@ export class InputNamedOrPositionalParamContext extends ParamsContext {
}
}
}
-export class InputParamContext extends ParamsContext {
- constructor(parser: esql_parser, ctx: ParamsContext) {
+export class InputParamContext extends ParameterContext {
+ constructor(parser: esql_parser, ctx: ParameterContext) {
super(parser, ctx.parentCtx, ctx.invokingState);
super.copyFrom(ctx);
}
@@ -5229,6 +5243,33 @@ export class InputParamContext extends ParamsContext {
}
+export class IdentifierOrParameterContext extends ParserRuleContext {
+ constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
+ super(parent, invokingState);
+ this.parser = parser;
+ }
+ public identifier(): IdentifierContext {
+ return this.getTypedRuleContext(IdentifierContext, 0) as IdentifierContext;
+ }
+ public parameter(): ParameterContext {
+ return this.getTypedRuleContext(ParameterContext, 0) as ParameterContext;
+ }
+ public get ruleIndex(): number {
+ return esql_parser.RULE_identifierOrParameter;
+ }
+ public enterRule(listener: esql_parserListener): void {
+ if(listener.enterIdentifierOrParameter) {
+ listener.enterIdentifierOrParameter(this);
+ }
+ }
+ public exitRule(listener: esql_parserListener): void {
+ if(listener.exitIdentifierOrParameter) {
+ listener.exitIdentifierOrParameter(this);
+ }
+ }
+}
+
+
export class LimitCommandContext extends ParserRuleContext {
constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
super(parent, invokingState);
@@ -5878,42 +5919,6 @@ export class ShowInfoContext extends ShowCommandContext {
}
-export class MetaCommandContext extends ParserRuleContext {
- constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
- super(parent, invokingState);
- this.parser = parser;
- }
- public get ruleIndex(): number {
- return esql_parser.RULE_metaCommand;
- }
- public override copyFrom(ctx: MetaCommandContext): void {
- super.copyFrom(ctx);
- }
-}
-export class MetaFunctionsContext extends MetaCommandContext {
- constructor(parser: esql_parser, ctx: MetaCommandContext) {
- super(parser, ctx.parentCtx, ctx.invokingState);
- super.copyFrom(ctx);
- }
- public META(): TerminalNode {
- return this.getToken(esql_parser.META, 0);
- }
- public FUNCTIONS(): TerminalNode {
- return this.getToken(esql_parser.FUNCTIONS, 0);
- }
- public enterRule(listener: esql_parserListener): void {
- if(listener.enterMetaFunctions) {
- listener.enterMetaFunctions(this);
- }
- }
- public exitRule(listener: esql_parserListener): void {
- if(listener.exitMetaFunctions) {
- listener.exitMetaFunctions(this);
- }
- }
-}
-
-
export class EnrichCommandContext extends ParserRuleContext {
public _policyName!: Token;
public _matchField!: QualifiedNamePatternContext;
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts b/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
index 00a559694496..f5c54adbe18d 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
@@ -62,13 +62,14 @@ import { QualifiedIntegerLiteralContext } from "./esql_parser.js";
import { DecimalLiteralContext } from "./esql_parser.js";
import { IntegerLiteralContext } from "./esql_parser.js";
import { BooleanLiteralContext } from "./esql_parser.js";
-import { InputParamsContext } from "./esql_parser.js";
+import { InputParameterContext } from "./esql_parser.js";
import { StringLiteralContext } from "./esql_parser.js";
import { NumericArrayLiteralContext } from "./esql_parser.js";
import { BooleanArrayLiteralContext } from "./esql_parser.js";
import { StringArrayLiteralContext } from "./esql_parser.js";
import { InputParamContext } from "./esql_parser.js";
import { InputNamedOrPositionalParamContext } from "./esql_parser.js";
+import { IdentifierOrParameterContext } from "./esql_parser.js";
import { LimitCommandContext } from "./esql_parser.js";
import { SortCommandContext } from "./esql_parser.js";
import { OrderExpressionContext } from "./esql_parser.js";
@@ -90,7 +91,6 @@ import { ComparisonOperatorContext } from "./esql_parser.js";
import { ExplainCommandContext } from "./esql_parser.js";
import { SubqueryExpressionContext } from "./esql_parser.js";
import { ShowInfoContext } from "./esql_parser.js";
-import { MetaFunctionsContext } from "./esql_parser.js";
import { EnrichCommandContext } from "./esql_parser.js";
import { EnrichWithClauseContext } from "./esql_parser.js";
import { LookupCommandContext } from "./esql_parser.js";
@@ -653,17 +653,17 @@ export default class esql_parserListener extends ParseTreeListener {
*/
exitBooleanLiteral?: (ctx: BooleanLiteralContext) => void;
/**
- * Enter a parse tree produced by the `inputParams`
+ * Enter a parse tree produced by the `inputParameter`
* labeled alternative in `esql_parser.constant`.
* @param ctx the parse tree
*/
- enterInputParams?: (ctx: InputParamsContext) => void;
+ enterInputParameter?: (ctx: InputParameterContext) => void;
/**
- * Exit a parse tree produced by the `inputParams`
+ * Exit a parse tree produced by the `inputParameter`
* labeled alternative in `esql_parser.constant`.
* @param ctx the parse tree
*/
- exitInputParams?: (ctx: InputParamsContext) => void;
+ exitInputParameter?: (ctx: InputParameterContext) => void;
/**
* Enter a parse tree produced by the `stringLiteral`
* labeled alternative in `esql_parser.constant`.
@@ -714,28 +714,38 @@ export default class esql_parserListener extends ParseTreeListener {
exitStringArrayLiteral?: (ctx: StringArrayLiteralContext) => void;
/**
* Enter a parse tree produced by the `inputParam`
- * labeled alternative in `esql_parser.params`.
+ * labeled alternative in `esql_parser.parameter`.
* @param ctx the parse tree
*/
enterInputParam?: (ctx: InputParamContext) => void;
/**
* Exit a parse tree produced by the `inputParam`
- * labeled alternative in `esql_parser.params`.
+ * labeled alternative in `esql_parser.parameter`.
* @param ctx the parse tree
*/
exitInputParam?: (ctx: InputParamContext) => void;
/**
* Enter a parse tree produced by the `inputNamedOrPositionalParam`
- * labeled alternative in `esql_parser.params`.
+ * labeled alternative in `esql_parser.parameter`.
* @param ctx the parse tree
*/
enterInputNamedOrPositionalParam?: (ctx: InputNamedOrPositionalParamContext) => void;
/**
* Exit a parse tree produced by the `inputNamedOrPositionalParam`
- * labeled alternative in `esql_parser.params`.
+ * labeled alternative in `esql_parser.parameter`.
* @param ctx the parse tree
*/
exitInputNamedOrPositionalParam?: (ctx: InputNamedOrPositionalParamContext) => void;
+ /**
+ * Enter a parse tree produced by `esql_parser.identifierOrParameter`.
+ * @param ctx the parse tree
+ */
+ enterIdentifierOrParameter?: (ctx: IdentifierOrParameterContext) => void;
+ /**
+ * Exit a parse tree produced by `esql_parser.identifierOrParameter`.
+ * @param ctx the parse tree
+ */
+ exitIdentifierOrParameter?: (ctx: IdentifierOrParameterContext) => void;
/**
* Enter a parse tree produced by `esql_parser.limitCommand`.
* @param ctx the parse tree
@@ -948,18 +958,6 @@ export default class esql_parserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
exitShowInfo?: (ctx: ShowInfoContext) => void;
- /**
- * Enter a parse tree produced by the `metaFunctions`
- * labeled alternative in `esql_parser.metaCommand`.
- * @param ctx the parse tree
- */
- enterMetaFunctions?: (ctx: MetaFunctionsContext) => void;
- /**
- * Exit a parse tree produced by the `metaFunctions`
- * labeled alternative in `esql_parser.metaCommand`.
- * @param ctx the parse tree
- */
- exitMetaFunctions?: (ctx: MetaFunctionsContext) => void;
/**
* Enter a parse tree produced by `esql_parser.enrichCommand`.
* @param ctx the parse tree
diff --git a/packages/kbn-spec-to-console/lib/convert/paths.js b/packages/kbn-esql-ast/src/ast/util.ts
similarity index 66%
rename from packages/kbn-spec-to-console/lib/convert/paths.js
rename to packages/kbn-esql-ast/src/ast/util.ts
index a14d7c72dde4..0cd94aba85cf 100644
--- a/packages/kbn-spec-to-console/lib/convert/paths.js
+++ b/packages/kbn-esql-ast/src/ast/util.ts
@@ -7,10 +7,8 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-const replacePattern = require('../replace_pattern');
+import { ESQLAstNode, ESQLCommandOption } from '../types';
-module.exports = (patterns) => {
- return patterns.map((patternObject) => {
- return replacePattern(patternObject.path);
- });
+export const isOptionNode = (node: ESQLAstNode): node is ESQLCommandOption => {
+ return !!node && typeof node === 'object' && !Array.isArray(node) && node.type === 'option';
};
diff --git a/packages/kbn-esql-ast/src/builder/builder.ts b/packages/kbn-esql-ast/src/builder/builder.ts
index ece92fbcd7d5..26b64a6312ee 100644
--- a/packages/kbn-esql-ast/src/builder/builder.ts
+++ b/packages/kbn-esql-ast/src/builder/builder.ts
@@ -100,6 +100,23 @@ export namespace Builder {
};
};
+ export const indexSource = (
+ index: string,
+ cluster?: string,
+ template?: Omit, 'name' | 'index' | 'cluster'>,
+ fromParser?: Partial
+ ): ESQLSource => {
+ return {
+ ...template,
+ ...Builder.parserFields(fromParser),
+ index,
+ cluster,
+ name: (cluster ? cluster + ':' : '') + index,
+ sourceType: 'index',
+ type: 'source',
+ };
+ };
+
export const column = (
template: Omit, 'name' | 'quoted'>,
fromParser?: Partial
diff --git a/packages/kbn-esql-ast/src/mutate/README.md b/packages/kbn-esql-ast/src/mutate/README.md
index 8c38bb72ca22..7dfd3d77a139 100644
--- a/packages/kbn-esql-ast/src/mutate/README.md
+++ b/packages/kbn-esql-ast/src/mutate/README.md
@@ -26,11 +26,37 @@ console.log(src); // FROM index METADATA _lang, _id
## API
-- `.commands.from.metadata.list()` — List all `METADATA` fields.
-- `.commands.from.metadata.find()` — Find a `METADATA` field by name.
-- `.commands.from.metadata.removeByPredicate()` — Remove a `METADATA`
- field by matching a predicate.
-- `.commands.from.metadata.remove()` — Remove a `METADATA` field by name.
-- `.commands.from.metadata.insert()` — Insert a `METADATA` field.
-- `.commands.from.metadata.upsert()` — Insert `METADATA` field, if it does
- not exist.
+- `.generic`
+ - `.listCommands()` — Lists all commands. Returns an iterator.
+ - `.findCommand()` — Finds a specific command by a predicate function.
+ - `.findCommandOption()` — Finds a specific command option by a predicate function.
+ - `.findCommandByName()` — Finds a specific command by name.
+ - `.findCommandOptionByName()` — Finds a specific command option by name.
+ - `.appendCommand()` — Add a new command to the AST.
+ - `.appendCommandOption()` — Add a new command option to a command.
+ - `.appendCommandArgument()` — Add a new main command argument to a command.
+ - `.removeCommand()` — Remove a command from the AST.
+ - `.removeCommandOption()` — Remove a command option from the AST.
+ - `.removeCommandArgument()` — Remove a command argument from the AST.
+- `.commands`
+ - `.from`
+ - `.sources`
+ - `.list()` — List all `FROM` sources.
+ - `.find()` — Find a source by name.
+ - `.remove()` — Remove a source by name.
+ - `.insert()` — Insert a source.
+ - `.upsert()` — Insert a source, if it does not exist.
+ - `.metadata`
+ - `.list()` — List all `METADATA` fields.
+ - `.find()` — Find a `METADATA` field by name.
+ - `.removeByPredicate()` — Remove a `METADATA` field by matching a predicate function.
+ - `.remove()` — Remove a `METADATA` field by name.
+ - `.insert()` — Insert a `METADATA` field.
+ - `.upsert()` — Insert `METADATA` field, if it does not exist.
+ - `.limit`
+ - `.list()` — List all `LIMIT` commands.
+ - `.byIndex()` — Find a `LIMIT` command by index.
+ - `.find()` — Find a `LIMIT` command by a predicate function.
+ - `.remove()` — Remove a `LIMIT` command by index.
+ - `.set()` — Set the limit value of a specific `LIMIT` command.
+ - `.upsert()` — Insert a `LIMIT` command, or update the limit value if it already exists.
diff --git a/packages/kbn-esql-ast/src/mutate/commands/from/index.ts b/packages/kbn-esql-ast/src/mutate/commands/from/index.ts
index df76e072b346..2a86a43dbe8d 100644
--- a/packages/kbn-esql-ast/src/mutate/commands/from/index.ts
+++ b/packages/kbn-esql-ast/src/mutate/commands/from/index.ts
@@ -7,6 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
+import * as sources from './sources';
import * as metadata from './metadata';
-export { metadata };
+export { sources, metadata };
diff --git a/packages/kbn-esql-ast/src/mutate/commands/from/metadata.ts b/packages/kbn-esql-ast/src/mutate/commands/from/metadata.ts
index 5892b028823a..7f08fa2a5e94 100644
--- a/packages/kbn-esql-ast/src/mutate/commands/from/metadata.ts
+++ b/packages/kbn-esql-ast/src/mutate/commands/from/metadata.ts
@@ -157,7 +157,7 @@ export const insert = (
return;
}
- option = generic.insertCommandOption(command, 'metadata');
+ option = generic.appendCommandOption(command, 'metadata');
}
const parts: string[] = typeof fieldName === 'string' ? [fieldName] : fieldName;
diff --git a/packages/kbn-esql-ast/src/mutate/commands/from/sources.test.ts b/packages/kbn-esql-ast/src/mutate/commands/from/sources.test.ts
new file mode 100644
index 000000000000..866a6dd8bdb2
--- /dev/null
+++ b/packages/kbn-esql-ast/src/mutate/commands/from/sources.test.ts
@@ -0,0 +1,246 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { parse } from '../../../parser';
+import { BasicPrettyPrinter } from '../../../pretty_print';
+import * as commands from '..';
+
+describe('commands.from.sources', () => {
+ describe('.list()', () => {
+ it('returns empty array, if there are no sources', () => {
+ const src = 'ROW 123';
+ const { root } = parse(src);
+ const list = [...commands.from.sources.list(root)];
+
+ expect(list.length).toBe(0);
+ });
+
+ it('returns a single source', () => {
+ const src = 'FROM index METADATA a';
+ const { root } = parse(src);
+ const list = [...commands.from.sources.list(root)];
+
+ expect(list.length).toBe(1);
+ expect(list[0]).toMatchObject({
+ type: 'source',
+ });
+ });
+
+ it('returns all source fields', () => {
+ const src = 'FROM index, index2, cl:index3 METADATA a | LIMIT 88';
+ const { root } = parse(src);
+ const list = [...commands.from.sources.list(root)];
+
+ expect(list).toMatchObject([
+ {
+ type: 'source',
+ index: 'index',
+ },
+ {
+ type: 'source',
+ index: 'index2',
+ },
+ {
+ type: 'source',
+ index: 'index3',
+ cluster: 'cl',
+ },
+ ]);
+ });
+ });
+
+ describe('.find()', () => {
+ it('returns undefined if source is not found', () => {
+ const src = 'FROM index | WHERE a = b | LIMIT 123';
+ const { root } = parse(src);
+ const source = commands.from.sources.find(root, 'abc');
+
+ expect(source).toBe(undefined);
+ });
+
+ it('can find a single source', () => {
+ const src = 'FROM index METADATA a';
+ const { root } = parse(src);
+ const source = commands.from.sources.find(root, 'index')!;
+
+ expect(source).toMatchObject({
+ type: 'source',
+ name: 'index',
+ index: 'index',
+ });
+ });
+
+ it('can find a source withing other sources', () => {
+ const src = 'FROM index, a, b, c:s1, s1, s2 METADATA a, b, c, _lang, _id';
+ const { root } = parse(src);
+ const source1 = commands.from.sources.find(root, 's2')!;
+ const source2 = commands.from.sources.find(root, 's1', 'c')!;
+
+ expect(source1).toMatchObject({
+ type: 'source',
+ name: 's2',
+ index: 's2',
+ });
+ expect(source2).toMatchObject({
+ type: 'source',
+ name: 'c:s1',
+ index: 's1',
+ cluster: 'c',
+ });
+ });
+ });
+
+ describe('.remove()', () => {
+ it('can remove a source from a list', () => {
+ const src1 = 'FROM a, b, c';
+ const { root } = parse(src1);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM a, b, c');
+
+ commands.from.sources.remove(root, 'b');
+
+ const src3 = BasicPrettyPrinter.print(root);
+
+ expect(src3).toBe('FROM a, c');
+ });
+
+ it('does nothing if source-to-delete does not exist', () => {
+ const src1 = 'FROM a, b, c';
+ const { root } = parse(src1);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM a, b, c');
+
+ commands.from.sources.remove(root, 'd');
+
+ const src3 = BasicPrettyPrinter.print(root);
+
+ expect(src3).toBe('FROM a, b, c');
+ });
+ });
+
+ describe('.insert()', () => {
+ it('can append a source', () => {
+ const src1 = 'FROM index METADATA a';
+ const { root } = parse(src1);
+
+ commands.from.sources.insert(root, 'index2');
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM index, index2 METADATA a');
+ });
+
+ it('can insert at specified position', () => {
+ const src1 = 'FROM a1, a2, a3';
+ const { root } = parse(src1);
+
+ commands.from.sources.insert(root, 'x', '', 0);
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM x, a1, a2, a3');
+
+ commands.from.sources.insert(root, 'y', '', 2);
+
+ const src3 = BasicPrettyPrinter.print(root);
+
+ expect(src3).toBe('FROM x, a1, y, a2, a3');
+
+ commands.from.sources.insert(root, 'z', '', 4);
+
+ const src4 = BasicPrettyPrinter.print(root);
+
+ expect(src4).toBe('FROM x, a1, y, a2, z, a3');
+ });
+
+ it('appends element, when insert position too high', () => {
+ const src1 = 'FROM a1, a2, a3';
+ const { root } = parse(src1);
+
+ commands.from.sources.insert(root, 'x', '', 999);
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM a1, a2, a3, x');
+ });
+
+ it('can inset the same source twice', () => {
+ const src1 = 'FROM index';
+ const { root } = parse(src1);
+
+ commands.from.sources.insert(root, 'x', '', 999);
+ commands.from.sources.insert(root, 'x', '', 999);
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM index, x, x');
+ });
+ });
+
+ describe('.upsert()', () => {
+ it('can append a source', () => {
+ const src1 = 'FROM index METADATA a';
+ const { root } = parse(src1);
+
+ commands.from.sources.upsert(root, 'index2');
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM index, index2 METADATA a');
+ });
+
+ it('can upsert at specified position', () => {
+ const src1 = 'FROM a1, a2, a3';
+ const { root } = parse(src1);
+
+ commands.from.sources.upsert(root, 'x', '', 0);
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM x, a1, a2, a3');
+
+ commands.from.sources.upsert(root, 'y', '', 2);
+
+ const src3 = BasicPrettyPrinter.print(root);
+
+ expect(src3).toBe('FROM x, a1, y, a2, a3');
+
+ commands.from.sources.upsert(root, 'z', '', 4);
+
+ const src4 = BasicPrettyPrinter.print(root);
+
+ expect(src4).toBe('FROM x, a1, y, a2, z, a3');
+ });
+
+ it('appends element, when upsert position too high', () => {
+ const src1 = 'FROM a1, a2, a3';
+ const { root } = parse(src1);
+
+ commands.from.sources.upsert(root, 'x', '', 999);
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM a1, a2, a3, x');
+ });
+
+ it('inserting already existing source is a no-op', () => {
+ const src1 = 'FROM index';
+ const { root } = parse(src1);
+
+ commands.from.sources.upsert(root, 'x', '', 999);
+ commands.from.sources.upsert(root, 'x', '', 999);
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM index, x');
+ });
+ });
+});
diff --git a/packages/kbn-esql-ast/src/mutate/commands/from/sources.ts b/packages/kbn-esql-ast/src/mutate/commands/from/sources.ts
new file mode 100644
index 000000000000..da67500b5b0b
--- /dev/null
+++ b/packages/kbn-esql-ast/src/mutate/commands/from/sources.ts
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { Builder } from '../../../builder';
+import { ESQLAstQueryExpression, ESQLSource } from '../../../types';
+import { Visitor } from '../../../visitor';
+import * as generic from '../../generic';
+import * as util from '../../util';
+import type { Predicate } from '../../types';
+
+export const list = (ast: ESQLAstQueryExpression): IterableIterator => {
+ return new Visitor()
+ .on('visitFromCommand', function* (ctx): IterableIterator {
+ for (const argument of ctx.arguments()) {
+ if (argument.type === 'source') {
+ yield argument;
+ }
+ }
+ })
+ .on('visitCommand', function* (): IterableIterator {})
+ .on('visitQuery', function* (ctx): IterableIterator {
+ for (const command of ctx.visitCommands()) {
+ yield* command;
+ }
+ })
+ .visitQuery(ast);
+};
+
+export const findByPredicate = (
+ ast: ESQLAstQueryExpression,
+ predicate: Predicate
+): ESQLSource | undefined => {
+ return util.findByPredicate(list(ast), predicate);
+};
+
+export const find = (
+ ast: ESQLAstQueryExpression,
+ index: string,
+ cluster?: string
+): ESQLSource | undefined => {
+ return findByPredicate(ast, (source) => {
+ if (index !== source.index) {
+ return false;
+ }
+ if (typeof cluster === 'string' && cluster !== source.cluster) {
+ return false;
+ }
+
+ return true;
+ });
+};
+
+export const remove = (
+ ast: ESQLAstQueryExpression,
+ index: string,
+ cluster?: string
+): ESQLSource | undefined => {
+ const node = find(ast, index, cluster);
+
+ if (!node) {
+ return undefined;
+ }
+
+ const success = generic.removeCommandArgument(ast, node);
+
+ return success ? node : undefined;
+};
+
+export const insert = (
+ ast: ESQLAstQueryExpression,
+ indexName: string,
+ clusterName?: string,
+ index: number = -1
+): ESQLSource | undefined => {
+ const command = generic.findCommandByName(ast, 'from');
+
+ if (!command) {
+ return;
+ }
+
+ const source = Builder.expression.indexSource(indexName, clusterName);
+
+ if (index === -1) {
+ generic.appendCommandArgument(command, source);
+ } else {
+ command.args.splice(index, 0, source);
+ }
+
+ return source;
+};
+
+export const upsert = (
+ ast: ESQLAstQueryExpression,
+ indexName: string,
+ clusterName?: string,
+ index: number = -1
+): ESQLSource | undefined => {
+ const source = find(ast, indexName, clusterName);
+
+ if (source) {
+ return source;
+ }
+
+ return insert(ast, indexName, clusterName, index);
+};
diff --git a/packages/kbn-esql-ast/src/mutate/commands/index.ts b/packages/kbn-esql-ast/src/mutate/commands/index.ts
index cc3b7f446fa8..0a779292e6ec 100644
--- a/packages/kbn-esql-ast/src/mutate/commands/index.ts
+++ b/packages/kbn-esql-ast/src/mutate/commands/index.ts
@@ -8,5 +8,6 @@
*/
import * as from from './from';
+import * as limit from './limit';
-export { from };
+export { from, limit };
diff --git a/packages/kbn-esql-ast/src/mutate/commands/limit/index.test.ts b/packages/kbn-esql-ast/src/mutate/commands/limit/index.test.ts
new file mode 100644
index 000000000000..9d734055cfef
--- /dev/null
+++ b/packages/kbn-esql-ast/src/mutate/commands/limit/index.test.ts
@@ -0,0 +1,311 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { parse } from '../../../parser';
+import { BasicPrettyPrinter } from '../../../pretty_print';
+import * as commands from '..';
+
+describe('commands.limit', () => {
+ describe('.list()', () => {
+ it('lists all "LIMIT" commands', () => {
+ const src = 'FROM index | LIMIT 1 | STATS agg() | LIMIT 2 | WHERE a == b | LIMIT 3';
+ const { root } = parse(src);
+
+ const nodes = [...commands.limit.list(root)];
+
+ expect(nodes).toMatchObject([
+ {
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 1,
+ },
+ ],
+ },
+ {
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 2,
+ },
+ ],
+ },
+ {
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 3,
+ },
+ ],
+ },
+ ]);
+ });
+ });
+
+ describe('.byIndex()', () => {
+ it('retrieves the specific "LIMIT" command by index', () => {
+ const src = 'FROM index | LIMIT 1 | STATS agg() | LIMIT 2 | WHERE a == b | LIMIT 3';
+ const { root } = parse(src);
+
+ const node = commands.limit.byIndex(root, 1);
+
+ expect(node).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 2,
+ },
+ ],
+ });
+ });
+ });
+
+ describe('.find()', () => {
+ it('can find a limit command by predicate', () => {
+ const src = 'FROM index | LIMIT 1 | STATS agg() | LIMIT 2 | WHERE a == b | LIMIT 3';
+ const { root } = parse(src);
+
+ const node = commands.limit.find(root, (cmd) => (cmd.args?.[0] as any).value === 3);
+
+ expect(node).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 3,
+ },
+ ],
+ });
+ });
+ });
+
+ describe('.remove()', () => {
+ it('can remove the only limit command', () => {
+ const src = 'FROM index | WHERE a == b | LIMIT 123';
+ const { root } = parse(src);
+
+ const node = commands.limit.remove(root);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(node).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ });
+ expect(src2).toBe('FROM index | WHERE a == b');
+ });
+
+ it('can remove the specific limit node', () => {
+ const src = 'FROM index | LIMIT 1 | STATS agg() | LIMIT 2 | WHERE a == b | LIMIT 3';
+ const { root } = parse(src);
+
+ const node1 = commands.limit.remove(root, 1);
+ const src1 = BasicPrettyPrinter.print(root);
+
+ expect(node1).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 2,
+ },
+ ],
+ });
+ expect(src1).toBe('FROM index | LIMIT 1 | STATS AGG() | WHERE a == b | LIMIT 3');
+
+ const node2 = commands.limit.remove(root);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(node2).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 1,
+ },
+ ],
+ });
+ expect(src2).toBe('FROM index | STATS AGG() | WHERE a == b | LIMIT 3');
+
+ const node3 = commands.limit.remove(root);
+ const src3 = BasicPrettyPrinter.print(root);
+
+ expect(node3).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 3,
+ },
+ ],
+ });
+ expect(src3).toBe('FROM index | STATS AGG() | WHERE a == b');
+
+ const node4 = commands.limit.remove(root);
+
+ expect(node4).toBe(undefined);
+ });
+ });
+
+ describe('.set()', () => {
+ it('can update a specific LIMIT command', () => {
+ const src = 'FROM index | LIMIT 1 | STATS agg() | LIMIT 2 | WHERE a == b | LIMIT 3';
+ const { root } = parse(src);
+
+ const node1 = commands.limit.set(root, 2222, 1);
+ const node2 = commands.limit.set(root, 3333, 2);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe(
+ 'FROM index | LIMIT 1 | STATS AGG() | LIMIT 2222 | WHERE a == b | LIMIT 3333'
+ );
+ expect(node1).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 2222,
+ },
+ ],
+ });
+ expect(node2).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 3333,
+ },
+ ],
+ });
+ });
+
+ it('by default, updates the first LIMIT command', () => {
+ const src = 'FROM index | LIMIT 1 | STATS agg() | LIMIT 2 | WHERE a == b | LIMIT 3';
+ const { root } = parse(src);
+
+ const node = commands.limit.set(root, 99999999);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe(
+ 'FROM index | LIMIT 99999999 | STATS AGG() | LIMIT 2 | WHERE a == b | LIMIT 3'
+ );
+ expect(node).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 99999999,
+ },
+ ],
+ });
+ });
+
+ it('does nothing if there is no existing limit command', () => {
+ const src = 'FROM index | STATS agg() | WHERE a == b';
+ const { root } = parse(src);
+
+ const node = commands.limit.set(root, 99999999);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM index | STATS AGG() | WHERE a == b');
+ expect(node).toBe(undefined);
+ });
+ });
+
+ describe('.upsert()', () => {
+ it('can update a specific LIMIT command', () => {
+ const src = 'FROM index | LIMIT 1 | STATS agg() | LIMIT 2 | WHERE a == b | LIMIT 3';
+ const { root } = parse(src);
+
+ const node1 = commands.limit.upsert(root, 2222, 1);
+ const node2 = commands.limit.upsert(root, 3333, 2);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe(
+ 'FROM index | LIMIT 1 | STATS AGG() | LIMIT 2222 | WHERE a == b | LIMIT 3333'
+ );
+ expect(node1).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 2222,
+ },
+ ],
+ });
+ expect(node2).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 3333,
+ },
+ ],
+ });
+ });
+
+ it('by default, updates the first LIMIT command', () => {
+ const src = 'FROM index | LIMIT 1 | STATS agg() | LIMIT 2 | WHERE a == b | LIMIT 3';
+ const { root } = parse(src);
+
+ const node = commands.limit.upsert(root, 99999999);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe(
+ 'FROM index | LIMIT 99999999 | STATS AGG() | LIMIT 2 | WHERE a == b | LIMIT 3'
+ );
+ expect(node).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 99999999,
+ },
+ ],
+ });
+ });
+
+ it('inserts a new LIMIT command, if there is none existing', () => {
+ const src = 'FROM index | STATS agg() | WHERE a == b';
+ const { root } = parse(src);
+
+ const node = commands.limit.upsert(root, 99999999);
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM index | STATS AGG() | WHERE a == b | LIMIT 99999999');
+ expect(node).toMatchObject({
+ type: 'command',
+ name: 'limit',
+ args: [
+ {
+ type: 'literal',
+ value: 99999999,
+ },
+ ],
+ });
+ });
+ });
+});
diff --git a/packages/kbn-esql-ast/src/mutate/commands/limit/index.ts b/packages/kbn-esql-ast/src/mutate/commands/limit/index.ts
new file mode 100644
index 000000000000..937538e84832
--- /dev/null
+++ b/packages/kbn-esql-ast/src/mutate/commands/limit/index.ts
@@ -0,0 +1,134 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { Builder } from '../../../builder';
+import type { ESQLAstQueryExpression, ESQLCommand } from '../../../types';
+import * as generic from '../../generic';
+import { Predicate } from '../../types';
+
+/**
+ * Lists all "LIMIT" commands in the query AST.
+ *
+ * @param ast The root AST node to search for "LIMIT" commands.
+ * @returns A collection of "LIMIT" commands.
+ */
+export const list = (ast: ESQLAstQueryExpression): IterableIterator => {
+ return generic.listCommands(ast, (cmd) => cmd.name === 'limit');
+};
+
+/**
+ * Retrieves the "LIMIT" command at the specified index in order of appearance.
+ *
+ * @param ast The root AST node to search for "LIMIT" commands.
+ * @param index The index of the "LIMIT" command to retrieve.
+ * @returns The "LIMIT" command at the specified index, if any.
+ */
+export const byIndex = (ast: ESQLAstQueryExpression, index: number): ESQLCommand | undefined => {
+ return [...list(ast)][index];
+};
+
+/**
+ * Finds the first "LIMIT" command that satisfies the provided predicate.
+ *
+ * @param ast The root AST node to search for "LIMIT" commands.
+ * @param predicate The predicate function to apply to each "LIMIT" command.
+ * @returns The first "LIMIT" command that satisfies the predicate, if any.
+ */
+export const find = (
+ ast: ESQLAstQueryExpression,
+ predicate: Predicate
+): ESQLCommand | undefined => {
+ return [...list(ast)].find(predicate);
+};
+
+/**
+ * Deletes the specified "LIMIT" command from the query AST.
+ *
+ * @param ast The root AST node to search for "LIMIT" commands.
+ * @param index The index of the "LIMIT" command to remove.
+ * @returns The removed "LIMIT" command, if any.
+ */
+export const remove = (ast: ESQLAstQueryExpression, index: number = 0): ESQLCommand | undefined => {
+ const command = generic.findCommandByName(ast, 'limit', index);
+
+ if (!command) {
+ return;
+ }
+
+ const success = generic.removeCommand(ast, command);
+
+ if (!success) {
+ return;
+ }
+
+ return command;
+};
+
+/**
+ * Sets the value of the specified "LIMIT" command. If `indexOrPredicate` is not
+ * specified will update the first "LIMIT" command found, if any.
+ *
+ * @param ast The root AST node to search for "LIMIT" commands.
+ * @param value The new value to set.
+ * @param indexOrPredicate The index of the "LIMIT" command to update, or a
+ * predicate function.
+ * @returns The updated "LIMIT" command, if any.
+ */
+export const set = (
+ ast: ESQLAstQueryExpression,
+ value: number,
+ indexOrPredicate: number | Predicate = 0
+): ESQLCommand | undefined => {
+ const node =
+ typeof indexOrPredicate === 'number'
+ ? byIndex(ast, indexOrPredicate)
+ : find(ast, indexOrPredicate);
+
+ if (!node) {
+ return;
+ }
+
+ const literal = Builder.expression.literal.numeric({ literalType: 'integer', value });
+
+ node.args = [literal];
+
+ return node;
+};
+
+/**
+ * Updates the value of the specified "LIMIT" command. If the "LIMIT" command
+ * is not found, a new one will be created and appended to the query AST.
+ *
+ * @param ast The root AST node to search for "LIMIT" commands.
+ * @param value The new value to set.
+ * @param indexOrPredicate The index of the "LIMIT" command to update, or a
+ * predicate function.
+ * @returns The updated or newly created "LIMIT" command.
+ */
+export const upsert = (
+ ast: ESQLAstQueryExpression,
+ value: number,
+ indexOrPredicate: number | Predicate = 0
+): ESQLCommand => {
+ const node = set(ast, value, indexOrPredicate);
+
+ if (node) {
+ return node;
+ }
+
+ const literal = Builder.expression.literal.numeric({ literalType: 'integer', value });
+ const command = Builder.command({
+ name: 'limit',
+ args: [literal],
+ });
+
+ generic.appendCommand(ast, command);
+
+ return command;
+};
diff --git a/packages/kbn-esql-ast/src/mutate/generic.test.ts b/packages/kbn-esql-ast/src/mutate/generic.test.ts
index 14d951db1bcc..0109ff838ffd 100644
--- a/packages/kbn-esql-ast/src/mutate/generic.test.ts
+++ b/packages/kbn-esql-ast/src/mutate/generic.test.ts
@@ -97,6 +97,46 @@ describe('generic', () => {
});
});
+ describe('.removeCommand()', () => {
+ it('can remove the last command', () => {
+ const src = 'FROM index | LIMIT 10';
+ const { root } = parse(src);
+ const command = generic.findCommandByName(root, 'limit', 0);
+
+ generic.removeCommand(root, command!);
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM index');
+ });
+
+ it('can remove the second command out of 3 with the same name', () => {
+ const src = 'FROM index | LIMIT 1 | LIMIT 2 | LIMIT 3';
+ const { root } = parse(src);
+ const command = generic.findCommandByName(root, 'limit', 1);
+
+ generic.removeCommand(root, command!);
+
+ const src2 = BasicPrettyPrinter.print(root);
+
+ expect(src2).toBe('FROM index | LIMIT 1 | LIMIT 3');
+ });
+
+ it('can remove all commands', () => {
+ const src = 'FROM index | WHERE a == b | LIMIT 123';
+ const { root } = parse(src);
+ const cmd1 = generic.findCommandByName(root, 'where');
+ const cmd2 = generic.findCommandByName(root, 'limit');
+ const cmd3 = generic.findCommandByName(root, 'from');
+
+ generic.removeCommand(root, cmd1!);
+ generic.removeCommand(root, cmd2!);
+ generic.removeCommand(root, cmd3!);
+
+ expect(root.commands.length).toBe(0);
+ });
+ });
+
describe('.removeCommandOption()', () => {
it('can remove existing command option', () => {
const src = 'FROM index METADATA _score';
diff --git a/packages/kbn-esql-ast/src/mutate/generic.ts b/packages/kbn-esql-ast/src/mutate/generic.ts
index 968eaf84f4a4..f27b0e2ae399 100644
--- a/packages/kbn-esql-ast/src/mutate/generic.ts
+++ b/packages/kbn-esql-ast/src/mutate/generic.ts
@@ -7,8 +7,15 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
+import { isOptionNode } from '../ast/util';
import { Builder } from '../builder';
-import { ESQLAstQueryExpression, ESQLCommand, ESQLCommandOption } from '../types';
+import {
+ ESQLAstQueryExpression,
+ ESQLCommand,
+ ESQLCommandOption,
+ ESQLProperNode,
+ ESQLSingleAstItem,
+} from '../types';
import { Visitor } from '../visitor';
import { Predicate } from './types';
@@ -124,6 +131,16 @@ export const findCommandOptionByName = (
return findCommandOption(command, (opt) => opt.name === optionName);
};
+/**
+ * Adds a new command to the query AST node.
+ *
+ * @param ast The root AST node to append the command to.
+ * @param command The command AST node to append.
+ */
+export const appendCommand = (ast: ESQLAstQueryExpression, command: ESQLCommand): void => {
+ ast.commands.push(command);
+};
+
/**
* Inserts a command option into the command's arguments list. The option can
* be specified as a string or an AST node.
@@ -132,7 +149,7 @@ export const findCommandOptionByName = (
* @param option The option to insert.
* @returns The inserted option.
*/
-export const insertCommandOption = (
+export const appendCommandOption = (
command: ESQLCommand,
option: string | ESQLCommandOption
): ESQLCommandOption => {
@@ -145,6 +162,40 @@ export const insertCommandOption = (
return option;
};
+export const appendCommandArgument = (
+ command: ESQLCommand,
+ expression: ESQLSingleAstItem
+): number => {
+ if (expression.type === 'option') {
+ command.args.push(expression);
+ return command.args.length - 1;
+ }
+
+ const index = command.args.findIndex((arg) => isOptionNode(arg));
+
+ if (index > -1) {
+ command.args.splice(index, 0, expression);
+ return index;
+ }
+
+ command.args.push(expression);
+ return command.args.length - 1;
+};
+
+export const removeCommand = (ast: ESQLAstQueryExpression, command: ESQLCommand): boolean => {
+ const cmds = ast.commands;
+ const length = cmds.length;
+
+ for (let i = 0; i < length; i++) {
+ if (cmds[i] === command) {
+ cmds.splice(i, 1);
+ return true;
+ }
+ }
+
+ return false;
+};
+
/**
* Removes the first command option from the command's arguments list that
* satisfies the predicate.
@@ -196,3 +247,41 @@ export const removeCommandOption = (
})
.visitQuery(ast);
};
+
+/**
+ * Searches all command arguments in the query AST node and removes the node
+ * from the command's arguments list.
+ *
+ * @param ast The root AST node to search for command arguments.
+ * @param node The argument AST node to remove.
+ * @returns Returns true if the argument was removed, false otherwise.
+ */
+export const removeCommandArgument = (
+ ast: ESQLAstQueryExpression,
+ node: ESQLProperNode
+): boolean => {
+ return new Visitor()
+ .on('visitCommand', (ctx): boolean => {
+ const args = ctx.node.args;
+ const length = args.length;
+
+ for (let i = 0; i < length; i++) {
+ if (args[i] === node) {
+ args.splice(i, 1);
+ return true;
+ }
+ }
+
+ return false;
+ })
+ .on('visitQuery', (ctx): boolean => {
+ for (const success of ctx.visitCommands()) {
+ if (success) {
+ return true;
+ }
+ }
+
+ return false;
+ })
+ .visitQuery(ast);
+};
diff --git a/packages/kbn-esql-ast/src/parser/__tests__/commands.test.ts b/packages/kbn-esql-ast/src/parser/__tests__/commands.test.ts
index b140a4dc83ed..30d44d447387 100644
--- a/packages/kbn-esql-ast/src/parser/__tests__/commands.test.ts
+++ b/packages/kbn-esql-ast/src/parser/__tests__/commands.test.ts
@@ -29,24 +29,6 @@ describe('commands', () => {
]);
});
- it('META', () => {
- const query = 'META functions';
- const { ast } = parse(query);
-
- expect(ast).toMatchObject([
- {
- type: 'command',
- name: 'meta',
- args: [
- {
- type: 'function',
- name: 'functions',
- },
- ],
- },
- ]);
- });
-
it('FROM', () => {
const query = 'FROM index';
const { ast } = parse(query);
diff --git a/packages/kbn-esql-ast/src/parser/esql_ast_builder_listener.ts b/packages/kbn-esql-ast/src/parser/esql_ast_builder_listener.ts
index 88248a0e0bf2..de406e33aa7a 100644
--- a/packages/kbn-esql-ast/src/parser/esql_ast_builder_listener.ts
+++ b/packages/kbn-esql-ast/src/parser/esql_ast_builder_listener.ts
@@ -10,7 +10,6 @@
import type { ErrorNode, ParserRuleContext, TerminalNode } from 'antlr4';
import {
type ShowInfoContext,
- type MetaFunctionsContext,
type SingleStatementContext,
type RowCommandContext,
type FromCommandContext,
@@ -28,7 +27,6 @@ import {
type EnrichCommandContext,
type WhereCommandContext,
default as esql_parser,
- type MetaCommandContext,
type MetricsCommandContext,
IndexPatternContext,
InlinestatsCommandContext,
@@ -83,21 +81,6 @@ export class ESQLAstBuilderListener implements ESQLParserListener {
}
}
- /**
- * Exit a parse tree produced by the `showFunctions`
- * labeled alternative in `esql_parser.showCommand`.
- * @param ctx the parse tree
- */
- exitMetaFunctions(ctx: MetaFunctionsContext) {
- const commandAst = createCommand('meta', ctx);
- this.ast.push(commandAst);
- // update the text
- commandAst.text = ctx.getText();
- if (textExistsAndIsValid(ctx.FUNCTIONS().getText())) {
- commandAst?.args.push(createFunction('functions', ctx, getPosition(ctx.FUNCTIONS().symbol)));
- }
- }
-
/**
* Enter a parse tree produced by `esql_parser.singleStatement`.
* @param ctx the parse tree
@@ -310,14 +293,6 @@ export class ESQLAstBuilderListener implements ESQLParserListener {
this.ast.push(command);
}
- /**
- * Enter a parse tree produced by `esql_parser.metaCommand`.
- * @param ctx the parse tree
- */
- enterMetaCommand(ctx: MetaCommandContext) {
- const command = createCommand('meta', ctx);
- this.ast.push(command);
- }
/**
* Exit a parse tree produced by `esql_parser.enrichCommand`.
* @param ctx the parse tree
diff --git a/packages/kbn-esql-ast/src/parser/factories.ts b/packages/kbn-esql-ast/src/parser/factories.ts
index 5afc23a1bd5d..321ca6a40dcd 100644
--- a/packages/kbn-esql-ast/src/parser/factories.ts
+++ b/packages/kbn-esql-ast/src/parser/factories.ts
@@ -430,7 +430,9 @@ export function createColumn(ctx: ParserRuleContext): ESQLColumn {
...ctx.identifierPattern_list().map((identifier) => parseIdentifier(identifier.getText()))
);
} else if (ctx instanceof QualifiedNameContext) {
- parts.push(...ctx.identifier_list().map((identifier) => parseIdentifier(identifier.getText())));
+ parts.push(
+ ...ctx.identifierOrParameter_list().map((identifier) => parseIdentifier(identifier.getText()))
+ );
} else {
parts.push(sanitizeIdentifierString(ctx));
}
diff --git a/packages/kbn-esql-ast/src/parser/parser.ts b/packages/kbn-esql-ast/src/parser/parser.ts
index 612239f97215..ad263a49ebd0 100644
--- a/packages/kbn-esql-ast/src/parser/parser.ts
+++ b/packages/kbn-esql-ast/src/parser/parser.ts
@@ -64,7 +64,7 @@ export const createParser = (text: string) => {
// These will need to be manually updated whenever the relevant grammar changes.
const SYNTAX_ERRORS_TO_IGNORE = [
- `SyntaxError: mismatched input '' expecting {'explain', 'from', 'meta', 'row', 'show'}`,
+ `SyntaxError: mismatched input '' expecting {'explain', 'from', 'row', 'show'}`,
];
export interface ParseOptions {
diff --git a/packages/kbn-esql-ast/src/parser/walkers.ts b/packages/kbn-esql-ast/src/parser/walkers.ts
index ce9490ccf545..cccc215ec365 100644
--- a/packages/kbn-esql-ast/src/parser/walkers.ts
+++ b/packages/kbn-esql-ast/src/parser/walkers.ts
@@ -16,7 +16,7 @@ import {
BooleanDefaultContext,
type BooleanExpressionContext,
BooleanLiteralContext,
- InputParamsContext,
+ InputParameterContext,
BooleanValueContext,
type CommandOptionsContext,
ComparisonContext,
@@ -385,7 +385,7 @@ function getConstant(ctx: ConstantContext): ESQLAstItem {
}
return createList(ctx, values);
}
- if (ctx instanceof InputParamsContext && ctx.children) {
+ if (ctx instanceof InputParameterContext && ctx.children) {
const values: ESQLLiteral[] = [];
for (const child of ctx.children) {
@@ -478,7 +478,7 @@ export function visitPrimaryExpression(ctx: PrimaryExpressionContext): ESQLAstIt
if (ctx instanceof FunctionContext) {
const functionExpressionCtx = ctx.functionExpression();
const fn = createFunction(
- functionExpressionCtx.identifier().getText().toLowerCase(),
+ functionExpressionCtx.identifierOrParameter().getText().toLowerCase(),
ctx,
undefined,
'variadic-call'
diff --git a/packages/kbn-esql-ast/src/pretty_print/__tests__/basic_pretty_printer.test.ts b/packages/kbn-esql-ast/src/pretty_print/__tests__/basic_pretty_printer.test.ts
index af54b8ccf36f..20db9e729f09 100644
--- a/packages/kbn-esql-ast/src/pretty_print/__tests__/basic_pretty_printer.test.ts
+++ b/packages/kbn-esql-ast/src/pretty_print/__tests__/basic_pretty_printer.test.ts
@@ -87,15 +87,6 @@ describe('single line query', () => {
});
});
- describe('META', () => {
- /** @todo Enable once show command args are parsed as columns. */
- test.skip('functions page', () => {
- const { text } = reprint('META functions');
-
- expect(text).toBe('META functions');
- });
- });
-
describe('STATS', () => {
test('with aggregates assignment', () => {
const { text } = reprint('FROM a | STATS var = agg(123, fn(true))');
diff --git a/packages/kbn-esql-editor/src/esql_editor.tsx b/packages/kbn-esql-editor/src/esql_editor.tsx
index abdaa577c4be..97340dc20d42 100644
--- a/packages/kbn-esql-editor/src/esql_editor.tsx
+++ b/packages/kbn-esql-editor/src/esql_editor.tsx
@@ -321,13 +321,10 @@ export const ESQLEditor = memo(function ESQLEditor({
}, []);
const { cache: dataSourcesCache, memoizedSources } = useMemo(() => {
- const fn = memoize(
- (...args: [DataViewsPublicPluginStart, CoreStart]) => ({
- timestamp: Date.now(),
- result: getESQLSources(...args),
- }),
- ({ esql }) => esql
- );
+ const fn = memoize((...args: [DataViewsPublicPluginStart, CoreStart]) => ({
+ timestamp: Date.now(),
+ result: getESQLSources(...args),
+ }));
return { cache: fn.cache, memoizedSources: fn };
}, []);
diff --git a/packages/kbn-esql-utils/index.ts b/packages/kbn-esql-utils/index.ts
index 333557964d87..ee47c0321e2e 100644
--- a/packages/kbn-esql-utils/index.ts
+++ b/packages/kbn-esql-utils/index.ts
@@ -30,6 +30,7 @@ export {
retrieveMetadataColumns,
getQueryColumnsFromESQLQuery,
isESQLColumnSortable,
+ isESQLColumnGroupable,
TextBasedLanguages,
} from './src';
diff --git a/packages/kbn-esql-utils/src/index.ts b/packages/kbn-esql-utils/src/index.ts
index 3b3228e7a2a4..cf530be20d7a 100644
--- a/packages/kbn-esql-utils/src/index.ts
+++ b/packages/kbn-esql-utils/src/index.ts
@@ -31,4 +31,4 @@ export {
getStartEndParams,
hasStartEndParams,
} from './utils/run_query';
-export { isESQLColumnSortable } from './utils/esql_fields_utils';
+export { isESQLColumnSortable, isESQLColumnGroupable } from './utils/esql_fields_utils';
diff --git a/packages/kbn-esql-utils/src/utils/esql_fields_utils.test.ts b/packages/kbn-esql-utils/src/utils/esql_fields_utils.test.ts
index ef8a24e686bd..bfc3a4d6708f 100644
--- a/packages/kbn-esql-utils/src/utils/esql_fields_utils.test.ts
+++ b/packages/kbn-esql-utils/src/utils/esql_fields_utils.test.ts
@@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
import type { DatatableColumn } from '@kbn/expressions-plugin/common';
-import { isESQLColumnSortable } from './esql_fields_utils';
+import { isESQLColumnSortable, isESQLColumnGroupable } from './esql_fields_utils';
describe('esql fields helpers', () => {
describe('isESQLColumnSortable', () => {
@@ -63,4 +63,45 @@ describe('esql fields helpers', () => {
expect(isESQLColumnSortable(keywordField)).toBeTruthy();
});
});
+
+ describe('isESQLColumnGroupable', () => {
+ it('returns false for unsupported fields', () => {
+ const unsupportedField = {
+ id: 'unsupported',
+ name: 'unsupported',
+ meta: {
+ type: 'unknown',
+ esType: 'unknown',
+ },
+ isNull: false,
+ } as DatatableColumn;
+ expect(isESQLColumnGroupable(unsupportedField)).toBeFalsy();
+ });
+
+ it('returns false for counter fields', () => {
+ const tsdbField = {
+ id: 'tsbd_counter',
+ name: 'tsbd_counter',
+ meta: {
+ type: 'number',
+ esType: 'counter_long',
+ },
+ isNull: false,
+ } as DatatableColumn;
+ expect(isESQLColumnGroupable(tsdbField)).toBeFalsy();
+ });
+
+ it('returns true for everything else', () => {
+ const keywordField = {
+ id: 'sortable',
+ name: 'sortable',
+ meta: {
+ type: 'string',
+ esType: 'keyword',
+ },
+ isNull: false,
+ } as DatatableColumn;
+ expect(isESQLColumnGroupable(keywordField)).toBeTruthy();
+ });
+ });
});
diff --git a/packages/kbn-esql-utils/src/utils/esql_fields_utils.ts b/packages/kbn-esql-utils/src/utils/esql_fields_utils.ts
index f5a0fe7b8134..e2c5c785f8f5 100644
--- a/packages/kbn-esql-utils/src/utils/esql_fields_utils.ts
+++ b/packages/kbn-esql-utils/src/utils/esql_fields_utils.ts
@@ -12,6 +12,7 @@ import type { DatatableColumn } from '@kbn/expressions-plugin/common';
const SPATIAL_FIELDS = ['geo_point', 'geo_shape', 'point', 'shape'];
const SOURCE_FIELD = '_source';
const TSDB_COUNTER_FIELDS_PREFIX = 'counter_';
+const UNKNOWN_FIELD = 'unknown';
/**
* Check if a column is sortable.
@@ -38,3 +39,23 @@ export const isESQLColumnSortable = (column: DatatableColumn): boolean => {
return true;
};
+
+/**
+ * Check if a column is groupable (| STATS ... BY ).
+ *
+ * @param column The DatatableColumn of the field.
+ * @returns True if the column is groupable, false otherwise.
+ */
+
+export const isESQLColumnGroupable = (column: DatatableColumn): boolean => {
+ // we don't allow grouping on the unknown field types
+ if (column.meta?.type === UNKNOWN_FIELD) {
+ return false;
+ }
+ // we don't allow grouping on tsdb counter fields
+ if (column.meta?.esType && column.meta?.esType?.indexOf(TSDB_COUNTER_FIELDS_PREFIX) !== -1) {
+ return false;
+ }
+
+ return true;
+};
diff --git a/packages/kbn-esql-utils/src/utils/get_esql_adhoc_dataview.ts b/packages/kbn-esql-utils/src/utils/get_esql_adhoc_dataview.ts
index eb116bb77d90..29d63387a40e 100644
--- a/packages/kbn-esql-utils/src/utils/get_esql_adhoc_dataview.ts
+++ b/packages/kbn-esql-utils/src/utils/get_esql_adhoc_dataview.ts
@@ -44,7 +44,7 @@ export async function getESQLAdHocDataview(
dataView.timeFieldName = timeField;
- // If the indexPattern is empty string means that the user used either the ROW or META FUNCTIONS / SHOW INFO commands
+ // If the indexPattern is empty string means that the user used either the ROW, SHOW INFO commands
// we don't want to add the @timestamp field in this case https://github.com/elastic/kibana/issues/163417
if (!timeField && indexPattern && dataView?.fields?.getByName?.('@timestamp')?.type === 'date') {
dataView.timeFieldName = '@timestamp';
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.from.ts b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.from.ts
index e3589bb8da64..491c44fe699d 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.from.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.from.ts
@@ -18,7 +18,7 @@ export const validationFromCommandTestSuite = (setup: helpers.Setup) => {
const { expectErrors } = await setup();
await expectErrors('f', [
- "SyntaxError: mismatched input 'f' expecting {'explain', 'from', 'meta', 'row', 'show'}",
+ "SyntaxError: mismatched input 'f' expecting {'explain', 'from', 'row', 'show'}",
]);
await expectErrors('from ', [
"SyntaxError: mismatched input '' expecting {QUOTED_STRING, UNQUOTED_SOURCE}",
@@ -56,12 +56,6 @@ export const validationFromCommandTestSuite = (setup: helpers.Setup) => {
await expectErrors('fRoM in*ex', []);
await expectErrors('fRoM ind*ex', []);
await expectErrors('fRoM *,-.*', []);
- await expectErrors('fRoM remote-*:indexes*', ['Unknown index [remote-*:indexes*]']);
- await expectErrors('fRoM remote-*:indexes', ['Unknown index [remote-*:indexes]']);
- await expectErrors('fRoM remote-ccs:indexes', ['Unknown index [remote-ccs:indexes]']);
- await expectErrors('fRoM a_index, remote-ccs:indexes', [
- 'Unknown index [remote-ccs:indexes]',
- ]);
await expectErrors('fRoM .secret_index', []);
await expectErrors('from my-index', []);
});
@@ -151,16 +145,6 @@ export const validationFromCommandTestSuite = (setup: helpers.Setup) => {
[],
addBracketsWarning()
);
- await expectErrors(
- `from remote-ccs:indexes ${setWrapping('METADATA _id')}`,
- ['Unknown index [remote-ccs:indexes]'],
- addBracketsWarning()
- );
- await expectErrors(
- `from *:indexes ${setWrapping('METADATA _id')}`,
- ['Unknown index [*:indexes]'],
- addBracketsWarning()
- );
});
test('validates fields', async () => {
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.metrics.ts b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.metrics.ts
index 8dd1634f6327..5384fdc136b4 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.metrics.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.metrics.ts
@@ -17,7 +17,7 @@ export const validationMetricsCommandTestSuite = (setup: helpers.Setup) => {
const { expectErrors } = await setup();
await expectErrors('m', [
- "SyntaxError: mismatched input 'm' expecting {'explain', 'from', 'meta', 'row', 'show'}",
+ "SyntaxError: mismatched input 'm' expecting {'explain', 'from', 'row', 'show'}",
]);
await expectErrors('metrics ', [
"SyntaxError: mismatched input '' expecting {QUOTED_STRING, UNQUOTED_SOURCE}",
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/validation.ccs.test.ts b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/validation.ccs.test.ts
new file mode 100644
index 000000000000..5cdb83be618d
--- /dev/null
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/validation.ccs.test.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+import { setup } from './helpers';
+
+describe('validation', () => {
+ describe('from command', () => {
+ describe('FROM [ METADATA ]', () => {
+ describe('... ...', () => {
+ test('display errors on unknown indices', async () => {
+ const { expectErrors } = await setup();
+ await expectErrors('fRoM remote-*:indexes*', ['Unknown index [remote-*:indexes*]']);
+ await expectErrors('fRoM remote-*:indexes', ['Unknown index [remote-*:indexes]']);
+ await expectErrors('fRoM remote-ccs:indexes', ['Unknown index [remote-ccs:indexes]']);
+ await expectErrors('fRoM a_index, remote-ccs:indexes', [
+ 'Unknown index [remote-ccs:indexes]',
+ ]);
+ });
+ });
+
+ describe('... METADATA ', () => {
+ for (const isWrapped of [true, false]) {
+ function setWrapping(option: string) {
+ return isWrapped ? `[${option}]` : option;
+ }
+
+ function addBracketsWarning() {
+ return isWrapped
+ ? ["Square brackets '[]' need to be removed from FROM METADATA declaration"]
+ : [];
+ }
+
+ describe(`wrapped = ${isWrapped}`, () => {
+ test('no errors on correct usage, waning on square brackets', async () => {
+ const { expectErrors } = await setup();
+ await expectErrors(
+ `from remote-ccs:indexes ${setWrapping('METADATA _id')}`,
+ ['Unknown index [remote-ccs:indexes]'],
+ addBracketsWarning()
+ );
+ await expectErrors(
+ `from *:indexes ${setWrapping('METADATA _id')}`,
+ ['Unknown index [*:indexes]'],
+ addBracketsWarning()
+ );
+ });
+ });
+ }
+ });
+ });
+ });
+});
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
index 1eb861168a13..736159b36384 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
@@ -160,63 +160,63 @@
{
"query": "eval",
"error": [
- "SyntaxError: mismatched input 'eval' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'eval' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
{
"query": "stats",
"error": [
- "SyntaxError: mismatched input 'stats' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'stats' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
{
"query": "rename",
"error": [
- "SyntaxError: mismatched input 'rename' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'rename' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
{
"query": "limit",
"error": [
- "SyntaxError: mismatched input 'limit' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'limit' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
{
"query": "keep",
"error": [
- "SyntaxError: mismatched input 'keep' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'keep' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
{
"query": "drop",
"error": [
- "SyntaxError: mismatched input 'drop' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'drop' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
{
"query": "mv_expand",
"error": [
- "SyntaxError: mismatched input 'mv_expand' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'mv_expand' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
{
"query": "dissect",
"error": [
- "SyntaxError: mismatched input 'dissect' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'dissect' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
{
"query": "grok",
"error": [
- "SyntaxError: mismatched input 'grok' expecting {'explain', 'from', 'meta', 'row', 'show'}"
+ "SyntaxError: mismatched input 'grok' expecting {'explain', 'from', 'row', 'show'}"
],
"warning": []
},
@@ -2206,7 +2206,7 @@
{
"query": "from index | keep ",
"error": [
- "SyntaxError: missing ID_PATTERN at ''"
+ "SyntaxError: mismatched input '' expecting {'?', NAMED_OR_POSITIONAL_PARAM, ID_PATTERN}"
],
"warning": []
},
@@ -2225,8 +2225,9 @@
"error": [
"SyntaxError: token recognition error at: '4'",
"SyntaxError: token recognition error at: '5'",
- "SyntaxError: missing ID_PATTERN at '.'",
- "SyntaxError: missing ID_PATTERN at ''"
+ "SyntaxError: mismatched input '.' expecting {'?', NAMED_OR_POSITIONAL_PARAM, ID_PATTERN}",
+ "SyntaxError: mismatched input '' expecting {'?', NAMED_OR_POSITIONAL_PARAM, ID_PATTERN}",
+ "Unknown column [.]"
],
"warning": []
},
@@ -2336,7 +2337,7 @@
{
"query": "from index | drop ",
"error": [
- "SyntaxError: missing ID_PATTERN at ''"
+ "SyntaxError: mismatched input '' expecting {'?', NAMED_OR_POSITIONAL_PARAM, ID_PATTERN}"
],
"warning": []
},
@@ -2350,8 +2351,9 @@
"error": [
"SyntaxError: token recognition error at: '4'",
"SyntaxError: token recognition error at: '5'",
- "SyntaxError: missing ID_PATTERN at '.'",
- "SyntaxError: missing ID_PATTERN at ''"
+ "SyntaxError: mismatched input '.' expecting {'?', NAMED_OR_POSITIONAL_PARAM, ID_PATTERN}",
+ "SyntaxError: mismatched input '' expecting {'?', NAMED_OR_POSITIONAL_PARAM, ID_PATTERN}",
+ "Unknown column [.]"
],
"warning": []
},
@@ -2471,7 +2473,7 @@
{
"query": "from a_index | mv_expand ",
"error": [
- "SyntaxError: missing {UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER} at '