Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] bump ipaddress to 5.4.2 #2545

Merged
merged 1 commit into from
Mar 8, 2024
Merged

[Backport 2.x] bump ipaddress to 5.4.2 #2545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
implementation 'com.github.babbel:okhttp-aws-signer:1.0.2'
api group: 'com.amazonaws', name: 'aws-java-sdk-core', version: "${aws_java_sdk_version}"
api group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: "${aws_java_sdk_version}"
implementation "com.github.seancfoley:ipaddress:5.4.0"
implementation "com.github.seancfoley:ipaddress:5.4.2"

testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.9.1'
Expand Down
9 changes: 9 additions & 0 deletions spark/src/main/antlr/FlintSparkSqlExtensions.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ statement
: skippingIndexStatement
| coveringIndexStatement
| materializedViewStatement
| indexManagementStatement
| indexJobManagementStatement
;

Expand Down Expand Up @@ -125,6 +126,14 @@ vacuumMaterializedViewStatement
: VACUUM MATERIALIZED VIEW mvName=multipartIdentifier
;

indexManagementStatement
: showFlintIndexStatement
;

showFlintIndexStatement
: SHOW FLINT (INDEX | INDEXES) IN catalogDb=multipartIdentifier
;

indexJobManagementStatement
: recoverIndexJobStatement
;
Expand Down
1 change: 1 addition & 0 deletions spark/src/main/antlr/SparkSqlBase.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ DESCRIBE: 'DESCRIBE';
DROP: 'DROP';
EXISTS: 'EXISTS';
FALSE: 'FALSE';
FLINT: 'FLINT';
IF: 'IF';
IN: 'IN';
INDEX: 'INDEX';
Expand Down
7 changes: 6 additions & 1 deletion spark/src/main/antlr/SqlBaseParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,7 @@ primaryExpression
| CASE whenClause+ (ELSE elseExpression=expression)? END #searchedCase
| CASE value=expression whenClause+ (ELSE elseExpression=expression)? END #simpleCase
| name=(CAST | TRY_CAST) LEFT_PAREN expression AS dataType RIGHT_PAREN #cast
| primaryExpression collateClause #collate
| primaryExpression DOUBLE_COLON dataType #castByColon
| STRUCT LEFT_PAREN (argument+=namedExpression (COMMA argument+=namedExpression)*)? RIGHT_PAREN #struct
| FIRST LEFT_PAREN expression (IGNORE NULLS)? RIGHT_PAREN #first
Expand Down Expand Up @@ -1094,6 +1095,10 @@ colPosition
: position=FIRST | position=AFTER afterCol=errorCapturingIdentifier
;

collateClause
: COLLATE collationName=stringLit
;

type
: BOOLEAN
| TINYINT | BYTE
Expand All @@ -1104,7 +1109,7 @@ type
| DOUBLE
| DATE
| TIMESTAMP | TIMESTAMP_NTZ | TIMESTAMP_LTZ
| STRING
| STRING collateClause?
| CHARACTER | CHAR
| VARCHAR
| BINARY
Expand Down
Loading