[BZ-1106300] propagate as insert a formerly deleted eval left tuple

apache · Jun 11, 2014 · 320f34f · 320f34f
1 parent b1a358c
commit 320f34f
Show file tree

Hide file tree

Showing 2 changed files with 123 additions and 1 deletion.
diff --git a/drools-compiler/src/test/java/org/drools/compiler/integrationtests/Misc2Test.java b/drools-compiler/src/test/java/org/drools/compiler/integrationtests/Misc2Test.java
@@ -6035,4 +6035,120 @@ public void testAccumulateWithNodeSharing() throws Exception {
         ksession.fireAllRules();
         assertEquals(1, d.getValue());
     }
+
+    public static class Reading {
+        private final String type;
+        private final int value;
+
+        public Reading(String type, int value) {
+            this.type = type;
+            this.value = value;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
+    public static class Alarm {
+        private String type;
+        private String level;
+
+        public String getLevel() {
+            return level;
+        }
+
+        public void setLevel(String level) {
+            this.level = level;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+    }
+
+    @Test
+    public void testDeletedEvalLeftTuple() throws Exception {
+        // BZ-1106300
+        String drl =
+                "import " + Reading.class.getCanonicalName() + ";\n" +
+                "import " + Alarm.class.getCanonicalName() + ";\n" +
+                "rule Normal when\n" +
+                "    Number( intValue <= 5) from accumulate( reading : Reading(), average( reading.getValue() ) )\n" +
+                "    alarm : Alarm ()\n" +
+                "then\n" +
+                "    System.out.println(kcontext.getRule().getName());" +
+                "    delete( alarm );\n" +
+                "end\n" +
+                "    \n" +
+                "rule Abnormal when\n" +
+                "    Number( intValue > 5, intValue <= 10 ) from accumulate( reading : Reading(), average( reading.getValue() ) )\n" +
+                "    not Alarm ()\n" +
+                "then\n" +
+                "    System.out.println(kcontext.getRule().getName());" +
+                "    Alarm alarm = new Alarm();\n" +
+                "    alarm.setType(\"t1\");\n" +
+                "    alarm.setLevel( \"ABNORMAL\" );\n" +
+                "    insert(alarm);\n" +
+                "end\n" +
+                "\n" +
+                "rule Severe when\n" +
+                "    Number( intValue > 10) from accumulate( reading : Reading(), average( reading.getValue() ) )\n" +
+                "    not Alarm ()\n" +
+                "then\n" +
+                "    System.out.println(kcontext.getRule().getName());" +
+                "    Alarm alarm = new Alarm();\n" +
+                "    alarm.setType(\"t1\");\n" +
+                "    alarm.setLevel( \"SEVERE\" );\n" +
+                "    insert(alarm);\n" +
+                "end\n" +
+                "\n" +
+                "rule AbnormalToSevere when\n" +
+                "    Number( intValue > 10) from accumulate( reading : Reading(), average( reading.getValue() ) )\n" +
+                "    alarm : Alarm (level == \"ABNORMAL\")\n" +
+                "then\n" +
+                "    System.out.println(kcontext.getRule().getName());" +
+                "    alarm.setLevel( \"SEVERE\" );\n" +
+                "    update(alarm);\n" +
+                "end\n" +
+                "\n" +
+                "rule SevereToAbnormal when\n" +
+                "    $type : String()\n" +
+                "    accumulate( reading : Reading( type == $type ), $avg : average( reading.getValue() ) )\n" +
+                "    eval( $avg.intValue() > 5 && $avg.intValue() <= 10 )\n" +
+                "    alarm : Alarm (type == $type, level == \"SEVERE\")\n" +
+                "then\n" +
+                "    System.out.println(kcontext.getRule().getName());" +
+                "    alarm.setLevel( \"ABNORMAL\" );\n" +
+                "    update(alarm);\n" +
+                "end";
+
+        KieHelper helper = new KieHelper();
+        helper.addContent( drl, ResourceType.DRL );
+        KieSession ksession = helper.build().newKieSession();
+
+        ksession.insert("t1");
+
+        ksession.insert(new Reading("t1", 12));
+        ksession.fireAllRules();
+        ksession.insert(new Reading("t1", 0));
+        ksession.fireAllRules();
+        ksession.insert(new Reading("t1", 0));
+        ksession.fireAllRules();
+
+        ksession.insert(new Reading("t1", 16));
+        ksession.fireAllRules();
+        ksession.insert(new Reading("t1", 32));
+        ksession.fireAllRules();
+        ksession.insert(new Reading("t1", -6));
+        ksession.fireAllRules();
+    }
 }
diff --git a/drools-core/src/main/java/org/drools/core/phreak/PhreakEvalNode.java b/drools-core/src/main/java/org/drools/core/phreak/PhreakEvalNode.java
@@ -16,6 +16,9 @@
 * To change this template use File | Settings | File Templates.
 */
 public class PhreakEvalNode {
+
+    private static final String EVAL_LEFT_TUPLE_DELETED = "EVAL_LEFT_TUPLE_DELETED";
+
     public void doNode(EvalConditionNode evalNode,
                        EvalMemory em,
                        LeftTupleSink sink,
@@ -77,12 +80,14 @@ public void doLeftUpdates(EvalConditionNode evalNode,
         for (LeftTuple leftTuple = srcLeftTuples.getUpdateFirst(); leftTuple != null; ) {
             LeftTuple next = leftTuple.getStagedNext();
 
-            boolean wasPropagated = leftTuple.getFirstChild() != null;
+            boolean wasPropagated = leftTuple.getFirstChild() != null && leftTuple.getObject() != EVAL_LEFT_TUPLE_DELETED;
 
             boolean allowed = condition.isAllowed(leftTuple,
                                                   wm,
                                                   em.context);
             if (allowed) {
+                leftTuple.setObject(null);
+
                 if (wasPropagated) {
                     // update
                     LeftTuple childLeftTuple = leftTuple.getFirstChild();
@@ -107,6 +112,7 @@ public void doLeftUpdates(EvalConditionNode evalNode,
             } else {
                 if (wasPropagated) {
                     // retract
+                    leftTuple.setObject(EVAL_LEFT_TUPLE_DELETED);
 
                     LeftTuple childLeftTuple = leftTuple.getFirstChild();
                     childLeftTuple.setPropagationContext( leftTuple.getPropagationContext());