Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3962 porting changes from AMQ-8613 

Improve performance of selectors with a big sequence of OR and AND
logical expressions.
This commit is contained in:
Justin Bertram 2022-08-29 14:45:19 -05:00
parent f0ff385c7c
commit f11b96e7ed
No known key found for this signature in database
GPG Key ID: F41830B875BB8633
2 changed files with 150 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java
View File

@ -16,78 +16,170 @@
*/
package org.apache.activemq.artemis.selector.filter;
import java.util.ArrayList;
import java.util.List;
/**
* A filter performing a comparison of two objects
* A sequence of expressions, to be combined with OR or AND conjunctions.
*
* @version $Revision: 1.2 $
*/
public abstract class LogicExpression extends BinaryExpression implements BooleanExpression {
public abstract class LogicExpression implements BooleanExpression {
protected final List<BooleanExpression> expressions = new ArrayList<>(2);
private LogicExpression(BooleanExpression lvalue, BooleanExpression rvalue) {
expressions.add(lvalue);
expressions.add(rvalue);
}
protected void addExpression(BooleanExpression expression) {
expressions.add(expression);
}
public BooleanExpression getLeft() {
if (expressions.size() == 2) {
return expressions.get(0);
}
throw new IllegalStateException("This expression is not binary: " + this);
}
public BooleanExpression getRight() {
if (expressions.size() == 2) {
return expressions.get(1);
}
throw new IllegalStateException("This expression is not binary: " + this);
}
/**
* @param left
* @param right
* Returns the symbol that represents this binary expression. For example, addition is
* represented by "+"
*
* @return
*/
public LogicExpression(BooleanExpression left, BooleanExpression right) {
super(left, right);
public abstract String getExpressionSymbol();
@Override
public String toString() {
if (expressions.size() == 2) {
return "( " + expressions.get(0) + " " + getExpressionSymbol() + " " + expressions.get(1) + " )";
}
StringBuilder result = new StringBuilder("(");
int count = 0;
for (BooleanExpression expression : expressions) {
if (count++ > 0) {
result.append(" " + getExpressionSymbol() + " ");
}
result.append(expression.toString());
}
result.append(")");
return result.toString();
}
public static BooleanExpression createOR(BooleanExpression lvalue, BooleanExpression rvalue) {
return new LogicExpression(lvalue, rvalue) {
@Override
public Object evaluate(Filterable message) throws FilterException {
Boolean lv = (Boolean) left.evaluate(message);
// Can we do an OR shortcut??
if (lv != null && lv.booleanValue()) {
return Boolean.TRUE;
}
Boolean rv = (Boolean) right.evaluate(message);
return rv == null ? null : rv;
}
@Override
public String getExpressionSymbol() {
return "OR";
}
};
if (lvalue instanceof ORExpression) {
ORExpression orExpression = (ORExpression) lvalue;
orExpression.addExpression(rvalue);
return orExpression;
} else {
return new ORExpression(lvalue, rvalue);
}
}
public static BooleanExpression createAND(BooleanExpression lvalue, BooleanExpression rvalue) {
return new LogicExpression(lvalue, rvalue) {
@Override
public Object evaluate(Filterable message) throws FilterException {
Boolean lv = (Boolean) left.evaluate(message);
// Can we do an AND shortcut??
if (lv == null) {
return null;
}
if (!lv.booleanValue()) {
return Boolean.FALSE;
}
Boolean rv = (Boolean) right.evaluate(message);
return rv == null ? null : rv;
}
@Override
public String getExpressionSymbol() {
return "AND";
}
};
if (lvalue instanceof ANDExpression) {
ANDExpression orExpression = (ANDExpression) lvalue;
orExpression.addExpression(rvalue);
return orExpression;
} else {
return new ANDExpression(lvalue, rvalue);
}
}
@Override
public abstract Object evaluate(Filterable message) throws FilterException;
@Override
public boolean matches(Filterable message) throws FilterException {
Object object = evaluate(message);
return object == Boolean.TRUE;
public abstract boolean matches(Filterable message) throws FilterException;
private static class ORExpression extends LogicExpression {
ORExpression(BooleanExpression lvalue, BooleanExpression rvalue) {
super(lvalue, rvalue);
}
@Override
public Object evaluate(Filterable message) throws FilterException {
boolean someNulls = false;
for (BooleanExpression expression : expressions) {
Boolean lv = (Boolean)expression.evaluate(message);
if (lv != null && lv.booleanValue()) {
return Boolean.TRUE;
}
if (lv == null) {
someNulls = true;
}
}
if (someNulls) {
return null;
}
return Boolean.FALSE;
}
@Override
public boolean matches(Filterable message) throws FilterException {
for (BooleanExpression expression : expressions) {
boolean lv = expression.matches(message);
if (lv) {
return true;
}
}
return false;
}
@Override
public String getExpressionSymbol() {
return "OR";
}
}
private static class ANDExpression extends LogicExpression {
ANDExpression(BooleanExpression lvalue, BooleanExpression rvalue) {
super(lvalue, rvalue);
}
@Override
public Object evaluate(Filterable message) throws FilterException {
boolean someNulls = false;
for (BooleanExpression expression : expressions) {
Boolean lv = (Boolean)expression.evaluate(message);
if (lv != null && !lv.booleanValue()) {
return Boolean.FALSE;
}
if (lv == null) {
someNulls = true;
}
}
if (someNulls) {
return null;
}
return Boolean.TRUE;
}
@Override
public boolean matches(Filterable message) throws FilterException {
for (BooleanExpression expression : expressions) {
boolean lv = expression.matches(message);
if (!lv) {
return false;
}
}
return true;
}
@Override
public String getExpressionSymbol() {
return "AND";
}
}
}

5
artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
View File

@ -126,7 +126,10 @@ public class SelectorTest {
assertSelector(message, "(trueProp OR falseProp) AND trueProp", true);
assertSelector(message, "(trueProp OR falseProp) AND falseProp", false);
assertSelector(message, "(falseProp OR falseProp OR falseProp OR falseProp OR falseProp OR falseProp OR trueProp)", true);
assertSelector(message, "(falseProp OR falseProp OR falseProp OR falseProp OR falseProp OR falseProp OR falseProp)", false);
assertSelector(message, "(trueProp AND trueProp AND trueProp AND trueProp AND trueProp AND trueProp AND falseProp)", false);
assertSelector(message, "(trueProp AND trueProp AND trueProp AND trueProp AND trueProp AND trueProp AND trueProp)", true);
}
@Test