Using isThreadSafe at creation time of reteevaluator

apache · Jun 30, 2023 · 5847a88 · 5847a88
1 parent 38405af
commit 5847a88
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/drools-core/src/main/java/org/drools/core/common/InternalWorkingMemory.java b/drools-core/src/main/java/org/drools/core/common/InternalWorkingMemory.java
@@ -29,7 +29,6 @@
 import org.drools.core.runtime.process.InternalProcessRuntime;
 import org.drools.core.rule.consequence.InternalMatch;
 import org.kie.api.runtime.Channel;
-import org.kie.api.runtime.conf.ThreadSafeOption;
 import org.kie.api.runtime.rule.EntryPoint;
 
 public interface InternalWorkingMemory
@@ -121,7 +120,4 @@ default FactHandleClassStore getStoreForClass(Class<?> clazz) {
 
     void cancelActivation(InternalMatch internalMatch, boolean declarativeAgenda);
 
-    default boolean isThreadSafe() {
-        return getRuleSessionConfiguration().getOption(ThreadSafeOption.KEY).isThreadSafe();
-    }
 }
diff --git a/drools-core/src/main/java/org/drools/core/common/ReteEvaluator.java b/drools-core/src/main/java/org/drools/core/common/ReteEvaluator.java
@@ -94,9 +94,7 @@ default Collection<TimerJobInstance> getTimerJobInstances(long id) {
 
     long getNextPropagationIdCounter();
 
-    default boolean isThreadSafe() {
-        return true;
-    }
+    boolean isThreadSafe();
 
     default FactHandleClassStore getStoreForClass(Class<?> clazz) {
         return getDefaultEntryPoint().getObjectStore().getStoreForClass(clazz);
@@ -137,6 +135,8 @@ default KnowledgeHelper createKnowledgeHelper() {
     int fireAllRules(int max);
     int fireAllRules(AgendaFilter agendaFilter);
     int fireAllRules(AgendaFilter agendaFilter, int max);
+
+
 
     default void setWorkingMemoryActionListener(Consumer<PropagationEntry> listener) {
         throw new UnsupportedOperationException();

diff --git a/...ssion/src/main/java/org/drools/kiesession/consequence/StatefulKnowledgeSessionForRHS.java b/...ssion/src/main/java/org/drools/kiesession/consequence/StatefulKnowledgeSessionForRHS.java
@@ -735,4 +735,8 @@ public SessionClock getSessionClock() {
     public ProcessInstance startProcessFromNodeIds(String processId, Map<String, Object> params, String... nodeIds) {
         return delegate.startProcessFromNodeIds(processId, params, nodeIds);
     }
+
+    public boolean isThreadSafe() {
+    	return delegate.isThreadSafe();
+    }
 }
diff --git a/...-kiesession/src/main/java/org/drools/kiesession/session/StatefulKnowledgeSessionImpl.java b/...-kiesession/src/main/java/org/drools/kiesession/session/StatefulKnowledgeSessionImpl.java
@@ -244,6 +244,8 @@ public class StatefulKnowledgeSessionImpl extends AbstractRuntime
 
     private Consumer<PropagationEntry> workingMemoryActionListener;
 
+	private boolean isThreadSafe;
+
     // ------------------------------------------------------------
     // Constructors
     // ------------------------------------------------------------
@@ -349,6 +351,8 @@ private StatefulKnowledgeSessionImpl(final long id,
         if (initInitFactHandle) {
             this.initialFactHandle = initInitialFact(null);
         }
+
+        isThreadSafe = getRuleSessionConfiguration().getOption(ThreadSafeOption.KEY).isThreadSafe();
     }
 
     public StatefulKnowledgeSessionImpl setStateless( boolean stateless ) {
@@ -518,6 +522,10 @@ public boolean isAlive() {
     public void destroy() {
         dispose();
     }
+
+    public boolean isThreadSafe() {
+    	return isThreadSafe;
+    }
 
     public void update(FactHandle factHandle) {
         this.update(factHandle,
@@ -1755,4 +1763,6 @@ public ProcessInstance startProcessFromNodeIds(String processId, Map<String, Obj
     public ProcessInstance startProcessFromNodeIds(String processId, CorrelationKey key, Map<String, Object> params, String... nodeIds) {
         return getProcessRuntime().startProcessFromNodeIds(processId, key, params, nodeIds);
     }
+
+
 }
diff --git a/...odel/drools-model-compiler/src/main/java/org/drools/modelcompiler/KiePackagesBuilder.java b/...odel/drools-model-compiler/src/main/java/org/drools/modelcompiler/KiePackagesBuilder.java
@@ -148,6 +148,7 @@
 import org.kie.api.definition.rule.Direct;
 import org.kie.api.definition.rule.Propagation;
 import org.kie.api.definition.type.Role;
+import org.kie.api.runtime.conf.ThreadSafeOption;
 import org.kie.internal.builder.KnowledgeBuilderConfiguration;
 import org.kie.internal.builder.conf.PropertySpecificOption;
 
@@ -391,6 +392,7 @@ private void processConsequence( RuleContext ctx, Consequence consequence, Strin
         // This is changed, because we must use the Declarations provided by the RTN, otherwise tuple indexes are not set.
         Declaration[] requiredDeclarations = getRequiredDeclarationsIfPossible( ctx, consequence, name );
         boolean enabledTupleOptimization = requiredDeclarations != null && requiredDeclarations.length > 0;
+
 
         if ( name.equals( RuleImpl.DEFAULT_CONSEQUENCE_NAME ) ) {
             if ("java".equals(consequence.getLanguage())) {

diff --git a/...ruleunits-impl/src/main/java/org/drools/ruleunits/impl/sessions/RuleUnitExecutorImpl.java b/...ruleunits-impl/src/main/java/org/drools/ruleunits/impl/sessions/RuleUnitExecutorImpl.java
@@ -300,6 +300,11 @@ public void dispose() {
 
         this.timerService.shutdown();
     }
+
+    @Override
+    public boolean isThreadSafe() {
+    	return true;
+    }
 
     @Override
     public QueryResults getQueryResults(String queryName, Object... arguments) {