This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-performance-tests.git
commit 29cc14d0998b924e0e67cdb576bd3889729f1204 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Aug 26 10:58:19 2024 +0200 Improve granularity for the CSimple tests --- .../camel/itest/jmh/CSimpleOperatorTest.java | 41 +++++++++++----------- .../itest/jmh/{ => csimple}/CSimpleScript1.java | 2 +- .../itest/jmh/{ => csimple}/CSimpleScript2.java | 2 +- .../itest/jmh/{ => csimple}/CSimpleScript3.java | 2 +- .../services/org/apache/camel/csimple.properties | 6 ++-- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleOperatorTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleOperatorTest.java index 055f838..8d91b54 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleOperatorTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleOperatorTest.java @@ -58,7 +58,7 @@ public class CSimpleOperatorTest { .mode(Mode.All) .timeUnit(TimeUnit.MICROSECONDS) .warmupTime(TimeValue.seconds(1)) - .warmupIterations(2) + .warmupIterations(5) .measurementTime(TimeValue.seconds(10)) .measurementIterations(2) .threads(2) @@ -77,9 +77,9 @@ public class CSimpleOperatorTest { @State(Scope.Thread) public static class BenchmarkState { CamelContext camel; - String expression = "${header.gold} == 123"; - String expression2 = "${header.gold} > 123"; - String expression3 = "${header.gold} < 123"; + final String expressionEquals = "${header.gold} == 123"; + final String expressionGreaterThan = "${header.gold} > 123"; + final String expressionSmallerThan = "${header.gold} < 123"; Exchange exchange; Language csimple; @@ -101,7 +101,7 @@ public class CSimpleOperatorTest { @TearDown(Level.Trial) public void close() { try { - LOG.info("" + camel.getTypeConverterRegistry().getStatistics()); + LOG.info("{}", camel.getTypeConverterRegistry().getStatistics()); camel.stop(); } catch (Exception e) { // ignore @@ -112,22 +112,23 @@ public class CSimpleOperatorTest { @Benchmark @Measurement(batchSize = 1000) - public void csimplePredicate(BenchmarkState state, Blackhole bh) { - boolean out = state.csimple.createPredicate(state.expression).matches(state.exchange); - if (!out) { - throw new IllegalArgumentException("Evaluation failed"); - } + public void cSimplePredicateEquals(BenchmarkState state, Blackhole bh) { + boolean out = state.csimple.createPredicate(state.expressionEquals).matches(state.exchange); bh.consume(out); - boolean out2 = state.csimple.createPredicate(state.expression2).matches(state.exchange); - if (out2) { - throw new IllegalArgumentException("Evaluation failed"); - } - bh.consume(out2); - boolean out3 = state.csimple.createPredicate(state.expression3).matches(state.exchange); - if (out3) { - throw new IllegalArgumentException("Evaluation failed"); - } - bh.consume(out3); + } + @Benchmark + @Measurement(batchSize = 1000) + public void cSimplePredicateGreater(BenchmarkState state, Blackhole bh) { + boolean out = state.csimple.createPredicate(state.expressionGreaterThan).matches(state.exchange); + bh.consume(out); + } + + @Benchmark + @Measurement(batchSize = 1000) + public void cSimplePredicateSmaller(BenchmarkState state, Blackhole bh) { + boolean out = state.csimple.createPredicate(state.expressionSmallerThan).matches(state.exchange); + bh.consume(out); + } } diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript1.java similarity index 97% rename from tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java rename to tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript1.java index a94d7d5..4ab5749 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.itest.jmh; +package org.apache.camel.itest.jmh.csimple; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript2.java similarity index 97% rename from tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java rename to tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript2.java index b5f8312..a20d38d 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.itest.jmh; +package org.apache.camel.itest.jmh.csimple; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript3.java similarity index 97% rename from tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java rename to tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript3.java index 64c6ec5..cc2bc1d 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/csimple/CSimpleScript3.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.itest.jmh; +package org.apache.camel.itest.jmh.csimple; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; diff --git a/tests/camel-jmh/src/test/resources/META-INF/services/org/apache/camel/csimple.properties b/tests/camel-jmh/src/test/resources/META-INF/services/org/apache/camel/csimple.properties index fc8d8ef..7bdf4f6 100644 --- a/tests/camel-jmh/src/test/resources/META-INF/services/org/apache/camel/csimple.properties +++ b/tests/camel-jmh/src/test/resources/META-INF/services/org/apache/camel/csimple.properties @@ -15,6 +15,6 @@ ## limitations under the License. ## --------------------------------------------------------------------------- -org.apache.camel.itest.jmh.CSimpleScript1 -org.apache.camel.itest.jmh.CSimpleScript2 -org.apache.camel.itest.jmh.CSimpleScript3 +org.apache.camel.itest.jmh.csimple.CSimpleScript1 +org.apache.camel.itest.jmh.csimple.CSimpleScript2 +org.apache.camel.itest.jmh.csimple.CSimpleScript3
