Fix asc/desc keyword behavior for sort command - #4651

Merged
RyanL1997 merged 9 commits into
opensearch-project:mainfrom
ritvibhatt:sort-desc-fix
Oct 28, 2025
Merged

Fix asc/desc keyword behavior for sort command#4651
RyanL1997 merged 9 commits into
opensearch-project:mainfrom
ritvibhatt:sort-desc-fix

Conversation

@ritvibhatt

@ritvibhattritvibhatt commented Oct 23, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Fixed PPL sort command so that asc/desc keywords specify sort direction for individual fields instead of applying all fields in the sort command. (keywords work on individual fields ex sort field1 asc, field2 desc means field1 is ascending and field2 is descending) while preventing mixing of prefix (+/-) and suffix (asc/desc) syntax, and updated integration tests to match this behavior.

Files Changed

  • ppl/src/main/antlr/OpenSearchPPLParser.g4: Updated grammar rules for sort command to support individual field ASC/DESC keywords
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java: Updated visitSortCommand() method to handle new ASC/DESC field syntax and prevent mixing of +/-and asc/desc sort syntax
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java: Modified expression building logic for sort field parsing and ensure consistent sort direction syntax usage across all sort fields
  • ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java: Updated getSortArguments() method to process new field-level ASC/DESC syntax

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • New functionality has javadoc added.
  • New functionality has a user manual doc added.
  • New PPL command checklist all confirmed.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff or -s.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@ritvibhatt
update asc/desc behavior for sort
e4f55cf
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix both sort directions on same field error
3619cc3
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
eb6536e
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
2c8f5ea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
aeb9fea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
update failing tests
647cc90
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@LantaoJinLantaoJin added the enhancement New feature or request label Oct 24, 2025
@ritvibhattritvibhatt changed the title Update asc/desc keyword behavior for sort commandFix asc/desc keyword behavior for sort commandOct 24, 2025
@ritvibhatt
ritvibhatt marked this pull request as ready for review October 24, 2025 15:52
ykmr1224
ykmr1224 reviewed Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/antlr/OpenSearchPPLParser.g4

sortField
: (PLUS | MINUS)? sortFieldExpression
: (PLUS | MINUS) sortFieldExpression (ASC | A | DESC | D) # invalidMixedSortField

@ykmr1224ykmr1224Oct 24, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to define invalid syntax? wouldn't it fail parse without this?

@ritvibhattritvibhattOct 24, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would fail the parse but added this to have a more clear error for when the two syntaxes are mixed

ykmr1224
ykmr1224 reviewed Oct 24, 2025
View reviewed changes
Comment threaddocs/user/ppl/cmd/sort.rst
ykmr1224
ykmr1224 reviewed Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
RyanL1997
RyanL1997 reviewed Oct 28, 2025
View reviewed changes

@RyanL1997RyanL1997 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ritvibhatt , thanks for the change, and I left some minor comments.

