[incubator-kie-issues#1300] Fix broken DMN benchmarks (#287)

Co-authored-by: Gabriele-Cardosi <[email protected]>
apache · Jun 5, 2024 · 076b7a6 · 076b7a6
1 parent d108dc0
commit 076b7a6
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 16 deletions.
diff --git a/...drools-benchmarks/src/main/java/org/drools/benchmarks/dmn/feel/AbstractFEELBenchmark.java b/...drools-benchmarks/src/main/java/org/drools/benchmarks/dmn/feel/AbstractFEELBenchmark.java
@@ -25,6 +25,7 @@
 
 import org.kie.dmn.feel.FEEL;
 import org.kie.dmn.feel.lang.CompiledExpression;
+import org.kie.dmn.feel.lang.impl.FEELBuilder;
 import org.kie.dmn.feel.parser.feel11.profiles.DoCompileFEELProfile;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -50,8 +51,8 @@ public abstract class AbstractFEELBenchmark {
 
     @Setup()
     public void setupFEEL() {
-        feelInterpreted = FEEL.newInstance();
-        feelCompiled = FEEL.newInstance(Collections.singletonList(new DoCompileFEELProfile()));
+        feelInterpreted = FEELBuilder.builder().build();
+        feelCompiled = FEELBuilder.builder().withProfiles(Collections.singletonList(new DoCompileFEELProfile())).build();
         compiledJavaExpression = compileExpression(getExpression());
         compiledButInterpretedExpression = compileInterpretedExpression(getExpression());
     }

diff --git a/...nchmarks/src/main/java/org/drools/benchmarks/dmn/feel/EvaluationContextImplBenchmark.java b/...nchmarks/src/main/java/org/drools/benchmarks/dmn/feel/EvaluationContextImplBenchmark.java
@@ -44,7 +44,7 @@ public class EvaluationContextImplBenchmark {
 
     @Setup()
     public void setupFEEL() {
-        context = new EvaluationContextImpl(this.getClass().getClassLoader(), null);
+        context = new EvaluationContextImpl(this.getClass().getClassLoader(), null, null);
         context.enterFrame();
         context.enterFrame();
         context.enterFrame();

diff --git a/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELAddExecutorBenchmark.java b/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELAddExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELAddExecutorBenchmark {
     @Setup
     public void setup() {
         executor = AddExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getObjectArray(argsType);
     }
 

diff --git a/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELAndExecutorBenchmark.java b/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELAndExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELAndExecutorBenchmark {
     @Setup
     public void setup() {
         executor = AndExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getBooleanArray(args);
     }
 

diff --git a/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELDivExecutorBenchmark.java b/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELDivExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELDivExecutorBenchmark {
     @Setup
     public void setup() {
         executor = DivExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getObjectArray(args);
     }
 

diff --git a/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELEqExecutorBenchmark.java b/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELEqExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELEqExecutorBenchmark {
     @Setup
     public void setup() {
         executor = EqExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getBooleanArray(args);
     }
 

diff --git a/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELGtExecutorBenchmark.java b/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELGtExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELGtExecutorBenchmark {
     @Setup
     public void setup() {
         executor = GtExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getBooleanArray(args);
     }
 

diff --git a/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELGteExecutorBenchmark.java b/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELGteExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELGteExecutorBenchmark {
     @Setup
     public void setup() {
         executor = GteExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getBooleanArray(args);
     }
 

diff --git a/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELLtExecutorBenchmark.java b/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELLtExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELLtExecutorBenchmark {
     @Setup
     public void setup() {
         executor = LtExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getBooleanArray(args);
     }
 

diff --git a/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELLteExecutorBenchmark.java b/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELLteExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELLteExecutorBenchmark {
     @Setup
     public void setup() {
         executor = LteExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getBooleanArray(args);
     }
 

diff --git a/...rc/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELMultExecutorBenchmark.java b/...rc/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELMultExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELMultExecutorBenchmark {
     @Setup
     public void setup() {
         executor = MultExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getObjectArray(args);
     }
 

diff --git a/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELNeExecutorBenchmark.java b/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELNeExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELNeExecutorBenchmark {
     @Setup
     public void setup() {
         executor = NeExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getBooleanArray(args);
     }
 

diff --git a/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELOrExecutorBenchmark.java b/.../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELOrExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELOrExecutorBenchmark {
     @Setup
     public void setup() {
         executor = OrExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getBooleanArray(args);
     }
 

diff --git a/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELPowExecutorBenchmark.java b/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELPowExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELPowExecutorBenchmark {
     @Setup
     public void setup() {
         executor = PowExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getObjectArray(argsType);
     }
 

diff --git a/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELSubExecutorBenchmark.java b/...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELSubExecutorBenchmark.java
@@ -47,7 +47,7 @@ public class FEELSubExecutorBenchmark {
     @Setup
     public void setup() {
         executor = SubExecutor.instance();
-        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null);
+        ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
         values = getObjectArray(argsType);
     }