[calcite] branch master updated: [CALCITE-4851] Build gives lots of 'Execution optimizations have been disabled' warnings

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new fd3c1d0  [CALCITE-4851] Build gives lots of 'Execution optimizations have been disabled' warnings
fd3c1d0 is described below

commit fd3c1d0bdf907d192d42c18b3aff5306eec650e7
Author: nobigo <no...@gmail.com>
AuthorDate: Tue Dec 7 21:40:20 2021 +0800

    [CALCITE-4851] Build gives lots of 'Execution optimizations have been disabled' warnings
---
 babel/build.gradle.kts  | 11 +++++++++++
 core/build.gradle.kts   | 13 +++++++++++++
 piglet/build.gradle.kts | 10 ++++++++++
 server/build.gradle.kts | 11 +++++++++++
 4 files changed, 45 insertions(+)

diff --git a/babel/build.gradle.kts b/babel/build.gradle.kts
index 0a5d8dd..ab14179 100644
--- a/babel/build.gradle.kts
+++ b/babel/build.gradle.kts
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import com.github.autostyle.gradle.AutostyleTask
+
 plugins {
     id("com.github.vlsi.ide")
     calcite.fmpp
@@ -52,6 +54,15 @@ val javaCCMain by tasks.registering(org.apache.calcite.buildtools.javacc.JavaCCT
     packageName.set("org.apache.calcite.sql.parser.babel")
 }
 
+tasks.withType<Checkstyle>().matching { it.name == "checkstyleMain" }
+    .configureEach {
+        mustRunAfter(javaCCMain)
+    }
+
+tasks.withType<AutostyleTask>().configureEach {
+    mustRunAfter(javaCCMain)
+}
+
 ide {
     fun generatedSource(javacc: TaskProvider<org.apache.calcite.buildtools.javacc.JavaCCTask>, sourceSet: String) =
         generatedJavaSources(javacc.get(), javacc.get().output.get().asFile, sourceSets.named(sourceSet))
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index c064929..093cd79 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import com.github.autostyle.gradle.AutostyleTask
 import com.github.vlsi.gradle.crlf.CrLfSpec
 import com.github.vlsi.gradle.crlf.LineEndings
 import com.github.vlsi.gradle.ide.dsl.settings
@@ -186,6 +187,18 @@ tasks.compileTestKotlin {
     dependsOn(javaCCTest)
 }
 
+tasks.withType<Checkstyle>().configureEach {
+    mustRunAfter(versionClass)
+    mustRunAfter(javaCCMain)
+    mustRunAfter(javaCCTest)
+}
+
+tasks.withType<AutostyleTask>().configureEach {
+    mustRunAfter(versionClass)
+    mustRunAfter(javaCCMain)
+    mustRunAfter(javaCCTest)
+}
+
 ide {
     fun generatedSource(javacc: TaskProvider<org.apache.calcite.buildtools.javacc.JavaCCTask>, sourceSet: String) =
         generatedJavaSources(javacc.get(), javacc.get().output.get().asFile, sourceSets.named(sourceSet))
diff --git a/piglet/build.gradle.kts b/piglet/build.gradle.kts
index e817954..8d8ab79 100644
--- a/piglet/build.gradle.kts
+++ b/piglet/build.gradle.kts
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import com.github.autostyle.gradle.AutostyleTask
 import com.github.vlsi.gradle.ide.dsl.settings
 import com.github.vlsi.gradle.ide.dsl.taskTriggers
 
@@ -71,6 +72,15 @@ val annotationProcessorMain by tasks.registering(JavaCompile::class) {
     configureAnnotationSet(sourceSets.main.get())
 }
 
+tasks.withType<Checkstyle>().matching { it.name == "checkstyleMain" }
+    .configureEach {
+        mustRunAfter(javaCCMain)
+    }
+
+tasks.withType<AutostyleTask>().configureEach {
+    mustRunAfter(javaCCMain)
+}
+
 ide {
     fun generatedSource(compile: TaskProvider<JavaCompile>) {
         project.rootProject.configure<org.gradle.plugins.ide.idea.model.IdeaModel> {
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 0e28a5f..161db9f 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import com.github.autostyle.gradle.AutostyleTask
+
 plugins {
     calcite.fmpp
     calcite.javacc
@@ -51,6 +53,15 @@ val javaCCMain by tasks.registering(org.apache.calcite.buildtools.javacc.JavaCCT
     packageName.set("org.apache.calcite.sql.parser.ddl")
 }
 
+tasks.withType<Checkstyle>().matching { it.name == "checkstyleMain" }
+    .configureEach {
+        mustRunAfter(javaCCMain)
+    }
+
+tasks.withType<AutostyleTask>().configureEach {
+    mustRunAfter(javaCCMain)
+}
+
 ide {
     fun generatedSource(javacc: TaskProvider<org.apache.calcite.buildtools.javacc.JavaCCTask>, sourceSet: String) =
         generatedJavaSources(javacc.get(), javacc.get().output.get().asFile, sourceSets.named(sourceSet))