Comment threaddocs/user/ppl/cmd/sort.rst
Comment threadppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@ritvibhatt
update docs and casting refactor
428c47b
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
RyanL1997
RyanL1997 previously approved these changes Oct 28, 2025
View reviewed changes
@ritvibhatt
fix formatting
00ddb41
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
18e09f0
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@RyanL1997
RyanL1997 merged commit 448c42a into opensearch-project:mainOct 28, 2025
53 of 54 checks passed
opensearch-trigger-botBot pushed a commit that referenced this pull request Oct 28, 2025
@github-actions
Fix asc/desc keyword behavior for sort command (#4651)
d67c120
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-botopensearch-trigger-botBot mentioned this pull request Oct 28, 2025
Merged
ykmr1224 pushed a commit that referenced this pull request Oct 29, 2025
@opensearch-trigger-bot@github-actions
Fix asc/desc keyword behavior for sort command (#4651) (#4691)
cea4893
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
expani pushed a commit to vinaykpud/sql that referenced this pull request Nov 4, 2025
@ritvibhatt@expani
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
5872b1a
sandeshkr419 added a commit to sandeshkr419/sql that referenced this pull request Dec 3, 2025
@sandeshkr419@github-actions
@Swiddis@manasvinibs@opensearch-ci-bot@noCharger@dai-chen@cnoramut@yuancu@opensearch-trigger-bot@ahkcs@penghuo@alexey-temnikov@RileyJergerAmazon@ykmr1224@LantaoJin@songkant-aws@qianheng-aws@xinyual@RyanL1997@peterzhuamazon@vinaykpud@expani@vamsimanohar@ritvibhatt@ishaoxy@mch2
Data fusion changes
6f7fd68
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
Co-authored-by: Manasvini B S <manasvis@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Louis Chu <clingzhi@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Mebsina <cnoramut@gmail.com>
Co-authored-by: Yuanchun Shen <yuanchu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kai Huang <105710027+ahkcs@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
Co-authored-by: Riley Jerger <214163063+RileyJergerAmazon@users.noreply.github.com>
Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Co-authored-by: Lantao Jin <ltjin@amazon.com>
Co-authored-by: Songkan Tang <songkant@amazon.com>
Co-authored-by: qianheng <qianheng@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: Xinyuan Lu <xinyual@amazon.com>
Co-authored-by: Jialiang Liang <jiallian@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
Co-authored-by: expani <anijainc@amazon.com>
Co-authored-by: expani1729 <110471048+expani@users.noreply.github.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: ritvibhatt <53196324+ritvibhatt@users.noreply.github.com>
Co-authored-by: Xinyu Hao <75524174+ishaoxy@users.noreply.github.com>
Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Fix join type ambiguous issue when specify the join type with sql-like join criteria (opensearch-project#4474)
Fix issue 4441 (opensearch-project#4449)
Fix missing keywordsCanBeId (opensearch-project#4491)
Fix the bug of explicit makeNullLiteral for UDT fields (opensearch-project#4475)
Fix mapping after aggregation push down (opensearch-project#4500)
Fix percentile bug (opensearch-project#4539)
Fix JsonExtractAllFunctionIT failure (opensearch-project#4556)
Fix sort push down into agg after project already pushed (opensearch-project#4546)
Fix push down failure for min/max on derived field (opensearch-project#4572)
Fix compile issue in main (opensearch-project#4608)
Fix filter parsing failure on date fields with non-default format (opensearch-project#4616)
Fix bin nested fields issue (opensearch-project#4606)
Fix: Support Alias Fields in MIN, MAX, FIRST, LAST, and TAKE Aggregations (opensearch-project#4621)
fix rename issue (opensearch-project#4670)
Fixes for `Multisearch` and `Append` command (opensearch-project#4512)
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
Fix] Fix unexpected shift of extraction for `rex` with nested capture groups in named groups (opensearch-project#4641)
Fix CVE-2025-48924 (opensearch-project#4665)
Fix sub-fields accessing of generated structs (opensearch-project#4683)
Fix] Incorrect Field Index Mapping in AVG to SUM/COUNT Conversion (opensearch-project#15)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ykmr1224ykmr1224ykmr1224 approved these changes
@RyanL1997RyanL1997RyanL1997 approved these changes
@ps48ps48Awaiting requested review from ps48ps48 is a code owner
@kavithacmkavithacmAwaiting requested review from kavithacm
@derek-hoderek-hoAwaiting requested review from derek-ho
@joshuali925joshuali925Awaiting requested review from joshuali925joshuali925 is a code owner
@dai-chendai-chenAwaiting requested review from dai-chendai-chen is a code owner
@YANG-DBYANG-DBAwaiting requested review from YANG-DB
@mengweiericmengweiericAwaiting requested review from mengweiericmengweieric is a code owner
@vamsimanoharvamsimanoharAwaiting requested review from vamsimanoharvamsimanohar is a code owner
@SwiddisSwiddisAwaiting requested review from SwiddisSwiddis is a code owner
@penghuopenghuoAwaiting requested review from penghuopenghuo is a code owner
@seankao-azseankao-azAwaiting requested review from seankao-az
@MaxKsyunzMaxKsyunzAwaiting requested review from MaxKsyunz
@Yury-FridlyandYury-FridlyandAwaiting requested review from Yury-Fridlyand
@anirudhaanirudhaAwaiting requested review from anirudhaanirudha is a code owner
@forestmveyforestmveyAwaiting requested review from forestmvey
@acarbonettoacarbonettoAwaiting requested review from acarbonettoacarbonetto is a code owner
@GumpacGGumpacGAwaiting requested review from GumpacG
@LantaoJinLantaoJinAwaiting requested review from LantaoJinLantaoJin is a code owner
@noChargernoChargerAwaiting requested review from noChargernoCharger is a code owner
@qianheng-awsqianheng-awsAwaiting requested review from qianheng-awsqianheng-aws is a code owner
@yuancuyuancuAwaiting requested review from yuancuyuancu is a code owner

Assignees

No one assigned

Labels

backport 2.19-devenhancementNew feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ritvibhatt@ykmr1224@RyanL1997@LantaoJin
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix asc/desc keyword behavior for sort command - #4651
Merged
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Oct 28, 2025
Merged
Fix asc/desc keyword behavior for sort command#4651
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Conversation
@ritvibhatt
@ritvibhattritvibhatt
commented
Oct 23, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Fixed PPL sort command so that asc/desc keywords specify sort direction for individual fields instead of applying all fields in the sort command. (keywords work on individual fields ex sort field1 asc, field2 desc means field1 is ascending and field2 is descending) while preventing mixing of prefix (+/-) and suffix (asc/desc) syntax, and updated integration tests to match this behavior.
Files Changed
  • ppl/src/main/antlr/OpenSearchPPLParser.g4: Updated grammar rules for sort command to support individual field ASC/DESC keywords
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java: Updated visitSortCommand() method to handle new ASC/DESC field syntax and prevent mixing of +/-and asc/desc sort syntax
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java: Modified expression building logic for sort field parsing and ensure consistent sort direction syntax usage across all sort fields
  • ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java: Updated getSortArguments() method to process new field-level ASC/DESC syntax
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
  •  New functionality includes testing.
  •  New functionality has been documented.
  •  New functionality has javadoc added.
  •  New functionality has a user manual doc added.
  •  New PPL command checklist all confirmed.
  •  API changes companion pull request created.
  •  Commits are signed per the DCO using --signoff or -s.
  •  Public documentation issue/PR created.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.
@ritvibhatt
update asc/desc behavior for sort
e4f55cf
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix both sort directions on same field error
3619cc3
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
eb6536e
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
2c8f5ea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
aeb9fea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
update failing tests
647cc90
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@LantaoJinLantaoJin
added
the 
enhancement
New feature or request
label
Oct 24, 2025
@ritvibhattritvibhatt
changed the title
Update asc/desc keyword behavior for sort commandFix asc/desc keyword behavior for sort commandOct 24, 2025
@ritvibhatt
ritvibhatt
marked this pull request as ready for review
October 24, 2025 15:52
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/antlr/OpenSearchPPLParser.g4

sortField
 : (PLUS | MINUS)? sortFieldExpression
 : (PLUS | MINUS) sortFieldExpression (ASC | A | DESC | D) # invalidMixedSortField
@ykmr1224ykmr1224Oct 24, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to define invalid syntax? wouldn't it fail parse without this?
@ritvibhattritvibhattOct 24, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would fail the parse but added this to have a more clear error for when the two syntaxes are mixed
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threaddocs/user/ppl/cmd/sort.rst
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
RyanL1997
RyanL1997
reviewed
Oct 28, 2025
View reviewed changes
@RyanL1997RyanL1997
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ritvibhatt , thanks for the change, and I left some minor comments.
Comment threaddocs/user/ppl/cmd/sort.rst
Comment threadppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@ritvibhatt
update docs and casting refactor
428c47b
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
RyanL1997
RyanL1997
previously approved these changes
Oct 28, 2025
View reviewed changes
@ritvibhatt
fix formatting
00ddb41
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
18e09f0
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@RyanL1997
RyanL1997
merged commit 448c42a
into
opensearch-project:mainOct 28, 2025

53 of 54 checks passed

opensearch-trigger-botBot
pushed a commit
that referenced
this pull request
Oct 28, 2025
@github-actions
Fix asc/desc keyword behavior for sort command (#4651)
d67c120
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-botopensearch-trigger-botBot
mentioned this pull request
Oct 28, 2025
 Merged

ykmr1224 pushed a commit
that referenced
this pull request
Oct 29, 2025
@opensearch-trigger-bot@github-actions
Fix asc/desc keyword behavior for sort command (#4651) (#4691)
cea4893
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
expani pushed a commit
to vinaykpud/sql
that referenced
this pull request
Nov 4, 2025
@ritvibhatt@expani
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
5872b1a
sandeshkr419 added a commit
to sandeshkr419/sql
that referenced
this pull request
Dec 3, 2025
@sandeshkr419@github-actions
@Swiddis@manasvinibs@opensearch-ci-bot@noCharger@dai-chen@cnoramut@yuancu@opensearch-trigger-bot@ahkcs@penghuo@alexey-temnikov@RileyJergerAmazon@ykmr1224@LantaoJin@songkant-aws@qianheng-aws@xinyual@RyanL1997@peterzhuamazon@vinaykpud@expani@vamsimanohar@ritvibhatt@ishaoxy@mch2
Data fusion changes
6f7fd68
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
Co-authored-by: Manasvini B S <manasvis@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Louis Chu <clingzhi@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Mebsina <cnoramut@gmail.com>
Co-authored-by: Yuanchun Shen <yuanchu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kai Huang <105710027+ahkcs@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
Co-authored-by: Riley Jerger <214163063+RileyJergerAmazon@users.noreply.github.com>
Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Co-authored-by: Lantao Jin <ltjin@amazon.com>
Co-authored-by: Songkan Tang <songkant@amazon.com>
Co-authored-by: qianheng <qianheng@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: Xinyuan Lu <xinyual@amazon.com>
Co-authored-by: Jialiang Liang <jiallian@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
Co-authored-by: expani <anijainc@amazon.com>
Co-authored-by: expani1729 <110471048+expani@users.noreply.github.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: ritvibhatt <53196324+ritvibhatt@users.noreply.github.com>
Co-authored-by: Xinyu Hao <75524174+ishaoxy@users.noreply.github.com>
Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Fix join type ambiguous issue when specify the join type with sql-like join criteria (opensearch-project#4474)
Fix issue 4441 (opensearch-project#4449)
Fix missing keywordsCanBeId (opensearch-project#4491)
Fix the bug of explicit makeNullLiteral for UDT fields (opensearch-project#4475)
Fix mapping after aggregation push down (opensearch-project#4500)
Fix percentile bug (opensearch-project#4539)
Fix JsonExtractAllFunctionIT failure (opensearch-project#4556)
Fix sort push down into agg after project already pushed (opensearch-project#4546)
Fix push down failure for min/max on derived field (opensearch-project#4572)
Fix compile issue in main (opensearch-project#4608)
Fix filter parsing failure on date fields with non-default format (opensearch-project#4616)
Fix bin nested fields issue (opensearch-project#4606)
Fix: Support Alias Fields in MIN, MAX, FIRST, LAST, and TAKE Aggregations (opensearch-project#4621)
fix rename issue (opensearch-project#4670)
Fixes for `Multisearch` and `Append` command (opensearch-project#4512)
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
Fix] Fix unexpected shift of extraction for `rex` with nested capture groups in named groups (opensearch-project#4641)
Fix CVE-2025-48924 (opensearch-project#4665)
Fix sub-fields accessing of generated structs (opensearch-project#4683)
Fix] Incorrect Field Index Mapping in AVG to SUM/COUNT Conversion (opensearch-project#15)
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ykmr1224ykmr1224ykmr1224 approved these changes
@RyanL1997RyanL1997RyanL1997 approved these changes
@ps48ps48Awaiting requested review from ps48ps48 is a code owner
@kavithacmkavithacmAwaiting requested review from kavithacm
@derek-hoderek-hoAwaiting requested review from derek-ho
@joshuali925joshuali925Awaiting requested review from joshuali925joshuali925 is a code owner
@dai-chendai-chenAwaiting requested review from dai-chendai-chen is a code owner
@YANG-DBYANG-DBAwaiting requested review from YANG-DB
@mengweiericmengweiericAwaiting requested review from mengweiericmengweieric is a code owner
@vamsimanoharvamsimanoharAwaiting requested review from vamsimanoharvamsimanohar is a code owner
@SwiddisSwiddisAwaiting requested review from SwiddisSwiddis is a code owner
@penghuopenghuoAwaiting requested review from penghuopenghuo is a code owner
@seankao-azseankao-azAwaiting requested review from seankao-az
@MaxKsyunzMaxKsyunzAwaiting requested review from MaxKsyunz
@Yury-FridlyandYury-FridlyandAwaiting requested review from Yury-Fridlyand
@anirudhaanirudhaAwaiting requested review from anirudhaanirudha is a code owner
@forestmveyforestmveyAwaiting requested review from forestmvey
@acarbonettoacarbonettoAwaiting requested review from acarbonettoacarbonetto is a code owner
@GumpacGGumpacGAwaiting requested review from GumpacG
@LantaoJinLantaoJinAwaiting requested review from LantaoJinLantaoJin is a code owner
@noChargernoChargerAwaiting requested review from noChargernoCharger is a code owner
@qianheng-awsqianheng-awsAwaiting requested review from qianheng-awsqianheng-aws is a code owner
@yuancuyuancuAwaiting requested review from yuancuyuancu is a code owner

Assignees


No one assigned


Labels

backport 2.19-devenhancementNew feature or request

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@ritvibhatt@ykmr1224@RyanL1997@LantaoJin

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix asc/desc keyword behavior for sort command - #4651
Merged
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Oct 28, 2025
Merged
Fix asc/desc keyword behavior for sort command#4651
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Conversation
@ritvibhatt
@ritvibhattritvibhatt
commented
Oct 23, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Fixed PPL sort command so that asc/desc keywords specify sort direction for individual fields instead of applying all fields in the sort command. (keywords work on individual fields ex sort field1 asc, field2 desc means field1 is ascending and field2 is descending) while preventing mixing of prefix (+/-) and suffix (asc/desc) syntax, and updated integration tests to match this behavior.
Files Changed
  • ppl/src/main/antlr/OpenSearchPPLParser.g4: Updated grammar rules for sort command to support individual field ASC/DESC keywords
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java: Updated visitSortCommand() method to handle new ASC/DESC field syntax and prevent mixing of +/-and asc/desc sort syntax
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java: Modified expression building logic for sort field parsing and ensure consistent sort direction syntax usage across all sort fields
  • ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java: Updated getSortArguments() method to process new field-level ASC/DESC syntax
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
  •  New functionality includes testing.
  •  New functionality has been documented.
  •  New functionality has javadoc added.
  •  New functionality has a user manual doc added.
  •  New PPL command checklist all confirmed.
  •  API changes companion pull request created.
  •  Commits are signed per the DCO using --signoff or -s.
  •  Public documentation issue/PR created.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.
@ritvibhatt
update asc/desc behavior for sort
e4f55cf
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix both sort directions on same field error
3619cc3
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
eb6536e
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
2c8f5ea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
aeb9fea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
update failing tests
647cc90
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@LantaoJinLantaoJin
added
the 
enhancement
New feature or request
label
Oct 24, 2025
@ritvibhattritvibhatt
changed the title
Update asc/desc keyword behavior for sort commandFix asc/desc keyword behavior for sort commandOct 24, 2025
@ritvibhatt
ritvibhatt
marked this pull request as ready for review
October 24, 2025 15:52
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/antlr/OpenSearchPPLParser.g4

sortField
 : (PLUS | MINUS)? sortFieldExpression
 : (PLUS | MINUS) sortFieldExpression (ASC | A | DESC | D) # invalidMixedSortField
@ykmr1224ykmr1224Oct 24, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to define invalid syntax? wouldn't it fail parse without this?
@ritvibhattritvibhattOct 24, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would fail the parse but added this to have a more clear error for when the two syntaxes are mixed
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threaddocs/user/ppl/cmd/sort.rst
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
RyanL1997
RyanL1997
reviewed
Oct 28, 2025
View reviewed changes
@RyanL1997RyanL1997
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ritvibhatt , thanks for the change, and I left some minor comments.
Comment threaddocs/user/ppl/cmd/sort.rst
Comment threadppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@ritvibhatt
update docs and casting refactor
428c47b
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
RyanL1997
RyanL1997
previously approved these changes
Oct 28, 2025
View reviewed changes
@ritvibhatt
fix formatting
00ddb41
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
18e09f0
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@RyanL1997
RyanL1997
merged commit 448c42a
into
opensearch-project:mainOct 28, 2025

53 of 54 checks passed

opensearch-trigger-botBot
pushed a commit
that referenced
this pull request
Oct 28, 2025
@github-actions
Fix asc/desc keyword behavior for sort command (#4651)
d67c120
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-botopensearch-trigger-botBot
mentioned this pull request
Oct 28, 2025
 Merged

ykmr1224 pushed a commit
that referenced
this pull request
Oct 29, 2025
@opensearch-trigger-bot@github-actions
Fix asc/desc keyword behavior for sort command (#4651) (#4691)
cea4893
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
expani pushed a commit
to vinaykpud/sql
that referenced
this pull request
Nov 4, 2025
@ritvibhatt@expani
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
5872b1a
sandeshkr419 added a commit
to sandeshkr419/sql
that referenced
this pull request
Dec 3, 2025
@sandeshkr419@github-actions
@Swiddis@manasvinibs@opensearch-ci-bot@noCharger@dai-chen@cnoramut@yuancu@opensearch-trigger-bot@ahkcs@penghuo@alexey-temnikov@RileyJergerAmazon@ykmr1224@LantaoJin@songkant-aws@qianheng-aws@xinyual@RyanL1997@peterzhuamazon@vinaykpud@expani@vamsimanohar@ritvibhatt@ishaoxy@mch2
Data fusion changes
6f7fd68
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
Co-authored-by: Manasvini B S <manasvis@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Louis Chu <clingzhi@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Mebsina <cnoramut@gmail.com>
Co-authored-by: Yuanchun Shen <yuanchu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kai Huang <105710027+ahkcs@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
Co-authored-by: Riley Jerger <214163063+RileyJergerAmazon@users.noreply.github.com>
Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Co-authored-by: Lantao Jin <ltjin@amazon.com>
Co-authored-by: Songkan Tang <songkant@amazon.com>
Co-authored-by: qianheng <qianheng@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: Xinyuan Lu <xinyual@amazon.com>
Co-authored-by: Jialiang Liang <jiallian@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
Co-authored-by: expani <anijainc@amazon.com>
Co-authored-by: expani1729 <110471048+expani@users.noreply.github.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: ritvibhatt <53196324+ritvibhatt@users.noreply.github.com>
Co-authored-by: Xinyu Hao <75524174+ishaoxy@users.noreply.github.com>
Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Fix join type ambiguous issue when specify the join type with sql-like join criteria (opensearch-project#4474)
Fix issue 4441 (opensearch-project#4449)
Fix missing keywordsCanBeId (opensearch-project#4491)
Fix the bug of explicit makeNullLiteral for UDT fields (opensearch-project#4475)
Fix mapping after aggregation push down (opensearch-project#4500)
Fix percentile bug (opensearch-project#4539)
Fix JsonExtractAllFunctionIT failure (opensearch-project#4556)
Fix sort push down into agg after project already pushed (opensearch-project#4546)
Fix push down failure for min/max on derived field (opensearch-project#4572)
Fix compile issue in main (opensearch-project#4608)
Fix filter parsing failure on date fields with non-default format (opensearch-project#4616)
Fix bin nested fields issue (opensearch-project#4606)
Fix: Support Alias Fields in MIN, MAX, FIRST, LAST, and TAKE Aggregations (opensearch-project#4621)
fix rename issue (opensearch-project#4670)
Fixes for `Multisearch` and `Append` command (opensearch-project#4512)
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
Fix] Fix unexpected shift of extraction for `rex` with nested capture groups in named groups (opensearch-project#4641)
Fix CVE-2025-48924 (opensearch-project#4665)
Fix sub-fields accessing of generated structs (opensearch-project#4683)
Fix] Incorrect Field Index Mapping in AVG to SUM/COUNT Conversion (opensearch-project#15)
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ykmr1224ykmr1224ykmr1224 approved these changes
@RyanL1997RyanL1997RyanL1997 approved these changes
@ps48ps48Awaiting requested review from ps48ps48 is a code owner
@kavithacmkavithacmAwaiting requested review from kavithacm
@derek-hoderek-hoAwaiting requested review from derek-ho
@joshuali925joshuali925Awaiting requested review from joshuali925joshuali925 is a code owner
@dai-chendai-chenAwaiting requested review from dai-chendai-chen is a code owner
@YANG-DBYANG-DBAwaiting requested review from YANG-DB
@mengweiericmengweiericAwaiting requested review from mengweiericmengweieric is a code owner
@vamsimanoharvamsimanoharAwaiting requested review from vamsimanoharvamsimanohar is a code owner
@SwiddisSwiddisAwaiting requested review from SwiddisSwiddis is a code owner
@penghuopenghuoAwaiting requested review from penghuopenghuo is a code owner
@seankao-azseankao-azAwaiting requested review from seankao-az
@MaxKsyunzMaxKsyunzAwaiting requested review from MaxKsyunz
@Yury-FridlyandYury-FridlyandAwaiting requested review from Yury-Fridlyand
@anirudhaanirudhaAwaiting requested review from anirudhaanirudha is a code owner
@forestmveyforestmveyAwaiting requested review from forestmvey
@acarbonettoacarbonettoAwaiting requested review from acarbonettoacarbonetto is a code owner
@GumpacGGumpacGAwaiting requested review from GumpacG
@LantaoJinLantaoJinAwaiting requested review from LantaoJinLantaoJin is a code owner
@noChargernoChargerAwaiting requested review from noChargernoCharger is a code owner
@qianheng-awsqianheng-awsAwaiting requested review from qianheng-awsqianheng-aws is a code owner
@yuancuyuancuAwaiting requested review from yuancuyuancu is a code owner

Assignees


No one assigned


Labels

backport 2.19-devenhancementNew feature or request

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@ritvibhatt@ykmr1224@RyanL1997@LantaoJin

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix asc/desc keyword behavior for sort command - #4651
Merged
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Oct 28, 2025
Merged
Fix asc/desc keyword behavior for sort command#4651
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Conversation
@ritvibhatt
@ritvibhattritvibhatt
commented
Oct 23, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Fixed PPL sort command so that asc/desc keywords specify sort direction for individual fields instead of applying all fields in the sort command. (keywords work on individual fields ex sort field1 asc, field2 desc means field1 is ascending and field2 is descending) while preventing mixing of prefix (+/-) and suffix (asc/desc) syntax, and updated integration tests to match this behavior.
Files Changed
  • ppl/src/main/antlr/OpenSearchPPLParser.g4: Updated grammar rules for sort command to support individual field ASC/DESC keywords
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java: Updated visitSortCommand() method to handle new ASC/DESC field syntax and prevent mixing of +/-and asc/desc sort syntax
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java: Modified expression building logic for sort field parsing and ensure consistent sort direction syntax usage across all sort fields
  • ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java: Updated getSortArguments() method to process new field-level ASC/DESC syntax
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
  •  New functionality includes testing.
  •  New functionality has been documented.
  •  New functionality has javadoc added.
  •  New functionality has a user manual doc added.
  •  New PPL command checklist all confirmed.
  •  API changes companion pull request created.
  •  Commits are signed per the DCO using --signoff or -s.
  •  Public documentation issue/PR created.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.
@ritvibhatt
update asc/desc behavior for sort
e4f55cf
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix both sort directions on same field error
3619cc3
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
eb6536e
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
2c8f5ea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
aeb9fea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
update failing tests
647cc90
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@LantaoJinLantaoJin
added
the 
enhancement
New feature or request
label
Oct 24, 2025
@ritvibhattritvibhatt
changed the title
Update asc/desc keyword behavior for sort commandFix asc/desc keyword behavior for sort commandOct 24, 2025
@ritvibhatt
ritvibhatt
marked this pull request as ready for review
October 24, 2025 15:52
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/antlr/OpenSearchPPLParser.g4

sortField
 : (PLUS | MINUS)? sortFieldExpression
 : (PLUS | MINUS) sortFieldExpression (ASC | A | DESC | D) # invalidMixedSortField
@ykmr1224ykmr1224Oct 24, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to define invalid syntax? wouldn't it fail parse without this?
@ritvibhattritvibhattOct 24, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would fail the parse but added this to have a more clear error for when the two syntaxes are mixed
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threaddocs/user/ppl/cmd/sort.rst
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
RyanL1997
RyanL1997
reviewed
Oct 28, 2025
View reviewed changes
@RyanL1997RyanL1997
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ritvibhatt , thanks for the change, and I left some minor comments.
Comment threaddocs/user/ppl/cmd/sort.rst
Comment threadppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@ritvibhatt
update docs and casting refactor
428c47b
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
RyanL1997
RyanL1997
previously approved these changes
Oct 28, 2025
View reviewed changes
@ritvibhatt
fix formatting
00ddb41
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
18e09f0
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@RyanL1997
RyanL1997
merged commit 448c42a
into
opensearch-project:mainOct 28, 2025

53 of 54 checks passed

opensearch-trigger-botBot
pushed a commit
that referenced
this pull request
Oct 28, 2025
@github-actions
Fix asc/desc keyword behavior for sort command (#4651)
d67c120
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-botopensearch-trigger-botBot
mentioned this pull request
Oct 28, 2025
 Merged

ykmr1224 pushed a commit
that referenced
this pull request
Oct 29, 2025
@opensearch-trigger-bot@github-actions
Fix asc/desc keyword behavior for sort command (#4651) (#4691)
cea4893
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
expani pushed a commit
to vinaykpud/sql
that referenced
this pull request
Nov 4, 2025
@ritvibhatt@expani
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
5872b1a
sandeshkr419 added a commit
to sandeshkr419/sql
that referenced
this pull request
Dec 3, 2025
@sandeshkr419@github-actions
@Swiddis@manasvinibs@opensearch-ci-bot@noCharger@dai-chen@cnoramut@yuancu@opensearch-trigger-bot@ahkcs@penghuo@alexey-temnikov@RileyJergerAmazon@ykmr1224@LantaoJin@songkant-aws@qianheng-aws@xinyual@RyanL1997@peterzhuamazon@vinaykpud@expani@vamsimanohar@ritvibhatt@ishaoxy@mch2
Data fusion changes
6f7fd68
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
Co-authored-by: Manasvini B S <manasvis@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Louis Chu <clingzhi@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Mebsina <cnoramut@gmail.com>
Co-authored-by: Yuanchun Shen <yuanchu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kai Huang <105710027+ahkcs@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
Co-authored-by: Riley Jerger <214163063+RileyJergerAmazon@users.noreply.github.com>
Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Co-authored-by: Lantao Jin <ltjin@amazon.com>
Co-authored-by: Songkan Tang <songkant@amazon.com>
Co-authored-by: qianheng <qianheng@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: Xinyuan Lu <xinyual@amazon.com>
Co-authored-by: Jialiang Liang <jiallian@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
Co-authored-by: expani <anijainc@amazon.com>
Co-authored-by: expani1729 <110471048+expani@users.noreply.github.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: ritvibhatt <53196324+ritvibhatt@users.noreply.github.com>
Co-authored-by: Xinyu Hao <75524174+ishaoxy@users.noreply.github.com>
Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Fix join type ambiguous issue when specify the join type with sql-like join criteria (opensearch-project#4474)
Fix issue 4441 (opensearch-project#4449)
Fix missing keywordsCanBeId (opensearch-project#4491)
Fix the bug of explicit makeNullLiteral for UDT fields (opensearch-project#4475)
Fix mapping after aggregation push down (opensearch-project#4500)
Fix percentile bug (opensearch-project#4539)
Fix JsonExtractAllFunctionIT failure (opensearch-project#4556)
Fix sort push down into agg after project already pushed (opensearch-project#4546)
Fix push down failure for min/max on derived field (opensearch-project#4572)
Fix compile issue in main (opensearch-project#4608)
Fix filter parsing failure on date fields with non-default format (opensearch-project#4616)
Fix bin nested fields issue (opensearch-project#4606)
Fix: Support Alias Fields in MIN, MAX, FIRST, LAST, and TAKE Aggregations (opensearch-project#4621)
fix rename issue (opensearch-project#4670)
Fixes for `Multisearch` and `Append` command (opensearch-project#4512)
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
Fix] Fix unexpected shift of extraction for `rex` with nested capture groups in named groups (opensearch-project#4641)
Fix CVE-2025-48924 (opensearch-project#4665)
Fix sub-fields accessing of generated structs (opensearch-project#4683)
Fix] Incorrect Field Index Mapping in AVG to SUM/COUNT Conversion (opensearch-project#15)
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ykmr1224ykmr1224ykmr1224 approved these changes
@RyanL1997RyanL1997RyanL1997 approved these changes
@ps48ps48Awaiting requested review from ps48ps48 is a code owner
@kavithacmkavithacmAwaiting requested review from kavithacm
@derek-hoderek-hoAwaiting requested review from derek-ho
@joshuali925joshuali925Awaiting requested review from joshuali925joshuali925 is a code owner
@dai-chendai-chenAwaiting requested review from dai-chendai-chen is a code owner
@YANG-DBYANG-DBAwaiting requested review from YANG-DB
@mengweiericmengweiericAwaiting requested review from mengweiericmengweieric is a code owner
@vamsimanoharvamsimanoharAwaiting requested review from vamsimanoharvamsimanohar is a code owner
@SwiddisSwiddisAwaiting requested review from SwiddisSwiddis is a code owner
@penghuopenghuoAwaiting requested review from penghuopenghuo is a code owner
@seankao-azseankao-azAwaiting requested review from seankao-az
@MaxKsyunzMaxKsyunzAwaiting requested review from MaxKsyunz
@Yury-FridlyandYury-FridlyandAwaiting requested review from Yury-Fridlyand
@anirudhaanirudhaAwaiting requested review from anirudhaanirudha is a code owner
@forestmveyforestmveyAwaiting requested review from forestmvey
@acarbonettoacarbonettoAwaiting requested review from acarbonettoacarbonetto is a code owner
@GumpacGGumpacGAwaiting requested review from GumpacG
@LantaoJinLantaoJinAwaiting requested review from LantaoJinLantaoJin is a code owner
@noChargernoChargerAwaiting requested review from noChargernoCharger is a code owner
@qianheng-awsqianheng-awsAwaiting requested review from qianheng-awsqianheng-aws is a code owner
@yuancuyuancuAwaiting requested review from yuancuyuancu is a code owner

Assignees


No one assigned


Labels

backport 2.19-devenhancementNew feature or request

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@ritvibhatt@ykmr1224@RyanL1997@LantaoJin

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix asc/desc keyword behavior for sort command - #4651
Merged
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Oct 28, 2025
Merged
Fix asc/desc keyword behavior for sort command#4651
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Conversation
@ritvibhatt
@ritvibhattritvibhatt
commented
Oct 23, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Fixed PPL sort command so that asc/desc keywords specify sort direction for individual fields instead of applying all fields in the sort command. (keywords work on individual fields ex sort field1 asc, field2 desc means field1 is ascending and field2 is descending) while preventing mixing of prefix (+/-) and suffix (asc/desc) syntax, and updated integration tests to match this behavior.
Files Changed
  • ppl/src/main/antlr/OpenSearchPPLParser.g4: Updated grammar rules for sort command to support individual field ASC/DESC keywords
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java: Updated visitSortCommand() method to handle new ASC/DESC field syntax and prevent mixing of +/-and asc/desc sort syntax
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java: Modified expression building logic for sort field parsing and ensure consistent sort direction syntax usage across all sort fields
  • ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java: Updated getSortArguments() method to process new field-level ASC/DESC syntax
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
  •  New functionality includes testing.
  •  New functionality has been documented.
  •  New functionality has javadoc added.
  •  New functionality has a user manual doc added.
  •  New PPL command checklist all confirmed.
  •  API changes companion pull request created.
  •  Commits are signed per the DCO using --signoff or -s.
  •  Public documentation issue/PR created.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.
@ritvibhatt
update asc/desc behavior for sort
e4f55cf
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix both sort directions on same field error
3619cc3
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
eb6536e
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
2c8f5ea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
aeb9fea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
update failing tests
647cc90
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@LantaoJinLantaoJin
added
the 
enhancement
New feature or request
label
Oct 24, 2025
@ritvibhattritvibhatt
changed the title
Update asc/desc keyword behavior for sort commandFix asc/desc keyword behavior for sort commandOct 24, 2025
@ritvibhatt
ritvibhatt
marked this pull request as ready for review
October 24, 2025 15:52
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/antlr/OpenSearchPPLParser.g4

sortField
 : (PLUS | MINUS)? sortFieldExpression
 : (PLUS | MINUS) sortFieldExpression (ASC | A | DESC | D) # invalidMixedSortField
@ykmr1224ykmr1224Oct 24, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to define invalid syntax? wouldn't it fail parse without this?
@ritvibhattritvibhattOct 24, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would fail the parse but added this to have a more clear error for when the two syntaxes are mixed
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threaddocs/user/ppl/cmd/sort.rst
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
RyanL1997
RyanL1997
reviewed
Oct 28, 2025
View reviewed changes
@RyanL1997RyanL1997
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ritvibhatt , thanks for the change, and I left some minor comments.
Comment threaddocs/user/ppl/cmd/sort.rst
Comment threadppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@ritvibhatt
update docs and casting refactor
428c47b
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
RyanL1997
RyanL1997
previously approved these changes
Oct 28, 2025
View reviewed changes
@ritvibhatt
fix formatting
00ddb41
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
18e09f0
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@RyanL1997
RyanL1997
merged commit 448c42a
into
opensearch-project:mainOct 28, 2025

53 of 54 checks passed

opensearch-trigger-botBot
pushed a commit
that referenced
this pull request
Oct 28, 2025
@github-actions
Fix asc/desc keyword behavior for sort command (#4651)
d67c120
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-botopensearch-trigger-botBot
mentioned this pull request
Oct 28, 2025
 Merged

ykmr1224 pushed a commit
that referenced
this pull request
Oct 29, 2025
@opensearch-trigger-bot@github-actions
Fix asc/desc keyword behavior for sort command (#4651) (#4691)
cea4893
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
expani pushed a commit
to vinaykpud/sql
that referenced
this pull request
Nov 4, 2025
@ritvibhatt@expani
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
5872b1a
sandeshkr419 added a commit
to sandeshkr419/sql
that referenced
this pull request
Dec 3, 2025
@sandeshkr419@github-actions
@Swiddis@manasvinibs@opensearch-ci-bot@noCharger@dai-chen@cnoramut@yuancu@opensearch-trigger-bot@ahkcs@penghuo@alexey-temnikov@RileyJergerAmazon@ykmr1224@LantaoJin@songkant-aws@qianheng-aws@xinyual@RyanL1997@peterzhuamazon@vinaykpud@expani@vamsimanohar@ritvibhatt@ishaoxy@mch2
Data fusion changes
6f7fd68
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
Co-authored-by: Manasvini B S <manasvis@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Louis Chu <clingzhi@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Mebsina <cnoramut@gmail.com>
Co-authored-by: Yuanchun Shen <yuanchu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kai Huang <105710027+ahkcs@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
Co-authored-by: Riley Jerger <214163063+RileyJergerAmazon@users.noreply.github.com>
Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Co-authored-by: Lantao Jin <ltjin@amazon.com>
Co-authored-by: Songkan Tang <songkant@amazon.com>
Co-authored-by: qianheng <qianheng@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: Xinyuan Lu <xinyual@amazon.com>
Co-authored-by: Jialiang Liang <jiallian@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
Co-authored-by: expani <anijainc@amazon.com>
Co-authored-by: expani1729 <110471048+expani@users.noreply.github.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: ritvibhatt <53196324+ritvibhatt@users.noreply.github.com>
Co-authored-by: Xinyu Hao <75524174+ishaoxy@users.noreply.github.com>
Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Fix join type ambiguous issue when specify the join type with sql-like join criteria (opensearch-project#4474)
Fix issue 4441 (opensearch-project#4449)
Fix missing keywordsCanBeId (opensearch-project#4491)
Fix the bug of explicit makeNullLiteral for UDT fields (opensearch-project#4475)
Fix mapping after aggregation push down (opensearch-project#4500)
Fix percentile bug (opensearch-project#4539)
Fix JsonExtractAllFunctionIT failure (opensearch-project#4556)
Fix sort push down into agg after project already pushed (opensearch-project#4546)
Fix push down failure for min/max on derived field (opensearch-project#4572)
Fix compile issue in main (opensearch-project#4608)
Fix filter parsing failure on date fields with non-default format (opensearch-project#4616)
Fix bin nested fields issue (opensearch-project#4606)
Fix: Support Alias Fields in MIN, MAX, FIRST, LAST, and TAKE Aggregations (opensearch-project#4621)
fix rename issue (opensearch-project#4670)
Fixes for `Multisearch` and `Append` command (opensearch-project#4512)
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
Fix] Fix unexpected shift of extraction for `rex` with nested capture groups in named groups (opensearch-project#4641)
Fix CVE-2025-48924 (opensearch-project#4665)
Fix sub-fields accessing of generated structs (opensearch-project#4683)
Fix] Incorrect Field Index Mapping in AVG to SUM/COUNT Conversion (opensearch-project#15)
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ykmr1224ykmr1224ykmr1224 approved these changes
@RyanL1997RyanL1997RyanL1997 approved these changes
@ps48ps48Awaiting requested review from ps48ps48 is a code owner
@kavithacmkavithacmAwaiting requested review from kavithacm
@derek-hoderek-hoAwaiting requested review from derek-ho
@joshuali925joshuali925Awaiting requested review from joshuali925joshuali925 is a code owner
@dai-chendai-chenAwaiting requested review from dai-chendai-chen is a code owner
@YANG-DBYANG-DBAwaiting requested review from YANG-DB
@mengweiericmengweiericAwaiting requested review from mengweiericmengweieric is a code owner
@vamsimanoharvamsimanoharAwaiting requested review from vamsimanoharvamsimanohar is a code owner
@SwiddisSwiddisAwaiting requested review from SwiddisSwiddis is a code owner
@penghuopenghuoAwaiting requested review from penghuopenghuo is a code owner
@seankao-azseankao-azAwaiting requested review from seankao-az
@MaxKsyunzMaxKsyunzAwaiting requested review from MaxKsyunz
@Yury-FridlyandYury-FridlyandAwaiting requested review from Yury-Fridlyand
@anirudhaanirudhaAwaiting requested review from anirudhaanirudha is a code owner
@forestmveyforestmveyAwaiting requested review from forestmvey
@acarbonettoacarbonettoAwaiting requested review from acarbonettoacarbonetto is a code owner
@GumpacGGumpacGAwaiting requested review from GumpacG
@LantaoJinLantaoJinAwaiting requested review from LantaoJinLantaoJin is a code owner
@noChargernoChargerAwaiting requested review from noChargernoCharger is a code owner
@qianheng-awsqianheng-awsAwaiting requested review from qianheng-awsqianheng-aws is a code owner
@yuancuyuancuAwaiting requested review from yuancuyuancu is a code owner

Assignees


No one assigned


Labels

backport 2.19-devenhancementNew feature or request

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@ritvibhatt@ykmr1224@RyanL1997@LantaoJin

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix asc/desc keyword behavior for sort command - #4651
Merged
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Oct 28, 2025
Merged
Fix asc/desc keyword behavior for sort command#4651
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Conversation
@ritvibhatt
@ritvibhattritvibhatt
commented
Oct 23, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Fixed PPL sort command so that asc/desc keywords specify sort direction for individual fields instead of applying all fields in the sort command. (keywords work on individual fields ex sort field1 asc, field2 desc means field1 is ascending and field2 is descending) while preventing mixing of prefix (+/-) and suffix (asc/desc) syntax, and updated integration tests to match this behavior.
Files Changed
  • ppl/src/main/antlr/OpenSearchPPLParser.g4: Updated grammar rules for sort command to support individual field ASC/DESC keywords
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java: Updated visitSortCommand() method to handle new ASC/DESC field syntax and prevent mixing of +/-and asc/desc sort syntax
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java: Modified expression building logic for sort field parsing and ensure consistent sort direction syntax usage across all sort fields
  • ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java: Updated getSortArguments() method to process new field-level ASC/DESC syntax
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
  •  New functionality includes testing.
  •  New functionality has been documented.
  •  New functionality has javadoc added.
  •  New functionality has a user manual doc added.
  •  New PPL command checklist all confirmed.
  •  API changes companion pull request created.
  •  Commits are signed per the DCO using --signoff or -s.
  •  Public documentation issue/PR created.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.
@ritvibhatt
update asc/desc behavior for sort
e4f55cf
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix both sort directions on same field error
3619cc3
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
eb6536e
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
2c8f5ea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
aeb9fea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
update failing tests
647cc90
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@LantaoJinLantaoJin
added
the 
enhancement
New feature or request
label
Oct 24, 2025
@ritvibhattritvibhatt
changed the title
Update asc/desc keyword behavior for sort commandFix asc/desc keyword behavior for sort commandOct 24, 2025
@ritvibhatt
ritvibhatt
marked this pull request as ready for review
October 24, 2025 15:52
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/antlr/OpenSearchPPLParser.g4

sortField
 : (PLUS | MINUS)? sortFieldExpression
 : (PLUS | MINUS) sortFieldExpression (ASC | A | DESC | D) # invalidMixedSortField
@ykmr1224ykmr1224Oct 24, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to define invalid syntax? wouldn't it fail parse without this?
@ritvibhattritvibhattOct 24, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would fail the parse but added this to have a more clear error for when the two syntaxes are mixed
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threaddocs/user/ppl/cmd/sort.rst
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
RyanL1997
RyanL1997
reviewed
Oct 28, 2025
View reviewed changes
@RyanL1997RyanL1997
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ritvibhatt , thanks for the change, and I left some minor comments.
Comment threaddocs/user/ppl/cmd/sort.rst
Comment threadppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@ritvibhatt
update docs and casting refactor
428c47b
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
RyanL1997
RyanL1997
previously approved these changes
Oct 28, 2025
View reviewed changes
@ritvibhatt
fix formatting
00ddb41
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
18e09f0
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@RyanL1997
RyanL1997
merged commit 448c42a
into
opensearch-project:mainOct 28, 2025

53 of 54 checks passed

opensearch-trigger-botBot
pushed a commit
that referenced
this pull request
Oct 28, 2025
@github-actions
Fix asc/desc keyword behavior for sort command (#4651)
d67c120
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-botopensearch-trigger-botBot
mentioned this pull request
Oct 28, 2025
 Merged

ykmr1224 pushed a commit
that referenced
this pull request
Oct 29, 2025
@opensearch-trigger-bot@github-actions
Fix asc/desc keyword behavior for sort command (#4651) (#4691)
cea4893
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
expani pushed a commit
to vinaykpud/sql
that referenced
this pull request
Nov 4, 2025
@ritvibhatt@expani
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
5872b1a
sandeshkr419 added a commit
to sandeshkr419/sql
that referenced
this pull request
Dec 3, 2025
@sandeshkr419@github-actions
@Swiddis@manasvinibs@opensearch-ci-bot@noCharger@dai-chen@cnoramut@yuancu@opensearch-trigger-bot@ahkcs@penghuo@alexey-temnikov@RileyJergerAmazon@ykmr1224@LantaoJin@songkant-aws@qianheng-aws@xinyual@RyanL1997@peterzhuamazon@vinaykpud@expani@vamsimanohar@ritvibhatt@ishaoxy@mch2
Data fusion changes
6f7fd68
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
Co-authored-by: Manasvini B S <manasvis@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Louis Chu <clingzhi@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Mebsina <cnoramut@gmail.com>
Co-authored-by: Yuanchun Shen <yuanchu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kai Huang <105710027+ahkcs@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
Co-authored-by: Riley Jerger <214163063+RileyJergerAmazon@users.noreply.github.com>
Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Co-authored-by: Lantao Jin <ltjin@amazon.com>
Co-authored-by: Songkan Tang <songkant@amazon.com>
Co-authored-by: qianheng <qianheng@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: Xinyuan Lu <xinyual@amazon.com>
Co-authored-by: Jialiang Liang <jiallian@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
Co-authored-by: expani <anijainc@amazon.com>
Co-authored-by: expani1729 <110471048+expani@users.noreply.github.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: ritvibhatt <53196324+ritvibhatt@users.noreply.github.com>
Co-authored-by: Xinyu Hao <75524174+ishaoxy@users.noreply.github.com>
Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Fix join type ambiguous issue when specify the join type with sql-like join criteria (opensearch-project#4474)
Fix issue 4441 (opensearch-project#4449)
Fix missing keywordsCanBeId (opensearch-project#4491)
Fix the bug of explicit makeNullLiteral for UDT fields (opensearch-project#4475)
Fix mapping after aggregation push down (opensearch-project#4500)
Fix percentile bug (opensearch-project#4539)
Fix JsonExtractAllFunctionIT failure (opensearch-project#4556)
Fix sort push down into agg after project already pushed (opensearch-project#4546)
Fix push down failure for min/max on derived field (opensearch-project#4572)
Fix compile issue in main (opensearch-project#4608)
Fix filter parsing failure on date fields with non-default format (opensearch-project#4616)
Fix bin nested fields issue (opensearch-project#4606)
Fix: Support Alias Fields in MIN, MAX, FIRST, LAST, and TAKE Aggregations (opensearch-project#4621)
fix rename issue (opensearch-project#4670)
Fixes for `Multisearch` and `Append` command (opensearch-project#4512)
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
Fix] Fix unexpected shift of extraction for `rex` with nested capture groups in named groups (opensearch-project#4641)
Fix CVE-2025-48924 (opensearch-project#4665)
Fix sub-fields accessing of generated structs (opensearch-project#4683)
Fix] Incorrect Field Index Mapping in AVG to SUM/COUNT Conversion (opensearch-project#15)
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ykmr1224ykmr1224ykmr1224 approved these changes
@RyanL1997RyanL1997RyanL1997 approved these changes
@ps48ps48Awaiting requested review from ps48ps48 is a code owner
@kavithacmkavithacmAwaiting requested review from kavithacm
@derek-hoderek-hoAwaiting requested review from derek-ho
@joshuali925joshuali925Awaiting requested review from joshuali925joshuali925 is a code owner
@dai-chendai-chenAwaiting requested review from dai-chendai-chen is a code owner
@YANG-DBYANG-DBAwaiting requested review from YANG-DB
@mengweiericmengweiericAwaiting requested review from mengweiericmengweieric is a code owner
@vamsimanoharvamsimanoharAwaiting requested review from vamsimanoharvamsimanohar is a code owner
@SwiddisSwiddisAwaiting requested review from SwiddisSwiddis is a code owner
@penghuopenghuoAwaiting requested review from penghuopenghuo is a code owner
@seankao-azseankao-azAwaiting requested review from seankao-az
@MaxKsyunzMaxKsyunzAwaiting requested review from MaxKsyunz
@Yury-FridlyandYury-FridlyandAwaiting requested review from Yury-Fridlyand
@anirudhaanirudhaAwaiting requested review from anirudhaanirudha is a code owner
@forestmveyforestmveyAwaiting requested review from forestmvey
@acarbonettoacarbonettoAwaiting requested review from acarbonettoacarbonetto is a code owner
@GumpacGGumpacGAwaiting requested review from GumpacG
@LantaoJinLantaoJinAwaiting requested review from LantaoJinLantaoJin is a code owner
@noChargernoChargerAwaiting requested review from noChargernoCharger is a code owner
@qianheng-awsqianheng-awsAwaiting requested review from qianheng-awsqianheng-aws is a code owner
@yuancuyuancuAwaiting requested review from yuancuyuancu is a code owner

Assignees


No one assigned


Labels

backport 2.19-devenhancementNew feature or request

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@ritvibhatt@ykmr1224@RyanL1997@LantaoJin

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix asc/desc keyword behavior for sort command - #4651
Merged
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Oct 28, 2025
Merged
Fix asc/desc keyword behavior for sort command#4651
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Conversation
@ritvibhatt
@ritvibhattritvibhatt
commented
Oct 23, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Fixed PPL sort command so that asc/desc keywords specify sort direction for individual fields instead of applying all fields in the sort command. (keywords work on individual fields ex sort field1 asc, field2 desc means field1 is ascending and field2 is descending) while preventing mixing of prefix (+/-) and suffix (asc/desc) syntax, and updated integration tests to match this behavior.
Files Changed
  • ppl/src/main/antlr/OpenSearchPPLParser.g4: Updated grammar rules for sort command to support individual field ASC/DESC keywords
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java: Updated visitSortCommand() method to handle new ASC/DESC field syntax and prevent mixing of +/-and asc/desc sort syntax
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java: Modified expression building logic for sort field parsing and ensure consistent sort direction syntax usage across all sort fields
  • ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java: Updated getSortArguments() method to process new field-level ASC/DESC syntax
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
  •  New functionality includes testing.
  •  New functionality has been documented.
  •  New functionality has javadoc added.
  •  New functionality has a user manual doc added.
  •  New PPL command checklist all confirmed.
  •  API changes companion pull request created.
  •  Commits are signed per the DCO using --signoff or -s.
  •  Public documentation issue/PR created.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.
@ritvibhatt
update asc/desc behavior for sort
e4f55cf
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix both sort directions on same field error
3619cc3
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
eb6536e
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
2c8f5ea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
aeb9fea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
update failing tests
647cc90
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@LantaoJinLantaoJin
added
the 
enhancement
New feature or request
label
Oct 24, 2025
@ritvibhattritvibhatt
changed the title
Update asc/desc keyword behavior for sort commandFix asc/desc keyword behavior for sort commandOct 24, 2025
@ritvibhatt
ritvibhatt
marked this pull request as ready for review
October 24, 2025 15:52
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/antlr/OpenSearchPPLParser.g4

sortField
 : (PLUS | MINUS)? sortFieldExpression
 : (PLUS | MINUS) sortFieldExpression (ASC | A | DESC | D) # invalidMixedSortField
@ykmr1224ykmr1224Oct 24, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to define invalid syntax? wouldn't it fail parse without this?
@ritvibhattritvibhattOct 24, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would fail the parse but added this to have a more clear error for when the two syntaxes are mixed
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threaddocs/user/ppl/cmd/sort.rst
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
RyanL1997
RyanL1997
reviewed
Oct 28, 2025
View reviewed changes
@RyanL1997RyanL1997
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ritvibhatt , thanks for the change, and I left some minor comments.
Comment threaddocs/user/ppl/cmd/sort.rst
Comment threadppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@ritvibhatt
update docs and casting refactor
428c47b
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
RyanL1997
RyanL1997
previously approved these changes
Oct 28, 2025
View reviewed changes
@ritvibhatt
fix formatting
00ddb41
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
18e09f0
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@RyanL1997
RyanL1997
merged commit 448c42a
into
opensearch-project:mainOct 28, 2025

53 of 54 checks passed

opensearch-trigger-botBot
pushed a commit
that referenced
this pull request
Oct 28, 2025
@github-actions
Fix asc/desc keyword behavior for sort command (#4651)
d67c120
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-botopensearch-trigger-botBot
mentioned this pull request
Oct 28, 2025
 Merged

ykmr1224 pushed a commit
that referenced
this pull request
Oct 29, 2025
@opensearch-trigger-bot@github-actions
Fix asc/desc keyword behavior for sort command (#4651) (#4691)
cea4893
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
expani pushed a commit
to vinaykpud/sql
that referenced
this pull request
Nov 4, 2025
@ritvibhatt@expani
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
5872b1a
sandeshkr419 added a commit
to sandeshkr419/sql
that referenced
this pull request
Dec 3, 2025
@sandeshkr419@github-actions
@Swiddis@manasvinibs@opensearch-ci-bot@noCharger@dai-chen@cnoramut@yuancu@opensearch-trigger-bot@ahkcs@penghuo@alexey-temnikov@RileyJergerAmazon@ykmr1224@LantaoJin@songkant-aws@qianheng-aws@xinyual@RyanL1997@peterzhuamazon@vinaykpud@expani@vamsimanohar@ritvibhatt@ishaoxy@mch2
Data fusion changes
6f7fd68
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
Co-authored-by: Manasvini B S <manasvis@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Louis Chu <clingzhi@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Mebsina <cnoramut@gmail.com>
Co-authored-by: Yuanchun Shen <yuanchu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kai Huang <105710027+ahkcs@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
Co-authored-by: Riley Jerger <214163063+RileyJergerAmazon@users.noreply.github.com>
Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Co-authored-by: Lantao Jin <ltjin@amazon.com>
Co-authored-by: Songkan Tang <songkant@amazon.com>
Co-authored-by: qianheng <qianheng@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: Xinyuan Lu <xinyual@amazon.com>
Co-authored-by: Jialiang Liang <jiallian@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
Co-authored-by: expani <anijainc@amazon.com>
Co-authored-by: expani1729 <110471048+expani@users.noreply.github.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: ritvibhatt <53196324+ritvibhatt@users.noreply.github.com>
Co-authored-by: Xinyu Hao <75524174+ishaoxy@users.noreply.github.com>
Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Fix join type ambiguous issue when specify the join type with sql-like join criteria (opensearch-project#4474)
Fix issue 4441 (opensearch-project#4449)
Fix missing keywordsCanBeId (opensearch-project#4491)
Fix the bug of explicit makeNullLiteral for UDT fields (opensearch-project#4475)
Fix mapping after aggregation push down (opensearch-project#4500)
Fix percentile bug (opensearch-project#4539)
Fix JsonExtractAllFunctionIT failure (opensearch-project#4556)
Fix sort push down into agg after project already pushed (opensearch-project#4546)
Fix push down failure for min/max on derived field (opensearch-project#4572)
Fix compile issue in main (opensearch-project#4608)
Fix filter parsing failure on date fields with non-default format (opensearch-project#4616)
Fix bin nested fields issue (opensearch-project#4606)
Fix: Support Alias Fields in MIN, MAX, FIRST, LAST, and TAKE Aggregations (opensearch-project#4621)
fix rename issue (opensearch-project#4670)
Fixes for `Multisearch` and `Append` command (opensearch-project#4512)
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
Fix] Fix unexpected shift of extraction for `rex` with nested capture groups in named groups (opensearch-project#4641)
Fix CVE-2025-48924 (opensearch-project#4665)
Fix sub-fields accessing of generated structs (opensearch-project#4683)
Fix] Incorrect Field Index Mapping in AVG to SUM/COUNT Conversion (opensearch-project#15)
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ykmr1224ykmr1224ykmr1224 approved these changes
@RyanL1997RyanL1997RyanL1997 approved these changes
@ps48ps48Awaiting requested review from ps48ps48 is a code owner
@kavithacmkavithacmAwaiting requested review from kavithacm
@derek-hoderek-hoAwaiting requested review from derek-ho
@joshuali925joshuali925Awaiting requested review from joshuali925joshuali925 is a code owner
@dai-chendai-chenAwaiting requested review from dai-chendai-chen is a code owner
@YANG-DBYANG-DBAwaiting requested review from YANG-DB
@mengweiericmengweiericAwaiting requested review from mengweiericmengweieric is a code owner
@vamsimanoharvamsimanoharAwaiting requested review from vamsimanoharvamsimanohar is a code owner
@SwiddisSwiddisAwaiting requested review from SwiddisSwiddis is a code owner
@penghuopenghuoAwaiting requested review from penghuopenghuo is a code owner
@seankao-azseankao-azAwaiting requested review from seankao-az
@MaxKsyunzMaxKsyunzAwaiting requested review from MaxKsyunz
@Yury-FridlyandYury-FridlyandAwaiting requested review from Yury-Fridlyand
@anirudhaanirudhaAwaiting requested review from anirudhaanirudha is a code owner
@forestmveyforestmveyAwaiting requested review from forestmvey
@acarbonettoacarbonettoAwaiting requested review from acarbonettoacarbonetto is a code owner
@GumpacGGumpacGAwaiting requested review from GumpacG
@LantaoJinLantaoJinAwaiting requested review from LantaoJinLantaoJin is a code owner
@noChargernoChargerAwaiting requested review from noChargernoCharger is a code owner
@qianheng-awsqianheng-awsAwaiting requested review from qianheng-awsqianheng-aws is a code owner
@yuancuyuancuAwaiting requested review from yuancuyuancu is a code owner

Assignees


No one assigned


Labels

backport 2.19-devenhancementNew feature or request

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@ritvibhatt@ykmr1224@RyanL1997@LantaoJin

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix asc/desc keyword behavior for sort command - #4651
Merged
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Oct 28, 2025
Merged
Fix asc/desc keyword behavior for sort command#4651
RyanL1997 merged 9 commits into
opensearch-project:mainfrom 
ritvibhatt:sort-desc-fix
Conversation
@ritvibhatt
@ritvibhattritvibhatt
commented
Oct 23, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Fixed PPL sort command so that asc/desc keywords specify sort direction for individual fields instead of applying all fields in the sort command. (keywords work on individual fields ex sort field1 asc, field2 desc means field1 is ascending and field2 is descending) while preventing mixing of prefix (+/-) and suffix (asc/desc) syntax, and updated integration tests to match this behavior.
Files Changed
  • ppl/src/main/antlr/OpenSearchPPLParser.g4: Updated grammar rules for sort command to support individual field ASC/DESC keywords
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java: Updated visitSortCommand() method to handle new ASC/DESC field syntax and prevent mixing of +/-and asc/desc sort syntax
  • ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java: Modified expression building logic for sort field parsing and ensure consistent sort direction syntax usage across all sort fields
  • ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java: Updated getSortArguments() method to process new field-level ASC/DESC syntax
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
  •  New functionality includes testing.
  •  New functionality has been documented.
  •  New functionality has javadoc added.
  •  New functionality has a user manual doc added.
  •  New PPL command checklist all confirmed.
  •  API changes companion pull request created.
  •  Commits are signed per the DCO using --signoff or -s.
  •  Public documentation issue/PR created.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.
@ritvibhatt
update asc/desc behavior for sort
e4f55cf
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix both sort directions on same field error
3619cc3
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
eb6536e
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
2c8f5ea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix tests
aeb9fea
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
update failing tests
647cc90
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@LantaoJinLantaoJin
added
the 
enhancement
New feature or request
label
Oct 24, 2025
@ritvibhattritvibhatt
changed the title
Update asc/desc keyword behavior for sort commandFix asc/desc keyword behavior for sort commandOct 24, 2025
@ritvibhatt
ritvibhatt
marked this pull request as ready for review
October 24, 2025 15:52
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/antlr/OpenSearchPPLParser.g4

sortField
 : (PLUS | MINUS)? sortFieldExpression
 : (PLUS | MINUS) sortFieldExpression (ASC | A | DESC | D) # invalidMixedSortField
@ykmr1224ykmr1224Oct 24, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to define invalid syntax? wouldn't it fail parse without this?
@ritvibhattritvibhattOct 24, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would fail the parse but added this to have a more clear error for when the two syntaxes are mixed
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threaddocs/user/ppl/cmd/sort.rst
ykmr1224
ykmr1224
reviewed
Oct 24, 2025
View reviewed changes
Comment threadppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
RyanL1997
RyanL1997
reviewed
Oct 28, 2025
View reviewed changes
@RyanL1997RyanL1997
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ritvibhatt , thanks for the change, and I left some minor comments.
Comment threaddocs/user/ppl/cmd/sort.rst
Comment threadppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@ritvibhatt
update docs and casting refactor
428c47b
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
RyanL1997
RyanL1997
previously approved these changes
Oct 28, 2025
View reviewed changes
@ritvibhatt
fix formatting
00ddb41
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@ritvibhatt
fix formatting
18e09f0
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
@RyanL1997
RyanL1997
merged commit 448c42a
into
opensearch-project:mainOct 28, 2025

53 of 54 checks passed

opensearch-trigger-botBot
pushed a commit
that referenced
this pull request
Oct 28, 2025
@github-actions
Fix asc/desc keyword behavior for sort command (#4651)
d67c120
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-botopensearch-trigger-botBot
mentioned this pull request
Oct 28, 2025
 Merged

ykmr1224 pushed a commit
that referenced
this pull request
Oct 29, 2025
@opensearch-trigger-bot@github-actions
Fix asc/desc keyword behavior for sort command (#4651) (#4691)
cea4893
(cherry picked from commit 448c42a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
expani pushed a commit
to vinaykpud/sql
that referenced
this pull request
Nov 4, 2025
@ritvibhatt@expani
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
5872b1a
sandeshkr419 added a commit
to sandeshkr419/sql
that referenced
this pull request
Dec 3, 2025
@sandeshkr419@github-actions
@Swiddis@manasvinibs@opensearch-ci-bot@noCharger@dai-chen@cnoramut@yuancu@opensearch-trigger-bot@ahkcs@penghuo@alexey-temnikov@RileyJergerAmazon@ykmr1224@LantaoJin@songkant-aws@qianheng-aws@xinyual@RyanL1997@peterzhuamazon@vinaykpud@expani@vamsimanohar@ritvibhatt@ishaoxy@mch2
Data fusion changes
6f7fd68
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
Co-authored-by: Manasvini B S <manasvis@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Louis Chu <clingzhi@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Mebsina <cnoramut@gmail.com>
Co-authored-by: Yuanchun Shen <yuanchu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kai Huang <105710027+ahkcs@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
Co-authored-by: Riley Jerger <214163063+RileyJergerAmazon@users.noreply.github.com>
Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Co-authored-by: Lantao Jin <ltjin@amazon.com>
Co-authored-by: Songkan Tang <songkant@amazon.com>
Co-authored-by: qianheng <qianheng@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: Xinyuan Lu <xinyual@amazon.com>
Co-authored-by: Jialiang Liang <jiallian@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
Co-authored-by: expani <anijainc@amazon.com>
Co-authored-by: expani1729 <110471048+expani@users.noreply.github.com>
Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Co-authored-by: ritvibhatt <53196324+ritvibhatt@users.noreply.github.com>
Co-authored-by: Xinyu Hao <75524174+ishaoxy@users.noreply.github.com>
Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Fix join type ambiguous issue when specify the join type with sql-like join criteria (opensearch-project#4474)
Fix issue 4441 (opensearch-project#4449)
Fix missing keywordsCanBeId (opensearch-project#4491)
Fix the bug of explicit makeNullLiteral for UDT fields (opensearch-project#4475)
Fix mapping after aggregation push down (opensearch-project#4500)
Fix percentile bug (opensearch-project#4539)
Fix JsonExtractAllFunctionIT failure (opensearch-project#4556)
Fix sort push down into agg after project already pushed (opensearch-project#4546)
Fix push down failure for min/max on derived field (opensearch-project#4572)
Fix compile issue in main (opensearch-project#4608)
Fix filter parsing failure on date fields with non-default format (opensearch-project#4616)
Fix bin nested fields issue (opensearch-project#4606)
Fix: Support Alias Fields in MIN, MAX, FIRST, LAST, and TAKE Aggregations (opensearch-project#4621)
fix rename issue (opensearch-project#4670)
Fixes for `Multisearch` and `Append` command (opensearch-project#4512)
Fix asc/desc keyword behavior for sort command (opensearch-project#4651)
Fix] Fix unexpected shift of extraction for `rex` with nested capture groups in named groups (opensearch-project#4641)
Fix CVE-2025-48924 (opensearch-project#4665)
Fix sub-fields accessing of generated structs (opensearch-project#4683)
Fix] Incorrect Field Index Mapping in AVG to SUM/COUNT Conversion (opensearch-project#15)
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ykmr1224ykmr1224ykmr1224 approved these changes
@RyanL1997RyanL1997RyanL1997 approved these changes
@ps48ps48Awaiting requested review from ps48ps48 is a code owner
@kavithacmkavithacmAwaiting requested review from kavithacm
@derek-hoderek-hoAwaiting requested review from derek-ho
@joshuali925joshuali925Awaiting requested review from joshuali925joshuali925 is a code owner
@dai-chendai-chenAwaiting requested review from dai-chendai-chen is a code owner
@YANG-DBYANG-DBAwaiting requested review from YANG-DB
@mengweiericmengweiericAwaiting requested review from mengweiericmengweieric is a code owner
@vamsimanoharvamsimanoharAwaiting requested review from vamsimanoharvamsimanohar is a code owner
@SwiddisSwiddisAwaiting requested review from SwiddisSwiddis is a code owner
@penghuopenghuoAwaiting requested review from penghuopenghuo is a code owner
@seankao-azseankao-azAwaiting requested review from seankao-az
@MaxKsyunzMaxKsyunzAwaiting requested review from MaxKsyunz
@Yury-FridlyandYury-FridlyandAwaiting requested review from Yury-Fridlyand
@anirudhaanirudhaAwaiting requested review from anirudhaanirudha is a code owner
@forestmveyforestmveyAwaiting requested review from forestmvey
@acarbonettoacarbonettoAwaiting requested review from acarbonettoacarbonetto is a code owner
@GumpacGGumpacGAwaiting requested review from GumpacG
@LantaoJinLantaoJinAwaiting requested review from LantaoJinLantaoJin is a code owner
@noChargernoChargerAwaiting requested review from noChargernoCharger is a code owner
@qianheng-awsqianheng-awsAwaiting requested review from qianheng-awsqianheng-aws is a code owner
@yuancuyuancuAwaiting requested review from yuancuyuancu is a code owner

Assignees


No one assigned


Labels

backport 2.19-devenhancementNew feature or request

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@ritvibhatt@ykmr1224@RyanL1997@LantaoJin