Skip to content

Commit 58b6c78

Browse files
ahkcsahkcs
committed
Regenerate legacy PPL explain fixtures for OpenSearch 3.7
The earlier sweep stripped `,"excludes":[]` textually but left the surrounding YAML double-quoted string folds at their old column positions. Once the embedded JSON shrinks, the server's emitter folds at different offsets, so the checked-in fixtures diverged from actual output. Regenerate the 47 affected legacy-path fixtures under expectedOutput/ppl/{,big5/} from a live 3.7-SNAPSHOT cluster so fold offsets match byte-for-byte. Signed-off-by: Kai Huang <ahkcs@amazon.com>
1 parent 2b18d45 commit 58b6c78

47 files changed

Lines changed: 124 additions & 130 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ root:
99
request: "OpenSearchQueryRequest(indexName=big5, sourceBuilder={\"from\":0,\"\
1010
size\":10,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"agent\",\"process\"\
1111
,\"log\",\"message\",\"tags\",\"cloud\",\"input\",\"@timestamp\",\"ecs\"\
12-
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"asc\",\"missing\":\"_first\"\
13-
}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
14-
children: []
12+
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]},\"sort\"\
13+
:[{\"@timestamp\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, pitId=*,\
14+
\ cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
15+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp_can_match_shortcut.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ root:
1414
:true,\"fuzzy_transpositions\":true,\"boost\":1.0}},\"_source\":{\"includes\"\
1515
:[\"agent\",\"process\",\"log\",\"message\",\"tags\",\"cloud\",\"input\"\
1616
,\"@timestamp\",\"ecs\",\"data_stream\",\"meta\",\"host\",\"metrics\",\"\
17-
aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"\
18-
asc\",\"missing\":\"_first\"}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null,\
19-
\ searchResponse=null)"
20-
children: []
17+
aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"asc\",\"missing\"\
18+
:\"_first\"}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
19+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp_no_can_match_shortcut.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ root:
1414
:true,\"fuzzy_transpositions\":true,\"boost\":1.0}},\"_source\":{\"includes\"\
1515
:[\"agent\",\"process\",\"log\",\"message\",\"tags\",\"cloud\",\"input\"\
1616
,\"@timestamp\",\"ecs\",\"data_stream\",\"meta\",\"host\",\"metrics\",\"\
17-
aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"\
18-
asc\",\"missing\":\"_first\"}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null,\
19-
\ searchResponse=null)"
20-
children: []
17+
aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"asc\",\"missing\"\
18+
:\"_first\"}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
19+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_with_after_timestamp.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ root:
99
request: "OpenSearchQueryRequest(indexName=big5, sourceBuilder={\"from\":0,\"\
1010
size\":10,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"agent\",\"process\"\
1111
,\"log\",\"message\",\"tags\",\"cloud\",\"input\",\"@timestamp\",\"ecs\"\
12-
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"asc\",\"missing\":\"_first\"\
13-
}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
14-
children: []
12+
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]},\"sort\"\
13+
:[{\"@timestamp\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, pitId=*,\
14+
\ cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
15+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/default.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ root:
99
request: "OpenSearchQueryRequest(indexName=big5, sourceBuilder={\"from\":0,\"\
1010
size\":10,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"agent\",\"process\"\
1111
,\"log\",\"message\",\"tags\",\"cloud\",\"input\",\"@timestamp\",\"ecs\"\
12-
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]}}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
13-
children: []
12+
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]}}, pitId=*,\
13+
\ cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
14+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ root:
99
request: "OpenSearchQueryRequest(indexName=big5, sourceBuilder={\"from\":0,\"\
1010
size\":10,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"agent\",\"process\"\
1111
,\"log\",\"message\",\"tags\",\"cloud\",\"input\",\"@timestamp\",\"ecs\"\
12-
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"desc\",\"missing\":\"_last\"\
13-
}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
14-
children: []
12+
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]},\"sort\"\
13+
:[{\"@timestamp\":{\"order\":\"desc\",\"missing\":\"_last\"}}]}, pitId=*,\
14+
\ cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
15+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp_can_match_shortcut.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ root:
1414
:true,\"fuzzy_transpositions\":true,\"boost\":1.0}},\"_source\":{\"includes\"\
1515
:[\"agent\",\"process\",\"log\",\"message\",\"tags\",\"cloud\",\"input\"\
1616
,\"@timestamp\",\"ecs\",\"data_stream\",\"meta\",\"host\",\"metrics\",\"\
17-
aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"\
18-
desc\",\"missing\":\"_last\"}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null,\
19-
\ searchResponse=null)"
20-
children: []
17+
aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"desc\",\"missing\"\
18+
:\"_last\"}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
19+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp_no_can_match_shortcut.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ root:
1414
:true,\"fuzzy_transpositions\":true,\"boost\":1.0}},\"_source\":{\"includes\"\
1515
:[\"agent\",\"process\",\"log\",\"message\",\"tags\",\"cloud\",\"input\"\
1616
,\"@timestamp\",\"ecs\",\"data_stream\",\"meta\",\"host\",\"metrics\",\"\
17-
aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"\
18-
desc\",\"missing\":\"_last\"}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null,\
19-
\ searchResponse=null)"
20-
children: []
17+
aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"desc\",\"missing\"\
18+
:\"_last\"}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
19+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_with_after_timestamp.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ root:
99
request: "OpenSearchQueryRequest(indexName=big5, sourceBuilder={\"from\":0,\"\
1010
size\":10,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"agent\",\"process\"\
1111
,\"log\",\"message\",\"tags\",\"cloud\",\"input\",\"@timestamp\",\"ecs\"\
12-
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]},\"sort\":[{\"@timestamp\":{\"order\":\"desc\",\"missing\":\"_last\"\
13-
}}]}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
14-
children: []
12+
,\"data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]},\"sort\"\
13+
:[{\"@timestamp\":{\"order\":\"desc\",\"missing\":\"_last\"}}]}, pitId=*,\
14+
\ cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
15+
children: []

‎integ-test/src/test/resources/expectedOutput/ppl/big5/keyword_in_range.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ root:
1919
:true,\"fuzzy_transpositions\":true,\"boost\":1.0}}],\"adjust_pure_negative\"\
2020
:true,\"boost\":1.0}},\"_source\":{\"includes\":[\"agent\",\"process\",\"\
2121
log\",\"message\",\"tags\",\"cloud\",\"input\",\"@timestamp\",\"ecs\",\"\
22-
data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]}}, pitId=*, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
23-
children: []
22+
data_stream\",\"meta\",\"host\",\"metrics\",\"aws\",\"event\"]}}, pitId=*,\
23+
\ cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
24+
children: []

0 commit comments

Comments
 (0)