[DROOLS-1177] avoid flushing non initialized path during rule removal (…

…apache#785)
kiegroup · May 18, 2016 · 6be892a · 6be892a
1 parent abdf21f
commit 6be892a
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 7 deletions.
diff --git a/...g/drools/compiler/integrationtests/incrementalcompilation/IncrementalCompilationTest.java b/...g/drools/compiler/integrationtests/incrementalcompilation/IncrementalCompilationTest.java
@@ -2781,4 +2781,54 @@ public void testIncrementalCompilationChangeingParentRule() throws Exception {
         assertEquals( 2, ksession.fireAllRules() );
     }
 
+    @Test
+    public void testRemoveRuleWithNonInitializedPath() {
+        // DROOLS-1177
+        String drl1 =
+                "import " + MyEvent.class.getCanonicalName() + "\n" +
+                "declare MyEvent @role( event ) end\n" +
+                "rule \"RG_TEST_1\"\n" +
+                "    when\n" +
+                "       $dummy: MyEvent (id == 1)\n" +
+                "		$other: MyEvent (this != $dummy)\n" +
+                "    then\n" +
+                "        retract($other);\n" +
+                "end\n" +
+                "rule \"RG_TEST_2\"\n" +
+                "    when\n" +
+                "       $dummy: MyEvent (id == 1)\n" +
+                "    then\n" +
+                "        retract($dummy);\n" +
+                "end\n";
+
+        String drl2 =
+                "import " + MyEvent.class.getCanonicalName() + "\n" +
+                "declare IMyEvent @role( event ) end\n" +
+                "rule \"RG_TEST_2\"\n" +
+                "    when\n" +
+                "       $dummy: MyEvent (id == 1)\n" +
+                "    then\n" +
+                "        retract($dummy);\n" +
+                "end\n";
+
+        KieServices ks = KieServices.Factory.get();
+
+        KieModuleModel kproj = ks.newKieModuleModel();
+        KieBaseModel kieBaseModel1 = kproj.newKieBaseModel( "KBase1" ).setDefault( true )
+                                          .setEventProcessingMode(EventProcessingOption.STREAM);
+        KieSessionModel ksession1 = kieBaseModel1.newKieSessionModel("KSession1").setDefault(true)
+                                                 .setType(KieSessionModel.KieSessionType.STATEFUL);
+
+        ReleaseId releaseId1 = ks.newReleaseId( "org.kie", "test-upgrade", "1.0.0" );
+        deployJar( ks, createKJar( ks, kproj, releaseId1, null, drl1 ) );
+
+        KieContainer kc = ks.newKieContainer( releaseId1 );
+        KieSession ksession = kc.newKieSession();
+
+        ksession.insert( new MyEvent( 0 ) );
+
+        ReleaseId releaseId2 = ks.newReleaseId( "org.kie", "test-upgrade", "1.1.0" );
+        deployJar( ks, createKJar( ks, kproj, releaseId2, null, drl2 ) );
+        kc.updateToVersion( releaseId2 );
+    }
 }
diff --git a/drools-core/src/main/java/org/drools/core/phreak/AddRemoveRule.java b/drools-core/src/main/java/org/drools/core/phreak/AddRemoveRule.java
@@ -190,7 +190,7 @@ public static void removeRule(TerminalNode tn, InternalWorkingMemory[] wms, Inte
                 }
             }
 
-            if (tnms.subjectPmem != null && tnms.subjectPmem.getRuleAgendaItem() != null && tnms.subjectPmem.getRuleAgendaItem().isQueued()) {
+            if (tnms.subjectPmem != null && tnms.subjectPmem.isInitialized() && tnms.subjectPmem.getRuleAgendaItem().isQueued()) {
                 // SubjectPmem can be null, if it was never initialized
                 tnms.subjectPmem.getRuleAgendaItem().dequeue();
             }
@@ -543,7 +543,7 @@ public Flushed(SegmentMemory segmentMemory, PathMemory pathMemory) {
 
     private static void flushStagedTuples(PathMemory pmem, PathEndNodes pathEndNodes, InternalWorkingMemory wm) {
         // first flush the subject rule, then flush any staging lists that are part of a merge
-        if ( pmem.getRuleAgendaItem() != null ) {
+        if ( pmem.isInitialized() ) {
             new RuleNetworkEvaluator().evaluateNetwork(pmem, pmem.getRuleAgendaItem().getRuleExecutor(), wm);
         }
 
@@ -584,7 +584,7 @@ private static void flushStagedTuples(PathMemory pmem, PathEndNodes pathEndNodes
     }
 
     private static void flushStagedTuples(LeftTupleNode splitStartNode, PathMemory pmem, InternalWorkingMemory wm) {
-        if (pmem.getRuleAgendaItem() == null ) {
+        if ( !pmem.isInitialized() ) {
             // The rule has never been linked in and evaluated, so there will be nothing to flush.
             return;
         }
@@ -618,15 +618,19 @@ public static boolean flushLeftTupleIfNecessary(InternalWorkingMemory wm, Segmen
                           sm.getPathMemories().get(0) :
                           sm.getFirstDataDrivenPathMemory();
 
+        if (pmem == null) {
+            return false;
+        }
+
         TupleSets<LeftTuple> leftTupleSets = new TupleSetsImpl<LeftTuple>();
         if (leftTuple != null) {
             leftTupleSets.addInsert(leftTuple);
         }
-
+        forceFlushLeftTuple(pmem, sm, wm, leftTupleSets);
-        return pmem != null && forceFlushLeftTuple(pmem, sm, wm, leftTupleSets);
+        return true;
     }
 
-    private static boolean forceFlushLeftTuple(PathMemory pmem, SegmentMemory sm, InternalWorkingMemory wm, TupleSets<LeftTuple> leftTupleSets) {
+    private static void forceFlushLeftTuple(PathMemory pmem, SegmentMemory sm, InternalWorkingMemory wm, TupleSets<LeftTuple> leftTupleSets) {
         SegmentMemory[] smems = pmem.getSegmentMemories();
 
         LeftTupleNode node;
@@ -652,7 +656,6 @@ private static boolean forceFlushLeftTuple(PathMemory pmem, SegmentMemory sm, In
         new RuleNetworkEvaluator().outerEval(pmem, node, bit, mem, smems, sm.getPos(), leftTupleSets, wm,
                                              new LinkedList<StackEntry>(),
                                              true, rtnPmem.getOrCreateRuleAgendaItem(wm).getRuleExecutor());
-        return true;
     }
 
 

diff --git a/drools-core/src/main/java/org/drools/core/reteoo/PathMemory.java b/drools-core/src/main/java/org/drools/core/reteoo/PathMemory.java
@@ -179,6 +179,10 @@ public short getNodeType() {
         return NodeTypeEnums.RuleTerminalNode;
     }
 
+    public boolean isInitialized() {
+        return agendaItem != null && segmentMemories[0] != null;
+    }
+
     public SegmentMemory[] getSegmentMemories() {
         return segmentMemories;
     }