[jboss-svn-commits] JBL Code SVN: r23017 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 23 10:52:31 EDT 2008
Author: tirelli
Date: 2008-09-23 10:52:31 -0400 (Tue, 23 Sep 2008)
New Revision: 23017
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/RulebasePartitioningTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EntryPointNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ExistsNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/PropagationQueuingNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
Log:
Refactoring API
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/RulebasePartitioningTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/RulebasePartitioningTest.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/RulebasePartitioningTest.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -47,7 +47,7 @@
final org.drools.rule.Package pkg = builder.getPackage();
RuleBaseConfiguration config = new RuleBaseConfiguration();
- config.setPartitionsEnabled( true );
+ config.setMultithreadEvaluation( true );
RuleBase ruleBase = getRuleBase( config );
ruleBase.addPackage( pkg );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -120,7 +120,7 @@
// if "true", rulebase builder will try to split
// the rulebase into multiple partitions that can be evaluated
// in parallel by using multiple internal threads
- private boolean partitionsEnabled;
+ private boolean multithread;
private ConflictResolver conflictResolver;
@@ -158,7 +158,7 @@
out.writeObject( conflictResolver );
out.writeObject( processNodeInstanceFactoryRegistry );
out.writeBoolean( advancedProcessRuleIntegration );
- out.writeBoolean( partitionsEnabled );
+ out.writeBoolean( multithread );
}
public void readExternal(ObjectInput in) throws IOException,
@@ -183,7 +183,7 @@
conflictResolver = (ConflictResolver) in.readObject();
processNodeInstanceFactoryRegistry = (NodeInstanceFactoryRegistry) in.readObject();
advancedProcessRuleIntegration = in.readBoolean();
- partitionsEnabled = in.readBoolean();
+ multithread = in.readBoolean();
}
/**
@@ -307,7 +307,7 @@
setAdvancedProcessRuleIntegration( Boolean.valueOf( this.chainedProperties.getProperty( "drools.advancedProcessRuleIntegration",
"false" ) ).booleanValue() );
- setPartitionsEnabled( Boolean.valueOf( this.chainedProperties.getProperty( "drools.enablePartitioning",
+ setMultithreadEvaluation( Boolean.valueOf( this.chainedProperties.getProperty( "drools.multithreadEvaluation",
"false" ) ).booleanValue() );
}
@@ -495,17 +495,16 @@
}
/**
- * Defines if the RuleBase should try to split the rules into
- * multiple independent partitions that can work in parallel
- * using multiple threads ("true"), of if the rulebase should
- * work in classic single partition mode ("false").
+ * Defines if the RuleBase should be executed using a pool of
+ * threads for evaluating the rules ("true"), or if the rulebase
+ * should work in classic single thread mode ("false").
*
- * @param enablePartitioning true for multi-partition or
- * false for single-partition. Default is false.
+ * @param enableMultithread true for multi-thread or
+ * false for single-thread. Default is false.
*/
- public void setPartitionsEnabled(boolean enablePartitioning) {
+ public void setMultithreadEvaluation(boolean enableMultithread) {
checkCanChange();
- this.partitionsEnabled = enablePartitioning;
+ this.multithread = enableMultithread;
}
/**
@@ -514,8 +513,8 @@
*
* @return
*/
- public boolean isPartitionsEnabled() {
- return this.partitionsEnabled;
+ public boolean isMultithreadEvaluation() {
+ return this.multithread;
}
private void initProcessNodeInstanceFactoryRegistry() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -303,7 +303,7 @@
* processing
*/
private void initPartitionManagers() {
- if ( this.ruleBase.getConfiguration().isPartitionsEnabled() ) {
+ if ( this.ruleBase.getConfiguration().isMultithreadEvaluation() ) {
// the Map MUST be thread safe
this.partitionManagers = new ConcurrentHashMap<RuleBasePartitionId, PartitionTaskManager>();
@@ -320,7 +320,7 @@
* running in multi-thread mode
*/
public void startPartitionManagers() {
- if ( this.ruleBase.getConfiguration().isPartitionsEnabled() ) {
+ if ( this.ruleBase.getConfiguration().isMultithreadEvaluation() ) {
for ( PartitionTaskManager task : this.partitionManagers.values() ) {
task.startService();
}
@@ -328,7 +328,7 @@
}
public void stopPartitionManagers() {
- if ( this.ruleBase.getConfiguration().isPartitionsEnabled() ) {
+ if ( this.ruleBase.getConfiguration().isMultithreadEvaluation() ) {
for ( PartitionTaskManager task : this.partitionManagers.values() ) {
// what to do here? should we simply wait for a timeout and give
// up?
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -72,7 +72,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
leftInput,
rightInput,
sourceBinder,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -79,7 +79,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
objectSource,
context.getRuleBase().getConfiguration().getAlphaNodeHashingThreshold() );
this.constraint = constraint;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -86,7 +86,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
leftInput,
rightInput,
sourceBinder,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EntryPointNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EntryPointNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EntryPointNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -83,7 +83,7 @@
final BuildContext context) {
this( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
objectSource,
context.getCurrentEntryPoint() ); // irrelevant for this node, since it overrides sink management
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -93,7 +93,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled() );
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation() );
this.condition = eval;
this.tupleSource = tupleSource;
this.tupleMemoryEnabled = context.isTupleMemoryEnabled();
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ExistsNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ExistsNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ExistsNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -72,7 +72,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
leftInput,
rightInput,
joinNodeBinder,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -53,7 +53,7 @@
final BuildContext context ) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled() );
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation() );
this.dataProvider = dataProvider;
this.tupleSource = tupleSource;
this.alphaConstraints = constraints;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -71,7 +71,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
leftInput,
rightInput,
binder,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -72,7 +72,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled() );
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation() );
this.objectSource = source;
this.leftTupleMemoryEnabled = context.isTupleMemoryEnabled();
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -70,7 +70,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
leftInput,
rightInput,
joinNodeBinder,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -96,7 +96,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
source,
context.getRuleBase().getConfiguration().getAlphaNodeHashingThreshold() );
this.objectType = objectType;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/PropagationQueuingNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/PropagationQueuingNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/PropagationQueuingNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -65,7 +65,7 @@
final BuildContext context ) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled(),
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation(),
objectSource,
context.getRuleBase().getConfiguration().getAlphaNodeHashingThreshold() );
this.action = new PropagateAction( this );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -83,7 +83,7 @@
final BuildContext context ) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled() );
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation() );
this.rule = rule;
this.subrule = subrule;
this.tupleSource = source;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -75,7 +75,7 @@
// ------------------------------------------------------------
public Rete(InternalRuleBase ruleBase) {
- super( 0, RuleBasePartitionId.MAIN_PARTITION, ruleBase != null ? ruleBase.getConfiguration().isPartitionsEnabled() : false );
+ super( 0, RuleBasePartitionId.MAIN_PARTITION, ruleBase != null ? ruleBase.getConfiguration().isMultithreadEvaluation() : false );
this.entryPoints = new HashMap<EntryPoint, EntryPointNode>();
this.ruleBase = ruleBase;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -136,7 +136,7 @@
// always add the default entry point
EntryPointNode epn = new EntryPointNode( this.reteooBuilder.getIdGenerator().getNextId(),
RuleBasePartitionId.MAIN_PARTITION,
- this.config.isPartitionsEnabled(),
+ this.config.isMultithreadEvaluation(),
this.rete,
EntryPoint.DEFAULT );
epn.attach();
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -70,7 +70,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled() );
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation() );
this.tupleSource = source;
this.tupleMemoryEnabled = context.isTupleMemoryEnabled();
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java 2008-09-23 14:30:10 UTC (rev 23016)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java 2008-09-23 14:52:31 UTC (rev 23017)
@@ -101,7 +101,7 @@
final BuildContext context) {
super( id,
context.getPartitionId(),
- context.getRuleBase().getConfiguration().isPartitionsEnabled() );
+ context.getRuleBase().getConfiguration().isMultithreadEvaluation() );
this.rule = rule;
this.tupleSource = source;
this.subrule = subrule;
More information about the jboss-svn-commits
mailing list