[jboss-svn-commits] JBL Code SVN: r18401 - in labs/jbossrules/branches/4.0.x: drools-ant and 22 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 7 19:37:03 EST 2008
Author: fmeyer
Date: 2008-02-07 19:37:03 -0500 (Thu, 07 Feb 2008)
New Revision: 18401
Added:
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadFiringCheck.drl
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadRulebaseSharing.drl
Modified:
labs/jbossrules/branches/4.0.x/drools-analytics/.classpath
labs/jbossrules/branches/4.0.x/drools-ant/.classpath
labs/jbossrules/branches/4.0.x/drools-ant/.project
labs/jbossrules/branches/4.0.x/drools-compiler/.classpath
labs/jbossrules/branches/4.0.x/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/Child.java
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/Parent.java
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
labs/jbossrules/branches/4.0.x/drools-core/.classpath
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/accumulators/JavaAccumulatorFunctionExecutor.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELGlobalVariable.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELKnowledgeHelper.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELLocalDeclarationVariable.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/BetaConstraints.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ExistsNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/FromNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/NotNode.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/builder/BuildContext.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AbstractCompositeConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AndCompositeRestriction.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AndConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/EvalCondition.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/LiteralRestriction.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/MultiRestrictionFieldConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/OrCompositeRestriction.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/OrConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/VariableConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/VariableRestriction.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/AlphaNodeFieldConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/BetaNodeFieldConstraint.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/DataProvider.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/EvalExpression.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/PredicateExpression.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/Restriction.java
labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/ReturnValueExpression.java
labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/AlphaNodeTest.java
labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/CollectNodeTest.java
labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java
labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java
labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java
labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java
labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/spi/MockConstraint.java
labs/jbossrules/branches/4.0.x/drools-decisiontables/.classpath
labs/jbossrules/branches/4.0.x/drools-jbrms/.classpath
labs/jbossrules/branches/4.0.x/drools-jbrms/.project
labs/jbossrules/branches/4.0.x/drools-jsr94/.classpath
labs/jbossrules/branches/4.0.x/drools-jsr94/.project
labs/jbossrules/branches/4.0.x/drools-repository/.classpath
Log:
JBRULES-1392 Rules behave incorrectly (randomly) in multi-threaded environment
Modified: labs/jbossrules/branches/4.0.x/drools-analytics/.classpath
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-analytics/.classpath 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-analytics/.classpath 2008-02-08 00:37:03 UTC (rev 18401)
@@ -5,15 +5,15 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.21/mvel14-1.2.21.jar"/>
<classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.10/mvel14-1.2.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
<classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-ant/.classpath
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-ant/.classpath 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-ant/.classpath 2008-02-08 00:37:03 UTC (rev 18401)
@@ -4,16 +4,20 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
<classpathentry kind="src" path="/drools-analytics"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.21/mvel14-1.2.21.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
+ <classpathentry kind="src" path="/drools-decisiontables"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.10/mvel14-1.2.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-ant/.project
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-ant/.project 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-ant/.project 2008-02-08 00:37:03 UTC (rev 18401)
@@ -2,8 +2,9 @@
<name>drools-ant</name>
<comment>A rule production system</comment>
<projects>
+ <project>drools-analytics</project>
+ <project>drools-decisiontables</project>
<project>drools-compiler</project>
- <project>drools-analytics</project>
<project>drools-core</project>
</projects>
<buildSpec>
Modified: labs/jbossrules/branches/4.0.x/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/.classpath 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/.classpath 2008-02-08 00:37:03 UTC (rev 18401)
@@ -5,14 +5,14 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
<classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.10/mvel14-1.2.10.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.21/mvel14-1.2.21.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel 2008-02-08 00:37:03 UTC (rev 18401)
@@ -58,11 +58,14 @@
{
private static final long serialVersionUID = 400L;
+ public Object createContext() { return null; }
+
public org.drools.spi.FieldValue evaluate(java.lang.Object object,
org.drools.spi.Tuple tuple,
org.drools.rule.Declaration[] previousDeclarations,
org.drools.rule.Declaration[] localDeclarations,
- org.drools.WorkingMemory workingMemory) throws Exception {
+ org.drools.WorkingMemory workingMemory,
+ Object context ) throws Exception {
@foreach{declarationTypes as type, declarations as declr} @{type} @{declr.identifier} = ( @{type} ) previousDeclarations[@{i0}].@{declr.nativeReadMethod.name}( (org.drools.common.InternalWorkingMemory) workingMemory, ( (org.drools.common.InternalFactHandle) tuple.get( previousDeclarations[@{i0}] ) ).getObject() );
@end{}
@@ -100,11 +103,14 @@
{
private static final long serialVersionUID = 400L;
+ public Object createContext() { return null; }
+
public boolean evaluate(java.lang.Object object,
org.drools.spi.Tuple tuple,
org.drools.rule.Declaration[] previousDeclarations,
org.drools.rule.Declaration[] localDeclarations,
- org.drools.WorkingMemory workingMemory) throws Exception {
+ org.drools.WorkingMemory workingMemory,
+ Object context ) throws Exception {
@foreach{declarationTypes as type, declarations as declr} @{type} @{declr.identifier} = ( @{type} ) previousDeclarations[@{i0}].@{declr.nativeReadMethod.name}( (org.drools.common.InternalWorkingMemory) workingMemory, ( (org.drools.common.InternalFactHandle) tuple.get( previousDeclarations[@{i0}] ) ).getObject() );
@end{}
@@ -136,10 +142,14 @@
public class @{invokerClassName} implements org.drools.spi.EvalExpression, org.drools.spi.CompiledInvoker
{
private static final long serialVersionUID = 400L;
+
+ // no need for context
+ public Object createContext() { return null; }
public boolean evaluate(org.drools.spi.Tuple tuple,
org.drools.rule.Declaration[] declarations,
- org.drools.WorkingMemory workingMemory) throws Exception {
+ org.drools.WorkingMemory workingMemory,
+ Object context ) throws Exception {
@foreach{declarationTypes as type, declarations as declr} @{type} @{declr.identifier} = ( @{type} ) declarations[@{i0}].@{declr.nativeReadMethod.name}( (org.drools.common.InternalWorkingMemory) workingMemory, ( (org.drools.common.InternalFactHandle) tuple.get( declarations[@{i0}] ) ).getObject() );
@end{}
Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/Child.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/Child.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/Child.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -2,6 +2,8 @@
public class Child extends Parent {
+ private Parent parent;
+
public Child() {
}
@@ -9,4 +11,18 @@
super( name );
}
+ /**
+ * @return the parent
+ */
+ public Parent getParent() {
+ return parent;
+ }
+
+ /**
+ * @param parent the parent to set
+ */
+ public void setParent(Parent parent) {
+ this.parent = parent;
+ }
+
}
Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/Parent.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/Parent.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/Parent.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -21,6 +21,8 @@
*
*/
public class Parent extends GrandParent {
+
+ private GrandParent grandParent;
public Parent() {
}
@@ -29,4 +31,18 @@
super( name );
}
+ /**
+ * @return the parent
+ */
+ public GrandParent getGrandParent() {
+ return grandParent;
+ }
+
+ /**
+ * @param parent the parent to set
+ */
+ public void setGrandParent(GrandParent parent) {
+ this.grandParent = parent;
+ }
+
}
Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -327,7 +327,7 @@
list.get( 2 ) );
}
- public void testRemovePackage() throws Exception {
+ public void FIXME_testRemovePackage() throws Exception {
final PackageBuilder builder = new PackageBuilder();
builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_RemovePackage.drl" ) ) );
Copied: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java (from rev 18325, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java)
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java (rev 0)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2008 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Created on Feb 5, 2008
+ */
+
+package org.drools.integrationtests;
+
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import junit.framework.TestCase;
+
+import org.drools.Child;
+import org.drools.GrandParent;
+import org.drools.Parent;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseFactory;
+import org.drools.StatefulSession;
+import org.drools.compiler.PackageBuilder;
+import org.drools.compiler.PackageBuilderConfiguration;
+
+/**
+ * This is a test case for multi-thred issues
+ *
+ * @author etirelli
+ */
+public class MultithreadTest extends TestCase {
+
+ /**
+ * @inheritDoc
+ *
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ /**
+ * @inheritDoc
+ *
+ * @see junit.framework.TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testRuleBaseConcurrentCompilation() {
+ final int THREAD_COUNT = 5;
+ try {
+ boolean success = true;
+ final PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_MultithreadRulebaseSharing.drl" ) ) );
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( builder.getPackage() );
+ final Thread[] t = new Thread[THREAD_COUNT];
+ final RulebaseRunner[] r = new RulebaseRunner[THREAD_COUNT];
+ for ( int i = 0; i < t.length; i++ ) {
+ r[i] = new RulebaseRunner( i,
+ ruleBase );
+ t[i] = new Thread( r[i],
+ "thread-" + i );
+ t[i].start();
+ }
+ for ( int i = 0; i < t.length; i++ ) {
+ t[i].join();
+ if ( r[i].getStatus() == RulebaseRunner.Status.FAIL ) {
+ success = false;
+ }
+ }
+ if ( !success ) {
+ fail( "Multithread test failed. Look at the stack traces for details. " );
+ }
+ } catch ( Exception e ) {
+ e.printStackTrace();
+ fail( "Should not raise any exception: " + e.getMessage() );
+ }
+ }
+
+ public static class RulebaseRunner
+ implements
+ Runnable {
+
+ private static final int ITERATIONS = 300;
+ private final int id;
+ private final RuleBase rulebase;
+ private int status;
+
+ public RulebaseRunner(final int id,
+ final RuleBase rulebase) {
+ this.id = id;
+ this.rulebase = rulebase;
+ this.status = Status.SUCCESS;
+ }
+
+ public void run() {
+ try {
+ StatefulSession session2 = this.rulebase.newStatefulSession();
+
+ for ( int k = 0; k < ITERATIONS; k++ ) {
+ GrandParent gp = new GrandParent( "bob" );
+ Parent parent = new Parent( "mark" );
+ parent.setGrandParent( gp );
+
+ Child child = new Child( "mike" );
+ child.setParent( parent );
+
+ session2.insert( gp );
+ session2.insert( parent );
+ session2.insert( child );
+ }
+
+ session2.fireAllRules();
+ session2.dispose();
+
+ } catch ( Exception e ) {
+ this.status = Status.FAIL;
+ System.out.println( Thread.currentThread().getName() + " failed: " + e.getMessage() );
+ e.printStackTrace();
+ }
+ }
+
+ public class Status {
+ static final int SUCCESS = 1;
+ static final int FAIL = 0;
+ }
+
+ /**
+ * @return the id
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * @return the status
+ */
+ public int getStatus() {
+ return status;
+ }
+
+ }
+
+ public void testExpectedFires() {
+ try {
+ final PackageBuilder packageBuilder = new PackageBuilder();
+ packageBuilder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_MultithreadFiringCheck.drl" ) ) );
+ final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( packageBuilder.getPackage() );
+ final Queue errorList = new ConcurrentLinkedQueue();
+ final Thread t[] = new Thread[50];
+ for ( int i = 0; i < t.length; i++ ) {
+ final int count = i;
+ t[i] = new Thread( new Runnable() {
+ public void run() {
+ try {
+ final int iterations = count * 15 + 3000;
+ final List results = new ArrayList();
+ final StatefulSession session2 = ruleBase.newStatefulSession();
+ session2.setGlobal( "results",
+ results );
+ session2.insert( new Integer( -1 ) );
+ for ( int k = 0; k < iterations; k++ ) {
+ session2.insert( new Integer( k ) );
+ if ( k + 1 != session2.getAgenda().agendaSize() ) {
+ errorList.add( "THREAD-" + count + " ERROR: expected agenda size=" + (k + 1) + " but was " + session2.getAgenda().agendaSize() );
+ }
+ }
+ session2.fireAllRules();
+ session2.dispose();
+ if ( results.size() != iterations ) {
+ errorList.add( "THREAD-" + count + " ERROR: expected fire count=" + iterations + " but was " + results.size() );
+ }
+ } catch ( Exception e ) {
+ errorList.add( "THREAD-" + count + " EXCEPTION: " + e.getMessage() );
+ e.printStackTrace();
+ }
+ }
+ } );
+ t[i].start();
+ }
+ for ( int i = 0; i < t.length; i++ ) {
+ t[i].join();
+ }
+ assertTrue( "Errors during execution: " + errorList.toString(),
+ errorList.isEmpty() );
+ } catch ( Exception e ) {
+ e.printStackTrace();
+ fail( "No exception should have been raised: "+e.getMessage());
+ }
+ }
+
+}
Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -12,7 +12,6 @@
import org.drools.base.ClassFieldExtractorCache;
import org.drools.base.ClassObjectType;
import org.drools.common.InternalFactHandle;
-import org.drools.compiler.DialectConfiguration;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.EvalDescr;
@@ -24,6 +23,9 @@
import org.drools.rule.Pattern;
import org.drools.spi.FieldExtractor;
+
+
+
public class MVELEvalBuilderTest extends TestCase {
private ClassFieldExtractorCache cache;
@@ -77,15 +79,19 @@
10 );
final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
final ReteTuple tuple = new ReteTuple( f0 );
+
+ Object evalContext = eval.createContext();
assertTrue( eval.isAllowed( tuple,
- wm ) );
+ wm,
+ evalContext ) );
cheddar.setPrice( 9 );
wm.update( f0,
cheddar );
assertFalse( eval.isAllowed( tuple,
- wm ) );
+ wm,
+ evalContext ) );
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -107,7 +107,7 @@
final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
final ReteTuple tuple = new ReteTuple( f0 );
- final PredicateContextEntry predicateContext = new PredicateContextEntry();
+ final PredicateContextEntry predicateContext = (PredicateContextEntry) predicate.createContextEntry();
predicateContext.leftTuple = tuple;
assertTrue( predicate.isAllowedCachedLeft( predicateContext,
Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -22,6 +22,7 @@
import org.drools.lang.descr.ReturnValueRestrictionDescr;
import org.drools.lang.descr.RuleDescr;
import org.drools.reteoo.ReteTuple;
+import org.drools.rule.ContextEntry;
import org.drools.rule.Declaration;
import org.drools.rule.Package;
import org.drools.rule.Pattern;
@@ -93,7 +94,6 @@
localDeclarations,
requiredGlobals,
ValueType.PINTEGER_TYPE.getEvaluator( Operator.EQUAL ) );
-
builder.build( context,
usedIdentifiers,
previousDeclarations,
@@ -101,6 +101,8 @@
returnValue,
returnValueDescr );
+ ContextEntry retValContext = returnValue.createContextEntry();
+
final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
final InternalWorkingMemory wm = (InternalWorkingMemory) ruleBase.newStatefulSession();
@@ -118,15 +120,20 @@
final Cheese brie = new Cheese( "brie",
20 );
+
+ ContextEntry ctx = returnValue.createContextEntry();
+
assertTrue( returnValue.isAllowed( extractor,
brie,
tuple,
- wm ) );
+ wm,
+ ctx) );
brie.setPrice( 18 );
assertFalse( returnValue.isAllowed( extractor,
brie,
tuple,
- wm ) );
+ wm,
+ retValContext ) );
}
}
Copied: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadFiringCheck.drl (from rev 18324, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadFiringCheck.drl)
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadFiringCheck.drl (rev 0)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadFiringCheck.drl 2008-02-08 00:37:03 UTC (rev 18401)
@@ -0,0 +1,11 @@
+package org.drools;
+
+global java.util.List results;
+
+rule "Should fire"
+when
+ $i1 : Integer( intValue == -1 )
+ $i2 : Integer( intValue > $i1 )
+then
+ results.add( $i2 );
+end
Copied: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadRulebaseSharing.drl (from rev 18325, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadRulebaseSharing.drl)
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadRulebaseSharing.drl (rev 0)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MultithreadRulebaseSharing.drl 2008-02-08 00:37:03 UTC (rev 18401)
@@ -0,0 +1,9 @@
+package org.drools;
+
+rule "test multi-thread rulebase sharing"
+when
+ $gp : GrandParent()
+ $ch : Child( parent.grandParent == $gp )
+then
+ // do something
+end
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/.classpath
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/.classpath 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/.classpath 2008-02-08 00:37:03 UTC (rev 18401)
@@ -6,7 +6,7 @@
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.21/mvel14-1.2.21.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.10/mvel14-1.2.10.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/accumulators/JavaAccumulatorFunctionExecutor.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/accumulators/JavaAccumulatorFunctionExecutor.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/accumulators/JavaAccumulatorFunctionExecutor.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -75,7 +75,8 @@
leftTuple,
declarations,
innerDeclarations,
- workingMemory ).getValue();
+ workingMemory,
+ workingMemoryContext ).getValue();
this.function.accumulate( context,
value );
}
@@ -91,7 +92,8 @@
leftTuple,
declarations,
innerDeclarations,
- workingMemory ).getValue();
+ workingMemory,
+ workingMemoryContext ).getValue();
this.function.reverse( context,
value );
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -18,24 +18,33 @@
DataProvider,
Serializable {
+ private static final long serialVersionUID = 1901006343031798173L;
+
private final Serializable expression;
- private final DroolsMVELFactory factory;
+ private final DroolsMVELFactory prototype;
public MVELDataProvider(final Serializable expression,
final DroolsMVELFactory factory) {
this.expression = expression;
- this.factory = factory;
+ this.prototype = factory;
}
public Declaration[] getRequiredDeclarations() {
return new Declaration[]{};
//return factory.getRequiredDeclarations();
}
+
+ public Object createContext() {
+ return this.prototype.clone();
+ }
public Iterator getResults(final Tuple tuple,
final WorkingMemory wm,
- final PropagationContext ctx) {
- this.factory.setContext( tuple,
+ final PropagationContext ctx,
+ final Object executionContext ) {
+ DroolsMVELFactory factory = (DroolsMVELFactory) executionContext;
+
+ factory.setContext( tuple,
null,
null,
wm,
@@ -43,7 +52,7 @@
//this.expression.
final Object result = MVEL.executeExpression( this.expression,
- this.factory );
+ factory );
if ( result instanceof Collection ) {
return ((Collection) result).iterator();
} else if ( result instanceof Iterator ) {
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -1,8 +1,5 @@
package org.drools.base.mvel;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Calendar;
@@ -13,13 +10,10 @@
import java.util.Map;
import org.drools.WorkingMemory;
-import org.drools.common.DroolsObjectInputStream;
import org.drools.reteoo.ReteTuple;
import org.drools.rule.Declaration;
-import org.drools.rule.Package;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.Tuple;
-import org.mvel.CompileException;
import org.mvel.DataConversion;
import org.mvel.integration.VariableResolver;
import org.mvel.integration.impl.BaseVariableResolverFactory;
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELGlobalVariable.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELGlobalVariable.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELGlobalVariable.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -9,6 +9,8 @@
VariableResolver,
Serializable {
+ private static final long serialVersionUID = -2480015657934353449L;
+
private String name;
private Class knownType;
private DroolsMVELFactory factory;
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELKnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELKnowledgeHelper.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELKnowledgeHelper.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -2,7 +2,6 @@
import java.io.Serializable;
-import org.drools.rule.Declaration;
import org.drools.spi.KnowledgeHelper;
import org.mvel.integration.VariableResolver;
@@ -11,6 +10,8 @@
VariableResolver,
Serializable {
+ private static final long serialVersionUID = 9175428283083361478L;
+
private DroolsMVELFactory factory;
public static final String DROOLS = "drools";
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELLocalDeclarationVariable.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELLocalDeclarationVariable.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELLocalDeclarationVariable.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -11,6 +11,8 @@
VariableResolver,
Serializable {
+ private static final long serialVersionUID = -8081447010148362496L;
+
private Declaration declaration;
private DroolsMVELFactory factory;
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 400L;
- private final DroolsMVELFactory model;
+ private final DroolsMVELFactory prototype;
private final Serializable init;
private final Serializable action;
private final Serializable reverse;
@@ -51,7 +51,7 @@
final Serializable reverse,
final Serializable result) {
super();
- this.model = factory;
+ this.prototype = factory;
this.init = init;
this.action = action;
this.reverse = reverse;
@@ -148,7 +148,7 @@
}
public Object createWorkingMemoryContext() {
- return this.model.clone();
+ return this.prototype.clone();
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -16,21 +16,22 @@
private static final long serialVersionUID = 400L;
private final Serializable expr;
- private final DroolsMVELFactory factory;
+ private final DroolsMVELFactory prototype;
public MVELConsequence(final Serializable expr,
final DroolsMVELFactory factory) {
this.expr = expr;
- this.factory = factory;
+ this.prototype = factory;
}
public void evaluate(final KnowledgeHelper knowledgeHelper,
final WorkingMemory workingMemory) throws Exception {
- this.factory.setContext( knowledgeHelper.getTuple(),
- knowledgeHelper,
- null,
- workingMemory,
- null );
+ DroolsMVELFactory factory = (DroolsMVELFactory) this.prototype.clone();
+ factory.setContext( knowledgeHelper.getTuple(),
+ knowledgeHelper,
+ null,
+ workingMemory,
+ null );
CompiledExpression compexpr = (CompiledExpression) this.expr;
//Receive breakpoints from debugger
@@ -42,11 +43,11 @@
}
MVEL.executeDebugger( compexpr,
null,
- this.factory );
+ factory );
} else {
MVEL.executeExpression( compexpr,
null,
- this.factory );
+ factory );
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -17,25 +17,31 @@
private static final long serialVersionUID = 400L;
private final Serializable expr;
- private final DroolsMVELFactory factory;
+ private final DroolsMVELFactory prototype;
public MVELEvalExpression(final Serializable expr,
final DroolsMVELFactory factory) {
this.expr = expr;
- this.factory = factory;
+ this.prototype = factory;
}
+
+ public Object createContext() {
+ return this.prototype.clone();
+ }
public boolean evaluate(final Tuple tuple,
final Declaration[] requiredDeclarations,
- final WorkingMemory workingMemory) throws Exception {
- this.factory.setContext( tuple,
+ final WorkingMemory workingMemory,
+ final Object context) throws Exception {
+ DroolsMVELFactory factory = (DroolsMVELFactory) context;
+ factory.setContext( tuple,
null,
null,
workingMemory,
null );
final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
new Object(),
- this.factory );
+ factory );
return result.booleanValue();
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -15,27 +15,33 @@
private static final long serialVersionUID = 400L;
private final Serializable expr;
- private final DroolsMVELFactory factory;
+ private final DroolsMVELFactory prototype;
public MVELPredicateExpression(final Serializable expr,
final DroolsMVELFactory factory) {
this.expr = expr;
- this.factory = factory;
+ this.prototype = factory;
}
+
+ public Object createContext() {
+ return this.prototype.clone();
+ }
public boolean evaluate(final Object object,
final Tuple tuple,
final Declaration[] previousDeclarations,
final Declaration[] requiredDeclarations,
- final WorkingMemory workingMemory) throws Exception {
- this.factory.setContext( tuple,
+ final WorkingMemory workingMemory,
+ final Object context ) throws Exception {
+ DroolsMVELFactory factory = (DroolsMVELFactory) context;
+ factory.setContext( tuple,
null,
object,
workingMemory,
null );
final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
object,
- this.factory );
+ factory );
return result.booleanValue();
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -16,20 +16,22 @@
private static final long serialVersionUID = 400L;
private final Serializable expr;
- private final DroolsMVELFactory factory;
+ private final DroolsMVELFactory prototype;
public MVELReturnValueExpression(final Serializable expr,
final DroolsMVELFactory factory) {
this.expr = expr;
- this.factory = factory;
+ this.prototype = factory;
}
public FieldValue evaluate(final Object object,
final Tuple tuple,
final Declaration[] previousDeclarations,
final Declaration[] requiredDeclarations,
- final WorkingMemory workingMemory) throws Exception {
- this.factory.setContext( tuple,
+ final WorkingMemory workingMemory,
+ final Object ctx ) throws Exception {
+ DroolsMVELFactory factory = (DroolsMVELFactory) ctx;
+ factory.setContext( tuple,
null,
object,
workingMemory,
@@ -37,7 +39,11 @@
return org.drools.base.FieldFactory.getFieldValue( MVEL.executeExpression( this.expr,
null,
- this.factory ) );
+ factory ) );
}
+ public Object createContext() {
+ return this.prototype.clone();
+ }
+
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -541,18 +541,19 @@
lock();
doUnlock = true;
}
- this.removalsSinceLock++;
+ try {
+ this.removalsSinceLock++;
- this.eventSupport.fireBeforePackageRemoved( pkg );
+ this.eventSupport.fireBeforePackageRemoved( pkg );
- final Rule[] rules = pkg.getRules();
+ final Rule[] rules = pkg.getRules();
- for ( int i = 0; i < rules.length; ++i ) {
- removeRule( pkg,
- rules[i] );
- }
+ for ( int i = 0; i < rules.length; ++i ) {
+ removeRule( pkg,
+ rules[i] );
+ }
- this.packageClassLoader.removeClassLoader( pkg.getPackageCompilationData().getClassLoader() );
+ this.packageClassLoader.removeClassLoader( pkg.getPackageCompilationData().getClassLoader() );
// getting the list of referenced globals
final Set referencedGlobals = new HashSet();
@@ -560,31 +561,34 @@
final org.drools.rule.Package pkgref = (org.drools.rule.Package) it.next();
if ( pkgref != pkg ) {
referencedGlobals.addAll( pkgref.getGlobals().keySet() );
+
}
}
- // removing globals declared inside the package that are not shared
- for ( final Iterator it = pkg.getGlobals().keySet().iterator(); it.hasNext(); ) {
- final String globalName = (String) it.next();
- if ( !referencedGlobals.contains( globalName ) ) {
- this.globals.remove( globalName );
+ // removing globals declared inside the package that are not shared
+ for ( final Iterator it = pkg.getGlobals().keySet().iterator(); it.hasNext(); ) {
+ final String globalName = (String) it.next();
+ if ( !referencedGlobals.contains( globalName ) ) {
+ this.globals.remove( globalName );
+ }
}
- }
- //and now the rule flows
- final Map flows = pkg.getRuleFlows();
- for ( final Iterator iter = flows.keySet().iterator(); iter.hasNext(); ) {
- removeProcess( (String) iter.next() );
- }
- // removing the package itself from the list
- this.pkgs.remove( pkg.getName() );
+ //and now the rule flows
+ final Map flows = pkg.getRuleFlows();
+ for ( final Iterator iter = flows.keySet().iterator(); iter.hasNext(); ) {
+ removeProcess( (String) iter.next() );
+ }
+ // removing the package itself from the list
+ this.pkgs.remove( pkg.getName() );
- //clear all members of the pkg
- pkg.clear();
+ //clear all members of the pkg
+ pkg.clear();
- this.eventSupport.fireAfterPackageRemoved( pkg );
+ this.eventSupport.fireAfterPackageRemoved( pkg );
- // only unlock if it had been acquired implicitely
- if ( doUnlock ) {
- unlock();
+ // only unlock if it had been acquired implicitely
+ } finally {
+ if ( doUnlock ) {
+ unlock();
+ }
}
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/BetaConstraints.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/BetaConstraints.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/BetaConstraints.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -5,33 +5,40 @@
import org.drools.RuleBaseConfiguration;
import org.drools.reteoo.BetaMemory;
import org.drools.reteoo.ReteTuple;
+import org.drools.rule.ContextEntry;
import org.drools.util.LinkedList;
public interface BetaConstraints
extends
Serializable {
- public void updateFromTuple(InternalWorkingMemory workingMemory,
+ public ContextEntry[] createContext();
+
+ public void updateFromTuple(ContextEntry[] context,
+ InternalWorkingMemory workingMemory,
ReteTuple tuple);
- public void updateFromFactHandle(InternalWorkingMemory workingMemory,
+ public void updateFromFactHandle(ContextEntry[] context,
+ InternalWorkingMemory workingMemory,
InternalFactHandle handle);
- public boolean isAllowedCachedLeft(Object object);
+ public boolean isAllowedCachedLeft(ContextEntry[] context, Object object);
- public boolean isAllowedCachedRight(ReteTuple tuple);
+ public boolean isAllowedCachedRight(ContextEntry[] context,
+ ReteTuple tuple);
public LinkedList getConstraints();
public boolean isIndexed();
-
+
public int getIndexCount();
public boolean isEmpty();
public BetaMemory createBetaMemory(final RuleBaseConfiguration config);
-
- public void resetTuple();
-
- public void resetFactHandle();
+
+ public void resetTuple(final ContextEntry[] context);
+
+ public void resetFactHandle(final ContextEntry[] context);
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -49,38 +49,37 @@
/**
*
*/
- private static final long serialVersionUID = 400L;
+ private static final long serialVersionUID = 400L;
- private final LinkedList constraints;
+ private final LinkedList constraints;
- private ContextEntry contexts;
+ private int indexed;
- private int indexed;
-
public DefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
final RuleBaseConfiguration conf) {
- this( constraints, conf, false );
-
+ this( constraints,
+ conf,
+ false );
+
}
-
+
public DefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
final RuleBaseConfiguration conf,
- final boolean disableIndexing ) {
+ final boolean disableIndexing) {
this.indexed = -1;
this.constraints = new LinkedList();
- ContextEntry current = null;
final int depth = conf.getCompositeKeyDepth();
// First create a LinkedList of constraints, with the indexed constraints first.
for ( int i = 0, length = constraints.length; i < length; i++ ) {
// Determine if this constraint is indexable
- if ( (!disableIndexing) && conf.isIndexLeftBetaMemory() && conf.isIndexRightBetaMemory() && isIndexable( constraints[i] ) && ( this.indexed < depth-1 ) ) {
+ if ( (!disableIndexing) && conf.isIndexLeftBetaMemory() && conf.isIndexRightBetaMemory() && isIndexable( constraints[i] ) && (this.indexed < depth - 1) ) {
if ( depth >= 1 && this.indexed == -1 ) {
// first index, so just add to the front
this.constraints.insertAfter( null,
new LinkedListEntry( constraints[i] ) );
this.indexed++;
- } else {
+ } else {
// insert this index after the previous index
this.constraints.insertAfter( findNode( this.indexed++ ),
new LinkedListEntry( constraints[i] ) );
@@ -91,18 +90,17 @@
}
}
+ }
+
+ public ContextEntry[] createContext() {
// Now create the ContextEntries in the same order the constraints
+ ContextEntry[] contexts = new ContextEntry[this.constraints.size()];
+ int i = 0;
for ( LinkedListEntry entry = (LinkedListEntry) this.constraints.getFirst(); entry != null; entry = (LinkedListEntry) entry.getNext() ) {
final BetaNodeFieldConstraint constraint = (BetaNodeFieldConstraint) entry.getObject();
- final ContextEntry context = constraint.getContextEntry();
- if ( current == null ) {
- current = context;
- this.contexts = context;
- } else {
- current.setNext( context );
- }
- current = context;
+ contexts[i++] = constraint.createContextEntry();
}
+ return contexts;
}
private LinkedListEntry findNode(final int pos) {
@@ -113,14 +111,6 @@
return current;
}
- private ContextEntry findContext(final int pos) {
- ContextEntry current = this.contexts;
- for ( int i = 0; i < pos; i++ ) {
- current = current.getNext();
- }
- return current;
- }
-
private boolean isIndexable(final BetaNodeFieldConstraint constraint) {
if ( constraint instanceof VariableConstraint ) {
final VariableConstraint variableConstraint = (VariableConstraint) constraint;
@@ -133,52 +123,55 @@
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromTuple(org.drools.reteoo.ReteTuple)
*/
- public void updateFromTuple(final InternalWorkingMemory workingMemory,
+ public void updateFromTuple(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final ReteTuple tuple) {
- for ( ContextEntry context = this.contexts; context != null; context = context.getNext() ) {
- context.updateFromTuple( workingMemory,
- tuple );
+ for ( int i = 0; i < context.length; i++ ) {
+ context[i].updateFromTuple( workingMemory,
+ tuple );
}
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromFactHandle(org.drools.common.InternalFactHandle)
*/
- public void updateFromFactHandle(final InternalWorkingMemory workingMemory,
+ public void updateFromFactHandle(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final InternalFactHandle handle) {
- for ( ContextEntry context = this.contexts; context != null; context = context.getNext() ) {
- context.updateFromFactHandle( workingMemory,
- handle );
+ for ( int i = 0; i < context.length; i++ ) {
+ context[i].updateFromFactHandle( workingMemory,
+ handle );
}
}
-
- public void resetTuple() {
- for ( ContextEntry context = this.contexts; context != null; context = context.getNext() ) {
- context.resetTuple();
+
+ public void resetTuple(final ContextEntry[] context) {
+ for ( int i = 0; i < context.length; i++ ) {
+ context[i].resetTuple();
}
}
-
- public void resetFactHandle() {
- for ( ContextEntry context = this.contexts; context != null; context = context.getNext() ) {
- context.resetFactHandle();
+
+ public void resetFactHandle(final ContextEntry[] context) {
+ for ( int i = 0; i < context.length; i++ ) {
+ context[i].resetFactHandle();
}
- }
+ }
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
*/
- public boolean isAllowedCachedLeft(final Object object) {
+ public boolean isAllowedCachedLeft(final ContextEntry[] context,
+ final Object object) {
// skip the indexed constraints
- LinkedListEntry entry = (LinkedListEntry) findNode( this.indexed );
+ LinkedListEntry entry = (LinkedListEntry) findNode( this.indexed+1 );
- ContextEntry context = findContext( this.indexed );
+ int i = 1;
while ( entry != null ) {
- if ( !((BetaNodeFieldConstraint) entry.getObject()).isAllowedCachedLeft( context,
+ if ( !((BetaNodeFieldConstraint) entry.getObject()).isAllowedCachedLeft( context[this.indexed + i],
object ) ) {
return false;
}
entry = (LinkedListEntry) entry.getNext();
- context = context.getNext();
+ i++;
}
return true;
}
@@ -186,18 +179,19 @@
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedRight(org.drools.reteoo.ReteTuple)
*/
- public boolean isAllowedCachedRight(final ReteTuple tuple) {
+ public boolean isAllowedCachedRight(final ContextEntry[] context,
+ final ReteTuple tuple) {
// skip the indexed constraints
- LinkedListEntry entry = (LinkedListEntry) findNode( this.indexed );
+ LinkedListEntry entry = (LinkedListEntry) findNode( this.indexed+1 );
- ContextEntry context = findContext( this.indexed );
+ int i = 1;
while ( entry != null ) {
if ( !((BetaNodeFieldConstraint) entry.getObject()).isAllowedCachedRight( tuple,
- context ) ) {
+ context[this.indexed + i] ) ) {
return false;
}
entry = (LinkedListEntry) entry.getNext();
- context = context.getNext();
+ i++;
}
return true;
}
@@ -206,10 +200,10 @@
// false if -1
return this.indexed >= 0;
}
-
+
public int getIndexCount() {
- return this.indexed+1;
- }
+ return this.indexed + 1;
+ }
public boolean isEmpty() {
return false;
@@ -246,10 +240,12 @@
factHandleMemory = config.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable();
}
memory = new BetaMemory( config.isSequential() ? null : tupleMemory,
- factHandleMemory );
+ factHandleMemory,
+ this.createContext() );
} else {
memory = new BetaMemory( config.isSequential() ? null : new TupleHashTable(),
- config.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable() );
+ config.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable(),
+ this.createContext() );
}
return memory;
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -51,9 +51,6 @@
private final BetaNodeFieldConstraint constraint0;
private final BetaNodeFieldConstraint constraint1;
- private ContextEntry context0;
- private ContextEntry context1;
-
private boolean indexed0;
private boolean indexed1;
@@ -94,10 +91,7 @@
}
this.constraint0 = constraints[0];
- this.context0 = this.constraint0.getContextEntry();
-
this.constraint1 = constraints[1];
- this.context1 = this.constraint1.getContextEntry();
}
private void swap(final BetaNodeFieldConstraint[] constraints,
@@ -120,51 +114,56 @@
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromTuple(org.drools.reteoo.ReteTuple)
*/
- public void updateFromTuple(final InternalWorkingMemory workingMemory,
+ public void updateFromTuple(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final ReteTuple tuple) {
- this.context0.updateFromTuple( workingMemory,
- tuple );
- this.context1.updateFromTuple( workingMemory,
- tuple );
+ context[0].updateFromTuple( workingMemory,
+ tuple );
+ context[1].updateFromTuple( workingMemory,
+ tuple );
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromFactHandle(org.drools.common.InternalFactHandle)
*/
- public void updateFromFactHandle(final InternalWorkingMemory workingMemory,
+ public void updateFromFactHandle(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final InternalFactHandle handle) {
- this.context0.updateFromFactHandle( workingMemory,
- handle );
- this.context1.updateFromFactHandle( workingMemory,
- handle );
+ context[0].updateFromFactHandle( workingMemory,
+ handle );
+ context[1].updateFromFactHandle( workingMemory,
+ handle );
}
-
- public void resetTuple() {
- this.context0.resetTuple();
- this.context1.resetTuple();
+
+ public void resetTuple(final ContextEntry[] context) {
+ context[0].resetTuple();
+ context[1].resetTuple();
}
-
- public void resetFactHandle() {
- this.context0.resetFactHandle();
- this.context1.resetFactHandle();
- }
+ public void resetFactHandle(final ContextEntry[] context) {
+ context[0].resetFactHandle();
+ context[1].resetFactHandle();
+ }
+
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
*/
- public boolean isAllowedCachedLeft(final Object object) {
- return (this.indexed0 || this.constraint0.isAllowedCachedLeft( this.context0,
- object )) && (this.indexed1 || this.constraint1.isAllowedCachedLeft( this.context1,
+ public boolean isAllowedCachedLeft(final ContextEntry[] context,
+ final Object object) {
+
+ return (this.indexed0 || this.constraint0.isAllowedCachedLeft( context[0],
+ object )) && (this.indexed1 || this.constraint1.isAllowedCachedLeft( context[1],
object ));
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedRight(org.drools.reteoo.ReteTuple)
*/
- public boolean isAllowedCachedRight(final ReteTuple tuple) {
+ public boolean isAllowedCachedRight(final ContextEntry[] context,
+ final ReteTuple tuple) {
return this.constraint0.isAllowedCachedRight( tuple,
- this.context0 ) && this.constraint1.isAllowedCachedRight( tuple,
- this.context1 );
+ context[0] ) && this.constraint1.isAllowedCachedRight( tuple,
+ context[1] );
}
public boolean isIndexed() {
@@ -224,10 +223,12 @@
factHandleMemory = config.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable();
}
memory = new BetaMemory( config.isSequential() ? null : tupleMemory,
- factHandleMemory );
+ factHandleMemory,
+ this.createContext() );
} else {
memory = new BetaMemory( config.isSequential() ? null : new TupleHashTable(),
- config.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable() );
+ config.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable(),
+ this.createContext() );
}
return memory;
@@ -278,4 +279,8 @@
return true;
}
+ public ContextEntry[] createContext() {
+ return new ContextEntry[]{this.constraint0.createContextEntry(), this.constraint1.createContextEntry()};
+ }
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -22,6 +22,7 @@
import org.drools.reteoo.BetaMemory;
import org.drools.reteoo.FactHandleMemory;
import org.drools.reteoo.ReteTuple;
+import org.drools.rule.ContextEntry;
import org.drools.util.FactHashTable;
import org.drools.util.FactList;
import org.drools.util.LinkedList;
@@ -33,6 +34,7 @@
BetaConstraints {
private static final BetaConstraints INSTANCE = new EmptyBetaConstraints();
+ private static final ContextEntry[] EMPTY = new ContextEntry[0];
public static BetaConstraints getInstance() {
return EmptyBetaConstraints.INSTANCE;
@@ -49,41 +51,45 @@
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromTuple(org.drools.reteoo.ReteTuple)
*/
- public void updateFromTuple(final InternalWorkingMemory workingMemory,
+ public void updateFromTuple(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final ReteTuple tuple) {
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromFactHandle(org.drools.common.InternalFactHandle)
*/
- public void updateFromFactHandle(final InternalWorkingMemory workingMemory,
+ public void updateFromFactHandle(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final InternalFactHandle handle) {
}
- public void resetTuple() {
+ public void resetTuple(final ContextEntry[] context) {
}
-
- public void resetFactHandle() {
- }
-
+
+ public void resetFactHandle(final ContextEntry[] context) {
+ }
+
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
*/
- public boolean isAllowedCachedLeft(final Object object) {
+ public boolean isAllowedCachedLeft(final ContextEntry[] context,
+ final Object object) {
return true;
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedRight(org.drools.reteoo.ReteTuple)
*/
- public boolean isAllowedCachedRight(final ReteTuple tuple) {
+ public boolean isAllowedCachedRight(final ContextEntry[] context,
+ final ReteTuple tuple) {
return true;
}
public boolean isIndexed() {
return false;
}
-
+
public int getIndexCount() {
return 0;
}
@@ -94,7 +100,8 @@
public BetaMemory createBetaMemory(final RuleBaseConfiguration config) {
final BetaMemory memory = new BetaMemory( config.isSequential() ? null : new TupleHashTable(),
- config.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable() );
+ config.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable(),
+ this.createContext() );
return memory;
}
@@ -128,4 +135,8 @@
return (object != null && (object instanceof EmptyBetaConstraints));
}
+ public ContextEntry[] createContext() {
+ return EMPTY;
+ }
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -57,7 +57,7 @@
return this.otherPattern;
}
- public ContextEntry getContextEntry() {
+ public ContextEntry createContextEntry() {
return new InstanceEqualsConstraintContextEntry( this.otherPattern );
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -48,7 +48,7 @@
return this.otherPattern;
}
- public ContextEntry getContextEntry() {
+ public ContextEntry createContextEntry() {
return new InstanceNotEqualsConstraintContextEntry( this.otherPattern );
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -53,11 +53,6 @@
private final BetaNodeFieldConstraint constraint2;
private final BetaNodeFieldConstraint constraint3;
- private final ContextEntry context0;
- private final ContextEntry context1;
- private final ContextEntry context2;
- private final ContextEntry context3;
-
private boolean indexed0;
private boolean indexed1;
private boolean indexed2;
@@ -73,7 +68,7 @@
public QuadroupleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
final RuleBaseConfiguration conf,
final boolean disableIndexing) {
- if ( disableIndexing || ( !conf.isIndexLeftBetaMemory() && !conf.isIndexRightBetaMemory() ) ) {
+ if ( disableIndexing || (!conf.isIndexLeftBetaMemory() && !conf.isIndexRightBetaMemory()) ) {
this.indexed0 = false;
this.indexed1 = false;
this.indexed2 = false;
@@ -141,16 +136,9 @@
}
this.constraint0 = constraints[0];
- this.context0 = this.constraint0.getContextEntry();
-
this.constraint1 = constraints[1];
- this.context1 = this.constraint1.getContextEntry();
-
this.constraint2 = constraints[2];
- this.context2 = this.constraint2.getContextEntry();
-
this.constraint3 = constraints[3];
- this.context3 = this.constraint3.getContextEntry();
}
private void swap(final BetaNodeFieldConstraint[] constraints,
@@ -173,80 +161,85 @@
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromTuple(org.drools.reteoo.ReteTuple)
*/
- public void updateFromTuple(final InternalWorkingMemory workingMemory,
+ public void updateFromTuple(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final ReteTuple tuple) {
- this.context0.updateFromTuple( workingMemory,
- tuple );
- this.context1.updateFromTuple( workingMemory,
- tuple );
- this.context2.updateFromTuple( workingMemory,
- tuple );
- this.context3.updateFromTuple( workingMemory,
- tuple );
+ context[0].updateFromTuple( workingMemory,
+ tuple );
+ context[1].updateFromTuple( workingMemory,
+ tuple );
+ context[2].updateFromTuple( workingMemory,
+ tuple );
+ context[3].updateFromTuple( workingMemory,
+ tuple );
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromFactHandle(org.drools.common.InternalFactHandle)
*/
- public void updateFromFactHandle(final InternalWorkingMemory workingMemory,
+ public void updateFromFactHandle(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final InternalFactHandle handle) {
- this.context0.updateFromFactHandle( workingMemory,
- handle );
- this.context1.updateFromFactHandle( workingMemory,
- handle );
- this.context2.updateFromFactHandle( workingMemory,
- handle );
- this.context3.updateFromFactHandle( workingMemory,
- handle );
+ context[0].updateFromFactHandle( workingMemory,
+ handle );
+ context[1].updateFromFactHandle( workingMemory,
+ handle );
+ context[2].updateFromFactHandle( workingMemory,
+ handle );
+ context[3].updateFromFactHandle( workingMemory,
+ handle );
}
-
- public void resetTuple() {
- this.context0.resetTuple();
- this.context1.resetTuple();
- this.context2.resetTuple();
- this.context3.resetTuple();
+
+ public void resetTuple(final ContextEntry[] context) {
+ context[0].resetTuple();
+ context[1].resetTuple();
+ context[2].resetTuple();
+ context[3].resetTuple();
}
-
- public void resetFactHandle() {
- this.context0.resetFactHandle();
- this.context1.resetFactHandle();
- this.context2.resetFactHandle();
- this.context3.resetFactHandle();
- }
+ public void resetFactHandle(final ContextEntry[] context) {
+ context[0].resetFactHandle();
+ context[1].resetFactHandle();
+ context[2].resetFactHandle();
+ context[3].resetFactHandle();
+ }
+
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
*/
- public boolean isAllowedCachedLeft(final Object object) {
+ public boolean isAllowedCachedLeft(final ContextEntry[] context,
+ final Object object) {
// return ( this.indexed0 || this.constraint0.isAllowedCachedLeft( context0,
// object ) ) && this.constraint1.isAllowedCachedLeft( context1,
// object ) && this.constraint2.isAllowedCachedLeft( context2,
// object );
- return (this.indexed0 || this.constraint0.isAllowedCachedLeft( this.context0,
- object )) && (this.indexed1 || this.constraint1.isAllowedCachedLeft( this.context1,
- object )) && (this.indexed2 || this.constraint2.isAllowedCachedLeft( this.context2,
+ return (this.indexed0 || this.constraint0.isAllowedCachedLeft( context[0],
+ object )) && (this.indexed1 || this.constraint1.isAllowedCachedLeft( context[1],
+ object )) && (this.indexed2 || this.constraint2.isAllowedCachedLeft( context[2],
object ))
- && (this.indexed3 || this.constraint3.isAllowedCachedLeft( this.context3,
+
+ && (this.indexed3 || this.constraint3.isAllowedCachedLeft( context[3],
object ));
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedRight(org.drools.reteoo.ReteTuple)
*/
- public boolean isAllowedCachedRight(final ReteTuple tuple) {
+ public boolean isAllowedCachedRight(final ContextEntry[] context,
+ final ReteTuple tuple) {
return this.constraint0.isAllowedCachedRight( tuple,
- this.context0 ) && this.constraint1.isAllowedCachedRight( tuple,
- this.context1 ) && this.constraint2.isAllowedCachedRight( tuple,
- this.context2 )
+ context[0] ) && this.constraint1.isAllowedCachedRight( tuple,
+ context[1] ) && this.constraint2.isAllowedCachedRight( tuple,
+ context[2] )
&& (this.indexed3 || this.constraint3.isAllowedCachedRight( tuple,
- this.context3 ));
+ context[3] ));
}
public boolean isIndexed() {
return this.indexed0;
}
-
+
public int getIndexCount() {
int count = 0;
if ( this.indexed0 ) {
@@ -260,9 +253,9 @@
}
if ( this.indexed3 ) {
count++;
- }
- return count;
- }
+ }
+ return count;
+ }
public boolean isEmpty() {
return false;
@@ -322,10 +315,12 @@
factHandleMemory = conf.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable();
}
memory = new BetaMemory( conf.isSequential() ? null : tupleMemory,
- factHandleMemory );
+ factHandleMemory,
+ this.createContext() );
} else {
memory = new BetaMemory( conf.isSequential() ? null : new TupleHashTable(),
- conf.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable() );
+ conf.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable(),
+ this.createContext() );
}
return memory;
@@ -386,4 +381,8 @@
return true;
}
+ public ContextEntry[] createContext() {
+ return new ContextEntry[]{this.constraint0.createContextEntry(), this.constraint1.createContextEntry(), this.constraint2.createContextEntry(), this.constraint3.createContextEntry()};
+ }
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -47,18 +47,16 @@
private final BetaNodeFieldConstraint constraint;
- private ContextEntry context;
-
private boolean indexed;
private RuleBaseConfiguration conf;
-
+
public SingleBetaConstraints(final BetaNodeFieldConstraint[] constraint,
final RuleBaseConfiguration conf) {
this( constraint[0],
conf,
false );
- }
+ }
public SingleBetaConstraints(final BetaNodeFieldConstraint constraint,
final RuleBaseConfiguration conf) {
@@ -80,7 +78,6 @@
}
this.constraint = constraint;
- this.context = constraint.getContextEntry();
}
private boolean isIndexable(final BetaNodeFieldConstraint constraint) {
@@ -92,54 +89,54 @@
}
}
+ public ContextEntry[] createContext() {
+ return new ContextEntry[] { this.constraint.createContextEntry() };
+ }
+
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromTuple(org.drools.reteoo.ReteTuple)
*/
- public void updateFromTuple(final InternalWorkingMemory workingMemory,
+ public void updateFromTuple(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final ReteTuple tuple) {
- this.context.updateFromTuple( workingMemory,
- tuple );
+ context[0].updateFromTuple( workingMemory,
+ tuple );
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromFactHandle(org.drools.common.InternalFactHandle)
*/
- public void updateFromFactHandle(final InternalWorkingMemory workingMemory,
+ public void updateFromFactHandle(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final InternalFactHandle handle) {
- this.context.updateFromFactHandle( workingMemory,
+ context[0].updateFromFactHandle( workingMemory,
handle );
}
-
- public void resetTuple() {
- this.context.resetTuple();
- }
-
- public void resetFactHandle() {
- this.context.resetFactHandle();
- }
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
*/
- public boolean isAllowedCachedLeft(final Object object) {
- return this.indexed || this.constraint.isAllowedCachedLeft( this.context,
+ public boolean isAllowedCachedLeft(final ContextEntry[] context,
+ final Object object) {
+ return this.indexed || this.constraint.isAllowedCachedLeft( context[0],
object );
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedRight(org.drools.reteoo.ReteTuple)
*/
- public boolean isAllowedCachedRight(final ReteTuple tuple) {
+ public boolean isAllowedCachedRight(final ContextEntry[] context,
+ final ReteTuple tuple) {
return this.constraint.isAllowedCachedRight( tuple,
- this.context );
+ context[0] );
}
public boolean isIndexed() {
return this.indexed;
}
-
+
public int getIndexCount() {
- return ( this.indexed ? 1 : 0 );
+ return (this.indexed ? 1 : 0);
}
public boolean isEmpty() {
@@ -167,10 +164,12 @@
factHandleMemory = new FactHashTable();
}
memory = new BetaMemory( config.isSequential() ? null : tupleMemory,
- factHandleMemory );
+ factHandleMemory,
+ this.createContext() );
} else {
memory = new BetaMemory( config.isSequential() ? null : new TupleHashTable(),
- new FactHashTable() );
+ new FactHashTable(),
+ this.createContext() );
}
return memory;
@@ -212,4 +211,12 @@
return this.constraint == other.constraint || this.constraint.equals( other );
}
+ public void resetFactHandle(ContextEntry[] context) {
+ context[0].resetFactHandle();
+ }
+
+ public void resetTuple(ContextEntry[] context) {
+ context[0].resetTuple();
+ }
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -52,10 +52,6 @@
private final BetaNodeFieldConstraint constraint1;
private final BetaNodeFieldConstraint constraint2;
- private final ContextEntry context0;
- private final ContextEntry context1;
- private final ContextEntry context2;
-
private boolean indexed0;
private boolean indexed1;
private boolean indexed2;
@@ -114,13 +110,8 @@
}
}
this.constraint0 = constraints[0];
- this.context0 = this.constraint0.getContextEntry();
-
this.constraint1 = constraints[1];
- this.context1 = this.constraint1.getContextEntry();
-
this.constraint2 = constraints[2];
- this.context2 = this.constraint2.getContextEntry();
}
private void swap(final BetaNodeFieldConstraint[] constraints,
@@ -143,64 +134,68 @@
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromTuple(org.drools.reteoo.ReteTuple)
*/
- public void updateFromTuple(final InternalWorkingMemory workingMemory,
+ public void updateFromTuple(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final ReteTuple tuple) {
- this.context0.updateFromTuple( workingMemory,
- tuple );
- this.context1.updateFromTuple( workingMemory,
- tuple );
- this.context2.updateFromTuple( workingMemory,
- tuple );
+ context[0].updateFromTuple( workingMemory,
+ tuple );
+ context[1].updateFromTuple( workingMemory,
+ tuple );
+ context[2].updateFromTuple( workingMemory,
+ tuple );
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#updateFromFactHandle(org.drools.common.InternalFactHandle)
*/
- public void updateFromFactHandle(final InternalWorkingMemory workingMemory,
+ public void updateFromFactHandle(final ContextEntry[] context,
+ final InternalWorkingMemory workingMemory,
final InternalFactHandle handle) {
- this.context0.updateFromFactHandle( workingMemory,
- handle );
- this.context1.updateFromFactHandle( workingMemory,
- handle );
- this.context2.updateFromFactHandle( workingMemory,
- handle );
+ context[0].updateFromFactHandle( workingMemory,
+ handle );
+ context[1].updateFromFactHandle( workingMemory,
+ handle );
+ context[2].updateFromFactHandle( workingMemory,
+ handle );
}
-
- public void resetTuple() {
- this.context0.resetTuple();
- this.context1.resetTuple();
- this.context2.resetTuple();
+
+ public void resetTuple(final ContextEntry[] context) {
+ context[0].resetTuple();
+ context[1].resetTuple();
+ context[2].resetTuple();
}
-
- public void resetFactHandle() {
- this.context0.resetFactHandle();
- this.context1.resetFactHandle();
- this.context2.resetFactHandle();
- }
+ public void resetFactHandle(final ContextEntry[] context) {
+ context[0].resetFactHandle();
+ context[1].resetFactHandle();
+ context[2].resetFactHandle();
+ }
+
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
*/
- public boolean isAllowedCachedLeft(final Object object) {
+ public boolean isAllowedCachedLeft(final ContextEntry[] context,
+ final Object object) {
// return ( this.indexed0 || this.constraint0.isAllowedCachedLeft( context0,
// object ) ) && this.constraint1.isAllowedCachedLeft( context1,
// object ) && this.constraint2.isAllowedCachedLeft( context2,
// object );
- return (this.indexed0 || this.constraint0.isAllowedCachedLeft( this.context0,
- object )) && (this.indexed1 || this.constraint1.isAllowedCachedLeft( this.context1,
- object )) && (this.indexed2 || this.constraint2.isAllowedCachedLeft( this.context2,
+ return (this.indexed0 || this.constraint0.isAllowedCachedLeft( context[0],
+ object )) && (this.indexed1 || this.constraint1.isAllowedCachedLeft( context[1],
+ object )) && (this.indexed2 || this.constraint2.isAllowedCachedLeft( context[2],
object ));
}
/* (non-Javadoc)
* @see org.drools.common.BetaNodeConstraints#isAllowedCachedRight(org.drools.reteoo.ReteTuple)
*/
- public boolean isAllowedCachedRight(final ReteTuple tuple) {
+ public boolean isAllowedCachedRight(final ContextEntry[] context,
+ final ReteTuple tuple) {
return this.constraint0.isAllowedCachedRight( tuple,
- this.context0 ) && this.constraint1.isAllowedCachedRight( tuple,
- this.context1 ) && this.constraint2.isAllowedCachedRight( tuple,
- this.context2 );
+ context[0] ) && this.constraint1.isAllowedCachedRight( tuple,
+ context[1] ) && this.constraint2.isAllowedCachedRight( tuple,
+ context[2] );
}
public boolean isIndexed() {
@@ -271,10 +266,12 @@
factHandleMemory = conf.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable();
}
memory = new BetaMemory( conf.isSequential() ? null : tupleMemory,
- factHandleMemory );
+ factHandleMemory,
+ this.createContext() );
} else {
memory = new BetaMemory( conf.isSequential() ? null : new TupleHashTable(),
- conf.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable() );
+ conf.isSequential() ? (FactHandleMemory) new FactList() : (FactHandleMemory) new FactHashTable(),
+ this.createContext() );
}
return memory;
@@ -330,4 +327,8 @@
return true;
}
+ public ContextEntry[] createContext() {
+ return new ContextEntry[]{this.constraint0.createContextEntry(), this.constraint1.createContextEntry(), this.constraint2.createContextEntry()};
+ }
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -69,7 +69,7 @@
Declaration newDecl) {
}
- public ContextEntry getContextEntry() {
+ public ContextEntry createContextEntry() {
return new TupleStartEqualsConstraintContextEntry();
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -25,6 +25,7 @@
import org.drools.common.InternalWorkingMemory;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Accumulate;
+import org.drools.rule.ContextEntry;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.PropagationContext;
import org.drools.util.ArrayUtils;
@@ -114,12 +115,15 @@
workingMemory );
final Iterator it = memory.betaMemory.getFactHandleMemory().iterator( leftTuple );
- this.constraints.updateFromTuple( workingMemory,
+ this.constraints.updateFromTuple( memory.betaMemory.getContext(),
+ workingMemory,
leftTuple );
for ( FactEntry entry = (FactEntry) it.next(); entry != null; entry = (FactEntry) it.next() ) {
InternalFactHandle handle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
+ if ( this.constraints.isAllowedCachedLeft( memory.betaMemory.getContext(),
+ handle.getObject() ) ) {
+
if ( this.unwrapRightObject ) {
// if there is a subnetwork, handle must be unwrapped
ReteTuple tuple = (ReteTuple) handle.getObject();
@@ -139,7 +143,7 @@
}
}
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.betaMemory.getContext() );
final Object result = this.accumulate.getResult( memory.workingMemoryContext,
accContext,
@@ -154,16 +158,20 @@
boolean isAllowed = true;
for ( int i = 0, length = this.resultConstraints.length; i < length; i++ ) {
if ( !this.resultConstraints[i].isAllowed( result,
- workingMemory ) ) {
+ workingMemory,
+ memory.alphaContexts[i] ) ) {
isAllowed = false;
break;
}
}
if ( isAllowed ) {
- this.resultBinder.updateFromTuple( workingMemory,
+ this.resultBinder.updateFromTuple( memory.resultsContext,
+ workingMemory,
leftTuple );
- if ( this.resultBinder.isAllowedCachedLeft( result ) ) {
+ if ( this.resultBinder.isAllowedCachedLeft( memory.resultsContext,
+ result ) ) {
final InternalFactHandle handle = workingMemory.getFactHandleFactory().newFactHandle( result );
+
accresult.handle = handle;
this.sink.propagateAssertTuple( leftTuple,
@@ -223,14 +231,16 @@
return;
}
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.betaMemory.getContext(),
+ workingMemory,
handle );
// need to clone the tuples to avoid concurrent modification exceptions
Entry[] tuples = memory.betaMemory.getTupleMemory().toArray();
for ( int i = 0; i < tuples.length; i++ ) {
ReteTuple tuple = (ReteTuple) tuples[i];
- if ( this.constraints.isAllowedCachedRight( tuple ) ) {
+ if ( this.constraints.isAllowedCachedRight( memory.betaMemory.getContext(),
+ tuple ) ) {
if ( this.accumulate.supportsReverse() || context.getType() == PropagationContext.ASSERTION ) {
modifyTuple( true,
tuple,
@@ -249,7 +259,7 @@
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.betaMemory.getContext() );
}
/**
@@ -266,13 +276,15 @@
return;
}
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.betaMemory.getContext(),
+ workingMemory,
handle );
// need to clone the tuples to avoid concurrent modification exceptions
Entry[] tuples = memory.betaMemory.getTupleMemory().toArray();
for ( int i = 0; i < tuples.length; i++ ) {
ReteTuple tuple = (ReteTuple) tuples[i];
- if ( this.constraints.isAllowedCachedRight( tuple ) ) {
+ if ( this.constraints.isAllowedCachedRight( memory.betaMemory.getContext(),
+ tuple ) ) {
if ( this.accumulate.supportsReverse() ) {
this.modifyTuple( false,
tuple,
@@ -290,7 +302,7 @@
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.betaMemory.getContext() );
}
public void modifyTuple(final boolean isAssert,
@@ -378,15 +390,18 @@
boolean isAllowed = true;
for ( int i = 0, length = this.resultConstraints.length; i < length; i++ ) {
if ( !this.resultConstraints[i].isAllowed( result,
- workingMemory ) ) {
+ workingMemory,
+ memory.alphaContexts[i] ) ) {
isAllowed = false;
break;
}
}
if ( isAllowed ) {
- this.resultBinder.updateFromTuple( workingMemory,
+ this.resultBinder.updateFromTuple( memory.resultsContext,
+ workingMemory,
leftTuple );
- if ( this.resultBinder.isAllowedCachedLeft( result ) ) {
+ if ( this.resultBinder.isAllowedCachedLeft( memory.resultsContext,
+ result ) ) {
final InternalFactHandle createdHandle = workingMemory.getFactHandleFactory().newFactHandle( result );
accresult.handle = createdHandle;
@@ -395,7 +410,7 @@
context,
workingMemory );
}
- this.resultBinder.resetTuple();
+ this.resultBinder.resetTuple( memory.resultsContext );
}
}
@@ -455,6 +470,11 @@
AccumulateMemory memory = new AccumulateMemory();
memory.betaMemory = this.constraints.createBetaMemory( config );
memory.workingMemoryContext = this.accumulate.createWorkingMemoryContext();
+ memory.resultsContext = this.resultBinder.createContext();
+ memory.alphaContexts = new ContextEntry[this.resultConstraints.length];
+ for ( int i = 0; i < this.resultConstraints.length; i++ ) {
+ memory.alphaContexts[i] = this.resultConstraints[i].createContextEntry();
+ }
return memory;
}
@@ -463,6 +483,8 @@
public Object workingMemoryContext;
public BetaMemory betaMemory;
+ public ContextEntry[] resultsContext;
+ public ContextEntry[] alphaContexts;
}
private static class AccumulateResult {
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import java.io.Serializable;
+
import org.drools.FactException;
import org.drools.RuleBaseConfiguration;
import org.drools.common.BaseNode;
@@ -23,6 +25,7 @@
import org.drools.common.NodeMemory;
import org.drools.common.PropagationContextImpl;
import org.drools.reteoo.builder.BuildContext;
+import org.drools.rule.ContextEntry;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.PropagationContext;
import org.drools.util.FactEntry;
@@ -129,12 +132,14 @@
public void assertObject(final InternalFactHandle handle,
final PropagationContext context,
final InternalWorkingMemory workingMemory) throws FactException {
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( this );
+
if ( this.constraint.isAllowed( handle.getObject(),
- workingMemory ) ) {
+ workingMemory,
+ memory.context ) ) {
if ( isObjectMemoryEnabled() ) {
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( this );
- memory.add( handle,
- false );
+ memory.facts.add( handle,
+ false );
}
this.sink.propagateAssertObject( handle,
@@ -147,12 +152,13 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
boolean propagate = true;
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( this );
if ( isObjectMemoryEnabled() ) {
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( this );
- propagate = memory.remove( handle );
+ propagate = memory.facts.remove( handle );
} else {
propagate = this.constraint.isAllowed( handle.getObject(),
- workingMemory );
+ workingMemory,
+ memory.context );
}
if ( propagate ) {
this.sink.propagateRetractObject( handle,
@@ -165,18 +171,19 @@
public void updateSink(final ObjectSink sink,
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- FactHashTable memory = null;
+ AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( this );
if ( !isObjectMemoryEnabled() ) {
// get the objects from the parent
- ObjectSinkUpdateAdapter adapter = new ObjectSinkUpdateAdapter( sink, this.constraint );
+ ObjectSinkUpdateAdapter adapter = new ObjectSinkUpdateAdapter( sink,
+ this.constraint,
+ memory.context );
this.objectSource.updateSink( adapter,
context,
workingMemory );
} else {
// if already has memory, just iterate and propagate
- memory = (FactHashTable) workingMemory.getNodeMemory( this );
- final Iterator it = memory.iterator();
+ final Iterator it = memory.facts.iterator();
for ( FactEntry entry = (FactEntry) it.next(); entry != null; entry = (FactEntry) it.next() ) {
sink.assertObject( entry.getFactHandle(),
context,
@@ -188,9 +195,11 @@
public void remove(final RuleRemovalContext context,
final BaseNode node,
final InternalWorkingMemory[] workingMemories) {
+
if ( !node.isInUse() ) {
removeObjectSink( (ObjectSink) node );
}
+
if ( !this.isInUse() ) {
for ( int i = 0, length = workingMemories.length; i < length; i++ ) {
workingMemories[i].clearNodeMemory( this );
@@ -217,7 +226,12 @@
* Creates a HashSet for the AlphaNode's memory.
*/
public Object createMemory(final RuleBaseConfiguration config) {
- return new FactHashTable();
+ AlphaMemory memory = new AlphaMemory();
+ memory.context = this.constraint.createContextEntry();
+ if ( this.objectMemoryEnabled ) {
+ memory.facts = new FactHashTable();
+ }
+ return memory;
}
/**
@@ -290,6 +304,16 @@
this.previousObjectSinkNode = previous;
}
+ public static class AlphaMemory
+ implements
+ Serializable {
+ private static final long serialVersionUID = -5852576405010023458L;
+
+ public FactHashTable facts;
+ public ContextEntry context;
+
+ }
+
/**
* Used with the updateSink method, so that the parent ObjectSource
* can update the TupleSink
@@ -299,20 +323,24 @@
private static class ObjectSinkUpdateAdapter
implements
ObjectSink {
- private final ObjectSink sink;
+ private final ObjectSink sink;
private final AlphaNodeFieldConstraint constraint;
+ private final ContextEntry alphaContext;
- public ObjectSinkUpdateAdapter(final ObjectSink sink,
- final AlphaNodeFieldConstraint constraint ) {
+ public ObjectSinkUpdateAdapter(final ObjectSink sink,
+ final AlphaNodeFieldConstraint constraint,
+ final ContextEntry context ) {
this.sink = sink;
this.constraint = constraint;
+ this.alphaContext = context;
}
public void assertObject(final InternalFactHandle handle,
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
if ( this.constraint.isAllowed( handle.getObject(),
- workingMemory ) ) {
+ workingMemory,
+ this.alphaContext ) ) {
this.sink.assertObject( handle,
context,
workingMemory );
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -2,6 +2,7 @@
import java.io.Serializable;
+import org.drools.rule.ContextEntry;
import org.drools.util.ObjectHashMap;
public class BetaMemory
@@ -13,11 +14,14 @@
private TupleMemory tupleMemory;
private FactHandleMemory factHandleMemory;
private ObjectHashMap createdHandles;
+ private ContextEntry[] context;
public BetaMemory(final TupleMemory tupleMemory,
- final FactHandleMemory objectMemory) {
+ final FactHandleMemory objectMemory,
+ final ContextEntry[] context ) {
this.tupleMemory = tupleMemory;
this.factHandleMemory = objectMemory;
+ this.context = context;
}
public FactHandleMemory getFactHandleMemory() {
@@ -34,4 +38,11 @@
}
return this.createdHandles;
}
+
+ /**
+ * @return the context
+ */
+ public ContextEntry[] getContext() {
+ return context;
+ }
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/BetaNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/BetaNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -25,6 +25,7 @@
import org.drools.common.InternalWorkingMemory;
import org.drools.common.NodeMemory;
import org.drools.common.PropagationContextImpl;
+import org.drools.rule.ContextEntry;
import org.drools.spi.BetaNodeFieldConstraint;
import org.drools.spi.PropagationContext;
import org.drools.util.LinkedList;
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/CollectNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/CollectNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -19,11 +19,13 @@
import java.util.Arrays;
import java.util.Collection;
+import org.drools.RuleBaseConfiguration;
import org.drools.common.BetaConstraints;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Collect;
+import org.drools.rule.ContextEntry;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.PropagationContext;
import org.drools.util.ArrayUtils;
@@ -103,58 +105,65 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+ final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
final Collection result = this.collect.instantiateResultObject();
final InternalFactHandle resultHandle = workingMemory.getFactHandleFactory().newFactHandle( result );
+
CollectResult colresult = new CollectResult();
colresult.handle = resultHandle;
colresult.propagated = false;
-
+
// do not add tuple and result to the memory in sequential mode
if ( this.tupleMemoryEnabled ) {
- memory.getTupleMemory().add( leftTuple );
- memory.getCreatedHandles().put( leftTuple,
- colresult,
- false );
+ memory.betaMemory.getTupleMemory().add( leftTuple );
+ memory.betaMemory.getCreatedHandles().put( leftTuple,
+ colresult,
+ false );
}
-
- final Iterator it = memory.getFactHandleMemory().iterator( leftTuple );
- this.constraints.updateFromTuple( workingMemory,
+ final Iterator it = memory.betaMemory.getFactHandleMemory().iterator( leftTuple );
+ this.constraints.updateFromTuple( memory.betaMemory.getContext(),
+ workingMemory,
leftTuple );
for ( FactEntry entry = (FactEntry) it.next(); entry != null; entry = (FactEntry) it.next() ) {
InternalFactHandle handle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
+ if ( this.constraints.isAllowedCachedLeft( memory.betaMemory.getContext(),
+ handle.getObject() ) ) {
if( this.unwrapRightObject ) {
handle = ((ReteTuple) handle.getObject()).getLastHandle();
}
result.add( handle.getObject() );
}
}
-
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.betaMemory.getContext() );
+
// First alpha node filters
boolean isAllowed = true;
for ( int i = 0, length = this.resultConstraints.length; i < length; i++ ) {
if ( !this.resultConstraints[i].isAllowed( result,
- workingMemory ) ) {
+ workingMemory,
+ memory.alphaContexts[i]) ) {
isAllowed = false;
break;
}
}
if ( isAllowed ) {
- this.resultsBinder.updateFromTuple( workingMemory,
+ this.resultsBinder.updateFromTuple( memory.resultsContext,
+ workingMemory,
leftTuple );
- if ( this.resultsBinder.isAllowedCachedLeft( result ) ) {
+ if ( this.resultsBinder.isAllowedCachedLeft( memory.resultsContext,
+ result ) ) {
+
colresult.propagated = true;
this.sink.propagateAssertTuple( leftTuple,
resultHandle,
context,
workingMemory );
}
+ this.resultsBinder.resetTuple( memory.resultsContext );
}
}
@@ -165,9 +174,9 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
- memory.getTupleMemory().remove( leftTuple );
- CollectResult result = (CollectResult) memory.getCreatedHandles().remove( leftTuple );
+ final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
+ memory.betaMemory.getTupleMemory().remove( leftTuple );
+ CollectResult result = (CollectResult) memory.betaMemory.getCreatedHandles().remove( leftTuple );
final InternalFactHandle handle = result.handle;
// if tuple was propagated
@@ -196,22 +205,24 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
- memory.getFactHandleMemory().add( handle );
-
+ final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
+ memory.betaMemory.getFactHandleMemory().add( handle );
+
if ( !this.tupleMemoryEnabled ) {
// do nothing here, as we know there are no left tuples at this stage in sequential mode.
return;
- }
+ }
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.betaMemory.getContext(),
+ workingMemory,
handle );
// need to clone the tuples to avoid concurrent modification exceptions
- Entry[] tuples = memory.getTupleMemory().toArray();
+ Entry[] tuples = memory.betaMemory.getTupleMemory().toArray();
for ( int i = 0; i < tuples.length; i++ ) {
ReteTuple tuple = (ReteTuple) tuples[i];
- if ( this.constraints.isAllowedCachedRight( tuple ) ) {
+ if ( this.constraints.isAllowedCachedRight( memory.betaMemory.getContext(),
+ tuple ) ) {
this.modifyTuple( true,
tuple,
handle,
@@ -220,7 +231,7 @@
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.betaMemory.getContext() );
}
/**
@@ -233,20 +244,22 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
- if ( !memory.getFactHandleMemory().remove( handle ) ) {
+ final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
+ if ( !memory.betaMemory.getFactHandleMemory().remove( handle ) ) {
return;
}
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.betaMemory.getContext(),
+ workingMemory,
handle );
// need to clone the tuples to avoid concurrent modification exceptions
- Entry[] tuples = memory.getTupleMemory().toArray();
+ Entry[] tuples = memory.betaMemory.getTupleMemory().toArray();
for ( int i = 0; i < tuples.length; i++ ) {
ReteTuple tuple = (ReteTuple) tuples[i];
- if ( this.constraints.isAllowedCachedRight( tuple ) ) {
-
+ if ( this.constraints.isAllowedCachedRight( memory.betaMemory.getContext(),
+ tuple ) ) {
+
this.modifyTuple( false,
tuple,
handle,
@@ -254,8 +267,8 @@
workingMemory );
}
}
-
- this.constraints.resetFactHandle();
+
+ this.constraints.resetFactHandle( memory.betaMemory.getContext() );
}
/**
@@ -273,9 +286,9 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+ final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
- CollectResult result = (CollectResult) memory.getCreatedHandles().get( leftTuple );
+ CollectResult result = (CollectResult) memory.betaMemory.getCreatedHandles().get( leftTuple );
// if tuple was propagated
if ( result.propagated ) {
@@ -285,20 +298,18 @@
workingMemory );
result.propagated = false;
}
-
+
// if there is a subnetwork, we need to unwrapp the object from inside the tuple
- if( this.unwrapRightObject ) {
- handle = ((ReteTuple) handle.getObject()).getLastHandle();
+ if ( this.unwrapRightObject ) {
+ handle = ((ReteTuple) handle.getObject()).getLastHandle();
}
if ( context.getType() == PropagationContext.ASSERTION ) {
((Collection) result.handle.getObject()).add( handle.getObject() );
} else if ( context.getType() == PropagationContext.RETRACTION ) {
((Collection) result.handle.getObject()).remove( handle.getObject() );
- } else if ( context.getType() == PropagationContext.MODIFICATION ||
- context.getType() == PropagationContext.RULE_ADDITION ||
- context.getType() == PropagationContext.RULE_REMOVAL ) {
- if( isAssert ) {
+ } else if ( context.getType() == PropagationContext.MODIFICATION || context.getType() == PropagationContext.RULE_ADDITION || context.getType() == PropagationContext.RULE_REMOVAL ) {
+ if ( isAssert ) {
((Collection) result.handle.getObject()).add( handle.getObject() );
} else {
((Collection) result.handle.getObject()).remove( handle.getObject() );
@@ -309,32 +320,35 @@
boolean isAllowed = true;
for ( int i = 0, length = this.resultConstraints.length; i < length; i++ ) {
if ( !this.resultConstraints[i].isAllowed( result.handle.getObject(),
- workingMemory ) ) {
+ workingMemory,
+ memory.alphaContexts[i] ) ) {
isAllowed = false;
break;
}
}
if ( isAllowed ) {
- this.resultsBinder.updateFromTuple( workingMemory,
+ this.resultsBinder.updateFromTuple( memory.resultsContext,
+ workingMemory,
leftTuple );
- if ( this.resultsBinder.isAllowedCachedLeft( result.handle.getObject() ) ) {
+ if ( this.resultsBinder.isAllowedCachedLeft( memory.resultsContext,
+ result.handle.getObject() ) ) {
result.propagated = true;
this.sink.propagateAssertTuple( leftTuple,
result.handle,
context,
workingMemory );
}
-
- this.resultsBinder.resetTuple();
+
+ this.resultsBinder.resetTuple( memory.resultsContext );
}
}
public void updateSink(final TupleSink sink,
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+ final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( this );
- final Iterator it = memory.getCreatedHandles().iterator();
+ final Iterator it = memory.betaMemory.getCreatedHandles().iterator();
for ( ObjectEntry entry = (ObjectEntry) it.next(); entry != null; entry = (ObjectEntry) it.next() ) {
CollectResult result = (CollectResult) entry.getValue();
@@ -378,6 +392,27 @@
return "[ " + this.getClass().getName() + "(" + this.id + ") ]";
}
+ /**
+ * Creates a BetaMemory for the BetaNode's memory.
+ */
+ public Object createMemory(final RuleBaseConfiguration config) {
+ CollectMemory memory = new CollectMemory();
+ memory.betaMemory = this.constraints.createBetaMemory( config );
+ memory.resultsContext = this.resultsBinder.createContext();
+ memory.alphaContexts = new ContextEntry[this.resultConstraints.length];
+ for ( int i = 0; i < this.resultConstraints.length; i++ ) {
+ memory.alphaContexts[i] = this.resultConstraints[i].createContextEntry();
+ }
+ return memory;
+ }
+
+ public static class CollectMemory {
+ private static final long serialVersionUID = 400L;
+ public BetaMemory betaMemory;
+ public ContextEntry[] resultsContext;
+ public ContextEntry[] alphaContexts;
+ }
+
private static class CollectResult {
// keeping attributes public just for performance
public InternalFactHandle handle;
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.Serializable;
+
import org.drools.RuleBaseConfiguration;
import org.drools.common.BaseNode;
import org.drools.common.InternalWorkingMemory;
@@ -141,14 +143,15 @@
public void assertTuple(final ReteTuple tuple,
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
+ final EvalMemory memory = (EvalMemory) workingMemory.getNodeMemory( this );
final boolean allowed = this.condition.isAllowed( tuple,
- workingMemory );
+ workingMemory,
+ memory.context );
if ( allowed ) {
if ( this.tupleMemoryEnabled ) {
- final TupleHashTable memory = (TupleHashTable) workingMemory.getNodeMemory( this );
- memory.add( tuple );
+ memory.tupleMemory.add( tuple );
}
this.sink.propagateAssertTuple( tuple,
@@ -160,10 +163,10 @@
public void retractTuple(final ReteTuple tuple,
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final TupleHashTable memory = (TupleHashTable) workingMemory.getNodeMemory( this );
+ final EvalMemory memory = (EvalMemory) workingMemory.getNodeMemory( this );
// can we improve that?
- final ReteTuple memTuple = memory.remove( tuple );
+ final ReteTuple memTuple = memory.tupleMemory.remove( tuple );
if ( memTuple != null ) {
this.sink.propagateRetractTuple( memTuple,
context,
@@ -199,7 +202,7 @@
}
public Object createMemory(final RuleBaseConfiguration config) {
- return new TupleHashTable();
+ return new EvalMemory( this.tupleMemoryEnabled, this.condition.createContext() );
}
/* (non-Javadoc)
@@ -209,9 +212,9 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final TupleHashTable memory = (TupleHashTable) workingMemory.getNodeMemory( this );
+ final EvalMemory memory = (EvalMemory) workingMemory.getNodeMemory( this );
- final Iterator it = memory.iterator();
+ final Iterator it = memory.tupleMemory.iterator();
for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
sink.assertTuple( tuple,
context,
@@ -282,5 +285,20 @@
public void setPreviousTupleSinkNode(final TupleSinkNode previous) {
this.previousTupleSinkNode = previous;
}
+
+ public static class EvalMemory implements Serializable {
+ private static final long serialVersionUID = -2754669682742843929L;
+
+ public TupleHashTable tupleMemory;
+ public Object context;
+
+ public EvalMemory( final boolean tupleMemoryEnabled, final Object context ) {
+ this.context = context;
+ if( tupleMemoryEnabled ) {
+ this.tupleMemory = new TupleHashTable();
+ }
+ }
+ }
+
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ExistsNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ExistsNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ExistsNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -97,17 +97,19 @@
}
final Iterator it = memory.getFactHandleMemory().iterator( leftTuple );
- this.constraints.updateFromTuple( workingMemory,
+ this.constraints.updateFromTuple( memory.getContext(),
+ workingMemory,
leftTuple );
for ( FactEntry entry = (FactEntry) it.next(); entry != null; entry = (FactEntry) it.next() ) {
final InternalFactHandle handle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
+ if ( this.constraints.isAllowedCachedLeft( memory.getContext(),
+ handle.getObject() ) ) {
leftTuple.setMatch( handle );
break;
}
}
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.getContext() );
if ( leftTuple.getMatch() != null ) {
this.sink.propagateAssertTuple( leftTuple,
@@ -140,10 +142,12 @@
}
final Iterator it = memory.getTupleMemory().iterator( handle );
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.getContext(),
+ workingMemory,
handle );
for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
- if ( this.constraints.isAllowedCachedRight( tuple ) && tuple.getMatch() == null) {
+ if ( this.constraints.isAllowedCachedRight( memory.getContext(),
+ tuple ) && tuple.getMatch() == null) {
tuple.setMatch( handle );
this.sink.propagateAssertTuple( tuple,
context,
@@ -151,7 +155,7 @@
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.getContext() );
}
/**
@@ -175,27 +179,31 @@
}
final Iterator it = memory.getTupleMemory().iterator( handle );
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.getContext(),
+ workingMemory,
handle );
for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
- if ( this.constraints.isAllowedCachedRight( tuple ) ) {
+ if ( this.constraints.isAllowedCachedRight( memory.getContext(),
+ tuple ) ) {
if ( tuple.getMatch() == handle ) {
// reset the match
tuple.setMatch( null );
// find next match, remember it and break.
final Iterator tupleIt = memory.getFactHandleMemory().iterator( tuple );
- this.constraints.updateFromTuple( workingMemory, tuple );
+ this.constraints.updateFromTuple( memory.getContext(),
+ workingMemory, tuple );
for ( FactEntry entry = (FactEntry) tupleIt.next(); entry != null; entry = (FactEntry) tupleIt.next() ) {
final InternalFactHandle rightHandle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( rightHandle.getObject() ) ) {
+ if ( this.constraints.isAllowedCachedLeft( memory.getContext(),
+ rightHandle.getObject() ) ) {
tuple.setMatch( rightHandle );
break;
}
}
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.getContext() );
// if there is now no new tuple match then propagate assert.
if ( tuple.getMatch() == null ) {
@@ -208,7 +216,7 @@
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.getContext() );
}
/**
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/FromNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/FromNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/FromNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -1,5 +1,7 @@
package org.drools.reteoo;
+import java.io.Serializable;
+
import org.drools.RuleBaseConfiguration;
import org.drools.common.BaseNode;
import org.drools.common.BetaConstraints;
@@ -8,6 +10,7 @@
import org.drools.common.InternalWorkingMemory;
import org.drools.common.NodeMemory;
import org.drools.common.PropagationContextImpl;
+import org.drools.rule.ContextEntry;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.DataProvider;
import org.drools.spi.PropagationContext;
@@ -54,24 +57,28 @@
public void assertTuple(final ReteTuple leftTuple,
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+ final FromMemory memory = (FromMemory) workingMemory.getNodeMemory( this );
- memory.getTupleMemory().add( leftTuple );
+ memory.betaMemory.getTupleMemory().add( leftTuple );
final LinkedList list = new LinkedList();
- this.betaConstraints.updateFromTuple( workingMemory,
+ this.betaConstraints.updateFromTuple( memory.betaMemory.getContext(),
+ workingMemory,
leftTuple );
for ( final java.util.Iterator it = this.dataProvider.getResults( leftTuple,
workingMemory,
- context ); it.hasNext(); ) {
+ context,
+ memory.providerContext ); it.hasNext(); ) {
final Object object = it.next();
+
if ( this.alphaConstraints != null ) {
// First alpha node filters
boolean isAllowed = true;
for ( int i = 0, length = this.alphaConstraints.length; i < length; i++ ) {
if ( !this.alphaConstraints[i].isAllowed( object,
- workingMemory ) ) {
+ workingMemory,
+ memory.alphaContexts[i] ) ) {
// next iteration
isAllowed = false;
break;
@@ -82,7 +89,8 @@
}
}
- if ( this.betaConstraints.isAllowedCachedLeft( object ) ) {
+ if ( this.betaConstraints.isAllowedCachedLeft( memory.betaMemory.getContext(),
+ object ) ) {
final InternalFactHandle handle = workingMemory.getFactHandleFactory().newFactHandle( object );
list.add( new LinkedListEntry( handle ) );
@@ -94,11 +102,11 @@
}
}
- this.betaConstraints.resetTuple();
+ this.betaConstraints.resetTuple( memory.betaMemory.getContext() );
if ( !list.isEmpty() ) {
- memory.getCreatedHandles().put( leftTuple,
- list );
+ memory.betaMemory.getCreatedHandles().put( leftTuple,
+ list );
}
}
@@ -107,10 +115,10 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
- final ReteTuple tuple = memory.getTupleMemory().remove( leftTuple );
+ final FromMemory memory = (FromMemory) workingMemory.getNodeMemory( this );
+ final ReteTuple tuple = memory.betaMemory.getTupleMemory().remove( leftTuple );
- final LinkedList list = (LinkedList) memory.getCreatedHandles().remove( tuple );
+ final LinkedList list = (LinkedList) memory.betaMemory.getCreatedHandles().remove( tuple );
// if tuple was propagated
if ( list != null ) {
for ( LinkedListEntry entry = (LinkedListEntry) list.getFirst(); entry != null; entry = (LinkedListEntry) entry.getNext() ) {
@@ -152,6 +160,7 @@
if ( !node.isInUse() ) {
removeTupleSink( (TupleSink) node );
}
+
if ( !this.isInUse() ) {
for ( int i = 0, length = workingMemories.length; i < length; i++ ) {
workingMemories[i].clearNodeMemory( this );
@@ -168,11 +177,11 @@
final PropagationContext context,
final InternalWorkingMemory workingMemory) {
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+ final FromMemory memory = (FromMemory) workingMemory.getNodeMemory( this );
- final Iterator tupleIter = memory.getTupleMemory().iterator();
+ final Iterator tupleIter = memory.betaMemory.getTupleMemory().iterator();
for ( ReteTuple tuple = (ReteTuple) tupleIter.next(); tuple != null; tuple = (ReteTuple) tupleIter.next() ) {
- final LinkedList list = (LinkedList) memory.getCreatedHandles().remove( tuple );
+ final LinkedList list = (LinkedList) memory.betaMemory.getCreatedHandles().remove( tuple );
if ( list == null ) {
continue;
}
@@ -187,8 +196,12 @@
}
public Object createMemory(final RuleBaseConfiguration config) {
- return new BetaMemory( new TupleHashTable(),
- null );
+ BetaMemory beta = new BetaMemory( new TupleHashTable(),
+ null,
+ this.betaConstraints.createContext() );
+ return new FromMemory( beta,
+ this.dataProvider.createContext(),
+ this.alphaConstraints );
}
public boolean isTupleMemoryEnabled() {
@@ -235,4 +248,24 @@
this.previousTupleSinkNode = previous;
}
+ public static class FromMemory
+ implements
+ Serializable {
+ private static final long serialVersionUID = -5802345705144095216L;
+
+ public BetaMemory betaMemory;
+ public Object providerContext;
+ public ContextEntry[] alphaContexts;
+
+ public FromMemory(BetaMemory betaMemory,
+ Object providerContext,
+ AlphaNodeFieldConstraint[] constraints) {
+ this.betaMemory = betaMemory;
+ this.providerContext = providerContext;
+ this.alphaContexts = new ContextEntry[constraints.length];
+ for( int i = 0; i < constraints.length; i++ ) {
+ this.alphaContexts[i] = constraints[i].createContextEntry();
+ }
+ }
+ }
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/JoinNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/JoinNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -99,11 +99,14 @@
}
final Iterator it = memory.getFactHandleMemory().iterator( leftTuple );
- this.constraints.updateFromTuple( workingMemory,
+ this.constraints.updateFromTuple( memory.getContext(),
+ workingMemory,
leftTuple );
for ( FactEntry entry = (FactEntry) it.next(); entry != null; entry = (FactEntry) it.next() ) {
final InternalFactHandle handle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
+
+ if ( this.constraints.isAllowedCachedLeft(memory.getContext(), handle.getObject() ) ) {
+
this.sink.propagateAssertTuple( leftTuple,
handle,
context,
@@ -111,7 +114,7 @@
}
}
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.getContext() );
}
/**
@@ -144,17 +147,19 @@
}
final Iterator it = memory.getTupleMemory().iterator( handle );
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.getContext(),
+ workingMemory,
handle );
for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
- if ( this.constraints.isAllowedCachedRight( tuple ) ) {
+ if ( this.constraints.isAllowedCachedRight( memory.getContext(),
+ tuple ) ) {
this.sink.propagateAssertTuple( tuple,
handle,
context,
workingMemory );
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.getContext() );
}
/**
@@ -177,10 +182,12 @@
}
final Iterator it = memory.getTupleMemory().iterator( handle );
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.getContext(),
+ workingMemory,
handle );
for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
- if ( this.constraints.isAllowedCachedRight( tuple ) ) {
+ if ( this.constraints.isAllowedCachedRight( memory.getContext(),
+ tuple ) ) {
this.sink.propagateRetractTuple( tuple,
handle,
context,
@@ -188,7 +195,7 @@
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.getContext() );
}
/**
@@ -213,19 +220,22 @@
}
final Iterator it = memory.getFactHandleMemory().iterator( leftTuple );
- this.constraints.updateFromTuple( workingMemory,
+ this.constraints.updateFromTuple( memory.getContext(),
+ workingMemory,
leftTuple );
for ( FactEntry entry = (FactEntry) it.next(); entry != null; entry = (FactEntry) it.next() ) {
final InternalFactHandle handle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
- this.sink.propagateRetractTuple( leftTuple,
+ if ( this.constraints.isAllowedCachedLeft( memory.getContext(),
+ handle.getObject() ) ) {
+
+ this.sink.propagateRetractTuple( leftTuple,
handle,
context,
workingMemory );
}
}
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.getContext() );
}
/* (non-Javadoc)
@@ -240,11 +250,14 @@
final Iterator tupleIter = memory.getTupleMemory().iterator();
for ( ReteTuple tuple = (ReteTuple) tupleIter.next(); tuple != null; tuple = (ReteTuple) tupleIter.next() ) {
final Iterator objectIter = memory.getFactHandleMemory().iterator( tuple );
- this.constraints.updateFromTuple( workingMemory,
+ this.constraints.updateFromTuple( memory.getContext(),
+ workingMemory,
tuple );
for ( FactEntry entry = (FactEntry) objectIter.next(); entry != null; entry = (FactEntry) objectIter.next() ) {
final InternalFactHandle handle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
+ if ( this.constraints.isAllowedCachedLeft( memory.getContext(),
+ handle.getObject() ) ) {
+
sink.assertTuple( new ReteTuple( tuple,
handle ),
context,
@@ -252,7 +265,7 @@
}
}
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.getContext() );
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/NotNode.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/NotNode.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/NotNode.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -94,18 +94,20 @@
}
final Iterator it = memory.getFactHandleMemory().iterator( leftTuple );
- this.constraints.updateFromTuple( workingMemory,
+ this.constraints.updateFromTuple( memory.getContext(),
+ workingMemory,
leftTuple );
for ( FactEntry entry = (FactEntry) it.next(); entry != null; entry = (FactEntry) it.next() ) {
final InternalFactHandle handle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( handle.getObject() ) ) {
+ if ( this.constraints.isAllowedCachedLeft( memory.getContext(),
+ handle.getObject() ) ) {
leftTuple.setMatch( handle );
break;
}
}
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.getContext() );
if ( leftTuple.getMatch() == null ) {
this.sink.propagateAssertTuple( leftTuple,
@@ -138,10 +140,12 @@
}
final Iterator it = memory.getTupleMemory().iterator( handle );
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.getContext(),
+ workingMemory,
handle );
for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
- if ( this.constraints.isAllowedCachedRight( tuple ) && tuple.getMatch() == null) {
+ if ( this.constraints.isAllowedCachedRight( memory.getContext(),
+ tuple ) && tuple.getMatch() == null) {
tuple.setMatch( handle );
this.sink.propagateRetractTuple( tuple,
context,
@@ -149,7 +153,7 @@
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.getContext() );
}
/**
@@ -174,10 +178,12 @@
}
final Iterator it = memory.getTupleMemory().iterator( handle );
- this.constraints.updateFromFactHandle( workingMemory,
+ this.constraints.updateFromFactHandle( memory.getContext(),
+ workingMemory,
handle );
for ( ReteTuple tuple = (ReteTuple) it.next(); tuple != null; tuple = (ReteTuple) it.next() ) {
- if ( this.constraints.isAllowedCachedRight( tuple ) ) {
+ if ( this.constraints.isAllowedCachedRight( memory.getContext(),
+ tuple ) ) {
if ( tuple.getMatch() == handle ) {
// reset the match
@@ -185,17 +191,19 @@
// find next match, remember it and break.
final Iterator tupleIt = memory.getFactHandleMemory().iterator( tuple );
- this.constraints.updateFromTuple( workingMemory, tuple );
+ this.constraints.updateFromTuple( memory.getContext(),
+ workingMemory, tuple );
for ( FactEntry entry = (FactEntry) tupleIt.next(); entry != null; entry = (FactEntry) tupleIt.next() ) {
final InternalFactHandle rightHandle = entry.getFactHandle();
- if ( this.constraints.isAllowedCachedLeft( rightHandle.getObject() ) ) {
+ if ( this.constraints.isAllowedCachedLeft( memory.getContext(),
+ rightHandle.getObject() ) ) {
tuple.setMatch( rightHandle );
break;
}
}
- this.constraints.resetTuple();
+ this.constraints.resetTuple( memory.getContext() );
// if there is now no new tuple match then propagate assert.
if ( tuple.getMatch() == null ) {
this.sink.propagateAssertTuple( tuple,
@@ -206,7 +214,7 @@
}
}
- this.constraints.resetFactHandle();
+ this.constraints.resetFactHandle( memory.getContext() );
}
/**
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -249,7 +249,6 @@
public void releaseLastId() {
this.nextId--;
}
-
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/builder/BuildContext.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/builder/BuildContext.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/builder/BuildContext.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -211,7 +211,7 @@
/**
* Method used to undo previous id assignment
*/
- public void releaseLastId() {
+ public void releaseId( ) {
this.idGenerator.releaseLastId();
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -117,7 +117,7 @@
if( node != null ) {
// shared node found
// undo previous id assignment
- context.releaseLastId();
+ context.releaseId();
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AbstractCompositeConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AbstractCompositeConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AbstractCompositeConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -150,7 +150,7 @@
/**
* {@inheritDoc}
*/
- public ContextEntry getContextEntry() {
+ public ContextEntry createContextEntry() {
return new MultiFieldConstraintContextEntry( this.betaConstraints );
}
@@ -201,7 +201,7 @@
public MultiFieldConstraintContextEntry(BetaNodeFieldConstraint[] constraints) {
contexts = new ContextEntry[constraints.length];
for ( int i = 0; i < contexts.length; i++ ) {
- contexts[i] = constraints[i].getContextEntry();
+ contexts[i] = constraints[i].createContextEntry();
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -16,11 +16,9 @@
private static final long serialVersionUID = 400L;
protected final Restriction[] restrictions;
- protected final CompositeContextEntry contextEntry;
public AbstractCompositeRestriction(final Restriction[] restriction) {
this.restrictions = restriction;
- this.contextEntry = new CompositeContextEntry( this.restrictions );
}
public Declaration[] getRequiredDeclarations() {
@@ -81,8 +79,8 @@
return true;
}
- public ContextEntry getContextEntry() {
- return this.contextEntry;
+ public ContextEntry createContextEntry() {
+ return new CompositeContextEntry( this.restrictions );
}
public abstract Object clone();
@@ -100,7 +98,7 @@
public CompositeContextEntry(final Restriction[] restrictions) {
contextEntries = new ContextEntry[restrictions.length];
for ( int i = 0; i < restrictions.length; i++ ) {
- contextEntries[i] = restrictions[i].getContextEntry();
+ contextEntries[i] = restrictions[i].createContextEntry();
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AndCompositeRestriction.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AndCompositeRestriction.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AndCompositeRestriction.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -15,11 +15,13 @@
public boolean isAllowed(final Extractor extractor,
final Object object,
- final InternalWorkingMemory workingMemory) {
+ final InternalWorkingMemory workingMemory,
+ final ContextEntry context ) {
for ( int i = 0, ilength = this.restrictions.length; i < ilength; i++ ) {
if ( !this.restrictions[i].isAllowed( extractor,
object,
- workingMemory ) ) {
+ workingMemory,
+ context ) ) {
return false;
}
}
@@ -28,8 +30,9 @@
public boolean isAllowedCachedLeft(final ContextEntry context,
final Object object) {
+ CompositeContextEntry contextEntry = (CompositeContextEntry) context;
for ( int i = 0, ilength = this.restrictions.length; i < ilength; i++ ) {
- if ( !this.restrictions[i].isAllowedCachedLeft( this.contextEntry.contextEntries[i],
+ if ( !this.restrictions[i].isAllowedCachedLeft( contextEntry.contextEntries[i],
object ) ) {
return false;
}
@@ -39,9 +42,10 @@
public boolean isAllowedCachedRight(final ReteTuple tuple,
final ContextEntry context) {
+ CompositeContextEntry contextEntry = (CompositeContextEntry) context;
for ( int i = 0, ilength = this.restrictions.length; i < ilength; i++ ) {
if ( !this.restrictions[i].isAllowedCachedRight( tuple,
- this.contextEntry.contextEntries[i] ) ) {
+ contextEntry.contextEntries[i] ) ) {
return false;
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AndConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AndConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/AndConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -41,11 +41,13 @@
* {@inheritDoc}
*/
public boolean isAllowed(Object object,
- InternalWorkingMemory workingMemory) {
+ InternalWorkingMemory workingMemory,
+ final ContextEntry ctx ) {
if ( this.alphaConstraints.length > 0 ) {
for ( int i = 0; i < this.alphaConstraints.length; i++ ) {
if ( !this.alphaConstraints[i].isAllowed( object,
- workingMemory ) ) {
+ workingMemory,
+ ctx ) ) {
return false;
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/EvalCondition.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/EvalCondition.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/EvalCondition.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -65,13 +65,19 @@
public Declaration[] getRequiredDeclarations() {
return this.requiredDeclarations;
}
+
+ public Object createContext() {
+ return this.expression.createContext();
+ }
public boolean isAllowed(final Tuple tuple,
- final WorkingMemory workingMemory) {
+ final WorkingMemory workingMemory,
+ final Object context ) {
try {
return this.expression.evaluate( tuple,
this.requiredDeclarations,
- workingMemory );
+ workingMemory,
+ context );
} catch ( final Exception e ) {
throw new RuntimeDroolsException( e );
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -78,10 +78,12 @@
}
public boolean isAllowed(final Object object,
- final InternalWorkingMemory workingMemory) {
+ final InternalWorkingMemory workingMemory,
+ final ContextEntry ctx ) {
return this.restriction.isAllowed( this.extractor,
object,
- workingMemory );
+ workingMemory,
+ ctx );
}
public String toString() {
@@ -113,4 +115,9 @@
this.getEvaluator(),
this.getField() );
}
+
+ public ContextEntry createContextEntry() {
+ // no need for context info
+ return null;
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/LiteralRestriction.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/LiteralRestriction.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/LiteralRestriction.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -35,16 +35,16 @@
private final Evaluator evaluator;
+ private final FieldExtractor extractor;
+
private static final Declaration[] requiredDeclarations = new Declaration[0];
- private final LiteralContextEntry contextEntry;
-
public LiteralRestriction(final FieldValue field,
final Evaluator evaluator,
final FieldExtractor fieldExtractor) {
this.field = field;
this.evaluator = evaluator;
- this.contextEntry = new LiteralContextEntry( fieldExtractor );
+ this.extractor = fieldExtractor;
}
public Evaluator getEvaluator() {
@@ -57,7 +57,8 @@
public boolean isAllowed(final Extractor extractor,
final Object object,
- final InternalWorkingMemory workingMemoiry) {
+ final InternalWorkingMemory workingMemoiry,
+ final ContextEntry context ) {
return this.evaluator.evaluate( null,
extractor,
object,
@@ -117,14 +118,14 @@
return this.field.equals( other.field ) && this.evaluator.equals( other.evaluator );
}
- public ContextEntry getContextEntry() {
- return this.contextEntry;
+ public ContextEntry createContextEntry() {
+ return new LiteralContextEntry( this.extractor );
}
public Object clone() {
return new LiteralRestriction( this.field,
this.evaluator,
- this.contextEntry.extractor );
+ this.extractor );
}
private static class LiteralContextEntry
@@ -165,13 +166,13 @@
final ReteTuple tuple) {
// nothing to do
}
-
- public void resetTuple() {
+
+ public void resetTuple() {
}
-
+
public void resetFactHandle() {
this.object = null;
- }
+ }
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/MultiRestrictionFieldConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/MultiRestrictionFieldConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/MultiRestrictionFieldConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -66,14 +66,16 @@
}
public boolean isAllowed(final Object object,
- final InternalWorkingMemory workingMemory) {
+ final InternalWorkingMemory workingMemory,
+ final ContextEntry context ) {
return this.restrictions.isAllowed( this.extractor,
object,
- workingMemory );
+ workingMemory,
+ context );
}
- public ContextEntry getContextEntry() {
- return this.restrictions.getContextEntry();
+ public ContextEntry createContextEntry() {
+ return this.restrictions.createContextEntry();
}
public boolean isAllowedCachedLeft(final ContextEntry context,
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/OrCompositeRestriction.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/OrCompositeRestriction.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/OrCompositeRestriction.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -15,11 +15,13 @@
public boolean isAllowed(final Extractor extractor,
final Object object,
- final InternalWorkingMemory workingMemory) {
+ final InternalWorkingMemory workingMemory,
+ final ContextEntry context ) {
for ( int i = 0, ilength = this.restrictions.length; i < ilength; i++ ) {
if ( this.restrictions[i].isAllowed( extractor,
object,
- workingMemory ) ) {
+ workingMemory,
+ context ) ) {
return true;
}
}
@@ -28,8 +30,9 @@
public boolean isAllowedCachedLeft(final ContextEntry context,
final Object object) {
+ CompositeContextEntry contextEntry = (CompositeContextEntry) context;
for ( int i = 0, ilength = this.restrictions.length; i < ilength; i++ ) {
- if ( this.restrictions[i].isAllowedCachedLeft( this.contextEntry.contextEntries[i],
+ if ( this.restrictions[i].isAllowedCachedLeft( contextEntry.contextEntries[i],
object ) ) {
return true;
}
@@ -39,9 +42,10 @@
public boolean isAllowedCachedRight(final ReteTuple tuple,
final ContextEntry context) {
+ CompositeContextEntry contextEntry = (CompositeContextEntry) context;
for ( int i = 0, ilength = this.restrictions.length; i < ilength; i++ ) {
if ( this.restrictions[i].isAllowedCachedRight( tuple,
- this.contextEntry.contextEntries[i] ) ) {
+ contextEntry.contextEntries[i] ) ) {
return true;
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/OrConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/OrConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/OrConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -43,11 +43,13 @@
* {@inheritDoc}
*/
public boolean isAllowed(Object object,
- InternalWorkingMemory workingMemory) {
+ InternalWorkingMemory workingMemory,
+ final ContextEntry ctx ) {
if ( this.alphaConstraints.length > 0 ) {
for ( int i = 0; i < this.alphaConstraints.length; i++ ) {
if ( this.alphaConstraints[i].isAllowed( object,
- workingMemory ) ) {
+ workingMemory,
+ ctx ) ) {
return true;
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -24,6 +24,7 @@
import org.drools.reteoo.ReteTuple;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.BetaNodeFieldConstraint;
+import org.drools.spi.Extractor;
import org.drools.spi.PredicateExpression;
public class PredicateConstraint
@@ -200,24 +201,35 @@
return this.expression.equals( other.expression );
}
- public ContextEntry getContextEntry() {
- return new PredicateContextEntry();
+ public ContextEntry createContextEntry() {
+ PredicateContextEntry ctx = new PredicateContextEntry();
+ ctx.dialectContext = this.expression.createContext();
+ return ctx;
}
public boolean isAllowed(final Object object,
- final InternalWorkingMemory workingMemory) {
+ final InternalWorkingMemory workingMemory,
+ final ContextEntry ctx ) {
try {
return this.expression.evaluate( object,
null,
this.previousDeclarations,
this.localDeclarations,
- workingMemory );
+ workingMemory,
+ ((PredicateContextEntry) ctx).dialectContext );
} catch ( final Exception e ) {
throw new RuntimeDroolsException( "Exception executing predicate " + this.expression,
e );
}
}
+ public boolean isAllowed(Extractor extractor,
+ InternalFactHandle handle,
+ InternalWorkingMemory workingMemory,
+ ContextEntry context ) {
+ throw new UnsupportedOperationException("Method not supported. Please contact development team.");
+ }
+
public boolean isAllowedCachedLeft(final ContextEntry context,
final Object object) {
try {
@@ -226,7 +238,8 @@
ctx.leftTuple,
this.previousDeclarations,
this.localDeclarations,
- ctx.workingMemory );
+ ctx.workingMemory,
+ ctx.dialectContext );
} catch ( final Exception e ) {
throw new RuntimeDroolsException( "Exception executing predicate " + this.expression,
e );
@@ -241,7 +254,8 @@
tuple,
this.previousDeclarations,
this.localDeclarations,
- ctx.workingMemory );
+ ctx.workingMemory,
+ ctx.dialectContext );
} catch ( final Exception e ) {
throw new RuntimeDroolsException( "Exception executing predicate " + this.expression,
e );
@@ -274,6 +288,8 @@
public ReteTuple leftTuple;
public Object rightObject;
public InternalWorkingMemory workingMemory;
+
+ public Object dialectContext;
private ContextEntry entry;
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -93,17 +93,19 @@
return this.fieldExtractor.equals( other.fieldExtractor ) && this.restriction.equals( other.restriction );
}
- public ContextEntry getContextEntry() {
- return this.restriction.getContextEntry();
+ public ContextEntry createContextEntry() {
+ return this.restriction.createContextEntry();
}
public boolean isAllowed(final Object object,
- final InternalWorkingMemory workingMemory) {
+ final InternalWorkingMemory workingMemory,
+ final ContextEntry context ) {
try {
return this.restriction.isAllowed( this.fieldExtractor,
object,
null,
- workingMemory );
+ workingMemory,
+ context );
} catch ( final Exception e ) {
throw new RuntimeDroolsException( "Exception executing ReturnValue constraint " + this.restriction + " : " + e.getMessage(),
e );
@@ -117,7 +119,8 @@
return this.restriction.isAllowed( this.fieldExtractor,
object,
ctx.getTuple(),
- ctx.getWorkingMemory() );
+ ctx.getWorkingMemory(),
+ ctx );
} catch ( final Exception e ) {
throw new RuntimeDroolsException( "Exception executing ReturnValue constraint " + this.restriction + " : " + e.getMessage(),
e );
@@ -131,7 +134,8 @@
return this.restriction.isAllowed( this.fieldExtractor,
ctx.getObject(),
tuple,
- ctx.getWorkingMemory() );
+ ctx.getWorkingMemory(),
+ ctx );
} catch ( final Exception e ) {
throw new RuntimeDroolsException( "Exception executing ReturnValue constraint " + this.restriction + " : " + e.getMessage(),
e );
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -34,26 +34,26 @@
implements
Restriction {
- private static final long serialVersionUID = 400L;
+ private static final long serialVersionUID = 400L;
- private ReturnValueExpression expression;
+ private ReturnValueExpression expression;
- private final Declaration[] requiredDeclarations;
-
- private final String[] requiredGlobals;
+ private final Declaration[] requiredDeclarations;
- private final Declaration[] previousDeclarations;
+ private final String[] requiredGlobals;
- private final Declaration[] localDeclarations;
+ private final Declaration[] previousDeclarations;
- private final Evaluator evaluator;
+ private final Declaration[] localDeclarations;
- private static final Declaration[] noRequiredDeclarations = new Declaration[]{};
+ private final Evaluator evaluator;
- private static final String[] noRequiredGlobals = new String[]{};
+ private final FieldExtractor extractor;
- private final ReturnValueContextEntry contextEntry;
+ private static final Declaration[] noRequiredDeclarations = new Declaration[]{};
+ private static final String[] noRequiredGlobals = new String[]{};
+
public ReturnValueRestriction(final FieldExtractor fieldExtractor,
final Declaration[] previousDeclarations,
final Declaration[] localDeclarations,
@@ -74,6 +74,7 @@
final String[] requiredGlobals,
final Evaluator evaluator) {
this.expression = returnValueExpression;
+ this.extractor = fieldExtractor;
if ( previousDeclarations != null ) {
this.previousDeclarations = previousDeclarations;
@@ -86,7 +87,7 @@
} else {
this.localDeclarations = ReturnValueRestriction.noRequiredDeclarations;
}
-
+
if ( requiredGlobals != null ) {
this.requiredGlobals = requiredGlobals;
} else {
@@ -94,9 +95,6 @@
}
this.evaluator = evaluator;
- this.contextEntry = new ReturnValueContextEntry( fieldExtractor,
- this.previousDeclarations,
- this.localDeclarations );
this.requiredDeclarations = new Declaration[this.previousDeclarations.length + this.localDeclarations.length];
System.arraycopy( this.previousDeclarations,
@@ -122,25 +120,25 @@
public Declaration[] getLocalDeclarations() {
return this.localDeclarations;
}
-
+
public String[] getRequiredGlobals() {
return this.requiredGlobals;
}
-
+
public void replaceDeclaration(Declaration oldDecl,
Declaration newDecl) {
- for( int i = 0; i < this.requiredDeclarations.length; i++) {
- if( this.requiredDeclarations[i].equals( oldDecl ) ) {
+ for ( int i = 0; i < this.requiredDeclarations.length; i++ ) {
+ if ( this.requiredDeclarations[i].equals( oldDecl ) ) {
this.requiredDeclarations[i] = newDecl;
}
}
- for( int i = 0; i < this.previousDeclarations.length; i++) {
- if( this.previousDeclarations[i].equals( oldDecl ) ) {
+ for ( int i = 0; i < this.previousDeclarations.length; i++ ) {
+ if ( this.previousDeclarations[i].equals( oldDecl ) ) {
this.previousDeclarations[i] = newDecl;
}
}
- for( int i = 0; i < this.localDeclarations.length; i++) {
- if( this.localDeclarations[i].equals( oldDecl ) ) {
+ for ( int i = 0; i < this.localDeclarations.length; i++ ) {
+ if ( this.localDeclarations[i].equals( oldDecl ) ) {
this.localDeclarations[i] = newDecl;
}
}
@@ -161,7 +159,8 @@
public boolean isAllowed(final Extractor extractor,
final Object object,
final Tuple tuple,
- final WorkingMemory workingMemory) {
+ final WorkingMemory workingMemory,
+ final ContextEntry context) {
try {
return this.evaluator.evaluate( null,
extractor,
@@ -169,7 +168,9 @@
tuple,
this.previousDeclarations,
this.localDeclarations,
- workingMemory ) );
+ workingMemory,
+ ((ReturnValueContextEntry)context).dialectContext) );
+
} catch ( final Exception e ) {
throw new RuntimeDroolsException( e );
}
@@ -177,7 +178,8 @@
public boolean isAllowed(final Extractor extractor,
final Object object,
- final InternalWorkingMemory workingMemoiry) {
+ final InternalWorkingMemory workingMemoiry,
+ final ContextEntry context) {
throw new UnsupportedOperationException( "does not support method call isAllowed(Object object, InternalWorkingMemory workingMemoiry)" );
}
@@ -255,22 +257,26 @@
return result;
}
- public ContextEntry getContextEntry() {
- return this.contextEntry;
+ public ContextEntry createContextEntry() {
+ ReturnValueContextEntry ctx = new ReturnValueContextEntry( this.extractor,
+ this.previousDeclarations,
+ this.localDeclarations );
+ ctx.dialectContext = this.expression.createContext();
+ return ctx;
}
-
+
public Object clone() {
- Declaration[] previous = new Declaration[ this.previousDeclarations.length ];
- for( int i = 0; i < previous.length; i++ ) {
+ Declaration[] previous = new Declaration[this.previousDeclarations.length];
+ for ( int i = 0; i < previous.length; i++ ) {
previous[i] = (Declaration) this.previousDeclarations[i].clone();
}
-
- Declaration[] local = new Declaration[ this.localDeclarations.length ];
- for( int i = 0; i < local.length; i++ ) {
+
+ Declaration[] local = new Declaration[this.localDeclarations.length];
+ for ( int i = 0; i < local.length; i++ ) {
local[i] = (Declaration) this.localDeclarations[i].clone();
}
-
- return new ReturnValueRestriction( this.contextEntry.fieldExtractor,
+
+ return new ReturnValueRestriction( this.extractor,
previous,
local,
this.requiredGlobals,
@@ -292,6 +298,8 @@
private ContextEntry entry;
+ public Object dialectContext;
+
public ReturnValueContextEntry(final FieldExtractor fieldExtractor,
final Declaration[] previousDeclarations,
final Declaration[] localDeclarations) {
@@ -358,14 +366,14 @@
public InternalWorkingMemory getWorkingMemory() {
return this.workingMemory;
}
-
+
public void resetTuple() {
this.leftTuple = null;
}
-
+
public void resetFactHandle() {
this.object = null;
- }
+ }
}
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/VariableConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/VariableConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/VariableConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -67,10 +67,12 @@
}
public boolean isAllowed(final Object object,
- final InternalWorkingMemory workingMemory) {
+ final InternalWorkingMemory workingMemory,
+ final ContextEntry context) {
return this.restriction.isAllowed( this.fieldExtractor,
object,
- workingMemory );
+ workingMemory,
+ context );
}
public boolean isAllowedCachedLeft(final ContextEntry context,
@@ -89,8 +91,8 @@
return "[VariableConstraint fieldExtractor=" + this.fieldExtractor + " declaration=" + getRequiredDeclarations() + "]";
}
- public ContextEntry getContextEntry() {
- return this.restriction.getContextEntry();
+ public ContextEntry createContextEntry() {
+ return this.restriction.createContextEntry();
}
public int hashCode() {
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/VariableRestriction.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/VariableRestriction.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/VariableRestriction.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -31,15 +31,15 @@
implements
Restriction {
- private static final long serialVersionUID = 400L;
+ private static final long serialVersionUID = 400L;
- private Declaration declaration;
+ private Declaration declaration;
- private final Declaration[] requiredDeclarations;
+ private final Declaration[] requiredDeclarations;
- private final Evaluator evaluator;
+ private final Evaluator evaluator;
- private final VariableContextEntry contextEntry;
+ private final FieldExtractor extractor;
public VariableRestriction(final FieldExtractor fieldExtractor,
final Declaration declaration,
@@ -47,8 +47,7 @@
this.declaration = declaration;
this.requiredDeclarations = new Declaration[]{declaration};
this.evaluator = evaluator;
- this.contextEntry = this.createContextEntry( this.evaluator,
- fieldExtractor );
+ this.extractor = fieldExtractor;
}
public Declaration[] getRequiredDeclarations() {
@@ -60,7 +59,6 @@
if ( this.declaration.equals( oldDecl ) ) {
this.declaration = newDecl;
this.requiredDeclarations[0] = newDecl;
- this.contextEntry.declaration = newDecl;
}
}
@@ -70,11 +68,12 @@
public boolean isAllowed(final Extractor extractor,
final Object object,
- final InternalWorkingMemory workingMemory) {
+ final InternalWorkingMemory workingMemory,
+ final ContextEntry context ) {
return this.evaluator.evaluate( workingMemory,
- this.contextEntry.extractor,
+ this.extractor,
object,
- this.contextEntry.declaration.getExtractor(),
+ this.declaration.getExtractor(),
object );
}
@@ -148,12 +147,13 @@
}
}
- public ContextEntry getContextEntry() {
- return this.contextEntry;
+ public ContextEntry createContextEntry() {
+ return this.createContextEntry( this.evaluator,
+ this.extractor );
}
public Object clone() {
- return new VariableRestriction( this.contextEntry.extractor,
+ return new VariableRestriction( this.extractor,
(Declaration) this.declaration.clone(),
this.evaluator );
}
@@ -207,14 +207,14 @@
public boolean isRightNull() {
return this.rightNull;
}
-
+
public void resetTuple() {
this.reteTuple = null;
}
-
+
public void resetFactHandle() {
this.object = null;
- }
+ }
}
public static class ObjectVariableContextEntry extends VariableContextEntry {
@@ -248,16 +248,16 @@
this.right = this.extractor.getValue( workingMemory,
handle.getObject() );
}
-
+
public void resetTuple() {
this.left = null;
this.reteTuple = null;
}
-
+
public void resetFactHandle() {
this.right = null;
this.object = null;
- }
+ }
}
public static class LongVariableContextEntry extends VariableContextEntry {
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/AlphaNodeFieldConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/AlphaNodeFieldConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/AlphaNodeFieldConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -17,11 +17,15 @@
*/
import org.drools.common.InternalWorkingMemory;
+import org.drools.rule.ContextEntry;
public interface AlphaNodeFieldConstraint
extends
Constraint {
+
+ public ContextEntry createContextEntry();
public boolean isAllowed(Object object,
- InternalWorkingMemory workingMemory);
+ InternalWorkingMemory workingMemory,
+ ContextEntry context);
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/BetaNodeFieldConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/BetaNodeFieldConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/BetaNodeFieldConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -29,6 +29,6 @@
public boolean isAllowedCachedRight(ReteTuple tuple,
ContextEntry context);
- public ContextEntry getContextEntry();
+ public ContextEntry createContextEntry();
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/DataProvider.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/DataProvider.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/DataProvider.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -9,9 +9,12 @@
public interface DataProvider extends Serializable {
public Declaration[] getRequiredDeclarations();
+
+ public Object createContext();
public Iterator getResults(Tuple tuple,
WorkingMemory wm,
- PropagationContext ctx);
+ PropagationContext ctx,
+ Object providerContext);
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/EvalExpression.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/EvalExpression.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/EvalExpression.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -22,7 +22,11 @@
public interface EvalExpression
extends
Invoker {
+
+ public Object createContext();
+
public boolean evaluate(Tuple tuple,
Declaration[] requiredDeclarations,
- WorkingMemory workingMemory) throws Exception;
+ WorkingMemory workingMemory,
+ Object context ) throws Exception;
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/PredicateExpression.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/PredicateExpression.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/PredicateExpression.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -22,9 +22,13 @@
public interface PredicateExpression
extends
Invoker {
+
+ public Object createContext();
+
public boolean evaluate(Object object,
Tuple tuple,
Declaration[] previousDeclarations,
Declaration[] localDeclarations,
- WorkingMemory workingMemory) throws Exception;
+ WorkingMemory workingMemory,
+ Object context ) throws Exception;
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/Restriction.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/Restriction.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/Restriction.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -15,7 +15,8 @@
public boolean isAllowed(Extractor extractor,
Object object,
- InternalWorkingMemory workingMemory);
+ InternalWorkingMemory workingMemory,
+ ContextEntry context );
public boolean isAllowedCachedLeft(ContextEntry context,
Object object);
@@ -23,7 +24,7 @@
public boolean isAllowedCachedRight(ReteTuple tuple,
ContextEntry context);
- public ContextEntry getContextEntry();
+ public ContextEntry createContextEntry();
/**
* A restriction may be required to replace an old
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/ReturnValueExpression.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/ReturnValueExpression.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/spi/ReturnValueExpression.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -22,9 +22,14 @@
public interface ReturnValueExpression
extends
Invoker {
+
+ public Object createContext();
+
public FieldValue evaluate(Object object,
Tuple tuple,
Declaration[] previousDeclarations,
Declaration[] localDeclarations,
- WorkingMemory workingMemory) throws Exception;
+ WorkingMemory workingMemory,
+ Object context ) throws Exception;
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/AlphaNodeTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/AlphaNodeTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/AlphaNodeTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -30,6 +30,7 @@
import org.drools.base.evaluators.Operator;
import org.drools.common.DefaultFactHandle;
import org.drools.common.PropagationContextImpl;
+import org.drools.reteoo.AlphaNode.AlphaMemory;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.LiteralConstraint;
import org.drools.rule.Rule;
@@ -41,7 +42,7 @@
public class AlphaNodeTest extends DroolsTestCase {
- ClassFieldExtractorCache cache = ClassFieldExtractorCache.getInstance();
+ ClassFieldExtractorCache cache = ClassFieldExtractorCache.getInstance();
public void testMemory() {
RuleBaseConfiguration config = new RuleBaseConfiguration();
@@ -51,12 +52,24 @@
((ReteooRuleBase) ruleBase).getReteooBuilder().getIdGenerator() );
ReteooWorkingMemory workingMemory = (ReteooWorkingMemory) ruleBase.newStatefulSession();
+ final ClassFieldExtractor extractor = cache.getExtractor( Cheese.class,
+ "type",
+ getClass().getClassLoader() );
+
+ final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
+
+ final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
+ final LiteralConstraint constraint = new LiteralConstraint( extractor,
+ evaluator,
+ field );
+
final AlphaNode alphaNode = new AlphaNode( buildContext.getNextId(),
+ constraint,
null,
- null,
buildContext );
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( alphaNode );
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( alphaNode );
assertNotNull( memory );
}
@@ -84,6 +97,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
@@ -107,10 +121,10 @@
sink.getAsserted() );
// check alpha memory is empty
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( alphaNode );
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( alphaNode );
assertEquals( 0,
- memory.size() );
+ memory.facts.size() );
// object should assert as it passes text
alphaNode.assertObject( f0,
@@ -120,12 +134,12 @@
assertEquals( 1,
sink.getAsserted().size() );
assertEquals( 1,
- memory.size() );
+ memory.facts.size() );
Object[] list = (Object[]) sink.getAsserted().get( 0 );
assertSame( cheddar,
workingMemory.getObject( (DefaultFactHandle) list[0] ) );
assertTrue( "Should contain 'cheddar handle'",
- memory.contains( f0 ) );
+ memory.facts.contains( f0 ) );
final Cheese stilton = new Cheese( "stilton",
6 );
@@ -140,12 +154,12 @@
assertLength( 1,
sink.getAsserted() );
assertEquals( 1,
- memory.size() );
+ memory.facts.size() );
list = (Object[]) sink.getAsserted().get( 0 );
assertSame( cheddar,
workingMemory.getObject( (DefaultFactHandle) list[0] ) );
assertTrue( "Should contain 'cheddar handle'",
- memory.contains( f0 ) );
+ memory.facts.contains( f0 ) );
}
public void testIsMemoryAllowedOverride() throws Exception {
@@ -171,6 +185,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
@@ -194,10 +209,9 @@
sink.getAsserted() );
// check alpha memory is empty
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( alphaNode );
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( alphaNode );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
// object should assert as it passes text
alphaNode.assertObject( f0,
@@ -207,8 +221,7 @@
assertEquals( 1,
sink.getAsserted().size() );
// memory should be one, as even though isAlphaMemory is on for the configuration, the build never allows memory
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
}
public void testLiteralConstraintAssertObjectWithoutMemory() throws Exception {
@@ -234,6 +247,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
@@ -256,10 +270,9 @@
sink.getAsserted() );
// check alpha memory is empty
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( alphaNode );
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( alphaNode );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
// object should assert as it passes text
alphaNode.assertObject( f0,
@@ -268,13 +281,10 @@
assertEquals( 1,
sink.getAsserted().size() );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
Object[] list = (Object[]) sink.getAsserted().get( 0 );
assertSame( cheddar,
workingMemory.getObject( (DefaultFactHandle) list[0] ) );
- assertFalse( "Should not contain 'cheddar handle'",
- memory.contains( f0 ) );
final Cheese stilton = new Cheese( "stilton",
6 );
@@ -288,13 +298,10 @@
assertLength( 1,
sink.getAsserted() );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
list = (Object[]) sink.getAsserted().get( 0 );
assertSame( cheddar,
workingMemory.getObject( (DefaultFactHandle) list[0] ) );
- assertFalse( "Should not contain 'cheddar handle'",
- memory.contains( f0 ) );
}
public void testLiteralConstraintAssertSequentialMode() throws Exception {
@@ -321,6 +328,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
@@ -343,10 +351,9 @@
sink.getAsserted() );
// check alpha memory is empty
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( alphaNode );
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( alphaNode );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
// object should assert as it passes text
alphaNode.assertObject( f0,
@@ -355,8 +362,7 @@
assertEquals( 1,
sink.getAsserted().size() );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
Object[] list = (Object[]) sink.getAsserted().get( 0 );
assertSame( cheddar,
workingMemory.getObject( (DefaultFactHandle) list[0] ) );
@@ -373,8 +379,7 @@
assertLength( 1,
sink.getAsserted() );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
list = (Object[]) sink.getAsserted().get( 0 );
assertSame( cheddar,
workingMemory.getObject( (DefaultFactHandle) list[0] ) );
@@ -408,6 +413,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
@@ -476,6 +482,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
@@ -495,9 +502,9 @@
cheddar );
// check alpha memory is empty
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( alphaNode );
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( alphaNode );
assertEquals( 0,
- memory.size() );
+ memory.facts.size() );
// object should assert as it passes text
alphaNode.assertObject( f0,
@@ -505,7 +512,7 @@
workingMemory );
assertEquals( 1,
- memory.size() );
+ memory.facts.size() );
final DefaultFactHandle f1 = new DefaultFactHandle( 1,
"cheese" );
@@ -518,9 +525,9 @@
assertLength( 0,
sink.getRetracted() );
assertEquals( 1,
- memory.size() );
+ memory.facts.size() );
assertTrue( "Should contain 'cheddar handle'",
- memory.contains( f0 ) );
+ memory.facts.contains( f0 ) );
// object should retract as it does exist
alphaNode.retractObject( f0,
@@ -530,7 +537,7 @@
assertLength( 1,
sink.getRetracted() );
assertEquals( 0,
- memory.size() );
+ memory.facts.size() );
final Object[] list = (Object[]) sink.getRetracted().get( 0 );
assertSame( f0,
list[0] );
@@ -560,6 +567,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
@@ -578,17 +586,15 @@
cheddar );
// check alpha memory is empty
- final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( alphaNode );
- assertEquals( 0,
- memory.size() );
+ final AlphaMemory memory = (AlphaMemory) workingMemory.getNodeMemory( alphaNode );
+ assertNull( memory.facts );
// object should assert as it passes text
alphaNode.assertObject( f0,
context,
workingMemory );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
final DefaultFactHandle f1 = new DefaultFactHandle( 1,
new Cheese( "brie",
@@ -602,10 +608,7 @@
// without memory, it will always propagate a retract
assertLength( 0,
sink.getRetracted() );
- assertEquals( 0,
- memory.size() );
- assertFalse( "Should not contain 'cheddar handle'",
- memory.contains( f0 ) );
+ assertNull( memory.facts );
// object should retract as it does exist
alphaNode.retractObject( f0,
@@ -614,8 +617,7 @@
assertLength( 1,
sink.getRetracted() );
- assertEquals( 0,
- memory.size() );
+ assertNull( memory.facts );
final Object[] list = (Object[]) sink.getRetracted().get( 0 );
assertSame( f0,
list[0] );
@@ -648,6 +650,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
@@ -732,6 +735,7 @@
final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
final Evaluator evaluator = ValueType.OBJECT_TYPE.getEvaluator( Operator.EQUAL );
+
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/CollectNodeTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/CollectNodeTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/CollectNodeTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -28,6 +28,7 @@
import org.drools.common.DefaultFactHandle;
import org.drools.common.EmptyBetaConstraints;
import org.drools.common.PropagationContextImpl;
+import org.drools.reteoo.CollectNode.CollectMemory;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Collect;
import org.drools.rule.Pattern;
@@ -51,7 +52,7 @@
MockTupleSource tupleSource;
MockTupleSink sink;
BetaNode node;
- BetaMemory memory;
+ CollectMemory memory;
MockConstraint constraint = new MockConstraint();
Collect collect;
@@ -101,13 +102,13 @@
this.node.addTupleSink( this.sink );
- this.memory = (BetaMemory) this.workingMemory.getNodeMemory( this.node );
+ this.memory = (CollectMemory) this.workingMemory.getNodeMemory( this.node );
// check memories are empty
assertEquals( 0,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
assertEquals( 0,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
}
/* (non-Javadoc)
@@ -158,9 +159,9 @@
this.workingMemory );
// check memories
assertEquals( 1,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
assertEquals( 0,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
Assert.assertTrue( "An empty collection should be propagated",
((Collection) ((DefaultFactHandle) ((Tuple) ((Object[]) this.sink.getAsserted().get( 0 ))[0]).get( 1 )).getObject()).isEmpty() );
@@ -172,12 +173,12 @@
this.contextAssert,
this.workingMemory );
assertEquals( 2,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
Assert.assertTrue( "An empty collection should be propagated",
((Collection) ((DefaultFactHandle) ((Tuple) ((Object[]) this.sink.getAsserted().get( 1 ))[0]).get( 1 )).getObject()).isEmpty() );
- assertTrue( this.memory.getTupleMemory().contains( tuple0 ) );
- assertTrue( this.memory.getTupleMemory().contains( tuple1 ) );
+ assertTrue( this.memory.betaMemory.getTupleMemory().contains( tuple0 ) );
+ assertTrue( this.memory.betaMemory.getTupleMemory().contains( tuple1 ) );
Assert.assertEquals( "Two tuples should have been propagated",
2,
@@ -203,9 +204,9 @@
this.workingMemory );
// check memories
assertEquals( 1,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
assertEquals( 2,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
Assert.assertEquals( "Wrong number of elements in matching objects list ",
2,
((Collection) ((DefaultFactHandle) ((Tuple) ((Object[]) this.sink.getAsserted().get( 0 ))[0]).get( 1 )).getObject()).size() );
@@ -216,13 +217,13 @@
this.contextAssert,
this.workingMemory );
assertEquals( 2,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
Assert.assertEquals( "Wrong number of elements in matching objects list ",
2,
((Collection) ((DefaultFactHandle) ((Tuple) ((Object[]) this.sink.getAsserted().get( 1 ))[0]).get( 1 )).getObject()).size() );
- assertTrue( this.memory.getTupleMemory().contains( tuple0 ) );
- assertTrue( this.memory.getTupleMemory().contains( tuple1 ) );
+ assertTrue( this.memory.betaMemory.getTupleMemory().contains( tuple0 ) );
+ assertTrue( this.memory.betaMemory.getTupleMemory().contains( tuple1 ) );
Assert.assertEquals( "Two tuples should have been propagated",
2,
@@ -240,9 +241,9 @@
this.workingMemory );
// check memories
assertEquals( 1,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
assertEquals( 0,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
Assert.assertTrue( "An empty collection should be propagated",
((Collection) ((DefaultFactHandle) ((Tuple) ((Object[]) this.sink.getAsserted().get( 0 ))[0]).get( 1 )).getObject()).isEmpty() );
@@ -250,7 +251,7 @@
this.contextRetract,
this.workingMemory );
assertEquals( 0,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
assertEquals( 1,
this.sink.getRetracted().size() );
assertEquals( 1,
@@ -270,7 +271,7 @@
// check memory
assertEquals( 1,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
assertEquals( 1,
this.sink.getAsserted().size() );
Assert.assertTrue( "An empty collection should be propagated",
@@ -280,7 +281,7 @@
this.contextAssert,
this.workingMemory );
assertEquals( 1,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
assertEquals( 2,
this.sink.getAsserted().size() );
Assert.assertEquals( "Wrong number of elements in matching objects list ",
@@ -292,7 +293,7 @@
this.workingMemory );
assertEquals( 2,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
assertEquals( 3,
this.sink.getAsserted().size() );
Assert.assertEquals( "Wrong number of elements in matching objects list ",
@@ -314,7 +315,7 @@
this.contextAssert,
this.workingMemory );
assertEquals( 2,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
// assert tuple, should add one to left memory
this.node.assertTuple( tuple0,
@@ -323,7 +324,7 @@
// check memory
assertEquals( 1,
- this.memory.getTupleMemory().size() );
+ this.memory.betaMemory.getTupleMemory().size() );
assertEquals( 0,
this.sink.getRetracted().size() );
assertEquals( 1,
@@ -336,7 +337,7 @@
this.contextRetract,
this.workingMemory );
assertEquals( 1,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
assertEquals( 1,
this.sink.getRetracted().size() );
assertEquals( 2,
@@ -349,7 +350,7 @@
this.contextRetract,
this.workingMemory );
assertEquals( 0,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
assertEquals( 2,
this.sink.getRetracted().size() );
assertEquals( 3,
@@ -380,7 +381,7 @@
false,
buildContext );
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( collectNode );
+ final CollectMemory memory = (CollectMemory) workingMemory.getNodeMemory( collectNode );
assertNotNull( memory );
}
@@ -392,7 +393,7 @@
this.workingMemory = new ReteooWorkingMemory( 1,
(ReteooRuleBase) RuleBaseFactory.newRuleBase( conf ) );
- this.memory = (BetaMemory) this.workingMemory.getNodeMemory( this.node );
+ this.memory = (CollectMemory) this.workingMemory.getNodeMemory( this.node );
this.node.setTupleMemoryEnabled( false );
final DefaultFactHandle f0 = (DefaultFactHandle) this.workingMemory.getFactHandleFactory().newFactHandle( "cheese" );
@@ -412,9 +413,9 @@
this.contextAssert,
this.workingMemory );
// check memories
- assertNull( this.memory.getTupleMemory() );
+ assertNull( this.memory.betaMemory.getTupleMemory() );
assertEquals( 2,
- this.memory.getFactHandleMemory().size() );
+ this.memory.betaMemory.getFactHandleMemory().size() );
Assert.assertEquals( "Wrong number of elements in matching objects list ",
2,
((Collection) ((DefaultFactHandle) ((Tuple) ((Object[]) this.sink.getAsserted().get( 0 ))[0]).get( 1 )).getObject()).size() );
@@ -424,7 +425,7 @@
this.node.assertTuple( tuple1,
this.contextAssert,
this.workingMemory );
- assertNull( this.memory.getTupleMemory() );
+ assertNull( this.memory.betaMemory.getTupleMemory() );
Assert.assertEquals( "Wrong number of elements in matching objects list ",
2,
((Collection) ((DefaultFactHandle) ((Tuple) ((Object[]) this.sink.getAsserted().get( 1 ))[0]).get( 1 )).getObject()).size() );
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -21,6 +21,7 @@
import org.drools.RuleBaseFactory;
import org.drools.common.DefaultFactHandle;
import org.drools.common.PropagationContextImpl;
+import org.drools.reteoo.EvalConditionNode.EvalMemory;
import org.drools.reteoo.builder.BuildContext;
import org.drools.spi.PropagationContext;
import org.drools.util.TupleHashTable;
@@ -79,9 +80,9 @@
new MockEvalCondition( true ),
buildContext );
- final TupleHashTable memory = (TupleHashTable) workingMemory.getNodeMemory( node );
+ final EvalMemory memory = (EvalMemory) workingMemory.getNodeMemory( node );
- assertNotNull( memory );
+ assertNotNull( memory.tupleMemory );
}
/**
@@ -123,13 +124,13 @@
this.workingMemory );
// Check memory was populated
- final TupleHashTable memory = (TupleHashTable) this.workingMemory.getNodeMemory( node );
+ final EvalMemory memory = (EvalMemory) this.workingMemory.getNodeMemory( node );
assertEquals( 2,
- memory.size() );
+ memory.tupleMemory.size() );
- assertTrue( memory.contains( tuple0 ) );
- assertTrue( memory.contains( tuple1 ) );
+ assertTrue( memory.tupleMemory.contains( tuple0 ) );
+ assertTrue( memory.tupleMemory.contains( tuple1 ) );
// make sure assertions were propagated
assertEquals( 2,
@@ -170,12 +171,12 @@
this.workingMemory );
// Check memory was populated
- final TupleHashTable memory = (TupleHashTable) this.workingMemory.getNodeMemory( node );
+ final EvalMemory memory = (EvalMemory) this.workingMemory.getNodeMemory( node );
assertEquals( 2,
- memory.size() );
- assertTrue( memory.contains( tuple0 ) );
- assertTrue( memory.contains( tuple1 ) );
+ memory.tupleMemory.size() );
+ assertTrue( memory.tupleMemory.contains( tuple0 ) );
+ assertTrue( memory.tupleMemory.contains( tuple1 ) );
// make sure assertions were propagated
assertEquals( 2,
@@ -188,9 +189,9 @@
// Now test that the fact is retracted correctly
assertEquals( 1,
- memory.size() );
+ memory.tupleMemory.size() );
- assertTrue( memory.contains( tuple1 ) );
+ assertTrue( memory.tupleMemory.contains( tuple1 ) );
// make sure retractions were propagated
assertEquals( 1,
@@ -203,7 +204,7 @@
// Now test that the fact is retracted correctly
assertEquals( 0,
- memory.size() );
+ memory.tupleMemory.size() );
// make sure retractions were propagated
assertEquals( 2,
@@ -243,10 +244,10 @@
this.workingMemory );
// Check memory was not populated
- final TupleHashTable memory = (TupleHashTable) this.workingMemory.getNodeMemory( node );
+ final EvalMemory memory = (EvalMemory) this.workingMemory.getNodeMemory( node );
assertEquals( 0,
- memory.size() );
+ memory.tupleMemory.size() );
// test no propagations
assertEquals( 0,
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -23,6 +23,7 @@
import org.drools.common.InternalFactHandle;
import org.drools.common.PropagationContextImpl;
import org.drools.common.SingleBetaConstraints;
+import org.drools.reteoo.FromNode.FromMemory;
import org.drools.rule.Declaration;
import org.drools.rule.LiteralConstraint;
import org.drools.rule.Pattern;
@@ -173,7 +174,7 @@
final FromNode from = new FromNode( 3,
dataProvider,
null,
- null,
+ new AlphaNodeFieldConstraint[0],
betaConstraints );
final MockTupleSink sink = new MockTupleSink( 5 );
from.addTupleSink( sink );
@@ -281,15 +282,15 @@
assertEquals( 2,
asserted.size() );
- final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( from );
+ final FromMemory memory = (FromMemory) workingMemory.getNodeMemory( from );
assertEquals( 1,
- memory.getTupleMemory().size() );
- assertNull( memory.getFactHandleMemory() );
+ memory.betaMemory.getTupleMemory().size() );
+ assertNull( memory.betaMemory.getFactHandleMemory() );
assertEquals( 2,
- ((LinkedList) memory.getCreatedHandles().get( tuple )).size() );
+ ((LinkedList) memory.betaMemory.getCreatedHandles().get( tuple )).size() );
- final InternalFactHandle handle1 = (InternalFactHandle) ((LinkedListEntry) ((LinkedList) memory.getCreatedHandles().get( tuple )).getFirst()).getObject();
- final InternalFactHandle handle2 = (InternalFactHandle) ((LinkedListEntry) ((LinkedList) memory.getCreatedHandles().get( tuple )).getLast()).getObject();
+ final InternalFactHandle handle1 = (InternalFactHandle) ((LinkedListEntry) ((LinkedList) memory.betaMemory.getCreatedHandles().get( tuple )).getFirst()).getObject();
+ final InternalFactHandle handle2 = (InternalFactHandle) ((LinkedListEntry) ((LinkedList) memory.betaMemory.getCreatedHandles().get( tuple )).getLast()).getObject();
assertEquals( handle1.getObject(),
cheese1 );
assertEquals( handle2.getObject(),
@@ -299,8 +300,8 @@
context,
workingMemory );
assertEquals( 0,
- memory.getTupleMemory().size() );
- assertNull( memory.getFactHandleMemory() );
+ memory.betaMemory.getTupleMemory().size() );
+ assertNull( memory.betaMemory.getFactHandleMemory() );
}
public static class MockDataProvider
@@ -319,9 +320,14 @@
public Iterator getResults(final Tuple tuple,
final WorkingMemory wm,
- final PropagationContext ctx) {
+ final PropagationContext ctx,
+ final Object providerContext ) {
return this.collection.iterator();
}
+
+ public Object createContext() {
+ return null;
+ }
}
public static class Person {
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -36,10 +36,13 @@
*
*/
private static final long serialVersionUID = 400L;
+
+ public Object createContext() { return null; }
public boolean evaluate(Tuple tuple,
Declaration[] requiredDeclarations,
- WorkingMemory workingMemory) {
+ WorkingMemory workingMemory,
+ Object context ) {
return MockEvalCondition.this.isAllowed.booleanValue();
}
};
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -81,6 +81,7 @@
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
+ final ContextEntry context = constraint.createContextEntry();
final Cheese cheddar = new Cheese( "cheddar",
5 );
@@ -89,7 +90,8 @@
// check constraint
assertTrue( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
final Cheese stilton = new Cheese( "stilton",
5 );
@@ -98,7 +100,8 @@
// check constraint
assertFalse( constraint.isAllowed( stiltonHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
}
/**
@@ -127,6 +130,7 @@
final LiteralConstraint constraint = new LiteralConstraint( extractor,
evaluator,
field );
+ final ContextEntry context = constraint.createContextEntry();
final Cheese cheddar = new Cheese( "cheddar",
5 );
@@ -135,7 +139,8 @@
// check constraint
assertTrue( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
final Cheese stilton = new Cheese( "stilton",
10 );
@@ -144,7 +149,8 @@
// check constraint
assertFalse( constraint.isAllowed( stiltonHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
}
/**
@@ -196,7 +202,8 @@
Tuple tuple,
Declaration[] previousDeclarations,
Declaration[] localDeclarations,
- WorkingMemory workingMemory) {
+ WorkingMemory workingMemory,
+ Object context ) {
int price1 = previousDeclarations[0].getIntValue( (InternalWorkingMemory) workingMemory,
workingMemory.getObject( tuple.get( previousDeclarations[0] ) ) );
int price2 = localDeclarations[0].getIntValue( (InternalWorkingMemory) workingMemory,
@@ -205,6 +212,11 @@
return (price2 == (price1 * 2));
}
+
+ public Object createContext() {
+ return null;
+ }
+
};
final PredicateConstraint constraint1 = new PredicateConstraint( evaluator,
@@ -224,7 +236,7 @@
tuple = new InstrumentedReteTuple( tuple,
f1 );
- final PredicateContextEntry context = (PredicateContextEntry) constraint1.getContextEntry();
+ final PredicateContextEntry context = (PredicateContextEntry) constraint1.createContextEntry();
context.updateFromTuple( workingMemory,
tuple );
assertTrue( constraint1.isAllowedCachedLeft( context,
@@ -271,12 +283,17 @@
Tuple tuple, // ?price
Declaration[] previousDeclarations,
Declaration[] localDeclarations,
- WorkingMemory workingMemory) {
+ WorkingMemory workingMemory,
+ Object context ) {
int price = ((Number) previousDeclarations[0].getValue( (InternalWorkingMemory) workingMemory,
workingMemory.getObject( tuple.get( previousDeclarations[0] ) ) )).intValue();
return FieldFactory.getFieldValue( 2 * price );
}
+
+ public Object createContext() {
+ return null;
+ }
};
final ReturnValueRestriction restriction1 = new ReturnValueRestriction( priceExtractor,
@@ -311,13 +328,13 @@
tuple = new InstrumentedReteTuple( tuple,
f1 );
- final ReturnValueContextEntry context1 = (ReturnValueContextEntry) constraint1.getContextEntry();
+ final ReturnValueContextEntry context1 = (ReturnValueContextEntry) constraint1.createContextEntry();
context1.updateFromTuple( workingMemory,
tuple );
assertTrue( constraint1.isAllowedCachedLeft( context1,
f1.getObject() ) );
- final ReturnValueContextEntry context2 = (ReturnValueContextEntry) constraint2.getContextEntry();
+ final ReturnValueContextEntry context2 = (ReturnValueContextEntry) constraint2.createContextEntry();
context2.updateFromTuple( workingMemory,
tuple );
assertFalse( constraint2.isAllowedCachedLeft( context2,
@@ -381,26 +398,32 @@
constraint.addAlphaConstraint( constraint1 );
constraint.addAlphaConstraint( constraint2 );
+ final ContextEntry context = constraint.createContextEntry();
+
final InternalFactHandle cheddarHandle = (InternalFactHandle) workingMemory.insert( cheddar );
// check constraint
assertTrue( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setPrice( 5 );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertFalse( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setType( "stilton" );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertFalse( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setPrice( 15 );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertFalse( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
}
/**
@@ -450,27 +473,32 @@
final OrConstraint constraint = new OrConstraint();
constraint.addAlphaConstraint( constraint1 );
constraint.addAlphaConstraint( constraint2 );
+ final ContextEntry context = constraint.createContextEntry();
final InternalFactHandle cheddarHandle = (InternalFactHandle) workingMemory.insert( cheddar );
// check constraint
assertTrue( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setPrice( 5 );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertTrue( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setType( "stilton" );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertFalse( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setPrice( 15 );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertTrue( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
}
/**
@@ -543,6 +571,7 @@
final OrConstraint constraint = new OrConstraint();
constraint.addAlphaConstraint( and1 );
constraint.addAlphaConstraint( and2 );
+ final ContextEntry context = constraint.createContextEntry();
final Cheese cheddar = new Cheese( "cheddar",
15 );
@@ -551,22 +580,26 @@
// check constraint
assertTrue( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setPrice( 5 );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertFalse( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setType( "stilton" );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertTrue( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
cheddar.setPrice( 15 );
((ShadowProxy) cheddarHandle.getObject()).updateProxy();
assertFalse( constraint.isAllowed( cheddarHandle.getObject(),
- workingMemory ) );
+ workingMemory,
+ context ) );
}
}
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -13,7 +13,8 @@
public class PackageCompilationDataTest extends TestCase {
public static class TestEvalExpression implements EvalExpression {
- public boolean evaluate(Tuple t, Declaration[] d, WorkingMemory w) {
+ public Object createContext() { return null; }
+ public boolean evaluate(Tuple t, Declaration[] d, WorkingMemory w, Object context ) {
return false;
}
}
Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/spi/MockConstraint.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/spi/MockConstraint.java 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/spi/MockConstraint.java 2008-02-08 00:37:03 UTC (rev 18401)
@@ -54,7 +54,7 @@
return this;
}
- public ContextEntry getContextEntry() {
+ public ContextEntry createContextEntry() {
return new ContextEntry() {
private static final long serialVersionUID = 400L;
private ContextEntry next;
Modified: labs/jbossrules/branches/4.0.x/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-decisiontables/.classpath 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-decisiontables/.classpath 2008-02-08 00:37:03 UTC (rev 18401)
@@ -5,14 +5,14 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
<classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.10/mvel14-1.2.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.21/mvel14-1.2.21.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-jbrms/.classpath
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-jbrms/.classpath 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-jbrms/.classpath 2008-02-08 00:37:03 UTC (rev 18401)
@@ -5,56 +5,56 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.4.60/gwt-servlet-1.4.60.jar"/>
<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/emma/emma/2.0.5312/emma-2.0.5312.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
<classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.10/mvel14-1.2.10.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.4.60/gwt-servlet-1.4.60.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.3/jackrabbit-api-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-el/2.0.0.CR1/jboss-el-2.0.0.CR1.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/emma/emma/2.0.5312/emma-2.0.5312.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.0.0.CR2/jboss-seam-2.0.0.CR2.jar"/>
<classpathentry kind="src" path="/drools-repository"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.GA/hibernate-validator-3.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="src" path="/drools-decisiontables"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/javassist/3.3.ga/javassist-3.3.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-el/2.0.0.CR1/jboss-el-2.0.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="src" path="/drools-decisiontables"/>
- <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.0.0.CR2/jboss-seam-2.0.0.CR2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.21/mvel14-1.2.21.jar"/>
<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-jbrms/.project
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-jbrms/.project 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-jbrms/.project 2008-02-08 00:37:03 UTC (rev 18401)
@@ -2,10 +2,10 @@
<name>drools-jbrms</name>
<comment>A rule production system</comment>
<projects>
+ <project>drools-repository</project>
+ <project>drools-decisiontables</project>
<project>drools-compiler</project>
<project>drools-core</project>
- <project>drools-repository</project>
- <project>drools-decisiontables</project>
</projects>
<buildSpec>
<buildCommand>
Modified: labs/jbossrules/branches/4.0.x/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-jsr94/.classpath 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-jsr94/.classpath 2008-02-08 00:37:03 UTC (rev 18401)
@@ -5,18 +5,18 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.10/mvel14-1.2.10.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
<classpathentry kind="src" path="/drools-decisiontables"/>
<classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2.21/mvel14-1.2.21.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/4.0.x/drools-jsr94/.project
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-jsr94/.project 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-jsr94/.project 2008-02-08 00:37:03 UTC (rev 18401)
@@ -2,9 +2,9 @@
<name>drools-jsr94</name>
<comment>A rule production system</comment>
<projects>
- <project>drools-core</project>
<project>drools-decisiontables</project>
<project>drools-compiler</project>
+ <project>drools-core</project>
</projects>
<buildSpec>
<buildCommand>
Modified: labs/jbossrules/branches/4.0.x/drools-repository/.classpath
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-repository/.classpath 2008-02-07 20:15:43 UTC (rev 18400)
+++ labs/jbossrules/branches/4.0.x/drools-repository/.classpath 2008-02-08 00:37:03 UTC (rev 18401)
@@ -5,20 +5,20 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.3/jackrabbit-api-1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.3/jackrabbit-api-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
</classpath>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list