Revert "[DROOLS-7528] Avoid casting to unnecessary interfaces (Fix th…

…e secondary super cache problem in Drools) (apache#5451)" This reverts commit abbfa6f.
lucamolteni · Sep 13, 2023 · 2d38873 · 2d38873
1 parent 3fe085e
commit 2d38873
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 38 deletions.
diff --git a/drools-core/src/main/java/org/drools/core/phreak/LazyPhreakBuilder.java b/drools-core/src/main/java/org/drools/core/phreak/LazyPhreakBuilder.java
@@ -1643,7 +1643,7 @@ private static int updateRiaAndTerminalMemory( LeftTupleSource lt,
                 }
 
             } else if (NodeTypeEnums.isTerminalNode(sink)) {
-                pmem = reteEvaluator.getNodeMemory((AbstractTerminalNode) sink);
+                pmem = (PathMemory) reteEvaluator.getNodeMemory((MemoryFactory) sink);
             }
 
             if (pmem != null && smem.getPos() < pmem.getSegmentMemories().length) {

diff --git a/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluator.java b/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluator.java
@@ -25,7 +25,6 @@
 import org.drools.core.common.ReteEvaluator;
 import org.drools.core.common.TupleSets;
 import org.drools.core.common.TupleSetsImpl;
-import org.drools.core.reteoo.AbstractTerminalNode;
 import org.drools.core.reteoo.AccumulateNode;
 import org.drools.core.reteoo.AccumulateNode.AccumulateMemory;
 import org.drools.core.reteoo.AsyncReceiveNode;
@@ -328,7 +327,7 @@ public void innerEval(PathMemory pmem,
             boolean terminalNode = true;
             switch (node.getType()) {
                 case NodeTypeEnums.RuleTerminalNode:
-                    pRtNode.doNode((AbstractTerminalNode) node, activationsManager, srcTuples, executor);
+                    pRtNode.doNode(( TerminalNode ) node, activationsManager, srcTuples, executor);
                     break;
                 case NodeTypeEnums.QueryTerminalNode:
                     pQtNode.doNode((QueryTerminalNode) node, activationsManager, srcTuples, stack);

diff --git a/drools-core/src/main/java/org/drools/core/reteoo/LeftTuple.java b/drools-core/src/main/java/org/drools/core/reteoo/LeftTuple.java
@@ -343,20 +343,8 @@ public int getIndex() {
     }
 
     @Override
-    // It's better to always cast to a concrete or abstract class to avoid
-    // secondary super cache problem. See https://issues.redhat.com/browse/DROOLS-7521
     public LeftTupleSink getTupleSink() {
-        Object sink = getSink();
-        if (sink instanceof AccumulateNode) {
-            return (AccumulateNode) sink;
-        } else if (sink instanceof RuleTerminalNode) {
-            return (RuleTerminalNode) sink;
-        } else if (sink instanceof RightInputAdapterNode) {
-            return (RightInputAdapterNode) sink;
-        } else if (sink instanceof ExistsNode) {
-            return (ExistsNode) sink;
-        }
-        return (LeftTupleSink)sink;
+        return (LeftTupleSink)getSink();
     }
 
     /* Had to add the set method because sink adapters must override

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
@@ -113,7 +113,7 @@ public RuleAgendaItem getOrCreateRuleAgendaItem(ActivationsManager activationsMa
     }
 
     private TerminalNode ensureAgendaItemCreated(ActivationsManager activationsManager) {
-        AbstractTerminalNode rtn = (AbstractTerminalNode) getPathEndNode();
+        TerminalNode rtn = (TerminalNode) getPathEndNode();
         if (agendaItem == null) {
             int salience = rtn.getRule().getSalience().isDynamic() ? 0 : rtn.getRule().getSalience().getValue();
             agendaItem = activationsManager.createRuleAgendaItem(salience, this, rtn);

diff --git a/drools-core/src/main/java/org/drools/core/reteoo/RightTupleImpl.java b/drools-core/src/main/java/org/drools/core/reteoo/RightTupleImpl.java
@@ -52,15 +52,8 @@ public RightTupleImpl(InternalFactHandle handle,
         handle.addLastRightTuple( this );
     }
 
-    // It's better to always cast to a concrete or abstract class to avoid
-    // secondary super cache problem. See https://issues.redhat.com/browse/DROOLS-7521
     public RightTupleSink getTupleSink() {
-        Object sink = getSink();
-        if(sink instanceof BetaNode) {
-            return (BetaNode)sink;
-        } else {
-            return (RightTupleSink) sink;
-        }
+        return (RightTupleSink) getSink();
     }
 
     public void reAdd() {

diff --git a/drools-core/src/main/java/org/drools/core/reteoo/RuleTerminalNodeLeftTuple.java b/drools-core/src/main/java/org/drools/core/reteoo/RuleTerminalNodeLeftTuple.java
@@ -247,7 +247,7 @@ public void setActivationNode(final ActivationNode activationNode) {
     }
 
     public TerminalNode getTerminalNode() {
-        return (AbstractTerminalNode) getTupleSink();
+        return (TerminalNode) getTupleSink();
     }
 
     public List<FactHandle> getFactHandles() {

diff --git a/drools-core/src/main/java/org/drools/core/reteoo/SingleLeftTupleSinkAdapter.java b/drools-core/src/main/java/org/drools/core/reteoo/SingleLeftTupleSinkAdapter.java
@@ -50,19 +50,9 @@ public BaseNode getMatchingNode(BaseNode candidate) {
     public LeftTupleSink[] getSinks() {
         return sinkArray;
     }
-
-    // See LeftTuple.getTupleSink() or https://issues.redhat.com/browse/DROOLS-7521
+
     public LeftTupleSinkNode getFirstLeftTupleSink() {
-        if (sink instanceof AccumulateNode) {
-            return (AccumulateNode) sink;
-        } else if (sink instanceof RuleTerminalNode) {
-            return (RuleTerminalNode) sink;
-        } else if (sink instanceof RightInputAdapterNode) {
-            return (RightInputAdapterNode) sink;
-        } else if (sink instanceof ExistsNode) {
-            return (ExistsNode) sink;
-        }
-        return (LeftTupleSinkNode) sink;
+        return ( LeftTupleSinkNode ) sink;
     }
 
     public LeftTupleSinkNode getLastLeftTupleSink() {