This is an automated email from the ASF dual-hosted git repository. vladimirsitnikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 8a9cb376ad210277b84453cca4a505c7058a2fa6 Author: Vladimir Sitnikov <[email protected]> AuthorDate: Thu Nov 14 19:10:15 2019 +0300 [CALCITE-2905] Use me.champeau.gradle.jmh for JMH --- build.gradle.kts | 4 ++++ gradle.properties | 1 + settings.gradle.kts | 1 + ubenchmark/build.gradle.kts | 18 ++++++++++++------ ubenchmark/gradle.properties | 3 +++ .../adapter/enumerable/CodeGenerationBenchmark.java | 0 .../AbstractRelNodeGetRelTypeNameBenchmark.java | 0 .../calcite/benchmarks/FlightRecorderProfiler.java | 0 .../org/apache/calcite/benchmarks/ParserBenchmark.java | 0 .../apache/calcite/benchmarks/PreconditionTest.java | 0 .../org/apache/calcite/benchmarks/StatementTest.java | 0 .../calcite/benchmarks/StringConstructBenchmark.java | 0 .../org/apache/calcite/benchmarks/package-info.java | 0 13 files changed, 21 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index aadc0b1..0ad9e43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -565,6 +565,10 @@ allprojects { // Do not publish "root" project. Java plugin is applied here for DSL purposes only return@configure } + if (!project.props.bool("nexus.publish", default = true)) { + // Some of the artifacts do not need to be published + return@configure + } publications { create<MavenPublication>(project.name) { artifactId = archivesBaseName diff --git a/gradle.properties b/gradle.properties index a696f66..4126703 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,6 +44,7 @@ com.github.vlsi.vlsi-release-plugins.version=1.48.0 com.google.protobuf.version=0.8.10 de.thetaphi.forbiddenapis.version=2.7 kotlin.version=1.3.50 +me.champeau.gradle.jmh.version=0.5.0 org.jetbrains.gradle.plugin.idea-ext.version=0.5 org.nosphere.apache.rat.version=0.5.2 org.owasp.dependencycheck.version=5.2.2 diff --git a/settings.gradle.kts b/settings.gradle.kts index c4c9769..0e941ca 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,6 +31,7 @@ pluginManagement { idv("com.github.vlsi.stage-vote-release", "com.github.vlsi.vlsi-release-plugins") idv("com.google.protobuf") idv("de.thetaphi.forbiddenapis") + idv("me.champeau.gradle.jmh") idv("org.jetbrains.gradle.plugin.idea-ext") idv("org.nosphere.apache.rat") idv("org.owasp.dependencycheck") diff --git a/ubenchmark/build.gradle.kts b/ubenchmark/build.gradle.kts index 740e664..2df3a11 100644 --- a/ubenchmark/build.gradle.kts +++ b/ubenchmark/build.gradle.kts @@ -16,11 +16,17 @@ * */ +plugins { + id("me.champeau.gradle.jmh") +} + dependencies { - api(project(":core")) - api(project(":linq4j")) - api("com.google.guava:guava") - api("org.codehaus.janino:commons-compiler") - api("org.openjdk.jmh:jmh-core") - api("org.openjdk.jmh:jmh-generator-annprocess") + jmh(project(":core")) + jmh(project(":linq4j")) + jmh("com.google.guava:guava") + jmh("org.codehaus.janino:commons-compiler") + jmh("org.openjdk.jmh:jmh-core") + jmh("org.openjdk.jmh:jmh-generator-annprocess") } + +// See https://github.com/melix/jmh-gradle-plugin diff --git a/ubenchmark/gradle.properties b/ubenchmark/gradle.properties index b3fd951..800d4f6 100644 --- a/ubenchmark/gradle.properties +++ b/ubenchmark/gradle.properties @@ -17,3 +17,6 @@ # description=Microbenchmarks for Calcite artifact.name=Calcite Ubenchmark +# Do not publish the jar +# It adds little value, however it requires effort to maintain license clearance +nexus.publish=false diff --git a/ubenchmark/src/main/java/org/apache/calcite/adapter/enumerable/CodeGenerationBenchmark.java b/ubenchmark/src/main/jmh/org/apache/calcite/adapter/enumerable/CodeGenerationBenchmark.java similarity index 100% rename from ubenchmark/src/main/java/org/apache/calcite/adapter/enumerable/CodeGenerationBenchmark.java rename to ubenchmark/src/main/jmh/org/apache/calcite/adapter/enumerable/CodeGenerationBenchmark.java diff --git a/ubenchmark/src/main/java/org/apache/calcite/benchmarks/AbstractRelNodeGetRelTypeNameBenchmark.java b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/AbstractRelNodeGetRelTypeNameBenchmark.java similarity index 100% rename from ubenchmark/src/main/java/org/apache/calcite/benchmarks/AbstractRelNodeGetRelTypeNameBenchmark.java rename to ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/AbstractRelNodeGetRelTypeNameBenchmark.java diff --git a/ubenchmark/src/main/java/org/apache/calcite/benchmarks/FlightRecorderProfiler.java b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/FlightRecorderProfiler.java similarity index 100% rename from ubenchmark/src/main/java/org/apache/calcite/benchmarks/FlightRecorderProfiler.java rename to ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/FlightRecorderProfiler.java diff --git a/ubenchmark/src/main/java/org/apache/calcite/benchmarks/ParserBenchmark.java b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/ParserBenchmark.java similarity index 100% rename from ubenchmark/src/main/java/org/apache/calcite/benchmarks/ParserBenchmark.java rename to ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/ParserBenchmark.java diff --git a/ubenchmark/src/main/java/org/apache/calcite/benchmarks/PreconditionTest.java b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/PreconditionTest.java similarity index 100% rename from ubenchmark/src/main/java/org/apache/calcite/benchmarks/PreconditionTest.java rename to ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/PreconditionTest.java diff --git a/ubenchmark/src/main/java/org/apache/calcite/benchmarks/StatementTest.java b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/StatementTest.java similarity index 100% rename from ubenchmark/src/main/java/org/apache/calcite/benchmarks/StatementTest.java rename to ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/StatementTest.java diff --git a/ubenchmark/src/main/java/org/apache/calcite/benchmarks/StringConstructBenchmark.java b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/StringConstructBenchmark.java similarity index 100% rename from ubenchmark/src/main/java/org/apache/calcite/benchmarks/StringConstructBenchmark.java rename to ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/StringConstructBenchmark.java diff --git a/ubenchmark/src/main/java/org/apache/calcite/benchmarks/package-info.java b/ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/package-info.java similarity index 100% rename from ubenchmark/src/main/java/org/apache/calcite/benchmarks/package-info.java rename to ubenchmark/src/main/jmh/org/apache/calcite/benchmarks/package-info.java
