Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.67.x-blue] [DROOLS-7398] executable model doesn't resolve bind variable from ano… #5339

Merged
merged 1 commit into from
Jun 22, 2023
Merged

[7.67.x-blue] [DROOLS-7398] executable model doesn't resolve bind variable from ano… #5339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drools-core/src/main/java/org/drools/core/common/BetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.drools.core.reteoo.BetaMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -64,7 +65,7 @@ BetaMemory createBetaMemory(final RuleBaseConfiguration config,

void resetFactHandle(final ContextEntry[] context);

BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties);
BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties);

void init(BuildContext context, short betaNodeType);
void initIndexes(int depth, short betaNodeType, RuleBaseConfiguration config);
Expand Down
6 changes: 4 additions & 2 deletions drools-core/src/main/java/org/drools/core/common/DefaultBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
import java.io.ObjectOutput;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.BetaMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.IndexableConstraint;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -260,10 +262,10 @@ public BetaConstraints getOriginalConstraint() {
throw new UnsupportedOperationException();
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
BitMask mask = getEmptyPropertyReactiveMask(settableProperties.size());
for (BetaNodeFieldConstraint constraint : constraints) {
mask = mask.setAll(constraint.getListenedPropertyMask(modifiedClass, settableProperties));
mask = mask.setAll(constraint.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties));
}
return mask;
}
Expand Down
8 changes: 5 additions & 3 deletions drools-core/src/main/java/org/drools/core/common/DoubleBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
package org.drools.core.common;

import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -156,9 +158,9 @@ public BetaConstraints getOriginalConstraint() {
throw new UnsupportedOperationException();
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
return constraints[0].getListenedPropertyMask(modifiedClass, settableProperties)
.setAll(constraints[1].getListenedPropertyMask(modifiedClass, settableProperties));
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return constraints[0].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties)
.setAll(constraints[1].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties));
}

public void registerEvaluationContext(BuildContext buildContext) {
Expand Down
8 changes: 5 additions & 3 deletions drools-core/src/main/java/org/drools/core/common/DoubleNonIndexSkipBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.BetaMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -149,9 +151,9 @@ public boolean isAllowedCachedRight(ContextEntry[] context,
return this.constraints.isAllowedCachedRight( context, tuple );
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
return constraint0.getListenedPropertyMask(modifiedClass, settableProperties)
.setAll(constraint1.getListenedPropertyMask(modifiedClass, settableProperties));
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return constraint0.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties)
.setAll(constraint1.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties));
}

public boolean isLeftUpdateOptimizationAllowed() {
Expand Down
3 changes: 2 additions & 1 deletion drools-core/src/main/java/org/drools/core/common/EmptyBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.drools.core.reteoo.BetaMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -151,7 +152,7 @@ public BetaConstraints getOriginalConstraint() {
throw new UnsupportedOperationException();
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return getEmptyPropertyReactiveMask(settableProperties.size());
}

Expand Down
12 changes: 7 additions & 5 deletions drools-core/src/main/java/org/drools/core/common/QuadroupleBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
package org.drools.core.common;

import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -180,11 +182,11 @@ public BetaConstraints getOriginalConstraint() {
throw new UnsupportedOperationException();
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
return constraints[0].getListenedPropertyMask(modifiedClass, settableProperties)
.setAll(constraints[1].getListenedPropertyMask(modifiedClass, settableProperties))
.setAll(constraints[2].getListenedPropertyMask(modifiedClass, settableProperties))
.setAll(constraints[3].getListenedPropertyMask(modifiedClass, settableProperties));
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return constraints[0].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties)
.setAll(constraints[1].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties))
.setAll(constraints[2].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties))
.setAll(constraints[3].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties));
}

public void registerEvaluationContext(BuildContext buildContext) {
Expand Down
12 changes: 7 additions & 5 deletions drools-core/src/main/java/org/drools/core/common/QuadroupleNonIndexSkipBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.BetaMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -156,11 +158,11 @@ public boolean isAllowedCachedRight(ContextEntry[] context,
return this.constraints.isAllowedCachedRight(context, tuple);
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
return constraint0.getListenedPropertyMask(modifiedClass, settableProperties)
.setAll(constraint1.getListenedPropertyMask(modifiedClass, settableProperties))
.setAll(constraint2.getListenedPropertyMask(modifiedClass, settableProperties))
.setAll(constraint3.getListenedPropertyMask(modifiedClass, settableProperties));
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return constraint0.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties)
.setAll(constraint1.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties))
.setAll(constraint2.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties))
.setAll(constraint3.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties));
}

public boolean isLeftUpdateOptimizationAllowed() {
Expand Down
6 changes: 4 additions & 2 deletions drools-core/src/main/java/org/drools/core/common/SingleBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.BetaMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -208,8 +210,8 @@ public BetaConstraints getOriginalConstraint() {
throw new UnsupportedOperationException();
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
return constraint.getListenedPropertyMask(modifiedClass, settableProperties);
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return constraint.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties);
}

