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

Bump antlr4 from 4.11.1 to 4.13.1 #12445

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Bump antlr4 from 4.11.1 to 4.13.1 #12445

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `opentelemetry` from 1.34.1 to 1.35.0 ([#12388](https://github.com/opensearch-project/OpenSearch/pull/12388))
- Bump Apache Lucene from 9.9.2 to 9.10.0 ([#12392](https://github.com/opensearch-project/OpenSearch/pull/12392))
- Bump `org.apache.logging.log4j:log4j-core` from 2.22.1 to 2.23.0 ([#12464](https://github.com/opensearch-project/OpenSearch/pull/12464))
- Bump `antlr4` from 4.11.1 to 4.13.1 ([#12445](https://github.com/opensearch-project/OpenSearch/pull/12445))

### Changed
- Allow composite aggregation to run under a parent filter aggregation ([#11499](https://github.com/opensearch-project/OpenSearch/pull/11499))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ asm = 9.6
jettison = 1.5.4
woodstox = 6.4.0
kotlin = 1.7.10
antlr4 = 4.11.1
antlr4 = 4.13.1
guava = 32.1.1-jre
protobuf = 3.22.3
jakarta_annotation = 1.3.5
Expand Down
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/antlr4-runtime-4.11.1.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/antlr4-runtime-4.13.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17125bae1d965624e265ef49552f6465a2bfa307
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/antlr4-runtime-4.11.1.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/antlr4-runtime-4.13.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17125bae1d965624e265ef49552f6465a2bfa307
4 changes: 2 additions & 2 deletions modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessLexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
import org.antlr.v4.runtime.atn.PredictionContextCache;
import org.antlr.v4.runtime.dfa.DFA;

@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue" })
@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape" })
abstract class PainlessLexer extends Lexer {
static {
RuntimeMetaData.checkVersion("4.11.1", RuntimeMetaData.VERSION);
RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION);
}

protected static final DFA[] _decisionToDFA;
Expand Down
52 changes: 26 additions & 26 deletions modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue" })
class PainlessParser extends Parser {
static {
RuntimeMetaData.checkVersion("4.11.1", RuntimeMetaData.VERSION);
RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION);
}

protected static final DFA[] _decisionToDFA;
Expand Down Expand Up @@ -337,7 +337,7 @@

@Override
public String getGrammarFileName() {
return "java-escape";
return "PainlessParser.g4";

Check warning on line 340 in modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParser.java

View check run for this annotation

Codecov / codecov/patch

modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParser.java#L340 

Added line #L340 was not covered by tests
}

@Override
Expand Down Expand Up @@ -425,8 +425,8 @@
setState(87);
_errHandler.sync(this);
_la = _input.LA(1);
while (((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155080519840L) != 0
|| (((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 4095L) != 0) {
while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155080519840L) != 0)
|| ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 4095L) != 0)) {
{
{
setState(84);
Expand Down Expand Up @@ -571,7 +571,7 @@
setState(109);
_errHandler.sync(this);
_la = _input.LA(1);
if ((((_la - 81)) & ~0x3f) == 0 && ((1L << (_la - 81)) & 7L) != 0) {
if (((((_la - 81)) & ~0x3f) == 0 && ((1L << (_la - 81)) & 7L) != 0)) {
{
setState(98);
decltype();
Expand Down Expand Up @@ -1088,8 +1088,8 @@
setState(140);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0
|| (((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 4095L) != 0) {
if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0)
|| ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 4095L) != 0)) {
{
setState(139);
initializer();
Expand All @@ -1101,8 +1101,8 @@
setState(144);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0
|| (((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 2559L) != 0) {
if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0)
|| ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 2559L) != 0)) {
{
setState(143);
expression();
Expand All @@ -1114,8 +1114,8 @@
setState(148);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0
|| (((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 2559L) != 0) {
if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0)
|| ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 2559L) != 0)) {
{
setState(147);
afterthought();
Expand Down Expand Up @@ -1470,8 +1470,8 @@
setState(193);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0
|| (((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 2559L) != 0) {
if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0)
|| ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 2559L) != 0)) {
{
setState(192);
expression();
Expand Down Expand Up @@ -1661,8 +1661,8 @@
setState(212);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155071795360L) != 0
|| (((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 4095L) != 0) {
if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155071795360L) != 0)
|| ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 4095L) != 0)) {
{
setState(211);
dstatement();
Expand Down Expand Up @@ -2491,7 +2491,7 @@
if (!(precpred(_ctx, 13))) throw new FailedPredicateException(this, "precpred(_ctx, 13)");
setState(269);
_la = _input.LA(1);
if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 7516192768L) != 0)) {
if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 7516192768L) != 0))) {
_errHandler.recoverInline(this);
} else {
if (_input.LA(1) == Token.EOF) matchedEOF = true;
Expand Down Expand Up @@ -2545,7 +2545,7 @@
if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)");
setState(278);
_la = _input.LA(1);
if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 240518168576L) != 0)) {
if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 240518168576L) != 0))) {
_errHandler.recoverInline(this);
} else {
if (_input.LA(1) == Token.EOF) matchedEOF = true;
Expand All @@ -2563,7 +2563,7 @@
if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
setState(281);
_la = _input.LA(1);
if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 4123168604160L) != 0)) {
if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 4123168604160L) != 0))) {
_errHandler.recoverInline(this);
} else {
if (_input.LA(1) == Token.EOF) matchedEOF = true;
Expand All @@ -2581,7 +2581,7 @@
if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)");
setState(284);
_la = _input.LA(1);
if (!(((_la) & ~0x3f) == 0 && ((1L << _la) & 65970697666560L) != 0)) {
if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & 65970697666560L) != 0))) {
_errHandler.recoverInline(this);
} else {
if (_input.LA(1) == Token.EOF) matchedEOF = true;
Expand Down Expand Up @@ -2861,7 +2861,7 @@
noncondexpression(0);
setState(320);
_la = _input.LA(1);
if (!((((_la - 60)) & ~0x3f) == 0 && ((1L << (_la - 60)) & 4095L) != 0)) {
if (!(((((_la - 60)) & ~0x3f) == 0 && ((1L << (_la - 60)) & 4095L) != 0))) {
_errHandler.recoverInline(this);
} else {
if (_input.LA(1) == Token.EOF) matchedEOF = true;
Expand Down Expand Up @@ -3938,7 +3938,7 @@
enterOuterAlt(_localctx, 2); {
setState(400);
_la = _input.LA(1);
if (!((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 15L) != 0)) {
if (!(((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 15L) != 0))) {
_errHandler.recoverInline(this);
} else {
if (_input.LA(1) == Token.EOF) matchedEOF = true;
Expand Down Expand Up @@ -4564,8 +4564,8 @@
setState(469);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0
|| (((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 2559L) != 0) {
if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155034439840L) != 0)
|| ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 2559L) != 0)) {
{
setState(461);
expression();
Expand Down Expand Up @@ -4923,8 +4923,8 @@
setState(524);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155101548704L) != 0
|| (((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 4095L) != 0) {
if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 864691155101548704L) != 0)
|| ((((_la - 72)) & ~0x3f) == 0 && ((1L << (_la - 72)) & 4095L) != 0)) {
{
setState(516);
argument();
Expand Down Expand Up @@ -5104,7 +5104,7 @@
setState(543);
_errHandler.sync(this);
_la = _input.LA(1);
if ((((_la - 81)) & ~0x3f) == 0 && ((1L << (_la - 81)) & 7L) != 0) {
if (((((_la - 81)) & ~0x3f) == 0 && ((1L << (_la - 81)) & 7L) != 0)) {
{
setState(535);
lamtype();
Expand Down
Loading