[ADH-5405] Fix rule parser

arenadata · Dec 10, 2024 · b1dedb6 · b1dedb6
1 parent 9a8d988
commit b1dedb6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/smart-rule/src/main/antlr4/org/smartdata/rule/parser/SmartRule.g4 b/smart-rule/src/main/antlr4/org/smartdata/rule/parser/SmartRule.g4
@@ -56,10 +56,13 @@ boolvalue
 
 compareexpr
     : numricexpr OPCMP numricexpr                           #cmpIdLong
-    | stringexpr OPEQCMP stringexpr                   #cmpIdString
+    | numricexpr OPEQ numricexpr                            #cmpEqIdLong
+    | stringexpr OPEQ stringexpr                            #cmpIdString
     | stringexpr MATCHES stringexpr                         #cmpIdStringMatches
     | timeintvalexpr OPCMP timeintvalexpr                   #cmpTimeintvalTimeintval
+    | timeintvalexpr OPEQ timeintvalexpr                    #cmpEqTimeintvalTimeintval
     | timepointexpr OPCMP timepointexpr                     #cmpTimepointTimePoint
+    | timepointexpr OPEQ timepointexpr                      #cmpEqTimepointTimePoint
     ;
 
 timeintvalexpr
@@ -128,27 +131,18 @@ id
     | OBJECTTYPE '.' ID '(' constexpr (',' constexpr)* ')'          #idObjAttPara
     ;
 
-OPEQCMP
+OPEQ
     : '=='
     | '!='
     ;
 
 OPCMP
-    : OPEQCMP
-    | '>'
+    : '>'
     | '<'
     | '>='
     | '<='
     ;
 
-opr
-   : '*'
-   | '/'
-   | '+'
-   | '-'
-   | '%'
-   ;
-
 fileEvent
    : FILECREATE
    | FILECLOSE

diff --git a/smart-rule/src/test/java/org/smartdata/rule/TestSmartRuleParser.java b/smart-rule/src/test/java/org/smartdata/rule/TestSmartRuleParser.java
@@ -79,6 +79,7 @@ public void testValidRule() throws Exception {
     rules.add("file : every 1s | storagePolicy == \"ALL_SSD\" | cache");
     rules.add("file : accessCount(10min) < 20 | uncache");
     rules.add("file : accessCount(10min) == 0 | uncache");
+    rules.add("file : accessCount(10min) != 0 | uncache");
     rules.add("file : accessCount(10min) <= 1 | uncache");
     rules.add("file : accessCount(1min) > 5 | cache -replica 2");
     rules.add("file : age <= 1 | echo -msg \"crul world\"");