>From Hussain Towaileb <[email protected]>: Hussain Towaileb has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21232?usp=email )
Change subject: [ASTERIXDB-3634][EXT]: Allow any order for snapshot ID and pos var ...................................................................... [ASTERIXDB-3634][EXT]: Allow any order for snapshot ID and pos var Ext-ref: MB-70761 Change-Id: I831d0dac85197ce58ed1ba83f7327fa5b186a405 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21232 Reviewed-by: Ali Alsuliman <[email protected]> Tested-by: Hussain Towaileb <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> --- M asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj 1 file changed, 38 insertions(+), 15 deletions(-) Approvals: Anon. E. Moose #1000171: Hussain Towaileb: Looks good to me, but someone else must approve; Verified Jenkins: Verified Ali Alsuliman: Looks good to me, approved diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj index a307750..9a0f616 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj +++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj @@ -5974,7 +5974,18 @@ <AT> posVar = Variable() )? | posVar = Variable() - ) + ( + <AT> + ( + LOOKAHEAD( { laIdentifier(SNAPSHOT) } ) + <IDENTIFIER> snapshotOrTimestamp = StringLiteral() + { timeTravelType = TimeTravel.Type.SNAPSHOT_ID; } + | LOOKAHEAD( { laIdentifier(TIMESTAMP) } ) + <IDENTIFIER> snapshotOrTimestamp = StringLiteral() + { timeTravelType = TimeTravel.Type.SNAPSHOT_TIMESTAMP; } + ) + )? + ) )? ( ( @@ -6067,21 +6078,33 @@ } ((<AS>)? rightVar = Variable())? ( - <AT> - ( - LOOKAHEAD( { laIdentifier(SNAPSHOT) } ) - <IDENTIFIER> snapshotOrTimestamp = StringLiteral() - { timeTravelType = TimeTravel.Type.SNAPSHOT_ID; } + <AT> + ( + LOOKAHEAD( { laIdentifier(SNAPSHOT) } ) + <IDENTIFIER> snapshotOrTimestamp = StringLiteral() + { timeTravelType = TimeTravel.Type.SNAPSHOT_ID; } + ( + <AT> posVar = Variable() + )? | LOOKAHEAD( { laIdentifier(TIMESTAMP) } ) - <IDENTIFIER> snapshotOrTimestamp = StringLiteral() - { timeTravelType = TimeTravel.Type.SNAPSHOT_TIMESTAMP; } - ) - )? - ( - <AT> - ( - posVar = Variable() - ) + <IDENTIFIER> snapshotOrTimestamp = StringLiteral() + { timeTravelType = TimeTravel.Type.SNAPSHOT_TIMESTAMP; } + ( + <AT> posVar = Variable() + )? + | posVar = Variable() + ( + <AT> + ( + LOOKAHEAD( { laIdentifier(SNAPSHOT) } ) + <IDENTIFIER> snapshotOrTimestamp = StringLiteral() + { timeTravelType = TimeTravel.Type.SNAPSHOT_ID; } + | LOOKAHEAD( { laIdentifier(TIMESTAMP) } ) + <IDENTIFIER> snapshotOrTimestamp = StringLiteral() + { timeTravelType = TimeTravel.Type.SNAPSHOT_TIMESTAMP; } + ) + )? + ) )? { if (rightVar == null) { -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21232?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: lumina Gerrit-Change-Id: I831d0dac85197ce58ed1ba83f7327fa5b186a405 Gerrit-Change-Number: 21232 Gerrit-PatchSet: 2 Gerrit-Owner: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]>
