Fix not throw error when part of expression not matched any expressio…

…n node in the `MQE` and `PromQL. (#12093)
apache · Apr 11, 2024 · 13bb3f6 · 13bb3f6
1 parent f97fd4f
commit 13bb3f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -96,6 +96,7 @@
 * Bump up Kafka to fix CVE.
 * Fix `NullPointerException` in Istio ServiceEntry registry.
 * Remove unnecessary `componentIds` as series ID in the `ServiceRelationClientSideMetrics` and `ServiceRelationServerSideMetrics` entities.
+* Fix not throw error when part of expression not matched any expression node in the `MQE` and `PromQL.
 
 #### UI
 

diff --git a/oap-server/mqe-grammar/src/main/antlr4/org/apache/skywalking/mqe/rt/grammar/MQEParser.g4 b/oap-server/mqe-grammar/src/main/antlr4/org/apache/skywalking/mqe/rt/grammar/MQEParser.g4
@@ -20,7 +20,7 @@ parser grammar MQEParser;
 
 options { tokenVocab = MQELexer; }
 
-root: expression;
+root: expression EOF;
 
 expression
     : expressionNode                   # exprNode

diff --git a/...gin/promql-plugin/src/main/antlr4/org/apache/skywalking/promql/rt/grammar/PromQLParser.g4 b/...gin/promql-plugin/src/main/antlr4/org/apache/skywalking/promql/rt/grammar/PromQLParser.g4
@@ -20,7 +20,7 @@ parser grammar PromQLParser;
 
 options { tokenVocab = PromQLLexer; }
 
-root: expression;
+root: expression EOF;
 
 expression
     : expressionNode                   # exprNode