Qute: IfSectionHelper - improve performance for common use case

mkouba · Sep 17, 2024 · d3d92be · d3d92be
1 parent ee6fc7a
commit d3d92be
Showing 1 changed file with 90 additions and 3 deletions.
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java
@@ -246,7 +246,12 @@ static class OperandCondition implements Condition {
 
         @Override
         public CompletionStage<Object> evaluate(SectionResolutionContext context) {
-            CompletionStage<Object> ret = context.resolutionContext().evaluate(expression);
+            CompletionStage<Object> ret;
+            if (expression.isLiteral()) {
+                ret = expression.asLiteral();
+            } else {
+                ret = context.resolutionContext().evaluate(expression);
+            }
             if (operator == Operator.NOT) {
                 return ret.thenApply(this::logicalComplement);
             }
@@ -270,6 +275,86 @@ public String toString() {
 
     }
 
+    static class DoubletonCondition implements Condition {
+
+        final Condition condition1;
+        final Condition condition2;
+        final Operator operator;
+
+        private DoubletonCondition(Condition condition1, Condition condition2, Operator operator) {
+            this.condition1 = Objects.requireNonNull(condition1);
+            this.condition2 = Objects.requireNonNull(condition2);
+            this.operator = operator;
+        }
+
+        @Override
+        public CompletionStage<Object> evaluate(SectionResolutionContext context) {
+            CompletionStage<Object> ret = condition1.evaluate(context);
+            if (ret instanceof CompletedStage completed) {
+                ret = evaluateSecond(context, completed.get());
+            } else {
+                ret = ret.thenCompose(first -> evaluateSecond(context, first));
+            }
+            if (operator == Operator.NOT) {
+                return ret.thenApply(this::logicalComplement);
+            }
+            return ret;
+        }
+
+        @Override
+        public Operator getOperator() {
+            return operator;
+        }
+
+        @Override
+        public String toString() {
+            return "DoubletonCondition [condition1=" + condition1 + ", condition2=" + condition2 + ", operator=" + operator
+                    + "]";
+        }
+
+        CompletionStage<Object> evaluateSecond(SectionResolutionContext context, Object firstVal) {
+            Boolean shortResult = null;
+            Operator operator = condition2.getOperator();
+            if (operator != null && operator.isShortCircuiting()) {
+                shortResult = operator.evaluate(firstVal);
+            }
+            if (shortResult != null) {
+                // There is no need to continue with the next operand
+                return CompletedStage.of(shortResult);
+            }
+            CompletionStage<Object> second = condition2.evaluate(context);
+            if (second instanceof CompletedStage completed) {
+                return processValues(operator, firstVal, completed.get());
+            } else {
+                return second.thenCompose(c2 -> processValues(operator, firstVal, c2));
+            }
+        }
+
+        CompletionStage<Object> processValues(Operator operator,
+                Object firstVal, Object secondVal) {
+            Object val;
+            if (operator == null || !operator.isBinary()) {
+                val = secondVal;
+            } else {
+                // Binary operator
+                try {
+                    if (Results.isNotFound(secondVal)) {
+                        secondVal = null;
+                    }
+                    Object localValue = firstVal;
+                    if (Results.isNotFound(localValue)) {
+                        localValue = null;
+                    }
+                    val = operator.evaluate(localValue, secondVal);
+                } catch (Throwable e) {
+                    return CompletedStage.failure(e);
+                }
+            }
+            return CompletedStage.of(val);
+        }
+
+    }
+
     static class CompositeCondition implements Condition {
 
         final List<Condition> conditions;
@@ -310,8 +395,8 @@ CompletionStage<Object> evaluateNext(SectionResolutionContext context, Object pr
                     return processConditionValue(context, operator, previousValue, literalVal, iter);
                 } else {
                     CompletionStage<Object> ret = next.evaluate(context);
-                    if (ret instanceof CompletedStage) {
-                        return processConditionValue(context, operator, previousValue, ((CompletedStage<Object>) ret).get(),
+                    if (ret instanceof CompletedStage completed) {
+                        return processConditionValue(context, operator, previousValue, completed.get(),
                                 iter);
                     } else {
                         return ret.thenCompose(r -> processConditionValue(context, operator, previousValue, r, iter));
@@ -664,6 +749,8 @@ static Condition createCondition(Object param, SectionBlock block, Operator oper
 
             if (operator == null && conditions.size() == 1) {
                 condition = conditions.get(0);
+            } else if (conditions.size() == 2) {
+                condition = new DoubletonCondition(conditions.get(0), conditions.get(1), operator);
             } else {
                 condition = new CompositeCondition(operator, ImmutableList.copyOf(conditions));
             }