public boolean isLeftUpdateOptimizationAllowed() {
Expand Down
6 changes: 4 additions & 2 deletions drools-core/src/main/java/org/drools/core/common/SingleNonIndexSkipBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.BetaMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -147,8 +149,8 @@ public boolean isAllowedCachedRight(ContextEntry[] context,
return this.constraints.isAllowedCachedRight( context, tuple );
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
return constraint.getListenedPropertyMask(modifiedClass, settableProperties);
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return constraint.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties);
}

public boolean isLeftUpdateOptimizationAllowed() {
Expand Down
10 changes: 6 additions & 4 deletions drools-core/src/main/java/org/drools/core/common/TripleBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
package org.drools.core.common;

import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -168,10 +170,10 @@ public BetaConstraints getOriginalConstraint() {
throw new UnsupportedOperationException();
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
return constraints[0].getListenedPropertyMask(modifiedClass, settableProperties)
.setAll(constraints[1].getListenedPropertyMask(modifiedClass, settableProperties))
.setAll(constraints[2].getListenedPropertyMask(modifiedClass, settableProperties));
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return constraints[0].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties)
.setAll(constraints[1].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties))
.setAll(constraints[2].getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties));
}

public void registerEvaluationContext(BuildContext buildContext) {
Expand Down
10 changes: 6 additions & 4 deletions drools-core/src/main/java/org/drools/core/common/TripleNonIndexSkipBetaConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import java.util.Optional;

import org.drools.core.RuleBaseConfiguration;
import org.drools.core.reteoo.BetaMemory;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.ContextEntry;
import org.drools.core.rule.MutableTypeConstraint;
import org.drools.core.rule.Pattern;
import org.drools.core.spi.BetaNodeFieldConstraint;
import org.drools.core.spi.Tuple;
import org.drools.core.util.bitmask.BitMask;
Expand Down Expand Up @@ -152,10 +154,10 @@ public boolean isAllowedCachedRight(ContextEntry[] context,
return this.constraints.isAllowedCachedRight( context, tuple );
}

public BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties) {
return constraint0.getListenedPropertyMask(modifiedClass, settableProperties)
.setAll(constraint1.getListenedPropertyMask(modifiedClass, settableProperties))
.setAll(constraint2.getListenedPropertyMask(modifiedClass, settableProperties));
public BitMask getListenedPropertyMask(Pattern pattern, Class modifiedClass, List<String> settableProperties) {
return constraint0.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties)
.setAll(constraint1.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties))
.setAll(constraint2.getListenedPropertyMask(Optional.of(pattern), modifiedClass, settableProperties));
}

public boolean isLeftUpdateOptimizationAllowed() {
Expand Down
2 changes: 1 addition & 1 deletion drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ protected void initDeclaredMask(BuildContext context,
rightListenedProperties = pattern.getListenedProperties();
List<String> accessibleProperties = pattern.getAccessibleProperties( context.getKnowledgeBase() );
rightDeclaredMask = pattern.getPositiveWatchMask(accessibleProperties);
rightDeclaredMask = rightDeclaredMask.setAll(constraints.getListenedPropertyMask(objectClass, accessibleProperties));
rightDeclaredMask = rightDeclaredMask.setAll(constraints.getListenedPropertyMask(pattern, objectClass, accessibleProperties));
rightNegativeMask = pattern.getNegativeWatchMask(accessibleProperties);
} else {
// if property reactive is not on, then accept all modification propagations
Expand Down
16 changes: 15 additions & 1 deletion drools-core/src/main/java/org/drools/core/spi/Constraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;

import org.drools.core.impl.InternalKnowledgeBase;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.rule.Declaration;
import org.drools.core.rule.Pattern;
import org.drools.core.util.bitmask.BitMask;

import static org.drools.core.reteoo.PropertySpecificUtil.allSetButTraitBitMask;
Expand Down Expand Up @@ -76,7 +78,19 @@ void replaceDeclaration(Declaration oldDecl,
*/
boolean isTemporal();

default BitMask getListenedPropertyMask( Class modifiedClass, List<String> settableProperties ) {
default BitMask getListenedPropertyMask(Class modifiedClass, List<String> settableProperties ) {
return getListenedPropertyMask(Optional.empty(), modifiedClass, settableProperties);
}

/**
* Returns property reactivity BitMask of this constraint.
*
* @param pattern which this constraint belongs to. if pattern is empty, bind variables are considered to be declared in the same pattern. It should be fine for alpha constraints
* @param modifiedClass
* @param settableProperties
* @return property reactivity BitMask
*/
default BitMask getListenedPropertyMask(Optional<Pattern> pattern, Class modifiedClass, List<String> settableProperties ) {
return allSetButTraitBitMask();
}

Expand Down
Loading