Sync main branch with Apache main branch

.github/workflows/pr-downstream-full.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java-version: [17]
-        maven-version: ['3.9.3']
+        maven-version: ['3.9.6']
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: Build Chain (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }})

.github/workflows/pr-downstream.yml

@@ -23,7 +23,7 @@ jobs:
         job_name: [ kogito-runtimes, kogito-apps, kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ]
         os: [ubuntu-latest]
         java-version: [17]
-        maven-version: ['3.9.3']
+        maven-version: ['3.9.6']
         include:
           - job_name: kogito-runtimes
             repository: kogito-runtimes

.github/workflows/pr-drools-ansible.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java-version: [17]
-        maven-version: ['3.9.3']
+        maven-version: ['3.9.6']
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: Ansible Integration / ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}

.github/workflows/pr-drools-docs.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java-version: [17]
-        maven-version: ['3.9.3']
+        maven-version: ['3.9.6']
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}

.github/workflows/pr-drools.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         java-version: [17]
-        maven-version: ['3.9.3']
+        maven-version: ['3.9.6']
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}

drools-core/src/main/java/org/drools/core/common/ActivationsManager.java

@@ -95,7 +95,7 @@ default void stageLeftTuple(RuleAgendaItem ruleAgendaItem, InternalMatch justifi
         if (!ruleAgendaItem.isQueued()) {
             ruleAgendaItem.getRuleExecutor().getPathMemory().queueRuleAgendaItem(this);
         }
-        ruleAgendaItem.getRuleExecutor().addLeftTuple( justified.getTuple() );
+        ruleAgendaItem.getRuleExecutor().modifyActiveTuple((RuleTerminalNodeLeftTuple) justified.getTuple() );
     }
 
     default ActivationsManager getPartitionedAgenda(int partitionNr) {

drools-core/src/main/java/org/drools/core/common/AgendaGroupsManager.java

@@ -218,8 +218,8 @@ public int sizeOfRuleFlowGroup(String name) {
             }
             int count = 0;
             for ( RuleAgendaItem item : mainAgendaGroup.getActivations() ) {
-                if (!(item.getRuleExecutor().getLeftTupleList().isEmpty())) {
-                    count = count + item.getRuleExecutor().getLeftTupleList().size();
+                if (!(item.getRuleExecutor().getActiveMatches().isEmpty())) {
+                    count = count + item.getRuleExecutor().getActiveMatches().size();
                 }
             }
             return count;
@@ -512,8 +512,8 @@ public int sizeOfRuleFlowGroup(String name) {
 
             int count = 0;
             for ( RuleAgendaItem item : group.getActivations() ) {
-                if (!item.getRuleExecutor().getLeftTupleList().isEmpty()) {
-                    count = count + item.getRuleExecutor().getLeftTupleList().size();
+                if (!item.getRuleExecutor().getActiveMatches().isEmpty()) {
+                    count = count + item.getRuleExecutor().getActiveMatches().size();
                 }
             }
             return count;

drools-core/src/main/java/org/drools/core/phreak/EagerPhreakBuilder.java

@@ -62,6 +62,7 @@
 import org.drools.core.reteoo.QueryElementNode;
 import org.drools.core.reteoo.RightInputAdapterNode;
 import org.drools.core.reteoo.RightTuple;
+import org.drools.core.reteoo.RuleTerminalNodeLeftTuple;
 import org.drools.core.reteoo.RuntimeComponentFactory;
 import org.drools.core.reteoo.SegmentMemory;
 import org.drools.core.reteoo.SegmentMemory.MemoryPrototype;
@@ -1245,7 +1246,7 @@ private static TupleImpl insertPeerLeftTuple(TupleImpl lt, LeftTupleSinkNode nod
                 TerminalNode rtn = ( TerminalNode ) node;
                 InternalAgenda agenda = wm.getAgenda();
                 RuleAgendaItem agendaItem = AlphaTerminalNode.getRuleAgendaItem( wm, agenda, rtn, insert );
-                PhreakRuleTerminalNode.doLeftTupleInsert( rtn, agendaItem.getRuleExecutor(), agenda, agendaItem, peer );
+                PhreakRuleTerminalNode.doLeftTupleInsert( rtn, agendaItem.getRuleExecutor(), agenda, agendaItem, (RuleTerminalNodeLeftTuple) peer );
             }
             return peer;
         }
@@ -1274,7 +1275,7 @@ private static void iterateLeftTuple(TupleImpl lt, InternalWorkingMemory wm) {
         if (NodeTypeEnums.isTerminalNode(lt.getSink())) {
             PathMemory pmem = (PathMemory) wm.getNodeMemories().peekNodeMemory( lt.getSink());
             if (pmem != null) {
-                PhreakRuleTerminalNode.doLeftDelete( pmem.getActualActivationsManager( wm ), pmem.getRuleAgendaItem().getRuleExecutor(), lt );
+                PhreakRuleTerminalNode.doLeftDelete( pmem.getActualActivationsManager( wm ), pmem.getRuleAgendaItem().getRuleExecutor(), (RuleTerminalNodeLeftTuple) lt );
             }
         } else {
             if (lt.getContextObject() instanceof AccumulateContext) {

drools-core/src/main/java/org/drools/core/phreak/LazyPhreakBuilder.java

@@ -70,6 +70,7 @@
 import org.drools.core.reteoo.RightInputAdapterNode;
 import org.drools.core.reteoo.RightInputAdapterNode.RiaPathMemory;
 import org.drools.core.reteoo.RightTuple;
+import org.drools.core.reteoo.RuleTerminalNodeLeftTuple;
 import org.drools.core.reteoo.RuntimeComponentFactory;
 import org.drools.core.reteoo.SegmentMemory;
 import org.drools.core.reteoo.SegmentNodeMemory;
@@ -978,7 +979,7 @@ private static TupleImpl insertPeerLeftTuple(TupleImpl lt, LeftTupleSinkNode nod
                 TerminalNode rtn = ( TerminalNode ) node;
                 InternalAgenda agenda = wm.getAgenda();
                 RuleAgendaItem agendaItem = AlphaTerminalNode.getRuleAgendaItem( wm, agenda, rtn, insert );
-                PhreakRuleTerminalNode.doLeftTupleInsert( rtn, agendaItem.getRuleExecutor(), agenda, agendaItem, peer );
+                PhreakRuleTerminalNode.doLeftTupleInsert( rtn, agendaItem.getRuleExecutor(), agenda, agendaItem, (RuleTerminalNodeLeftTuple) peer );
             }
             return peer;
         }
@@ -1007,7 +1008,7 @@ private static void iterateLeftTuple(TupleImpl lt, InternalWorkingMemory wm) {
         if (NodeTypeEnums.isTerminalNode(lt.getSink())) {
             PathMemory pmem = (PathMemory) wm.getNodeMemories().peekNodeMemory( lt.getSink());
             if (pmem != null) {
-                PhreakRuleTerminalNode.doLeftDelete( pmem.getActualActivationsManager( wm ), pmem.getRuleAgendaItem().getRuleExecutor(), lt );
+                PhreakRuleTerminalNode.doLeftDelete( pmem.getActualActivationsManager( wm ), pmem.getRuleAgendaItem().getRuleExecutor(), (RuleTerminalNodeLeftTuple) lt );
             }
         } else {
             if (lt.getContextObject() instanceof AccumulateContext) {

drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java

@@ -249,8 +249,7 @@ private void doRightInserts(AccumulateNode accNode,
                 FastIterator leftIt = accNode.getLeftIterator( ltm );
 
                 for ( TupleImpl leftTuple = accNode.getFirstLeftTuple( rightTuple, ltm, leftIt ); leftTuple != null; leftTuple = (LeftTuple) leftIt.next( leftTuple ) ) {
-                    if ( constraints.isAllowedCachedRight(leftTuple, contextEntry
-                                                         ) ) {
+                    if ( constraints.isAllowedCachedRight(leftTuple, contextEntry) ) {
                         final BaseAccumulation accctx = (BaseAccumulation) leftTuple.getContextObject();
                         addMatch( accNode, accumulate, leftTuple, rightTuple,
                                   null, null, reteEvaluator, am,
@@ -717,7 +716,7 @@ private void addMatch(final AccumulateNode accNode,
                           final boolean useLeftMemory,
                           final boolean leftPropagation) {
         TupleImpl tuple = leftTuple;
-        InternalFactHandle handle = (InternalFactHandle) rightTuple.getFactHandle();
+        InternalFactHandle handle = rightTuple.getFactHandle();
 
         if (accNode.isRightInputIsRiaNode()) {
             // if there is a subnetwork, handle must be unwrapped

drools-core/src/main/java/org/drools/core/phreak/PhreakBranchNode.java

@@ -18,15 +18,16 @@
  */
 package org.drools.core.phreak;
 
+import org.drools.base.reteoo.NodeTypeEnums;
 import org.drools.core.common.ActivationsManager;
 import org.drools.core.common.TupleSets;
 import org.drools.core.reteoo.ConditionalBranchEvaluator;
 import org.drools.core.reteoo.ConditionalBranchEvaluator.ConditionalExecution;
 import org.drools.core.reteoo.ConditionalBranchNode;
 import org.drools.core.reteoo.ConditionalBranchNode.ConditionalBranchMemory;
-import org.drools.core.reteoo.LeftTuple;
 import org.drools.core.reteoo.LeftTupleSink;
 import org.drools.core.reteoo.RuleTerminalNode;
+import org.drools.core.reteoo.RuleTerminalNodeLeftTuple;
 import org.drools.core.reteoo.TupleFactory;
 import org.drools.core.reteoo.TupleImpl;
 
@@ -67,8 +68,6 @@ public void doLeftInserts(ConditionalBranchNode branchNode,
                               RuleExecutor executor) {
         ConditionalBranchEvaluator branchEvaluator = branchNode.getBranchEvaluator();
 
-        RuleAgendaItem ruleAgendaItem = executor.getRuleAgendaItem();
-
         for (TupleImpl leftTuple = srcLeftTuples.getInsertFirst(); leftTuple != null; ) {
             TupleImpl next = leftTuple.getStagedNext();
 
@@ -79,7 +78,7 @@ public void doLeftInserts(ConditionalBranchNode branchNode,
 
             if (conditionalExecution != null) {
                 RuleTerminalNode rtn = (RuleTerminalNode) conditionalExecution.getSink().getFirstLeftTupleSink();
-                TupleImpl branchedLeftTuple = TupleFactory.createLeftTuple(leftTuple,
+                RuleTerminalNodeLeftTuple branchedLeftTuple = (RuleTerminalNodeLeftTuple) TupleFactory.createLeftTuple(leftTuple,
                                                                            rtn,
                                                                            leftTuple.getPropagationContext(), useLeftMemory);
                 PhreakRuleTerminalNode.doLeftTupleInsert( rtn, executor, activationsManager,
@@ -107,7 +106,6 @@ public void doLeftUpdates(ConditionalBranchNode branchNode,
                               TupleSets stagedLeftTuples,
                               RuleExecutor executor) {
         ConditionalBranchEvaluator branchEvaluator = branchNode.getBranchEvaluator();
-        RuleAgendaItem ruleAgendaItem = executor.getRuleAgendaItem();
 
         for (TupleImpl leftTuple = srcLeftTuples.getUpdateFirst(); leftTuple != null; ) {
             TupleImpl next = leftTuple.getStagedNext();
@@ -134,7 +132,7 @@ public void doLeftUpdates(ConditionalBranchNode branchNode,
                 if (newRtn == null) {
                     // old exits, new does not, so delete
                     if ( branchTuples.rtnLeftTuple.getMemory() != null ) {
-                        executor.removeLeftTuple(branchTuples.rtnLeftTuple);
+                        executor.removeActiveTuple(branchTuples.rtnLeftTuple);
                     }
                     PhreakRuleTerminalNode.doLeftDelete(activationsManager, executor, branchTuples.rtnLeftTuple);
 
@@ -145,11 +143,11 @@ public void doLeftUpdates(ConditionalBranchNode branchNode,
                 } else {
                     // old and new on different branches, delete one and insert the other
                     if ( branchTuples.rtnLeftTuple.getMemory() != null ) {
-                        executor.removeLeftTuple(branchTuples.rtnLeftTuple);
+                        executor.removeActiveTuple(branchTuples.rtnLeftTuple);
                     }
                     PhreakRuleTerminalNode.doLeftDelete(activationsManager, executor, branchTuples.rtnLeftTuple);
 
-                    branchTuples.rtnLeftTuple = TupleFactory.createLeftTuple(leftTuple,
+                    branchTuples.rtnLeftTuple = (RuleTerminalNodeLeftTuple) TupleFactory.createLeftTuple(leftTuple,
                                                                              newRtn,
                                                                              leftTuple.getPropagationContext(), true);
                     PhreakRuleTerminalNode.doLeftTupleInsert( newRtn, executor, activationsManager,
@@ -158,7 +156,7 @@ public void doLeftUpdates(ConditionalBranchNode branchNode,
 
             } else if (newRtn != null) {
                 // old does not exist, new exists, so insert
-                branchTuples.rtnLeftTuple = TupleFactory.createLeftTuple(leftTuple, newRtn,
+                branchTuples.rtnLeftTuple = (RuleTerminalNodeLeftTuple) TupleFactory.createLeftTuple(leftTuple, newRtn,
                                                                          leftTuple.getPropagationContext(), true);
                 PhreakRuleTerminalNode.doLeftTupleInsert( newRtn, executor, activationsManager,
                                                           executor.getRuleAgendaItem(), branchTuples.rtnLeftTuple) ;
@@ -168,12 +166,12 @@ public void doLeftUpdates(ConditionalBranchNode branchNode,
             if (branchTuples.mainLeftTuple != null) {
                 normalizeStagedTuples( stagedLeftTuples, branchTuples.mainLeftTuple );
 
-                if (!breaking) {
-                    // child exist, new one does, so update
-                    trgLeftTuples.addUpdate(branchTuples.mainLeftTuple);
-                } else {
+                if (breaking && !NodeTypeEnums.isTerminalNode(branchTuples.mainLeftTuple.getSink())) {
                     // child exist, new one does not, so delete
                     trgLeftTuples.addDelete(branchTuples.mainLeftTuple);
+                } else {
+                    // child exist, new one does, so update
+                    trgLeftTuples.addUpdate(branchTuples.mainLeftTuple);
                 }
             } else if (!breaking) {
                 // child didn't exist, new one does, so insert
@@ -200,7 +198,7 @@ public void doLeftDeletes(LeftTupleSink sink,
 
             if (branchTuples.rtnLeftTuple != null) {
                 if ( branchTuples.rtnLeftTuple.getMemory() != null ) {
-                    executor.removeLeftTuple(branchTuples.rtnLeftTuple);
+                    executor.removeActiveTuple(branchTuples.rtnLeftTuple);
                 }
                 PhreakRuleTerminalNode.doLeftDelete(activationsManager, executor, branchTuples.rtnLeftTuple);
             }
@@ -230,22 +228,22 @@ private BranchTuples getBranchTuples(LeftTupleSink sink, TupleImpl leftTuple) {
             if (child.getSink() == sink ) {
                 branchTuples.mainLeftTuple = child;
             } else {
-                branchTuples.rtnLeftTuple = child;
+                branchTuples.rtnLeftTuple = (RuleTerminalNodeLeftTuple) child;
             }
             child = child.getHandleNext();
             if ( child != null ) {
                 if (child.getSink() == sink ) {
                     branchTuples.mainLeftTuple = child;
                 } else {
-                    branchTuples.rtnLeftTuple = child;
+                    branchTuples.rtnLeftTuple = (RuleTerminalNodeLeftTuple) child;
                 }
             }
         }
         return branchTuples;
     }
 
     private static class BranchTuples {
-        TupleImpl rtnLeftTuple;
+        RuleTerminalNodeLeftTuple rtnLeftTuple;
         TupleImpl mainLeftTuple;
     }
 }