You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vl...@apache.org on 2019/12/05 09:43:38 UTC

[calcite] branch drop_HydromaticFileSetCheck created (now f966d17)

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

vladimirsitnikov pushed a change to branch drop_HydromaticFileSetCheck
in repository https://gitbox.apache.org/repos/asf/calcite.git.


      at f966d17  [CALCITE-3559] Fix broken CALCITE-... links

This branch includes the following new commits:

     new 9895227  [CALCITE-3559] Drop HydromaticFileSetCheck, upgrade Checkstyle 7.8.2 -> 8.27
     new 6446291  [CALCITE-3559] Fix Checkstyle 8 findings
     new 21ed09c  [CALCITE-3559] Update formatting: remove "// End" trailers, move @Test from their own lines
     new fcfeed5  [CALCITE-3559] Improve the layout of parenthesis in code
     new f966d17  [CALCITE-3559] Fix broken CALCITE-... links

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[calcite] 05/05: [CALCITE-3559] Fix broken CALCITE-... links

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f966d1790eae400d9537066fbf97fc88a7a26ba3
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Thu Dec 5 12:38:24 2019 +0300

    [CALCITE-3559] Fix broken CALCITE-... links
---
 build.gradle.kts                                                     | 4 ++++
 core/src/test/java/org/apache/calcite/test/JdbcTest.java             | 2 +-
 core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java | 2 +-
 core/src/test/java/org/apache/calcite/test/ScannableTableTest.java   | 4 ++--
 core/src/test/java/org/apache/calcite/tools/PlannerTest.java         | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ccbc819..a55c631 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -426,6 +426,10 @@ allprojects {
                     // (?-m) disables multiline, so $ matches the very end of the file rather than end of line
                     replaceRegex("Remove '// End file.java' trailer", "(?-m)\n// End [^\n]++.\\w++\\s*+$", "")
                     replaceRegex("<p> should not be placed a the end of the line", "(?-m)\\s*+<p> *+\n \\* ", "\n *\n * <p>")
+                    // Assume developer copy-pasted the link, and updated text only, so the url is old, and we replace it with the proper one
+                    replaceRegex(">[CALCITE-...] link styles: 1", "<a(?:(?!CALCITE-)[^>])++CALCITE-\\d+[^>]++>\\s*+\\[?(CALCITE-\\d+)\\]?", "<a href=\"https://issues.apache.org/jira/browse/\$1\">[\$1]")
+                    // If the link was crafted manually, ensure it has [CALCITE-...] in the link text
+                    replaceRegex(">[CALCITE-...] link styles: 2", "<a(?:(?!CALCITE-)[^>])++(CALCITE-\\d+)[^>]++>\\s*+\\[?CALCITE-\\d+\\]?", "<a href=\"https://issues.apache.org/jira/browse/\$1\">[\$1]")
                     bumpThisNumberIfACustomStepChanges(1)
                     custom("((() preventer") { contents: String ->
                         ParenthesisBalancer.apply(contents)
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcTest.java b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
index 3650a82..05468e1 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -2113,7 +2113,7 @@ public class JdbcTest {
   }
 
   /** Test case for
-   * <a href="https://issues.apache.org/jira/browse/CALCITE-2381">[CALCITE-2391]
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-2391">[CALCITE-2391]
    * Aggregate query with UNNEST or LATERAL fails with
    * ClassCastException</a>. */
   @Test public void testAggUnnestColumn() {
diff --git a/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java b/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java
index 6a3e105..a4a63c5 100644
--- a/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java
+++ b/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java
@@ -853,7 +853,7 @@ public class ReflectiveSchemaTest {
   }
 
   /** Test case for
-   * <a href="https://issues.apache.org/jira/browse/CALCITE-281">[CALCITE-1919]
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-1919">[CALCITE-1919]
    * NPE when target in ReflectiveSchema belongs to the unnamed package</a>. */
   @Test public void testReflectiveSchemaInUnnamedPackage() throws Exception {
     final Driver driver = new Driver();
diff --git a/core/src/test/java/org/apache/calcite/test/ScannableTableTest.java b/core/src/test/java/org/apache/calcite/test/ScannableTableTest.java
index a46ac45..ed8997a 100644
--- a/core/src/test/java/org/apache/calcite/test/ScannableTableTest.java
+++ b/core/src/test/java/org/apache/calcite/test/ScannableTableTest.java
@@ -319,7 +319,7 @@ public class ScannableTableTest {
   }
 
   /** Test case for
-   * <a href="https://issues.apache.org/jira/browse/CALCITE-1031">[CALCITE-3405]
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-3405">[CALCITE-3405]
    * Prune columns for ProjectableFilterable when project is not simple mapping</a>. */
   @Test public void testPushNonSimpleMappingProject() throws Exception {
     final StringBuilder buf = new StringBuilder();
@@ -342,7 +342,7 @@ public class ScannableTableTest {
   }
 
   /** Test case for
-   * <a href="https://issues.apache.org/jira/browse/CALCITE-1031">[CALCITE-3405]
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-3405">[CALCITE-3405]
    * Prune columns for ProjectableFilterable when project is not simple mapping</a>. */
   @Test public void testPushSimpleMappingProject() throws Exception {
     final StringBuilder buf = new StringBuilder();
diff --git a/core/src/test/java/org/apache/calcite/tools/PlannerTest.java b/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
index 41be588..dfe9fee 100644
--- a/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
+++ b/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
@@ -1354,7 +1354,7 @@ public class PlannerTest {
   }
 
   /** Test case for
-   * <a href="https://issues.apache.org/jira/browse/CALCITE-648">[CALCITE-649]
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-648">[CALCITE-648]
    * Update ProjectMergeRule description for new naming convention</a>. */
   @Test public void testMergeProjectForceMode() throws Exception {
     RuleSet ruleSet =


[calcite] 01/05: [CALCITE-3559] Drop HydromaticFileSetCheck, upgrade Checkstyle 7.8.2 -> 8.27

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 9895227aedc89bbf7e331d132731aed70a2b84ad
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Tue Dec 3 21:42:59 2019 +0300

    [CALCITE-3559] Drop HydromaticFileSetCheck, upgrade Checkstyle 7.8.2 -> 8.27
---
 build.gradle.kts                                   |  39 ++++----
 buildSrc/settings.gradle.kts                       |   1 +
 buildSrc/subprojects/buildext/buildext.gradle.kts  |  26 ++++++
 .../calcite/buildtools/buildext/BuildExtPlugin.kt  |  27 ++++++
 .../buildtools/buildext/dsl/ParenthesisBalancer.kt | 101 +++++++++++++++++++++
 gradle.properties                                  |   4 +-
 src/main/config/checkstyle/checker.xml             |  74 ++++++++-------
 src/main/config/checkstyle/suppressions.xml        |  22 -----
 8 files changed, 216 insertions(+), 78 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 58003f9..ccbc819 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,12 +25,14 @@ import com.github.vlsi.gradle.properties.dsl.props
 import com.github.vlsi.gradle.release.RepositoryType
 import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApisExtension
+import org.apache.calcite.buildtools.buildext.dsl.ParenthesisBalancer
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
     publishing
     // Verification
     checkstyle
+    calcite.buildext
     id("com.diffplug.gradle.spotless")
     id("org.nosphere.apache.rat")
     id("com.github.spotbugs")
@@ -184,11 +186,11 @@ val buildSqllineClasspath by tasks.registering(Jar::class) {
     }
 }
 
-val semaphore = `java.util.concurrent`.Semaphore(1)
-
 val javaccGeneratedPatterns = arrayOf(
     "org/apache/calcite/jdbc/CalciteDriverVersion.java",
-    "**/parser/**/*ParserImpl*.*",
+    "**/parser/**/*ParserImpl.*",
+    "**/parser/**/*ParserImplConstants.*",
+    "**/parser/**/*ParserImplTokenManager.*",
     "**/parser/**/PigletParser.*",
     "**/parser/**/PigletParserConstants.*",
     "**/parser/**/ParseException.*",
@@ -260,18 +262,14 @@ allprojects {
     }
     if (!skipCheckstyle) {
         apply<CheckstylePlugin>()
-        dependencies {
-            checkstyle("com.puppycrawl.tools:checkstyle:${"checkstyle".v}")
-            checkstyle("net.hydromatic:toolbox:${"hydromatic-toolbox".v}")
-        }
         checkstyle {
-            // Current one is ~8.8
-            // https://github.com/julianhyde/toolbox/issues/3
+            toolVersion = "checkstyle".v
             isShowViolations = true
             configDirectory.set(File(rootDir, "src/main/config/checkstyle"))
             configFile = configDirectory.get().file("checker.xml").asFile
             configProperties = mapOf(
-                "base_dir" to rootDir.toString()
+                "base_dir" to rootDir.toString(),
+                "cache_file" to buildDir.resolve("checkstyle/cacheFile")
             )
         }
         tasks.register("checkstyleAll") {
@@ -283,15 +281,6 @@ allprojects {
             // On the other hand, supporessions.xml still analyzes the file, and
             // then it recognizes it should suppress all the output.
             excludeJavaCcGenerated()
-            // There are concurrency issues with Checkstyle 7.8.2
-            // It could be in Checkstyle, in CheckstyleAnt task or in Gradle's Checkstyle plugin
-            // The bug looks like as if suppression was not working
-            doFirst {
-                semaphore.acquire()
-            }
-            doLast {
-                semaphore.release()
-            }
         }
     }
     if (!skipSpotless || !skipCheckstyle) {
@@ -430,7 +419,17 @@ allprojects {
                     )
                     removeUnusedImports()
                     trimTrailingWhitespace()
-                    indentWithSpaces(4)
+                    indentWithSpaces(2)
+                    replaceRegex("@Override should not be on its own line", "(@Override)\\s{2,}", "\$1 ")
+                    replaceRegex("@Test should not be on its own line", "(@Test)\\s{2,}", "\$1 ")
+                    replaceRegex("Newline in string should be at end of line", """\\n" *\+""", "\\n\"\n  +")
+                    // (?-m) disables multiline, so $ matches the very end of the file rather than end of line
+                    replaceRegex("Remove '// End file.java' trailer", "(?-m)\n// End [^\n]++.\\w++\\s*+$", "")
+                    replaceRegex("<p> should not be placed a the end of the line", "(?-m)\\s*+<p> *+\n \\* ", "\n *\n * <p>")
+                    bumpThisNumberIfACustomStepChanges(1)
+                    custom("((() preventer") { contents: String ->
+                        ParenthesisBalancer.apply(contents)
+                    }
                     endWithNewline()
                 }
             }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 0e51e6a..727edf4 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -24,6 +24,7 @@ pluginManagement {
 
 include("javacc")
 include("fmpp")
+include("buildext")
 
 val upperCaseLetters = "\\p{Upper}".toRegex()
 
diff --git a/buildSrc/subprojects/buildext/buildext.gradle.kts b/buildSrc/subprojects/buildext/buildext.gradle.kts
new file mode 100644
index 0000000..e074f48
--- /dev/null
+++ b/buildSrc/subprojects/buildext/buildext.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+gradlePlugin {
+    plugins {
+        register("buildext") {
+            id = "calcite.buildext"
+            implementationClass = "org.apache.calcite.buildtools.buildext.BuildExtPlugin"
+        }
+    }
+}
diff --git a/buildSrc/subprojects/buildext/src/main/kotlin/org/apache/calcite/buildtools/buildext/BuildExtPlugin.kt b/buildSrc/subprojects/buildext/src/main/kotlin/org/apache/calcite/buildtools/buildext/BuildExtPlugin.kt
new file mode 100644
index 0000000..463fd08
--- /dev/null
+++ b/buildSrc/subprojects/buildext/src/main/kotlin/org/apache/calcite/buildtools/buildext/BuildExtPlugin.kt
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.calcite.buildtools.buildext
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class BuildExtPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+    }
+}
diff --git a/buildSrc/subprojects/buildext/src/main/kotlin/org/apache/calcite/buildtools/buildext/dsl/ParenthesisBalancer.kt b/buildSrc/subprojects/buildext/src/main/kotlin/org/apache/calcite/buildtools/buildext/dsl/ParenthesisBalancer.kt
new file mode 100644
index 0000000..f73de1b
--- /dev/null
+++ b/buildSrc/subprojects/buildext/src/main/kotlin/org/apache/calcite/buildtools/buildext/dsl/ParenthesisBalancer.kt
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.calcite.buildtools.buildext.dsl
+
+import java.util.function.Function
+
+private const val SINGLE_LINE_COMMENT = "//.*+"
+private const val MULTILINE_COMMENT = "/[*](?>\\\\[*]|[*][^/]|[^*])*+[*]/"
+private const val STRING_LITERAL = "\"(?>\\\\.|[^\"])*+\""
+private const val CHAR_LITERAL = "'(?>\\\\.|[^'])'"
+
+private const val KEYWORDS = "\\b(?>for|if|return|switch|try|while)\\b"
+private const val KEYWORD_BLOCK = "$KEYWORDS *\\("
+private const val WHITESPACE = "(?:(?!$KEYWORDS|[(),\"'/]).)++"
+
+// Below Regex matches one token at a time
+// That is it breaks if (!canCastFrom(/*comment*/callBinding, throwOnFailure into the following sequence
+// "if (", "!canCastFrom", "(", "/*comment*/", "callBinding", ",", " throwOnFailure"
+// This enables to skip strings, comments, and capture the position of commas and parenthesis
+
+private val tokenizer =
+    Regex("(?>$SINGLE_LINE_COMMENT|$MULTILINE_COMMENT|$STRING_LITERAL|$CHAR_LITERAL|$KEYWORD_BLOCK|$WHITESPACE|.)")
+private val looksLikeJavadoc = Regex("^ +\\* ")
+
+// Note: if you change the logic, please remember to update the value in
+// build.gradle.kts / bumpThisNumberIfACustomStepChanges
+// Otherwise spotless would assume the files are up to date
+object ParenthesisBalancer : Function<String, String> {
+    override fun apply(v: String): String = v.lines().map { line ->
+        if ('(' !in line || looksLikeJavadoc.containsMatchIn(line)) {
+            return@map line
+        }
+        var balance = 0
+        var seenOpen = false
+        var commaSplit = 0
+        var lastOpen = 0
+        for (m in tokenizer.findAll(line)) {
+            val range = m.range
+            if (range.last - range.first > 1) {
+                // parenthesis always take one char, so ignore long matches
+                continue
+            }
+            val c = line[range.first]
+            if (c == '(') {
+                seenOpen = true
+                if (balance == 0) {
+                    lastOpen = range.first + 1
+                }
+                balance += 1
+                continue
+            } else if (!seenOpen) {
+                continue
+            }
+            if (c == ',' && balance == 0) {
+                commaSplit = range.first + 1
+            }
+            if (c == ')') {
+                balance -= 1
+            }
+        }
+        if (balance <= 1) {
+            line
+        } else {
+            val indent = line.indexOfFirst { it != ' ' }
+            val res = if (commaSplit == 0) {
+                // f1(1,f2(2,...  pattern
+                //    ^-- lastOpen, commaSplit=0 (no split)
+                // It is split right after ('
+                line.substring(0, lastOpen) + "\n" + " ".repeat(indent + 4) +
+                        line.substring(lastOpen)
+            } else {
+                // f1(1), f2(2,...  pattern
+                //       ^   ^-- lastOpen
+                //        '-- commaSplit
+                // It is split twice: right after the comma, and after (
+                line.substring(0, commaSplit) +
+                        "\n" + " ".repeat(indent) +
+                        line.substring(commaSplit, lastOpen).trimStart(' ') +
+                        "\n" + " ".repeat(indent + 4) + line.substring(lastOpen)
+            }
+            // println("---\n$line\n->\n$res")
+            res
+        }
+    }.joinToString("\n")
+}
diff --git a/gradle.properties b/gradle.properties
index 890252e..1741fb5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -56,10 +56,8 @@ org.owasp.dependencycheck.version=5.2.2
 # docker-maven-plugin.version=1.2.0
 
 # Tools
-checkstyle.version=7.8.2
+checkstyle.version=8.27
 spotbugs.version=3.1.11
-# For Checkstyle
-hydromatic-toolbox.version=0.3
 
 # We support Guava versions as old as 14.0.1 (the version used by Hive)
 # but prefer more recent versions.
diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml
index b1c24a9..651e52c 100644
--- a/src/main/config/checkstyle/checker.xml
+++ b/src/main/config/checkstyle/checker.xml
@@ -32,6 +32,8 @@ limitations under the License.
 <module name="Checker">
   <property name="localeLanguage" value="en"/>
 
+  <property name="cacheFile" value="${cache_file}"/>
+
   <!-- Checks for headers -->
   <!-- See http://checkstyle.sf.net/config_header.html -->
     <!-- Verify that EVERY source file has the appropriate license -->
@@ -65,9 +67,16 @@ limitations under the License.
     <!-- No tabs allowed! -->
   <module name="FileTabCharacter"/>
 
-  <module name="TreeWalker">
-    <property name="cacheFile" value="build/checkstyle-cachefile"/>
+  <!-- Checks for Size Violations.                    -->
+  <!-- See http://checkstyle.sf.net/config_sizes.html -->
+  <!-- Lines cannot exceed 80 chars, except if they are hyperlinks
+       or strings (possibly preceded by '+' and followed by say '),'. -->
+  <module name="LineLength">
+    <property name="max" value="100"/>
+    <property name="ignorePattern" value="^import|@see|@link|@BaseMessage|href|^[ +]*&quot;.*&quot;[);,]*$"/>
+  </module>
 
+  <module name="TreeWalker">
     <!-- Checks for blocks. You know, those {}'s         -->
     <!-- See http://checkstyle.sf.net/config_blocks.html -->
       <!-- No empty blocks (i.e. catch); must contain at least a comment -->
@@ -206,27 +215,31 @@ limitations under the License.
       <property name="message" value="developers names should be in pom file"/>
     </module>
 
+    <module name="Regexp">
+      <property name="format" value="@param ++([^ ]++) *+[\r\n]"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="@param with no description. Please add description"/>
+    </module>
+
+    <module name="Regexp">
+      <property name="format" value="\{@link[^\r\n}]++[\r\n]"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="split @link. Please ensure {@link ..} is on a single line"/>
+    </module>
+
     <!-- No multi-line C-style comments except at start of line. -->
     <module name="Regexp">
-      <property name="format" value="^ +/\*[^*][^/]$"/>
+      <property name="format" value="^ ++/\*[^*][^/]$"/>
       <property name="illegalPattern" value="true"/>
       <property name="message" value="C-style comment"/>
     </module>
 
     <module name="Regexp">
-      <property name="format" value="^ +/\*$"/>
+      <property name="format" value="^ ++/\*$"/>
       <property name="illegalPattern" value="true"/>
       <property name="message" value="C-style comment"/>
     </module>
 
-    <!-- Checks for Size Violations.                    -->
-    <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <!-- Lines cannot exceed 80 chars, except if they are hyperlinks
-         or strings (possibly preceded by '+' and followed by say '),'. -->
-    <module name="LineLength">
-      <property name="max" value="100"/>
-      <property name="ignorePattern" value="^import|@see|@link|@BaseMessage|href|^[ +]*&quot;.*&quot;[);,]*$"/>
-    </module>
       <!-- Over time, we will revise this down -->
     <module name="MethodLength">
       <property name="max" value="370"/>
@@ -254,31 +267,26 @@ limitations under the License.
       <!-- No extra whitespace around types -->
     <module name="GenericWhitespace"/>
 
-    <!-- Required for SuppressionCommentFilter below -->
-    <module name="FileContentsHolder"/>
-  </module>
-
-  <!-- Setup special comments to suppress specific checks from source files -->
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CHECKSTYLE\: stop ([\w\|]+)"/>
-    <property name="onCommentFormat"  value="CHECKSTYLE\: resume ([\w\|]+)"/>
-    <property name="checkFormat"      value="$1"/>
-  </module>
+    <!-- Setup special comments to suppress specific checks from source files -->
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE\: stop ([\w\|]+)"/>
+      <property name="onCommentFormat"  value="CHECKSTYLE\: resume ([\w\|]+)"/>
+      <property name="checkFormat"      value="$1"/>
+    </module>
 
-  <!-- Turn off all checks between OFF and ON -->
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CHECKSTYLE\: OFF"/>
-    <property name="onCommentFormat"  value="CHECKSTYLE\: ON"/>
-  </module>
+    <!-- Turn off all checks between OFF and ON -->
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE\: OFF"/>
+      <property name="onCommentFormat"  value="CHECKSTYLE\: ON"/>
+    </module>
 
-  <!-- Turn off checks for the next N lines. -->
-  <module name="SuppressWithNearbyCommentFilter">
-    <property name="commentFormat" value="CHECKSTYLE: +IGNORE (\d+)"/>
-    <property name="influenceFormat" value="$1"/>
+    <!-- Turn off checks for the next N lines. -->
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat" value="CHECKSTYLE: +IGNORE (\d+)"/>
+      <property name="influenceFormat" value="$1"/>
+    </module>
   </module>
 
-  <module name="net.hydromatic.toolbox.checkstyle.HydromaticFileSetCheck"/>
-
   <module name="SuppressionFilter">
     <property name="file" value="${base_dir}/src/main/config/checkstyle/suppressions.xml"/>
   </module>
diff --git a/src/main/config/checkstyle/suppressions.xml b/src/main/config/checkstyle/suppressions.xml
index d6f7818..8f597b1 100644
--- a/src/main/config/checkstyle/suppressions.xml
+++ b/src/main/config/checkstyle/suppressions.xml
@@ -19,24 +19,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <suppressions>
-  <!-- Suppress checks on generated files. -->
-  <suppress checks="Header" files="LICENSE"/>
-  <suppress checks="Header" files="NOTICE"/>
-  <suppress checks=".*" files="Foo.java"/>
-  <suppress checks=".*" files="[/\\]target[/\\]maven-archiver[/\\]pom.properties"/>
-  <suppress checks=".*" files="[/\\]target[/\\]generated-sources[/\\]"/>
-  <suppress checks=".*" files="[/\\]target[/\\]generated-test-sources[/\\]"/>
-  <suppress checks=".*" files="[/\\]target[/\\]embeddedCassandra[/\\]log4j-embedded-cassandra.properties"/>
-  <suppress checks=".*" files="org[/\\]apache[/\\]calcite[/\\]runtime[/\\]Resources.java"/>
-
-  <suppress checks=".*" files="git.properties"/>
-  <suppress checks=".*" files="release.properties"/>
-  <suppress checks=".*" files="auth-users.properties"/>
-
-  <!-- This file triggers https://github.com/checkstyle/checkstyle/issues/92,
-       through no fault of its own. -->
-  <suppress checks=".*" files="SqlSimpleParser.java"/>
-
   <!-- Don't complain about field names such as cust_id -->
   <suppress checks=".*Name" files="JdbcExample.java"/>
 
@@ -46,10 +28,6 @@ limitations under the License.
   <!-- Suppress JavadocPackage in the test packages -->
   <suppress checks="JavadocPackage" files="src[/\\]test[/\\]java[/\\]"/>
 
-  <!-- And likewise in ubenchmark -->
-  <suppress checks="JavadocPackage" files="StatementTest.java"/>
-  <suppress checks="JavadocPackage" files="CodeGenerationBenchmark.java"/>
-
   <!-- Method names in Resource can have underscores -->
   <suppress checks="MethodName" files="CalciteResource.java"/>
 </suppressions>


[calcite] 03/05: [CALCITE-3559] Update formatting: remove "// End" trailers, move @Test from their own lines

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 21ed09cf49e1c4163d8e3421e18a01055e041e67
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Tue Dec 3 21:44:13 2019 +0300

    [CALCITE-3559] Update formatting: remove "// End" trailers, move @Test from their own lines
---
 babel/src/main/codegen/includes/parserImpls.ftl    |   2 -
 .../java/org/apache/calcite/sql/babel/Babel.java   |   2 -
 .../org/apache/calcite/sql/babel/package-info.java |   2 -
 .../org/apache/calcite/test/BabelParserTest.java   |   2 -
 .../org/apache/calcite/test/BabelQuidemTest.java   |   2 -
 .../java/org/apache/calcite/test/BabelTest.java    |   2 -
 .../adapter/cassandra/CassandraEnumerator.java     |   2 -
 .../calcite/adapter/cassandra/CassandraFilter.java |   2 -
 .../calcite/adapter/cassandra/CassandraLimit.java  |   2 -
 .../calcite/adapter/cassandra/CassandraMethod.java |   2 -
 .../adapter/cassandra/CassandraProject.java        |   2 -
 .../calcite/adapter/cassandra/CassandraRel.java    |   2 -
 .../calcite/adapter/cassandra/CassandraRules.java  |   2 -
 .../calcite/adapter/cassandra/CassandraSchema.java |   2 -
 .../adapter/cassandra/CassandraSchemaFactory.java  |   2 -
 .../calcite/adapter/cassandra/CassandraSort.java   |   2 -
 .../calcite/adapter/cassandra/CassandraTable.java  |   2 -
 .../adapter/cassandra/CassandraTableScan.java      |   2 -
 .../cassandra/CassandraToEnumerableConverter.java  |   2 -
 .../CassandraToEnumerableConverterRule.java        |   2 -
 .../calcite/adapter/cassandra/package-info.java    |   2 -
 .../apache/calcite/test/CassandraAdapterTest.java  |   2 -
 core/src/main/codegen/templates/Parser.jj          |   2 -
 .../main/java/org/apache/calcite/DataContext.java  |   2 -
 core/src/main/java/org/apache/calcite/Demo.java    |   2 -
 .../apache/calcite/adapter/Java9Workaround.java    |   2 -
 .../apache/calcite/adapter/clone/ArrayTable.java   |   2 -
 .../apache/calcite/adapter/clone/CloneSchema.java  |   2 -
 .../apache/calcite/adapter/clone/ColumnLoader.java |   2 -
 .../apache/calcite/adapter/clone/ListTable.java    |   2 -
 .../apache/calcite/adapter/clone/package-info.java |   2 -
 .../calcite/adapter/enumerable/AggAddContext.java  |   2 -
 .../calcite/adapter/enumerable/AggContext.java     |   2 -
 .../calcite/adapter/enumerable/AggImpState.java    |   2 -
 .../calcite/adapter/enumerable/AggImplementor.java |   2 -
 .../adapter/enumerable/AggResetContext.java        |   2 -
 .../adapter/enumerable/AggResultContext.java       |   2 -
 .../adapter/enumerable/AggregateLambdaFactory.java |   2 -
 .../enumerable/BasicAggregateLambdaFactory.java    |   2 -
 .../adapter/enumerable/BasicLazyAccumulator.java   |   2 -
 .../adapter/enumerable/CallImplementor.java        |   2 -
 .../calcite/adapter/enumerable/EnumUtils.java      |   2 -
 .../adapter/enumerable/EnumerableAggregate.java    |   2 -
 .../enumerable/EnumerableAggregateRule.java        |   2 -
 .../enumerable/EnumerableBatchNestedLoopJoin.java  |   2 -
 .../EnumerableBatchNestedLoopJoinRule.java         |   2 -
 .../adapter/enumerable/EnumerableBindable.java     |   2 -
 .../calcite/adapter/enumerable/EnumerableCalc.java |   2 -
 .../adapter/enumerable/EnumerableCalcRule.java     |   2 -
 .../adapter/enumerable/EnumerableCollect.java      |   2 -
 .../adapter/enumerable/EnumerableCollectRule.java  |   2 -
 .../adapter/enumerable/EnumerableConvention.java   |   2 -
 .../adapter/enumerable/EnumerableCorrelate.java    |   2 -
 .../enumerable/EnumerableCorrelateRule.java        |   2 -
 .../adapter/enumerable/EnumerableFilter.java       |   2 -
 .../adapter/enumerable/EnumerableFilterRule.java   |   2 -
 .../enumerable/EnumerableFilterToCalcRule.java     |   2 -
 .../adapter/enumerable/EnumerableHashJoin.java     |   2 -
 .../enumerable/EnumerableInterpretable.java        |   2 -
 .../adapter/enumerable/EnumerableInterpreter.java  |   2 -
 .../enumerable/EnumerableInterpreterRule.java      |   2 -
 .../adapter/enumerable/EnumerableIntersect.java    |   2 -
 .../enumerable/EnumerableIntersectRule.java        |   2 -
 .../adapter/enumerable/EnumerableJoinRule.java     |   2 -
 .../adapter/enumerable/EnumerableLimit.java        |   2 -
 .../adapter/enumerable/EnumerableLimitRule.java    |   2 -
 .../adapter/enumerable/EnumerableMatch.java        |   2 -
 .../adapter/enumerable/EnumerableMatchRule.java    |   2 -
 .../adapter/enumerable/EnumerableMergeJoin.java    |   2 -
 .../enumerable/EnumerableMergeJoinRule.java        |   2 -
 .../adapter/enumerable/EnumerableMinus.java        |   2 -
 .../adapter/enumerable/EnumerableMinusRule.java    |   2 -
 .../enumerable/EnumerableNestedLoopJoin.java       |   2 -
 .../adapter/enumerable/EnumerableProject.java      |   2 -
 .../adapter/enumerable/EnumerableProjectRule.java  |   2 -
 .../enumerable/EnumerableProjectToCalcRule.java    |   2 -
 .../calcite/adapter/enumerable/EnumerableRel.java  |   2 -
 .../enumerable/EnumerableRelImplementor.java       |   2 -
 .../adapter/enumerable/EnumerableRepeatUnion.java  |   2 -
 .../enumerable/EnumerableRepeatUnionRule.java      |   2 -
 .../adapter/enumerable/EnumerableRules.java        |   2 -
 .../calcite/adapter/enumerable/EnumerableSort.java |   2 -
 .../adapter/enumerable/EnumerableSortRule.java     |   2 -
 .../enumerable/EnumerableTableFunctionScan.java    |   2 -
 .../EnumerableTableFunctionScanRule.java           |   2 -
 .../adapter/enumerable/EnumerableTableModify.java  |   2 -
 .../enumerable/EnumerableTableModifyRule.java      |   2 -
 .../adapter/enumerable/EnumerableTableScan.java    |   2 -
 .../enumerable/EnumerableTableScanRule.java        |   2 -
 .../adapter/enumerable/EnumerableTableSpool.java   |   2 -
 .../enumerable/EnumerableTableSpoolRule.java       |   2 -
 .../adapter/enumerable/EnumerableUncollect.java    |   2 -
 .../enumerable/EnumerableUncollectRule.java        |   2 -
 .../adapter/enumerable/EnumerableUnion.java        |   2 -
 .../adapter/enumerable/EnumerableUnionRule.java    |   2 -
 .../adapter/enumerable/EnumerableValues.java       |   2 -
 .../adapter/enumerable/EnumerableValuesRule.java   |   2 -
 .../adapter/enumerable/EnumerableWindow.java       |   2 -
 .../adapter/enumerable/EnumerableWindowRule.java   |   2 -
 .../adapter/enumerable/JavaRelImplementor.java     |   2 -
 .../calcite/adapter/enumerable/JavaRowFormat.java  |   2 -
 .../enumerable/LazyAggregateLambdaFactory.java     |   2 -
 .../adapter/enumerable/MatchImplementor.java       |   2 -
 .../calcite/adapter/enumerable/MatchUtils.java     |   2 -
 .../adapter/enumerable/NestedBlockBuilder.java     |   2 -
 .../adapter/enumerable/NestedBlockBuilderImpl.java |   2 -
 .../adapter/enumerable/NotNullImplementor.java     |   2 -
 .../calcite/adapter/enumerable/NullPolicy.java     |   2 -
 .../calcite/adapter/enumerable/PhysType.java       |   2 -
 .../calcite/adapter/enumerable/PhysTypeImpl.java   |   2 -
 .../ReflectiveCallNotNullImplementor.java          |   2 -
 .../calcite/adapter/enumerable/RexImpTable.java    |   2 -
 .../adapter/enumerable/RexToLixTranslator.java     |   2 -
 .../calcite/adapter/enumerable/SourceSorter.java   |   2 -
 .../adapter/enumerable/StrictAggImplementor.java   |   2 -
 .../enumerable/StrictWinAggImplementor.java        |   2 -
 .../adapter/enumerable/WinAggAddContext.java       |   2 -
 .../calcite/adapter/enumerable/WinAggContext.java  |   2 -
 .../adapter/enumerable/WinAggFrameContext.java     |   2 -
 .../enumerable/WinAggFrameResultContext.java       |   2 -
 .../adapter/enumerable/WinAggImplementor.java      |   2 -
 .../adapter/enumerable/WinAggResetContext.java     |   2 -
 .../adapter/enumerable/WinAggResultContext.java    |   2 -
 .../adapter/enumerable/impl/AggAddContextImpl.java |   2 -
 .../enumerable/impl/AggResetContextImpl.java       |   2 -
 .../enumerable/impl/AggResultContextImpl.java      |   2 -
 .../enumerable/impl/WinAggAddContextImpl.java      |   2 -
 .../enumerable/impl/WinAggResetContextImpl.java    |   2 -
 .../enumerable/impl/WinAggResultContextImpl.java   |   2 -
 .../adapter/enumerable/impl/package-info.java      |   2 -
 .../calcite/adapter/enumerable/package-info.java   |   2 -
 .../adapter/java/AbstractQueryableTable.java       |   2 -
 .../org/apache/calcite/adapter/java/Array.java     |   2 -
 .../calcite/adapter/java/JavaTypeFactory.java      |   2 -
 .../java/org/apache/calcite/adapter/java/Map.java  |   2 -
 .../calcite/adapter/java/ReflectiveSchema.java     |   2 -
 .../apache/calcite/adapter/java/package-info.java  |   2 -
 .../calcite/adapter/jdbc/JdbcCatalogSchema.java    |   2 -
 .../calcite/adapter/jdbc/JdbcConvention.java       |   2 -
 .../calcite/adapter/jdbc/JdbcImplementor.java      |   2 -
 .../calcite/adapter/jdbc/JdbcQueryProvider.java    |   2 -
 .../org/apache/calcite/adapter/jdbc/JdbcRel.java   |   2 -
 .../org/apache/calcite/adapter/jdbc/JdbcRules.java |   2 -
 .../apache/calcite/adapter/jdbc/JdbcSchema.java    |   2 -
 .../org/apache/calcite/adapter/jdbc/JdbcTable.java |   2 -
 .../apache/calcite/adapter/jdbc/JdbcTableScan.java |   2 -
 .../adapter/jdbc/JdbcToEnumerableConverter.java    |   2 -
 .../jdbc/JdbcToEnumerableConverterRule.java        |   2 -
 .../org/apache/calcite/adapter/jdbc/JdbcUtils.java |   2 -
 .../apache/calcite/adapter/jdbc/package-info.java  |   2 -
 .../org/apache/calcite/adapter/package-info.java   |   2 -
 .../calcite/config/CalciteConnectionConfig.java    |   2 -
 .../config/CalciteConnectionConfigImpl.java        |   2 -
 .../calcite/config/CalciteConnectionProperty.java  |   2 -
 .../calcite/config/CalciteSystemProperty.java      |   2 -
 .../main/java/org/apache/calcite/config/Lex.java   |   2 -
 .../org/apache/calcite/config/NullCollation.java   |   2 -
 .../org/apache/calcite/config/package-info.java    |   2 -
 .../calcite/interpreter/AbstractSingleNode.java    |   2 -
 .../apache/calcite/interpreter/AggregateNode.java  |   2 -
 .../calcite/interpreter/BindableConvention.java    |   2 -
 .../apache/calcite/interpreter/BindableRel.java    |   2 -
 .../org/apache/calcite/interpreter/Bindables.java  |   2 -
 .../apache/calcite/interpreter/CollectNode.java    |   2 -
 .../org/apache/calcite/interpreter/Compiler.java   |   2 -
 .../org/apache/calcite/interpreter/Context.java    |   2 -
 .../org/apache/calcite/interpreter/FilterNode.java |   2 -
 .../interpreter/InterpretableConvention.java       |   2 -
 .../interpreter/InterpretableConverter.java        |   2 -
 .../calcite/interpreter/InterpretableRel.java      |   2 -
 .../apache/calcite/interpreter/Interpreter.java    |   2 -
 .../apache/calcite/interpreter/Interpreters.java   |   2 -
 .../calcite/interpreter/JaninoRexCompiler.java     |   2 -
 .../org/apache/calcite/interpreter/JoinNode.java   |   2 -
 .../org/apache/calcite/interpreter/MatchNode.java  |   2 -
 .../java/org/apache/calcite/interpreter/Node.java  |   2 -
 .../java/org/apache/calcite/interpreter/Nodes.java |   2 -
 .../interpreter/NoneToBindableConverterRule.java   |   2 -
 .../apache/calcite/interpreter/ProjectNode.java    |   2 -
 .../java/org/apache/calcite/interpreter/Row.java   |   2 -
 .../org/apache/calcite/interpreter/Scalar.java     |   2 -
 .../org/apache/calcite/interpreter/SetOpNode.java  |   2 -
 .../java/org/apache/calcite/interpreter/Sink.java  |   2 -
 .../org/apache/calcite/interpreter/SortNode.java   |   2 -
 .../org/apache/calcite/interpreter/Source.java     |   2 -
 .../apache/calcite/interpreter/TableScanNode.java  |   2 -
 .../org/apache/calcite/interpreter/UnionNode.java  |   2 -
 .../org/apache/calcite/interpreter/ValuesNode.java |   2 -
 .../org/apache/calcite/interpreter/WindowNode.java |   2 -
 .../apache/calcite/interpreter/package-info.java   |   2 -
 .../apache/calcite/jdbc/CachingCalciteSchema.java  |   2 -
 .../org/apache/calcite/jdbc/CalciteConnection.java |   2 -
 .../apache/calcite/jdbc/CalciteConnectionImpl.java |   2 -
 .../org/apache/calcite/jdbc/CalciteFactory.java    |   2 -
 .../apache/calcite/jdbc/CalciteJdbc41Factory.java  |   2 -
 .../org/apache/calcite/jdbc/CalciteMetaImpl.java   |   2 -
 .../org/apache/calcite/jdbc/CalcitePrepare.java    |   2 -
 .../calcite/jdbc/CalcitePreparedStatement.java     |   2 -
 .../org/apache/calcite/jdbc/CalciteResultSet.java  |   2 -
 .../org/apache/calcite/jdbc/CalciteRootSchema.java |   2 -
 .../org/apache/calcite/jdbc/CalciteSchema.java     |   2 -
 .../org/apache/calcite/jdbc/CalciteStatement.java  |   2 -
 .../apache/calcite/jdbc/ContextSqlValidator.java   |   2 -
 .../main/java/org/apache/calcite/jdbc/Driver.java  |   2 -
 .../org/apache/calcite/jdbc/JavaRecordType.java    |   2 -
 .../apache/calcite/jdbc/JavaTypeFactoryImpl.java   |   2 -
 .../org/apache/calcite/jdbc/MetadataSchema.java    |   2 -
 .../apache/calcite/jdbc/SimpleCalciteSchema.java   |   2 -
 .../apache/calcite/jdbc/SqlTimeoutException.java   |   2 -
 .../java/org/apache/calcite/jdbc/package-info.java |   2 -
 .../CachingLatticeStatisticProvider.java           |   2 -
 .../DelegatingLatticeStatisticProvider.java        |   2 -
 .../org/apache/calcite/materialize/Lattice.java    |   2 -
 .../calcite/materialize/LatticeChildNode.java      |   2 -
 .../apache/calcite/materialize/LatticeNode.java    |   2 -
 .../calcite/materialize/LatticeRootNode.java       |   2 -
 .../apache/calcite/materialize/LatticeSpace.java   |   2 -
 .../materialize/LatticeStatisticProvider.java      |   2 -
 .../calcite/materialize/LatticeSuggester.java      |   2 -
 .../apache/calcite/materialize/LatticeTable.java   |   2 -
 .../org/apache/calcite/materialize/Lattices.java   |   2 -
 .../calcite/materialize/MaterializationActor.java  |   2 -
 .../calcite/materialize/MaterializationKey.java    |   2 -
 .../materialize/MaterializationService.java        |   2 -
 .../apache/calcite/materialize/MutableNode.java    |   2 -
 .../java/org/apache/calcite/materialize/Path.java  |   2 -
 .../ProfilerLatticeStatisticProvider.java          |   2 -
 .../materialize/SqlLatticeStatisticProvider.java   |   2 -
 .../calcite/materialize/SqlStatisticProvider.java  |   2 -
 .../java/org/apache/calcite/materialize/Step.java  |   2 -
 .../org/apache/calcite/materialize/TileKey.java    |   2 -
 .../apache/calcite/materialize/TileSuggester.java  |   2 -
 .../apache/calcite/materialize/package-info.java   |   2 -
 .../java/org/apache/calcite/model/JsonColumn.java  |   2 -
 .../org/apache/calcite/model/JsonCustomSchema.java |   2 -
 .../org/apache/calcite/model/JsonCustomTable.java  |   2 -
 .../org/apache/calcite/model/JsonFunction.java     |   2 -
 .../org/apache/calcite/model/JsonJdbcSchema.java   |   2 -
 .../java/org/apache/calcite/model/JsonLattice.java |   2 -
 .../org/apache/calcite/model/JsonMapSchema.java    |   2 -
 .../apache/calcite/model/JsonMaterialization.java  |   2 -
 .../java/org/apache/calcite/model/JsonMeasure.java |   2 -
 .../java/org/apache/calcite/model/JsonRoot.java    |   2 -
 .../java/org/apache/calcite/model/JsonSchema.java  |   2 -
 .../java/org/apache/calcite/model/JsonStream.java  |   2 -
 .../java/org/apache/calcite/model/JsonTable.java   |   2 -
 .../java/org/apache/calcite/model/JsonTile.java    |   2 -
 .../java/org/apache/calcite/model/JsonType.java    |   2 -
 .../apache/calcite/model/JsonTypeAttribute.java    |   2 -
 .../java/org/apache/calcite/model/JsonView.java    |   2 -
 .../org/apache/calcite/model/ModelHandler.java     |   2 -
 .../org/apache/calcite/model/package-info.java     |   2 -
 .../main/java/org/apache/calcite/package-info.java |   2 -
 .../apache/calcite/plan/AbstractRelOptPlanner.java |   2 -
 .../apache/calcite/plan/CommonRelSubExprRule.java  |   2 -
 .../main/java/org/apache/calcite/plan/Context.java |   2 -
 .../java/org/apache/calcite/plan/Contexts.java     |   2 -
 .../java/org/apache/calcite/plan/Convention.java   |   2 -
 .../apache/calcite/plan/ConventionTraitDef.java    |   2 -
 .../plan/MaterializedViewSubstitutionVisitor.java  |   2 -
 .../calcite/plan/MulticastRelOptListener.java      |   2 -
 .../org/apache/calcite/plan/RelCompositeTrait.java |   2 -
 .../org/apache/calcite/plan/RelImplementor.java    |   2 -
 .../org/apache/calcite/plan/RelMultipleTrait.java  |   2 -
 .../apache/calcite/plan/RelOptAbstractTable.java   |   2 -
 .../org/apache/calcite/plan/RelOptCluster.java     |   2 -
 .../org/apache/calcite/plan/RelOptConnection.java  |   2 -
 .../java/org/apache/calcite/plan/RelOptCost.java   |   2 -
 .../org/apache/calcite/plan/RelOptCostFactory.java |   2 -
 .../org/apache/calcite/plan/RelOptCostImpl.java    |   2 -
 .../org/apache/calcite/plan/RelOptLattice.java     |   2 -
 .../org/apache/calcite/plan/RelOptListener.java    |   2 -
 .../apache/calcite/plan/RelOptMaterialization.java |   2 -
 .../calcite/plan/RelOptMaterializations.java       |   2 -
 .../java/org/apache/calcite/plan/RelOptNode.java   |   2 -
 .../org/apache/calcite/plan/RelOptPlanner.java     |   2 -
 .../apache/calcite/plan/RelOptPredicateList.java   |   2 -
 .../java/org/apache/calcite/plan/RelOptQuery.java  |   2 -
 .../java/org/apache/calcite/plan/RelOptRule.java   |   2 -
 .../org/apache/calcite/plan/RelOptRuleCall.java    |   2 -
 .../org/apache/calcite/plan/RelOptRuleOperand.java |   2 -
 .../calcite/plan/RelOptRuleOperandChildPolicy.java |   2 -
 .../calcite/plan/RelOptRuleOperandChildren.java    |   2 -
 .../java/org/apache/calcite/plan/RelOptRules.java  |   2 -
 .../calcite/plan/RelOptSamplingParameters.java     |   2 -
 .../java/org/apache/calcite/plan/RelOptSchema.java |   2 -
 .../calcite/plan/RelOptSchemaWithSampling.java     |   2 -
 .../java/org/apache/calcite/plan/RelOptTable.java  |   2 -
 .../java/org/apache/calcite/plan/RelOptUtil.java   |   2 -
 .../java/org/apache/calcite/plan/RelTrait.java     |   2 -
 .../java/org/apache/calcite/plan/RelTraitDef.java  |   2 -
 .../calcite/plan/RelTraitPropagationVisitor.java   |   2 -
 .../java/org/apache/calcite/plan/RelTraitSet.java  |   2 -
 .../apache/calcite/plan/RexImplicationChecker.java |   2 -
 .../main/java/org/apache/calcite/plan/Strong.java  |   2 -
 .../apache/calcite/plan/SubstitutionVisitor.java   |   2 -
 .../org/apache/calcite/plan/TableAccessMap.java    |   2 -
 .../org/apache/calcite/plan/ViewExpanders.java     |   2 -
 .../apache/calcite/plan/VisitorDataContext.java    |   2 -
 .../apache/calcite/plan/hep/HepInstruction.java    |   2 -
 .../org/apache/calcite/plan/hep/HepMatchOrder.java |   2 -
 .../org/apache/calcite/plan/hep/HepPlanner.java    |   2 -
 .../org/apache/calcite/plan/hep/HepProgram.java    |   2 -
 .../apache/calcite/plan/hep/HepProgramBuilder.java |   2 -
 .../calcite/plan/hep/HepRelMetadataProvider.java   |   2 -
 .../org/apache/calcite/plan/hep/HepRelVertex.java  |   2 -
 .../org/apache/calcite/plan/hep/HepRuleCall.java   |   2 -
 .../org/apache/calcite/plan/hep/package-info.java  |   2 -
 .../java/org/apache/calcite/plan/package-info.java |   2 -
 .../calcite/plan/volcano/AbstractConverter.java    |   2 -
 .../ChainedPhaseRuleMappingInitializer.java        |   2 -
 .../org/apache/calcite/plan/volcano/RelSet.java    |   2 -
 .../org/apache/calcite/plan/volcano/RelSubset.java |   2 -
 .../org/apache/calcite/plan/volcano/RuleQueue.java |   2 -
 .../apache/calcite/plan/volcano/VolcanoCost.java   |   2 -
 .../calcite/plan/volcano/VolcanoPlanner.java       |   2 -
 .../calcite/plan/volcano/VolcanoPlannerPhase.java  |   2 -
 .../VolcanoPlannerPhaseRuleMappingInitializer.java |   2 -
 .../plan/volcano/VolcanoRelMetadataProvider.java   |   2 -
 .../calcite/plan/volcano/VolcanoRuleCall.java      |   2 -
 .../calcite/plan/volcano/VolcanoRuleMatch.java     |   2 -
 .../apache/calcite/plan/volcano/package-info.java  |   2 -
 .../calcite/prepare/CalciteCatalogReader.java      |   2 -
 .../calcite/prepare/CalciteMaterializer.java       |   2 -
 .../apache/calcite/prepare/CalcitePrepareImpl.java |   2 -
 .../calcite/prepare/CalciteSqlValidator.java       |   2 -
 .../apache/calcite/prepare/LixToRelTranslator.java |   2 -
 .../org/apache/calcite/prepare/PlannerImpl.java    |   2 -
 .../java/org/apache/calcite/prepare/Prepare.java   |   2 -
 .../calcite/prepare/QueryableRelBuilder.java       |   2 -
 .../apache/calcite/prepare/RelOptTableImpl.java    |   2 -
 .../org/apache/calcite/prepare/package-info.java   |   2 -
 .../java/org/apache/calcite/profile/Profiler.java  |   2 -
 .../org/apache/calcite/profile/ProfilerImpl.java   |   2 -
 .../org/apache/calcite/profile/SimpleProfiler.java |   2 -
 .../org/apache/calcite/profile/package-info.java   |   2 -
 .../org/apache/calcite/rel/AbstractRelNode.java    |   2 -
 .../main/java/org/apache/calcite/rel/BiRel.java    |   2 -
 .../apache/calcite/rel/InvalidRelException.java    |   2 -
 .../java/org/apache/calcite/rel/RelCollation.java  |   2 -
 .../org/apache/calcite/rel/RelCollationImpl.java   |   2 -
 .../apache/calcite/rel/RelCollationTraitDef.java   |   2 -
 .../java/org/apache/calcite/rel/RelCollations.java |   2 -
 .../org/apache/calcite/rel/RelDistribution.java    |   2 -
 .../calcite/rel/RelDistributionTraitDef.java       |   2 -
 .../org/apache/calcite/rel/RelDistributions.java   |   2 -
 .../org/apache/calcite/rel/RelFieldCollation.java  |   2 -
 .../apache/calcite/rel/RelHomogeneousShuttle.java  |   2 -
 .../main/java/org/apache/calcite/rel/RelInput.java |   2 -
 .../main/java/org/apache/calcite/rel/RelNode.java  |   2 -
 .../main/java/org/apache/calcite/rel/RelNodes.java |   2 -
 .../calcite/rel/RelReferentialConstraint.java      |   2 -
 .../calcite/rel/RelReferentialConstraintImpl.java  |   2 -
 .../main/java/org/apache/calcite/rel/RelRoot.java  |   2 -
 .../java/org/apache/calcite/rel/RelShuttle.java    |   2 -
 .../org/apache/calcite/rel/RelShuttleImpl.java     |   2 -
 .../java/org/apache/calcite/rel/RelVisitor.java    |   2 -
 .../java/org/apache/calcite/rel/RelWriter.java     |   2 -
 .../java/org/apache/calcite/rel/SingleRel.java     |   2 -
 .../org/apache/calcite/rel/convert/Converter.java  |   2 -
 .../apache/calcite/rel/convert/ConverterImpl.java  |   2 -
 .../apache/calcite/rel/convert/ConverterRule.java  |   2 -
 .../apache/calcite/rel/convert/NoneConverter.java  |   2 -
 .../calcite/rel/convert/TraitMatchingRule.java     |   2 -
 .../apache/calcite/rel/convert/package-info.java   |   2 -
 .../org/apache/calcite/rel/core/Aggregate.java     |   2 -
 .../org/apache/calcite/rel/core/AggregateCall.java |   2 -
 .../java/org/apache/calcite/rel/core/Calc.java     |   2 -
 .../java/org/apache/calcite/rel/core/Collect.java  |   2 -
 .../org/apache/calcite/rel/core/Correlate.java     |   2 -
 .../org/apache/calcite/rel/core/CorrelationId.java |   2 -
 .../java/org/apache/calcite/rel/core/EquiJoin.java |   2 -
 .../java/org/apache/calcite/rel/core/Exchange.java |   2 -
 .../java/org/apache/calcite/rel/core/Filter.java   |   2 -
 .../org/apache/calcite/rel/core/Intersect.java     |   2 -
 .../java/org/apache/calcite/rel/core/Join.java     |   2 -
 .../java/org/apache/calcite/rel/core/JoinInfo.java |   2 -
 .../org/apache/calcite/rel/core/JoinRelType.java   |   2 -
 .../java/org/apache/calcite/rel/core/Match.java    |   2 -
 .../java/org/apache/calcite/rel/core/Minus.java    |   2 -
 .../java/org/apache/calcite/rel/core/Project.java  |   2 -
 .../org/apache/calcite/rel/core/RelFactories.java  |   2 -
 .../org/apache/calcite/rel/core/RepeatUnion.java   |   2 -
 .../java/org/apache/calcite/rel/core/Sample.java   |   2 -
 .../java/org/apache/calcite/rel/core/SetOp.java    |   2 -
 .../java/org/apache/calcite/rel/core/Snapshot.java |   2 -
 .../java/org/apache/calcite/rel/core/Sort.java     |   2 -
 .../org/apache/calcite/rel/core/SortExchange.java  |   2 -
 .../java/org/apache/calcite/rel/core/Spool.java    |   2 -
 .../apache/calcite/rel/core/TableFunctionScan.java |   2 -
 .../org/apache/calcite/rel/core/TableModify.java   |   2 -
 .../org/apache/calcite/rel/core/TableScan.java     |   2 -
 .../org/apache/calcite/rel/core/TableSpool.java    |   2 -
 .../org/apache/calcite/rel/core/Uncollect.java     |   2 -
 .../java/org/apache/calcite/rel/core/Union.java    |   2 -
 .../java/org/apache/calcite/rel/core/Values.java   |   2 -
 .../java/org/apache/calcite/rel/core/Window.java   |   2 -
 .../org/apache/calcite/rel/core/package-info.java  |   2 -
 .../calcite/rel/externalize/RelEnumTypes.java      |   2 -
 .../apache/calcite/rel/externalize/RelJson.java    |   2 -
 .../calcite/rel/externalize/RelJsonReader.java     |   2 -
 .../calcite/rel/externalize/RelJsonWriter.java     |   2 -
 .../calcite/rel/externalize/RelWriterImpl.java     |   2 -
 .../calcite/rel/externalize/RelXmlWriter.java      |   2 -
 .../calcite/rel/externalize/package-info.java      |   2 -
 .../calcite/rel/hint/ExplicitHintMatcher.java      |   2 -
 .../calcite/rel/hint/ExplicitHintStrategy.java     |   2 -
 .../apache/calcite/rel/hint/HintStrategies.java    |   2 -
 .../org/apache/calcite/rel/hint/HintStrategy.java  |   2 -
 .../calcite/rel/hint/HintStrategyCascade.java      |   2 -
 .../apache/calcite/rel/hint/HintStrategyTable.java |   2 -
 .../java/org/apache/calcite/rel/hint/Hintable.java |   2 -
 .../calcite/rel/hint/NodeTypeHintStrategy.java     |   2 -
 .../java/org/apache/calcite/rel/hint/RelHint.java  |   2 -
 .../org/apache/calcite/rel/hint/package-info.java  |   2 -
 .../calcite/rel/logical/LogicalAggregate.java      |   2 -
 .../apache/calcite/rel/logical/LogicalCalc.java    |   2 -
 .../calcite/rel/logical/LogicalCorrelate.java      |   2 -
 .../calcite/rel/logical/LogicalExchange.java       |   2 -
 .../apache/calcite/rel/logical/LogicalFilter.java  |   2 -
 .../calcite/rel/logical/LogicalIntersect.java      |   2 -
 .../apache/calcite/rel/logical/LogicalJoin.java    |   2 -
 .../apache/calcite/rel/logical/LogicalMatch.java   |   2 -
 .../apache/calcite/rel/logical/LogicalMinus.java   |   2 -
 .../apache/calcite/rel/logical/LogicalProject.java |   2 -
 .../calcite/rel/logical/LogicalRepeatUnion.java    |   2 -
 .../calcite/rel/logical/LogicalSnapshot.java       |   2 -
 .../apache/calcite/rel/logical/LogicalSort.java    |   2 -
 .../calcite/rel/logical/LogicalSortExchange.java   |   2 -
 .../rel/logical/LogicalTableFunctionScan.java      |   2 -
 .../calcite/rel/logical/LogicalTableModify.java    |   2 -
 .../calcite/rel/logical/LogicalTableScan.java      |   2 -
 .../calcite/rel/logical/LogicalTableSpool.java     |   2 -
 .../apache/calcite/rel/logical/LogicalUnion.java   |   2 -
 .../apache/calcite/rel/logical/LogicalValues.java  |   2 -
 .../apache/calcite/rel/logical/LogicalWindow.java  |   2 -
 .../calcite/rel/logical/ToLogicalConverter.java    |   2 -
 .../apache/calcite/rel/logical/package-info.java   |   2 -
 .../calcite/rel/metadata/BuiltInMetadata.java      |   2 -
 .../rel/metadata/CachingRelMetadataProvider.java   |   2 -
 .../rel/metadata/ChainedRelMetadataProvider.java   |   2 -
 .../rel/metadata/CyclicMetadataException.java      |   2 -
 .../rel/metadata/DefaultRelMetadataProvider.java   |   2 -
 .../rel/metadata/JaninoRelMetadataProvider.java    |   2 -
 .../org/apache/calcite/rel/metadata/Metadata.java  |   2 -
 .../apache/calcite/rel/metadata/MetadataDef.java   |   2 -
 .../calcite/rel/metadata/MetadataFactory.java      |   2 -
 .../calcite/rel/metadata/MetadataFactoryImpl.java  |   2 -
 .../calcite/rel/metadata/MetadataHandler.java      |   2 -
 .../apache/calcite/rel/metadata/NullSentinel.java  |   2 -
 .../metadata/ReflectiveRelMetadataProvider.java    |   2 -
 .../calcite/rel/metadata/RelColumnMapping.java     |   2 -
 .../calcite/rel/metadata/RelColumnOrigin.java      |   2 -
 .../calcite/rel/metadata/RelMdAllPredicates.java   |   2 -
 .../calcite/rel/metadata/RelMdCollation.java       |   2 -
 .../calcite/rel/metadata/RelMdColumnOrigins.java   |   2 -
 .../rel/metadata/RelMdColumnUniqueness.java        |   2 -
 .../rel/metadata/RelMdDistinctRowCount.java        |   2 -
 .../calcite/rel/metadata/RelMdDistribution.java    |   2 -
 .../rel/metadata/RelMdExplainVisibility.java       |   2 -
 .../rel/metadata/RelMdExpressionLineage.java       |   2 -
 .../calcite/rel/metadata/RelMdMaxRowCount.java     |   2 -
 .../apache/calcite/rel/metadata/RelMdMemory.java   |   2 -
 .../calcite/rel/metadata/RelMdMinRowCount.java     |   2 -
 .../calcite/rel/metadata/RelMdNodeTypes.java       |   2 -
 .../calcite/rel/metadata/RelMdParallelism.java     |   2 -
 .../rel/metadata/RelMdPercentageOriginalRows.java  |   2 -
 .../calcite/rel/metadata/RelMdPopulationSize.java  |   2 -
 .../calcite/rel/metadata/RelMdPredicates.java      |   2 -
 .../apache/calcite/rel/metadata/RelMdRowCount.java |   2 -
 .../calcite/rel/metadata/RelMdSelectivity.java     |   2 -
 .../org/apache/calcite/rel/metadata/RelMdSize.java |   2 -
 .../calcite/rel/metadata/RelMdTableReferences.java |   2 -
 .../calcite/rel/metadata/RelMdUniqueKeys.java      |   2 -
 .../org/apache/calcite/rel/metadata/RelMdUtil.java |   2 -
 .../calcite/rel/metadata/RelMetadataProvider.java  |   2 -
 .../calcite/rel/metadata/RelMetadataQuery.java     |   2 -
 .../calcite/rel/metadata/RelMetadataQueryBase.java |   2 -
 .../calcite/rel/metadata/UnboundMetadata.java      |   2 -
 .../apache/calcite/rel/metadata/package-info.java  |   2 -
 .../org/apache/calcite/rel/mutable/Holder.java     |   2 -
 .../calcite/rel/mutable/MutableAggregate.java      |   2 -
 .../apache/calcite/rel/mutable/MutableBiRel.java   |   2 -
 .../apache/calcite/rel/mutable/MutableCalc.java    |   2 -
 .../apache/calcite/rel/mutable/MutableCollect.java |   2 -
 .../calcite/rel/mutable/MutableCorrelate.java      |   2 -
 .../calcite/rel/mutable/MutableExchange.java       |   2 -
 .../apache/calcite/rel/mutable/MutableFilter.java  |   2 -
 .../calcite/rel/mutable/MutableIntersect.java      |   2 -
 .../apache/calcite/rel/mutable/MutableJoin.java    |   2 -
 .../apache/calcite/rel/mutable/MutableLeafRel.java |   2 -
 .../apache/calcite/rel/mutable/MutableMatch.java   |   2 -
 .../apache/calcite/rel/mutable/MutableMinus.java   |   2 -
 .../calcite/rel/mutable/MutableMultiRel.java       |   2 -
 .../apache/calcite/rel/mutable/MutableProject.java |   2 -
 .../org/apache/calcite/rel/mutable/MutableRel.java |   2 -
 .../apache/calcite/rel/mutable/MutableRelType.java |   2 -
 .../calcite/rel/mutable/MutableRelVisitor.java     |   2 -
 .../apache/calcite/rel/mutable/MutableRels.java    |   2 -
 .../apache/calcite/rel/mutable/MutableSample.java  |   2 -
 .../apache/calcite/rel/mutable/MutableScan.java    |   2 -
 .../apache/calcite/rel/mutable/MutableSetOp.java   |   2 -
 .../calcite/rel/mutable/MutableSingleRel.java      |   2 -
 .../apache/calcite/rel/mutable/MutableSort.java    |   2 -
 .../rel/mutable/MutableTableFunctionScan.java      |   2 -
 .../calcite/rel/mutable/MutableTableModify.java    |   2 -
 .../calcite/rel/mutable/MutableUncollect.java      |   2 -
 .../apache/calcite/rel/mutable/MutableUnion.java   |   2 -
 .../apache/calcite/rel/mutable/MutableValues.java  |   2 -
 .../apache/calcite/rel/mutable/MutableWindow.java  |   2 -
 .../apache/calcite/rel/mutable/package-info.java   |   2 -
 .../java/org/apache/calcite/rel/package-info.java  |   2 -
 .../calcite/rel/rel2sql/RelToSqlConverter.java     |   2 -
 .../apache/calcite/rel/rel2sql/SqlImplementor.java |   2 -
 .../apache/calcite/rel/rel2sql/package-info.java   |   2 -
 .../rel/rules/AbstractJoinExtractFilterRule.java   |   2 -
 .../rel/rules/AbstractMaterializedViewRule.java    |   2 -
 .../rel/rules/AggregateCaseToFilterRule.java       |   2 -
 .../AggregateExpandDistinctAggregatesRule.java     |   2 -
 .../rel/rules/AggregateExtractProjectRule.java     |   2 -
 .../rel/rules/AggregateFilterTransposeRule.java    |   2 -
 .../rel/rules/AggregateJoinJoinRemoveRule.java     |   2 -
 .../calcite/rel/rules/AggregateJoinRemoveRule.java |   2 -
 .../rel/rules/AggregateJoinTransposeRule.java      |   2 -
 .../calcite/rel/rules/AggregateMergeRule.java      |   2 -
 .../rel/rules/AggregateProjectMergeRule.java       |   2 -
 .../rules/AggregateProjectPullUpConstantsRule.java |   2 -
 .../rel/rules/AggregateReduceFunctionsRule.java    |   2 -
 .../calcite/rel/rules/AggregateRemoveRule.java     |   2 -
 .../calcite/rel/rules/AggregateStarTableRule.java  |   2 -
 .../rel/rules/AggregateUnionAggregateRule.java     |   2 -
 .../rel/rules/AggregateUnionTransposeRule.java     |   2 -
 .../calcite/rel/rules/AggregateValuesRule.java     |   2 -
 .../apache/calcite/rel/rules/CalcMergeRule.java    |   2 -
 .../apache/calcite/rel/rules/CalcRelSplitter.java  |   2 -
 .../apache/calcite/rel/rules/CalcRemoveRule.java   |   2 -
 .../apache/calcite/rel/rules/CalcSplitRule.java    |   2 -
 .../apache/calcite/rel/rules/CoerceInputsRule.java |   2 -
 .../apache/calcite/rel/rules/DateRangeRules.java   |   2 -
 .../org/apache/calcite/rel/rules/EquiJoin.java     |   2 -
 .../rel/rules/ExchangeRemoveConstantKeysRule.java  |   2 -
 .../rel/rules/FilterAggregateTransposeRule.java    |   2 -
 .../calcite/rel/rules/FilterCalcMergeRule.java     |   2 -
 .../calcite/rel/rules/FilterCorrelateRule.java     |   2 -
 .../apache/calcite/rel/rules/FilterJoinRule.java   |   2 -
 .../apache/calcite/rel/rules/FilterMergeRule.java  |   2 -
 .../rel/rules/FilterMultiJoinMergeRule.java        |   2 -
 .../rel/rules/FilterProjectTransposeRule.java      |   2 -
 .../rules/FilterRemoveIsNotDistinctFromRule.java   |   2 -
 .../rel/rules/FilterSetOpTransposeRule.java        |   2 -
 .../rules/FilterTableFunctionTransposeRule.java    |   2 -
 .../calcite/rel/rules/FilterTableScanRule.java     |   2 -
 .../apache/calcite/rel/rules/FilterToCalcRule.java |   2 -
 .../calcite/rel/rules/IntersectToDistinctRule.java |   2 -
 .../rel/rules/JoinAddRedundantSemiJoinRule.java    |   2 -
 .../calcite/rel/rules/JoinAssociateRule.java       |   2 -
 .../apache/calcite/rel/rules/JoinCommuteRule.java  |   2 -
 .../calcite/rel/rules/JoinExtractFilterRule.java   |   2 -
 .../rel/rules/JoinProjectTransposeRule.java        |   2 -
 .../calcite/rel/rules/JoinPushExpressionsRule.java |   2 -
 .../calcite/rel/rules/JoinPushThroughJoinRule.java |   2 -
 .../rules/JoinPushTransitivePredicatesRule.java    |   2 -
 .../calcite/rel/rules/JoinToCorrelateRule.java     |   2 -
 .../calcite/rel/rules/JoinToMultiJoinRule.java     |   2 -
 .../calcite/rel/rules/JoinUnionTransposeRule.java  |   2 -
 .../org/apache/calcite/rel/rules/LoptJoinTree.java |   2 -
 .../apache/calcite/rel/rules/LoptMultiJoin.java    |   2 -
 .../calcite/rel/rules/LoptOptimizeJoinRule.java    |   2 -
 .../calcite/rel/rules/LoptSemiJoinOptimizer.java   |   2 -
 .../org/apache/calcite/rel/rules/MatchRule.java    |   2 -
 .../rel/rules/MaterializedViewFilterScanRule.java  |   2 -
 .../org/apache/calcite/rel/rules/MultiJoin.java    |   2 -
 .../rel/rules/MultiJoinOptimizeBushyRule.java      |   2 -
 .../rel/rules/MultiJoinProjectTransposeRule.java   |   2 -
 .../calcite/rel/rules/ProjectCalcMergeRule.java    |   2 -
 .../rel/rules/ProjectCorrelateTransposeRule.java   |   2 -
 .../rel/rules/ProjectFilterTransposeRule.java      |   2 -
 .../rel/rules/ProjectJoinJoinRemoveRule.java       |   2 -
 .../calcite/rel/rules/ProjectJoinRemoveRule.java   |   2 -
 .../rel/rules/ProjectJoinTransposeRule.java        |   2 -
 .../apache/calcite/rel/rules/ProjectMergeRule.java |   2 -
 .../rel/rules/ProjectMultiJoinMergeRule.java       |   2 -
 .../calcite/rel/rules/ProjectRemoveRule.java       |   2 -
 .../rel/rules/ProjectSetOpTransposeRule.java       |   2 -
 .../rel/rules/ProjectSortTransposeRule.java        |   2 -
 .../calcite/rel/rules/ProjectTableScanRule.java    |   2 -
 .../calcite/rel/rules/ProjectToCalcRule.java       |   2 -
 .../calcite/rel/rules/ProjectToWindowRule.java     |   2 -
 .../rel/rules/ProjectWindowTransposeRule.java      |   2 -
 .../apache/calcite/rel/rules/PruneEmptyRules.java  |   2 -
 .../apache/calcite/rel/rules/PushProjector.java    |   2 -
 .../calcite/rel/rules/ReduceDecimalsRule.java      |   2 -
 .../calcite/rel/rules/ReduceExpressionsRule.java   |   2 -
 .../rel/rules/SemiJoinFilterTransposeRule.java     |   2 -
 .../rel/rules/SemiJoinJoinTransposeRule.java       |   2 -
 .../rel/rules/SemiJoinProjectTransposeRule.java    |   2 -
 .../calcite/rel/rules/SemiJoinRemoveRule.java      |   2 -
 .../org/apache/calcite/rel/rules/SemiJoinRule.java |   2 -
 .../apache/calcite/rel/rules/SortJoinCopyRule.java |   2 -
 .../calcite/rel/rules/SortJoinTransposeRule.java   |   2 -
 .../rel/rules/SortProjectTransposeRule.java        |   2 -
 .../rel/rules/SortRemoveConstantKeysRule.java      |   2 -
 .../apache/calcite/rel/rules/SortRemoveRule.java   |   2 -
 .../calcite/rel/rules/SortUnionTransposeRule.java  |   2 -
 .../calcite/rel/rules/SubQueryRemoveRule.java      |   2 -
 .../apache/calcite/rel/rules/TableScanRule.java    |   2 -
 .../calcite/rel/rules/UnionEliminatorRule.java     |   2 -
 .../apache/calcite/rel/rules/UnionMergeRule.java   |   2 -
 .../rel/rules/UnionPullUpConstantsRule.java        |   2 -
 .../calcite/rel/rules/UnionToDistinctRule.java     |   2 -
 .../apache/calcite/rel/rules/ValuesReduceRule.java |   2 -
 .../org/apache/calcite/rel/rules/package-info.java |   2 -
 .../java/org/apache/calcite/rel/stream/Chi.java    |   2 -
 .../java/org/apache/calcite/rel/stream/Delta.java  |   2 -
 .../org/apache/calcite/rel/stream/LogicalChi.java  |   2 -
 .../apache/calcite/rel/stream/LogicalDelta.java    |   2 -
 .../org/apache/calcite/rel/stream/StreamRules.java |   2 -
 .../apache/calcite/rel/stream/package-info.java    |   2 -
 .../calcite/rel/type/DelegatingTypeSystem.java     |   2 -
 .../apache/calcite/rel/type/DynamicRecordType.java |   2 -
 .../calcite/rel/type/DynamicRecordTypeImpl.java    |   2 -
 .../org/apache/calcite/rel/type/RelCrossType.java  |   2 -
 .../org/apache/calcite/rel/type/RelDataType.java   |   2 -
 .../calcite/rel/type/RelDataTypeComparability.java |   2 -
 .../calcite/rel/type/RelDataTypeFactory.java       |   2 -
 .../calcite/rel/type/RelDataTypeFactoryImpl.java   |   2 -
 .../apache/calcite/rel/type/RelDataTypeFamily.java |   2 -
 .../apache/calcite/rel/type/RelDataTypeField.java  |   2 -
 .../calcite/rel/type/RelDataTypeFieldImpl.java     |   2 -
 .../apache/calcite/rel/type/RelDataTypeHolder.java |   2 -
 .../apache/calcite/rel/type/RelDataTypeImpl.java   |   2 -
 .../rel/type/RelDataTypePrecedenceList.java        |   2 -
 .../apache/calcite/rel/type/RelDataTypeSystem.java |   2 -
 .../calcite/rel/type/RelDataTypeSystemImpl.java    |   2 -
 .../apache/calcite/rel/type/RelProtoDataType.java  |   2 -
 .../org/apache/calcite/rel/type/RelRecordType.java |   2 -
 .../org/apache/calcite/rel/type/StructKind.java    |   2 -
 .../org/apache/calcite/rel/type/package-info.java  |   2 -
 .../java/org/apache/calcite/rex/LogicVisitor.java  |   2 -
 .../java/org/apache/calcite/rex/RexAction.java     |   2 -
 .../java/org/apache/calcite/rex/RexAnalyzer.java   |   2 -
 .../java/org/apache/calcite/rex/RexBiVisitor.java  |   2 -
 .../java/org/apache/calcite/rex/RexBuilder.java    |   2 -
 .../main/java/org/apache/calcite/rex/RexCall.java  |   2 -
 .../org/apache/calcite/rex/RexCallBinding.java     |   2 -
 .../java/org/apache/calcite/rex/RexChecker.java    |   2 -
 .../java/org/apache/calcite/rex/RexCopier.java     |   2 -
 .../org/apache/calcite/rex/RexCorrelVariable.java  |   2 -
 .../apache/calcite/rex/RexDigestIncludeType.java   |   2 -
 .../org/apache/calcite/rex/RexDynamicParam.java    |   2 -
 .../java/org/apache/calcite/rex/RexExecutable.java |   2 -
 .../java/org/apache/calcite/rex/RexExecutor.java   |   2 -
 .../org/apache/calcite/rex/RexExecutorImpl.java    |   2 -
 .../org/apache/calcite/rex/RexFieldAccess.java     |   2 -
 .../org/apache/calcite/rex/RexFieldCollation.java  |   2 -
 .../java/org/apache/calcite/rex/RexInputRef.java   |   2 -
 .../org/apache/calcite/rex/RexInterpreter.java     |   2 -
 .../java/org/apache/calcite/rex/RexLiteral.java    |   2 -
 .../java/org/apache/calcite/rex/RexLocalRef.java   |   2 -
 .../org/apache/calcite/rex/RexMultisetUtil.java    |   2 -
 .../main/java/org/apache/calcite/rex/RexNode.java  |   2 -
 .../main/java/org/apache/calcite/rex/RexOver.java  |   2 -
 .../java/org/apache/calcite/rex/RexPattern.java    |   2 -
 .../org/apache/calcite/rex/RexPatternFieldRef.java |   2 -
 .../apache/calcite/rex/RexPermutationShuttle.java  |   2 -
 .../calcite/rex/RexPermuteInputsShuttle.java       |   2 -
 .../java/org/apache/calcite/rex/RexProgram.java    |   2 -
 .../org/apache/calcite/rex/RexProgramBuilder.java  |   2 -
 .../java/org/apache/calcite/rex/RexRangeRef.java   |   2 -
 .../java/org/apache/calcite/rex/RexShuttle.java    |   2 -
 .../java/org/apache/calcite/rex/RexSimplify.java   |   2 -
 .../main/java/org/apache/calcite/rex/RexSlot.java  |   2 -
 .../org/apache/calcite/rex/RexSqlConvertlet.java   |   2 -
 .../apache/calcite/rex/RexSqlConvertletTable.java  |   2 -
 .../rex/RexSqlReflectiveConvertletTable.java       |   2 -
 .../calcite/rex/RexSqlStandardConvertletTable.java |   2 -
 .../java/org/apache/calcite/rex/RexSubQuery.java   |   2 -
 .../org/apache/calcite/rex/RexTableInputRef.java   |   2 -
 .../apache/calcite/rex/RexToSqlNodeConverter.java  |   2 -
 .../calcite/rex/RexToSqlNodeConverterImpl.java     |   2 -
 .../org/apache/calcite/rex/RexTransformer.java     |   2 -
 .../java/org/apache/calcite/rex/RexUnknownAs.java  |   2 -
 .../main/java/org/apache/calcite/rex/RexUtil.java  |   2 -
 .../java/org/apache/calcite/rex/RexVariable.java   |   2 -
 .../java/org/apache/calcite/rex/RexVisitor.java    |   2 -
 .../org/apache/calcite/rex/RexVisitorImpl.java     |   2 -
 .../java/org/apache/calcite/rex/RexWindow.java     |   2 -
 .../org/apache/calcite/rex/RexWindowBound.java     |   2 -
 .../java/org/apache/calcite/rex/package-info.java  |   2 -
 .../calcite/runtime/AbstractImmutableList.java     |   2 -
 .../org/apache/calcite/runtime/ArrayBindable.java  |   2 -
 .../apache/calcite/runtime/ArrayComparator.java    |   2 -
 .../calcite/runtime/ArrayEnumeratorCursor.java     |   2 -
 .../java/org/apache/calcite/runtime/Automaton.java |   2 -
 .../apache/calcite/runtime/AutomatonBuilder.java   |   2 -
 .../org/apache/calcite/runtime/BinarySearch.java   |   2 -
 .../java/org/apache/calcite/runtime/Bindable.java  |   2 -
 .../calcite/runtime/CalciteContextException.java   |   2 -
 .../apache/calcite/runtime/CalciteException.java   |   2 -
 .../apache/calcite/runtime/CalciteResource.java    |   2 -
 .../java/org/apache/calcite/runtime/ConsList.java  |   2 -
 .../calcite/runtime/DeterministicAutomaton.java    |   2 -
 .../org/apache/calcite/runtime/Enumerables.java    |   2 -
 .../apache/calcite/runtime/EnumeratorCursor.java   |   2 -
 .../java/org/apache/calcite/runtime/Feature.java   |   2 -
 .../java/org/apache/calcite/runtime/FlatLists.java |   2 -
 .../org/apache/calcite/runtime/GeoFunctions.java   |   2 -
 .../main/java/org/apache/calcite/runtime/Hook.java |   2 -
 .../java/org/apache/calcite/runtime/HttpUtils.java |   2 -
 .../org/apache/calcite/runtime/JsonFunctions.java  |   2 -
 .../main/java/org/apache/calcite/runtime/Like.java |   2 -
 .../java/org/apache/calcite/runtime/Matcher.java   |   2 -
 .../calcite/runtime/ObjectEnumeratorCursor.java    |   2 -
 .../java/org/apache/calcite/runtime/Pattern.java   |   2 -
 .../org/apache/calcite/runtime/PredicateImpl.java  |   2 -
 .../org/apache/calcite/runtime/RandomFunction.java |   2 -
 .../calcite/runtime/RecordEnumeratorCursor.java    |   2 -
 .../java/org/apache/calcite/runtime/Resources.java |   2 -
 .../calcite/runtime/ResultSetEnumerable.java       |   2 -
 .../apache/calcite/runtime/SocketFactoryImpl.java  |   2 -
 .../org/apache/calcite/runtime/SortedMultiMap.java |   2 -
 .../org/apache/calcite/runtime/SqlFunctions.java   |   2 -
 .../calcite/runtime/TrustAllSslSocketFactory.java  |   2 -
 .../java/org/apache/calcite/runtime/Typed.java     |   2 -
 .../main/java/org/apache/calcite/runtime/Unit.java |   2 -
 .../java/org/apache/calcite/runtime/Utilities.java |   2 -
 .../org/apache/calcite/runtime/package-info.java   |   2 -
 .../apache/calcite/schema/AggregateFunction.java   |   2 -
 .../org/apache/calcite/schema/ColumnStrategy.java  |   2 -
 .../calcite/schema/CustomColumnResolvingTable.java |   2 -
 .../org/apache/calcite/schema/ExtensibleTable.java |   2 -
 .../org/apache/calcite/schema/FilterableTable.java |   2 -
 .../java/org/apache/calcite/schema/Function.java   |   2 -
 .../apache/calcite/schema/FunctionParameter.java   |   2 -
 .../calcite/schema/ImplementableAggFunction.java   |   2 -
 .../calcite/schema/ImplementableFunction.java      |   2 -
 .../java/org/apache/calcite/schema/Member.java     |   2 -
 .../org/apache/calcite/schema/ModifiableTable.java |   2 -
 .../org/apache/calcite/schema/ModifiableView.java  |   2 -
 .../main/java/org/apache/calcite/schema/Path.java  |   2 -
 .../calcite/schema/ProjectableFilterableTable.java |   2 -
 .../org/apache/calcite/schema/QueryableTable.java  |   2 -
 .../org/apache/calcite/schema/ScalarFunction.java  |   2 -
 .../org/apache/calcite/schema/ScannableTable.java  |   2 -
 .../java/org/apache/calcite/schema/Schema.java     |   2 -
 .../org/apache/calcite/schema/SchemaFactory.java   |   2 -
 .../java/org/apache/calcite/schema/SchemaPlus.java |   2 -
 .../org/apache/calcite/schema/SchemaVersion.java   |   2 -
 .../java/org/apache/calcite/schema/Schemas.java    |   2 -
 .../apache/calcite/schema/SemiMutableSchema.java   |   2 -
 .../java/org/apache/calcite/schema/Statistic.java  |   2 -
 .../java/org/apache/calcite/schema/Statistics.java |   2 -
 .../org/apache/calcite/schema/StreamableTable.java |   2 -
 .../main/java/org/apache/calcite/schema/Table.java |   2 -
 .../org/apache/calcite/schema/TableFactory.java    |   2 -
 .../org/apache/calcite/schema/TableFunction.java   |   2 -
 .../java/org/apache/calcite/schema/TableMacro.java |   2 -
 .../org/apache/calcite/schema/TemporalTable.java   |   2 -
 .../org/apache/calcite/schema/TransientTable.java  |   2 -
 .../apache/calcite/schema/TranslatableTable.java   |   2 -
 .../java/org/apache/calcite/schema/Wrapper.java    |   2 -
 .../apache/calcite/schema/impl/AbstractSchema.java |   2 -
 .../apache/calcite/schema/impl/AbstractTable.java  |   2 -
 .../schema/impl/AbstractTableQueryable.java        |   2 -
 .../calcite/schema/impl/AggregateFunctionImpl.java |   2 -
 .../calcite/schema/impl/DelegatingSchema.java      |   2 -
 .../calcite/schema/impl/ListTransientTable.java    |   2 -
 .../calcite/schema/impl/LongSchemaVersion.java     |   2 -
 .../calcite/schema/impl/MaterializedViewTable.java |   2 -
 .../calcite/schema/impl/ModifiableViewTable.java   |   2 -
 .../schema/impl/ReflectiveFunctionBase.java        |   2 -
 .../calcite/schema/impl/ScalarFunctionImpl.java    |   2 -
 .../org/apache/calcite/schema/impl/StarTable.java  |   2 -
 .../calcite/schema/impl/TableFunctionImpl.java     |   2 -
 .../apache/calcite/schema/impl/TableMacroImpl.java |   2 -
 .../org/apache/calcite/schema/impl/ViewTable.java  |   2 -
 .../apache/calcite/schema/impl/ViewTableMacro.java |   2 -
 .../apache/calcite/schema/impl/package-info.java   |   2 -
 .../org/apache/calcite/schema/package-info.java    |   2 -
 .../org/apache/calcite/server/CalciteServer.java   |   2 -
 .../calcite/server/CalciteServerStatement.java     |   2 -
 .../org/apache/calcite/server/package-info.java    |   2 -
 .../calcite/sql/ExplicitOperatorBinding.java       |   2 -
 .../org/apache/calcite/sql/JoinConditionType.java  |   2 -
 .../main/java/org/apache/calcite/sql/JoinType.java |   2 -
 .../calcite/sql/SqlAbstractDateTimeLiteral.java    |   2 -
 .../calcite/sql/SqlAbstractStringLiteral.java      |   2 -
 .../java/org/apache/calcite/sql/SqlAccessEnum.java |   2 -
 .../java/org/apache/calcite/sql/SqlAccessType.java |   2 -
 .../org/apache/calcite/sql/SqlAggFunction.java     |   2 -
 .../calcite/sql/SqlAlienSystemTypeNameSpec.java    |   2 -
 .../main/java/org/apache/calcite/sql/SqlAlter.java |   2 -
 .../java/org/apache/calcite/sql/SqlAsOperator.java |   2 -
 .../java/org/apache/calcite/sql/SqlBasicCall.java  |   2 -
 .../apache/calcite/sql/SqlBasicTypeNameSpec.java   |   2 -
 .../org/apache/calcite/sql/SqlBinaryOperator.java  |   2 -
 .../apache/calcite/sql/SqlBinaryStringLiteral.java |   2 -
 .../main/java/org/apache/calcite/sql/SqlCall.java  |   2 -
 .../org/apache/calcite/sql/SqlCallBinding.java     |   2 -
 .../apache/calcite/sql/SqlCharStringLiteral.java   |   2 -
 .../java/org/apache/calcite/sql/SqlCollation.java  |   2 -
 .../calcite/sql/SqlCollectionTypeNameSpec.java     |   2 -
 .../java/org/apache/calcite/sql/SqlCreate.java     |   2 -
 .../org/apache/calcite/sql/SqlDataTypeSpec.java    |   2 -
 .../org/apache/calcite/sql/SqlDateLiteral.java     |   2 -
 .../main/java/org/apache/calcite/sql/SqlDdl.java   |   2 -
 .../java/org/apache/calcite/sql/SqlDelete.java     |   2 -
 .../org/apache/calcite/sql/SqlDescribeSchema.java  |   2 -
 .../org/apache/calcite/sql/SqlDescribeTable.java   |   2 -
 .../java/org/apache/calcite/sql/SqlDialect.java    |   2 -
 .../org/apache/calcite/sql/SqlDialectFactory.java  |   2 -
 .../apache/calcite/sql/SqlDialectFactoryImpl.java  |   2 -
 .../main/java/org/apache/calcite/sql/SqlDrop.java  |   2 -
 .../org/apache/calcite/sql/SqlDynamicParam.java    |   2 -
 .../apache/calcite/sql/SqlExecutableStatement.java |   2 -
 .../java/org/apache/calcite/sql/SqlExplain.java    |   2 -
 .../org/apache/calcite/sql/SqlExplainFormat.java   |   2 -
 .../org/apache/calcite/sql/SqlExplainLevel.java    |   2 -
 .../org/apache/calcite/sql/SqlFilterOperator.java  |   2 -
 .../java/org/apache/calcite/sql/SqlFunction.java   |   2 -
 .../apache/calcite/sql/SqlFunctionCategory.java    |   2 -
 .../apache/calcite/sql/SqlFunctionalOperator.java  |   2 -
 .../calcite/sql/SqlGroupedWindowFunction.java      |   2 -
 .../main/java/org/apache/calcite/sql/SqlHint.java  |   2 -
 .../java/org/apache/calcite/sql/SqlIdentifier.java |   2 -
 .../org/apache/calcite/sql/SqlInfixOperator.java   |   2 -
 .../java/org/apache/calcite/sql/SqlInsert.java     |   2 -
 .../org/apache/calcite/sql/SqlInsertKeyword.java   |   2 -
 .../apache/calcite/sql/SqlInternalOperator.java    |   2 -
 .../org/apache/calcite/sql/SqlIntervalLiteral.java |   2 -
 .../apache/calcite/sql/SqlIntervalQualifier.java   |   2 -
 .../apache/calcite/sql/SqlJdbcDataTypeName.java    |   2 -
 .../apache/calcite/sql/SqlJdbcFunctionCall.java    |   2 -
 .../main/java/org/apache/calcite/sql/SqlJoin.java  |   2 -
 .../calcite/sql/SqlJsonConstructorNullClause.java  |   2 -
 .../apache/calcite/sql/SqlJsonEmptyOrError.java    |   2 -
 .../org/apache/calcite/sql/SqlJsonEncoding.java    |   2 -
 .../calcite/sql/SqlJsonExistsErrorBehavior.java    |   2 -
 .../sql/SqlJsonQueryEmptyOrErrorBehavior.java      |   2 -
 .../calcite/sql/SqlJsonQueryWrapperBehavior.java   |   2 -
 .../sql/SqlJsonValueEmptyOrErrorBehavior.java      |   2 -
 .../main/java/org/apache/calcite/sql/SqlKind.java  |   2 -
 .../org/apache/calcite/sql/SqlLateralOperator.java |   2 -
 .../java/org/apache/calcite/sql/SqlLiteral.java    |   2 -
 .../org/apache/calcite/sql/SqlMatchFunction.java   |   2 -
 .../org/apache/calcite/sql/SqlMatchRecognize.java  |   2 -
 .../main/java/org/apache/calcite/sql/SqlMerge.java |   2 -
 .../main/java/org/apache/calcite/sql/SqlNode.java  |   2 -
 .../java/org/apache/calcite/sql/SqlNodeList.java   |   2 -
 .../org/apache/calcite/sql/SqlNullSemantics.java   |   2 -
 .../calcite/sql/SqlNullTreatmentOperator.java      |   2 -
 .../org/apache/calcite/sql/SqlNumericLiteral.java  |   2 -
 .../apache/calcite/sql/SqlOperandCountRange.java   |   2 -
 .../java/org/apache/calcite/sql/SqlOperator.java   |   2 -
 .../org/apache/calcite/sql/SqlOperatorBinding.java |   2 -
 .../org/apache/calcite/sql/SqlOperatorTable.java   |   2 -
 .../java/org/apache/calcite/sql/SqlOrderBy.java    |   2 -
 .../org/apache/calcite/sql/SqlOverOperator.java    |   2 -
 .../org/apache/calcite/sql/SqlPostfixOperator.java |   2 -
 .../org/apache/calcite/sql/SqlPrefixOperator.java  |   2 -
 .../calcite/sql/SqlProcedureCallOperator.java      |   2 -
 .../org/apache/calcite/sql/SqlRankFunction.java    |   2 -
 .../org/apache/calcite/sql/SqlRowTypeNameSpec.java |   2 -
 .../java/org/apache/calcite/sql/SqlSampleSpec.java |   2 -
 .../java/org/apache/calcite/sql/SqlSelect.java     |   2 -
 .../org/apache/calcite/sql/SqlSelectKeyword.java   |   2 -
 .../org/apache/calcite/sql/SqlSelectOperator.java  |   2 -
 .../org/apache/calcite/sql/SqlSetOperator.java     |   2 -
 .../java/org/apache/calcite/sql/SqlSetOption.java  |   2 -
 .../java/org/apache/calcite/sql/SqlSnapshot.java   |   2 -
 .../org/apache/calcite/sql/SqlSpecialOperator.java |   2 -
 .../calcite/sql/SqlSplittableAggFunction.java      |   2 -
 .../java/org/apache/calcite/sql/SqlStateCodes.java |   2 -
 .../java/org/apache/calcite/sql/SqlSyntax.java     |   2 -
 .../java/org/apache/calcite/sql/SqlTableRef.java   |   2 -
 .../org/apache/calcite/sql/SqlTimeLiteral.java     |   2 -
 .../apache/calcite/sql/SqlTimestampLiteral.java    |   2 -
 .../org/apache/calcite/sql/SqlTypeNameSpec.java    |   2 -
 .../org/apache/calcite/sql/SqlUnnestOperator.java  |   2 -
 .../apache/calcite/sql/SqlUnresolvedFunction.java  |   2 -
 .../java/org/apache/calcite/sql/SqlUpdate.java     |   2 -
 .../calcite/sql/SqlUserDefinedTypeNameSpec.java    |   2 -
 .../main/java/org/apache/calcite/sql/SqlUtil.java  |   2 -
 .../org/apache/calcite/sql/SqlValuesOperator.java  |   2 -
 .../java/org/apache/calcite/sql/SqlWindow.java     |   2 -
 .../main/java/org/apache/calcite/sql/SqlWith.java  |   2 -
 .../java/org/apache/calcite/sql/SqlWithItem.java   |   2 -
 .../apache/calcite/sql/SqlWithinGroupOperator.java |   2 -
 .../java/org/apache/calcite/sql/SqlWriter.java     |   2 -
 .../org/apache/calcite/sql/advise/SqlAdvisor.java  |   2 -
 .../sql/advise/SqlAdvisorGetHintsFunction.java     |   2 -
 .../sql/advise/SqlAdvisorGetHintsFunction2.java    |   2 -
 .../apache/calcite/sql/advise/SqlAdvisorHint.java  |   2 -
 .../apache/calcite/sql/advise/SqlAdvisorHint2.java |   2 -
 .../calcite/sql/advise/SqlAdvisorValidator.java    |   2 -
 .../apache/calcite/sql/advise/SqlSimpleParser.java |   2 -
 .../apache/calcite/sql/advise/package-info.java    |   2 -
 .../calcite/sql/dialect/AccessSqlDialect.java      |   2 -
 .../apache/calcite/sql/dialect/AnsiSqlDialect.java |   2 -
 .../calcite/sql/dialect/BigQuerySqlDialect.java    |   2 -
 .../calcite/sql/dialect/CalciteSqlDialect.java     |   2 -
 .../apache/calcite/sql/dialect/Db2SqlDialect.java  |   2 -
 .../calcite/sql/dialect/DerbySqlDialect.java       |   2 -
 .../calcite/sql/dialect/FirebirdSqlDialect.java    |   2 -
 .../apache/calcite/sql/dialect/H2SqlDialect.java   |   2 -
 .../apache/calcite/sql/dialect/HiveSqlDialect.java |   2 -
 .../calcite/sql/dialect/HsqldbSqlDialect.java      |   2 -
 .../calcite/sql/dialect/InfobrightSqlDialect.java  |   2 -
 .../calcite/sql/dialect/InformixSqlDialect.java    |   2 -
 .../calcite/sql/dialect/IngresSqlDialect.java      |   2 -
 .../calcite/sql/dialect/InterbaseSqlDialect.java   |   2 -
 .../calcite/sql/dialect/JethroDataSqlDialect.java  |   2 -
 .../calcite/sql/dialect/LucidDbSqlDialect.java     |   2 -
 .../calcite/sql/dialect/MssqlSqlDialect.java       |   2 -
 .../calcite/sql/dialect/MysqlSqlDialect.java       |   2 -
 .../calcite/sql/dialect/NeoviewSqlDialect.java     |   2 -
 .../calcite/sql/dialect/NetezzaSqlDialect.java     |   2 -
 .../calcite/sql/dialect/OracleSqlDialect.java      |   2 -
 .../calcite/sql/dialect/ParaccelSqlDialect.java    |   2 -
 .../calcite/sql/dialect/PhoenixSqlDialect.java     |   2 -
 .../calcite/sql/dialect/PostgresqlSqlDialect.java  |   2 -
 .../calcite/sql/dialect/RedshiftSqlDialect.java    |   2 -
 .../calcite/sql/dialect/SnowflakeSqlDialect.java   |   2 -
 .../calcite/sql/dialect/SparkSqlDialect.java       |   2 -
 .../calcite/sql/dialect/SybaseSqlDialect.java      |   2 -
 .../calcite/sql/dialect/TeradataSqlDialect.java    |   2 -
 .../calcite/sql/dialect/VerticaSqlDialect.java     |   2 -
 .../apache/calcite/sql/dialect/package-info.java   |   2 -
 .../apache/calcite/sql/fun/LibraryOperator.java    |   2 -
 .../calcite/sql/fun/OracleSqlOperatorTable.java    |   2 -
 .../calcite/sql/fun/SqlAbstractGroupFunction.java  |   2 -
 .../calcite/sql/fun/SqlAbstractTimeFunction.java   |   2 -
 .../calcite/sql/fun/SqlAnyValueAggFunction.java    |   2 -
 .../sql/fun/SqlArgumentAssignmentOperator.java     |   2 -
 .../calcite/sql/fun/SqlArrayQueryConstructor.java  |   2 -
 .../calcite/sql/fun/SqlArrayValueConstructor.java  |   2 -
 .../apache/calcite/sql/fun/SqlAvgAggFunction.java  |   2 -
 .../calcite/sql/fun/SqlBaseContextVariable.java    |   2 -
 .../apache/calcite/sql/fun/SqlBetweenOperator.java |   2 -
 .../calcite/sql/fun/SqlBitOpAggFunction.java       |   2 -
 .../java/org/apache/calcite/sql/fun/SqlCase.java   |   2 -
 .../apache/calcite/sql/fun/SqlCaseOperator.java    |   2 -
 .../apache/calcite/sql/fun/SqlCastFunction.java    |   2 -
 .../apache/calcite/sql/fun/SqlCastOperator.java    |   2 -
 .../calcite/sql/fun/SqlCoalesceFunction.java       |   2 -
 .../sql/fun/SqlCollectionTableOperator.java        |   2 -
 .../calcite/sql/fun/SqlColumnListConstructor.java  |   2 -
 .../apache/calcite/sql/fun/SqlConvertFunction.java |   2 -
 .../calcite/sql/fun/SqlCountAggFunction.java       |   2 -
 .../calcite/sql/fun/SqlCovarAggFunction.java       |   2 -
 .../calcite/sql/fun/SqlCurrentDateFunction.java    |   2 -
 .../calcite/sql/fun/SqlCursorConstructor.java      |   2 -
 .../calcite/sql/fun/SqlDatePartFunction.java       |   2 -
 .../calcite/sql/fun/SqlDatetimePlusOperator.java   |   2 -
 .../sql/fun/SqlDatetimeSubtractionOperator.java    |   2 -
 .../apache/calcite/sql/fun/SqlDefaultOperator.java |   2 -
 .../org/apache/calcite/sql/fun/SqlDotOperator.java |   2 -
 .../apache/calcite/sql/fun/SqlExtendOperator.java  |   2 -
 .../apache/calcite/sql/fun/SqlExtractFunction.java |   2 -
 .../sql/fun/SqlFirstLastValueAggFunction.java      |   2 -
 .../apache/calcite/sql/fun/SqlFloorFunction.java   |   2 -
 .../apache/calcite/sql/fun/SqlGroupIdFunction.java |   2 -
 .../calcite/sql/fun/SqlGroupingFunction.java       |   2 -
 .../calcite/sql/fun/SqlGroupingIdFunction.java     |   2 -
 .../calcite/sql/fun/SqlHistogramAggFunction.java   |   2 -
 .../org/apache/calcite/sql/fun/SqlInOperator.java  |   2 -
 .../apache/calcite/sql/fun/SqlItemOperator.java    |   2 -
 .../sql/fun/SqlJsonArrayAggAggFunction.java        |   2 -
 .../calcite/sql/fun/SqlJsonArrayFunction.java      |   2 -
 .../calcite/sql/fun/SqlJsonDepthFunction.java      |   2 -
 .../calcite/sql/fun/SqlJsonExistsFunction.java     |   2 -
 .../calcite/sql/fun/SqlJsonKeysFunction.java       |   2 -
 .../calcite/sql/fun/SqlJsonLengthFunction.java     |   2 -
 .../sql/fun/SqlJsonObjectAggAggFunction.java       |   2 -
 .../calcite/sql/fun/SqlJsonObjectFunction.java     |   2 -
 .../calcite/sql/fun/SqlJsonPrettyFunction.java     |   2 -
 .../calcite/sql/fun/SqlJsonQueryFunction.java      |   2 -
 .../calcite/sql/fun/SqlJsonRemoveFunction.java     |   2 -
 .../sql/fun/SqlJsonStorageSizeFunction.java        |   2 -
 .../calcite/sql/fun/SqlJsonTypeFunction.java       |   2 -
 .../sql/fun/SqlJsonValueExpressionOperator.java    |   2 -
 .../calcite/sql/fun/SqlJsonValueFunction.java      |   2 -
 .../calcite/sql/fun/SqlLeadLagAggFunction.java     |   2 -
 .../org/apache/calcite/sql/fun/SqlLibrary.java     |   2 -
 .../sql/fun/SqlLibraryOperatorTableFactory.java    |   2 -
 .../calcite/sql/fun/SqlLibraryOperators.java       |   2 -
 .../apache/calcite/sql/fun/SqlLikeOperator.java    |   2 -
 .../calcite/sql/fun/SqlLiteralChainOperator.java   |   2 -
 .../calcite/sql/fun/SqlMapQueryConstructor.java    |   2 -
 .../calcite/sql/fun/SqlMapValueConstructor.java    |   2 -
 .../calcite/sql/fun/SqlMinMaxAggFunction.java      |   2 -
 .../sql/fun/SqlMonotonicBinaryOperator.java        |   2 -
 .../calcite/sql/fun/SqlMonotonicUnaryFunction.java |   2 -
 .../sql/fun/SqlMultisetMemberOfOperator.java       |   2 -
 .../sql/fun/SqlMultisetQueryConstructor.java       |   2 -
 .../calcite/sql/fun/SqlMultisetSetOperator.java    |   2 -
 .../sql/fun/SqlMultisetValueConstructor.java       |   2 -
 .../org/apache/calcite/sql/fun/SqlNewOperator.java |   2 -
 .../calcite/sql/fun/SqlNthValueAggFunction.java    |   2 -
 .../calcite/sql/fun/SqlNtileAggFunction.java       |   2 -
 .../apache/calcite/sql/fun/SqlNullifFunction.java  |   2 -
 .../calcite/sql/fun/SqlOverlapsOperator.java       |   2 -
 .../apache/calcite/sql/fun/SqlOverlayFunction.java |   2 -
 .../calcite/sql/fun/SqlPositionFunction.java       |   2 -
 .../calcite/sql/fun/SqlPosixRegexOperator.java     |   2 -
 .../calcite/sql/fun/SqlQuantifyOperator.java       |   2 -
 .../apache/calcite/sql/fun/SqlRandFunction.java    |   2 -
 .../calcite/sql/fun/SqlRandIntegerFunction.java    |   2 -
 .../calcite/sql/fun/SqlRegexpReplaceFunction.java  |   2 -
 .../calcite/sql/fun/SqlRegrCountAggFunction.java   |   2 -
 .../apache/calcite/sql/fun/SqlRollupOperator.java  |   2 -
 .../org/apache/calcite/sql/fun/SqlRowOperator.java |   2 -
 .../calcite/sql/fun/SqlSequenceValueOperator.java  |   2 -
 .../calcite/sql/fun/SqlSingleValueAggFunction.java |   2 -
 .../calcite/sql/fun/SqlStdOperatorTable.java       |   2 -
 .../calcite/sql/fun/SqlStringContextVariable.java  |   2 -
 .../calcite/sql/fun/SqlSubstringFunction.java      |   2 -
 .../apache/calcite/sql/fun/SqlSumAggFunction.java  |   2 -
 .../sql/fun/SqlSumEmptyIsZeroAggFunction.java      |   2 -
 .../apache/calcite/sql/fun/SqlThrowOperator.java   |   2 -
 .../calcite/sql/fun/SqlTimestampAddFunction.java   |   2 -
 .../calcite/sql/fun/SqlTimestampDiffFunction.java  |   2 -
 .../calcite/sql/fun/SqlTranslate3Function.java     |   2 -
 .../apache/calcite/sql/fun/SqlTrimFunction.java    |   2 -
 .../org/apache/calcite/sql/fun/package-info.java   |   2 -
 .../java/org/apache/calcite/sql/package-info.java  |   2 -
 .../java/org/apache/calcite/sql/parser/Span.java   |   2 -
 .../calcite/sql/parser/SqlAbstractParserImpl.java  |   2 -
 .../calcite/sql/parser/SqlParseException.java      |   2 -
 .../org/apache/calcite/sql/parser/SqlParser.java   |   2 -
 .../calcite/sql/parser/SqlParserImplFactory.java   |   2 -
 .../apache/calcite/sql/parser/SqlParserPos.java    |   2 -
 .../apache/calcite/sql/parser/SqlParserUtil.java   |   2 -
 .../calcite/sql/parser/impl/package-info.java      |   2 -
 .../apache/calcite/sql/parser/package-info.java    |   2 -
 .../calcite/sql/pretty/SqlFormatOptions.java       |   2 -
 .../apache/calcite/sql/pretty/SqlPrettyWriter.java |   2 -
 .../apache/calcite/sql/pretty/package-info.java    |   2 -
 .../apache/calcite/sql/type/AbstractSqlType.java   |   2 -
 .../org/apache/calcite/sql/type/ArraySqlType.java  |   2 -
 .../sql/type/AssignableOperandTypeChecker.java     |   2 -
 .../org/apache/calcite/sql/type/BasicSqlType.java  |   2 -
 .../sql/type/ComparableOperandTypeChecker.java     |   2 -
 .../sql/type/CompositeOperandTypeChecker.java      |   2 -
 .../type/CompositeSingleOperandTypeChecker.java    |   2 -
 .../sql/type/CursorReturnTypeInference.java        |   2 -
 .../sql/type/ExplicitOperandTypeInference.java     |   2 -
 .../sql/type/ExplicitReturnTypeInference.java      |   2 -
 .../org/apache/calcite/sql/type/ExtraSqlTypes.java |   2 -
 .../calcite/sql/type/FamilyOperandTypeChecker.java |   2 -
 .../sql/type/ImplicitCastOperandTypeChecker.java   |   2 -
 .../org/apache/calcite/sql/type/InferTypes.java    |   2 -
 .../apache/calcite/sql/type/IntervalSqlType.java   |   2 -
 .../sql/type/JavaToSqlTypeConversionRules.java     |   2 -
 .../sql/type/LiteralOperandTypeChecker.java        |   2 -
 .../org/apache/calcite/sql/type/MapSqlType.java    |   2 -
 .../calcite/sql/type/MatchReturnTypeInference.java |   2 -
 .../sql/type/MultisetOperandTypeChecker.java       |   2 -
 .../apache/calcite/sql/type/MultisetSqlType.java   |   2 -
 .../org/apache/calcite/sql/type/ObjectSqlType.java |   2 -
 .../org/apache/calcite/sql/type/OperandTypes.java  |   2 -
 .../calcite/sql/type/OperandsTypeChecking.java     |   2 -
 .../sql/type/OrdinalReturnTypeInference.java       |   2 -
 .../org/apache/calcite/sql/type/ReturnTypes.java   |   2 -
 .../calcite/sql/type/SameOperandTypeChecker.java   |   2 -
 .../SameOperandTypeExceptLastOperandChecker.java   |   2 -
 .../calcite/sql/type/SetopOperandTypeChecker.java  |   2 -
 .../calcite/sql/type/SqlOperandCountRanges.java    |   2 -
 .../calcite/sql/type/SqlOperandTypeChecker.java    |   2 -
 .../calcite/sql/type/SqlOperandTypeInference.java  |   2 -
 .../calcite/sql/type/SqlReturnTypeInference.java   |   2 -
 .../sql/type/SqlReturnTypeInferenceChain.java      |   2 -
 .../sql/type/SqlSingleOperandTypeChecker.java      |   2 -
 .../calcite/sql/type/SqlTypeAssignmentRules.java   |   2 -
 .../sql/type/SqlTypeExplicitPrecedenceList.java    |   2 -
 .../calcite/sql/type/SqlTypeFactoryImpl.java       |   2 -
 .../org/apache/calcite/sql/type/SqlTypeFamily.java |   2 -
 .../org/apache/calcite/sql/type/SqlTypeName.java   |   2 -
 .../apache/calcite/sql/type/SqlTypeTransform.java  |   2 -
 .../calcite/sql/type/SqlTypeTransformCascade.java  |   2 -
 .../apache/calcite/sql/type/SqlTypeTransforms.java |   2 -
 .../org/apache/calcite/sql/type/SqlTypeUtil.java   |   2 -
 .../sql/type/TableFunctionReturnTypeInference.java |   2 -
 .../org/apache/calcite/sql/type/package-info.java  |   2 -
 .../calcite/sql/util/ChainedSqlOperatorTable.java  |   2 -
 .../calcite/sql/util/ListSqlOperatorTable.java     |   2 -
 .../sql/util/ReflectiveSqlOperatorTable.java       |   2 -
 .../apache/calcite/sql/util/SqlBasicVisitor.java   |   2 -
 .../org/apache/calcite/sql/util/SqlBuilder.java    |   2 -
 .../org/apache/calcite/sql/util/SqlShuttle.java    |   2 -
 .../org/apache/calcite/sql/util/SqlString.java     |   2 -
 .../org/apache/calcite/sql/util/SqlVisitor.java    |   2 -
 .../org/apache/calcite/sql/util/package-info.java  |   2 -
 .../calcite/sql/validate/AbstractNamespace.java    |   2 -
 .../apache/calcite/sql/validate/AggChecker.java    |   2 -
 .../org/apache/calcite/sql/validate/AggFinder.java |   2 -
 .../apache/calcite/sql/validate/AggVisitor.java    |   2 -
 .../calcite/sql/validate/AggregatingScope.java     |   2 -
 .../sql/validate/AggregatingSelectScope.java       |   2 -
 .../calcite/sql/validate/AliasNamespace.java       |   2 -
 .../apache/calcite/sql/validate/CatalogScope.java  |   2 -
 .../calcite/sql/validate/CollectNamespace.java     |   2 -
 .../apache/calcite/sql/validate/CollectScope.java  |   2 -
 .../sql/validate/CyclicDefinitionException.java    |   2 -
 .../calcite/sql/validate/DelegatingNamespace.java  |   2 -
 .../calcite/sql/validate/DelegatingScope.java      |   2 -
 .../DelegatingSqlValidatorCatalogReader.java       |   2 -
 .../sql/validate/DelegatingSqlValidatorTable.java  |   2 -
 .../apache/calcite/sql/validate/EmptyScope.java    |   2 -
 .../calcite/sql/validate/FieldNamespace.java       |   2 -
 .../apache/calcite/sql/validate/GroupByScope.java  |   2 -
 .../calcite/sql/validate/IdentifierNamespace.java  |   2 -
 .../apache/calcite/sql/validate/JoinNamespace.java |   2 -
 .../org/apache/calcite/sql/validate/JoinScope.java |   2 -
 .../org/apache/calcite/sql/validate/ListScope.java |   2 -
 .../sql/validate/MatchRecognizeNamespace.java      |   2 -
 .../calcite/sql/validate/MatchRecognizeScope.java  |   2 -
 .../apache/calcite/sql/validate/OrderByScope.java  |   2 -
 .../org/apache/calcite/sql/validate/OverScope.java |   2 -
 .../calcite/sql/validate/ParameterNamespace.java   |   2 -
 .../calcite/sql/validate/ParameterScope.java       |   2 -
 .../calcite/sql/validate/ProcedureNamespace.java   |   2 -
 .../calcite/sql/validate/SchemaNamespace.java      |   2 -
 .../apache/calcite/sql/validate/ScopeChild.java    |   2 -
 .../calcite/sql/validate/SelectNamespace.java      |   2 -
 .../apache/calcite/sql/validate/SelectScope.java   |   2 -
 .../calcite/sql/validate/SetopNamespace.java       |   2 -
 .../sql/validate/SqlAbstractConformance.java       |   2 -
 .../calcite/sql/validate/SqlConformance.java       |   2 -
 .../calcite/sql/validate/SqlConformanceEnum.java   |   2 -
 .../sql/validate/SqlDelegatingConformance.java     |   2 -
 .../calcite/sql/validate/SqlIdentifierMoniker.java |   2 -
 .../apache/calcite/sql/validate/SqlModality.java   |   2 -
 .../apache/calcite/sql/validate/SqlMoniker.java    |   2 -
 .../calcite/sql/validate/SqlMonikerImpl.java       |   2 -
 .../calcite/sql/validate/SqlMonikerType.java       |   2 -
 .../calcite/sql/validate/SqlMonotonicity.java      |   2 -
 .../calcite/sql/validate/SqlNameMatcher.java       |   2 -
 .../calcite/sql/validate/SqlNameMatchers.java      |   2 -
 .../apache/calcite/sql/validate/SqlQualified.java  |   2 -
 .../calcite/sql/validate/SqlScopedShuttle.java     |   2 -
 .../sql/validate/SqlUserDefinedAggFunction.java    |   2 -
 .../sql/validate/SqlUserDefinedFunction.java       |   2 -
 .../sql/validate/SqlUserDefinedTableFunction.java  |   2 -
 .../sql/validate/SqlUserDefinedTableMacro.java     |   2 -
 .../apache/calcite/sql/validate/SqlValidator.java  |   2 -
 .../sql/validate/SqlValidatorCatalogReader.java    |   2 -
 .../sql/validate/SqlValidatorException.java        |   2 -
 .../calcite/sql/validate/SqlValidatorImpl.java     |   2 -
 .../sql/validate/SqlValidatorNamespace.java        |   2 -
 .../calcite/sql/validate/SqlValidatorScope.java    |   2 -
 .../calcite/sql/validate/SqlValidatorTable.java    |   2 -
 .../calcite/sql/validate/SqlValidatorUtil.java     |   2 -
 .../sql/validate/SqlValidatorWithHints.java        |   2 -
 .../sql/validate/TableConstructorNamespace.java    |   2 -
 .../calcite/sql/validate/TableNamespace.java       |   2 -
 .../apache/calcite/sql/validate/TableScope.java    |   2 -
 .../calcite/sql/validate/UnnestNamespace.java      |   2 -
 .../calcite/sql/validate/WithItemNamespace.java    |   2 -
 .../apache/calcite/sql/validate/WithNamespace.java |   2 -
 .../org/apache/calcite/sql/validate/WithScope.java |   2 -
 .../validate/implicit/AbstractTypeCoercion.java    |   2 -
 .../sql/validate/implicit/TypeCoercion.java        |   2 -
 .../sql/validate/implicit/TypeCoercionImpl.java    |   2 -
 .../sql/validate/implicit/TypeCoercions.java       |   2 -
 .../sql/validate/implicit/package-info.java        |   2 -
 .../apache/calcite/sql/validate/package-info.java  |   2 -
 .../apache/calcite/sql2rel/AuxiliaryConverter.java |   2 -
 .../sql2rel/CorrelationReferenceFinder.java        |   2 -
 .../sql2rel/DeduplicateCorrelateVariables.java     |   2 -
 .../apache/calcite/sql2rel/InitializerContext.java |   2 -
 .../sql2rel/InitializerExpressionFactory.java      |   2 -
 .../sql2rel/NullInitializerExpressionFactory.java  |   2 -
 .../calcite/sql2rel/ReflectiveConvertletTable.java |   2 -
 .../apache/calcite/sql2rel/RelDecorrelator.java    |   2 -
 .../apache/calcite/sql2rel/RelFieldTrimmer.java    |   2 -
 .../sql2rel/RelStructuredTypeFlattener.java        |   2 -
 .../calcite/sql2rel/SqlNodeToRexConverter.java     |   2 -
 .../calcite/sql2rel/SqlNodeToRexConverterImpl.java |   2 -
 .../org/apache/calcite/sql2rel/SqlRexContext.java  |   2 -
 .../apache/calcite/sql2rel/SqlRexConvertlet.java   |   2 -
 .../calcite/sql2rel/SqlRexConvertletTable.java     |   2 -
 .../apache/calcite/sql2rel/SqlToRelConverter.java  |   2 -
 .../calcite/sql2rel/StandardConvertletTable.java   |   2 -
 .../apache/calcite/sql2rel/SubQueryConverter.java  |   2 -
 .../org/apache/calcite/sql2rel/package-info.java   |   2 -
 .../statistic/CachingSqlStatisticProvider.java     |   2 -
 .../calcite/statistic/MapSqlStatisticProvider.java |   2 -
 .../statistic/QuerySqlStatisticProvider.java       |   2 -
 .../org/apache/calcite/statistic/package-info.java |   2 -
 .../org/apache/calcite/tools/FrameworkConfig.java  |   2 -
 .../java/org/apache/calcite/tools/Frameworks.java  |   2 -
 .../org/apache/calcite/tools/PigRelBuilder.java    |   2 -
 .../java/org/apache/calcite/tools/Planner.java     |   2 -
 .../java/org/apache/calcite/tools/Program.java     |   2 -
 .../java/org/apache/calcite/tools/Programs.java    |   2 -
 .../java/org/apache/calcite/tools/RelBuilder.java  |   2 -
 .../apache/calcite/tools/RelBuilderFactory.java    |   2 -
 .../calcite/tools/RelConversionException.java      |   2 -
 .../java/org/apache/calcite/tools/RelRunner.java   |   2 -
 .../java/org/apache/calcite/tools/RelRunners.java  |   2 -
 .../java/org/apache/calcite/tools/RuleSet.java     |   2 -
 .../java/org/apache/calcite/tools/RuleSets.java    |   2 -
 .../apache/calcite/tools/ValidationException.java  |   2 -
 .../org/apache/calcite/tools/package-info.java     |   2 -
 .../calcite/util/BarfingInvocationHandler.java     |   2 -
 .../java/org/apache/calcite/util/Benchmark.java    |   2 -
 .../main/java/org/apache/calcite/util/BitSets.java |   2 -
 .../java/org/apache/calcite/util/BitString.java    |   2 -
 .../java/org/apache/calcite/util/BlackholeMap.java |   2 -
 .../src/main/java/org/apache/calcite/util/Bug.java |   2 -
 .../org/apache/calcite/util/BuiltInMethod.java     |   2 -
 .../calcite/util/CalciteParserException.java       |   2 -
 .../calcite/util/CalciteValidatorException.java    |   2 -
 .../java/org/apache/calcite/util/CancelFlag.java   |   2 -
 .../calcite/util/CaseInsensitiveComparator.java    |   2 -
 .../java/org/apache/calcite/util/CastingList.java  |   2 -
 .../java/org/apache/calcite/util/ChunkList.java    |   2 -
 .../main/java/org/apache/calcite/util/Closer.java  |   2 -
 .../org/apache/calcite/util/CompositeList.java     |   2 -
 .../java/org/apache/calcite/util/CompositeMap.java |   2 -
 .../apache/calcite/util/ControlFlowException.java  |   2 -
 .../org/apache/calcite/util/ConversionUtil.java    |   2 -
 .../java/org/apache/calcite/util/DateString.java   |   2 -
 .../apache/calcite/util/DateTimeStringUtils.java   |   2 -
 .../calcite/util/DelegatingInvocationHandler.java  |   2 -
 .../org/apache/calcite/util/EquivalenceSet.java    |   2 -
 .../java/org/apache/calcite/util/Filterator.java   |   2 -
 .../java/org/apache/calcite/util/Glossary.java     |   2 -
 .../main/java/org/apache/calcite/util/Holder.java  |   2 -
 .../org/apache/calcite/util/ImmutableBitSet.java   |   2 -
 .../org/apache/calcite/util/ImmutableIntList.java  |   2 -
 .../apache/calcite/util/ImmutableNullableList.java |   2 -
 .../main/java/org/apache/calcite/util/IntList.java |   2 -
 .../apache/calcite/util/IntegerIntervalSet.java    |   2 -
 .../java/org/apache/calcite/util/JsonBuilder.java  |   2 -
 .../main/java/org/apache/calcite/util/Litmus.java  |   2 -
 .../main/java/org/apache/calcite/util/NameMap.java |   2 -
 .../java/org/apache/calcite/util/NameMultimap.java |   2 -
 .../main/java/org/apache/calcite/util/NameSet.java |   2 -
 .../java/org/apache/calcite/util/NlsString.java    |   2 -
 .../java/org/apache/calcite/util/NumberUtil.java   |   2 -
 .../java/org/apache/calcite/util/Optionality.java  |   2 -
 .../main/java/org/apache/calcite/util/Pair.java    |   2 -
 .../apache/calcite/util/PartiallyOrderedSet.java   |   2 -
 .../java/org/apache/calcite/util/Permutation.java  |   2 -
 .../calcite/util/PrecedenceClimbingParser.java     |   2 -
 .../java/org/apache/calcite/util/ReflectUtil.java  |   2 -
 .../calcite/util/ReflectiveVisitDispatcher.java    |   2 -
 .../org/apache/calcite/util/ReflectiveVisitor.java |   2 -
 .../org/apache/calcite/util/SaffronProperties.java |   2 -
 .../apache/calcite/util/SerializableCharset.java   |   2 -
 .../main/java/org/apache/calcite/util/Source.java  |   2 -
 .../apache/calcite/util/SourceStringReader.java    |   2 -
 .../main/java/org/apache/calcite/util/Sources.java |   2 -
 .../java/org/apache/calcite/util/StackWriter.java  |   2 -
 .../main/java/org/apache/calcite/util/Stacks.java  |   2 -
 .../main/java/org/apache/calcite/util/Static.java  |   2 -
 .../java/org/apache/calcite/util/Template.java     |   2 -
 .../java/org/apache/calcite/util/TimeString.java   |   2 -
 .../calcite/util/TimeWithTimeZoneString.java       |   2 -
 .../org/apache/calcite/util/TimestampString.java   |   2 -
 .../calcite/util/TimestampWithTimeZoneString.java  |   2 -
 .../org/apache/calcite/util/TryThreadLocal.java    |   2 -
 .../apache/calcite/util/UnmodifiableArrayList.java |   2 -
 .../main/java/org/apache/calcite/util/Unsafe.java  |   2 -
 .../main/java/org/apache/calcite/util/Util.java    |   2 -
 .../java/org/apache/calcite/util/XmlOutput.java    |   3 -
 .../util/graph/AttributedDirectedGraph.java        |   2 -
 .../calcite/util/graph/BreadthFirstIterator.java   |   2 -
 .../apache/calcite/util/graph/CycleDetector.java   |   2 -
 .../calcite/util/graph/DefaultDirectedGraph.java   |   2 -
 .../org/apache/calcite/util/graph/DefaultEdge.java |   2 -
 .../calcite/util/graph/DepthFirstIterator.java     |   2 -
 .../apache/calcite/util/graph/DirectedGraph.java   |   2 -
 .../java/org/apache/calcite/util/graph/Graphs.java |   2 -
 .../util/graph/TopologicalOrderIterator.java       |   2 -
 .../apache/calcite/util/graph/package-info.java    |   2 -
 .../apache/calcite/util/javac/JaninoCompiler.java  |   2 -
 .../apache/calcite/util/javac/JavaCompiler.java    |   2 -
 .../calcite/util/javac/JavaCompilerArgs.java       |   2 -
 .../apache/calcite/util/javac/package-info.java    |   2 -
 .../util/mapping/AbstractSourceMapping.java        |   2 -
 .../util/mapping/AbstractTargetMapping.java        |   2 -
 .../org/apache/calcite/util/mapping/IntPair.java   |   2 -
 .../org/apache/calcite/util/mapping/Mapping.java   |   2 -
 .../apache/calcite/util/mapping/MappingType.java   |   2 -
 .../org/apache/calcite/util/mapping/Mappings.java  |   2 -
 .../apache/calcite/util/mapping/package-info.java  |   2 -
 .../java/org/apache/calcite/util/package-info.java |   2 -
 .../apache/calcite/util/trace/CalciteLogger.java   |   2 -
 .../calcite/util/trace/CalciteTimingTracer.java    |   2 -
 .../apache/calcite/util/trace/CalciteTrace.java    |   2 -
 .../apache/calcite/util/trace/package-info.java    |   2 -
 .../apache/calcite/jdbc/CalciteDriverVersion.java  |   2 -
 core/src/test/codegen/includes/parserImpls.ftl     |   2 -
 core/src/test/java/RootEmployee.java               |   2 -
 core/src/test/java/RootHr.java                     |   2 -
 .../calcite/adapter/clone/ArrayTableTest.java      |   2 -
 .../calcite/adapter/enumerable/EnumUtilsTest.java  |   2 -
 .../calcite/adapter/enumerable/PhysTypeTest.java   |   2 -
 .../calcite/adapter/enumerable/TypeFinderTest.java |   2 -
 .../calcite/adapter/generate/RangeTable.java       |   2 -
 .../apache/calcite/examples/RelBuilderExample.java |   2 -
 .../examples/foodmart/java/JdbcExample.java        |   2 -
 .../calcite/jdbc/CalciteRemoteDriverTest.java      |   2 -
 .../apache/calcite/jdbc/JavaTypeFactoryTest.java   |   2 -
 .../calcite/materialize/LatticeSuggesterTest.java  |   2 -
 .../apache/calcite/plan/RelOptPlanReaderTest.java  |   2 -
 .../org/apache/calcite/plan/RelOptUtilTest.java    |   2 -
 .../java/org/apache/calcite/plan/RelTraitTest.java |   2 -
 .../org/apache/calcite/plan/RelWriterTest.java     |   2 -
 .../plan/volcano/CollationConversionTest.java      |   2 -
 .../apache/calcite/plan/volcano/ComboRuleTest.java |   2 -
 .../apache/calcite/plan/volcano/PlannerTests.java  |   2 -
 .../calcite/plan/volcano/TraitConversionTest.java  |   2 -
 .../calcite/plan/volcano/TraitPropagationTest.java |   2 -
 .../calcite/plan/volcano/VolcanoPlannerTest.java   |   2 -
 .../plan/volcano/VolcanoPlannerTraitTest.java      |   2 -
 .../prepare/LookupOperatorOverloadsTest.java       |   2 -
 .../org/apache/calcite/profile/ProfilerTest.java   |   2 -
 .../org/apache/calcite/rel/RelCollationTest.java   |   2 -
 .../apache/calcite/rel/RelDistributionTest.java    |   2 -
 .../rel/logical/ToLogicalConverterTest.java        |   2 -
 .../rel/rel2sql/RelToSqlConverterStructsTest.java  |   2 -
 .../calcite/rel/rel2sql/RelToSqlConverterTest.java |   2 -
 .../calcite/rel/rules/DateRangeRulesTest.java      |   2 -
 .../calcite/rel/rules/EnumerableLimitRuleTest.java |   2 -
 .../calcite/rel/rules/SortRemoveRuleTest.java      |   2 -
 .../org/apache/calcite/rex/RexBuilderTest.java     |  11 +-
 .../org/apache/calcite/rex/RexExecutorTest.java    |   2 -
 .../rex/RexSqlStandardConvertletTableTest.java     |  11 +-
 .../org/apache/calcite/runtime/AutomatonTest.java  |   2 -
 .../apache/calcite/runtime/BinarySearchTest.java   |  20 +-
 .../runtime/DeterministicAutomatonTest.java        |   2 -
 .../apache/calcite/runtime/EnumerablesTest.java    |   5 +-
 .../apache/calcite/schemas/HrClusteredSchema.java  |   2 -
 .../calcite/sql/SqlSetOptionOperatorTest.java      |   2 -
 .../apache/calcite/sql/parser/SqlParserTest.java   |   2 -
 .../apache/calcite/sql/parser/SqlUnParserTest.java |   2 -
 .../ExtensionSqlParserTest.java                    |   2 -
 .../parserextensiontesting/SqlCreateTable.java     |   2 -
 .../parserextensiontesting/SqlUploadJarNode.java   |   2 -
 .../apache/calcite/sql/test/AbstractSqlTester.java |   2 -
 .../apache/calcite/sql/test/DocumentationTest.java |   2 -
 .../apache/calcite/sql/test/SqlAdvisorTest.java    |   2 -
 .../calcite/sql/test/SqlOperatorBaseTest.java      |   2 -
 .../apache/calcite/sql/test/SqlOperatorTest.java   |   2 -
 .../calcite/sql/test/SqlPrettyWriterTest.java      |   2 -
 .../apache/calcite/sql/test/SqlRuntimeTester.java  |   2 -
 .../apache/calcite/sql/test/SqlTestFactory.java    |   2 -
 .../org/apache/calcite/sql/test/SqlTester.java     |   2 -
 .../java/org/apache/calcite/sql/test/SqlTests.java |   2 -
 .../apache/calcite/sql/test/SqlTypeNameTest.java   |   2 -
 .../calcite/sql/test/SqlValidatorTester.java       |   2 -
 .../org/apache/calcite/sql/test/package-info.java  |   2 -
 .../calcite/sql/type/RelDataTypeSystemTest.java    |  23 +-
 .../calcite/sql/type/SqlTypeFactoryTest.java       |   5 +-
 .../apache/calcite/sql/type/SqlTypeFixture.java    |   2 -
 .../apache/calcite/sql/type/SqlTypeUtilTest.java   |  20 +-
 .../calcite/sql/validate/LexCaseSensitiveTest.java |   2 -
 .../apache/calcite/sql/validate/LexEscapeTest.java |   2 -
 .../calcite/sql/validate/SqlValidatorUtilTest.java |   2 -
 .../org/apache/calcite/test/BookstoreSchema.java   |   2 -
 .../org/apache/calcite/test/CalciteAssert.java     |   2 -
 .../apache/calcite/test/CalciteResourceTest.java   |   2 -
 .../calcite/test/CalciteSqlOperatorTest.java       |   2 -
 .../apache/calcite/test/CollectionTypeTest.java    |  14 +-
 .../org/apache/calcite/test/ConnectionSpec.java    |   2 -
 .../org/apache/calcite/test/CoreQuidemTest.java    |   2 -
 .../calcite/test/CountriesTableFunction.java       |   2 -
 .../org/apache/calcite/test/DiffRepository.java    |   2 -
 .../java/org/apache/calcite/test/DiffTestCase.java |   2 -
 .../apache/calcite/test/ExceptionMessageTest.java  |   2 -
 .../org/apache/calcite/test/FilteratorTest.java    |   2 -
 .../test/FoodMartLatticeStatisticProvider.java     |   2 -
 .../org/apache/calcite/test/FoodMartQuerySet.java  |   2 -
 .../java/org/apache/calcite/test/FoodmartTest.java |   2 -
 .../org/apache/calcite/test/HepPlannerTest.java    |   2 -
 .../org/apache/calcite/test/HierarchySchema.java   |   2 -
 .../calcite/test/InduceGroupingTypeTest.java       |   2 -
 .../org/apache/calcite/test/InterpreterTest.java   |   2 -
 .../org/apache/calcite/test/JdbcAdapterTest.java   |   2 -
 .../test/JdbcFrontJdbcBackLinqMiddleTest.java      |   2 -
 .../apache/calcite/test/JdbcFrontJdbcBackTest.java |   2 -
 .../apache/calcite/test/JdbcFrontLinqBackTest.java |   2 -
 .../java/org/apache/calcite/test/JdbcTest.java     |   8 +-
 .../java/org/apache/calcite/test/LatticeTest.java  |   2 -
 .../apache/calcite/test/LinqFrontJdbcBackTest.java |   2 -
 .../java/org/apache/calcite/test/Matchers.java     |   2 -
 .../apache/calcite/test/MaterializationTest.java   |   2 -
 .../org/apache/calcite/test/MockRelOptCost.java    |   2 -
 .../org/apache/calcite/test/MockRelOptPlanner.java |   2 -
 .../apache/calcite/test/MockSqlOperatorTable.java  |   2 -
 .../java/org/apache/calcite/test/ModelTest.java    |   2 -
 .../calcite/test/MultiJdbcSchemaJoinTest.java      |   2 -
 .../org/apache/calcite/test/MutableRelTest.java    |   2 -
 .../org/apache/calcite/test/PigRelBuilderTest.java |   2 -
 .../java/org/apache/calcite/test/QuidemTest.java   |   2 -
 .../apache/calcite/test/ReflectiveSchemaTest.java  |   5 +-
 .../org/apache/calcite/test/RelBuilderTest.java    |   2 -
 .../calcite/test/RelMdColumnOriginsTest.java       |   2 -
 .../test/RelMdPercentageOriginalRowsTest.java      |   2 -
 .../org/apache/calcite/test/RelMetadataTest.java   |   5 +-
 .../org/apache/calcite/test/RelOptRulesTest.java   |  14 +-
 .../org/apache/calcite/test/RelOptTestBase.java    |   2 -
 .../calcite/test/RexImplicationCheckerTest.java    |   2 -
 .../apache/calcite/test/RexProgramBuilderBase.java |   2 -
 .../org/apache/calcite/test/RexProgramTest.java    |   2 -
 .../org/apache/calcite/test/RexShuttleTest.java    |   8 +-
 .../apache/calcite/test/RexTransformerTest.java    |   2 -
 .../apache/calcite/test/ScannableTableTest.java    |   2 -
 .../apache/calcite/test/SqlAdvisorJdbcTest.java    |   2 -
 .../org/apache/calcite/test/SqlFunctionsTest.java  |   2 -
 .../apache/calcite/test/SqlHintsConverterTest.java |   2 -
 .../apache/calcite/test/SqlJsonFunctionsTest.java  |   2 -
 .../org/apache/calcite/test/SqlLimitsTest.java     |   2 -
 .../java/org/apache/calcite/test/SqlLineTest.java  |   2 -
 .../calcite/test/SqlOperatorBindingTest.java       |   2 -
 .../calcite/test/SqlStatisticProviderTest.java     |   2 -
 .../java/org/apache/calcite/test/SqlTestGen.java   |   2 -
 .../test/SqlToRelConverterExtendedTest.java        |   2 -
 .../apache/calcite/test/SqlToRelConverterTest.java |   5 +-
 .../org/apache/calcite/test/SqlToRelTestBase.java  |   2 -
 .../calcite/test/SqlValidatorDynamicTest.java      |   2 -
 .../calcite/test/SqlValidatorFeatureTest.java      |   2 -
 .../apache/calcite/test/SqlValidatorMatchTest.java |   2 -
 .../org/apache/calcite/test/SqlValidatorTest.java  |   5 +-
 .../apache/calcite/test/SqlValidatorTestCase.java  |   2 -
 .../java/org/apache/calcite/test/StreamTest.java   |   2 -
 .../org/apache/calcite/test/TableFunctionTest.java |   2 -
 .../apache/calcite/test/TableInRootSchemaTest.java |   2 -
 .../calcite/test/TypeCoercionConverterTest.java    |   4 +-
 .../org/apache/calcite/test/TypeCoercionTest.java  |   4 +-
 .../test/java/org/apache/calcite/test/UdfTest.java |   5 +-
 .../test/java/org/apache/calcite/test/UdtTest.java |   2 -
 .../test/java/org/apache/calcite/test/WithLex.java |   2 -
 .../calcite/test/catalog/CompoundNameColumn.java   |   2 -
 .../test/catalog/CompoundNameColumnResolver.java   |   2 -
 .../calcite/test/catalog/CountingFactory.java      |   2 -
 .../catalog/EmpInitializerExpressionFactory.java   |   2 -
 .../org/apache/calcite/test/catalog/Fixture.java   |   2 -
 .../calcite/test/catalog/MockCatalogReader.java    |   2 -
 .../test/catalog/MockCatalogReaderDynamic.java     |   2 -
 .../test/catalog/MockCatalogReaderExtended.java    |   2 -
 .../test/catalog/MockCatalogReaderSimple.java      |   2 -
 .../catalog/VirtualColumnsExpressionFactory.java   |   2 -
 .../test/concurrent/ConcurrentTestCommand.java     |   2 -
 .../concurrent/ConcurrentTestCommandExecutor.java  |   2 -
 .../concurrent/ConcurrentTestCommandGenerator.java |   2 -
 .../concurrent/ConcurrentTestCommandScript.java    |   2 -
 .../test/concurrent/ConcurrentTestPlugin.java      |   2 -
 .../concurrent/ConcurrentTestPluginCommand.java    |   2 -
 .../ConcurrentTestTimedCommandGenerator.java       |   2 -
 .../calcite/test/concurrent/SamplePlugin.java      |   2 -
 .../calcite/test/concurrent/package-info.java      |   2 -
 .../EnumerableBatchNestedLoopJoinTest.java         |   2 -
 .../test/enumerable/EnumerableCorrelateTest.java   |   2 -
 .../test/enumerable/EnumerableHashJoinTest.java    |   2 -
 .../test/enumerable/EnumerableJoinTest.java        |   2 -
 .../EnumerableRepeatUnionHierarchyTest.java        |   2 -
 .../test/enumerable/EnumerableRepeatUnionTest.java |   2 -
 .../calcite/test/enumerable/package-info.java      |   2 -
 .../org/apache/calcite/test/fuzzer/RexFuzzer.java  |   2 -
 .../calcite/test/fuzzer/RexProgramFuzzyTest.java   |   2 -
 .../apache/calcite/test/fuzzer/RexShrinker.java    |   2 -
 .../calcite/test/fuzzer/RexToTestCodeShuttle.java  |   2 -
 .../apache/calcite/test/fuzzer/SimplifyTask.java   |   2 -
 .../java/org/apache/calcite/test/package-info.java |   2 -
 .../org/apache/calcite/tools/FrameworksTest.java   |   2 -
 .../java/org/apache/calcite/tools/PlannerTest.java |   8 +-
 .../java/org/apache/calcite/tools/TpchSchema.java  |   2 -
 .../java/org/apache/calcite/util/BitSetsTest.java  |   2 -
 .../org/apache/calcite/util/ChunkListTest.java     |   2 -
 .../apache/calcite/util/ImmutableBitSetTest.java   |   2 -
 .../calcite/util/PartiallyOrderedSetTest.java      |   2 -
 .../apache/calcite/util/PermutationTestCase.java   |   2 -
 .../calcite/util/PrecedenceClimbingParserTest.java |   2 -
 .../apache/calcite/util/ReflectVisitorTest.java    |   2 -
 .../test/java/org/apache/calcite/util/Smalls.java  |   2 -
 .../java/org/apache/calcite/util/SourceTest.java   |   2 -
 .../java/org/apache/calcite/util/TestUtil.java     |   2 -
 .../java/org/apache/calcite/util/TestUtilTest.java |   8 +-
 .../java/org/apache/calcite/util/UtilTest.java     |   2 -
 .../calcite/util/graph/DirectedGraphTest.java      |   2 -
 .../apache/calcite/util/mapping/MappingTest.java   |   2 -
 .../adapter/druid/BinaryOperatorConversion.java    |   2 -
 .../adapter/druid/CeilOperatorConversion.java      |   2 -
 .../calcite/adapter/druid/ComplexMetric.java       |   2 -
 .../adapter/druid/DefaultDimensionSpec.java        |   2 -
 .../calcite/adapter/druid/DimensionSpec.java       |   2 -
 .../adapter/druid/DirectOperatorConversion.java    |   2 -
 .../calcite/adapter/druid/DruidConnection.java     |   2 -
 .../calcite/adapter/druid/DruidConnectionImpl.java |   2 -
 .../calcite/adapter/druid/DruidDateTimeUtils.java  |   2 -
 .../calcite/adapter/druid/DruidExpressions.java    |   2 -
 .../apache/calcite/adapter/druid/DruidJson.java    |   2 -
 .../calcite/adapter/druid/DruidJsonFilter.java     |   2 -
 .../apache/calcite/adapter/druid/DruidQuery.java   |   2 -
 .../apache/calcite/adapter/druid/DruidRules.java   |   2 -
 .../apache/calcite/adapter/druid/DruidSchema.java  |   2 -
 .../calcite/adapter/druid/DruidSchemaFactory.java  |   2 -
 .../adapter/druid/DruidSqlCastConverter.java       |   2 -
 .../adapter/druid/DruidSqlOperatorConverter.java   |   2 -
 .../apache/calcite/adapter/druid/DruidTable.java   |   2 -
 .../calcite/adapter/druid/DruidTableFactory.java   |   2 -
 .../apache/calcite/adapter/druid/DruidType.java    |   2 -
 .../adapter/druid/ExtractOperatorConversion.java   |   2 -
 .../adapter/druid/ExtractionDimensionSpec.java     |   2 -
 .../calcite/adapter/druid/ExtractionFunction.java  |   2 -
 .../adapter/druid/FloorOperatorConversion.java     |   2 -
 .../calcite/adapter/druid/Granularities.java       |   2 -
 .../apache/calcite/adapter/druid/Granularity.java  |   2 -
 .../adapter/druid/NaryOperatorConverter.java       |   2 -
 .../apache/calcite/adapter/druid/QueryType.java    |   2 -
 .../adapter/druid/SubstringOperatorConversion.java |   2 -
 .../adapter/druid/TimeExtractionFunction.java      |   2 -
 .../druid/UnaryPrefixOperatorConversion.java       |   2 -
 .../druid/UnarySuffixOperatorConversion.java       |   2 -
 .../calcite/adapter/druid/VirtualColumn.java       |   2 -
 .../apache/calcite/adapter/druid/package-info.java |   2 -
 .../adapter/druid/DruidQueryFilterTest.java        |   2 -
 .../org/apache/calcite/test/DruidAdapter2IT.java   | 227 +++++++------------
 .../org/apache/calcite/test/DruidAdapterIT.java    | 239 +++++++--------------
 .../java/org/apache/calcite/test/DruidChecker.java |   2 -
 .../calcite/test/DruidDateRangeRulesTest.java      |   2 -
 .../elasticsearch/ElasticsearchAggregate.java      |   2 -
 .../elasticsearch/ElasticsearchConstants.java      |   2 -
 .../elasticsearch/ElasticsearchEnumerators.java    |   2 -
 .../adapter/elasticsearch/ElasticsearchFilter.java |   2 -
 .../adapter/elasticsearch/ElasticsearchJson.java   |   2 -
 .../elasticsearch/ElasticsearchMapping.java        |   2 -
 .../adapter/elasticsearch/ElasticsearchMethod.java |   2 -
 .../elasticsearch/ElasticsearchProject.java        |   2 -
 .../adapter/elasticsearch/ElasticsearchRel.java    |   2 -
 .../adapter/elasticsearch/ElasticsearchRules.java  |   2 -
 .../adapter/elasticsearch/ElasticsearchSchema.java |   2 -
 .../elasticsearch/ElasticsearchSchemaFactory.java  |   2 -
 .../elasticsearch/ElasticsearchSearchResult.java   |   2 -
 .../adapter/elasticsearch/ElasticsearchSort.java   |   2 -
 .../adapter/elasticsearch/ElasticsearchTable.java  |   2 -
 .../elasticsearch/ElasticsearchTableScan.java      |   2 -
 .../ElasticsearchToEnumerableConverter.java        |   2 -
 .../ElasticsearchToEnumerableConverterRule.java    |   2 -
 .../elasticsearch/ElasticsearchTransport.java      |   2 -
 .../elasticsearch/ElasticsearchVersion.java        |   2 -
 .../elasticsearch/MapProjectionFieldVisitor.java   |   2 -
 .../adapter/elasticsearch/PredicateAnalyzer.java   |   2 -
 .../adapter/elasticsearch/QueryBuilders.java       |   2 -
 .../calcite/adapter/elasticsearch/Scrolling.java   |   2 -
 .../adapter/elasticsearch/package-info.java        |   2 -
 .../adapter/elasticsearch/AggregationTest.java     |  41 ++--
 .../adapter/elasticsearch/BooleanLogicTest.java    |   8 +-
 .../elasticsearch/ElasticSearchAdapterTest.java    |  26 +--
 .../elasticsearch/ElasticsearchJsonTest.java       |  23 +-
 .../elasticsearch/ElasticsearchVersionTest.java    |   5 +-
 .../elasticsearch/EmbeddedElasticsearchNode.java   |   2 -
 .../elasticsearch/EmbeddedElasticsearchPolicy.java |   2 -
 .../calcite/adapter/elasticsearch/MatchTest.java   |   5 +-
 .../adapter/elasticsearch/Projection2Test.java     |  17 +-
 .../adapter/elasticsearch/ProjectionTest.java      |   5 +-
 .../adapter/elasticsearch/QueryBuildersTest.java   |  23 +-
 .../adapter/elasticsearch/ScrollingTest.java       |   5 +-
 .../apache/calcite/test/ElasticsearchChecker.java  |   2 -
 .../apache/calcite/adapter/csv/CsvEnumerator.java  |   2 -
 .../apache/calcite/adapter/csv/CsvFieldType.java   |   2 -
 .../calcite/adapter/csv/CsvFilterableTable.java    |   2 -
 .../adapter/csv/CsvProjectTableScanRule.java       |   2 -
 .../calcite/adapter/csv/CsvScannableTable.java     |   2 -
 .../org/apache/calcite/adapter/csv/CsvSchema.java  |   2 -
 .../calcite/adapter/csv/CsvSchemaFactory.java      |   2 -
 .../calcite/adapter/csv/CsvStreamReader.java       |   2 -
 .../adapter/csv/CsvStreamScannableTable.java       |   2 -
 .../calcite/adapter/csv/CsvStreamTableFactory.java |   2 -
 .../org/apache/calcite/adapter/csv/CsvTable.java   |   2 -
 .../calcite/adapter/csv/CsvTableFactory.java       |   2 -
 .../apache/calcite/adapter/csv/CsvTableScan.java   |   2 -
 .../calcite/adapter/csv/CsvTranslatableTable.java  |   2 -
 .../apache/calcite/adapter/csv/JsonEnumerator.java |   2 -
 .../calcite/adapter/csv/JsonScannableTable.java    |   2 -
 .../org/apache/calcite/adapter/csv/JsonTable.java  |   2 -
 .../apache/calcite/adapter/csv/package-info.java   |   2 -
 .../test/java/org/apache/calcite/test/CsvTest.java |   2 -
 .../java/org/apache/calcite/example/maze/Maze.java |   2 -
 .../org/apache/calcite/example/maze/MazeTable.java |   2 -
 .../apache/calcite/example/maze/package-info.java  |   2 -
 .../apache/calcite/test/ExampleFunctionTest.java   |   2 -
 .../calcite/adapter/file/FileEnumerator.java       |   2 -
 .../apache/calcite/adapter/file/FileFieldType.java |   2 -
 .../apache/calcite/adapter/file/FileReader.java    |   2 -
 .../calcite/adapter/file/FileReaderException.java  |   2 -
 .../calcite/adapter/file/FileRowConverter.java     |   2 -
 .../apache/calcite/adapter/file/FileSchema.java    |   2 -
 .../calcite/adapter/file/FileSchemaFactory.java    |   2 -
 .../org/apache/calcite/adapter/file/FileTable.java |   2 -
 .../apache/calcite/adapter/file/FileTableScan.java |   2 -
 .../apache/calcite/adapter/file/package-info.java  |   2 -
 .../calcite/adapter/file/FileReaderTest.java       |   2 -
 .../calcite/adapter/file/RequiresNetwork.java      |   2 -
 .../adapter/file/RequiresNetworkExtension.java     |   2 -
 .../org/apache/calcite/adapter/file/SqlTest.java   |   2 -
 .../apache/calcite/adapter/file/package-info.java  |   2 -
 .../calcite/adapter/geode/rel/GeodeAggregate.java  |   2 -
 .../calcite/adapter/geode/rel/GeodeEnumerator.java |   2 -
 .../calcite/adapter/geode/rel/GeodeFilter.java     |   2 -
 .../calcite/adapter/geode/rel/GeodeProject.java    |   2 -
 .../apache/calcite/adapter/geode/rel/GeodeRel.java |   2 -
 .../calcite/adapter/geode/rel/GeodeRules.java      |   2 -
 .../calcite/adapter/geode/rel/GeodeSchema.java     |   2 -
 .../adapter/geode/rel/GeodeSchemaFactory.java      |   2 -
 .../calcite/adapter/geode/rel/GeodeSort.java       |   2 -
 .../calcite/adapter/geode/rel/GeodeTable.java      |   2 -
 .../calcite/adapter/geode/rel/GeodeTableScan.java  |   2 -
 .../geode/rel/GeodeToEnumerableConverter.java      |   2 -
 .../geode/rel/GeodeToEnumerableConverterRule.java  |   2 -
 .../calcite/adapter/geode/rel/package-info.java    |   2 -
 .../geode/simple/GeodeSimpleEnumerator.java        |   2 -
 .../geode/simple/GeodeSimpleScannableTable.java    |   2 -
 .../adapter/geode/simple/GeodeSimpleSchema.java    |   2 -
 .../geode/simple/GeodeSimpleSchemaFactory.java     |   2 -
 .../calcite/adapter/geode/simple/package-info.java |   2 -
 .../calcite/adapter/geode/util/GeodeUtils.java     |   2 -
 .../adapter/geode/util/JavaTypeFactoryExtImpl.java |   2 -
 .../calcite/adapter/geode/util/package-info.java   |   2 -
 .../adapter/geode/rel/AbstractGeodeTest.java       |   2 -
 .../adapter/geode/rel/GeodeAllDataTypesTest.java   |  38 ++--
 .../calcite/adapter/geode/rel/GeodeAssertions.java |   2 -
 .../adapter/geode/rel/GeodeBookstoreTest.java      | 110 ++++------
 .../adapter/geode/rel/GeodeEmbeddedPolicy.java     |   2 -
 .../calcite/adapter/geode/rel/GeodeZipsTest.java   |  44 ++--
 .../calcite/adapter/geode/rel/JsonLoader.java      |   2 -
 .../adapter/geode/rel/RelationalJdbcExample.java   |   2 -
 .../adapter/geode/simple/BookMasterRegionTest.java |   2 -
 .../adapter/geode/simple/SimpleJdbcExample.java    |   2 -
 .../adapter/kafka/KafkaMessageEnumerator.java      |   2 -
 .../calcite/adapter/kafka/KafkaRowConverter.java   |   2 -
 .../adapter/kafka/KafkaRowConverterImpl.java       |   2 -
 .../calcite/adapter/kafka/KafkaStreamTable.java    |   2 -
 .../calcite/adapter/kafka/KafkaTableConstants.java |   2 -
 .../calcite/adapter/kafka/KafkaTableFactory.java   |   2 -
 .../calcite/adapter/kafka/KafkaTableOptions.java   |   2 -
 .../apache/calcite/adapter/kafka/package-info.java |   2 -
 .../calcite/adapter/kafka/KafkaAdapterTest.java    |   2 -
 .../calcite/adapter/kafka/KafkaMockConsumer.java   |   2 -
 .../adapter/kafka/KafkaRowConverterTest.java       |   2 -
 .../apache/calcite/linq4j/AbstractEnumerable.java  |   2 -
 .../apache/calcite/linq4j/AbstractEnumerable2.java |   2 -
 .../apache/calcite/linq4j/AbstractQueryable.java   |   2 -
 .../org/apache/calcite/linq4j/BaseQueryable.java   |   2 -
 .../calcite/linq4j/CartesianProductEnumerator.java |   2 -
 .../apache/calcite/linq4j/DefaultEnumerable.java   |   2 -
 .../apache/calcite/linq4j/DefaultQueryable.java    |   2 -
 .../calcite/linq4j/DelegatingEnumerator.java       |   2 -
 .../java/org/apache/calcite/linq4j/Enumerable.java |   2 -
 .../apache/calcite/linq4j/EnumerableDefaults.java  |   2 -
 .../calcite/linq4j/EnumerableOrderedQueryable.java |   2 -
 .../apache/calcite/linq4j/EnumerableQueryable.java |   2 -
 .../java/org/apache/calcite/linq4j/Enumerator.java |   2 -
 .../apache/calcite/linq4j/ExtendedEnumerable.java  |   2 -
 .../calcite/linq4j/ExtendedOrderedEnumerable.java  |   2 -
 .../calcite/linq4j/ExtendedOrderedQueryable.java   |   2 -
 .../apache/calcite/linq4j/ExtendedQueryable.java   |   2 -
 .../java/org/apache/calcite/linq4j/Extensions.java |   2 -
 .../java/org/apache/calcite/linq4j/Grouping.java   |   2 -
 .../org/apache/calcite/linq4j/GroupingImpl.java    |   2 -
 .../java/org/apache/calcite/linq4j/JoinType.java   |   2 -
 .../java/org/apache/calcite/linq4j/Linq4j.java     |   2 -
 .../java/org/apache/calcite/linq4j/Lookup.java     |   2 -
 .../java/org/apache/calcite/linq4j/LookupImpl.java |   2 -
 .../apache/calcite/linq4j/MemoryEnumerable.java    |   2 -
 .../apache/calcite/linq4j/MemoryEnumerator.java    |   2 -
 .../org/apache/calcite/linq4j/MemoryFactory.java   |   2 -
 .../org/apache/calcite/linq4j/ModularInteger.java  |   2 -
 .../java/org/apache/calcite/linq4j/OpType.java     |   2 -
 .../main/java/org/apache/calcite/linq4j/Ord.java   |   2 -
 .../apache/calcite/linq4j/OrderedEnumerable.java   |   2 -
 .../apache/calcite/linq4j/OrderedQueryable.java    |   2 -
 .../org/apache/calcite/linq4j/PackageMarker.java   |   2 -
 .../org/apache/calcite/linq4j/QueryProvider.java   |   2 -
 .../apache/calcite/linq4j/QueryProviderImpl.java   |   2 -
 .../java/org/apache/calcite/linq4j/Queryable.java  |   2 -
 .../apache/calcite/linq4j/QueryableDefaults.java   |   2 -
 .../apache/calcite/linq4j/QueryableFactory.java    |   2 -
 .../apache/calcite/linq4j/QueryableRecorder.java   |   2 -
 .../org/apache/calcite/linq4j/RawEnumerable.java   |   2 -
 .../org/apache/calcite/linq4j/RawQueryable.java    |   2 -
 .../calcite/linq4j/TransformedEnumerator.java      |   2 -
 .../linq4j/function/BigDecimalFunction1.java       |   2 -
 .../calcite/linq4j/function/Deterministic.java     |   2 -
 .../calcite/linq4j/function/DoubleFunction1.java   |   2 -
 .../calcite/linq4j/function/EqualityComparer.java  |   2 -
 .../calcite/linq4j/function/Experimental.java      |   2 -
 .../calcite/linq4j/function/FloatFunction1.java    |   2 -
 .../apache/calcite/linq4j/function/Function.java   |   2 -
 .../apache/calcite/linq4j/function/Function0.java  |   2 -
 .../apache/calcite/linq4j/function/Function1.java  |   2 -
 .../apache/calcite/linq4j/function/Function2.java  |   2 -
 .../apache/calcite/linq4j/function/Functions.java  |   2 -
 .../calcite/linq4j/function/IntegerFunction1.java  |   2 -
 .../calcite/linq4j/function/LongFunction1.java     |   2 -
 .../calcite/linq4j/function/NonDeterministic.java  |   2 -
 .../function/NullableBigDecimalFunction1.java      |   2 -
 .../linq4j/function/NullableDoubleFunction1.java   |   2 -
 .../linq4j/function/NullableFloatFunction1.java    |   2 -
 .../linq4j/function/NullableIntegerFunction1.java  |   2 -
 .../linq4j/function/NullableLongFunction1.java     |   2 -
 .../apache/calcite/linq4j/function/Parameter.java  |   2 -
 .../apache/calcite/linq4j/function/Predicate1.java |   2 -
 .../apache/calcite/linq4j/function/Predicate2.java |   2 -
 .../apache/calcite/linq4j/function/SemiStrict.java |   2 -
 .../org/apache/calcite/linq4j/function/Strict.java |   2 -
 .../calcite/linq4j/function/package-info.java      |   2 -
 .../org/apache/calcite/linq4j/package-info.java    |   2 -
 .../apache/calcite/linq4j/tree/AbstractNode.java   |   2 -
 .../linq4j/tree/ArrayLengthRecordField.java        |   2 -
 .../calcite/linq4j/tree/BinaryExpression.java      |   2 -
 .../apache/calcite/linq4j/tree/BlockBuilder.java   |   2 -
 .../apache/calcite/linq4j/tree/BlockStatement.java |   2 -
 .../org/apache/calcite/linq4j/tree/Blocks.java     |   2 -
 .../apache/calcite/linq4j/tree/CallSiteBinder.java |   2 -
 .../org/apache/calcite/linq4j/tree/CatchBlock.java |   2 -
 .../calcite/linq4j/tree/ClassDeclaration.java      |   2 -
 .../linq4j/tree/ClassDeclarationFinder.java        |   2 -
 .../calcite/linq4j/tree/ConditionalExpression.java |   2 -
 .../calcite/linq4j/tree/ConditionalStatement.java  |   2 -
 .../calcite/linq4j/tree/ConstantExpression.java    |   2 -
 .../calcite/linq4j/tree/ConstantUntypedNull.java   |   2 -
 .../linq4j/tree/ConstructorDeclaration.java        |   2 -
 .../calcite/linq4j/tree/DeclarationStatement.java  |   2 -
 .../calcite/linq4j/tree/DefaultExpression.java     |   2 -
 .../linq4j/tree/DeterministicCodeOptimizer.java    |   2 -
 .../calcite/linq4j/tree/DynamicExpression.java     |   2 -
 .../apache/calcite/linq4j/tree/ElementInit.java    |   2 -
 .../org/apache/calcite/linq4j/tree/Evaluator.java  |   2 -
 .../org/apache/calcite/linq4j/tree/Expression.java |   2 -
 .../apache/calcite/linq4j/tree/ExpressionType.java |   2 -
 .../calcite/linq4j/tree/ExpressionVisitor.java     |   2 -
 .../calcite/linq4j/tree/ExpressionWriter.java      |   2 -
 .../apache/calcite/linq4j/tree/Expressions.java    |   2 -
 .../calcite/linq4j/tree/FieldDeclaration.java      |   2 -
 .../calcite/linq4j/tree/ForEachStatement.java      |   2 -
 .../apache/calcite/linq4j/tree/ForStatement.java   |   2 -
 .../calcite/linq4j/tree/FunctionExpression.java    |   2 -
 .../calcite/linq4j/tree/GotoExpressionKind.java    |   2 -
 .../apache/calcite/linq4j/tree/GotoStatement.java  |   2 -
 .../calcite/linq4j/tree/IndexExpression.java       |   2 -
 .../calcite/linq4j/tree/InvocationExpression.java  |   2 -
 .../apache/calcite/linq4j/tree/LabelStatement.java |   2 -
 .../apache/calcite/linq4j/tree/LabelTarget.java    |   2 -
 .../calcite/linq4j/tree/LambdaExpression.java      |   2 -
 .../calcite/linq4j/tree/ListInitExpression.java    |   2 -
 .../calcite/linq4j/tree/MemberAssignment.java      |   2 -
 .../apache/calcite/linq4j/tree/MemberBinding.java  |   2 -
 .../calcite/linq4j/tree/MemberDeclaration.java     |   2 -
 .../calcite/linq4j/tree/MemberExpression.java      |   2 -
 .../calcite/linq4j/tree/MemberInitExpression.java  |   2 -
 .../calcite/linq4j/tree/MemberListBinding.java     |   2 -
 .../calcite/linq4j/tree/MemberMemberBinding.java   |   2 -
 .../calcite/linq4j/tree/MethodCallExpression.java  |   2 -
 .../calcite/linq4j/tree/MethodDeclaration.java     |   2 -
 .../calcite/linq4j/tree/NewArrayExpression.java    |   2 -
 .../apache/calcite/linq4j/tree/NewExpression.java  |   2 -
 .../java/org/apache/calcite/linq4j/tree/Node.java  |   2 -
 .../calcite/linq4j/tree/OptimizeShuttle.java       |   2 -
 .../calcite/linq4j/tree/ParameterExpression.java   |   2 -
 .../org/apache/calcite/linq4j/tree/Primitive.java  |   2 -
 .../apache/calcite/linq4j/tree/PseudoField.java    |   2 -
 .../calcite/linq4j/tree/ReflectedPseudoField.java  |   2 -
 .../org/apache/calcite/linq4j/tree/Shuttle.java    |   2 -
 .../org/apache/calcite/linq4j/tree/Statement.java  |   2 -
 .../org/apache/calcite/linq4j/tree/SwitchCase.java |   2 -
 .../calcite/linq4j/tree/SwitchStatement.java       |   2 -
 .../calcite/linq4j/tree/TernaryExpression.java     |   2 -
 .../apache/calcite/linq4j/tree/ThrowStatement.java |   2 -
 .../apache/calcite/linq4j/tree/TryStatement.java   |   2 -
 .../calcite/linq4j/tree/TypeBinaryExpression.java  |   2 -
 .../java/org/apache/calcite/linq4j/tree/Types.java |   2 -
 .../calcite/linq4j/tree/UnaryExpression.java       |   2 -
 .../org/apache/calcite/linq4j/tree/Visitor.java    |   2 -
 .../apache/calcite/linq4j/tree/VisitorImpl.java    |   2 -
 .../apache/calcite/linq4j/tree/WhileStatement.java |   2 -
 .../apache/calcite/linq4j/tree/package-info.java   |   2 -
 .../src/test/java/com/example/Linq4jExample.java   |   2 -
 linq4j/src/test/java/com/example/package-info.java |   2 -
 .../calcite/linq4j/MemoryEnumerableTest.java       |   2 -
 .../calcite/linq4j/function/FunctionTest.java      |   2 -
 .../calcite/linq4j/function/package-info.java      |   2 -
 .../calcite/linq4j/test/BlockBuilderBase.java      |   2 -
 .../calcite/linq4j/test/BlockBuilderTest.java      |   5 +-
 .../calcite/linq4j/test/CorrelateJoinTest.java     |   2 -
 .../calcite/linq4j/test/DeterministicTest.java     |   2 -
 .../apache/calcite/linq4j/test/ExpressionTest.java |   2 -
 .../apache/calcite/linq4j/test/InlinerTest.java    |   2 -
 .../calcite/linq4j/test/JoinPreserveOrderTest.java |   2 -
 .../apache/calcite/linq4j/test/Linq4jSuite.java    |   2 -
 .../org/apache/calcite/linq4j/test/Linq4jTest.java |   5 +-
 .../apache/calcite/linq4j/test/LookupImplTest.java |   8 +-
 .../apache/calcite/linq4j/test/OptimizerTest.java  |   2 -
 .../apache/calcite/linq4j/test/PrimitiveTest.java  |   2 -
 .../apache/calcite/linq4j/test/package-info.java   |   2 -
 .../org/apache/calcite/linq4j/tree/TypeTest.java   |   2 -
 .../apache/calcite/linq4j/tree/package-info.java   |   2 -
 .../calcite/adapter/mongodb/MongoAggregate.java    |   2 -
 .../calcite/adapter/mongodb/MongoEnumerator.java   |   2 -
 .../calcite/adapter/mongodb/MongoFilter.java       |   2 -
 .../calcite/adapter/mongodb/MongoMethod.java       |   2 -
 .../calcite/adapter/mongodb/MongoProject.java      |   2 -
 .../apache/calcite/adapter/mongodb/MongoRel.java   |   2 -
 .../apache/calcite/adapter/mongodb/MongoRules.java |   2 -
 .../calcite/adapter/mongodb/MongoSchema.java       |   2 -
 .../adapter/mongodb/MongoSchemaFactory.java        |   2 -
 .../apache/calcite/adapter/mongodb/MongoSort.java  |   2 -
 .../apache/calcite/adapter/mongodb/MongoTable.java |   2 -
 .../calcite/adapter/mongodb/MongoTableScan.java    |   2 -
 .../mongodb/MongoToEnumerableConverter.java        |   2 -
 .../mongodb/MongoToEnumerableConverterRule.java    |   2 -
 .../calcite/adapter/mongodb/package-info.java      |   2 -
 .../calcite/adapter/mongodb/MongoAdapterTest.java  |   2 -
 .../adapter/mongodb/MongoDatabasePolicy.java       |   2 -
 .../org/apache/calcite/test/MongoAssertions.java   |   2 -
 .../apache/calcite/adapter/pig/PigAggFunction.java |   2 -
 .../apache/calcite/adapter/pig/PigAggregate.java   |   2 -
 .../apache/calcite/adapter/pig/PigDataType.java    |   2 -
 .../org/apache/calcite/adapter/pig/PigFilter.java  |   2 -
 .../org/apache/calcite/adapter/pig/PigJoin.java    |   2 -
 .../org/apache/calcite/adapter/pig/PigProject.java |   2 -
 .../org/apache/calcite/adapter/pig/PigRel.java     |   2 -
 .../calcite/adapter/pig/PigRelFactories.java       |   2 -
 .../org/apache/calcite/adapter/pig/PigRules.java   |   2 -
 .../org/apache/calcite/adapter/pig/PigSchema.java  |   2 -
 .../calcite/adapter/pig/PigSchemaFactory.java      |   2 -
 .../org/apache/calcite/adapter/pig/PigTable.java   |   2 -
 .../calcite/adapter/pig/PigTableFactory.java       |   2 -
 .../apache/calcite/adapter/pig/PigTableScan.java   |   2 -
 .../adapter/pig/PigToEnumerableConverter.java      |   2 -
 .../adapter/pig/PigToEnumerableConverterRule.java  |   2 -
 .../apache/calcite/adapter/pig/package-info.java   |   2 -
 .../org/apache/calcite/test/AbstractPigTest.java   |   2 -
 .../org/apache/calcite/test/PigAdapterTest.java    |   2 -
 .../calcite/test/PigRelBuilderStyleTest.java       |  26 +--
 .../main/java/org/apache/calcite/piglet/Ast.java   |   2 -
 .../calcite/piglet/DynamicTupleRecordType.java     |   2 -
 .../java/org/apache/calcite/piglet/Handler.java    |   2 -
 .../org/apache/calcite/piglet/PigConverter.java    |   2 -
 .../org/apache/calcite/piglet/PigRelBuilder.java   |   2 -
 .../org/apache/calcite/piglet/PigRelExVisitor.java |   2 -
 .../org/apache/calcite/piglet/PigRelExWalker.java  |   2 -
 .../calcite/piglet/PigRelOpInnerVisitor.java       |   2 -
 .../org/apache/calcite/piglet/PigRelOpVisitor.java |   2 -
 .../org/apache/calcite/piglet/PigRelOpWalker.java  |   2 -
 .../org/apache/calcite/piglet/PigRelSqlUdfs.java   |   2 -
 .../calcite/piglet/PigRelToSqlConverter.java       |   2 -
 .../apache/calcite/piglet/PigRelUdfConverter.java  |   2 -
 .../java/org/apache/calcite/piglet/PigTable.java   |   2 -
 .../calcite/piglet/PigToSqlAggregateRule.java      |   2 -
 .../java/org/apache/calcite/piglet/PigTypes.java   |   2 -
 .../org/apache/calcite/piglet/PigUdfFinder.java    |   2 -
 .../java/org/apache/calcite/piglet/PigUdfs.java    |   2 -
 .../calcite/piglet/PigUserDefinedFunction.java     |   2 -
 .../org/apache/calcite/piglet/package-info.java    |   2 -
 piglet/src/main/javacc/PigletParser.jj             |   2 -
 .../org/apache/calcite/test/CalciteHandler.java    |   2 -
 .../test/java/org/apache/calcite/test/Fluent.java  |   2 -
 .../java/org/apache/calcite/test/PigRelExTest.java |  89 +++-----
 .../java/org/apache/calcite/test/PigRelOpTest.java |   2 -
 .../org/apache/calcite/test/PigRelTestBase.java    |   2 -
 .../org/apache/calcite/test/PigScriptTest.java     |   5 +-
 .../java/org/apache/calcite/test/PigletTest.java   |   2 -
 .../apache/calcite/adapter/os/DuTableFunction.java |   2 -
 .../calcite/adapter/os/FilesTableFunction.java     |   2 -
 .../adapter/os/GitCommitsTableFunction.java        |   2 -
 .../calcite/adapter/os/JpsTableFunction.java       |   2 -
 .../org/apache/calcite/adapter/os/Processes.java   |   2 -
 .../apache/calcite/adapter/os/PsTableFunction.java |   2 -
 .../org/apache/calcite/adapter/os/SqlShell.java    |   2 -
 .../calcite/adapter/os/StdinTableFunction.java     |   2 -
 .../calcite/adapter/os/VmstatTableFunction.java    |   2 -
 .../apache/calcite/adapter/os/package-info.java    |   2 -
 .../apache/calcite/adapter/tpcds/TpcdsSchema.java  |   2 -
 .../calcite/adapter/tpcds/TpcdsSchemaFactory.java  |   2 -
 .../apache/calcite/adapter/tpcds/package-info.java |   2 -
 .../apache/calcite/adapter/tpch/TpchSchema.java    |   2 -
 .../calcite/adapter/tpch/TpchSchemaFactory.java    |   2 -
 .../apache/calcite/adapter/tpch/package-info.java  |   2 -
 .../calcite/chinook/CalciteConnectionProvider.java |   2 -
 .../calcite/chinook/ChinookAvaticaServer.java      |   2 -
 .../calcite/chinook/ChosenCustomerEmail.java       |   2 -
 .../org/apache/calcite/chinook/CodesFunction.java  |   2 -
 .../apache/calcite/chinook/ConnectionFactory.java  |   2 -
 .../apache/calcite/chinook/EnvironmentFairy.java   |   2 -
 .../chinook/PreferredAlbumsTableFactory.java       |   2 -
 .../chinook/PreferredGenresTableFactory.java       |   2 -
 .../calcite/chinook/StringConcatFunction.java      |   2 -
 .../org/apache/calcite/chinook/package-info.java   |   2 -
 .../apache/calcite/adapter/os/OsAdapterTest.java   |   2 -
 .../apache/calcite/adapter/tpcds/TpcdsTest.java    |   2 -
 .../org/apache/calcite/adapter/tpch/TpchTest.java  |   2 -
 .../org/apache/calcite/chinook/EndToEndTest.java   |   2 -
 .../RemotePreparedStatementParametersTest.java     |   2 -
 .../materialize/TpcdsLatticeSuggesterTest.java     |   2 -
 server/src/main/codegen/includes/parserImpls.ftl   |   2 -
 .../calcite/sql/ddl/SqlAttributeDefinition.java    |   2 -
 .../apache/calcite/sql/ddl/SqlCheckConstraint.java |   2 -
 .../calcite/sql/ddl/SqlColumnDeclaration.java      |   2 -
 .../calcite/sql/ddl/SqlCreateForeignSchema.java    |   2 -
 .../apache/calcite/sql/ddl/SqlCreateFunction.java  |   2 -
 .../calcite/sql/ddl/SqlCreateMaterializedView.java |   2 -
 .../apache/calcite/sql/ddl/SqlCreateSchema.java    |   2 -
 .../org/apache/calcite/sql/ddl/SqlCreateTable.java |   2 -
 .../org/apache/calcite/sql/ddl/SqlCreateType.java  |   2 -
 .../org/apache/calcite/sql/ddl/SqlCreateView.java  |   2 -
 .../org/apache/calcite/sql/ddl/SqlDdlNodes.java    |   2 -
 .../apache/calcite/sql/ddl/SqlDropFunction.java    |   2 -
 .../calcite/sql/ddl/SqlDropMaterializedView.java   |   2 -
 .../org/apache/calcite/sql/ddl/SqlDropObject.java  |   2 -
 .../org/apache/calcite/sql/ddl/SqlDropSchema.java  |   2 -
 .../org/apache/calcite/sql/ddl/SqlDropTable.java   |   2 -
 .../org/apache/calcite/sql/ddl/SqlDropType.java    |   2 -
 .../org/apache/calcite/sql/ddl/SqlDropView.java    |   2 -
 .../apache/calcite/sql/ddl/SqlKeyConstraint.java   |   2 -
 .../org/apache/calcite/sql/ddl/package-info.java   |   2 -
 .../org/apache/calcite/test/ServerParserTest.java  |   2 -
 .../org/apache/calcite/test/ServerQuidemTest.java  |   2 -
 .../java/org/apache/calcite/test/ServerTest.java   |   2 -
 .../apache/calcite/test/ServerUnParserTest.java    |   2 -
 .../adapter/spark/EnumerableToSparkConverter.java  |   2 -
 .../spark/EnumerableToSparkConverterRule.java      |   2 -
 .../apache/calcite/adapter/spark/HttpServer.java   |   2 -
 .../adapter/spark/JdbcToSparkConverter.java        |   2 -
 .../adapter/spark/JdbcToSparkConverterRule.java    |   2 -
 .../calcite/adapter/spark/SparkHandlerImpl.java    |   2 -
 .../apache/calcite/adapter/spark/SparkMethod.java  |   2 -
 .../org/apache/calcite/adapter/spark/SparkRel.java |   2 -
 .../apache/calcite/adapter/spark/SparkRules.java   |   2 -
 .../apache/calcite/adapter/spark/SparkRuntime.java |   2 -
 .../adapter/spark/SparkToEnumerableConverter.java  |   2 -
 .../apache/calcite/adapter/spark/package-info.java |   2 -
 .../org/apache/calcite/test/SparkAdapterTest.java  |   2 -
 .../calcite/adapter/splunk/SplunkDriver.java       |   2 -
 .../adapter/splunk/SplunkDriverVersion.java        |   2 -
 .../calcite/adapter/splunk/SplunkPushDownRule.java |   2 -
 .../apache/calcite/adapter/splunk/SplunkQuery.java |   2 -
 .../calcite/adapter/splunk/SplunkSchema.java       |   2 -
 .../apache/calcite/adapter/splunk/SplunkTable.java |   2 -
 .../calcite/adapter/splunk/SplunkTableScan.java    |   2 -
 .../calcite/adapter/splunk/package-info.java       |   2 -
 .../splunk/search/SearchResultListener.java        |   2 -
 .../adapter/splunk/search/SplunkConnection.java    |   2 -
 .../splunk/search/SplunkConnectionImpl.java        |   2 -
 .../adapter/splunk/search/package-info.java        |   2 -
 .../calcite/adapter/splunk/util/StringUtils.java   |   2 -
 .../calcite/adapter/splunk/util/package-info.java  |   2 -
 .../org/apache/calcite/test/SplunkAdapterTest.java |   2 -
 .../enumerable/CodeGenerationBenchmark.java        |   2 -
 .../AbstractRelNodeGetRelTypeNameBenchmark.java    |   2 -
 .../calcite/benchmarks/FlightRecorderProfiler.java |   2 -
 .../apache/calcite/benchmarks/ParserBenchmark.java |   2 -
 .../calcite/benchmarks/PreconditionTest.java       |   2 -
 .../apache/calcite/benchmarks/StatementTest.java   |   2 -
 .../benchmarks/StringConstructBenchmark.java       |   2 -
 .../apache/calcite/benchmarks/package-info.java    |   2 -
 1961 files changed, 354 insertions(+), 4629 deletions(-)

diff --git a/babel/src/main/codegen/includes/parserImpls.ftl b/babel/src/main/codegen/includes/parserImpls.ftl
index ffb53de..55ab4c9 100644
--- a/babel/src/main/codegen/includes/parserImpls.ftl
+++ b/babel/src/main/codegen/includes/parserImpls.ftl
@@ -96,5 +96,3 @@ void InfixCast(List<Object> list, ExprContext exprContext, Span s) :
         list.add(dt);
     }
 }
-
-// End parserImpls.ftl
diff --git a/babel/src/main/java/org/apache/calcite/sql/babel/Babel.java b/babel/src/main/java/org/apache/calcite/sql/babel/Babel.java
index 167a136..5b1760a 100644
--- a/babel/src/main/java/org/apache/calcite/sql/babel/Babel.java
+++ b/babel/src/main/java/org/apache/calcite/sql/babel/Babel.java
@@ -22,5 +22,3 @@ public class Babel {
   // This class is currently a place-holder. Javadoc gets upset
   // if there are no classes in babel/java/main.
 }
-
-// End Babel.java
diff --git a/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java b/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java
index b5c8540..4e83fed 100644
--- a/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java
+++ b/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java
@@ -19,5 +19,3 @@
  * Parse tree for SQL extensions used by the Babel parser.
  */
 package org.apache.calcite.sql.babel;
-
-// End package-info.java
diff --git a/babel/src/test/java/org/apache/calcite/test/BabelParserTest.java b/babel/src/test/java/org/apache/calcite/test/BabelParserTest.java
index b2b25a6..11f53d8 100644
--- a/babel/src/test/java/org/apache/calcite/test/BabelParserTest.java
+++ b/babel/src/test/java/org/apache/calcite/test/BabelParserTest.java
@@ -256,5 +256,3 @@ public class BabelParserTest extends SqlParserTest {
     sql(sql).ok(expected);
   }
 }
-
-// End BabelParserTest.java
diff --git a/babel/src/test/java/org/apache/calcite/test/BabelQuidemTest.java b/babel/src/test/java/org/apache/calcite/test/BabelQuidemTest.java
index dabfd41..bc82d34 100644
--- a/babel/src/test/java/org/apache/calcite/test/BabelQuidemTest.java
+++ b/babel/src/test/java/org/apache/calcite/test/BabelQuidemTest.java
@@ -185,5 +185,3 @@ public class BabelQuidemTest extends QuidemTest {
     }
   }
 }
-
-// End BabelQuidemTest.java
diff --git a/babel/src/test/java/org/apache/calcite/test/BabelTest.java b/babel/src/test/java/org/apache/calcite/test/BabelTest.java
index 5e21d89..efdfac7 100644
--- a/babel/src/test/java/org/apache/calcite/test/BabelTest.java
+++ b/babel/src/test/java/org/apache/calcite/test/BabelTest.java
@@ -98,5 +98,3 @@ public class BabelTest {
     }
   }
 }
-
-// End BabelTest.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java
index 43153f4..96ca916 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraEnumerator.java
@@ -111,5 +111,3 @@ class CassandraEnumerator implements Enumerator<Object> {
     // Nothing to do here
   }
 }
-
-// End CassandraEnumerator.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraFilter.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraFilter.java
index 8aab55e..2d80426 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraFilter.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraFilter.java
@@ -280,5 +280,3 @@ public class CassandraFilter extends Filter implements CassandraRel {
     }
   }
 }
-
-// End CassandraFilter.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java
index 41a11b9..7627acb 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraLimit.java
@@ -71,5 +71,3 @@ public class CassandraLimit extends SingleRel implements CassandraRel {
     return pw;
   }
 }
-
-// End CassandraLimit.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraMethod.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraMethod.java
index b2035e5..66f2e13 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraMethod.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraMethod.java
@@ -47,5 +47,3 @@ public enum CassandraMethod {
     this.method = Types.lookupMethod(clazz, methodName, argumentTypes);
   }
 }
-
-// End CassandraMethod.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraProject.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraProject.java
index 44dbfba..92c9c8d 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraProject.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraProject.java
@@ -70,5 +70,3 @@ public class CassandraProject extends Project implements CassandraRel {
     implementor.add(fields, null);
   }
 }
-
-// End CassandraProject.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRel.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRel.java
index 998334d..a52ac4e 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRel.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRel.java
@@ -70,5 +70,3 @@ public interface CassandraRel extends RelNode {
     }
   }
 }
-
-// End CassandraRel.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java
index a5ae66d..19b60ef 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java
@@ -393,5 +393,3 @@ public class CassandraRules {
     }
   }
 }
-
-// End CassandraRules.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java
index a2a3282..fd6819c 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java
@@ -327,5 +327,3 @@ public class CassandraSchema extends AbstractSchema {
     return session.getCluster().getMetadata().getKeyspace(keyspace);
   }
 }
-
-// End CassandraSchema.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java
index eb94ef5..87943a8 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java
@@ -52,5 +52,3 @@ public class CassandraSchemaFactory implements SchemaFactory {
     }
   }
 }
-
-// End CassandraSchemaFactory.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSort.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSort.java
index aa3b0a3..b8a70e0 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSort.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSort.java
@@ -85,5 +85,3 @@ public class CassandraSort extends Sort implements CassandraRel {
     }
   }
 }
-
-// End CassandraSort.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java
index 9f72116..fa7d0b1 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java
@@ -254,5 +254,3 @@ public class CassandraTable extends AbstractQueryableTable
     }
   }
 }
-
-// End CassandraTable.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTableScan.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTableScan.java
index 3197d93..5956cca 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTableScan.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTableScan.java
@@ -74,5 +74,3 @@ public class CassandraTableScan extends TableScan implements CassandraRel {
     implementor.table = table;
   }
 }
-
-// End CassandraTableScan.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java
index 02b3b5a..45f6f07 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverter.java
@@ -146,5 +146,3 @@ public class CassandraToEnumerableConverter
     return Lists.transform(values, Expressions::constant);
   }
 }
-
-// End CassandraToEnumerableConverter.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java
index 9184c30..f955697 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraToEnumerableConverterRule.java
@@ -50,5 +50,3 @@ public class CassandraToEnumerableConverterRule extends ConverterRule {
     return new CassandraToEnumerableConverter(rel.getCluster(), newTraitSet, rel);
   }
 }
-
-// End CassandraToEnumerableConverterRule.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java
index bd56f6a..82ed9fd 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java
@@ -21,5 +21,3 @@
  * <p>There is one table for each Cassandra column family.</p>
  */
 package org.apache.calcite.adapter.cassandra;
-
-// End package-info.java
diff --git a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
index 5f18f99..f7bc4dd 100644
--- a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
+++ b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterTest.java
@@ -227,5 +227,3 @@ public class CassandraAdapterTest {
         .explainContains("CassandraTableScan(table=[[twissandra, Tweets_By_User]])");
   }
 }
-
-// End CassandraAdapterTest.java
diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj
index 9e14098..92aa10e 100644
--- a/core/src/main/codegen/templates/Parser.jj
+++ b/core/src/main/codegen/templates/Parser.jj
@@ -7720,5 +7720,3 @@ void UnusedExtension() :
         LOOKAHEAD({false}) <ZONE>
     )
 }
-
-// End Parser.jj
diff --git a/core/src/main/java/org/apache/calcite/DataContext.java b/core/src/main/java/org/apache/calcite/DataContext.java
index 576c9e5..1ea46be 100644
--- a/core/src/main/java/org/apache/calcite/DataContext.java
+++ b/core/src/main/java/org/apache/calcite/DataContext.java
@@ -141,5 +141,3 @@ public interface DataContext {
     }
   }
 }
-
-// End DataContext.java
diff --git a/core/src/main/java/org/apache/calcite/Demo.java b/core/src/main/java/org/apache/calcite/Demo.java
index 7e0bde4..c087478 100644
--- a/core/src/main/java/org/apache/calcite/Demo.java
+++ b/core/src/main/java/org/apache/calcite/Demo.java
@@ -39,5 +39,3 @@ public class Demo {
     }
   }
 }
-
-// End Demo.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/Java9Workaround.java b/core/src/main/java/org/apache/calcite/adapter/Java9Workaround.java
index 9f45e2e..5df7cfd 100644
--- a/core/src/main/java/org/apache/calcite/adapter/Java9Workaround.java
+++ b/core/src/main/java/org/apache/calcite/adapter/Java9Workaround.java
@@ -22,5 +22,3 @@ package org.apache.calcite.adapter;
  */
 class Java9Workaround {
 }
-
-// End Java9Workaround.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java b/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java
index c4579e6..bc4560e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java
+++ b/core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java
@@ -896,5 +896,3 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable {
     }
   }
 }
-
-// End ArrayTable.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/CloneSchema.java b/core/src/main/java/org/apache/calcite/adapter/clone/CloneSchema.java
index 0b5bb25..3f1f7ee 100644
--- a/core/src/main/java/org/apache/calcite/adapter/clone/CloneSchema.java
+++ b/core/src/main/java/org/apache/calcite/adapter/clone/CloneSchema.java
@@ -163,5 +163,3 @@ public class CloneSchema extends AbstractSchema {
     }
   }
 }
-
-// End CloneSchema.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java b/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java
index 558118f..a276722 100644
--- a/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java
+++ b/core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java
@@ -451,5 +451,3 @@ class ColumnLoader<T> {
     }
   }
 }
-
-// End ColumnLoader.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java b/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java
index d8ee05e..8c61846 100644
--- a/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java
+++ b/core/src/main/java/org/apache/calcite/adapter/clone/ListTable.java
@@ -93,5 +93,3 @@ class ListTable extends AbstractQueryableTable {
     };
   }
 }
-
-// End ListTable.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java b/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java
index eef12e2..d2f9429 100644
--- a/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java
@@ -19,5 +19,3 @@
  * Provides utility classes.
  */
 package org.apache.calcite.adapter.clone;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggAddContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggAddContext.java
index 4da0447..3fc2c89 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggAddContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggAddContext.java
@@ -61,5 +61,3 @@ public interface AggAddContext extends AggResultContext {
    */
   RexToLixTranslator rowTranslator();
 }
-
-// End AggAddContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggContext.java
index 70e464a..c5f5ca1 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggContext.java
@@ -87,5 +87,3 @@ public interface AggContext {
   /** Returns the grouping sets we are aggregating on. */
   List<ImmutableBitSet> groupSets();
 }
-
-// End AggContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImpState.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImpState.java
index aac5277..94ff785 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImpState.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImpState.java
@@ -46,5 +46,3 @@ public class AggImpState {
     }
   }
 }
-
-// End AggImpState.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java
index 9c18376..da21ad5 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java
@@ -85,5 +85,3 @@ public interface AggImplementor {
    */
   Expression implementResult(AggContext info, AggResultContext result);
 }
-
-// End AggImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggResetContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggResetContext.java
index 1718231..cb275a4 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggResetContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggResetContext.java
@@ -39,5 +39,3 @@ public interface AggResetContext extends NestedBlockBuilder {
    */
   List<Expression> accumulator();
 }
-
-// End AggResetContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggResultContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggResultContext.java
index f80dd2b..4191e7e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggResultContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggResultContext.java
@@ -40,5 +40,3 @@ public interface AggResultContext extends NestedBlockBuilder, AggResetContext {
 
   AggregateCall call();
 }
-
-// End AggResultContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggregateLambdaFactory.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggregateLambdaFactory.java
index c5f87b4..6a19d36 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggregateLambdaFactory.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggregateLambdaFactory.java
@@ -44,5 +44,3 @@ public interface AggregateLambdaFactory<TSource, TOrigAccumulate, TAccumulate,
   Function2<TKey, TAccumulate, TResult> resultSelector(
       Function2<TKey, TOrigAccumulate, TResult> resultSelector);
 }
-
-// End AggregateLambdaFactory.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/BasicAggregateLambdaFactory.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/BasicAggregateLambdaFactory.java
index ee67523..49a18b8 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/BasicAggregateLambdaFactory.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/BasicAggregateLambdaFactory.java
@@ -84,5 +84,3 @@ public class BasicAggregateLambdaFactory<TSource, TAccumulate, TResult, TKey>
     }
   }
 }
-
-// End BasicAggregateLambdaFactory.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/BasicLazyAccumulator.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/BasicLazyAccumulator.java
index 4374cca..75ec35c 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/BasicLazyAccumulator.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/BasicLazyAccumulator.java
@@ -41,5 +41,3 @@ public class BasicLazyAccumulator<TAccumulate, TSource>
     }
   }
 }
-
-// End BasicLazyAccumulator.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/CallImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/CallImplementor.java
index a258082..3030881 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/CallImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/CallImplementor.java
@@ -40,5 +40,3 @@ public interface CallImplementor {
       RexCall call,
       RexImpTable.NullAs nullAs);
 }
-
-// End CallImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumUtils.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumUtils.java
index 02f7f7f..f19ff9e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumUtils.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumUtils.java
@@ -584,5 +584,3 @@ public class EnumUtils {
     return Expressions.lambda(Predicate2.class, builder.toBlock(), left_, right_);
   }
 }
-
-// End EnumUtils.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java
index 31b2b56..5c68a9b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java
@@ -610,5 +610,3 @@ public class EnumerableAggregate extends Aggregate implements EnumerableRel {
     }
   }
 }
-
-// End EnumerableAggregate.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregateRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregateRule.java
index 1eeeeaa..48e8473 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregateRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregateRule.java
@@ -51,5 +51,3 @@ class EnumerableAggregateRule extends ConverterRule {
     }
   }
 }
-
-// End EnumerableAggregateRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoin.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoin.java
index 9860bf9..382fd11 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoin.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoin.java
@@ -214,5 +214,3 @@ public class EnumerableBatchNestedLoopJoin extends Join implements EnumerableRel
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableBatchNestedLoopJoin.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoinRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoinRule.java
index 887220a..09072b6 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoinRule.java
@@ -138,5 +138,3 @@ public class EnumerableBatchNestedLoopJoinRule extends RelOptRule {
             joinType));
   }
 }
-
-// End EnumerableBatchNestedLoopJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBindable.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBindable.java
index 62a3b7f..7e973c9 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBindable.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBindable.java
@@ -106,5 +106,3 @@ public class EnumerableBindable extends ConverterImpl implements BindableRel {
     }
   }
 }
-
-// End EnumerableBindable.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalc.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalc.java
index 05c721d..d86c441 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalc.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalc.java
@@ -269,5 +269,3 @@ public class EnumerableCalc extends Calc implements EnumerableRel {
     return program;
   }
 }
-
-// End EnumerableCalc.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java
index 35db0c9..9c4c1c4 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java
@@ -49,5 +49,3 @@ class EnumerableCalcRule extends ConverterRule {
         calc.getProgram());
   }
 }
-
-// End EnumerableCalcRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCollect.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCollect.java
index f89fec0..625748d 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCollect.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCollect.java
@@ -79,5 +79,3 @@ public class EnumerableCollect extends Collect implements EnumerableRel {
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableCollect.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCollectRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCollectRule.java
index 4ab49b4..b1a0984 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCollectRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCollectRule.java
@@ -45,5 +45,3 @@ class EnumerableCollectRule extends ConverterRule {
         collect.getFieldName());
   }
 }
-
-// End EnumerableCollectRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableConvention.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableConvention.java
index 32f1c98..c7b1642 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableConvention.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableConvention.java
@@ -74,5 +74,3 @@ public enum EnumerableConvention implements Convention {
     return useAbstractConvertersForConversion;
   }
 }
-
-// End EnumerableConvention.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java
index 4a59c1f..aa30f14 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java
@@ -137,5 +137,3 @@ public class EnumerableCorrelate extends Correlate
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableCorrelate.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelateRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelateRule.java
index fa3c557..ea6ad243 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelateRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelateRule.java
@@ -51,5 +51,3 @@ public class EnumerableCorrelateRule extends ConverterRule {
         c.getJoinType());
   }
 }
-
-// End EnumerableCorrelateRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilter.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilter.java
index 514c8ad..f8256e6 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilter.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilter.java
@@ -69,5 +69,3 @@ public class EnumerableFilter
     throw new UnsupportedOperationException();
   }
 }
-
-// End EnumerableFilter.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilterRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilterRule.java
index e10daa6..98df892 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilterRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilterRule.java
@@ -47,5 +47,3 @@ class EnumerableFilterRule extends ConverterRule {
         filter.getCondition());
   }
 }
-
-// End EnumerableFilterRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilterToCalcRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilterToCalcRule.java
index 58d885d..8e05a47 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilterToCalcRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilterToCalcRule.java
@@ -54,5 +54,3 @@ public class EnumerableFilterToCalcRule extends RelOptRule {
     call.transformTo(calc);
   }
 }
-
-// End EnumerableFilterToCalcRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableHashJoin.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableHashJoin.java
index 91f3c90..36004e8 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableHashJoin.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableHashJoin.java
@@ -249,5 +249,3 @@ public class EnumerableHashJoin extends Join implements EnumerableRel {
             .toBlock());
   }
 }
-
-// End EnumerableHashJoin.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java
index e0bf74f..ee74a53 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpretable.java
@@ -235,5 +235,3 @@ public class EnumerableInterpretable extends ConverterImpl
     }
   }
 }
-
-// End EnumerableInterpretable.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpreter.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpreter.java
index 1c53483..4e8f633 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpreter.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpreter.java
@@ -100,5 +100,3 @@ public class EnumerableInterpreter extends SingleRel
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableInterpreter.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpreterRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpreterRule.java
index ca1ae06..9aa78bf 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpreterRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableInterpreterRule.java
@@ -50,5 +50,3 @@ public class EnumerableInterpreterRule extends ConverterRule {
     return EnumerableInterpreter.create(rel, 0.5d);
   }
 }
-
-// End EnumerableInterpreterRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableIntersect.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableIntersect.java
index 1f2b522..a18c5c4 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableIntersect.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableIntersect.java
@@ -77,5 +77,3 @@ public class EnumerableIntersect extends Intersect implements EnumerableRel {
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableIntersect.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableIntersectRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableIntersectRule.java
index 21b4cd8..4bd6ad2 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableIntersectRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableIntersectRule.java
@@ -41,5 +41,3 @@ class EnumerableIntersectRule extends ConverterRule {
         convertList(intersect.getInputs(), out), intersect.all);
   }
 }
-
-// End EnumerableIntersectRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoinRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoinRule.java
index d0994c4..1092c8c 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoinRule.java
@@ -105,5 +105,3 @@ class EnumerableJoinRule extends ConverterRule {
     }
   }
 }
-
-// End EnumerableJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimit.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimit.java
index 825aa7d..9b68a52 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimit.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimit.java
@@ -138,5 +138,3 @@ public class EnumerableLimit extends SingleRel implements EnumerableRel {
     }
   }
 }
-
-// End EnumerableLimit.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimitRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimitRule.java
index a5b9623..8440686 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimitRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableLimitRule.java
@@ -56,5 +56,3 @@ class EnumerableLimitRule extends RelOptRule {
             sort.fetch));
   }
 }
-
-// End EnumerableLimitRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMatch.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMatch.java
index 5f0fc24..85bfaed 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMatch.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMatch.java
@@ -530,5 +530,3 @@ public class EnumerableMatch extends Match implements EnumerableRel {
     }
   }
 }
-
-// End EnumerableMatch.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMatchRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMatchRule.java
index 3c5634c..086680d 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMatchRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMatchRule.java
@@ -40,5 +40,3 @@ public class EnumerableMatchRule extends ConverterRule {
         match.getOrderKeys(), match.getInterval());
   }
 }
-
-// End EnumerableMatchRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java
index ac91dd5..731a6c4 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java
@@ -185,5 +185,3 @@ public class EnumerableMergeJoin extends Join implements EnumerableRel {
                         joinType.generatesNullsOnRight())))).toBlock());
   }
 }
-
-// End EnumerableMergeJoin.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoinRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoinRule.java
index 16c820b..da4948c 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoinRule.java
@@ -96,5 +96,3 @@ class EnumerableMergeJoinRule extends ConverterRule {
         join.getJoinType());
   }
 }
-
-// End EnumerableMergeJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMinus.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMinus.java
index 47b563a..1bbda3f 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMinus.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMinus.java
@@ -77,5 +77,3 @@ public class EnumerableMinus extends Minus implements EnumerableRel {
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableMinus.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMinusRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMinusRule.java
index e28f6fd..f81df96 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMinusRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMinusRule.java
@@ -42,5 +42,3 @@ class EnumerableMinusRule extends ConverterRule {
         convertList(minus.getInputs(), out), minus.all);
   }
 }
-
-// End EnumerableMinusRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java
index 4f1968c..948ebe7 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java
@@ -146,5 +146,3 @@ public class EnumerableNestedLoopJoin extends Join implements EnumerableRel {
             .toBlock());
   }
 }
-
-// End EnumerableNestedLoopJoin.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProject.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProject.java
index c37dfe6..e4ae1d0 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProject.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProject.java
@@ -85,5 +85,3 @@ public class EnumerableProject extends Project implements EnumerableRel {
     throw new UnsupportedOperationException();
   }
 }
-
-// End EnumerableProject.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java
index b35f382..2b88d2e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java
@@ -47,5 +47,3 @@ class EnumerableProjectRule extends ConverterRule {
         project.getRowType());
   }
 }
-
-// End EnumerableProjectRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectToCalcRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectToCalcRule.java
index 4d2b9c1..4f6f226 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectToCalcRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectToCalcRule.java
@@ -47,5 +47,3 @@ public class EnumerableProjectToCalcRule extends RelOptRule {
     call.transformTo(calc);
   }
 }
-
-// End EnumerableProjectToCalcRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRel.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRel.java
index 346eb9c..c514091 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRel.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRel.java
@@ -102,5 +102,3 @@ public interface EnumerableRel
     }
   }
 }
-
-// End EnumerableRel.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java
index 683f53a..e983ae4 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java
@@ -561,5 +561,3 @@ public class EnumerableRelImplementor extends JavaRelImplementor {
     }
   }
 }
-
-// End EnumerableRelImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnion.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnion.java
index 33b234a..136afc8 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnion.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnion.java
@@ -85,5 +85,3 @@ public class EnumerableRepeatUnion extends RepeatUnion implements EnumerableRel
   }
 
 }
-
-// End EnumerableRepeatUnion.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
index 6b7fec5..89aa707 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
@@ -52,5 +52,3 @@ public class EnumerableRepeatUnionRule extends ConverterRule {
         union.iterationLimit);
   }
 }
-
-// End EnumerableRepeatUnionRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java
index 1f83bd7..07ff770 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRules.java
@@ -141,5 +141,3 @@ public class EnumerableRules {
     return ENUMERABLE_RULES;
   }
 }
-
-// End EnumerableRules.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSort.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSort.java
index 8046d64..1cc8d7b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSort.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSort.java
@@ -92,5 +92,3 @@ public class EnumerableSort extends Sort implements EnumerableRel {
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableSort.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSortRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSortRule.java
index eb3d737..4e9941b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSortRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSortRule.java
@@ -46,5 +46,3 @@ class EnumerableSortRule extends ConverterRule {
         null);
   }
 }
-
-// End EnumerableSortRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java
index 1c27b7b..2dc9142 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java
@@ -104,5 +104,3 @@ public class EnumerableTableFunctionScan extends TableFunctionScan
     return QueryableTable.class.isAssignableFrom(method.getReturnType());
   }
 }
-
-// End EnumerableTableFunctionScan.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScanRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScanRule.java
index a5a4190..bc5640f 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScanRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScanRule.java
@@ -56,5 +56,3 @@ public class EnumerableTableFunctionScanRule extends ConverterRule {
         tbl.getCall(), tbl.getColumnMappings());
   }
 }
-
-// End EnumerableTableFunctionScanRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java
index ba1a208..f49ba7c 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java
@@ -169,5 +169,3 @@ public class EnumerableTableModify extends TableModify
   }
 
 }
-
-// End EnumerableTableModify.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModifyRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModifyRule.java
index 3e960b2..3186c61 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModifyRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModifyRule.java
@@ -63,5 +63,3 @@ public class EnumerableTableModifyRule extends ConverterRule {
         modify.isFlattened());
   }
 }
-
-// End EnumerableTableModifyRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java
index dfd7ac3..9277d16 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java
@@ -249,5 +249,3 @@ public class EnumerableTableScan
     return implementor.result(physType, Blocks.toBlock(expression));
   }
 }
-
-// End EnumerableTableScan.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScanRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScanRule.java
index 3fe1a56..4518ee5 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScanRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScanRule.java
@@ -64,5 +64,3 @@ public class EnumerableTableScanRule extends ConverterRule {
     return EnumerableTableScan.create(scan.getCluster(), relOptTable);
   }
 }
-
-// End EnumerableTableScanRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableSpool.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableSpool.java
index 2712453..ecee69a 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableSpool.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableSpool.java
@@ -111,5 +111,3 @@ public class EnumerableTableSpool extends TableSpool implements EnumerableRel {
         readType, writeType, table);
   }
 }
-
-// End EnumerableTableSpool.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableSpoolRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableSpoolRule.java
index e5e6daf..12e3a01 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableSpoolRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableSpoolRule.java
@@ -49,5 +49,3 @@ public class EnumerableTableSpoolRule extends ConverterRule {
         spool.getTable());
   }
 }
-
-// End EnumerableTableSpoolRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUncollect.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUncollect.java
index 2417c16..6666cf7 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUncollect.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUncollect.java
@@ -126,5 +126,3 @@ public class EnumerableUncollect extends Uncollect implements EnumerableRel {
   }
 
 }
-
-// End EnumerableUncollect.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUncollectRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUncollectRule.java
index 2687b1e..f3b3c75 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUncollectRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUncollectRule.java
@@ -43,5 +43,3 @@ class EnumerableUncollectRule extends ConverterRule {
         uncollect.withOrdinality);
   }
 }
-
-// End EnumerableUncollectRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java
index a3fb07c..be1f4d3 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java
@@ -73,5 +73,3 @@ public class EnumerableUnion extends Union implements EnumerableRel {
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableUnion.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnionRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnionRule.java
index 42a97f1..5ab0690 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnionRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnionRule.java
@@ -40,5 +40,3 @@ class EnumerableUnionRule extends ConverterRule {
         convertList(union.getInputs(), out), union.all);
   }
 }
-
-// End EnumerableUnionRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableValues.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableValues.java
index 82b2f87..497e820 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableValues.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableValues.java
@@ -113,5 +113,3 @@ public class EnumerableValues extends Values implements EnumerableRel {
     return implementor.result(physType, builder.toBlock());
   }
 }
-
-// End EnumerableValues.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableValuesRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableValuesRule.java
index b48251b..6a71ac0 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableValuesRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableValuesRule.java
@@ -46,5 +46,3 @@ public class EnumerableValuesRule extends ConverterRule {
         values.getTuples());
   }
 }
-
-// End EnumerableValuesRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
index eb42bde..8fd80c2 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
@@ -977,5 +977,3 @@ public class EnumerableWindow extends Window implements EnumerableRel {
         rows_, val, searchLower, searchUpper, keySelector, keyComparator);
   }
 }
-
-// End EnumerableWindow.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowRule.java
index a295470..bc3e1dd 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowRule.java
@@ -44,5 +44,3 @@ class EnumerableWindowRule extends ConverterRule {
         winAgg.getConstants(), winAgg.getRowType(), winAgg.groups);
   }
 }
-
-// End EnumerableWindowRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/JavaRelImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/JavaRelImplementor.java
index c4209a3..a7ff283 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/JavaRelImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/JavaRelImplementor.java
@@ -53,5 +53,3 @@ public abstract class JavaRelImplementor implements RelImplementor {
     return DataContext.ROOT;
   }
 }
-
-// End JavaRelImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/JavaRowFormat.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/JavaRowFormat.java
index 2cb14f2..00d354f 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/JavaRowFormat.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/JavaRowFormat.java
@@ -292,5 +292,3 @@ public enum JavaRowFormat {
   public abstract Expression field(Expression expression, int field,
       Type fromType, Type fieldType);
 }
-
-// End JavaRowFormat.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/LazyAggregateLambdaFactory.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/LazyAggregateLambdaFactory.java
index aa11ca1..b83423b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/LazyAggregateLambdaFactory.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/LazyAggregateLambdaFactory.java
@@ -109,5 +109,3 @@ public class LazyAggregateLambdaFactory<TSource, TKey, TOrigAccumulate, TResult>
     void accumulate(Iterable<TSource> sourceIterable, TOrigAccumulate accumulator);
   }
 }
-
-// End LazyAggregateLambdaFactory.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/MatchImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/MatchImplementor.java
index 8f632c5..f8ec11a 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/MatchImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/MatchImplementor.java
@@ -42,5 +42,3 @@ public interface MatchImplementor {
       ParameterExpression currentIndex);
 
 }
-
-// End MatchImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/MatchUtils.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/MatchUtils.java
index a2a4451..5c3120d 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/MatchUtils.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/MatchUtils.java
@@ -47,5 +47,3 @@ public class MatchUtils {
     System.out.println(s);
   }
 }
-
-// End MatchUtils.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/NestedBlockBuilder.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/NestedBlockBuilder.java
index c78a25c..db6e0d5 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/NestedBlockBuilder.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/NestedBlockBuilder.java
@@ -73,5 +73,3 @@ public interface NestedBlockBuilder {
    */
   void exitBlock();
 }
-
-// End NestedBlockBuilder.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/NestedBlockBuilderImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/NestedBlockBuilderImpl.java
index f932fec..969d79f 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/NestedBlockBuilderImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/NestedBlockBuilderImpl.java
@@ -116,5 +116,3 @@ public class NestedBlockBuilderImpl implements NestedBlockBuilder {
     nullables.remove(nullables.size() - 1);
   }
 }
-
-// End NestedBlockBuilderImpl.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/NotNullImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/NotNullImplementor.java
index 0144d3a..895b3f9 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/NotNullImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/NotNullImplementor.java
@@ -44,5 +44,3 @@ public interface NotNullImplementor {
       RexCall call,
       List<Expression> translatedOperands);
 }
-
-// End NotNullImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/NullPolicy.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/NullPolicy.java
index 736af5a..1bb2111 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/NullPolicy.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/NullPolicy.java
@@ -44,5 +44,3 @@ public enum NullPolicy {
   NOT,
   NONE
 }
-
-// End NullPolicy.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/PhysType.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/PhysType.java
index 25baa83..460ad88 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/PhysType.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/PhysType.java
@@ -212,5 +212,3 @@ public interface PhysType {
    * the <code>targetFormat</code> for representing its rows. */
   Expression convertTo(Expression expression, JavaRowFormat targetFormat);
 }
-
-// End PhysType.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/PhysTypeImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/PhysTypeImpl.java
index 912f714..ae02d56 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/PhysTypeImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/PhysTypeImpl.java
@@ -667,5 +667,3 @@ public class PhysTypeImpl implements PhysType {
     return format.field(expression, field, fieldType, storageType);
   }
 }
-
-// End PhysTypeImpl.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/ReflectiveCallNotNullImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/ReflectiveCallNotNullImplementor.java
index c083d25..01280f2 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/ReflectiveCallNotNullImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/ReflectiveCallNotNullImplementor.java
@@ -76,5 +76,3 @@ public class ReflectiveCallNotNullImplementor implements NotNullImplementor {
     return false;
   }
 }
-
-// End ReflectiveCallNotNullImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java
index d8e74af..443bb1e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java
@@ -3021,5 +3021,3 @@ public class RexImpTable {
     }
   }
 }
-
-// End RexImpTable.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
index ad3332b..98450b2 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
@@ -1163,5 +1163,3 @@ public class RexToLixTranslator {
     private AlwaysNull() {}
   }
 }
-
-// End RexToLixTranslator.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/SourceSorter.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/SourceSorter.java
index c91bb1a..8cdb71c 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/SourceSorter.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/SourceSorter.java
@@ -63,5 +63,3 @@ public class SourceSorter<TAccumulate, TSource, TSortKey>
     }
   }
 }
-
-// End SourceSorter.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java
index 30b5a56..2036240 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java
@@ -206,5 +206,3 @@ public abstract class StrictAggImplementor implements AggImplementor {
     return result.accumulator().get(0);
   }
 }
-
-// End StrictAggImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictWinAggImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictWinAggImplementor.java
index f2b0790..ecc1c2a 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictWinAggImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictWinAggImplementor.java
@@ -78,5 +78,3 @@ public abstract class StrictWinAggImplementor extends StrictAggImplementor
     return true;
   }
 }
-
-// End StrictWinAggImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggAddContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggAddContext.java
index 13717e5..dd1e92f 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggAddContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggAddContext.java
@@ -40,5 +40,3 @@ public interface WinAggAddContext extends AggAddContext, WinAggResultContext {
    */
   Expression currentPosition();
 }
-
-// End WinAggAddContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggContext.java
index db0a6cd..aa96d09 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggContext.java
@@ -23,5 +23,3 @@ package org.apache.calcite.adapter.enumerable;
  */
 public interface WinAggContext extends AggContext {
 }
-
-// End WinAggContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggFrameContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggFrameContext.java
index 73782a3..397ff2c 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggFrameContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggFrameContext.java
@@ -71,5 +71,3 @@ public interface WinAggFrameContext {
    */
   Expression getPartitionRowCount();
 }
-
-// End WinAggFrameContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggFrameResultContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggFrameResultContext.java
index f0b4d87..ef4423d 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggFrameResultContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggFrameResultContext.java
@@ -64,5 +64,3 @@ public interface WinAggFrameResultContext extends WinAggFrameContext {
    */
   Expression compareRows(Expression a, Expression b);
 }
-
-// End WinAggFrameResultContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java
index 2ad4932..8a09a7e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggImplementor.java
@@ -61,5 +61,3 @@ public interface WinAggImplementor extends AggImplementor {
 
   boolean needCacheWhenFrameIntact();
 }
-
-// End WinAggImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggResetContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggResetContext.java
index 9dee01e..1629ab3 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggResetContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggResetContext.java
@@ -31,5 +31,3 @@ package org.apache.calcite.adapter.enumerable;
 public interface WinAggResetContext
     extends AggResetContext, WinAggFrameContext {
 }
-
-// End WinAggResetContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggResultContext.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggResultContext.java
index 3b83b19..26818f0 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggResultContext.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/WinAggResultContext.java
@@ -50,5 +50,3 @@ public interface WinAggResultContext extends AggResultContext,
    */
   List<Expression> arguments(Expression rowIndex);
 }
-
-// End WinAggResultContext.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggAddContextImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggAddContextImpl.java
index 8d575bf..8e53369 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggAddContextImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggAddContextImpl.java
@@ -36,5 +36,3 @@ public abstract class AggAddContextImpl extends AggResultContextImpl
     return rowTranslator().translateList(rexArguments());
   }
 }
-
-// End AggAddContextImpl.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggResetContextImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggResetContextImpl.java
index c159073..7578a68 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggResetContextImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggResetContextImpl.java
@@ -52,5 +52,3 @@ public abstract class AggResetContextImpl extends NestedBlockBuilderImpl
     throw new UnsupportedOperationException();
   }
 }
-
-// End AggResetContextImpl.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggResultContextImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggResultContextImpl.java
index 6e02756..db97675 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggResultContextImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/AggResultContextImpl.java
@@ -65,5 +65,3 @@ public class AggResultContextImpl extends AggResetContextImpl
     return call;
   }
 }
-
-// End AggResultContextImpl.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java
index 69b4788..aa8d7e3 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java
@@ -55,5 +55,3 @@ public abstract class WinAggAddContextImpl extends WinAggResultContextImpl
     return rowTranslator().translateList(rexArguments());
   }
 }
-
-// End WinAggAddContextImpl.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggResetContextImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggResetContextImpl.java
index 0145f80..7478f4e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggResetContextImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggResetContextImpl.java
@@ -85,5 +85,3 @@ public class WinAggResetContextImpl extends AggResetContextImpl
     return partitionRowCount;
   }
 }
-
-// End WinAggResetContextImpl.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggResultContextImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggResultContextImpl.java
index a204c3b..02d86cb 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggResultContextImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggResultContextImpl.java
@@ -112,5 +112,3 @@ public abstract class WinAggResultContextImpl extends AggResultContextImpl
     return getFrame().getPartitionRowCount();
   }
 }
-
-// End WinAggResultContextImpl.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java
index d1df993..722e56d 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java
@@ -19,5 +19,3 @@
  * Calcite-specific classes for implementation of regular and window aggregates.
  */
 package org.apache.calcite.adapter.enumerable.impl;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java
index 5751e7c..2b626c3 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java
@@ -19,5 +19,3 @@
  * Query optimizer rules for Java calling convention.
  */
 package org.apache.calcite.adapter.enumerable;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/AbstractQueryableTable.java b/core/src/main/java/org/apache/calcite/adapter/java/AbstractQueryableTable.java
index 5cb7b82..deaf402 100644
--- a/core/src/main/java/org/apache/calcite/adapter/java/AbstractQueryableTable.java
+++ b/core/src/main/java/org/apache/calcite/adapter/java/AbstractQueryableTable.java
@@ -45,5 +45,3 @@ public abstract class AbstractQueryableTable extends AbstractTable
     return Schemas.tableExpression(schema, elementType, tableName, clazz);
   }
 }
-
-// End AbstractQueryableTable.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/Array.java b/core/src/main/java/org/apache/calcite/adapter/java/Array.java
index 07b75b6..40b163e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/java/Array.java
+++ b/core/src/main/java/org/apache/calcite/adapter/java/Array.java
@@ -37,5 +37,3 @@ public @interface Array {
   /** Maximum number of elements in the array. -1 means no maximum. */
   long maximumCardinality() default -1L;
 }
-
-// End Array.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/JavaTypeFactory.java b/core/src/main/java/org/apache/calcite/adapter/java/JavaTypeFactory.java
index 205b391..118e44e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/java/JavaTypeFactory.java
+++ b/core/src/main/java/org/apache/calcite/adapter/java/JavaTypeFactory.java
@@ -52,5 +52,3 @@ public interface JavaTypeFactory extends RelDataTypeFactory {
   /** Converts a type in Java format to a SQL-oriented type. */
   RelDataType toSql(RelDataType type);
 }
-
-// End JavaTypeFactory.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/Map.java b/core/src/main/java/org/apache/calcite/adapter/java/Map.java
index 10bfa57..7aa198b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/java/Map.java
+++ b/core/src/main/java/org/apache/calcite/adapter/java/Map.java
@@ -40,5 +40,3 @@ public @interface Map {
   /** Whether values may be null. */
   boolean valueIsNullable() default true;
 }
-
-// End Map.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java b/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java
index 72f85cc..86d151b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java
+++ b/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java
@@ -413,5 +413,3 @@ public class ReflectiveSchema
     }
   }
 }
-
-// End ReflectiveSchema.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/package-info.java b/core/src/main/java/org/apache/calcite/adapter/java/package-info.java
index 4d66ffe..fdd167c 100644
--- a/core/src/main/java/org/apache/calcite/adapter/java/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/java/package-info.java
@@ -20,5 +20,3 @@
  * structures.
  */
 package org.apache.calcite.adapter.java;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCatalogSchema.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCatalogSchema.java
index fc9fe3e..feecda4 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCatalogSchema.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCatalogSchema.java
@@ -143,5 +143,3 @@ public class JdbcCatalogSchema extends AbstractSchema {
     }
   }
 }
-
-// End JdbcCatalogSchema.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java
index 71b7c59..8aea79e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcConvention.java
@@ -70,5 +70,3 @@ public class JdbcConvention extends Convention.Impl {
     planner.addRule(ProjectRemoveRule.INSTANCE);
   }
 }
-
-// End JdbcConvention.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java
index 79ec62f..f0df676 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java
@@ -43,5 +43,3 @@ public class JdbcImplementor extends RelToSqlConverter {
     return dispatch(node);
   }
 }
-
-// End JdbcImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcQueryProvider.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcQueryProvider.java
index 14c9282..b516d8d 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcQueryProvider.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcQueryProvider.java
@@ -34,5 +34,3 @@ public final class JdbcQueryProvider extends QueryProviderImpl {
     return null;
   }
 }
-
-// End JdbcQueryProvider.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRel.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRel.java
index ba91d1b..93293f5 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRel.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRel.java
@@ -24,5 +24,3 @@ import org.apache.calcite.rel.RelNode;
 public interface JdbcRel extends RelNode {
   JdbcImplementor.Result implement(JdbcImplementor implementor);
 }
-
-// End JdbcRel.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java
index 7e3e0da..47f4a1a 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java
@@ -1081,5 +1081,3 @@ public class JdbcRules {
   }
 
 }
-
-// End JdbcRules.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java
index 5b91c3d..1011d13 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java
@@ -567,5 +567,3 @@ public class JdbcSchema implements Schema {
       extends BiFunction<String, String, Iterable<MetaImpl.MetaTable>> {
   }
 }
-
-// End JdbcSchema.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java
index e14de38..b1f32ad 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTable.java
@@ -227,5 +227,3 @@ public class JdbcTable extends AbstractQueryableTable
     }
   }
 }
-
-// End JdbcTable.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTableScan.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTableScan.java
index a760315..55f87d6 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTableScan.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTableScan.java
@@ -53,5 +53,3 @@ public class JdbcTableScan extends TableScan implements JdbcRel {
         ImmutableList.of(JdbcImplementor.Clause.FROM), this, null);
   }
 }
-
-// End JdbcTableScan.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverter.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverter.java
index 03eb64b..446b12f 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverter.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverter.java
@@ -334,5 +334,3 @@ public class JdbcToEnumerableConverter
     return result.asStatement().toSqlString(dialect);
   }
 }
-
-// End JdbcToEnumerableConverter.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverterRule.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverterRule.java
index 6ac2816..86fbc3d 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverterRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverterRule.java
@@ -43,5 +43,3 @@ public class JdbcToEnumerableConverterRule extends ConverterRule {
     return new JdbcToEnumerableConverter(rel.getCluster(), newTraitSet, rel);
   }
 }
-
-// End JdbcToEnumerableConverterRule.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java
index 7d5b8da..0d207e1 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java
@@ -233,5 +233,3 @@ final class JdbcUtils {
     }
   }
 }
-
-// End JdbcUtils.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java
index 92990dd..ecabc57 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java
@@ -19,5 +19,3 @@
  * Query provider based on a JDBC data source.
  */
 package org.apache.calcite.adapter.jdbc;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/package-info.java b/core/src/main/java/org/apache/calcite/adapter/package-info.java
index 697412a..d8b8ad8 100644
--- a/core/src/main/java/org/apache/calcite/adapter/package-info.java
+++ b/core/src/main/java/org/apache/calcite/adapter/package-info.java
@@ -38,5 +38,3 @@
  * </blockquote>
  */
 package org.apache.calcite.adapter;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/config/CalciteConnectionConfig.java b/core/src/main/java/org/apache/calcite/config/CalciteConnectionConfig.java
index fdc3379..d495a21 100644
--- a/core/src/main/java/org/apache/calcite/config/CalciteConnectionConfig.java
+++ b/core/src/main/java/org/apache/calcite/config/CalciteConnectionConfig.java
@@ -79,5 +79,3 @@ public interface CalciteConnectionConfig extends ConnectionConfig {
   /** @see CalciteConnectionProperty#LENIENT_OPERATOR_LOOKUP */
   boolean lenientOperatorLookup();
 }
-
-// End CalciteConnectionConfig.java
diff --git a/core/src/main/java/org/apache/calcite/config/CalciteConnectionConfigImpl.java b/core/src/main/java/org/apache/calcite/config/CalciteConnectionConfigImpl.java
index 1d03e38..b3c9d91 100644
--- a/core/src/main/java/org/apache/calcite/config/CalciteConnectionConfigImpl.java
+++ b/core/src/main/java/org/apache/calcite/config/CalciteConnectionConfigImpl.java
@@ -200,5 +200,3 @@ public class CalciteConnectionConfigImpl extends ConnectionConfigImpl
         .getBoolean();
   }
 }
-
-// End CalciteConnectionConfigImpl.java
diff --git a/core/src/main/java/org/apache/calcite/config/CalciteConnectionProperty.java b/core/src/main/java/org/apache/calcite/config/CalciteConnectionProperty.java
index 876d0ea..d3b9b53 100644
--- a/core/src/main/java/org/apache/calcite/config/CalciteConnectionProperty.java
+++ b/core/src/main/java/org/apache/calcite/config/CalciteConnectionProperty.java
@@ -243,5 +243,3 @@ public enum CalciteConnectionProperty implements ConnectionProperty {
   }
 
 }
-
-// End CalciteConnectionProperty.java
diff --git a/core/src/main/java/org/apache/calcite/config/CalciteSystemProperty.java b/core/src/main/java/org/apache/calcite/config/CalciteSystemProperty.java
index 6f338b2..041213f 100644
--- a/core/src/main/java/org/apache/calcite/config/CalciteSystemProperty.java
+++ b/core/src/main/java/org/apache/calcite/config/CalciteSystemProperty.java
@@ -411,5 +411,3 @@ public final class CalciteSystemProperty<T> {
     return value;
   }
 }
-
-// End CalciteSystemProperty.java
diff --git a/core/src/main/java/org/apache/calcite/config/Lex.java b/core/src/main/java/org/apache/calcite/config/Lex.java
index d5a50cb..a8a6625 100644
--- a/core/src/main/java/org/apache/calcite/config/Lex.java
+++ b/core/src/main/java/org/apache/calcite/config/Lex.java
@@ -72,5 +72,3 @@ public enum Lex {
     this.caseSensitive = caseSensitive;
   }
 }
-
-// End Lex.java
diff --git a/core/src/main/java/org/apache/calcite/config/NullCollation.java b/core/src/main/java/org/apache/calcite/config/NullCollation.java
index f26191b..7a5616c 100644
--- a/core/src/main/java/org/apache/calcite/config/NullCollation.java
+++ b/core/src/main/java/org/apache/calcite/config/NullCollation.java
@@ -66,5 +66,3 @@ public enum NullCollation {
     }
   }
 }
-
-// End NullCollation.java
diff --git a/core/src/main/java/org/apache/calcite/config/package-info.java b/core/src/main/java/org/apache/calcite/config/package-info.java
index b6d2ddb..59e449b 100644
--- a/core/src/main/java/org/apache/calcite/config/package-info.java
+++ b/core/src/main/java/org/apache/calcite/config/package-info.java
@@ -19,5 +19,3 @@
  * Configuration.
  */
 package org.apache.calcite.config;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java b/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java
index 0734305..007ee92 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/AbstractSingleNode.java
@@ -34,5 +34,3 @@ abstract class AbstractSingleNode<T extends SingleRel> implements Node {
     this.sink = compiler.sink(rel);
   }
 }
-
-// End AbstractSingleNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/AggregateNode.java b/core/src/main/java/org/apache/calcite/interpreter/AggregateNode.java
index f0ba61b..4422e8d 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/AggregateNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/AggregateNode.java
@@ -758,5 +758,3 @@ public class AggregateNode extends AbstractSingleNode<Aggregate> {
     }
   }
 }
-
-// End AggregateNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/BindableConvention.java b/core/src/main/java/org/apache/calcite/interpreter/BindableConvention.java
index 94a35e8..bae22e9 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/BindableConvention.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/BindableConvention.java
@@ -70,5 +70,3 @@ public enum BindableConvention implements Convention {
     return false;
   }
 }
-
-// End BindableConvention.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/BindableRel.java b/core/src/main/java/org/apache/calcite/interpreter/BindableRel.java
index 7bde2e5..98191c8 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/BindableRel.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/BindableRel.java
@@ -27,5 +27,3 @@ import org.apache.calcite.runtime.ArrayBindable;
  */
 public interface BindableRel extends RelNode, ArrayBindable, InterpretableRel {
 }
-
-// End BindableRel.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Bindables.java b/core/src/main/java/org/apache/calcite/interpreter/Bindables.java
index 9f7f6dc..8444b4b 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Bindables.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Bindables.java
@@ -844,5 +844,3 @@ public class Bindables {
   }
 
 }
-
-// End Bindables.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/CollectNode.java b/core/src/main/java/org/apache/calcite/interpreter/CollectNode.java
index 4caf5df..3954c9b 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/CollectNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/CollectNode.java
@@ -43,5 +43,3 @@ public class CollectNode extends AbstractSingleNode<Collect> {
     sink.send(row);
   }
 }
-
-// End CollectNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Compiler.java b/core/src/main/java/org/apache/calcite/interpreter/Compiler.java
index cdd5c5e..5eae988 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Compiler.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Compiler.java
@@ -66,5 +66,3 @@ public interface Compiler {
   Context createContext();
 
 }
-
-// End Compiler.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Context.java b/core/src/main/java/org/apache/calcite/interpreter/Context.java
index f125454..d44d9c2 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Context.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Context.java
@@ -31,5 +31,3 @@ public class Context {
     this.root = root;
   }
 }
-
-// End Context.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/FilterNode.java b/core/src/main/java/org/apache/calcite/interpreter/FilterNode.java
index 4f3fb7f..c60ebf4 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/FilterNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/FilterNode.java
@@ -47,5 +47,3 @@ public class FilterNode extends AbstractSingleNode<Filter> {
     }
   }
 }
-
-// End FilterNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/InterpretableConvention.java b/core/src/main/java/org/apache/calcite/interpreter/InterpretableConvention.java
index 5927b7e..e616926 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/InterpretableConvention.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/InterpretableConvention.java
@@ -64,5 +64,3 @@ public enum InterpretableConvention implements Convention {
     return false;
   }
 }
-
-// End InterpretableConvention.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/InterpretableConverter.java b/core/src/main/java/org/apache/calcite/interpreter/InterpretableConverter.java
index 8b62174..e5d1356 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/InterpretableConverter.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/InterpretableConverter.java
@@ -51,5 +51,3 @@ public class InterpretableConverter extends ConverterImpl
     return new Interpreter(dataContext, getInput());
   }
 }
-
-// End InterpretableConverter.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/InterpretableRel.java b/core/src/main/java/org/apache/calcite/interpreter/InterpretableRel.java
index 2fee43d..275c8a4 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/InterpretableRel.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/InterpretableRel.java
@@ -51,5 +51,3 @@ public interface InterpretableRel extends RelNode {
     }
   }
 }
-
-// End InterpretableRel.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java b/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java
index d399c0a..19d8a0c 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Interpreter.java
@@ -585,5 +585,3 @@ public class Interpreter extends AbstractEnumerable<Object[]>
     Scalar compile(List<RexNode> nodes, RelDataType inputRowType);
   }
 }
-
-// End Interpreter.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Interpreters.java b/core/src/main/java/org/apache/calcite/interpreter/Interpreters.java
index a4b6eb0..255c068 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Interpreters.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Interpreters.java
@@ -46,5 +46,3 @@ public class Interpreters {
     };
   }
 }
-
-// End Interpreters.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/JaninoRexCompiler.java b/core/src/main/java/org/apache/calcite/interpreter/JaninoRexCompiler.java
index c573f6b..da95be4 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/JaninoRexCompiler.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/JaninoRexCompiler.java
@@ -176,5 +176,3 @@ public class JaninoRexCompiler implements Interpreter.ScalarCompiler {
     return (Scalar) cbe.createInstance(new StringReader(s));
   }
 }
-
-// End JaninoRexCompiler.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/JoinNode.java b/core/src/main/java/org/apache/calcite/interpreter/JoinNode.java
index c870c90..e7cfdea 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/JoinNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/JoinNode.java
@@ -168,5 +168,3 @@ public class JoinNode implements Node {
     }
   }
 }
-
-// End JoinNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/MatchNode.java b/core/src/main/java/org/apache/calcite/interpreter/MatchNode.java
index 8161200..0f98a52 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/MatchNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/MatchNode.java
@@ -35,5 +35,3 @@ public class MatchNode extends AbstractSingleNode<Match> {
     sink.end();
   }
 }
-
-// End MatchNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Node.java b/core/src/main/java/org/apache/calcite/interpreter/Node.java
index cd24c5c..330f043 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Node.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Node.java
@@ -22,5 +22,3 @@ package org.apache.calcite.interpreter;
 public interface Node {
   void run() throws InterruptedException;
 }
-
-// End Node.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Nodes.java b/core/src/main/java/org/apache/calcite/interpreter/Nodes.java
index 5837d65..0f01a46 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Nodes.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Nodes.java
@@ -101,5 +101,3 @@ public class Nodes {
     }
   }
 }
-
-// End Nodes.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/NoneToBindableConverterRule.java b/core/src/main/java/org/apache/calcite/interpreter/NoneToBindableConverterRule.java
index 233b2ed..fddfc54 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/NoneToBindableConverterRule.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/NoneToBindableConverterRule.java
@@ -50,5 +50,3 @@ public class NoneToBindableConverterRule extends ConverterRule {
     return new InterpretableConverter(rel.getCluster(), newTraitSet, rel);
   }
 }
-
-// End NoneToBindableConverterRule.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/ProjectNode.java b/core/src/main/java/org/apache/calcite/interpreter/ProjectNode.java
index 2503b1cd..8a61f44 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/ProjectNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/ProjectNode.java
@@ -45,5 +45,3 @@ public class ProjectNode extends AbstractSingleNode<Project> {
     }
   }
 }
-
-// End ProjectNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Row.java b/core/src/main/java/org/apache/calcite/interpreter/Row.java
index a39a164..1a16f81 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Row.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Row.java
@@ -138,5 +138,3 @@ public class Row {
 
 
 }
-
-// End Row.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Scalar.java b/core/src/main/java/org/apache/calcite/interpreter/Scalar.java
index 795e9d4..20e5bdd 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Scalar.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Scalar.java
@@ -23,5 +23,3 @@ public interface Scalar {
   Object execute(Context context);
   void execute(Context context, Object[] results);
 }
-
-// End Scalar.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/SetOpNode.java b/core/src/main/java/org/apache/calcite/interpreter/SetOpNode.java
index 32b8adf..8128bfc 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/SetOpNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/SetOpNode.java
@@ -83,5 +83,3 @@ public class SetOpNode implements Node {
     }
   }
 }
-
-// End SetOpNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Sink.java b/core/src/main/java/org/apache/calcite/interpreter/Sink.java
index 6056b96..828c048 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Sink.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Sink.java
@@ -32,5 +32,3 @@ public interface Sink {
   @Deprecated
   void setSourceEnumerable(Enumerable<Row> enumerable) throws InterruptedException;
 }
-
-// End Sink.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/SortNode.java b/core/src/main/java/org/apache/calcite/interpreter/SortNode.java
index 210a530..4b7d1b6 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/SortNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/SortNode.java
@@ -109,5 +109,3 @@ public class SortNode extends AbstractSingleNode<Sort> {
     }
   }
 }
-
-// End SortNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/Source.java b/core/src/main/java/org/apache/calcite/interpreter/Source.java
index 1371819..6606f19 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/Source.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/Source.java
@@ -27,5 +27,3 @@ public interface Source extends AutoCloseable {
 
   void close();
 }
-
-// End Source.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/TableScanNode.java b/core/src/main/java/org/apache/calcite/interpreter/TableScanNode.java
index a6a2a44..a56505f 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/TableScanNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/TableScanNode.java
@@ -287,5 +287,3 @@ public class TableScanNode implements Node {
     return new TableScanNode(compiler, rel, enumerable);
   }
 }
-
-// End TableScanNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/UnionNode.java b/core/src/main/java/org/apache/calcite/interpreter/UnionNode.java
index f31f1c7..520130c 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/UnionNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/UnionNode.java
@@ -57,5 +57,3 @@ public class UnionNode implements Node {
     }
   }
 }
-
-// End UnionNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/ValuesNode.java b/core/src/main/java/org/apache/calcite/interpreter/ValuesNode.java
index 83a510d..c7d4172 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/ValuesNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/ValuesNode.java
@@ -66,5 +66,3 @@ public class ValuesNode implements Node {
     sink.end();
   }
 }
-
-// End ValuesNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/WindowNode.java b/core/src/main/java/org/apache/calcite/interpreter/WindowNode.java
index eff4bea..8bd67e2 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/WindowNode.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/WindowNode.java
@@ -35,5 +35,3 @@ public class WindowNode extends AbstractSingleNode<Window> {
     sink.end();
   }
 }
-
-// End WindowNode.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/package-info.java b/core/src/main/java/org/apache/calcite/interpreter/package-info.java
index c2e152f..6120c5c 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/package-info.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/package-info.java
@@ -23,5 +23,3 @@
  * competitive for queries over small data sets.
  */
 package org.apache.calcite.interpreter;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java b/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java
index 486f0d2..57494bd 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java
@@ -343,5 +343,3 @@ class CachingCalciteSchema extends CalciteSchema {
     }
   }
 }
-
-// End CachingCalciteSchema.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteConnection.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteConnection.java
index 6fbc564..115d675 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteConnection.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteConnection.java
@@ -81,5 +81,3 @@ public interface CalciteConnection extends Connection, QueryProvider {
   /** Creates a context for preparing a statement for execution. */
   Context createPrepareContext();
 }
-
-// End CalciteConnection.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java
index 0b48e79..a274793 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java
@@ -626,5 +626,3 @@ abstract class CalciteConnectionImpl
   }
 
 }
-
-// End CalciteConnectionImpl.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteFactory.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteFactory.java
index 68c5507..b13e4d7 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteFactory.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteFactory.java
@@ -58,5 +58,3 @@ public abstract class CalciteFactory implements AvaticaFactory {
       AvaticaFactory factory, String url, Properties info,
       CalciteSchema rootSchema, JavaTypeFactory typeFactory);
 }
-
-// End CalciteFactory.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java
index 7aedae4..d4ba467 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteJdbc41Factory.java
@@ -263,5 +263,3 @@ public class CalciteJdbc41Factory extends CalciteFactory {
     }
   }
 }
-
-// End CalciteJdbc41Factory.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java
index 0e9457b..95d1502 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java
@@ -823,5 +823,3 @@ public class CalciteMetaImpl extends MetaImpl {
     }
   }
 }
-
-// End CalciteMetaImpl.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java b/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java
index afc5252..638f625 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java
@@ -399,5 +399,3 @@ public interface CalcitePrepare {
     }
   }
 }
-
-// End CalcitePrepare.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalcitePreparedStatement.java b/core/src/main/java/org/apache/calcite/jdbc/CalcitePreparedStatement.java
index 50e4036..fe877e7 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalcitePreparedStatement.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalcitePreparedStatement.java
@@ -52,5 +52,3 @@ abstract class CalcitePreparedStatement extends AvaticaPreparedStatement {
     return (CalciteConnectionImpl) super.getConnection();
   }
 }
-
-// End CalcitePreparedStatement.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteResultSet.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteResultSet.java
index 62e2249..59e9c21 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteResultSet.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteResultSet.java
@@ -112,5 +112,3 @@ public class CalciteResultSet extends AvaticaResultSet {
     return (CalciteConnectionImpl) statement.getConnection();
   }
 }
-
-// End CalciteResultSet.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteRootSchema.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteRootSchema.java
index 66e7526..8c7675f 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteRootSchema.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteRootSchema.java
@@ -28,5 +28,3 @@ public class CalciteRootSchema extends CachingCalciteSchema {
     super(null, schema, "");
   }
 }
-
-// End CalciteRootSchema.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteSchema.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteSchema.java
index 7445a6b..88f8f41 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteSchema.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteSchema.java
@@ -826,5 +826,3 @@ public abstract class CalciteSchema {
   }
 
 }
-
-// End CalciteSchema.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteStatement.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteStatement.java
index f73640e..56c81c3 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteStatement.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteStatement.java
@@ -85,5 +85,3 @@ public abstract class CalciteStatement extends AvaticaStatement {
     }
   }
 }
-
-// End CalciteStatement.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/ContextSqlValidator.java b/core/src/main/java/org/apache/calcite/jdbc/ContextSqlValidator.java
index 6a2f940..ca6631f 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/ContextSqlValidator.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/ContextSqlValidator.java
@@ -59,5 +59,3 @@ public class ContextSqlValidator extends SqlValidatorImpl {
         new CalciteConnectionConfigImpl(new Properties()));
   }
 }
-
-// End ContextSqlValidator.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/Driver.java b/core/src/main/java/org/apache/calcite/jdbc/Driver.java
index b839566..9db3057 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/Driver.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/Driver.java
@@ -179,5 +179,3 @@ public class Driver extends UnregisteredDriver {
             rootSchema, typeFactory);
   }
 }
-
-// End Driver.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/JavaRecordType.java b/core/src/main/java/org/apache/calcite/jdbc/JavaRecordType.java
index 7ef3439..80049cd 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/JavaRecordType.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/JavaRecordType.java
@@ -48,5 +48,3 @@ public class JavaRecordType extends RelRecordType {
     return Objects.hash(fieldList, clazz);
   }
 }
-
-// End JavaRecordType.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java b/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java
index 3c6c900..564a1ab 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/JavaTypeFactoryImpl.java
@@ -411,5 +411,3 @@ public class JavaTypeFactoryImpl
     }
   }
 }
-
-// End JavaTypeFactoryImpl.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/MetadataSchema.java b/core/src/main/java/org/apache/calcite/jdbc/MetadataSchema.java
index c11ccea..6f7664f 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/MetadataSchema.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/MetadataSchema.java
@@ -70,5 +70,3 @@ class MetadataSchema extends AbstractSchema {
     return TABLE_MAP;
   }
 }
-
-// End MetadataSchema.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/SimpleCalciteSchema.java b/core/src/main/java/org/apache/calcite/jdbc/SimpleCalciteSchema.java
index 15ede8b..7e50886 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/SimpleCalciteSchema.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/SimpleCalciteSchema.java
@@ -184,5 +184,3 @@ class SimpleCalciteSchema extends CalciteSchema {
   }
 
 }
-
-// End SimpleCalciteSchema.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/SqlTimeoutException.java b/core/src/main/java/org/apache/calcite/jdbc/SqlTimeoutException.java
index c207842..65f3d53 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/SqlTimeoutException.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/SqlTimeoutException.java
@@ -30,5 +30,3 @@ public class SqlTimeoutException
     super("timeout", null, 0);
   }
 }
-
-// End SqlTimeoutException.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/package-info.java b/core/src/main/java/org/apache/calcite/jdbc/package-info.java
index 40b3744..6770573 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/package-info.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/package-info.java
@@ -19,5 +19,3 @@
  * JDBC driver for Calcite.
  */
 package org.apache.calcite.jdbc;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java b/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java
index fb102d7..984b544 100644
--- a/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java
+++ b/core/src/main/java/org/apache/calcite/materialize/CachingLatticeStatisticProvider.java
@@ -57,5 +57,3 @@ class CachingLatticeStatisticProvider implements LatticeStatisticProvider {
     return (int) Lattice.getRowCount(lattice.getFactRowCount(), counts);
   }
 }
-
-// End CachingLatticeStatisticProvider.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/DelegatingLatticeStatisticProvider.java b/core/src/main/java/org/apache/calcite/materialize/DelegatingLatticeStatisticProvider.java
index f889dae..0a36e8a 100644
--- a/core/src/main/java/org/apache/calcite/materialize/DelegatingLatticeStatisticProvider.java
+++ b/core/src/main/java/org/apache/calcite/materialize/DelegatingLatticeStatisticProvider.java
@@ -39,5 +39,3 @@ public class DelegatingLatticeStatisticProvider
     return provider.cardinality(columns);
   }
 }
-
-// End DelegatingLatticeStatisticProvider.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/Lattice.java b/core/src/main/java/org/apache/calcite/materialize/Lattice.java
index b1af5f3..db03cde 100644
--- a/core/src/main/java/org/apache/calcite/materialize/Lattice.java
+++ b/core/src/main/java/org/apache/calcite/materialize/Lattice.java
@@ -1167,5 +1167,3 @@ public class Lattice {
     }
   }
 }
-
-// End Lattice.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/LatticeChildNode.java b/core/src/main/java/org/apache/calcite/materialize/LatticeChildNode.java
index 0554f63..5f394a9 100644
--- a/core/src/main/java/org/apache/calcite/materialize/LatticeChildNode.java
+++ b/core/src/main/java/org/apache/calcite/materialize/LatticeChildNode.java
@@ -42,5 +42,3 @@ public class LatticeChildNode extends LatticeNode {
     }
   }
 }
-
-// End LatticeChildNode.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/LatticeNode.java b/core/src/main/java/org/apache/calcite/materialize/LatticeNode.java
index 092453e..4b739cc 100644
--- a/core/src/main/java/org/apache/calcite/materialize/LatticeNode.java
+++ b/core/src/main/java/org/apache/calcite/materialize/LatticeNode.java
@@ -112,5 +112,3 @@ public abstract class LatticeNode {
   }
 
 }
-
-// End LatticeNode.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/LatticeRootNode.java b/core/src/main/java/org/apache/calcite/materialize/LatticeRootNode.java
index 60f53ec..aef86d2 100644
--- a/core/src/main/java/org/apache/calcite/materialize/LatticeRootNode.java
+++ b/core/src/main/java/org/apache/calcite/materialize/LatticeRootNode.java
@@ -82,5 +82,3 @@ public class LatticeRootNode extends LatticeNode {
   }
 
 }
-
-// End LatticeRootNode.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/LatticeSpace.java b/core/src/main/java/org/apache/calcite/materialize/LatticeSpace.java
index 8fa87db..c4cb0d8 100644
--- a/core/src/main/java/org/apache/calcite/materialize/LatticeSpace.java
+++ b/core/src/main/java/org/apache/calcite/materialize/LatticeSpace.java
@@ -169,5 +169,3 @@ class LatticeSpace {
     }
   }
 }
-
-// End LatticeSpace.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/LatticeStatisticProvider.java b/core/src/main/java/org/apache/calcite/materialize/LatticeStatisticProvider.java
index d191f8b..2db6ef8 100644
--- a/core/src/main/java/org/apache/calcite/materialize/LatticeStatisticProvider.java
+++ b/core/src/main/java/org/apache/calcite/materialize/LatticeStatisticProvider.java
@@ -32,5 +32,3 @@ public interface LatticeStatisticProvider {
   interface Factory extends Function<Lattice, LatticeStatisticProvider> {
   }
 }
-
-// End LatticeStatisticProvider.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/LatticeSuggester.java b/core/src/main/java/org/apache/calcite/materialize/LatticeSuggester.java
index d752196..7a2bd0c 100644
--- a/core/src/main/java/org/apache/calcite/materialize/LatticeSuggester.java
+++ b/core/src/main/java/org/apache/calcite/materialize/LatticeSuggester.java
@@ -814,5 +814,3 @@ public class LatticeSuggester {
   }
 
 }
-
-// End LatticeSuggester.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/LatticeTable.java b/core/src/main/java/org/apache/calcite/materialize/LatticeTable.java
index c7ae68a..0ea30a4 100644
--- a/core/src/main/java/org/apache/calcite/materialize/LatticeTable.java
+++ b/core/src/main/java/org/apache/calcite/materialize/LatticeTable.java
@@ -52,5 +52,3 @@ public class LatticeTable {
     return t.getRowType().getFieldList().get(i);
   }
 }
-
-// End LatticeTable.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/Lattices.java b/core/src/main/java/org/apache/calcite/materialize/Lattices.java
index 2a0a7ea..3a18bd7 100644
--- a/core/src/main/java/org/apache/calcite/materialize/Lattices.java
+++ b/core/src/main/java/org/apache/calcite/materialize/Lattices.java
@@ -34,5 +34,3 @@ public class Lattices {
   public static final LatticeStatisticProvider.Factory PROFILER =
       ProfilerLatticeStatisticProvider.FACTORY;
 }
-
-// End Lattices.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/MaterializationActor.java b/core/src/main/java/org/apache/calcite/materialize/MaterializationActor.java
index f01b9af..7183747 100644
--- a/core/src/main/java/org/apache/calcite/materialize/MaterializationActor.java
+++ b/core/src/main/java/org/apache/calcite/materialize/MaterializationActor.java
@@ -110,5 +110,3 @@ class MaterializationActor {
     }
   }
 }
-
-// End MaterializationActor.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/MaterializationKey.java b/core/src/main/java/org/apache/calcite/materialize/MaterializationKey.java
index c498f48..7f6b61a 100644
--- a/core/src/main/java/org/apache/calcite/materialize/MaterializationKey.java
+++ b/core/src/main/java/org/apache/calcite/materialize/MaterializationKey.java
@@ -42,5 +42,3 @@ public class MaterializationKey implements Serializable {
     return uuid.toString();
   }
 }
-
-// End MaterializationKey.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/MaterializationService.java b/core/src/main/java/org/apache/calcite/materialize/MaterializationService.java
index e013d08..0dedb82 100644
--- a/core/src/main/java/org/apache/calcite/materialize/MaterializationService.java
+++ b/core/src/main/java/org/apache/calcite/materialize/MaterializationService.java
@@ -402,5 +402,3 @@ public class MaterializationService {
     }
   }
 }
-
-// End MaterializationService.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/MutableNode.java b/core/src/main/java/org/apache/calcite/materialize/MutableNode.java
index 5e5871f..4882270 100644
--- a/core/src/main/java/org/apache/calcite/materialize/MutableNode.java
+++ b/core/src/main/java/org/apache/calcite/materialize/MutableNode.java
@@ -123,5 +123,3 @@ class MutableNode {
     return null;
   }
 }
-
-// End MutableNode.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/Path.java b/core/src/main/java/org/apache/calcite/materialize/Path.java
index 39e6191..07a66f2 100644
--- a/core/src/main/java/org/apache/calcite/materialize/Path.java
+++ b/core/src/main/java/org/apache/calcite/materialize/Path.java
@@ -41,5 +41,3 @@ class Path {
         && id == ((Path) obj).id;
   }
 }
-
-// End Path.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/ProfilerLatticeStatisticProvider.java b/core/src/main/java/org/apache/calcite/materialize/ProfilerLatticeStatisticProvider.java
index 3653b46..d22f56f 100644
--- a/core/src/main/java/org/apache/calcite/materialize/ProfilerLatticeStatisticProvider.java
+++ b/core/src/main/java/org/apache/calcite/materialize/ProfilerLatticeStatisticProvider.java
@@ -85,5 +85,3 @@ class ProfilerLatticeStatisticProvider implements LatticeStatisticProvider {
     return cardinality;
   }
 }
-
-// End ProfilerLatticeStatisticProvider.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/SqlLatticeStatisticProvider.java b/core/src/main/java/org/apache/calcite/materialize/SqlLatticeStatisticProvider.java
index 28d804c..34df02d 100644
--- a/core/src/main/java/org/apache/calcite/materialize/SqlLatticeStatisticProvider.java
+++ b/core/src/main/java/org/apache/calcite/materialize/SqlLatticeStatisticProvider.java
@@ -64,5 +64,3 @@ class SqlLatticeStatisticProvider implements LatticeStatisticProvider {
     return ((Number) values[0]).doubleValue();
   }
 }
-
-// End SqlLatticeStatisticProvider.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/SqlStatisticProvider.java b/core/src/main/java/org/apache/calcite/materialize/SqlStatisticProvider.java
index c18900f..a9baeff 100644
--- a/core/src/main/java/org/apache/calcite/materialize/SqlStatisticProvider.java
+++ b/core/src/main/java/org/apache/calcite/materialize/SqlStatisticProvider.java
@@ -59,5 +59,3 @@ public interface SqlStatisticProvider {
    * <p>For example, {@code isKey(DEPT, [DEPTNO]} returns false. */
   boolean isKey(RelOptTable table, List<Integer> columns);
 }
-
-// End SqlStatisticProvider.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/Step.java b/core/src/main/java/org/apache/calcite/materialize/Step.java
index 2e75c65..8c8fa8f 100644
--- a/core/src/main/java/org/apache/calcite/materialize/Step.java
+++ b/core/src/main/java/org/apache/calcite/materialize/Step.java
@@ -156,5 +156,3 @@ class Step extends DefaultEdge {
     }
   }
 }
-
-// End Step.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/TileKey.java b/core/src/main/java/org/apache/calcite/materialize/TileKey.java
index 34564be..476886f 100644
--- a/core/src/main/java/org/apache/calcite/materialize/TileKey.java
+++ b/core/src/main/java/org/apache/calcite/materialize/TileKey.java
@@ -57,5 +57,3 @@ public class TileKey {
     return "dimensions: " + dimensions + ", measures: " + measures;
   }
 }
-
-// End TileKey.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java b/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java
index 64cf736..eb5680f 100644
--- a/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java
+++ b/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java
@@ -210,5 +210,3 @@ public class TileSuggester {
     }
   }
 }
-
-// End TileSuggester.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/package-info.java b/core/src/main/java/org/apache/calcite/materialize/package-info.java
index 0aab1ca..fdcad1d 100644
--- a/core/src/main/java/org/apache/calcite/materialize/package-info.java
+++ b/core/src/main/java/org/apache/calcite/materialize/package-info.java
@@ -33,5 +33,3 @@
  * recognize what materializations would be useful based on actual query load.
  */
 package org.apache.calcite.materialize;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonColumn.java b/core/src/main/java/org/apache/calcite/model/JsonColumn.java
index b337ef3..f76050a 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonColumn.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonColumn.java
@@ -34,5 +34,3 @@ public class JsonColumn {
     handler.visit(this);
   }
 }
-
-// End JsonColumn.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonCustomSchema.java b/core/src/main/java/org/apache/calcite/model/JsonCustomSchema.java
index 0e656cd..36cea82 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonCustomSchema.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonCustomSchema.java
@@ -49,5 +49,3 @@ public class JsonCustomSchema extends JsonMapSchema {
     return "JsonCustomSchema(name=" + name + ")";
   }
 }
-
-// End JsonCustomSchema.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonCustomTable.java b/core/src/main/java/org/apache/calcite/model/JsonCustomTable.java
index 1619f7f..09d0104 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonCustomTable.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonCustomTable.java
@@ -45,5 +45,3 @@ public class JsonCustomTable extends JsonTable {
     handler.visit(this);
   }
 }
-
-// End JsonCustomTable.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonFunction.java b/core/src/main/java/org/apache/calcite/model/JsonFunction.java
index e7a2bec..716723f 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonFunction.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonFunction.java
@@ -64,5 +64,3 @@ public class JsonFunction {
     handler.visit(this);
   }
 }
-
-// End JsonFunction.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java b/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java
index 4c8aaf5..0361554 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonJdbcSchema.java
@@ -73,5 +73,3 @@ public class JsonJdbcSchema extends JsonSchema {
     handler.visit(this);
   }
 }
-
-// End JsonJdbcSchema.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonLattice.java b/core/src/main/java/org/apache/calcite/model/JsonLattice.java
index 15f1fcd..20bc638 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonLattice.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonLattice.java
@@ -142,5 +142,3 @@ public class JsonLattice {
     }
   }
 }
-
-// End JsonLattice.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonMapSchema.java b/core/src/main/java/org/apache/calcite/model/JsonMapSchema.java
index 9e98606..1b8300d 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonMapSchema.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonMapSchema.java
@@ -63,5 +63,3 @@ public class JsonMapSchema extends JsonSchema {
     }
   }
 }
-
-// End JsonMapSchema.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonMaterialization.java b/core/src/main/java/org/apache/calcite/model/JsonMaterialization.java
index a724f1f..59c0c2f 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonMaterialization.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonMaterialization.java
@@ -52,5 +52,3 @@ public class JsonMaterialization {
     return JsonLattice.toString(sql);
   }
 }
-
-// End JsonMaterialization.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonMeasure.java b/core/src/main/java/org/apache/calcite/model/JsonMeasure.java
index 3071b00..37737cc 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonMeasure.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonMeasure.java
@@ -55,5 +55,3 @@ public class JsonMeasure {
     modelHandler.visit(this);
   }
 }
-
-// End JsonMeasure.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonRoot.java b/core/src/main/java/org/apache/calcite/model/JsonRoot.java
index 7d45013..ca2924f 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonRoot.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonRoot.java
@@ -66,5 +66,3 @@ public class JsonRoot {
    */
   public final List<JsonSchema> schemas = new ArrayList<>();
 }
-
-// End JsonRoot.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonSchema.java b/core/src/main/java/org/apache/calcite/model/JsonSchema.java
index ce9c801..3a9afcc 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonSchema.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonSchema.java
@@ -110,5 +110,3 @@ public abstract class JsonSchema {
     CUSTOM
   }
 }
-
-// End JsonSchema.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonStream.java b/core/src/main/java/org/apache/calcite/model/JsonStream.java
index 714af5f..bc9ee48 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonStream.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonStream.java
@@ -37,5 +37,3 @@ public class JsonStream {
    */
   public boolean history = false;
 }
-
-// End JsonStream.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonTable.java b/core/src/main/java/org/apache/calcite/model/JsonTable.java
index 9673667..3fb80be 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonTable.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonTable.java
@@ -56,5 +56,3 @@ public abstract class JsonTable {
 
   public abstract void accept(ModelHandler handler);
 }
-
-// End JsonTable.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonTile.java b/core/src/main/java/org/apache/calcite/model/JsonTile.java
index f718777..c007f05 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonTile.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonTile.java
@@ -52,5 +52,3 @@ public class JsonTile {
     handler.visit(this);
   }
 }
-
-// End JsonTile.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonType.java b/core/src/main/java/org/apache/calcite/model/JsonType.java
index 08db52f..3129038 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonType.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonType.java
@@ -45,5 +45,3 @@ public class JsonType {
     handler.visit(this);
   }
 }
-
-// End JsonType.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonTypeAttribute.java b/core/src/main/java/org/apache/calcite/model/JsonTypeAttribute.java
index 19ca36a..8ce2a28 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonTypeAttribute.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonTypeAttribute.java
@@ -32,5 +32,3 @@ public class JsonTypeAttribute {
    */
   public String type;
 }
-
-// End JsonTypeAttribute.java
diff --git a/core/src/main/java/org/apache/calcite/model/JsonView.java b/core/src/main/java/org/apache/calcite/model/JsonView.java
index ccacc11..90467d1 100644
--- a/core/src/main/java/org/apache/calcite/model/JsonView.java
+++ b/core/src/main/java/org/apache/calcite/model/JsonView.java
@@ -96,5 +96,3 @@ public class JsonView extends JsonTable {
     return JsonLattice.toString(sql);
   }
 }
-
-// End JsonView.java
diff --git a/core/src/main/java/org/apache/calcite/model/ModelHandler.java b/core/src/main/java/org/apache/calcite/model/ModelHandler.java
index afd11f4..2aba4aa 100644
--- a/core/src/main/java/org/apache/calcite/model/ModelHandler.java
+++ b/core/src/main/java/org/apache/calcite/model/ModelHandler.java
@@ -577,5 +577,3 @@ public class ModelHandler {
     }
   }
 }
-
-// End ModelHandler.java
diff --git a/core/src/main/java/org/apache/calcite/model/package-info.java b/core/src/main/java/org/apache/calcite/model/package-info.java
index b0abc14..5b8fa79 100644
--- a/core/src/main/java/org/apache/calcite/model/package-info.java
+++ b/core/src/main/java/org/apache/calcite/model/package-info.java
@@ -34,5 +34,3 @@
  * <a href="https://calcite.apache.org/docs/tutorial.html">tutorial</a>.
  */
 package org.apache.calcite.model;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/package-info.java b/core/src/main/java/org/apache/calcite/package-info.java
index 87ef21f..2b1b922 100644
--- a/core/src/main/java/org/apache/calcite/package-info.java
+++ b/core/src/main/java/org/apache/calcite/package-info.java
@@ -19,5 +19,3 @@
  * Main package for Calcite, the dynamic data management platform.
  */
 package org.apache.calcite;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/plan/AbstractRelOptPlanner.java b/core/src/main/java/org/apache/calcite/plan/AbstractRelOptPlanner.java
index 93c16f2..6fe9536 100644
--- a/core/src/main/java/org/apache/calcite/plan/AbstractRelOptPlanner.java
+++ b/core/src/main/java/org/apache/calcite/plan/AbstractRelOptPlanner.java
@@ -422,5 +422,3 @@ public abstract class AbstractRelOptPlanner implements RelOptPlanner {
     return Util.filter(classes, clazz::isAssignableFrom);
   }
 }
-
-// End AbstractRelOptPlanner.java
diff --git a/core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java b/core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java
index 7886ad2..e5ffda5 100644
--- a/core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java
+++ b/core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java
@@ -34,5 +34,3 @@ public abstract class CommonRelSubExprRule extends RelOptRule {
     super(operand);
   }
 }
-
-// End CommonRelSubExprRule.java
diff --git a/core/src/main/java/org/apache/calcite/plan/Context.java b/core/src/main/java/org/apache/calcite/plan/Context.java
index 764d3a8..667d3f7 100644
--- a/core/src/main/java/org/apache/calcite/plan/Context.java
+++ b/core/src/main/java/org/apache/calcite/plan/Context.java
@@ -28,5 +28,3 @@ import org.apache.calcite.schema.Wrapper;
  */
 public interface Context extends Wrapper {
 }
-
-// End Context.java
diff --git a/core/src/main/java/org/apache/calcite/plan/Contexts.java b/core/src/main/java/org/apache/calcite/plan/Contexts.java
index adc13da..05343d8 100644
--- a/core/src/main/java/org/apache/calcite/plan/Contexts.java
+++ b/core/src/main/java/org/apache/calcite/plan/Contexts.java
@@ -155,5 +155,3 @@ public class Contexts {
     }
   }
 }
-
-// End Contexts.java
diff --git a/core/src/main/java/org/apache/calcite/plan/Convention.java b/core/src/main/java/org/apache/calcite/plan/Convention.java
index 248a98f..5ad1847 100644
--- a/core/src/main/java/org/apache/calcite/plan/Convention.java
+++ b/core/src/main/java/org/apache/calcite/plan/Convention.java
@@ -106,5 +106,3 @@ public interface Convention extends RelTrait {
     }
   }
 }
-
-// End Convention.java
diff --git a/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java b/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java
index cc459b3..13a4ad9 100644
--- a/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java
+++ b/core/src/main/java/org/apache/calcite/plan/ConventionTraitDef.java
@@ -241,5 +241,3 @@ public class ConventionTraitDef extends RelTraitDef<Convention> {
     }
   }
 }
-
-// End ConventionTraitDef.java
diff --git a/core/src/main/java/org/apache/calcite/plan/MaterializedViewSubstitutionVisitor.java b/core/src/main/java/org/apache/calcite/plan/MaterializedViewSubstitutionVisitor.java
index b54dd44..0ddee54 100644
--- a/core/src/main/java/org/apache/calcite/plan/MaterializedViewSubstitutionVisitor.java
+++ b/core/src/main/java/org/apache/calcite/plan/MaterializedViewSubstitutionVisitor.java
@@ -34,5 +34,3 @@ public class MaterializedViewSubstitutionVisitor extends SubstitutionVisitor {
     super(target_, query_, DEFAULT_RULES, relBuilderFactory);
   }
 }
-
-// End MaterializedViewSubstitutionVisitor.java
diff --git a/core/src/main/java/org/apache/calcite/plan/MulticastRelOptListener.java b/core/src/main/java/org/apache/calcite/plan/MulticastRelOptListener.java
index 1cba6a5..e707bbd 100644
--- a/core/src/main/java/org/apache/calcite/plan/MulticastRelOptListener.java
+++ b/core/src/main/java/org/apache/calcite/plan/MulticastRelOptListener.java
@@ -83,5 +83,3 @@ public class MulticastRelOptListener implements RelOptListener {
     }
   }
 }
-
-// End MulticastRelOptListener.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java b/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java
index e3555b8..ac8c705 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelCompositeTrait.java
@@ -115,5 +115,3 @@ class RelCompositeTrait<T extends RelMultipleTrait> implements RelTrait {
     return traits.length;
   }
 }
-
-// End RelCompositeTrait.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelImplementor.java b/core/src/main/java/org/apache/calcite/plan/RelImplementor.java
index 56157c3..c7396a3 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelImplementor.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelImplementor.java
@@ -29,5 +29,3 @@ public interface RelImplementor {
   /** Returns the desired SQL conformance. */
   SqlConformance getConformance();
 }
-
-// End RelImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelMultipleTrait.java b/core/src/main/java/org/apache/calcite/plan/RelMultipleTrait.java
index fbbc32f..ded460e 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelMultipleTrait.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelMultipleTrait.java
@@ -28,5 +28,3 @@ public interface RelMultipleTrait
    * (including itself). */
   boolean isTop();
 }
-
-// End RelMultipleTrait.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptAbstractTable.java b/core/src/main/java/org/apache/calcite/plan/RelOptAbstractTable.java
index 18e03ee..05333a3 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptAbstractTable.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptAbstractTable.java
@@ -124,5 +124,3 @@ public abstract class RelOptAbstractTable implements RelOptTable {
   }
 
 }
-
-// End RelOptAbstractTable.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptCluster.java b/core/src/main/java/org/apache/calcite/plan/RelOptCluster.java
index d68a36c..1baa0fc 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptCluster.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptCluster.java
@@ -251,5 +251,3 @@ public class RelOptCluster {
     return emptyTraitSet.replace(trait);
   }
 }
-
-// End RelOptCluster.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptConnection.java b/core/src/main/java/org/apache/calcite/plan/RelOptConnection.java
index 0005e62..0f64f50 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptConnection.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptConnection.java
@@ -28,5 +28,3 @@ public interface RelOptConnection {
    */
   RelOptSchema getRelOptSchema();
 }
-
-// End RelOptConnection.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptCost.java b/core/src/main/java/org/apache/calcite/plan/RelOptCost.java
index bf9a55d..aae811d 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptCost.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptCost.java
@@ -132,5 +132,3 @@ public interface RelOptCost {
    */
   String toString();
 }
-
-// End RelOptCost.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptCostFactory.java b/core/src/main/java/org/apache/calcite/plan/RelOptCostFactory.java
index cb3ec0b..608acf5 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptCostFactory.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptCostFactory.java
@@ -45,5 +45,3 @@ public interface RelOptCostFactory {
    */
   RelOptCost makeZeroCost();
 }
-
-// End RelOptCostFactory.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptCostImpl.java b/core/src/main/java/org/apache/calcite/plan/RelOptCostImpl.java
index 0c46353..2ed57bd 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptCostImpl.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptCostImpl.java
@@ -149,5 +149,3 @@ public class RelOptCostImpl implements RelOptCost {
     }
   }
 }
-
-// End RelOptCostImpl.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptLattice.java b/core/src/main/java/org/apache/calcite/plan/RelOptLattice.java
index 2463fde..2b823e7 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptLattice.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptLattice.java
@@ -84,5 +84,3 @@ public class RelOptLattice {
         false);
   }
 }
-
-// End RelOptLattice.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptListener.java b/core/src/main/java/org/apache/calcite/plan/RelOptListener.java
index ef74980..64d6203 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptListener.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptListener.java
@@ -183,5 +183,3 @@ public interface RelOptListener extends EventListener {
     }
   }
 }
-
-// End RelOptListener.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptMaterialization.java b/core/src/main/java/org/apache/calcite/plan/RelOptMaterialization.java
index 673148f..1baf55f 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptMaterialization.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptMaterialization.java
@@ -295,5 +295,3 @@ public class RelOptMaterialization {
     return rel2;
   }
 }
-
-// End RelOptMaterialization.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptMaterializations.java b/core/src/main/java/org/apache/calcite/plan/RelOptMaterializations.java
index 0a4551b..938ce05 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptMaterializations.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptMaterializations.java
@@ -238,5 +238,3 @@ public abstract class RelOptMaterializations {
     return false;
   }
 }
-
-// End RelOptMaterializations.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptNode.java b/core/src/main/java/org/apache/calcite/plan/RelOptNode.java
index 9db9cb1..6ba931b 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptNode.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptNode.java
@@ -91,5 +91,3 @@ public interface RelOptNode {
    */
   RelOptCluster getCluster();
 }
-
-// End RelOptNode.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptPlanner.java b/core/src/main/java/org/apache/calcite/plan/RelOptPlanner.java
index acbcf76..19a65fb 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptPlanner.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptPlanner.java
@@ -352,5 +352,3 @@ public interface RelOptPlanner {
     }
   }
 }
-
-// End RelOptPlanner.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptPredicateList.java b/core/src/main/java/org/apache/calcite/plan/RelOptPredicateList.java
index bd60d5a..ab20971 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptPredicateList.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptPredicateList.java
@@ -181,5 +181,3 @@ public class RelOptPredicateList {
         RexUtil.shift(rightInferredPredicates, offset));
   }
 }
-
-// End RelOptPredicateList.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptQuery.java b/core/src/main/java/org/apache/calcite/plan/RelOptQuery.java
index e4814d3..d095161 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptQuery.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptQuery.java
@@ -127,5 +127,3 @@ public class RelOptQuery {
     mapCorrelToRel.put(name, rel);
   }
 }
-
-// End RelOptQuery.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptRule.java b/core/src/main/java/org/apache/calcite/plan/RelOptRule.java
index c737359..04b04bb 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptRule.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptRule.java
@@ -660,5 +660,3 @@ public abstract class RelOptRule {
     }
   }
 }
-
-// End RelOptRule.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptRuleCall.java b/core/src/main/java/org/apache/calcite/plan/RelOptRuleCall.java
index 9a3db76..d225ede 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptRuleCall.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptRuleCall.java
@@ -279,5 +279,3 @@ public abstract class RelOptRuleCall {
     return rule.relBuilderFactory.create(rel(0).getCluster(), null);
   }
 }
-
-// End RelOptRuleCall.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperand.java b/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperand.java
index 7506010..1e71e46 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperand.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperand.java
@@ -214,5 +214,3 @@ public class RelOptRuleOperand {
     return predicate.test(rel);
   }
 }
-
-// End RelOptRuleOperand.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperandChildPolicy.java b/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperandChildPolicy.java
index a9bbc68..dabba09 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperandChildPolicy.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperandChildPolicy.java
@@ -48,5 +48,3 @@ public enum RelOptRuleOperandChildPolicy {
    */
   UNORDERED,
 }
-
-// End RelOptRuleOperandChildPolicy.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperandChildren.java b/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperandChildren.java
index 3dfab3e..98539a8 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperandChildren.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptRuleOperandChildren.java
@@ -51,5 +51,3 @@ public class RelOptRuleOperandChildren {
     this.operands = ImmutableList.copyOf(operands);
   }
 }
-
-// End RelOptRuleOperandChildren.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptRules.java b/core/src/main/java/org/apache/calcite/plan/RelOptRules.java
index bfe363c..0d16de0 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptRules.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptRules.java
@@ -195,5 +195,3 @@ public class RelOptRules {
       AbstractMaterializedViewRule.INSTANCE_PROJECT_AGGREGATE,
       AbstractMaterializedViewRule.INSTANCE_AGGREGATE);
 }
-
-// End RelOptRules.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptSamplingParameters.java b/core/src/main/java/org/apache/calcite/plan/RelOptSamplingParameters.java
index 1621c44..2e9ddb7 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptSamplingParameters.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptSamplingParameters.java
@@ -95,5 +95,3 @@ public class RelOptSamplingParameters {
     return repeatableSeed;
   }
 }
-
-// End RelOptSamplingParameters.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptSchema.java b/core/src/main/java/org/apache/calcite/plan/RelOptSchema.java
index 1b682ff..fdf151c 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptSchema.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptSchema.java
@@ -52,5 +52,3 @@ public interface RelOptSchema {
    */
   void registerRules(RelOptPlanner planner) throws Exception;
 }
-
-// End RelOptSchema.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptSchemaWithSampling.java b/core/src/main/java/org/apache/calcite/plan/RelOptSchemaWithSampling.java
index 77f6716..f080f97 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptSchemaWithSampling.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptSchemaWithSampling.java
@@ -42,5 +42,3 @@ public interface RelOptSchemaWithSampling extends RelOptSchema {
       String datasetName,
       boolean[] usedDataset);
 }
-
-// End RelOptSchemaWithSampling.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptTable.java b/core/src/main/java/org/apache/calcite/plan/RelOptTable.java
index dca3ab2..4904398 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptTable.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptTable.java
@@ -152,5 +152,3 @@ public interface RelOptTable extends Wrapper {
     RelOptCluster getCluster();
   }
 }
-
-// End RelOptTable.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
index 9daf30d..603da4f 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
@@ -4020,5 +4020,3 @@ public abstract class RelOptUtil {
     }
   }
 }
-
-// End RelOptUtil.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelTrait.java b/core/src/main/java/org/apache/calcite/plan/RelTrait.java
index 2e3475b..8ee9147 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelTrait.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelTrait.java
@@ -86,5 +86,3 @@ public interface RelTrait {
    */
   void register(RelOptPlanner planner);
 }
-
-// End RelTrait.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelTraitDef.java b/core/src/main/java/org/apache/calcite/plan/RelTraitDef.java
index 43b44d4..a2c4704 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelTraitDef.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelTraitDef.java
@@ -186,5 +186,3 @@ public abstract class RelTraitDef<T extends RelTrait> {
    */
   public abstract T getDefault();
 }
-
-// End RelTraitDef.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelTraitPropagationVisitor.java b/core/src/main/java/org/apache/calcite/plan/RelTraitPropagationVisitor.java
index 135a9dd..080f283 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelTraitPropagationVisitor.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelTraitPropagationVisitor.java
@@ -87,5 +87,3 @@ public class RelTraitPropagationVisitor extends RelVisitor {
     rel.childrenAccept(this);
   }
 }
-
-// End RelTraitPropagationVisitor.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RelTraitSet.java b/core/src/main/java/org/apache/calcite/plan/RelTraitSet.java
index fa11142..8dc5391 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelTraitSet.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelTraitSet.java
@@ -556,5 +556,3 @@ public final class RelTraitSet extends AbstractList<RelTrait> {
     }
   }
 }
-
-// End RelTraitSet.java
diff --git a/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java b/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java
index e607c85..3e56c0a 100644
--- a/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java
+++ b/core/src/main/java/org/apache/calcite/plan/RexImplicationChecker.java
@@ -519,5 +519,3 @@ public class RexImplicationChecker {
     private int usageCount = 0;
   }
 }
-
-// End RexImplicationChecker.java
diff --git a/core/src/main/java/org/apache/calcite/plan/Strong.java b/core/src/main/java/org/apache/calcite/plan/Strong.java
index 81e3d71..7c793ca 100644
--- a/core/src/main/java/org/apache/calcite/plan/Strong.java
+++ b/core/src/main/java/org/apache/calcite/plan/Strong.java
@@ -295,5 +295,3 @@ public class Strong {
     AS_IS,
   }
 }
-
-// End Strong.java
diff --git a/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java b/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
index df8146b..0984230 100644
--- a/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
+++ b/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
@@ -2056,5 +2056,3 @@ public class SubstitutionVisitor {
     }
   }
 }
-
-// End SubstitutionVisitor.java
diff --git a/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java b/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java
index 259cdf9..30ca6db 100644
--- a/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java
+++ b/core/src/main/java/org/apache/calcite/plan/TableAccessMap.java
@@ -200,5 +200,3 @@ public class TableAccessMap {
     }
   }
 }
-
-// End TableAccessMap.java
diff --git a/core/src/main/java/org/apache/calcite/plan/ViewExpanders.java b/core/src/main/java/org/apache/calcite/plan/ViewExpanders.java
index eea2e33..543e9eb 100644
--- a/core/src/main/java/org/apache/calcite/plan/ViewExpanders.java
+++ b/core/src/main/java/org/apache/calcite/plan/ViewExpanders.java
@@ -63,5 +63,3 @@ public abstract class ViewExpanders {
     };
   }
 }
-
-// End ViewExpanders.java
diff --git a/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java b/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java
index 13e80be..675ce3a 100644
--- a/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java
+++ b/core/src/main/java/org/apache/calcite/plan/VisitorDataContext.java
@@ -162,5 +162,3 @@ public class VisitorDataContext implements DataContext {
   }
 
 }
-
-// End VisitorDataContext.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java b/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java
index d89e58f..329f0fe 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/HepInstruction.java
@@ -195,5 +195,3 @@ abstract class HepInstruction {
     }
   }
 }
-
-// End HepInstruction.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepMatchOrder.java b/core/src/main/java/org/apache/calcite/plan/hep/HepMatchOrder.java
index a590f75..1ac64f4 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/HepMatchOrder.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/HepMatchOrder.java
@@ -50,5 +50,3 @@ public enum HepMatchOrder {
    */
   DEPTH_FIRST
 }
-
-// End HepMatchOrder.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepPlanner.java b/core/src/main/java/org/apache/calcite/plan/hep/HepPlanner.java
index d6ba1a0..9a41776 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/HepPlanner.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/HepPlanner.java
@@ -1044,5 +1044,3 @@ public class HepPlanner extends AbstractRelOptPlanner {
     materializations.add(materialization);
   }
 }
-
-// End HepPlanner.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepProgram.java b/core/src/main/java/org/apache/calcite/plan/hep/HepProgram.java
index f68abc1..83e5c88 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/HepProgram.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/HepProgram.java
@@ -74,5 +74,3 @@ public class HepProgram {
     }
   }
 }
-
-// End HepProgram.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepProgramBuilder.java b/core/src/main/java/org/apache/calcite/plan/hep/HepProgramBuilder.java
index f34a143..f3ed082 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/HepProgramBuilder.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/HepProgramBuilder.java
@@ -263,5 +263,3 @@ public class HepProgramBuilder {
     return program;
   }
 }
-
-// End HepProgramBuilder.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java
index 103018b..435e406 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/HepRelMetadataProvider.java
@@ -64,5 +64,3 @@ class HepRelMetadataProvider implements RelMetadataProvider {
     return ImmutableMultimap.of();
   }
 }
-
-// End HepRelMetadataProvider.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepRelVertex.java b/core/src/main/java/org/apache/calcite/plan/hep/HepRelVertex.java
index 249d37d..6ec8a6c 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/HepRelVertex.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/HepRelVertex.java
@@ -95,5 +95,3 @@ public class HepRelVertex extends AbstractRelNode {
     return currentRel;
   }
 }
-
-// End HepRelVertex.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepRuleCall.java b/core/src/main/java/org/apache/calcite/plan/hep/HepRuleCall.java
index 38f846a..85b3c61 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/HepRuleCall.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/HepRuleCall.java
@@ -66,5 +66,3 @@ public class HepRuleCall extends RelOptRuleCall {
     return results;
   }
 }
-
-// End HepRuleCall.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/package-info.java b/core/src/main/java/org/apache/calcite/plan/hep/package-info.java
index 424ad80..c388091 100644
--- a/core/src/main/java/org/apache/calcite/plan/hep/package-info.java
+++ b/core/src/main/java/org/apache/calcite/plan/hep/package-info.java
@@ -20,5 +20,3 @@
  * {@link org.apache.calcite.plan}.
  */
 package org.apache.calcite.plan.hep;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/plan/package-info.java b/core/src/main/java/org/apache/calcite/plan/package-info.java
index e6fecd2..013ceaa 100644
--- a/core/src/main/java/org/apache/calcite/plan/package-info.java
+++ b/core/src/main/java/org/apache/calcite/plan/package-info.java
@@ -20,5 +20,3 @@
  * relational expressions.
  */
 package org.apache.calcite.plan;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/AbstractConverter.java b/core/src/main/java/org/apache/calcite/plan/volcano/AbstractConverter.java
index 5c36ad1..0afdd69 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/AbstractConverter.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/AbstractConverter.java
@@ -127,5 +127,3 @@ public class AbstractConverter extends ConverterImpl {
     }
   }
 }
-
-// End AbstractConverter.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/ChainedPhaseRuleMappingInitializer.java b/core/src/main/java/org/apache/calcite/plan/volcano/ChainedPhaseRuleMappingInitializer.java
index db65891..ce276c1 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/ChainedPhaseRuleMappingInitializer.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/ChainedPhaseRuleMappingInitializer.java
@@ -66,5 +66,3 @@ public abstract class ChainedPhaseRuleMappingInitializer
   public abstract void chainedInitialize(
       Map<VolcanoPlannerPhase, Set<String>> phaseRuleMap);
 }
-
-// End ChainedPhaseRuleMappingInitializer.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java b/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java
index f866068..10816cc 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java
@@ -389,5 +389,3 @@ class RelSet {
     }
   }
 }
-
-// End RelSet.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java b/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java
index 8aa4e84..13bd1f9 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java
@@ -640,5 +640,3 @@ public class RelSubset extends AbstractRelNode {
     }
   }
 }
-
-// End RelSubset.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/RuleQueue.java b/core/src/main/java/org/apache/calcite/plan/volcano/RuleQueue.java
index 1b37e7d..170a46c 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/RuleQueue.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/RuleQueue.java
@@ -696,5 +696,3 @@ class RuleQueue {
     }
   }
 }
-
-// End RuleQueue.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoCost.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoCost.java
index 3b3fa33..f8d67ec 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoCost.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoCost.java
@@ -239,5 +239,3 @@ class VolcanoCost implements RelOptCost {
     }
   }
 }
-
-// End VolcanoCost.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java
index bcbb380..6a1be86 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java
@@ -1986,5 +1986,3 @@ public class VolcanoPlanner extends AbstractRelOptPlanner {
     }
   }
 }
-
-// End VolcanoPlanner.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlannerPhase.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlannerPhase.java
index 13b51a1..24ed5e9 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlannerPhase.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlannerPhase.java
@@ -24,5 +24,3 @@ package org.apache.calcite.plan.volcano;
 public enum VolcanoPlannerPhase {
   PRE_PROCESS_MDR, PRE_PROCESS, OPTIMIZE, CLEANUP,
 }
-
-// End VolcanoPlannerPhase.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlannerPhaseRuleMappingInitializer.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlannerPhaseRuleMappingInitializer.java
index 3f839e2..130e488 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlannerPhaseRuleMappingInitializer.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlannerPhaseRuleMappingInitializer.java
@@ -47,5 +47,3 @@ public interface VolcanoPlannerPhaseRuleMappingInitializer {
    */
   void initialize(Map<VolcanoPlannerPhase, Set<String>> phaseRuleMap);
 }
-
-// End VolcanoPlannerPhaseRuleMappingInitializer.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java
index 9d96fef..00c5164 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRelMetadataProvider.java
@@ -117,5 +117,3 @@ public class VolcanoRelMetadataProvider implements RelMetadataProvider {
     return ImmutableMultimap.of();
   }
 }
-
-// End VolcanoRelMetadataProvider.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleCall.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleCall.java
index 786a036..a9c4369 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleCall.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleCall.java
@@ -375,5 +375,3 @@ public class VolcanoRuleCall extends RelOptRuleCall {
     }
   }
 }
-
-// End VolcanoRuleCall.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleMatch.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleMatch.java
index aa2272a..12e7831 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleMatch.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleMatch.java
@@ -197,5 +197,3 @@ class VolcanoRuleMatch extends VolcanoRuleCall {
   }
 
 }
-
-// End VolcanoRuleMatch.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java b/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java
index 0dd4fa4..15ac0f2 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java
@@ -269,5 +269,3 @@
  *     (1993)</a>.</p>
  */
 package org.apache.calcite.plan.volcano;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/CalciteCatalogReader.java b/core/src/main/java/org/apache/calcite/prepare/CalciteCatalogReader.java
index d2dcf5b..74fe767 100644
--- a/core/src/main/java/org/apache/calcite/prepare/CalciteCatalogReader.java
+++ b/core/src/main/java/org/apache/calcite/prepare/CalciteCatalogReader.java
@@ -412,5 +412,3 @@ public class CalciteCatalogReader implements Prepare.CatalogReader {
     return null;
   }
 }
-
-// End CalciteCatalogReader.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java b/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java
index ae02dcd..e127677 100644
--- a/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java
+++ b/core/src/main/java/org/apache/calcite/prepare/CalciteMaterializer.java
@@ -211,5 +211,3 @@ class CalciteMaterializer extends CalcitePrepareImpl.CalcitePreparingStmt {
     }
   }
 }
-
-// End CalciteMaterializer.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java b/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java
index 898f955..3edaa56 100644
--- a/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java
+++ b/core/src/main/java/org/apache/calcite/prepare/CalcitePrepareImpl.java
@@ -1342,5 +1342,3 @@ public class CalcitePrepareImpl implements CalcitePrepare {
     }
   }
 }
-
-// End CalcitePrepareImpl.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java b/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java
index 23206c7..606323c 100644
--- a/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java
+++ b/core/src/main/java/org/apache/calcite/prepare/CalciteSqlValidator.java
@@ -46,5 +46,3 @@ class CalciteSqlValidator extends SqlValidatorImpl {
     return ((JavaTypeFactory) typeFactory).toSql(superType);
   }
 }
-
-// End CalciteSqlValidator.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java b/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java
index 8a05671..e6ab3bc 100644
--- a/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java
+++ b/core/src/main/java/org/apache/calcite/prepare/LixToRelTranslator.java
@@ -176,5 +176,3 @@ class LixToRelTranslator {
         .toRex(expression.body);
   }
 }
-
-// End LixToRelTranslator.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/PlannerImpl.java b/core/src/main/java/org/apache/calcite/prepare/PlannerImpl.java
index 9acbc42..6494e2a 100644
--- a/core/src/main/java/org/apache/calcite/prepare/PlannerImpl.java
+++ b/core/src/main/java/org/apache/calcite/prepare/PlannerImpl.java
@@ -394,5 +394,3 @@ public class PlannerImpl implements Planner, ViewExpander {
     }
   }
 }
-
-// End PlannerImpl.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/Prepare.java b/core/src/main/java/org/apache/calcite/prepare/Prepare.java
index 226a27f..4cb7c4a 100644
--- a/core/src/main/java/org/apache/calcite/prepare/Prepare.java
+++ b/core/src/main/java/org/apache/calcite/prepare/Prepare.java
@@ -671,5 +671,3 @@ public abstract class Prepare {
     }
   }
 }
-
-// End Prepare.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java b/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java
index 2f6b627..b43c0b6 100644
--- a/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java
+++ b/core/src/main/java/org/apache/calcite/prepare/QueryableRelBuilder.java
@@ -760,5 +760,3 @@ class QueryableRelBuilder<T> implements QueryableFactory<T> {
     throw new UnsupportedOperationException();
   }
 }
-
-// End QueryableRelBuilder.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java b/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java
index c3706d3..49ac822 100644
--- a/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java
+++ b/core/src/main/java/org/apache/calcite/prepare/RelOptTableImpl.java
@@ -538,5 +538,3 @@ public class RelOptTableImpl extends Prepare.AbstractPreparingTable {
     }
   }
 }
-
-// End RelOptTableImpl.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/package-info.java b/core/src/main/java/org/apache/calcite/prepare/package-info.java
index 0d4dd6e..212d419 100644
--- a/core/src/main/java/org/apache/calcite/prepare/package-info.java
+++ b/core/src/main/java/org/apache/calcite/prepare/package-info.java
@@ -19,5 +19,3 @@
  * Preparation of queries (parsing, planning and implementation).
  */
 package org.apache.calcite.prepare;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/profile/Profiler.java b/core/src/main/java/org/apache/calcite/profile/Profiler.java
index 5cb5423..7ab6988 100644
--- a/core/src/main/java/org/apache/calcite/profile/Profiler.java
+++ b/core/src/main/java/org/apache/calcite/profile/Profiler.java
@@ -300,5 +300,3 @@ public interface Profiler {
     }
   }
 }
-
-// End Profiler.java
diff --git a/core/src/main/java/org/apache/calcite/profile/ProfilerImpl.java b/core/src/main/java/org/apache/calcite/profile/ProfilerImpl.java
index 1115946..e3afb29 100644
--- a/core/src/main/java/org/apache/calcite/profile/ProfilerImpl.java
+++ b/core/src/main/java/org/apache/calcite/profile/ProfilerImpl.java
@@ -788,5 +788,3 @@ public class ProfilerImpl implements Profiler {
     }
   }
 }
-
-// End ProfilerImpl.java
diff --git a/core/src/main/java/org/apache/calcite/profile/SimpleProfiler.java b/core/src/main/java/org/apache/calcite/profile/SimpleProfiler.java
index f1c7ee4..932d3b6 100644
--- a/core/src/main/java/org/apache/calcite/profile/SimpleProfiler.java
+++ b/core/src/main/java/org/apache/calcite/profile/SimpleProfiler.java
@@ -321,5 +321,3 @@ public class SimpleProfiler implements Profiler {
     }
   }
 }
-
-// End SimpleProfiler.java
diff --git a/core/src/main/java/org/apache/calcite/profile/package-info.java b/core/src/main/java/org/apache/calcite/profile/package-info.java
index 1af9951..6d647fd 100644
--- a/core/src/main/java/org/apache/calcite/profile/package-info.java
+++ b/core/src/main/java/org/apache/calcite/profile/package-info.java
@@ -19,5 +19,3 @@
  * Utilities to analyze data sets.
  */
 package org.apache.calcite.profile;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java b/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java
index 34c54eb..703a782 100644
--- a/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java
+++ b/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java
@@ -464,5 +464,3 @@ public abstract class AbstractRelNode implements RelNode {
     }
   }
 }
-
-// End AbstractRelNode.java
diff --git a/core/src/main/java/org/apache/calcite/rel/BiRel.java b/core/src/main/java/org/apache/calcite/rel/BiRel.java
index 6e3a4f2..baafd46 100644
--- a/core/src/main/java/org/apache/calcite/rel/BiRel.java
+++ b/core/src/main/java/org/apache/calcite/rel/BiRel.java
@@ -80,5 +80,3 @@ public abstract class BiRel extends AbstractRelNode {
         .input("right", right);
   }
 }
-
-// End BiRel.java
diff --git a/core/src/main/java/org/apache/calcite/rel/InvalidRelException.java b/core/src/main/java/org/apache/calcite/rel/InvalidRelException.java
index f929dbb..36bf29b 100644
--- a/core/src/main/java/org/apache/calcite/rel/InvalidRelException.java
+++ b/core/src/main/java/org/apache/calcite/rel/InvalidRelException.java
@@ -53,5 +53,3 @@ public class InvalidRelException extends Exception {
     super(message, cause);
   }
 }
-
-// End InvalidRelException.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelCollation.java b/core/src/main/java/org/apache/calcite/rel/RelCollation.java
index 6ab6702..811d12c 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelCollation.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelCollation.java
@@ -34,5 +34,3 @@ public interface RelCollation extends RelMultipleTrait {
    */
   List<RelFieldCollation> getFieldCollations();
 }
-
-// End RelCollation.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelCollationImpl.java b/core/src/main/java/org/apache/calcite/rel/RelCollationImpl.java
index e27046a..f09ab82 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelCollationImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelCollationImpl.java
@@ -171,5 +171,3 @@ public class RelCollationImpl implements RelCollation {
     return RelCollations.ordinals(collation);
   }
 }
-
-// End RelCollationImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelCollationTraitDef.java b/core/src/main/java/org/apache/calcite/rel/RelCollationTraitDef.java
index 4050fa6..418d5f1 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelCollationTraitDef.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelCollationTraitDef.java
@@ -99,5 +99,3 @@ public class RelCollationTraitDef extends RelTraitDef<RelCollation> {
     return true;
   }
 }
-
-// End RelCollationTraitDef.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelCollations.java b/core/src/main/java/org/apache/calcite/rel/RelCollations.java
index 97bd2f9..f4e5adc 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelCollations.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelCollations.java
@@ -207,5 +207,3 @@ public class RelCollations {
             fc -> fc.withFieldIndex(mapping.getTarget(fc.getFieldIndex()))));
   }
 }
-
-// End RelCollations.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelDistribution.java b/core/src/main/java/org/apache/calcite/rel/RelDistribution.java
index 22b722e..9de68fc 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelDistribution.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelDistribution.java
@@ -90,5 +90,3 @@ public interface RelDistribution extends RelMultipleTrait {
     }
   }
 }
-
-// End RelDistribution.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelDistributionTraitDef.java b/core/src/main/java/org/apache/calcite/rel/RelDistributionTraitDef.java
index fefcc2d..72dd253 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelDistributionTraitDef.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelDistributionTraitDef.java
@@ -71,5 +71,3 @@ public class RelDistributionTraitDef extends RelTraitDef<RelDistribution> {
     return true;
   }
 }
-
-// End RelDistributionTraitDef.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelDistributions.java b/core/src/main/java/org/apache/calcite/rel/RelDistributions.java
index 9da83fe..b5444d1 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelDistributions.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelDistributions.java
@@ -189,5 +189,3 @@ public class RelDistributions {
     }
   }
 }
-
-// End RelDistributions.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelFieldCollation.java b/core/src/main/java/org/apache/calcite/rel/RelFieldCollation.java
index fd897d6..38eccce 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelFieldCollation.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelFieldCollation.java
@@ -295,5 +295,3 @@ public class RelFieldCollation {
     }
   }
 }
-
-// End RelFieldCollation.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelHomogeneousShuttle.java b/core/src/main/java/org/apache/calcite/rel/RelHomogeneousShuttle.java
index cd7b85b..25c33ce 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelHomogeneousShuttle.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelHomogeneousShuttle.java
@@ -92,5 +92,3 @@ public class RelHomogeneousShuttle extends RelShuttleImpl {
     return visit((RelNode) exchange);
   }
 }
-
-// End RelHomogeneousShuttle.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelInput.java b/core/src/main/java/org/apache/calcite/rel/RelInput.java
index a619bae..72015b0 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelInput.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelInput.java
@@ -96,5 +96,3 @@ public interface RelInput {
 
   boolean getBoolean(String tag, boolean default_);
 }
-
-// End RelInput.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelNode.java b/core/src/main/java/org/apache/calcite/rel/RelNode.java
index 02622e9..362e885 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelNode.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelNode.java
@@ -448,5 +448,3 @@ public interface RelNode extends RelOptNode, Cloneable {
     Set<CorrelationId> correlationIds();
   }
 }
-
-// End RelNode.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelNodes.java b/core/src/main/java/org/apache/calcite/rel/RelNodes.java
index 25235f1..a7d98c4 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelNodes.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelNodes.java
@@ -65,5 +65,3 @@ public class RelNodes {
     }
   }
 }
-
-// End RelNodes.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelReferentialConstraint.java b/core/src/main/java/org/apache/calcite/rel/RelReferentialConstraint.java
index 00b8f8f..504f20f 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelReferentialConstraint.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelReferentialConstraint.java
@@ -42,5 +42,3 @@ public interface RelReferentialConstraint {
   List<IntPair> getColumnPairs();
 
 }
-
-// End RelReferentialConstraint.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelReferentialConstraintImpl.java b/core/src/main/java/org/apache/calcite/rel/RelReferentialConstraintImpl.java
index 91dbd32..0a62d12 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelReferentialConstraintImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelReferentialConstraintImpl.java
@@ -64,5 +64,3 @@ public class RelReferentialConstraintImpl implements RelReferentialConstraint {
   }
 
 }
-
-// End RelReferentialConstraintImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelRoot.java b/core/src/main/java/org/apache/calcite/rel/RelRoot.java
index 887a476..5a3b1f9 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelRoot.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelRoot.java
@@ -194,5 +194,3 @@ public class RelRoot {
         && collations.get(0).equals(collation);
   }
 }
-
-// End RelRoot.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelShuttle.java b/core/src/main/java/org/apache/calcite/rel/RelShuttle.java
index 9e25c71..ce21f67 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelShuttle.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelShuttle.java
@@ -65,5 +65,3 @@ public interface RelShuttle {
 
   RelNode visit(RelNode other);
 }
-
-// End RelShuttle.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelShuttleImpl.java b/core/src/main/java/org/apache/calcite/rel/RelShuttleImpl.java
index d822efb..9ede050 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelShuttleImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelShuttleImpl.java
@@ -131,5 +131,3 @@ public class RelShuttleImpl implements RelShuttle {
     return visitChildren(other);
   }
 }
-
-// End RelShuttleImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelVisitor.java b/core/src/main/java/org/apache/calcite/rel/RelVisitor.java
index 1a77690..82704bf 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelVisitor.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelVisitor.java
@@ -62,5 +62,3 @@ public abstract class RelVisitor {
     return root;
   }
 }
-
-// End RelVisitor.java
diff --git a/core/src/main/java/org/apache/calcite/rel/RelWriter.java b/core/src/main/java/org/apache/calcite/rel/RelWriter.java
index 551685c..92f78b6 100644
--- a/core/src/main/java/org/apache/calcite/rel/RelWriter.java
+++ b/core/src/main/java/org/apache/calcite/rel/RelWriter.java
@@ -86,5 +86,3 @@ public interface RelWriter {
     return false;
   }
 }
-
-// End RelWriter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/SingleRel.java b/core/src/main/java/org/apache/calcite/rel/SingleRel.java
index 186db36..a650543 100644
--- a/core/src/main/java/org/apache/calcite/rel/SingleRel.java
+++ b/core/src/main/java/org/apache/calcite/rel/SingleRel.java
@@ -88,5 +88,3 @@ public abstract class SingleRel extends AbstractRelNode {
     return input.getRowType();
   }
 }
-
-// End SingleRel.java
diff --git a/core/src/main/java/org/apache/calcite/rel/convert/Converter.java b/core/src/main/java/org/apache/calcite/rel/convert/Converter.java
index b84c30a..13cc3c0 100644
--- a/core/src/main/java/org/apache/calcite/rel/convert/Converter.java
+++ b/core/src/main/java/org/apache/calcite/rel/convert/Converter.java
@@ -73,5 +73,3 @@ public interface Converter extends RelNode {
    */
   RelNode getInput();
 }
-
-// End Converter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/convert/ConverterImpl.java b/core/src/main/java/org/apache/calcite/rel/convert/ConverterImpl.java
index acadd74..310cf62 100644
--- a/core/src/main/java/org/apache/calcite/rel/convert/ConverterImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/convert/ConverterImpl.java
@@ -80,5 +80,3 @@ public abstract class ConverterImpl extends SingleRel
   }
 
 }
-
-// End ConverterImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/convert/ConverterRule.java b/core/src/main/java/org/apache/calcite/rel/convert/ConverterRule.java
index e6e308c..2da27fd 100644
--- a/core/src/main/java/org/apache/calcite/rel/convert/ConverterRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/convert/ConverterRule.java
@@ -151,5 +151,3 @@ public abstract class ConverterRule extends RelOptRule {
   //~ Inner Classes ----------------------------------------------------------
 
 }
-
-// End ConverterRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/convert/NoneConverter.java b/core/src/main/java/org/apache/calcite/rel/convert/NoneConverter.java
index dc1fa08..8f08a91 100644
--- a/core/src/main/java/org/apache/calcite/rel/convert/NoneConverter.java
+++ b/core/src/main/java/org/apache/calcite/rel/convert/NoneConverter.java
@@ -58,5 +58,3 @@ public class NoneConverter extends ConverterImpl {
     Util.discard(planner);
   }
 }
-
-// End NoneConverter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/convert/TraitMatchingRule.java b/core/src/main/java/org/apache/calcite/rel/convert/TraitMatchingRule.java
index 0fb14c9..c857693 100644
--- a/core/src/main/java/org/apache/calcite/rel/convert/TraitMatchingRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/convert/TraitMatchingRule.java
@@ -75,5 +75,3 @@ public class TraitMatchingRule extends RelOptRule {
     }
   }
 }
-
-// End TraitMatchingRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/convert/package-info.java b/core/src/main/java/org/apache/calcite/rel/convert/package-info.java
index cf1032c..7b2fe7f 100644
--- a/core/src/main/java/org/apache/calcite/rel/convert/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/convert/package-info.java
@@ -20,5 +20,3 @@
  * conventions.
  */
 package org.apache.calcite.rel.convert;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Aggregate.java b/core/src/main/java/org/apache/calcite/rel/core/Aggregate.java
index 79c75ee..3090e47 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Aggregate.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Aggregate.java
@@ -601,5 +601,3 @@ public abstract class Aggregate extends SingleRel {
     }
   }
 }
-
-// End Aggregate.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/AggregateCall.java b/core/src/main/java/org/apache/calcite/rel/core/AggregateCall.java
index e0966f5..ee2c9a4 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/AggregateCall.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/AggregateCall.java
@@ -421,5 +421,3 @@ public class AggregateCall {
         RelCollations.permute(collation, mapping));
   }
 }
-
-// End AggregateCall.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Calc.java b/core/src/main/java/org/apache/calcite/rel/core/Calc.java
index 27cd0df..17da257 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Calc.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Calc.java
@@ -187,5 +187,3 @@ public abstract class Calc extends SingleRel {
     return copy(traitSet, getInput(), newProgram);
   }
 }
-
-// End Calc.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Collect.java b/core/src/main/java/org/apache/calcite/rel/core/Collect.java
index 522672a..d50b4d1 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Collect.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Collect.java
@@ -124,5 +124,3 @@ public class Collect extends SingleRel {
     return typeFactory.createTypeWithNullability(ret, false);
   }
 }
-
-// End Collect.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Correlate.java b/core/src/main/java/org/apache/calcite/rel/core/Correlate.java
index 76f3d11..49f69e8 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Correlate.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Correlate.java
@@ -210,5 +210,3 @@ public abstract class Correlate extends BiRel {
         0, 0).plus(rescanCost);
   }
 }
-
-// End Correlate.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java b/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java
index d5d74c9..0c23729 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/CorrelationId.java
@@ -123,5 +123,3 @@ public class CorrelationId implements Cloneable, Comparable<CorrelationId> {
     return builder.build();
   }
 }
-
-// End CorrelationId.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/EquiJoin.java b/core/src/main/java/org/apache/calcite/rel/core/EquiJoin.java
index 3821c6d..dfb0842 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/EquiJoin.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/EquiJoin.java
@@ -86,5 +86,3 @@ public abstract class EquiJoin extends Join {
     return rightKeys;
   }
 }
-
-// End EquiJoin.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Exchange.java b/core/src/main/java/org/apache/calcite/rel/core/Exchange.java
index ebb17f2..79999bd 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Exchange.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Exchange.java
@@ -103,5 +103,3 @@ public abstract class Exchange extends SingleRel {
         .item("distribution", distribution);
   }
 }
-
-// End Exchange.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Filter.java b/core/src/main/java/org/apache/calcite/rel/core/Filter.java
index c3c023e..dd13485 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Filter.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Filter.java
@@ -153,5 +153,3 @@ public abstract class Filter extends SingleRel {
         .item("condition", condition);
   }
 }
-
-// End Filter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Intersect.java b/core/src/main/java/org/apache/calcite/rel/core/Intersect.java
index 7495a8f..00effaf 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Intersect.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Intersect.java
@@ -61,5 +61,3 @@ public abstract class Intersect extends SetOp {
     return dRows;
   }
 }
-
-// End Intersect.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Join.java b/core/src/main/java/org/apache/calcite/rel/core/Join.java
index 6ffc395..f5d9644 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Join.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Join.java
@@ -352,5 +352,3 @@ public abstract class Join extends BiRel implements Hintable {
     return hints;
   }
 }
-
-// End Join.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/JoinInfo.java b/core/src/main/java/org/apache/calcite/rel/core/JoinInfo.java
index 468cb97..c468e98 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/JoinInfo.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/JoinInfo.java
@@ -108,5 +108,3 @@ public class JoinInfo {
   }
 
 }
-
-// End JoinInfo.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/JoinRelType.java b/core/src/main/java/org/apache/calcite/rel/core/JoinRelType.java
index 1f1e7bb..97c2b89 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/JoinRelType.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/JoinRelType.java
@@ -153,5 +153,3 @@ public enum JoinRelType {
     return this != SEMI && this != ANTI;
   }
 }
-
-// End JoinRelType.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Match.java b/core/src/main/java/org/apache/calcite/rel/core/Match.java
index 38fede5..5003372 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Match.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Match.java
@@ -339,5 +339,3 @@ public abstract class Match extends SingleRel {
     }
   }
 }
-
-// End Match.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Minus.java b/core/src/main/java/org/apache/calcite/rel/core/Minus.java
index 9950d78..f116c92 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Minus.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Minus.java
@@ -53,5 +53,3 @@ public abstract class Minus extends SetOp {
     return RelMdUtil.getMinusRowCount(mq, this);
   }
 }
-
-// End Minus.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Project.java b/core/src/main/java/org/apache/calcite/rel/core/Project.java
index 381bba2..402bcc8 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Project.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Project.java
@@ -406,5 +406,3 @@ public abstract class Project extends SingleRel implements Hintable {
     public static final int NONE = 0;
   }
 }
-
-// End Project.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java b/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
index a02e187..92473bc 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
@@ -655,5 +655,3 @@ public class RelFactories {
     }
   }
 }
-
-// End RelFactories.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/RepeatUnion.java b/core/src/main/java/org/apache/calcite/rel/core/RepeatUnion.java
index 8d76298..9975429 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/RepeatUnion.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/RepeatUnion.java
@@ -110,5 +110,3 @@ public abstract class RepeatUnion extends BiRel {
     return rowType;
   }
 }
-
-// End RepeatUnion.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Sample.java b/core/src/main/java/org/apache/calcite/rel/core/Sample.java
index 9005001..d78f2fd 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Sample.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Sample.java
@@ -86,5 +86,3 @@ public class Sample extends SingleRel {
             params.isRepeatable() ? params.getRepeatableSeed() : "-");
   }
 }
-
-// End Sample.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/SetOp.java b/core/src/main/java/org/apache/calcite/rel/core/SetOp.java
index 6596b61..3883716 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/SetOp.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/SetOp.java
@@ -133,5 +133,3 @@ public abstract class SetOp extends AbstractRelNode {
     return true;
   }
 }
-
-// End SetOp.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Snapshot.java b/core/src/main/java/org/apache/calcite/rel/core/Snapshot.java
index a77bf10..2f78973 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Snapshot.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Snapshot.java
@@ -106,5 +106,3 @@ public abstract class Snapshot extends SingleRel  {
     return litmus.succeed();
   }
 }
-
-// End Snapshot.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Sort.java b/core/src/main/java/org/apache/calcite/rel/core/Sort.java
index d9d49c5..8611240 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Sort.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Sort.java
@@ -197,5 +197,3 @@ public abstract class Sort extends SingleRel {
     return pw;
   }
 }
-
-// End Sort.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/SortExchange.java b/core/src/main/java/org/apache/calcite/rel/core/SortExchange.java
index 1854674..eba52a4 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/SortExchange.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/SortExchange.java
@@ -108,5 +108,3 @@ public abstract class SortExchange extends Exchange {
         .item("collation", collation);
   }
 }
-
-// End SortExchange.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Spool.java b/core/src/main/java/org/apache/calcite/rel/core/Spool.java
index da244bd..4c5a097 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Spool.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Spool.java
@@ -91,5 +91,3 @@ public abstract class Spool extends SingleRel {
         .item("writeType", writeType);
   }
 }
-
-// End Spool.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/TableFunctionScan.java b/core/src/main/java/org/apache/calcite/rel/core/TableFunctionScan.java
index 0951609..5a39071 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/TableFunctionScan.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/TableFunctionScan.java
@@ -218,5 +218,3 @@ public abstract class TableFunctionScan extends AbstractRelNode {
     return elementType;
   }
 }
-
-// End TableFunctionScan.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/TableModify.java b/core/src/main/java/org/apache/calcite/rel/core/TableModify.java
index 1fc56e6..de625c8 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/TableModify.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/TableModify.java
@@ -234,5 +234,3 @@ public abstract class TableModify extends SingleRel {
     return planner.getCostFactory().makeCost(rowCount, 0, 0);
   }
 }
-
-// End TableModify.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/TableScan.java b/core/src/main/java/org/apache/calcite/rel/core/TableScan.java
index b461915..6e0506b 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/TableScan.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/TableScan.java
@@ -183,5 +183,3 @@ public abstract class TableScan
     return hints;
   }
 }
-
-// End TableScan.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/TableSpool.java b/core/src/main/java/org/apache/calcite/rel/core/TableSpool.java
index 22506fb..cb7ec14 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/TableSpool.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/TableSpool.java
@@ -51,5 +51,3 @@ public abstract class TableSpool extends Spool {
     return pw.item("table", table.getQualifiedName());
   }
 }
-
-// End TableSpool.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Uncollect.java b/core/src/main/java/org/apache/calcite/rel/core/Uncollect.java
index 7d49748..c519552 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Uncollect.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Uncollect.java
@@ -157,5 +157,3 @@ public class Uncollect extends SingleRel {
     return builder.build();
   }
 }
-
-// End Uncollect.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Union.java b/core/src/main/java/org/apache/calcite/rel/core/Union.java
index 7bc755a..adf5d3f 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Union.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Union.java
@@ -66,5 +66,3 @@ public abstract class Union extends SetOp {
     return RelMdUtil.getUnionAllRowCount(mq, (Union) rel);
   }
 }
-
-// End Union.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Values.java b/core/src/main/java/org/apache/calcite/rel/core/Values.java
index db04127..8f25815 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Values.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Values.java
@@ -194,5 +194,3 @@ public abstract class Values extends AbstractRelNode {
     return relWriter;
   }
 }
-
-// End Values.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Window.java b/core/src/main/java/org/apache/calcite/rel/core/Window.java
index cd57b3a..3285e67 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Window.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Window.java
@@ -394,5 +394,3 @@ public abstract class Window extends SingleRel {
     }
   }
 }
-
-// End Window.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/package-info.java b/core/src/main/java/org/apache/calcite/rel/core/package-info.java
index 2e547fb..db717ab 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/package-info.java
@@ -32,5 +32,3 @@
  * </ul>
  */
 package org.apache.calcite.rel.core;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/RelEnumTypes.java b/core/src/main/java/org/apache/calcite/rel/externalize/RelEnumTypes.java
index 43f2d21..f793efc 100644
--- a/core/src/main/java/org/apache/calcite/rel/externalize/RelEnumTypes.java
+++ b/core/src/main/java/org/apache/calcite/rel/externalize/RelEnumTypes.java
@@ -102,5 +102,3 @@ public abstract class RelEnumTypes {
     return (E) ENUM_BY_NAME.get(name);
   }
 }
-
-// End RelEnumTypes.java
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/RelJson.java b/core/src/main/java/org/apache/calcite/rel/externalize/RelJson.java
index f095108..4096ca9 100644
--- a/core/src/main/java/org/apache/calcite/rel/externalize/RelJson.java
+++ b/core/src/main/java/org/apache/calcite/rel/externalize/RelJson.java
@@ -671,5 +671,3 @@ public class RelJson {
     return map;
   }
 }
-
-// End RelJson.java
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/RelJsonReader.java b/core/src/main/java/org/apache/calcite/rel/externalize/RelJsonReader.java
index 6ac696c..d310f7f 100644
--- a/core/src/main/java/org/apache/calcite/rel/externalize/RelJsonReader.java
+++ b/core/src/main/java/org/apache/calcite/rel/externalize/RelJsonReader.java
@@ -298,5 +298,3 @@ public class RelJsonReader {
     return node;
   }
 }
-
-// End RelJsonReader.java
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/RelJsonWriter.java b/core/src/main/java/org/apache/calcite/rel/externalize/RelJsonWriter.java
index c2105cb..5b6a346 100644
--- a/core/src/main/java/org/apache/calcite/rel/externalize/RelJsonWriter.java
+++ b/core/src/main/java/org/apache/calcite/rel/externalize/RelJsonWriter.java
@@ -143,5 +143,3 @@ public class RelJsonWriter implements RelWriter {
     return jsonBuilder.toJsonString(map);
   }
 }
-
-// End RelJsonWriter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/RelWriterImpl.java b/core/src/main/java/org/apache/calcite/rel/externalize/RelWriterImpl.java
index 9dade7b..3fd1ebc 100644
--- a/core/src/main/java/org/apache/calcite/rel/externalize/RelWriterImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/externalize/RelWriterImpl.java
@@ -174,5 +174,3 @@ public class RelWriterImpl implements RelWriter {
     return buf.toString();
   }
 }
-
-// End RelWriterImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/RelXmlWriter.java b/core/src/main/java/org/apache/calcite/rel/externalize/RelXmlWriter.java
index 92c96ee..9d2d060 100644
--- a/core/src/main/java/org/apache/calcite/rel/externalize/RelXmlWriter.java
+++ b/core/src/main/java/org/apache/calcite/rel/externalize/RelXmlWriter.java
@@ -157,5 +157,3 @@ public class RelXmlWriter extends RelWriterImpl {
     spacer.subtract(2);
   }
 }
-
-// End RelXmlWriter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java b/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java
index d5897ff..f7f78ea 100644
--- a/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java
@@ -20,5 +20,3 @@
  * XML and JSON format.
  */
 package org.apache.calcite.rel.externalize;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/ExplicitHintMatcher.java b/core/src/main/java/org/apache/calcite/rel/hint/ExplicitHintMatcher.java
index c839a95..3edd833 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/ExplicitHintMatcher.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/ExplicitHintMatcher.java
@@ -39,5 +39,3 @@ import org.apache.calcite.rel.RelNode;
 public interface ExplicitHintMatcher<R extends RelNode> {
   boolean apply(RelHint hint, R node);
 }
-
-// End ExplicitHintMatcher.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/ExplicitHintStrategy.java b/core/src/main/java/org/apache/calcite/rel/hint/ExplicitHintStrategy.java
index b96fdf9..98dca48 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/ExplicitHintStrategy.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/ExplicitHintStrategy.java
@@ -48,5 +48,3 @@ public class ExplicitHintStrategy implements HintStrategy {
     return this.matcher.apply(hint, rel);
   }
 }
-
-// End ExplicitHintStrategy.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/HintStrategies.java b/core/src/main/java/org/apache/calcite/rel/hint/HintStrategies.java
index ba7b44d..9fa99df 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/HintStrategies.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/HintStrategies.java
@@ -58,5 +58,3 @@ public abstract class HintStrategies {
     return new HintStrategyCascade(hintStrategies);
   }
 }
-
-// End HintStrategies.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/HintStrategy.java b/core/src/main/java/org/apache/calcite/rel/hint/HintStrategy.java
index 8e7623b..c19a46c 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/HintStrategy.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/HintStrategy.java
@@ -44,5 +44,3 @@ public interface HintStrategy {
    */
   boolean supportsRel(RelHint hint, RelNode rel);
 }
-
-// End HintStrategy.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/HintStrategyCascade.java b/core/src/main/java/org/apache/calcite/rel/hint/HintStrategyCascade.java
index de7e4a6..bf98418 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/HintStrategyCascade.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/HintStrategyCascade.java
@@ -56,5 +56,3 @@ public class HintStrategyCascade implements HintStrategy {
     return true;
   }
 }
-
-// End HintStrategyCascade.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/HintStrategyTable.java b/core/src/main/java/org/apache/calcite/rel/hint/HintStrategyTable.java
index c6ce9be..29b9888 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/HintStrategyTable.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/HintStrategyTable.java
@@ -146,5 +146,3 @@ public class HintStrategyTable {
     }
   }
 }
-
-// End HintStrategyTable.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/Hintable.java b/core/src/main/java/org/apache/calcite/rel/hint/Hintable.java
index 20e1864..7956488 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/Hintable.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/Hintable.java
@@ -86,5 +86,3 @@ public interface Hintable {
     return new ArrayList<>(hints);
   }
 }
-
-// End Hintable.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/NodeTypeHintStrategy.java b/core/src/main/java/org/apache/calcite/rel/hint/NodeTypeHintStrategy.java
index 633b236..87ab8a2 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/NodeTypeHintStrategy.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/NodeTypeHintStrategy.java
@@ -77,5 +77,3 @@ public class NodeTypeHintStrategy implements HintStrategy {
     }
   }
 }
-
-// End NodeTypeHintStrategy.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/RelHint.java b/core/src/main/java/org/apache/calcite/rel/hint/RelHint.java
index 679009b..2b617ca 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/RelHint.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/RelHint.java
@@ -175,5 +175,3 @@ public class RelHint {
     return builder.toString();
   }
 }
-
-// End RelHint.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/package-info.java b/core/src/main/java/org/apache/calcite/rel/hint/package-info.java
index 968c7cb..b6ce3a6 100644
--- a/core/src/main/java/org/apache/calcite/rel/hint/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/hint/package-info.java
@@ -90,5 +90,3 @@
  * <a href="https://docs.google.com/document/d/1mykz-w2t1Yw7CH6NjUWpWqCAf_6YNKxSc59gXafrNCs/edit?usp=sharing">Calcite SQL and Planner Hints Design</a>.
  */
 package org.apache.calcite.rel.hint;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalAggregate.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalAggregate.java
index 8b10baf..7b4dc86 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalAggregate.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalAggregate.java
@@ -130,5 +130,3 @@ public final class LogicalAggregate extends Aggregate {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalAggregate.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalCalc.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalCalc.java
index 71257dc..c1281a9 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalCalc.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalCalc.java
@@ -125,5 +125,3 @@ public final class LogicalCalc extends Calc {
     variableSet.addAll(vuv.variables);
   }
 }
-
-// End LogicalCalc.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalCorrelate.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalCorrelate.java
index 1d67d6d..031de64 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalCorrelate.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalCorrelate.java
@@ -109,5 +109,3 @@ public final class LogicalCorrelate extends Correlate {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalCorrelate.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalExchange.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalExchange.java
index 4abcd69..8c8f12a 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalExchange.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalExchange.java
@@ -71,5 +71,3 @@ public final class LogicalExchange extends Exchange {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalExchange.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalFilter.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalFilter.java
index fd98d66..8995241 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalFilter.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalFilter.java
@@ -136,5 +136,3 @@ public final class LogicalFilter extends Filter {
         .itemIf("variablesSet", variablesSet, !variablesSet.isEmpty());
   }
 }
-
-// End LogicalFilter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalIntersect.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalIntersect.java
index 2c7f07f..99ecf65 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalIntersect.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalIntersect.java
@@ -76,5 +76,3 @@ public final class LogicalIntersect extends Intersect {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalIntersect.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalJoin.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalJoin.java
index 6f6f7c7..d570eae 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalJoin.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalJoin.java
@@ -219,5 +219,3 @@ public final class LogicalJoin extends Join {
         left, right, condition, variablesSet, joinType, semiJoinDone, systemFieldList);
   }
 }
-
-// End LogicalJoin.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalMatch.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalMatch.java
index ed91ebd..8f370da 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalMatch.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalMatch.java
@@ -112,5 +112,3 @@ public class LogicalMatch extends Match {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalMatch.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalMinus.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalMinus.java
index b8e8057..357c403 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalMinus.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalMinus.java
@@ -76,5 +76,3 @@ public final class LogicalMinus extends Minus {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalMinus.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalProject.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalProject.java
index d7d129e..37f10e8 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalProject.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalProject.java
@@ -146,5 +146,3 @@ public final class LogicalProject extends Project {
         input, getProjects(), rowType);
   }
 }
-
-// End LogicalProject.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalRepeatUnion.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalRepeatUnion.java
index 0a74382..5084176 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalRepeatUnion.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalRepeatUnion.java
@@ -65,5 +65,3 @@ public class LogicalRepeatUnion extends RepeatUnion {
         inputs.get(0), inputs.get(1), all, iterationLimit);
   }
 }
-
-// End LogicalRepeatUnion.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalSnapshot.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalSnapshot.java
index 7cb398c..47e9967 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalSnapshot.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalSnapshot.java
@@ -70,5 +70,3 @@ public class LogicalSnapshot extends Snapshot {
     return new LogicalSnapshot(cluster, traitSet, input, period);
   }
 }
-
-// End LogicalSnapshot.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalSort.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalSort.java
index 2d61cc4..a53a460 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalSort.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalSort.java
@@ -75,5 +75,3 @@ public final class LogicalSort extends Sort {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalSort.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalSortExchange.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalSortExchange.java
index 73a066a..d1e6b5b 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalSortExchange.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalSortExchange.java
@@ -64,5 +64,3 @@ public class LogicalSortExchange extends SortExchange {
         newDistribution, newCollation);
   }
 }
-
-// End LogicalSortExchange.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableFunctionScan.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableFunctionScan.java
index 2852652..fbd1869 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableFunctionScan.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableFunctionScan.java
@@ -119,5 +119,3 @@ public class LogicalTableFunctionScan extends TableFunctionScan {
     return planner.getCostFactory().makeHugeCost();
   }
 }
-
-// End LogicalTableFunctionScan.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableModify.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableModify.java
index 3c4d274..122c5f1 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableModify.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableModify.java
@@ -83,5 +83,3 @@ public final class LogicalTableModify extends TableModify {
         getSourceExpressionList(), isFlattened());
   }
 }
-
-// End LogicalTableModify.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableScan.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableScan.java
index 958f171..9104071 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableScan.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableScan.java
@@ -133,5 +133,3 @@ public final class LogicalTableScan extends TableScan {
     return new LogicalTableScan(getCluster(), traitSet, mergeHints(hintList), table);
   }
 }
-
-// End LogicalTableScan.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableSpool.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableSpool.java
index c7dc798..4aab172 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableSpool.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableSpool.java
@@ -65,5 +65,3 @@ public class LogicalTableSpool extends TableSpool {
         readType, writeType, table);
   }
 }
-
-// End LogicalTableSpool.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalUnion.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalUnion.java
index ab7f3bf..535ca81 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalUnion.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalUnion.java
@@ -77,5 +77,3 @@ public final class LogicalUnion extends Union {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalUnion.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalValues.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalValues.java
index 5fc9548..edbea5d 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalValues.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalValues.java
@@ -118,5 +118,3 @@ public class LogicalValues extends Values {
     return shuttle.visit(this);
   }
 }
-
-// End LogicalValues.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java b/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java
index 7f0db03..cc7d5ad 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalWindow.java
@@ -368,5 +368,3 @@ public final class LogicalWindow extends Window {
     windowMap.put(windowKey, over);
   }
 }
-
-// End LogicalWindow.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/ToLogicalConverter.java b/core/src/main/java/org/apache/calcite/rel/logical/ToLogicalConverter.java
index 3be76f0..d4f491c 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/ToLogicalConverter.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/ToLogicalConverter.java
@@ -178,5 +178,3 @@ public class ToLogicalConverter extends RelShuttleImpl {
         + relNode.getClass().getName());
   }
 }
-
-// End ToLogicalConverter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/package-info.java b/core/src/main/java/org/apache/calcite/rel/logical/package-info.java
index 3317ac1..26797ec 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/package-info.java
@@ -32,5 +32,3 @@
  * </ul>
  */
 package org.apache.calcite.rel.logical;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/BuiltInMetadata.java b/core/src/main/java/org/apache/calcite/rel/metadata/BuiltInMetadata.java
index 6d09cc7..dd698da 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/BuiltInMetadata.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/BuiltInMetadata.java
@@ -673,5 +673,3 @@ public abstract class BuiltInMetadata {
       ExpressionLineage, TableReferences, NodeTypes {
   }
 }
-
-// End BuiltInMetadata.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java
index fd44e47..03f80e1 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java
@@ -143,5 +143,3 @@ public class CachingRelMetadataProvider implements RelMetadataProvider {
     }
   }
 }
-
-// End CachingRelMetadataProvider.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java
index af01813..e727650 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java
@@ -145,5 +145,3 @@ public class ChainedRelMetadataProvider implements RelMetadataProvider {
     }
   }
 }
-
-// End ChainedRelMetadataProvider.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/CyclicMetadataException.java b/core/src/main/java/org/apache/calcite/rel/metadata/CyclicMetadataException.java
index 27f3e06..7746dd5 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/CyclicMetadataException.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/CyclicMetadataException.java
@@ -27,5 +27,3 @@ public class CyclicMetadataException extends RuntimeException {
     super();
   }
 }
-
-// End CyclicMetadataException.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/DefaultRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/DefaultRelMetadataProvider.java
index 74ef413..4631092 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/DefaultRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/DefaultRelMetadataProvider.java
@@ -64,5 +64,3 @@ public class DefaultRelMetadataProvider extends ChainedRelMetadataProvider {
             RelMdCollation.SOURCE));
   }
 }
-
-// End DefaultRelMetadataProvider.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
index 835c842..e5e6392 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
@@ -548,5 +548,3 @@ public class JaninoRelMetadataProvider implements RelMetadataProvider {
     }
   }
 }
-
-// End JaninoRelMetadataProvider.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/Metadata.java b/core/src/main/java/org/apache/calcite/rel/metadata/Metadata.java
index d5d642d..af4767e 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/Metadata.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/Metadata.java
@@ -43,5 +43,3 @@ public interface Metadata {
   /** Returns the relational expression that this metadata is about. */
   RelNode rel();
 }
-
-// End Metadata.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/MetadataDef.java b/core/src/main/java/org/apache/calcite/rel/metadata/MetadataDef.java
index e7924e7..025a19d 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/MetadataDef.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/MetadataDef.java
@@ -63,5 +63,3 @@ public class MetadataDef<M extends Metadata> {
     return new MetadataDef<>(metadataClass, handlerClass, methods);
   }
 }
-
-// End MetadataDef.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/MetadataFactory.java b/core/src/main/java/org/apache/calcite/rel/metadata/MetadataFactory.java
index 28ca883..24b3e4f 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/MetadataFactory.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/MetadataFactory.java
@@ -43,5 +43,3 @@ public interface MetadataFactory {
   <M extends Metadata> M query(RelNode rel, RelMetadataQuery mq,
       Class<M> metadataClazz);
 }
-
-// End MetadataFactory.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/MetadataFactoryImpl.java b/core/src/main/java/org/apache/calcite/rel/metadata/MetadataFactoryImpl.java
index 781c697..7cef923 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/MetadataFactoryImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/MetadataFactoryImpl.java
@@ -69,5 +69,3 @@ public class MetadataFactoryImpl implements MetadataFactory {
     }
   }
 }
-
-// End MetadataFactoryImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/MetadataHandler.java b/core/src/main/java/org/apache/calcite/rel/metadata/MetadataHandler.java
index 95f8d62..d032fa2 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/MetadataHandler.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/MetadataHandler.java
@@ -24,5 +24,3 @@ package org.apache.calcite.rel.metadata;
 public interface MetadataHandler<M extends Metadata> {
   MetadataDef<M> getDef();
 }
-
-// End MetadataHandler.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/NullSentinel.java b/core/src/main/java/org/apache/calcite/rel/metadata/NullSentinel.java
index 2f023ec..a494f1a 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/NullSentinel.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/NullSentinel.java
@@ -43,5 +43,3 @@ public enum NullSentinel {
     return value;
   }
 }
-
-// End NullSentinel.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java
index 2990a48..6d3dea2 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java
@@ -354,5 +354,3 @@ public class ReflectiveRelMetadataProvider
     }
   }
 }
-
-// End ReflectiveRelMetadataProvider.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnMapping.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnMapping.java
index 4511f74..80fad0f 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnMapping.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnMapping.java
@@ -51,5 +51,3 @@ public class RelColumnMapping {
    */
   public final boolean derived;
 }
-
-// End RelColumnMapping.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java
index 92cd7fe..4416df7 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java
@@ -91,5 +91,3 @@ public class RelColumnOrigin {
         + iOriginColumn + (isDerived ? 313 : 0);
   }
 }
-
-// End RelColumnOrigin.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdAllPredicates.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdAllPredicates.java
index fa06ad3..f034057 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdAllPredicates.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdAllPredicates.java
@@ -325,5 +325,3 @@ public class RelMdAllPredicates
   }
 
 }
-
-// End RelMdAllPredicates.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
index 34cd90e..aa452fa 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
@@ -513,5 +513,3 @@ public class RelMdCollation
     return ImmutableList.of();
   }
 }
-
-// End RelMdCollation.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java
index 8b034ae..2dc7d83 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java
@@ -254,5 +254,3 @@ public class RelMdColumnOrigins
     return set;
   }
 }
-
-// End RelMdColumnOrigins.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java
index 5235065..e982580 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java
@@ -458,5 +458,3 @@ public class RelMdColumnUniqueness
     return checkingColumns;
   }
 }
-
-// End RelMdColumnUniqueness.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdDistinctRowCount.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdDistinctRowCount.java
index 7293b49..6a6b8e5 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdDistinctRowCount.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdDistinctRowCount.java
@@ -284,5 +284,3 @@ public class RelMdDistinctRowCount
     return d;
   }
 }
-
-// End RelMdDistinctRowCount.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdDistribution.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdDistribution.java
index 2403935..adbab6b 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdDistribution.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdDistribution.java
@@ -180,5 +180,3 @@ public class RelMdDistribution
     return distribution;
   }
 }
-
-// End RelMdDistribution.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdExplainVisibility.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdExplainVisibility.java
index 473b30a..474f29f 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdExplainVisibility.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdExplainVisibility.java
@@ -53,5 +53,3 @@ public class RelMdExplainVisibility
     return null;
   }
 }
-
-// End RelMdExplainVisibility.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdExpressionLineage.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdExpressionLineage.java
index f23c4cf..fea2fa7 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdExpressionLineage.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdExpressionLineage.java
@@ -496,5 +496,3 @@ public class RelMdExpressionLineage
     return inputFinder.inputBitSet.build();
   }
 }
-
-// End RelMdExpressionLineage.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMaxRowCount.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMaxRowCount.java
index 23681cd..ab66bf2 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMaxRowCount.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMaxRowCount.java
@@ -217,5 +217,3 @@ public class RelMdMaxRowCount
     return null;
   }
 }
-
-// End RelMdMaxRowCount.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMemory.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMemory.java
index 359af35..80864f8 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMemory.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMemory.java
@@ -100,5 +100,3 @@ public class RelMdMemory implements MetadataHandler<BuiltInMetadata.Memory> {
     return memoryWithinPhase / splitCount;
   }
 }
-
-// End RelMdMemory.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMinRowCount.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMinRowCount.java
index d0554ba..1a9b25a 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMinRowCount.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdMinRowCount.java
@@ -167,5 +167,3 @@ public class RelMdMinRowCount
     return null;
   }
 }
-
-// End RelMdMinRowCount.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdNodeTypes.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdNodeTypes.java
index 83023e0..5259b3f 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdNodeTypes.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdNodeTypes.java
@@ -180,5 +180,3 @@ public class RelMdNodeTypes
   }
 
 }
-
-// End RelMdNodeTypes.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdParallelism.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdParallelism.java
index 4d144aa..c444386 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdParallelism.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdParallelism.java
@@ -81,5 +81,3 @@ public class RelMdParallelism
     return 1;
   }
 }
-
-// End RelMdParallelism.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPercentageOriginalRows.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPercentageOriginalRows.java
index f74742d..a68082c 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPercentageOriginalRows.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPercentageOriginalRows.java
@@ -190,5 +190,3 @@ public class RelMdPercentageOriginalRows
     }
   }
 }
-
-// End RelMdPercentageOriginalRows.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPopulationSize.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPopulationSize.java
index 38990f3..093958d 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPopulationSize.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPopulationSize.java
@@ -159,5 +159,3 @@ public class RelMdPopulationSize
     return null;
   }
 }
-
-// End RelMdPopulationSize.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
index 58c53c6..2aa3091 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
@@ -911,5 +911,3 @@ public class RelMdPredicates
     }
   }
 }
-
-// End RelMdPredicates.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdRowCount.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdRowCount.java
index 20abaca..ec7f497 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdRowCount.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdRowCount.java
@@ -223,5 +223,3 @@ public class RelMdRowCount
     return mq.getRowCount(rel.getInput());
   }
 }
-
-// End RelMdRowCount.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdSelectivity.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdSelectivity.java
index 9bf3fd0..d98b2cd 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdSelectivity.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdSelectivity.java
@@ -196,5 +196,3 @@ public class RelMdSelectivity
     return RelMdUtil.guessSelectivity(predicate);
   }
 }
-
-// End RelMdSelectivity.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdSize.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdSize.java
index c453495..fe2e663 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdSize.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdSize.java
@@ -396,5 +396,3 @@ public class RelMdSize implements MetadataHandler<BuiltInMetadata.Size> {
     }
   }
 }
-
-// End RelMdSize.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdTableReferences.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdTableReferences.java
index 1ac81e8..36bd889 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdTableReferences.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdTableReferences.java
@@ -236,5 +236,3 @@ public class RelMdTableReferences
   }
 
 }
-
-// End RelMdTableReferences.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUniqueKeys.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUniqueKeys.java
index a116257..1d18f70 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUniqueKeys.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUniqueKeys.java
@@ -243,5 +243,3 @@ public class RelMdUniqueKeys
     return null;
   }
 }
-
-// End RelMdUniqueKeys.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java
index 9bc0e62..e7f9484 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java
@@ -949,5 +949,3 @@ public class RelMdUtil {
   }
 
 }
-
-// End RelMdUtil.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java
index 3eb9d9d..c6a64cc 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java
@@ -68,5 +68,3 @@ public interface RelMetadataProvider {
   <M extends Metadata> Multimap<Method, MetadataHandler<M>> handlers(
       MetadataDef<M> def);
 }
-
-// End RelMetadataProvider.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java
index 22803c3..aadc8e5 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java
@@ -844,5 +844,3 @@ public class RelMetadataQuery extends RelMetadataQueryBase {
     }
   }
 }
-
-// End RelMetadataQuery.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQueryBase.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQueryBase.java
index 3fbd935..6bceb26 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQueryBase.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQueryBase.java
@@ -103,5 +103,3 @@ public class RelMetadataQueryBase {
     map.row(rel).clear();
   }
 }
-
-// End RelMetadataQueryBase.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/UnboundMetadata.java b/core/src/main/java/org/apache/calcite/rel/metadata/UnboundMetadata.java
index 85a6c76..0686ca8 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/UnboundMetadata.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/UnboundMetadata.java
@@ -28,5 +28,3 @@ import org.apache.calcite.rel.RelNode;
 public interface UnboundMetadata<M extends Metadata> {
   M bind(RelNode rel, RelMetadataQuery mq);
 }
-
-// End UnboundMetadata.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java b/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java
index ed98035..d61c782 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java
@@ -20,5 +20,3 @@
  * expressions.
  */
 package org.apache.calcite.rel.metadata;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/Holder.java b/core/src/main/java/org/apache/calcite/rel/mutable/Holder.java
index b4da54f..95493f1 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/Holder.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/Holder.java
@@ -42,5 +42,3 @@ public class Holder extends MutableSingleRel {
     return Holder.of(input.clone());
   }
 }
-
-// End Holder.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableAggregate.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableAggregate.java
index 886714e..5c5a8b7 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableAggregate.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableAggregate.java
@@ -92,5 +92,3 @@ public class MutableAggregate extends MutableSingleRel {
     return MutableAggregate.of(input.clone(), groupSet, groupSets, aggCalls);
   }
 }
-
-// End MutableAggregate.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableBiRel.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableBiRel.java
index 2c082ac..46d1f2d 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableBiRel.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableBiRel.java
@@ -73,5 +73,3 @@ abstract class MutableBiRel extends MutableRel {
     visitor.visit(right);
   }
 }
-
-// End MutableBiRel.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableCalc.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableCalc.java
index 3aca910..79c2b81 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableCalc.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableCalc.java
@@ -60,5 +60,3 @@ public class MutableCalc extends MutableSingleRel {
     return MutableCalc.of(input.clone(), program);
   }
 }
-
-// End MutableCalc.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableCollect.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableCollect.java
index 4e413f5..3123c25 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableCollect.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableCollect.java
@@ -61,5 +61,3 @@ public class MutableCollect extends MutableSingleRel {
     return MutableCollect.of(rowType, input.clone(), fieldName);
   }
 }
-
-// End MutableCollect.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableCorrelate.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableCorrelate.java
index f635461..80302fa 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableCorrelate.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableCorrelate.java
@@ -87,5 +87,3 @@ public class MutableCorrelate extends MutableBiRel {
         right.clone(), correlationId, requiredColumns, joinType);
   }
 }
-
-// End MutableCorrelate.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableExchange.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableExchange.java
index 2c3c28d..b9f4825 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableExchange.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableExchange.java
@@ -58,5 +58,3 @@ public class MutableExchange extends MutableSingleRel {
     return MutableExchange.of(input.clone(), distribution);
   }
 }
-
-// End MutableExchange.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableFilter.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableFilter.java
index ef9f8d7..009674a 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableFilter.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableFilter.java
@@ -59,5 +59,3 @@ public class MutableFilter extends MutableSingleRel {
     return MutableFilter.of(input.clone(), condition);
   }
 }
-
-// End MutableFilter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableIntersect.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableIntersect.java
index 5829f80..e281627 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableIntersect.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableIntersect.java
@@ -51,5 +51,3 @@ public class MutableIntersect extends MutableSetOp {
     return MutableIntersect.of(rowType, cloneChildren(), all);
   }
 }
-
-// End MutableIntersect.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableJoin.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableJoin.java
index 0a49c8c..ab87de8 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableJoin.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableJoin.java
@@ -88,5 +88,3 @@ public class MutableJoin extends MutableBiRel {
         right.clone(), condition, joinType, variablesSet);
   }
 }
-
-// End MutableJoin.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableLeafRel.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableLeafRel.java
index 6ea92e2..f34f58f 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableLeafRel.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableLeafRel.java
@@ -44,5 +44,3 @@ abstract class MutableLeafRel extends MutableRel {
     // no children - nothing to do
   }
 }
-
-// End MutableLeafRel.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableMatch.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableMatch.java
index 57ba8d1..8fffb14 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableMatch.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableMatch.java
@@ -118,5 +118,3 @@ public class MutableMatch extends MutableSingleRel {
         partitionKeys, orderKeys, interval);
   }
 }
-
-// End MutableMatch.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableMinus.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableMinus.java
index 42b3968..a5d1ae1 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableMinus.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableMinus.java
@@ -51,5 +51,3 @@ public class MutableMinus extends MutableSetOp {
     return MutableMinus.of(rowType, cloneChildren(), all);
   }
 }
-
-// End MutableMinus.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableMultiRel.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableMultiRel.java
index ad660f0..277c3ef 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableMultiRel.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableMultiRel.java
@@ -61,5 +61,3 @@ abstract class MutableMultiRel extends MutableRel {
     return Lists.transform(inputs, MutableRel::clone);
   }
 }
-
-// End MutableMultiRel.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableProject.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableProject.java
index 4ff921b..b781f1c 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableProject.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableProject.java
@@ -96,5 +96,3 @@ public class MutableProject extends MutableSingleRel {
     return MutableProject.of(rowType, input.clone(), projects);
   }
 }
-
-// End MutableProject.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableRel.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableRel.java
index fb0d72b..06fcf2f 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableRel.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableRel.java
@@ -144,5 +144,3 @@ public abstract class MutableRel {
   }
 
 }
-
-// End MutableRel.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableRelType.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableRelType.java
index a760402..6f1dc8f 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableRelType.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableRelType.java
@@ -40,5 +40,3 @@ enum MutableRelType {
   WINDOW,
   HOLDER
 }
-
-// End MutableRelType.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableRelVisitor.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableRelVisitor.java
index aea7c5c..85532a0 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableRelVisitor.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableRelVisitor.java
@@ -30,5 +30,3 @@ public class MutableRelVisitor {
     return root;
   }
 }
-
-// End MutableRelVisitor.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableRels.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableRels.java
index f10fade..70a5fb9 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableRels.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableRels.java
@@ -432,5 +432,3 @@ public abstract class MutableRels {
         .collect(Collectors.toList());
   }
 }
-
-// End MutableRels.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableSample.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableSample.java
index 9b9da35..84bdf7f 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableSample.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableSample.java
@@ -65,5 +65,3 @@ public class MutableSample extends MutableSingleRel {
     return MutableSample.of(input.clone(), params);
   }
 }
-
-// End MutableSample.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableScan.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableScan.java
index 4d63519..3e73301 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableScan.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableScan.java
@@ -52,5 +52,3 @@ public class MutableScan extends MutableLeafRel {
     return MutableScan.of((TableScan) rel);
   }
 }
-
-// End MutableScan.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableSetOp.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableSetOp.java
index ad241f8..bba4f2d 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableSetOp.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableSetOp.java
@@ -48,5 +48,3 @@ abstract class MutableSetOp extends MutableMultiRel {
     return Objects.hash(type, inputs, all);
   }
 }
-
-// End MutableSetOp.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableSingleRel.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableSingleRel.java
index e310ac9..133061a 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableSingleRel.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableSingleRel.java
@@ -57,5 +57,3 @@ abstract class MutableSingleRel extends MutableRel {
     return input;
   }
 }
-
-// End MutableSingleRel.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableSort.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableSort.java
index 36268c7..2aa5c17 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableSort.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableSort.java
@@ -77,5 +77,3 @@ public class MutableSort extends MutableSingleRel {
     return MutableSort.of(input.clone(), collation, offset, fetch);
   }
 }
-
-// End MutableSort.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableTableFunctionScan.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableTableFunctionScan.java
index c5dc296..3e67160 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableTableFunctionScan.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableTableFunctionScan.java
@@ -92,5 +92,3 @@ public class MutableTableFunctionScan extends MutableMultiRel {
   }
 
 }
-
-// End MutableTableFunctionScan.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableTableModify.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableTableModify.java
index ba188f8..1103cad 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableTableModify.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableTableModify.java
@@ -109,5 +109,3 @@ public class MutableTableModify extends MutableSingleRel {
   }
 
 }
-
-// End MutableTableModify.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableUncollect.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableUncollect.java
index eb3afcc..49d65ef 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableUncollect.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableUncollect.java
@@ -63,5 +63,3 @@ public class MutableUncollect extends MutableSingleRel {
     return MutableUncollect.of(rowType, input.clone(), withOrdinality);
   }
 }
-
-// End MutableUncollect.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableUnion.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableUnion.java
index a60dd68..cc379e6 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableUnion.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableUnion.java
@@ -51,5 +51,3 @@ public class MutableUnion extends MutableSetOp {
     return MutableUnion.of(rowType, cloneChildren(), all);
   }
 }
-
-// End MutableUnion.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableValues.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableValues.java
index 299db16..53e0223 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableValues.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableValues.java
@@ -52,5 +52,3 @@ public class MutableValues extends MutableLeafRel {
     return MutableValues.of((Values) rel);
   }
 }
-
-// End MutableValues.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/MutableWindow.java b/core/src/main/java/org/apache/calcite/rel/mutable/MutableWindow.java
index ee82875..b098b57 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/MutableWindow.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/MutableWindow.java
@@ -69,5 +69,3 @@ public class MutableWindow extends MutableSingleRel {
     return MutableWindow.of(rowType, input.clone(), groups, constants);
   }
 }
-
-// End MutableWindow.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java b/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java
index bad84ec..1d62994 100644
--- a/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java
@@ -32,5 +32,3 @@
  * </ul>
  */
 package org.apache.calcite.rel.mutable;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/package-info.java b/core/src/main/java/org/apache/calcite/rel/package-info.java
index fdbfd3b..9f0d27f 100644
--- a/core/src/main/java/org/apache/calcite/rel/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/package-info.java
@@ -36,5 +36,3 @@
  * </ul>
  */
 package org.apache.calcite.rel;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
index 017b5fc..34d5b68 100644
--- a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
+++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
@@ -910,5 +910,3 @@ public class RelToSqlConverter extends SqlImplementor
     }
   }
 }
-
-// End RelToSqlConverter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java
index d2c1800..7b49def 100644
--- a/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java
+++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java
@@ -1468,5 +1468,3 @@ public abstract class SqlImplementor {
     FROM, WHERE, GROUP_BY, HAVING, SELECT, SET_OP, ORDER_BY, FETCH, OFFSET
   }
 }
-
-// End SqlImplementor.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java
index 23a214a..573f407 100644
--- a/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java
@@ -19,5 +19,3 @@
  * Translates a relational expression to SQL parse tree.
  */
 package org.apache.calcite.rel.rel2sql;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AbstractJoinExtractFilterRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AbstractJoinExtractFilterRule.java
index 106aa28..401bd62 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AbstractJoinExtractFilterRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AbstractJoinExtractFilterRule.java
@@ -81,5 +81,3 @@ public abstract class AbstractJoinExtractFilterRule extends RelOptRule {
     call.transformTo(builder.build());
   }
 }
-
-// End AbstractJoinExtractFilterRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java
index d8c7af4..00f2fbf 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java
@@ -2626,5 +2626,3 @@ public abstract class AbstractMaterializedViewRule extends RelOptRule {
   }
 
 }
-
-// End AbstractMaterializedViewRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateCaseToFilterRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateCaseToFilterRule.java
index 77966ec..2c64943 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateCaseToFilterRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateCaseToFilterRule.java
@@ -264,5 +264,3 @@ public class AggregateCaseToFilterRule extends RelOptRule {
         && SqlTypeName.INT_TYPES.contains(rexNode.getType().getSqlTypeName());
   }
 }
-
-// End AggregateCaseToFilterRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java
index 0cdd0dd..e7aeb62 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java
@@ -869,5 +869,3 @@ public final class AggregateExpandDistinctAggregatesRule extends RelOptRule {
     return relBuilder;
   }
 }
-
-// End AggregateExpandDistinctAggregatesRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java
index bd5a348..7303ba0 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java
@@ -130,5 +130,3 @@ public class AggregateExtractProjectRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End AggregateExtractProjectRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateFilterTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateFilterTransposeRule.java
index 52d994f..79d9f07 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateFilterTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateFilterTransposeRule.java
@@ -155,5 +155,3 @@ public class AggregateFilterTransposeRule extends RelOptRule {
     }
   }
 }
-
-// End AggregateFilterTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinJoinRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinJoinRemoveRule.java
index 6caaa1a..bf5344f 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinJoinRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinJoinRemoveRule.java
@@ -154,5 +154,3 @@ public class AggregateJoinJoinRemoveRule extends RelOptRule {
     call.transformTo(newAggregate);
   }
 }
-
-// End AggregateJoinJoinRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinRemoveRule.java
index c3e5e23..dc7d467 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinRemoveRule.java
@@ -122,5 +122,3 @@ public class AggregateJoinRemoveRule extends RelOptRule {
     call.transformTo(node);
   }
 }
-
-// End AggregateJoinRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java
index 622ada3..26ba061 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java
@@ -448,5 +448,3 @@ public class AggregateJoinTransposeRule extends RelOptRule {
     boolean aggregate;
   }
 }
-
-// End AggregateJoinTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateMergeRule.java
index 57c5e98..e1501bd 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateMergeRule.java
@@ -147,5 +147,3 @@ public class AggregateMergeRule extends RelOptRule {
     call.transformTo(finalAgg);
   }
 }
-
-// End AggregateMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectMergeRule.java
index 3b4dd3f..fa8b46a 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectMergeRule.java
@@ -134,5 +134,3 @@ public class AggregateProjectMergeRule extends RelOptRule {
     return relBuilder.build();
   }
 }
-
-// End AggregateProjectMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectPullUpConstantsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectPullUpConstantsRule.java
index 68f2061..decee3a 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectPullUpConstantsRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateProjectPullUpConstantsRule.java
@@ -189,5 +189,3 @@ public class AggregateProjectPullUpConstantsRule extends RelOptRule {
   }
 
 }
-
-// End AggregateProjectPullUpConstantsRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateReduceFunctionsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateReduceFunctionsRule.java
index 80e7ae7..201bc45 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateReduceFunctionsRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateReduceFunctionsRule.java
@@ -858,5 +858,3 @@ public class AggregateReduceFunctionsRule extends RelOptRule {
     return inputField.getType();
   }
 }
-
-// End AggregateReduceFunctionsRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateRemoveRule.java
index 2ea110f..b8bc35d 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateRemoveRule.java
@@ -126,5 +126,3 @@ public class AggregateRemoveRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End AggregateRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateStarTableRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateStarTableRule.java
index 21351f7..da5998a 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateStarTableRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateStarTableRule.java
@@ -272,5 +272,3 @@ public class AggregateStarTableRule extends RelOptRule {
     return -1;
   }
 }
-
-// End AggregateStarTableRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionAggregateRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionAggregateRule.java
index 349c578..e9d8393 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionAggregateRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionAggregateRule.java
@@ -152,5 +152,3 @@ public class AggregateUnionAggregateRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End AggregateUnionAggregateRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java
index 901b640..3750892 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java
@@ -182,5 +182,3 @@ public class AggregateUnionTransposeRule extends RelOptRule {
     return newCalls;
   }
 }
-
-// End AggregateUnionTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
index 67e474a..cf5115c 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
@@ -106,5 +106,3 @@ public class AggregateValuesRule extends RelOptRule {
     call.getPlanner().setImportance(aggregate, 0.0);
   }
 }
-
-// End AggregateValuesRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java
index 9ed05f3..8d36b43 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java
@@ -95,5 +95,3 @@ public class CalcMergeRule extends RelOptRule {
     call.transformTo(newCalc);
   }
 }
-
-// End CalcMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java b/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java
index 51826bf..6d0b840 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java
@@ -988,5 +988,3 @@ public abstract class CalcRelSplitter {
     }
   }
 }
-
-// End CalcRelSplitter.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CalcRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/CalcRemoveRule.java
index 0a8869c..d869732 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/CalcRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/CalcRemoveRule.java
@@ -67,5 +67,3 @@ public class CalcRemoveRule extends RelOptRule {
             calc.getTraitSet()));
   }
 }
-
-// End CalcRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CalcSplitRule.java b/core/src/main/java/org/apache/calcite/rel/rules/CalcSplitRule.java
index 01b7c91..e9b63f8 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/CalcSplitRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/CalcSplitRule.java
@@ -62,5 +62,3 @@ public class CalcSplitRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End CalcSplitRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CoerceInputsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/CoerceInputsRule.java
index c6e839f..4209f84 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/CoerceInputsRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/CoerceInputsRule.java
@@ -109,5 +109,3 @@ public class CoerceInputsRule extends RelOptRule {
     call.transformTo(newConsumerRel);
   }
 }
-
-// End CoerceInputsRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/DateRangeRules.java b/core/src/main/java/org/apache/calcite/rel/rules/DateRangeRules.java
index 8d2337f..9bd4d47 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/DateRangeRules.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/DateRangeRules.java
@@ -703,5 +703,3 @@ public abstract class DateRangeRules {
     }
   }
 }
-
-// End DateRangeRules.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/EquiJoin.java b/core/src/main/java/org/apache/calcite/rel/rules/EquiJoin.java
index 52a0474..287ff1c 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/EquiJoin.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/EquiJoin.java
@@ -42,5 +42,3 @@ public abstract class EquiJoin extends org.apache.calcite.rel.core.EquiJoin {
         CorrelationId.setOf(variablesStopped), joinType);
   }
 }
-
-// End EquiJoin.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ExchangeRemoveConstantKeysRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ExchangeRemoveConstantKeysRule.java
index 1fbf14c..a5f131b 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ExchangeRemoveConstantKeysRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ExchangeRemoveConstantKeysRule.java
@@ -197,5 +197,3 @@ public class ExchangeRemoveConstantKeysRule extends RelOptRule {
     }
   }
 }
-
-// End ExchangeRemoveConstantKeysRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterAggregateTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterAggregateTransposeRule.java
index 9501e74..1fc907e 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterAggregateTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterAggregateTransposeRule.java
@@ -151,5 +151,3 @@ public class FilterAggregateTransposeRule extends RelOptRule {
     return true;
   }
 }
-
-// End FilterAggregateTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterCalcMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterCalcMergeRule.java
index b422763..5c76fcc 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterCalcMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterCalcMergeRule.java
@@ -92,5 +92,3 @@ public class FilterCalcMergeRule extends RelOptRule {
     call.transformTo(newCalc);
   }
 }
-
-// End FilterCalcMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterCorrelateRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterCorrelateRule.java
index d768055..15175aa 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterCorrelateRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterCorrelateRule.java
@@ -128,5 +128,3 @@ public class FilterCorrelateRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End FilterCorrelateRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java
index c24a282..6e0de41 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java
@@ -392,5 +392,3 @@ public abstract class FilterJoinRule extends RelOptRule {
     boolean apply(Join join, JoinRelType joinType, RexNode exp);
   }
 }
-
-// End FilterJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterMergeRule.java
index 1f414f8..33e598f 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterMergeRule.java
@@ -99,5 +99,3 @@ public class FilterMergeRule extends RelOptRule {
     return programBuilder.getProgram();
   }
 }
-
-// End FilterMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
index 5638956..57b4c82 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
@@ -94,5 +94,3 @@ public class FilterMultiJoinMergeRule extends RelOptRule {
     call.transformTo(newMultiJoin);
   }
 }
-
-// End FilterMultiJoinMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterProjectTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterProjectTransposeRule.java
index 3592375..0e4efaa 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterProjectTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterProjectTransposeRule.java
@@ -206,5 +206,3 @@ public class FilterProjectTransposeRule extends RelOptRule {
         xBuilder.getTypeFactory(), simplifier.simplifyUnknownAsFalse(condition));
   }
 }
-
-// End FilterProjectTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java
index c5a5649..eff8618 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java
@@ -117,5 +117,3 @@ public final class FilterRemoveIsNotDistinctFromRule extends RelOptRule {
     }
   }
 }
-
-// End FilterRemoveIsNotDistinctFromRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterSetOpTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterSetOpTransposeRule.java
index db327ba..79dd548 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterSetOpTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterSetOpTransposeRule.java
@@ -93,5 +93,3 @@ public class FilterSetOpTransposeRule extends RelOptRule {
     call.transformTo(newSetOp);
   }
 }
-
-// End FilterSetOpTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterTableFunctionTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterTableFunctionTransposeRule.java
index 743a9d0..02ac662 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterTableFunctionTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterTableFunctionTransposeRule.java
@@ -118,5 +118,3 @@ public class FilterTableFunctionTransposeRule extends RelOptRule {
     call.transformTo(newFuncRel);
   }
 }
-
-// End FilterTableFunctionTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterTableScanRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterTableScanRule.java
index 7e597b0..f5bd14c 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterTableScanRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterTableScanRule.java
@@ -131,5 +131,3 @@ public abstract class FilterTableScanRule extends RelOptRule {
             filters.build(), projects));
   }
 }
-
-// End FilterTableScanRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterToCalcRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterToCalcRule.java
index d8d1a49..b2a7d58 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterToCalcRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterToCalcRule.java
@@ -78,5 +78,3 @@ public class FilterToCalcRule extends RelOptRule {
     call.transformTo(calc);
   }
 }
-
-// End FilterToCalcRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/IntersectToDistinctRule.java b/core/src/main/java/org/apache/calcite/rel/rules/IntersectToDistinctRule.java
index a03f61c..ffd24f9 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/IntersectToDistinctRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/IntersectToDistinctRule.java
@@ -124,5 +124,3 @@ public class IntersectToDistinctRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End IntersectToDistinctRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinAddRedundantSemiJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinAddRedundantSemiJoinRule.java
index 8ec75db..de03c14 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinAddRedundantSemiJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinAddRedundantSemiJoinRule.java
@@ -90,5 +90,3 @@ public class JoinAddRedundantSemiJoinRule extends RelOptRule {
     call.transformTo(newJoinRel);
   }
 }
-
-// End JoinAddRedundantSemiJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinAssociateRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinAssociateRule.java
index 56206d5..4488741 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinAssociateRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinAssociateRule.java
@@ -154,5 +154,3 @@ public class JoinAssociateRule extends RelOptRule {
     call.transformTo(newTopJoin);
   }
 }
-
-// End JoinAssociateRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinCommuteRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinCommuteRule.java
index 315a0cd..fe6f347 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinCommuteRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinCommuteRule.java
@@ -235,5 +235,3 @@ public class JoinCommuteRule extends RelOptRule {
     }
   }
 }
-
-// End JoinCommuteRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinExtractFilterRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinExtractFilterRule.java
index 1e7e661..a2a5fcb 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinExtractFilterRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinExtractFilterRule.java
@@ -56,5 +56,3 @@ public final class JoinExtractFilterRule extends AbstractJoinExtractFilterRule {
   //~ Methods ----------------------------------------------------------------
 
 }
-
-// End JoinExtractFilterRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinProjectTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinProjectTransposeRule.java
index 3c3ba98..b777028 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinProjectTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinProjectTransposeRule.java
@@ -405,5 +405,3 @@ public class JoinProjectTransposeRule extends RelOptRule {
     }
   }
 }
-
-// End JoinProjectTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinPushExpressionsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinPushExpressionsRule.java
index 923809f..cbbfe25 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinPushExpressionsRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinPushExpressionsRule.java
@@ -69,5 +69,3 @@ public class JoinPushExpressionsRule extends RelOptRule {
     call.transformTo(newJoin);
   }
 }
-
-// End JoinPushExpressionsRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinPushThroughJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinPushThroughJoinRule.java
index 76606a8..93a8ac2 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinPushThroughJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinPushThroughJoinRule.java
@@ -327,5 +327,3 @@ public class JoinPushThroughJoinRule extends RelOptRule {
     }
   }
 }
-
-// End JoinPushThroughJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinPushTransitivePredicatesRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinPushTransitivePredicatesRule.java
index acec023..f0c78dc 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinPushTransitivePredicatesRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinPushTransitivePredicatesRule.java
@@ -93,5 +93,3 @@ public class JoinPushTransitivePredicatesRule extends RelOptRule {
     call.transformTo(newRel);
   }
 }
-
-// End JoinPushTransitivePredicatesRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java
index 66c7984..5717865 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinToCorrelateRule.java
@@ -147,5 +147,3 @@ public class JoinToCorrelateRule extends RelOptRule {
     call.transformTo(newRel);
   }
 }
-
-// End JoinToCorrelateRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java
index 42fbb89..efb73c4 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java
@@ -572,5 +572,3 @@ public class JoinToMultiJoinRule extends RelOptRule {
     }
   }
 }
-
-// End JoinToMultiJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java
index fbf7651..d788ede 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java
@@ -122,5 +122,3 @@ public class JoinUnionTransposeRule extends RelOptRule {
     call.transformTo(newUnionRel);
   }
 }
-
-// End JoinUnionTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/LoptJoinTree.java b/core/src/main/java/org/apache/calcite/rel/rules/LoptJoinTree.java
index 5765d69..dcec3bf 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/LoptJoinTree.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/LoptJoinTree.java
@@ -212,5 +212,3 @@ public class LoptJoinTree {
     }
   }
 }
-
-// End LoptJoinTree.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/LoptMultiJoin.java b/core/src/main/java/org/apache/calcite/rel/rules/LoptMultiJoin.java
index e1c9c8d..855bfdc 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/LoptMultiJoin.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/LoptMultiJoin.java
@@ -868,5 +868,3 @@ public class LoptMultiJoin {
     }
   }
 }
-
-// End LoptMultiJoin.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
index a8cbc93..7fcaa4c 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
@@ -2065,5 +2065,3 @@ public class LoptOptimizeJoinRule extends RelOptRule {
         joinInfo.leftSet());
   }
 }
-
-// End LoptOptimizeJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java b/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java
index 7830e00..aed93a0 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java
@@ -844,5 +844,3 @@ public class LoptSemiJoinOptimizer {
     }
   }
 }
-
-// End LoptSemiJoinOptimizer.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/MatchRule.java b/core/src/main/java/org/apache/calcite/rel/rules/MatchRule.java
index e482b91..71f8a70 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/MatchRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/MatchRule.java
@@ -51,5 +51,3 @@ public class MatchRule extends RelOptRule {
     call.transformTo(match);
   }
 }
-
-// End MatchRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/MaterializedViewFilterScanRule.java b/core/src/main/java/org/apache/calcite/rel/rules/MaterializedViewFilterScanRule.java
index 6923206..fa87a48 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/MaterializedViewFilterScanRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/MaterializedViewFilterScanRule.java
@@ -93,5 +93,3 @@ public class MaterializedViewFilterScanRule extends RelOptRule {
     }
   }
 }
-
-// End MaterializedViewFilterScanRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/MultiJoin.java b/core/src/main/java/org/apache/calcite/rel/rules/MultiJoin.java
index ab06504..1b09be8 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/MultiJoin.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/MultiJoin.java
@@ -275,5 +275,3 @@ public final class MultiJoin extends AbstractRelNode {
     return false;
   }
 }
-
-// End MultiJoin.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/MultiJoinOptimizeBushyRule.java b/core/src/main/java/org/apache/calcite/rel/rules/MultiJoinOptimizeBushyRule.java
index 46f910d..afc0cba 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/MultiJoinOptimizeBushyRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/MultiJoinOptimizeBushyRule.java
@@ -387,5 +387,3 @@ public class MultiJoinOptimizeBushyRule extends RelOptRule {
     }
   }
 }
-
-// End MultiJoinOptimizeBushyRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/MultiJoinProjectTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/MultiJoinProjectTransposeRule.java
index c69a6c2..6a80e1c 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/MultiJoinProjectTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/MultiJoinProjectTransposeRule.java
@@ -143,5 +143,3 @@ public class MultiJoinProjectTransposeRule extends JoinProjectTransposeRule {
     return RelOptUtil.projectMultiJoin(multiJoin, project);
   }
 }
-
-// End MultiJoinProjectTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectCalcMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectCalcMergeRule.java
index 568c31b..598c469 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectCalcMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectCalcMergeRule.java
@@ -111,5 +111,3 @@ public class ProjectCalcMergeRule extends RelOptRule {
     call.transformTo(newCalc);
   }
 }
-
-// End ProjectCalcMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectCorrelateTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectCorrelateTransposeRule.java
index 56d572e..f14401c 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectCorrelateTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectCorrelateTransposeRule.java
@@ -208,5 +208,3 @@ public class ProjectCorrelateTransposeRule extends RelOptRule {
     }
   }
 }
-
-// End ProjectCorrelateTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java
index ade34a1..47a5803 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectFilterTransposeRule.java
@@ -132,5 +132,3 @@ public class ProjectFilterTransposeRule extends RelOptRule {
     }
   }
 }
-
-// End ProjectFilterTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinJoinRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinJoinRemoveRule.java
index c2d8122..97b5769 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinJoinRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinJoinRemoveRule.java
@@ -138,5 +138,3 @@ public class ProjectJoinJoinRemoveRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End ProjectJoinJoinRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinRemoveRule.java
index eb20eed..a458a80 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinRemoveRule.java
@@ -123,5 +123,3 @@ public class ProjectJoinRemoveRule extends RelOptRule {
     call.transformTo(node);
   }
 }
-
-// End ProjectJoinRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java
index 35821a7..31ab28b 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectJoinTransposeRule.java
@@ -203,5 +203,3 @@ public class ProjectJoinTransposeRule extends RelOptRule {
     call.transformTo(topProject);
   }
 }
-
-// End ProjectJoinTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectMergeRule.java
index 1a67787..2d550f9 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectMergeRule.java
@@ -123,5 +123,3 @@ public class ProjectMergeRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End ProjectMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
index c41d474..20db7e3 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
@@ -93,5 +93,3 @@ public class ProjectMultiJoinMergeRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End ProjectMultiJoinMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectRemoveRule.java
index 515b779..08e27cc 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectRemoveRule.java
@@ -93,5 +93,3 @@ public class ProjectRemoveRule extends RelOptRule {
     return RexUtil.isIdentity(exps, childRowType);
   }
 }
-
-// End ProjectRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java
index ce5adf9..e1933d1 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectSetOpTransposeRule.java
@@ -122,5 +122,3 @@ public class ProjectSetOpTransposeRule extends RelOptRule {
     call.transformTo(node);
   }
 }
-
-// End ProjectSetOpTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java
index d1dd14e..844b051 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java
@@ -82,5 +82,3 @@ public class ProjectSortTransposeRule extends RelOptRule {
     call.transformTo(newSort);
   }
 }
-
-// End ProjectSortTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectTableScanRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectTableScanRule.java
index d130455..23788a8 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectTableScanRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectTableScanRule.java
@@ -151,5 +151,3 @@ public abstract class ProjectTableScanRule extends RelOptRule {
     }
   }
 }
-
-// End ProjectTableScanRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectToCalcRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectToCalcRule.java
index e16bc81..5c77191 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectToCalcRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectToCalcRule.java
@@ -72,5 +72,3 @@ public class ProjectToCalcRule extends RelOptRule {
     call.transformTo(calc);
   }
 }
-
-// End ProjectToCalcRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java
index b85fd44..507ce3c 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java
@@ -376,5 +376,3 @@ public abstract class ProjectToWindowRule extends RelOptRule {
     }
   }
 }
-
-// End ProjectToWindowRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectWindowTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectWindowTransposeRule.java
index ce5025b..e8dbe63 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectWindowTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectWindowTransposeRule.java
@@ -242,5 +242,3 @@ public class ProjectWindowTransposeRule extends RelOptRule {
     }
   }
 }
-
-// End ProjectWindowTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/PruneEmptyRules.java b/core/src/main/java/org/apache/calcite/rel/rules/PruneEmptyRules.java
index 64f20d1..5e68a6f 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/PruneEmptyRules.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/PruneEmptyRules.java
@@ -369,5 +369,3 @@ public abstract class PruneEmptyRules {
     }
   }
 }
-
-// End PruneEmptyRules.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java b/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java
index 52fd5fc..7ec5482 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java
@@ -861,5 +861,3 @@ public class PushProjector {
     }
   }
 }
-
-// End PushProjector.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java
index eca2555..c20c690 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java
@@ -1313,5 +1313,3 @@ public class ReduceDecimalsRule extends RelOptRule {
     }
   }
 }
-
-// End ReduceDecimalsRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ReduceExpressionsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ReduceExpressionsRule.java
index c3b5a3e..9fd0550 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ReduceExpressionsRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ReduceExpressionsRule.java
@@ -1145,5 +1145,3 @@ public abstract class ReduceExpressionsRule extends RelOptRule {
     }
   }
 }
-
-// End ReduceExpressionsRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinFilterTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinFilterTransposeRule.java
index 2f2f3ca..b3068ba 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinFilterTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinFilterTransposeRule.java
@@ -78,5 +78,3 @@ public class SemiJoinFilterTransposeRule extends RelOptRule {
     call.transformTo(newFilter);
   }
 }
-
-// End SemiJoinFilterTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinJoinTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinJoinTransposeRule.java
index 53f298c..cf83391 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinJoinTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinJoinTransposeRule.java
@@ -218,5 +218,3 @@ public class SemiJoinJoinTransposeRule extends RelOptRule {
     }
   }
 }
-
-// End SemiJoinJoinTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinProjectTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinProjectTransposeRule.java
index d1333ea..f601893 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinProjectTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinProjectTransposeRule.java
@@ -177,5 +177,3 @@ public class SemiJoinProjectTransposeRule extends RelOptRule {
         mergedProgram.getCondition());
   }
 }
-
-// End SemiJoinProjectTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRemoveRule.java
index 2282fff..b8f7801 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRemoveRule.java
@@ -51,5 +51,3 @@ public class SemiJoinRemoveRule extends RelOptRule {
     call.transformTo(call.rel(0).getInput(0));
   }
 }
-
-// End SemiJoinRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java
index 9f9b85f..8bdb211 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java
@@ -183,5 +183,3 @@ public abstract class SemiJoinRule extends RelOptRule {
     perform(call, null, join, left, aggregate);
   }
 }
-
-// End SemiJoinRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SortJoinCopyRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SortJoinCopyRule.java
index 7bdea42..08c9974 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SortJoinCopyRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SortJoinCopyRule.java
@@ -162,5 +162,3 @@ public class SortJoinCopyRule extends RelOptRule {
     call.transformTo(sortCopy);
   }
 }
-
-// End SortJoinCopyRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SortJoinTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SortJoinTransposeRule.java
index 6a1c76b..66c8d7f 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SortJoinTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SortJoinTransposeRule.java
@@ -162,5 +162,3 @@ public class SortJoinTransposeRule extends RelOptRule {
   }
 
 }
-
-// End SortJoinTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SortProjectTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SortProjectTransposeRule.java
index 8bdcdd2..3928d68 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SortProjectTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SortProjectTransposeRule.java
@@ -156,5 +156,3 @@ public class SortProjectTransposeRule extends RelOptRule {
     call.transformTo(newProject, equiv);
   }
 }
-
-// End SortProjectTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SortRemoveConstantKeysRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SortRemoveConstantKeysRule.java
index f2a4f47..ca50570 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SortRemoveConstantKeysRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SortRemoveConstantKeysRule.java
@@ -82,5 +82,3 @@ public class SortRemoveConstantKeysRule extends RelOptRule {
     call.getPlanner().setImportance(sort, 0.0);
   }
 }
-
-// End SortRemoveConstantKeysRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SortRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SortRemoveRule.java
index 09334ab..15b97f1 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SortRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SortRemoveRule.java
@@ -65,5 +65,3 @@ public class SortRemoveRule extends RelOptRule {
     call.transformTo(convert(sort.getInput(), traits));
   }
 }
-
-// End SortRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SortUnionTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SortUnionTransposeRule.java
index bd4df23..7e91743 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SortUnionTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SortUnionTransposeRule.java
@@ -118,5 +118,3 @@ public class SortUnionTransposeRule extends RelOptRule {
     call.transformTo(result);
   }
 }
-
-// End SortUnionTransposeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java
index 347a880..ee30dfc 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java
@@ -704,5 +704,3 @@ public abstract class SubQueryRemoveRule extends RelOptRule {
     }
   }
 }
-
-// End SubQueryRemoveRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/TableScanRule.java b/core/src/main/java/org/apache/calcite/rel/rules/TableScanRule.java
index 24dd9ff..9f6a49b 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/TableScanRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/TableScanRule.java
@@ -57,5 +57,3 @@ public class TableScanRule extends RelOptRule {
     call.transformTo(newRel);
   }
 }
-
-// End TableScanRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/UnionEliminatorRule.java b/core/src/main/java/org/apache/calcite/rel/rules/UnionEliminatorRule.java
index 024dd4e..01d891d 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/UnionEliminatorRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/UnionEliminatorRule.java
@@ -59,5 +59,3 @@ public class UnionEliminatorRule extends RelOptRule {
     call.transformTo(union.getInputs().get(0));
   }
 }
-
-// End UnionEliminatorRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/UnionMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/UnionMergeRule.java
index 20fbcd9..1cee1c5 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/UnionMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/UnionMergeRule.java
@@ -140,5 +140,3 @@ public class UnionMergeRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End UnionMergeRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/UnionPullUpConstantsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/UnionPullUpConstantsRule.java
index b7cfab3..0bbc5f6 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/UnionPullUpConstantsRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/UnionPullUpConstantsRule.java
@@ -139,5 +139,3 @@ public class UnionPullUpConstantsRule extends RelOptRule {
   }
 
 }
-
-// End UnionPullUpConstantsRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/UnionToDistinctRule.java b/core/src/main/java/org/apache/calcite/rel/rules/UnionToDistinctRule.java
index 10ae1f4..8989970 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/UnionToDistinctRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/UnionToDistinctRule.java
@@ -66,5 +66,3 @@ public class UnionToDistinctRule extends RelOptRule {
     call.transformTo(relBuilder.build());
   }
 }
-
-// End UnionToDistinctRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ValuesReduceRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ValuesReduceRule.java
index 3434079..94d7817 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ValuesReduceRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ValuesReduceRule.java
@@ -265,5 +265,3 @@ public abstract class ValuesReduceRule extends RelOptRule {
     }
   }
 }
-
-// End ValuesReduceRule.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/package-info.java b/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
index ba83e74..df52edb 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
@@ -48,5 +48,3 @@
  * </ul>
  */
 package org.apache.calcite.rel.rules;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/Chi.java b/core/src/main/java/org/apache/calcite/rel/stream/Chi.java
index 36e03c0..db2d15e 100644
--- a/core/src/main/java/org/apache/calcite/rel/stream/Chi.java
+++ b/core/src/main/java/org/apache/calcite/rel/stream/Chi.java
@@ -34,5 +34,3 @@ public class Chi extends SingleRel {
     super(cluster, traits, input);
   }
 }
-
-// End Chi.java
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/Delta.java b/core/src/main/java/org/apache/calcite/rel/stream/Delta.java
index ce1417c..8a6a5ec 100644
--- a/core/src/main/java/org/apache/calcite/rel/stream/Delta.java
+++ b/core/src/main/java/org/apache/calcite/rel/stream/Delta.java
@@ -45,5 +45,3 @@ public abstract class Delta extends SingleRel {
     this(input.getCluster(), input.getTraitSet(), input.getInput());
   }
 }
-
-// End Delta.java
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/LogicalChi.java b/core/src/main/java/org/apache/calcite/rel/stream/LogicalChi.java
index fad29e7..8e919e2 100644
--- a/core/src/main/java/org/apache/calcite/rel/stream/LogicalChi.java
+++ b/core/src/main/java/org/apache/calcite/rel/stream/LogicalChi.java
@@ -29,5 +29,3 @@ public final class LogicalChi extends Chi {
     super(cluster, traits, input);
   }
 }
-
-// End LogicalChi.java
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/LogicalDelta.java b/core/src/main/java/org/apache/calcite/rel/stream/LogicalDelta.java
index 05de63b..249dca0 100644
--- a/core/src/main/java/org/apache/calcite/rel/stream/LogicalDelta.java
+++ b/core/src/main/java/org/apache/calcite/rel/stream/LogicalDelta.java
@@ -57,5 +57,3 @@ public final class LogicalDelta extends Delta {
     return new LogicalDelta(getCluster(), traitSet, sole(inputs));
   }
 }
-
-// End LogicalDelta.java
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/StreamRules.java b/core/src/main/java/org/apache/calcite/rel/stream/StreamRules.java
index 6ceed03..14c0c67 100644
--- a/core/src/main/java/org/apache/calcite/rel/stream/StreamRules.java
+++ b/core/src/main/java/org/apache/calcite/rel/stream/StreamRules.java
@@ -336,5 +336,3 @@ public class StreamRules {
     }
   }
 }
-
-// End StreamRules.java
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/package-info.java b/core/src/main/java/org/apache/calcite/rel/stream/package-info.java
index 46278b8..abc9584 100644
--- a/core/src/main/java/org/apache/calcite/rel/stream/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/stream/package-info.java
@@ -28,5 +28,3 @@
  * </ul>
  */
 package org.apache.calcite.rel.stream;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/DelegatingTypeSystem.java b/core/src/main/java/org/apache/calcite/rel/type/DelegatingTypeSystem.java
index a91a2db..ba3b45b 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/DelegatingTypeSystem.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/DelegatingTypeSystem.java
@@ -95,5 +95,3 @@ public class DelegatingTypeSystem implements RelDataTypeSystem {
     return typeSystem.shouldConvertRaggedUnionTypesToVarying();
   }
 }
-
-// End DelegatingTypeSystem.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java b/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java
index 642a760..196e3a0 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java
@@ -38,5 +38,3 @@ public abstract class DynamicRecordType extends RelDataTypeImpl {
   }
 
 }
-
-// End DynamicRecordType.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java b/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java
index 50f426b..36a960f 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordTypeImpl.java
@@ -86,5 +86,3 @@ public class DynamicRecordTypeImpl extends DynamicRecordType {
   }
 
 }
-
-// End DynamicRecordTypeImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java b/core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java
index ba2ac85..8e22fde 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java
@@ -76,5 +76,3 @@ public class RelCrossType extends RelDataTypeImpl {
     sb.append(")");
   }
 }
-
-// End RelCrossType.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataType.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataType.java
index 8299d00..3e6f474 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataType.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataType.java
@@ -242,5 +242,3 @@ public interface RelDataType {
   boolean isDynamicStruct();
 
 }
-
-// End RelDataType.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeComparability.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeComparability.java
index 7dbabbb..cc17e61 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeComparability.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeComparability.java
@@ -35,5 +35,3 @@ public enum RelDataTypeComparability {
     Util.discard(description);
   }
 }
-
-// End RelDataTypeComparability.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactory.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactory.java
index 60eb34d..4663d50 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactory.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactory.java
@@ -584,5 +584,3 @@ public interface RelDataTypeFactory {
     }
   }
 }
-
-// End RelDataTypeFactory.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java
index d01e3b3..c321ffa 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java
@@ -651,5 +651,3 @@ public abstract class RelDataTypeFactoryImpl implements RelDataTypeFactory {
     }
   }
 }
-
-// End RelDataTypeFactoryImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFamily.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFamily.java
index 54a3da0..9e0801a 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFamily.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFamily.java
@@ -22,5 +22,3 @@ package org.apache.calcite.rel.type;
  */
 public interface RelDataTypeFamily {
 }
-
-// End RelDataTypeFamily.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeField.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeField.java
index 913c3a3..7fceec7 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeField.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeField.java
@@ -85,5 +85,3 @@ public interface RelDataTypeField extends Map.Entry<String, RelDataType> {
    */
   boolean isDynamicStar();
 }
-
-// End RelDataTypeField.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFieldImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFieldImpl.java
index a3cbf32..8af3422 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFieldImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFieldImpl.java
@@ -107,5 +107,3 @@ public class RelDataTypeFieldImpl implements RelDataTypeField, Serializable {
   }
 
 }
-
-// End RelDataTypeFieldImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java
index 1473679..d08a68d 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeHolder.java
@@ -83,5 +83,3 @@ class RelDataTypeHolder {
   }
 
 }
-
-// End RelDataTypeHolder.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java
index 19edf77..b556741 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java
@@ -384,5 +384,3 @@ public abstract class RelDataTypeImpl
     RelDataTypeField field;
   }
 }
-
-// End RelDataTypeImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypePrecedenceList.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypePrecedenceList.java
index 99c8266..919a5fa 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypePrecedenceList.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypePrecedenceList.java
@@ -47,5 +47,3 @@ public interface RelDataTypePrecedenceList {
    */
   int compareTypePrecedence(RelDataType type1, RelDataType type2);
 }
-
-// End RelDataTypePrecedenceList.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystem.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystem.java
index b4f969d..03189fe 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystem.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystem.java
@@ -406,5 +406,3 @@ public interface RelDataTypeSystem {
   }
 
 }
-
-// End RelDataTypeSystem.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java
index 6131fb3..f719ceb 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java
@@ -253,5 +253,3 @@ public abstract class RelDataTypeSystemImpl implements RelDataTypeSystem {
   }
 
 }
-
-// End RelDataTypeSystemImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelProtoDataType.java b/core/src/main/java/org/apache/calcite/rel/type/RelProtoDataType.java
index ed518b6..bd3ba07 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelProtoDataType.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelProtoDataType.java
@@ -27,5 +27,3 @@ import org.apache.calcite.linq4j.function.Function1;
 public interface RelProtoDataType
     extends Function1<RelDataTypeFactory, RelDataType> {
 }
-
-// End RelProtoDataType.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelRecordType.java b/core/src/main/java/org/apache/calcite/rel/type/RelRecordType.java
index b9b0818..751e6a1 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelRecordType.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelRecordType.java
@@ -149,5 +149,3 @@ public class RelRecordType extends RelDataTypeImpl implements Serializable {
     }
   }
 }
-
-// End RelRecordType.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/StructKind.java b/core/src/main/java/org/apache/calcite/rel/type/StructKind.java
index af13e0a..cf1900f 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/StructKind.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/StructKind.java
@@ -84,5 +84,3 @@ public enum StructKind {
    * <p>Used in Flink, not Phoenix. */
   PEEK_FIELDS_NO_EXPAND,
 }
-
-// End StructKind.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/package-info.java b/core/src/main/java/org/apache/calcite/rel/type/package-info.java
index 7c2e251..6da568d 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/package-info.java
@@ -19,5 +19,3 @@
  * Defines a type system for relational expressions.
  */
 package org.apache.calcite.rel.type;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rex/LogicVisitor.java b/core/src/main/java/org/apache/calcite/rex/LogicVisitor.java
index 7d4f494..59adf52 100644
--- a/core/src/main/java/org/apache/calcite/rex/LogicVisitor.java
+++ b/core/src/main/java/org/apache/calcite/rex/LogicVisitor.java
@@ -171,5 +171,3 @@ public class LogicVisitor implements RexBiVisitor<Logic, Logic> {
     return end(ref, arg);
   }
 }
-
-// End LogicVisitor.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexAction.java b/core/src/main/java/org/apache/calcite/rex/RexAction.java
index ecff36a..bb7f2fc 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexAction.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexAction.java
@@ -26,5 +26,3 @@ public interface RexAction {
 
   void onMatch(RexNode[] tokens);
 }
-
-// End RexAction.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexAnalyzer.java b/core/src/main/java/org/apache/calcite/rex/RexAnalyzer.java
index c080ccf..efbd723 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexAnalyzer.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexAnalyzer.java
@@ -138,5 +138,3 @@ public class RexAnalyzer {
     }
   }
 }
-
-// End RexAnalyzer.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexBiVisitor.java b/core/src/main/java/org/apache/calcite/rex/RexBiVisitor.java
index aa494c2..be2280d 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexBiVisitor.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexBiVisitor.java
@@ -52,5 +52,3 @@ public interface RexBiVisitor<R, P> {
 
   R visitPatternFieldRef(RexPatternFieldRef ref, P arg);
 }
-
-// End RexBiVisitor.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexBuilder.java b/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
index be2593d..e3cb5c4 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
@@ -1641,5 +1641,3 @@ public class RexBuilder {
     return new ByteString(Arrays.copyOf(s.getBytes(), length));
   }
 }
-
-// End RexBuilder.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexCall.java b/core/src/main/java/org/apache/calcite/rex/RexCall.java
index dca3a18..44c0f7f 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexCall.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexCall.java
@@ -268,5 +268,3 @@ public class RexCall extends RexNode {
     return toString().hashCode();
   }
 }
-
-// End RexCall.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java b/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java
index a91eca8..a2725e3 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java
@@ -159,5 +159,3 @@ public class RexCallBinding extends SqlOperatorBinding {
     }
   }
 }
-
-// End RexCallBinding.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexChecker.java b/core/src/main/java/org/apache/calcite/rex/RexChecker.java
index 121328d..d352992 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexChecker.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexChecker.java
@@ -184,5 +184,3 @@ public class RexChecker extends RexVisitorImpl<Boolean> {
     return expr.accept(this);
   }
 }
-
-// End RexChecker.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexCopier.java b/core/src/main/java/org/apache/calcite/rex/RexCopier.java
index f207750..8a371fb 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexCopier.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexCopier.java
@@ -95,5 +95,3 @@ class RexCopier extends RexShuttle {
         rangeRef.getOffset(), false);
   }
 }
-
-// End RexCopier.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexCorrelVariable.java b/core/src/main/java/org/apache/calcite/rex/RexCorrelVariable.java
index a16b30d..7c3408c 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexCorrelVariable.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexCorrelVariable.java
@@ -67,5 +67,3 @@ public class RexCorrelVariable extends RexVariable {
     return Objects.hash(digest, type, id);
   }
 }
-
-// End RexCorrelVariable.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexDigestIncludeType.java b/core/src/main/java/org/apache/calcite/rex/RexDigestIncludeType.java
index 89199c4..8492bb0 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexDigestIncludeType.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexDigestIncludeType.java
@@ -24,5 +24,3 @@ public enum RexDigestIncludeType {
   OPTIONAL,
   NO_TYPE;
 }
-
-// End RexDigestIncludeType.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexDynamicParam.java b/core/src/main/java/org/apache/calcite/rex/RexDynamicParam.java
index 7e92d4a..7a59021 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexDynamicParam.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexDynamicParam.java
@@ -74,5 +74,3 @@ public class RexDynamicParam extends RexVariable {
     return Objects.hash(digest, type, index);
   }
 }
-
-// End RexDynamicParam.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexExecutable.java b/core/src/main/java/org/apache/calcite/rex/RexExecutable.java
index 2907651..a3eda5c 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexExecutable.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexExecutable.java
@@ -106,5 +106,3 @@ public class RexExecutable {
     return code;
   }
 }
-
-// End RexExecutable.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexExecutor.java b/core/src/main/java/org/apache/calcite/rex/RexExecutor.java
index bb45a9b..b9b3c37 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexExecutor.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexExecutor.java
@@ -33,5 +33,3 @@ public interface RexExecutor {
    */
   void reduce(RexBuilder rexBuilder, List<RexNode> constExps, List<RexNode> reducedValues);
 }
-
-// End RexExecutor.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java b/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java
index 2844e3a..120c444 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java
@@ -164,5 +164,3 @@ public class RexExecutorImpl implements RexExecutor {
     }
   }
 }
-
-// End RexExecutorImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexFieldAccess.java b/core/src/main/java/org/apache/calcite/rex/RexFieldAccess.java
index 6de5548..a7b318e 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexFieldAccess.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexFieldAccess.java
@@ -111,5 +111,3 @@ public class RexFieldAccess extends RexNode {
     return result;
   }
 }
-
-// End RexFieldAccess.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexFieldCollation.java b/core/src/main/java/org/apache/calcite/rex/RexFieldCollation.java
index 0cfe52d..5324355 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexFieldCollation.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexFieldCollation.java
@@ -109,5 +109,3 @@ public class RexFieldCollation extends Pair<RexNode, ImmutableSet<SqlKind>> {
     }
   }
 }
-
-// End RexFieldCollation.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexInputRef.java b/core/src/main/java/org/apache/calcite/rex/RexInputRef.java
index 8019ad6..e264a6d 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexInputRef.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexInputRef.java
@@ -124,5 +124,3 @@ public class RexInputRef extends RexSlot {
     return NAMES.get(index);
   }
 }
-
-// End RexInputRef.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexInterpreter.java b/core/src/main/java/org/apache/calcite/rex/RexInterpreter.java
index 67c53c9..2d1f761 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexInterpreter.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexInterpreter.java
@@ -374,5 +374,3 @@ public class RexInterpreter implements RexVisitor<Comparable> {
     }
   }
 }
-
-// End RexInterpreter.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexLiteral.java b/core/src/main/java/org/apache/calcite/rex/RexLiteral.java
index cb4719a..0911a1e 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexLiteral.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexLiteral.java
@@ -1142,5 +1142,3 @@ public class RexLiteral extends RexNode {
     return visitor.visitLiteral(this, arg);
   }
 }
-
-// End RexLiteral.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexLocalRef.java b/core/src/main/java/org/apache/calcite/rex/RexLocalRef.java
index 60180ce..18a4d5d 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexLocalRef.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexLocalRef.java
@@ -83,5 +83,3 @@ public class RexLocalRef extends RexSlot {
     return NAMES.get(index);
   }
 }
-
-// End RexLocalRef.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexMultisetUtil.java b/core/src/main/java/org/apache/calcite/rex/RexMultisetUtil.java
index 826b3a1..971cf47 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexMultisetUtil.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexMultisetUtil.java
@@ -200,5 +200,3 @@ public class RexMultisetUtil {
     }
   }
 }
-
-// End RexMultisetUtil.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexNode.java b/core/src/main/java/org/apache/calcite/rex/RexNode.java
index ca382c0..fd92eba 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexNode.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexNode.java
@@ -110,5 +110,3 @@ public abstract class RexNode {
    */
   @Override public abstract int hashCode();
 }
-
-// End RexNode.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexOver.java b/core/src/main/java/org/apache/calcite/rex/RexOver.java
index 78a6a37..9e6e931 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexOver.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexOver.java
@@ -192,5 +192,3 @@ public class RexOver extends RexCall {
     }
   }
 }
-
-// End RexOver.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexPattern.java b/core/src/main/java/org/apache/calcite/rex/RexPattern.java
index c961de4..7061bde 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexPattern.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexPattern.java
@@ -32,5 +32,3 @@ public interface RexPattern {
       RexNode ptree,
       RexAction action);
 }
-
-// End RexPattern.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexPatternFieldRef.java b/core/src/main/java/org/apache/calcite/rex/RexPatternFieldRef.java
index 3d9ff42..a0d039e 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexPatternFieldRef.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexPatternFieldRef.java
@@ -55,5 +55,3 @@ public class RexPatternFieldRef extends RexInputRef {
     return SqlKind.PATTERN_INPUT_REF;
   }
 }
-
-// End RexPatternFieldRef.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexPermutationShuttle.java b/core/src/main/java/org/apache/calcite/rex/RexPermutationShuttle.java
index 2af15ea..87dd078 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexPermutationShuttle.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexPermutationShuttle.java
@@ -45,5 +45,3 @@ public class RexPermutationShuttle extends RexShuttle {
         local.getType());
   }
 }
-
-// End RexPermutationShuttle.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexPermuteInputsShuttle.java b/core/src/main/java/org/apache/calcite/rex/RexPermuteInputsShuttle.java
index 1d8d41e..1f99fef 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexPermuteInputsShuttle.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexPermuteInputsShuttle.java
@@ -110,5 +110,3 @@ public class RexPermuteInputsShuttle extends RexShuttle {
     return -1;
   }
 }
-
-// End RexPermuteInputsShuttle.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexProgram.java b/core/src/main/java/org/apache/calcite/rex/RexProgram.java
index 13e4d7f..2d3decd 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexProgram.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexProgram.java
@@ -1000,5 +1000,3 @@ public class RexProgram {
     }
   }
 }
-
-// End RexProgram.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java b/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java
index 9feb711..932aa3e 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java
@@ -1062,5 +1062,3 @@ public class RexProgramBuilder {
     }
   }
 }
-
-// End RexProgramBuilder.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexRangeRef.java b/core/src/main/java/org/apache/calcite/rex/RexRangeRef.java
index 97d5e46..e8a40fe 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexRangeRef.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexRangeRef.java
@@ -88,5 +88,3 @@ public class RexRangeRef extends RexNode {
     return Objects.hash(type, offset);
   }
 }
-
-// End RexRangeRef.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexShuttle.java b/core/src/main/java/org/apache/calcite/rex/RexShuttle.java
index eee8d57..af1b5be 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexShuttle.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexShuttle.java
@@ -277,5 +277,3 @@ public class RexShuttle implements RexVisitor<RexNode> {
     return (expr == null) ? null : expr.accept(this);
   }
 }
-
-// End RexShuttle.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexSimplify.java b/core/src/main/java/org/apache/calcite/rex/RexSimplify.java
index d3cdb45..a3b52f0 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexSimplify.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexSimplify.java
@@ -2351,5 +2351,3 @@ public class RexSimplify {
   }
 
 }
-
-// End RexSimplify.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexSlot.java b/core/src/main/java/org/apache/calcite/rex/RexSlot.java
index d56db42..7ce5d49 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexSlot.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexSlot.java
@@ -102,5 +102,3 @@ public abstract class RexSlot extends RexVariable {
     }
   }
 }
-
-// End RexSlot.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexSqlConvertlet.java b/core/src/main/java/org/apache/calcite/rex/RexSqlConvertlet.java
index 2aca4ea..663c4ba 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexSqlConvertlet.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexSqlConvertlet.java
@@ -35,5 +35,3 @@ public interface RexSqlConvertlet {
       RexToSqlNodeConverter converter,
       RexCall call);
 }
-
-// End RexSqlConvertlet.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexSqlConvertletTable.java b/core/src/main/java/org/apache/calcite/rex/RexSqlConvertletTable.java
index 8f00b4f..8406ec0 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexSqlConvertletTable.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexSqlConvertletTable.java
@@ -27,5 +27,3 @@ public interface RexSqlConvertletTable {
    */
   RexSqlConvertlet get(RexCall call);
 }
-
-// End RexSqlConvertletTable.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexSqlReflectiveConvertletTable.java b/core/src/main/java/org/apache/calcite/rex/RexSqlReflectiveConvertletTable.java
index a571331..c19d540 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexSqlReflectiveConvertletTable.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexSqlReflectiveConvertletTable.java
@@ -82,5 +82,3 @@ public class RexSqlReflectiveConvertletTable implements RexSqlConvertletTable {
     map.put(op, convertlet);
   }
 }
-
-// End RexSqlReflectiveConvertletTable.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexSqlStandardConvertletTable.java b/core/src/main/java/org/apache/calcite/rex/RexSqlStandardConvertletTable.java
index f25f0d0..217a6ff 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexSqlStandardConvertletTable.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexSqlStandardConvertletTable.java
@@ -258,5 +258,3 @@ public class RexSqlStandardConvertletTable
     }
   }
 }
-
-// End RexSqlStandardConvertletTable.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexSubQuery.java b/core/src/main/java/org/apache/calcite/rex/RexSubQuery.java
index 9bf5ecc..5a081dc 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexSubQuery.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexSubQuery.java
@@ -137,5 +137,3 @@ public class RexSubQuery extends RexCall {
     return new RexSubQuery(type, getOperator(), operands, rel);
   }
 }
-
-// End RexSubQuery.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexTableInputRef.java b/core/src/main/java/org/apache/calcite/rex/RexTableInputRef.java
index 6376d11..fd14ede 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexTableInputRef.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexTableInputRef.java
@@ -145,5 +145,3 @@ public class RexTableInputRef extends RexInputRef {
     }
   }
 }
-
-// End RexTableInputRef.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexToSqlNodeConverter.java b/core/src/main/java/org/apache/calcite/rex/RexToSqlNodeConverter.java
index 460d8f9..f9273d3 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexToSqlNodeConverter.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexToSqlNodeConverter.java
@@ -63,5 +63,3 @@ public interface RexToSqlNodeConverter {
    */
   SqlNode convertInputRef(RexInputRef ref);
 }
-
-// End RexToSqlNodeConverter.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexToSqlNodeConverterImpl.java b/core/src/main/java/org/apache/calcite/rex/RexToSqlNodeConverterImpl.java
index 504fca2..1b9c2e1 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexToSqlNodeConverterImpl.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexToSqlNodeConverterImpl.java
@@ -135,5 +135,3 @@ public class RexToSqlNodeConverterImpl implements RexToSqlNodeConverter {
     return null;
   }
 }
-
-// End RexToSqlNodeConverterImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexTransformer.java b/core/src/main/java/org/apache/calcite/rex/RexTransformer.java
index 13e3199..a98334c 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexTransformer.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexTransformer.java
@@ -225,5 +225,3 @@ public class RexTransformer {
     return node;
   }
 }
-
-// End RexTransformer.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexUnknownAs.java b/core/src/main/java/org/apache/calcite/rex/RexUnknownAs.java
index 3999af7..7ab948a 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexUnknownAs.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexUnknownAs.java
@@ -106,5 +106,3 @@ public enum RexUnknownAs {
     }
   }
 }
-
-// End RexUnknownAs.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexUtil.java b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
index d0082ba..8595e00 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexUtil.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
@@ -2682,5 +2682,3 @@ public class RexUtil {
     }
   }
 }
-
-// End RexUtil.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexVariable.java b/core/src/main/java/org/apache/calcite/rex/RexVariable.java
index 6a702c0..77fdd7e 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexVariable.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexVariable.java
@@ -52,5 +52,3 @@ public abstract class RexVariable extends RexNode {
     return name;
   }
 }
-
-// End RexVariable.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexVisitor.java b/core/src/main/java/org/apache/calcite/rex/RexVisitor.java
index a2a01d0..b958aa1 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexVisitor.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexVisitor.java
@@ -52,5 +52,3 @@ public interface RexVisitor<R> {
 
   R visitPatternFieldRef(RexPatternFieldRef fieldRef);
 }
-
-// End RexVisitor.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexVisitorImpl.java b/core/src/main/java/org/apache/calcite/rex/RexVisitorImpl.java
index 6e40a67..707d583 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexVisitorImpl.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexVisitorImpl.java
@@ -162,5 +162,3 @@ public class RexVisitorImpl<R> implements RexVisitor<R> {
     return false;
   }
 }
-
-// End RexVisitorImpl.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexWindow.java b/core/src/main/java/org/apache/calcite/rex/RexWindow.java
index 8fe3008..da9a33f 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexWindow.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexWindow.java
@@ -150,5 +150,3 @@ public class RexWindow {
     return isRows;
   }
 }
-
-// End RexWindow.java
diff --git a/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java b/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java
index 7db66d6..bfcf92d 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java
@@ -256,5 +256,3 @@ public abstract class RexWindowBound {
     }
   }
 }
-
-// End RexWindowBound.java
diff --git a/core/src/main/java/org/apache/calcite/rex/package-info.java b/core/src/main/java/org/apache/calcite/rex/package-info.java
index b776422..07cad92c 100644
--- a/core/src/main/java/org/apache/calcite/rex/package-info.java
+++ b/core/src/main/java/org/apache/calcite/rex/package-info.java
@@ -80,5 +80,3 @@
  * </ul>
  */
 package org.apache.calcite.rex;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/AbstractImmutableList.java b/core/src/main/java/org/apache/calcite/runtime/AbstractImmutableList.java
index ff7b48e..cc58a00 100644
--- a/core/src/main/java/org/apache/calcite/runtime/AbstractImmutableList.java
+++ b/core/src/main/java/org/apache/calcite/runtime/AbstractImmutableList.java
@@ -103,5 +103,3 @@ abstract class AbstractImmutableList<E> implements List<E> {
     throw new UnsupportedOperationException();
   }
 }
-
-// End AbstractImmutableList.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/ArrayBindable.java b/core/src/main/java/org/apache/calcite/runtime/ArrayBindable.java
index 2c3e078..d40bfa5 100644
--- a/core/src/main/java/org/apache/calcite/runtime/ArrayBindable.java
+++ b/core/src/main/java/org/apache/calcite/runtime/ArrayBindable.java
@@ -26,5 +26,3 @@ public interface ArrayBindable extends Bindable<Object[]>, Typed {
   // override
   Class<Object[]> getElementType();
 }
-
-// End ArrayBindable.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/ArrayComparator.java b/core/src/main/java/org/apache/calcite/runtime/ArrayComparator.java
index d2f57ef..a44c479 100644
--- a/core/src/main/java/org/apache/calcite/runtime/ArrayComparator.java
+++ b/core/src/main/java/org/apache/calcite/runtime/ArrayComparator.java
@@ -58,5 +58,3 @@ public class ArrayComparator implements Comparator<Object[]> {
     return 0;
   }
 }
-
-// End ArrayComparator.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/ArrayEnumeratorCursor.java b/core/src/main/java/org/apache/calcite/runtime/ArrayEnumeratorCursor.java
index f15c10d..6775340 100644
--- a/core/src/main/java/org/apache/calcite/runtime/ArrayEnumeratorCursor.java
+++ b/core/src/main/java/org/apache/calcite/runtime/ArrayEnumeratorCursor.java
@@ -37,5 +37,3 @@ public class ArrayEnumeratorCursor extends EnumeratorCursor<Object[]> {
     return new ArrayGetter(ordinal);
   }
 }
-
-// End ArrayEnumeratorCursor.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Automaton.java b/core/src/main/java/org/apache/calcite/runtime/Automaton.java
index 27fd6d6..0079da8 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Automaton.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Automaton.java
@@ -150,5 +150,3 @@ public class Automaton {
     }
   }
 }
-
-// End Automaton.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/AutomatonBuilder.java b/core/src/main/java/org/apache/calcite/runtime/AutomatonBuilder.java
index b35d79c..05484e3 100644
--- a/core/src/main/java/org/apache/calcite/runtime/AutomatonBuilder.java
+++ b/core/src/main/java/org/apache/calcite/runtime/AutomatonBuilder.java
@@ -233,5 +233,3 @@ public class AutomatonBuilder {
     return this;
   }
 }
-
-// End AutomatonBuilder.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/BinarySearch.java b/core/src/main/java/org/apache/calcite/runtime/BinarySearch.java
index f78ffa0..0c1e2f7 100644
--- a/core/src/main/java/org/apache/calcite/runtime/BinarySearch.java
+++ b/core/src/main/java/org/apache/calcite/runtime/BinarySearch.java
@@ -271,5 +271,3 @@ public class BinarySearch {
     }
   }
 }
-
-// End BinarySearch.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Bindable.java b/core/src/main/java/org/apache/calcite/runtime/Bindable.java
index a5c62e9..8658037 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Bindable.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Bindable.java
@@ -35,5 +35,3 @@ public interface Bindable<T> {
    */
   Enumerable<T> bind(DataContext dataContext);
 }
-
-// End Bindable.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/CalciteContextException.java b/core/src/main/java/org/apache/calcite/runtime/CalciteContextException.java
index 1dddc7b..fdedfe6 100644
--- a/core/src/main/java/org/apache/calcite/runtime/CalciteContextException.java
+++ b/core/src/main/java/org/apache/calcite/runtime/CalciteContextException.java
@@ -180,5 +180,3 @@ public class CalciteContextException extends CalciteException {
     return super.getMessage() + ": " + getCause().getMessage();
   }
 }
-
-// End CalciteContextException.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/CalciteException.java b/core/src/main/java/org/apache/calcite/runtime/CalciteException.java
index b073069..440bca1 100644
--- a/core/src/main/java/org/apache/calcite/runtime/CalciteException.java
+++ b/core/src/main/java/org/apache/calcite/runtime/CalciteException.java
@@ -65,5 +65,3 @@ public class CalciteException extends RuntimeException {
     }
   }
 }
-
-// End CalciteException.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java b/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java
index 9805b4e..ac63eb1 100644
--- a/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java
+++ b/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java
@@ -901,5 +901,3 @@ public interface CalciteResource {
   @BaseMessage("Not a valid input for REGEXP_REPLACE: ''{0}''")
   ExInst<CalciteException> invalidInputForRegexpReplace(String value);
 }
-
-// End CalciteResource.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/ConsList.java b/core/src/main/java/org/apache/calcite/runtime/ConsList.java
index fe53901..445cf7e 100644
--- a/core/src/main/java/org/apache/calcite/runtime/ConsList.java
+++ b/core/src/main/java/org/apache/calcite/runtime/ConsList.java
@@ -143,5 +143,3 @@ public class ConsList<E> extends AbstractImmutableList<E> {
     return toList().lastIndexOf(o);
   }
 }
-
-// End ConsList.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/DeterministicAutomaton.java b/core/src/main/java/org/apache/calcite/runtime/DeterministicAutomaton.java
index 8dd47aa..3602c0b 100644
--- a/core/src/main/java/org/apache/calcite/runtime/DeterministicAutomaton.java
+++ b/core/src/main/java/org/apache/calcite/runtime/DeterministicAutomaton.java
@@ -184,5 +184,3 @@ public class DeterministicAutomaton {
     }
   }
 }
-
-// End DeterministicAutomaton.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Enumerables.java b/core/src/main/java/org/apache/calcite/runtime/Enumerables.java
index 374e82f..a9c3f82 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Enumerables.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Enumerables.java
@@ -192,5 +192,3 @@ public class Enumerables {
         Consumer<TResult> consumer);
   }
 }
-
-// End Enumerables.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/EnumeratorCursor.java b/core/src/main/java/org/apache/calcite/runtime/EnumeratorCursor.java
index 740c54f..c1a12b6 100644
--- a/core/src/main/java/org/apache/calcite/runtime/EnumeratorCursor.java
+++ b/core/src/main/java/org/apache/calcite/runtime/EnumeratorCursor.java
@@ -54,5 +54,3 @@ public abstract class EnumeratorCursor<T> extends PositionedCursor<T> {
     enumerator.close();
   }
 }
-
-// End EnumeratorCursor.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Feature.java b/core/src/main/java/org/apache/calcite/runtime/Feature.java
index f38df94..3ef8d85 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Feature.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Feature.java
@@ -27,5 +27,3 @@ public class Feature
     super(base, locale, method, args);
   }
 }
-
-// End Feature.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/FlatLists.java b/core/src/main/java/org/apache/calcite/runtime/FlatLists.java
index a6ea656..c8c7d07 100644
--- a/core/src/main/java/org/apache/calcite/runtime/FlatLists.java
+++ b/core/src/main/java/org/apache/calcite/runtime/FlatLists.java
@@ -1358,5 +1358,3 @@ public class FlatLists {
   }
 
 }
-
-// End FlatLists.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/GeoFunctions.java b/core/src/main/java/org/apache/calcite/runtime/GeoFunctions.java
index 3e258c9..1918436 100644
--- a/core/src/main/java/org/apache/calcite/runtime/GeoFunctions.java
+++ b/core/src/main/java/org/apache/calcite/runtime/GeoFunctions.java
@@ -656,5 +656,3 @@ public class GeoFunctions {
     }
   }
 }
-
-// End GeoFunctions.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Hook.java b/core/src/main/java/org/apache/calcite/runtime/Hook.java
index a02bb0f..01faa4e 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Hook.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Hook.java
@@ -192,5 +192,3 @@ public enum Hook {
     @Override void close();
   }
 }
-
-// End Hook.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/HttpUtils.java b/core/src/main/java/org/apache/calcite/runtime/HttpUtils.java
index 13f09a2..a3b140b 100644
--- a/core/src/main/java/org/apache/calcite/runtime/HttpUtils.java
+++ b/core/src/main/java/org/apache/calcite/runtime/HttpUtils.java
@@ -138,5 +138,3 @@ public class HttpUtils {
     }
   }
 }
-
-// End HttpUtils.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/JsonFunctions.java b/core/src/main/java/org/apache/calcite/runtime/JsonFunctions.java
index f77b87e..f82c394 100644
--- a/core/src/main/java/org/apache/calcite/runtime/JsonFunctions.java
+++ b/core/src/main/java/org/apache/calcite/runtime/JsonFunctions.java
@@ -792,5 +792,3 @@ public class JsonFunctions {
     NONE
   }
 }
-
-// End JsonFunctions.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Like.java b/core/src/main/java/org/apache/calcite/runtime/Like.java
index e55da9d..cfd1910 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Like.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Like.java
@@ -302,5 +302,3 @@ public class Like {
     return javaPattern.toString();
   }
 }
-
-// End Like.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Matcher.java b/core/src/main/java/org/apache/calcite/runtime/Matcher.java
index d5a4c6b..3d835cb 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Matcher.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Matcher.java
@@ -349,5 +349,3 @@ public class Matcher<E> {
     }
   }
 }
-
-// End Matcher.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/ObjectEnumeratorCursor.java b/core/src/main/java/org/apache/calcite/runtime/ObjectEnumeratorCursor.java
index 73cc9a1..233ffa3 100644
--- a/core/src/main/java/org/apache/calcite/runtime/ObjectEnumeratorCursor.java
+++ b/core/src/main/java/org/apache/calcite/runtime/ObjectEnumeratorCursor.java
@@ -52,5 +52,3 @@ public class ObjectEnumeratorCursor extends PositionedCursor<Object> {
     enumerator.close();
   }
 }
-
-// End ObjectEnumeratorCursor.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Pattern.java b/core/src/main/java/org/apache/calcite/runtime/Pattern.java
index 60e01c5..d0ae8a2 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Pattern.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Pattern.java
@@ -226,5 +226,3 @@ public interface Pattern {
 
   }
 }
-
-// End Pattern.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/PredicateImpl.java b/core/src/main/java/org/apache/calcite/runtime/PredicateImpl.java
index 33adb54..db80565 100644
--- a/core/src/main/java/org/apache/calcite/runtime/PredicateImpl.java
+++ b/core/src/main/java/org/apache/calcite/runtime/PredicateImpl.java
@@ -42,5 +42,3 @@ public abstract class PredicateImpl<T> implements Predicate<T> {
   /** Overrides {@code java.util.function.Predicate#test} in JDK8 and higher. */
   public abstract boolean test(@Nullable T t);
 }
-
-// End PredicateImpl.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/RandomFunction.java b/core/src/main/java/org/apache/calcite/runtime/RandomFunction.java
index e1a26c7..f6a15cf 100644
--- a/core/src/main/java/org/apache/calcite/runtime/RandomFunction.java
+++ b/core/src/main/java/org/apache/calcite/runtime/RandomFunction.java
@@ -70,5 +70,3 @@ public class RandomFunction {
   }
 
 }
-
-// End RandomFunction.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/RecordEnumeratorCursor.java b/core/src/main/java/org/apache/calcite/runtime/RecordEnumeratorCursor.java
index e02bc44..e1efdcf 100644
--- a/core/src/main/java/org/apache/calcite/runtime/RecordEnumeratorCursor.java
+++ b/core/src/main/java/org/apache/calcite/runtime/RecordEnumeratorCursor.java
@@ -46,5 +46,3 @@ public class RecordEnumeratorCursor<E> extends EnumeratorCursor<E> {
     return new FieldGetter(clazz.getFields()[ordinal]);
   }
 }
-
-// End RecordEnumeratorCursor.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Resources.java b/core/src/main/java/org/apache/calcite/runtime/Resources.java
index a167500..f00a81e 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Resources.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Resources.java
@@ -1120,5 +1120,3 @@ public class Resources {
     }
   }
 }
-
-// End Resources.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java b/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java
index d8f005b..f8f12bb 100644
--- a/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java
+++ b/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java
@@ -446,5 +446,3 @@ public class ResultSetEnumerable<T> extends AbstractEnumerable<T> {
     void enrich(PreparedStatement statement) throws SQLException;
   }
 }
-
-// End ResultSetEnumerable.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/SocketFactoryImpl.java b/core/src/main/java/org/apache/calcite/runtime/SocketFactoryImpl.java
index e68a6ca..6bd857d 100644
--- a/core/src/main/java/org/apache/calcite/runtime/SocketFactoryImpl.java
+++ b/core/src/main/java/org/apache/calcite/runtime/SocketFactoryImpl.java
@@ -159,5 +159,3 @@ public class SocketFactoryImpl extends SocketFactory {
     return new SocketFactoryImpl();
   }
 }
-
-// End SocketFactoryImpl.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/SortedMultiMap.java b/core/src/main/java/org/apache/calcite/runtime/SortedMultiMap.java
index c1dd446..0f162e4 100644
--- a/core/src/main/java/org/apache/calcite/runtime/SortedMultiMap.java
+++ b/core/src/main/java/org/apache/calcite/runtime/SortedMultiMap.java
@@ -76,5 +76,3 @@ public class SortedMultiMap<K, V> extends HashMap<K, List<V>> {
     return multiMap.arrays(comparator);
   }
 }
-
-// End SortedMultiMap.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java b/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
index 9dc5291..7a44f8c 100644
--- a/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
+++ b/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
@@ -2797,5 +2797,3 @@ public class SqlFunctions {
   }
 
 }
-
-// End SqlFunctions.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/TrustAllSslSocketFactory.java b/core/src/main/java/org/apache/calcite/runtime/TrustAllSslSocketFactory.java
index b7ff117..3e212a4 100644
--- a/core/src/main/java/org/apache/calcite/runtime/TrustAllSslSocketFactory.java
+++ b/core/src/main/java/org/apache/calcite/runtime/TrustAllSslSocketFactory.java
@@ -125,5 +125,3 @@ public class TrustAllSslSocketFactory extends SocketFactoryImpl {
     }
   }
 }
-
-// End TrustAllSslSocketFactory.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Typed.java b/core/src/main/java/org/apache/calcite/runtime/Typed.java
index 8620981..8ae2d78 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Typed.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Typed.java
@@ -27,5 +27,3 @@ public interface Typed {
    */
   Type getElementType();
 }
-
-// End Typed.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Unit.java b/core/src/main/java/org/apache/calcite/runtime/Unit.java
index c3e29ca..9422029 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Unit.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Unit.java
@@ -35,5 +35,3 @@ public class Unit implements Comparable<Unit> {
     return "{}";
   }
 }
-
-// End Unit.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/Utilities.java b/core/src/main/java/org/apache/calcite/runtime/Utilities.java
index 4409a5a..a79cbb6 100644
--- a/core/src/main/java/org/apache/calcite/runtime/Utilities.java
+++ b/core/src/main/java/org/apache/calcite/runtime/Utilities.java
@@ -225,5 +225,3 @@ public class Utilities {
     return Pattern.builder();
   }
 }
-
-// End Utilities.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/package-info.java b/core/src/main/java/org/apache/calcite/runtime/package-info.java
index 25e404f..47b8dbb 100644
--- a/core/src/main/java/org/apache/calcite/runtime/package-info.java
+++ b/core/src/main/java/org/apache/calcite/runtime/package-info.java
@@ -19,5 +19,3 @@
  * Utilities required at runtime.
  */
 package org.apache.calcite.runtime;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/schema/AggregateFunction.java b/core/src/main/java/org/apache/calcite/schema/AggregateFunction.java
index 30e6725..438a1a6 100644
--- a/core/src/main/java/org/apache/calcite/schema/AggregateFunction.java
+++ b/core/src/main/java/org/apache/calcite/schema/AggregateFunction.java
@@ -31,5 +31,3 @@ public interface AggregateFunction extends Function {
    */
   RelDataType getReturnType(RelDataTypeFactory typeFactory);
 }
-
-// End AggregateFunction.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ColumnStrategy.java b/core/src/main/java/org/apache/calcite/schema/ColumnStrategy.java
index e77da37..3806a24 100644
--- a/core/src/main/java/org/apache/calcite/schema/ColumnStrategy.java
+++ b/core/src/main/java/org/apache/calcite/schema/ColumnStrategy.java
@@ -47,5 +47,3 @@ public enum ColumnStrategy {
     return this != STORED && this != VIRTUAL;
   }
 }
-
-// End ColumnStrategy.java
diff --git a/core/src/main/java/org/apache/calcite/schema/CustomColumnResolvingTable.java b/core/src/main/java/org/apache/calcite/schema/CustomColumnResolvingTable.java
index 322a297..9ce0193 100644
--- a/core/src/main/java/org/apache/calcite/schema/CustomColumnResolvingTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/CustomColumnResolvingTable.java
@@ -54,5 +54,3 @@ public interface CustomColumnResolvingTable extends Table {
   List<Pair<RelDataTypeField, List<String>>> resolveColumn(
       RelDataType rowType, RelDataTypeFactory typeFactory, List<String> names);
 }
-
-// End CustomColumnResolvingTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ExtensibleTable.java b/core/src/main/java/org/apache/calcite/schema/ExtensibleTable.java
index 1127adb..96abe62 100644
--- a/core/src/main/java/org/apache/calcite/schema/ExtensibleTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/ExtensibleTable.java
@@ -46,5 +46,3 @@ public interface ExtensibleTable extends Table {
    * counted in the row-type field count. */
   int getExtendedColumnOffset();
 }
-
-// End ExtensibleTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/FilterableTable.java b/core/src/main/java/org/apache/calcite/schema/FilterableTable.java
index 753fe91..8340a32 100644
--- a/core/src/main/java/org/apache/calcite/schema/FilterableTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/FilterableTable.java
@@ -40,5 +40,3 @@ public interface FilterableTable extends Table {
    * operator. */
   Enumerable<Object[]> scan(DataContext root, List<RexNode> filters);
 }
-
-// End FilterableTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Function.java b/core/src/main/java/org/apache/calcite/schema/Function.java
index cdca7a5..8349056 100644
--- a/core/src/main/java/org/apache/calcite/schema/Function.java
+++ b/core/src/main/java/org/apache/calcite/schema/Function.java
@@ -40,5 +40,3 @@ public interface Function {
    */
   List<FunctionParameter> getParameters();
 }
-
-// End Function.java
diff --git a/core/src/main/java/org/apache/calcite/schema/FunctionParameter.java b/core/src/main/java/org/apache/calcite/schema/FunctionParameter.java
index 37af4bd..f675399 100644
--- a/core/src/main/java/org/apache/calcite/schema/FunctionParameter.java
+++ b/core/src/main/java/org/apache/calcite/schema/FunctionParameter.java
@@ -63,5 +63,3 @@ public interface FunctionParameter {
    */
   boolean isOptional();
 }
-
-// End FunctionParameter.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ImplementableAggFunction.java b/core/src/main/java/org/apache/calcite/schema/ImplementableAggFunction.java
index 94b0b45..f703e6c 100644
--- a/core/src/main/java/org/apache/calcite/schema/ImplementableAggFunction.java
+++ b/core/src/main/java/org/apache/calcite/schema/ImplementableAggFunction.java
@@ -35,5 +35,3 @@ public interface ImplementableAggFunction extends AggregateFunction {
    */
   AggImplementor getImplementor(boolean windowContext);
 }
-
-// End ImplementableAggFunction.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ImplementableFunction.java b/core/src/main/java/org/apache/calcite/schema/ImplementableFunction.java
index e138c3e..5f16cb8 100644
--- a/core/src/main/java/org/apache/calcite/schema/ImplementableFunction.java
+++ b/core/src/main/java/org/apache/calcite/schema/ImplementableFunction.java
@@ -31,5 +31,3 @@ public interface ImplementableFunction extends Function {
    */
   CallImplementor getImplementor();
 }
-
-// End ImplementableFunction.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Member.java b/core/src/main/java/org/apache/calcite/schema/Member.java
index e2eee27..8e37a08 100644
--- a/core/src/main/java/org/apache/calcite/schema/Member.java
+++ b/core/src/main/java/org/apache/calcite/schema/Member.java
@@ -81,5 +81,3 @@ public interface Member {
       Object schemaInstance,
       List<Object> arguments);
 }
-
-// End Member.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ModifiableTable.java b/core/src/main/java/org/apache/calcite/schema/ModifiableTable.java
index 71ac06b..487becb 100644
--- a/core/src/main/java/org/apache/calcite/schema/ModifiableTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/ModifiableTable.java
@@ -50,5 +50,3 @@ public interface ModifiableTable extends QueryableTable {
       List<RexNode> sourceExpressionList,
       boolean flattened);
 }
-
-// End ModifiableTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ModifiableView.java b/core/src/main/java/org/apache/calcite/schema/ModifiableView.java
index a1aaf5b..44bfff6 100644
--- a/core/src/main/java/org/apache/calcite/schema/ModifiableView.java
+++ b/core/src/main/java/org/apache/calcite/schema/ModifiableView.java
@@ -65,5 +65,3 @@ public interface ModifiableView extends Table {
   /** Returns the full path of the underlying table. */
   Path getTablePath();
 }
-
-// End ModifiableView.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Path.java b/core/src/main/java/org/apache/calcite/schema/Path.java
index 1575f58..89d7070 100644
--- a/core/src/main/java/org/apache/calcite/schema/Path.java
+++ b/core/src/main/java/org/apache/calcite/schema/Path.java
@@ -41,5 +41,3 @@ public interface Path extends List<Pair<String, Schema>>, RandomAccess {
   /** Returns the schemas of this path. */
   List<Schema> schemas();
 }
-
-// End Path.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ProjectableFilterableTable.java b/core/src/main/java/org/apache/calcite/schema/ProjectableFilterableTable.java
index f6227c4..adf3b2b 100644
--- a/core/src/main/java/org/apache/calcite/schema/ProjectableFilterableTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/ProjectableFilterableTable.java
@@ -59,5 +59,3 @@ public interface ProjectableFilterableTable extends Table {
   Enumerable<Object[]> scan(DataContext root, List<RexNode> filters,
       int[] projects);
 }
-
-// End ProjectableFilterableTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/QueryableTable.java b/core/src/main/java/org/apache/calcite/schema/QueryableTable.java
index ab831cd..9b3d34e 100644
--- a/core/src/main/java/org/apache/calcite/schema/QueryableTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/QueryableTable.java
@@ -43,5 +43,3 @@ public interface QueryableTable extends Table {
    */
   Expression getExpression(SchemaPlus schema, String tableName, Class clazz);
 }
-
-// End QueryableTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ScalarFunction.java b/core/src/main/java/org/apache/calcite/schema/ScalarFunction.java
index 13e7a7c..5ecab34 100644
--- a/core/src/main/java/org/apache/calcite/schema/ScalarFunction.java
+++ b/core/src/main/java/org/apache/calcite/schema/ScalarFunction.java
@@ -31,5 +31,3 @@ public interface ScalarFunction extends Function {
    */
   RelDataType getReturnType(RelDataTypeFactory typeFactory);
 }
-
-// End ScalarFunction.java
diff --git a/core/src/main/java/org/apache/calcite/schema/ScannableTable.java b/core/src/main/java/org/apache/calcite/schema/ScannableTable.java
index 908d745..0c75478 100644
--- a/core/src/main/java/org/apache/calcite/schema/ScannableTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/ScannableTable.java
@@ -28,5 +28,3 @@ public interface ScannableTable extends Table {
    * as an array of its column values. */
   Enumerable<Object[]> scan(DataContext root);
 }
-
-// End ScannableTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Schema.java b/core/src/main/java/org/apache/calcite/schema/Schema.java
index d9e5cfa..7dee0c3 100644
--- a/core/src/main/java/org/apache/calcite/schema/Schema.java
+++ b/core/src/main/java/org/apache/calcite/schema/Schema.java
@@ -344,5 +344,3 @@ public interface Schema {
     }
   }
 }
-
-// End Schema.java
diff --git a/core/src/main/java/org/apache/calcite/schema/SchemaFactory.java b/core/src/main/java/org/apache/calcite/schema/SchemaFactory.java
index 8fcd6ec..0d32e2a 100644
--- a/core/src/main/java/org/apache/calcite/schema/SchemaFactory.java
+++ b/core/src/main/java/org/apache/calcite/schema/SchemaFactory.java
@@ -70,5 +70,3 @@ public interface SchemaFactory {
       String name,
       Map<String, Object> operand);
 }
-
-// End SchemaFactory.java
diff --git a/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java b/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java
index 7e966fc..8043560 100644
--- a/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java
+++ b/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java
@@ -86,5 +86,3 @@ public interface SchemaPlus extends Schema {
 
   boolean isCacheEnabled();
 }
-
-// End SchemaPlus.java
diff --git a/core/src/main/java/org/apache/calcite/schema/SchemaVersion.java b/core/src/main/java/org/apache/calcite/schema/SchemaVersion.java
index 892eda9..49eb5c9 100644
--- a/core/src/main/java/org/apache/calcite/schema/SchemaVersion.java
+++ b/core/src/main/java/org/apache/calcite/schema/SchemaVersion.java
@@ -38,5 +38,3 @@ public interface SchemaVersion {
    */
   boolean isBefore(SchemaVersion other);
 }
-
-// End SchemaVersion.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Schemas.java b/core/src/main/java/org/apache/calcite/schema/Schemas.java
index 17ee95c..fe53d83 100644
--- a/core/src/main/java/org/apache/calcite/schema/Schemas.java
+++ b/core/src/main/java/org/apache/calcite/schema/Schemas.java
@@ -623,5 +623,3 @@ public final class Schemas {
     }
   }
 }
-
-// End Schemas.java
diff --git a/core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java b/core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java
index 0865cff..e2835a4 100644
--- a/core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java
+++ b/core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java
@@ -22,5 +22,3 @@ package org.apache.calcite.schema;
  */
 public interface SemiMutableSchema extends Schema {
 }
-
-// End SemiMutableSchema.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Statistic.java b/core/src/main/java/org/apache/calcite/schema/Statistic.java
index 0d1fdc6..20143e7 100644
--- a/core/src/main/java/org/apache/calcite/schema/Statistic.java
+++ b/core/src/main/java/org/apache/calcite/schema/Statistic.java
@@ -52,5 +52,3 @@ public interface Statistic {
   /** Returns the distribution of the data in this table. */
   RelDistribution getDistribution();
 }
-
-// End Statistic.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Statistics.java b/core/src/main/java/org/apache/calcite/schema/Statistics.java
index 7f5ef5a..eb24a06 100644
--- a/core/src/main/java/org/apache/calcite/schema/Statistics.java
+++ b/core/src/main/java/org/apache/calcite/schema/Statistics.java
@@ -120,5 +120,3 @@ public class Statistics {
     };
   }
 }
-
-// End Statistics.java
diff --git a/core/src/main/java/org/apache/calcite/schema/StreamableTable.java b/core/src/main/java/org/apache/calcite/schema/StreamableTable.java
index a9dcdf8..ea64988 100644
--- a/core/src/main/java/org/apache/calcite/schema/StreamableTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/StreamableTable.java
@@ -28,5 +28,3 @@ public interface StreamableTable extends Table {
    * as an array of its column values. */
   Table stream();
 }
-
-// End StreamableTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Table.java b/core/src/main/java/org/apache/calcite/schema/Table.java
index f3540d1..79f55f6 100644
--- a/core/src/main/java/org/apache/calcite/schema/Table.java
+++ b/core/src/main/java/org/apache/calcite/schema/Table.java
@@ -81,5 +81,3 @@ public interface Table {
   boolean rolledUpColumnValidInsideAgg(String column, SqlCall call,
       SqlNode parent, CalciteConnectionConfig config);
 }
-
-// End Table.java
diff --git a/core/src/main/java/org/apache/calcite/schema/TableFactory.java b/core/src/main/java/org/apache/calcite/schema/TableFactory.java
index ec8ceb2..9875334 100644
--- a/core/src/main/java/org/apache/calcite/schema/TableFactory.java
+++ b/core/src/main/java/org/apache/calcite/schema/TableFactory.java
@@ -85,5 +85,3 @@ public interface TableFactory<T extends Table> {
       Map<String, Object> operand,
       RelDataType rowType);
 }
-
-// End TableFactory.java
diff --git a/core/src/main/java/org/apache/calcite/schema/TableFunction.java b/core/src/main/java/org/apache/calcite/schema/TableFunction.java
index e5402bb..2ec8849 100644
--- a/core/src/main/java/org/apache/calcite/schema/TableFunction.java
+++ b/core/src/main/java/org/apache/calcite/schema/TableFunction.java
@@ -53,5 +53,3 @@ public interface TableFunction extends Function {
    */
   Type getElementType(List<Object> arguments);
 }
-
-// End TableFunction.java
diff --git a/core/src/main/java/org/apache/calcite/schema/TableMacro.java b/core/src/main/java/org/apache/calcite/schema/TableMacro.java
index 8288909..861995a 100644
--- a/core/src/main/java/org/apache/calcite/schema/TableMacro.java
+++ b/core/src/main/java/org/apache/calcite/schema/TableMacro.java
@@ -34,5 +34,3 @@ public interface TableMacro extends Function {
    */
   TranslatableTable apply(List<Object> arguments);
 }
-
-// End TableMacro.java
diff --git a/core/src/main/java/org/apache/calcite/schema/TemporalTable.java b/core/src/main/java/org/apache/calcite/schema/TemporalTable.java
index 5823cbd..6b6a472 100644
--- a/core/src/main/java/org/apache/calcite/schema/TemporalTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/TemporalTable.java
@@ -31,5 +31,3 @@ public interface TemporalTable extends Table {
    * time of each row. */
   @Nonnull String getSysEndFieldName();
 }
-
-// End TemporalTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/TransientTable.java b/core/src/main/java/org/apache/calcite/schema/TransientTable.java
index b3a3702..bcb2d2c 100644
--- a/core/src/main/java/org/apache/calcite/schema/TransientTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/TransientTable.java
@@ -29,5 +29,3 @@ import org.apache.calcite.linq4j.function.Experimental;
 @Experimental
 public interface TransientTable extends Table {
 }
-
-// End TransientTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java b/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java
index c93afcd..046a498 100644
--- a/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java
@@ -36,5 +36,3 @@ public interface TranslatableTable extends Table {
       RelOptTable.ToRelContext context,
       RelOptTable relOptTable);
 }
-
-// End TranslatableTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/Wrapper.java b/core/src/main/java/org/apache/calcite/schema/Wrapper.java
index 8b527df..e68f61f 100644
--- a/core/src/main/java/org/apache/calcite/schema/Wrapper.java
+++ b/core/src/main/java/org/apache/calcite/schema/Wrapper.java
@@ -24,5 +24,3 @@ public interface Wrapper {
    * or returns null if this object does not support that interface. */
   <C> C unwrap(Class<C> aClass);
 }
-
-// End Wrapper.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/AbstractSchema.java b/core/src/main/java/org/apache/calcite/schema/impl/AbstractSchema.java
index c77107b..2c01b19 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/AbstractSchema.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/AbstractSchema.java
@@ -171,5 +171,3 @@ public class AbstractSchema implements Schema {
     }
   }
 }
-
-// End AbstractSchema.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/AbstractTable.java b/core/src/main/java/org/apache/calcite/schema/impl/AbstractTable.java
index d2e92cb..3f93c7e 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/AbstractTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/AbstractTable.java
@@ -62,5 +62,3 @@ public abstract class AbstractTable implements Table, Wrapper {
     return true;
   }
 }
-
-// End AbstractTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/AbstractTableQueryable.java b/core/src/main/java/org/apache/calcite/schema/impl/AbstractTableQueryable.java
index 1e8774c..f28651e 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/AbstractTableQueryable.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/AbstractTableQueryable.java
@@ -66,5 +66,3 @@ public abstract class AbstractTableQueryable<T> extends AbstractQueryable<T> {
     return Linq4j.enumeratorIterator(enumerator());
   }
 }
-
-// End AbstractTableQueryable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/AggregateFunctionImpl.java b/core/src/main/java/org/apache/calcite/schema/impl/AggregateFunctionImpl.java
index 34644e9..45d83be 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/AggregateFunctionImpl.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/AggregateFunctionImpl.java
@@ -141,5 +141,3 @@ public class AggregateFunctionImpl implements AggregateFunction,
     return new RexImpTable.UserDefinedAggReflectiveImplementor(this);
   }
 }
-
-// End AggregateFunctionImpl.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/DelegatingSchema.java b/core/src/main/java/org/apache/calcite/schema/impl/DelegatingSchema.java
index 7c8bb96..4cd1af3 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/DelegatingSchema.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/DelegatingSchema.java
@@ -91,5 +91,3 @@ public class DelegatingSchema implements Schema {
     return schema.getSubSchemaNames();
   }
 }
-
-// End DelegatingSchema.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/ListTransientTable.java b/core/src/main/java/org/apache/calcite/schema/impl/ListTransientTable.java
index 87dcbd4..06eca34 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/ListTransientTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/ListTransientTable.java
@@ -146,5 +146,3 @@ public class ListTransientTable extends AbstractQueryableTable
     return TYPE;
   }
 }
-
-// End ListTransientTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/LongSchemaVersion.java b/core/src/main/java/org/apache/calcite/schema/impl/LongSchemaVersion.java
index b28cd91..399d1b3 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/LongSchemaVersion.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/LongSchemaVersion.java
@@ -56,5 +56,3 @@ public class LongSchemaVersion implements SchemaVersion {
     return String.valueOf(value);
   }
 }
-
-// End LongSchemaVersion.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/MaterializedViewTable.java b/core/src/main/java/org/apache/calcite/schema/impl/MaterializedViewTable.java
index 5121221..c0b9ea7 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/MaterializedViewTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/MaterializedViewTable.java
@@ -126,5 +126,3 @@ public class MaterializedViewTable extends ViewTable {
     }
   }
 }
-
-// End MaterializedViewTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/ModifiableViewTable.java b/core/src/main/java/org/apache/calcite/schema/impl/ModifiableViewTable.java
index 567b780..2caa91d 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/ModifiableViewTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/ModifiableViewTable.java
@@ -260,5 +260,3 @@ public class ModifiableViewTable extends ViewTable
     }
   }
 }
-
-// End ModifiableViewTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/ReflectiveFunctionBase.java b/core/src/main/java/org/apache/calcite/schema/impl/ReflectiveFunctionBase.java
index 981d652..82a966e 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/ReflectiveFunctionBase.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/ReflectiveFunctionBase.java
@@ -141,5 +141,3 @@ public abstract class ReflectiveFunctionBase implements Function {
     }
   }
 }
-
-// End ReflectiveFunctionBase.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java b/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java
index 0736524..1322607 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java
@@ -168,5 +168,3 @@ public class ScalarFunctionImpl extends ReflectiveFunctionBase
     return returnType;
   }
 }
-
-// End ScalarFunctionImpl.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/StarTable.java b/core/src/main/java/org/apache/calcite/schema/impl/StarTable.java
index 05444f6..abd4285 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/StarTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/StarTable.java
@@ -136,5 +136,3 @@ public class StarTable extends AbstractTable implements TranslatableTable {
     }
   }
 }
-
-// End StarTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java b/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java
index 7ee55ab..0b5933a 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java
@@ -162,5 +162,3 @@ public class TableFunctionImpl extends ReflectiveFunctionBase implements
     }
   }
 }
-
-// End TableFunctionImpl.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/TableMacroImpl.java b/core/src/main/java/org/apache/calcite/schema/impl/TableMacroImpl.java
index 017a457..91cdfc6 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/TableMacroImpl.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/TableMacroImpl.java
@@ -92,5 +92,3 @@ public class TableMacroImpl extends ReflectiveFunctionBase
     }
   }
 }
-
-// End TableMacroImpl.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/ViewTable.java b/core/src/main/java/org/apache/calcite/schema/impl/ViewTable.java
index 0c21e64..1e439d2 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/ViewTable.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/ViewTable.java
@@ -146,5 +146,3 @@ public class ViewTable
     }
   }
 }
-
-// End ViewTable.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/ViewTableMacro.java b/core/src/main/java/org/apache/calcite/schema/impl/ViewTableMacro.java
index 5ded4c3..8bdbbcc 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/ViewTableMacro.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/ViewTableMacro.java
@@ -107,5 +107,3 @@ public class ViewTableMacro implements TableMacro {
         RelDataTypeImpl.proto(parsed.rowType), viewSql, schemaPath, viewPath);
   }
 }
-
-// End ViewTableMacro.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/package-info.java b/core/src/main/java/org/apache/calcite/schema/impl/package-info.java
index 8b918de..d8bf0bd 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/package-info.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/package-info.java
@@ -19,5 +19,3 @@
  * Utilities to help implement Calcite's SPIs.
  */
 package org.apache.calcite.schema.impl;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/schema/package-info.java b/core/src/main/java/org/apache/calcite/schema/package-info.java
index bded44c..44c5e97 100644
--- a/core/src/main/java/org/apache/calcite/schema/package-info.java
+++ b/core/src/main/java/org/apache/calcite/schema/package-info.java
@@ -23,5 +23,3 @@
  * identifiers to objects.
  */
 package org.apache.calcite.schema;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/server/CalciteServer.java b/core/src/main/java/org/apache/calcite/server/CalciteServer.java
index 9d769db..8a38ca9 100644
--- a/core/src/main/java/org/apache/calcite/server/CalciteServer.java
+++ b/core/src/main/java/org/apache/calcite/server/CalciteServer.java
@@ -40,5 +40,3 @@ public interface CalciteServer {
   CalciteServerStatement getStatement(Meta.StatementHandle h)
       throws NoSuchStatementException;
 }
-
-// End CalciteServer.java
diff --git a/core/src/main/java/org/apache/calcite/server/CalciteServerStatement.java b/core/src/main/java/org/apache/calcite/server/CalciteServerStatement.java
index 244879d..092d30e 100644
--- a/core/src/main/java/org/apache/calcite/server/CalciteServerStatement.java
+++ b/core/src/main/java/org/apache/calcite/server/CalciteServerStatement.java
@@ -40,5 +40,3 @@ public interface CalciteServerStatement {
 
   void setResultSet(Iterator<Object> resultSet);
 }
-
-// End CalciteServerStatement.java
diff --git a/core/src/main/java/org/apache/calcite/server/package-info.java b/core/src/main/java/org/apache/calcite/server/package-info.java
index 5de3ce7..1102b10 100644
--- a/core/src/main/java/org/apache/calcite/server/package-info.java
+++ b/core/src/main/java/org/apache/calcite/server/package-info.java
@@ -19,5 +19,3 @@
  * Provides a server for hosting Calcite connections.
  */
 package org.apache.calcite.server;
-
-// End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/sql/ExplicitOperatorBinding.java b/core/src/main/java/org/apache/calcite/sql/ExplicitOperatorBinding.java
index 0e3bb23..e42a461 100644
--- a/core/src/main/java/org/apache/calcite/sql/ExplicitOperatorBinding.java
+++ b/core/src/main/java/org/apache/calcite/sql/ExplicitOperatorBinding.java
@@ -92,5 +92,3 @@ public class ExplicitOperatorBinding extends SqlOperatorBinding {
     return false;
   }
 }
-
-// End ExplicitOperatorBinding.java
diff --git a/core/src/main/java/org/apache/calcite/sql/JoinConditionType.java b/core/src/main/java/org/apache/calcite/sql/JoinConditionType.java
index 3b449b0..ce32ba4 100644
--- a/core/src/main/java/org/apache/calcite/sql/JoinConditionType.java
+++ b/core/src/main/java/org/apache/calcite/sql/JoinConditionType.java
@@ -47,5 +47,3 @@ public enum JoinConditionType {
     return SqlLiteral.createSymbol(this, pos);
   }
 }
-
-// End JoinConditionType.java
diff --git a/core/src/main/java/org/apache/calcite/sql/JoinType.java b/core/src/main/java/org/apache/calcite/sql/JoinType.java
index 3ee64d4..698097e 100644
--- a/core/src/main/java/org/apache/calcite/sql/JoinType.java
+++ b/core/src/main/java/org/apache/calcite/sql/JoinType.java
@@ -91,5 +91,3 @@ public enum JoinType {
     return SqlLiteral.createSymbol(this, pos);
   }
 }
-
-// End JoinType.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlAbstractDateTimeLiteral.java b/core/src/main/java/org/apache/calcite/sql/SqlAbstractDateTimeLiteral.java
index 05d77d1..65fa6be 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlAbstractDateTimeLiteral.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlAbstractDateTimeLiteral.java
@@ -85,5 +85,3 @@ public abstract class SqlAbstractDateTimeLiteral extends SqlLiteral {
     writer.literal(this.toString());
   }
 }
-
-// End SqlAbstractDateTimeLiteral.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlAbstractStringLiteral.java b/core/src/main/java/org/apache/calcite/sql/SqlAbstractStringLiteral.java
index 377479b..7759af2 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlAbstractStringLiteral.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlAbstractStringLiteral.java
@@ -46,5 +46,3 @@ abstract class SqlAbstractStringLiteral extends SqlLiteral {
   protected abstract SqlAbstractStringLiteral concat1(
       List<SqlLiteral> literals);
 }
-
-// End SqlAbstractStringLiteral.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlAccessEnum.java b/core/src/main/java/org/apache/calcite/sql/SqlAccessEnum.java
index fbbfc25..7abf1f7 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlAccessEnum.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlAccessEnum.java
@@ -22,5 +22,3 @@ package org.apache.calcite.sql;
 public enum SqlAccessEnum {
   SELECT, UPDATE, INSERT, DELETE;
 }
-
-// End SqlAccessEnum.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlAccessType.java b/core/src/main/java/org/apache/calcite/sql/SqlAccessType.java
index 5efab84..b5e0466 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlAccessType.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlAccessType.java
@@ -70,5 +70,3 @@ public class SqlAccessType {
     return create(accessNames);
   }
 }
-
-// End SqlAccessType.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlAggFunction.java b/core/src/main/java/org/apache/calcite/sql/SqlAggFunction.java
index 8348153..4f9aac3 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlAggFunction.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlAggFunction.java
@@ -205,5 +205,3 @@ public abstract class SqlAggFunction extends SqlFunction implements Context {
     return false;
   }
 }
-
-// End SqlAggFunction.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlAlienSystemTypeNameSpec.java b/core/src/main/java/org/apache/calcite/sql/SqlAlienSystemTypeNameSpec.java
index e6fab0f..f3cd2d6 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlAlienSystemTypeNameSpec.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlAlienSystemTypeNameSpec.java
@@ -89,5 +89,3 @@ public class SqlAlienSystemTypeNameSpec extends SqlBasicTypeNameSpec {
     return super.equalsDeep(node, litmus);
   }
 }
-
-// End SqlAlienSystemTypeNameSpec.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlAlter.java b/core/src/main/java/org/apache/calcite/sql/SqlAlter.java
index 960c7ef..34a3edf 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlAlter.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlAlter.java
@@ -56,5 +56,3 @@ public abstract class SqlAlter extends SqlCall {
   }
 
 }
-
-// End SqlAlter.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlAsOperator.java b/core/src/main/java/org/apache/calcite/sql/SqlAsOperator.java
index 4d9ea95..5e2b7cf 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlAsOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlAsOperator.java
@@ -139,5 +139,3 @@ public class SqlAsOperator extends SqlSpecialOperator {
     return call.getOperandMonotonicity(0);
   }
 }
-
-// End SqlAsOperator.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlBasicCall.java b/core/src/main/java/org/apache/calcite/sql/SqlBasicCall.java
index ad28e0a..0a141f7 100755
--- a/core/src/main/java/org/apache/calcite/sql/SqlBasicCall.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlBasicCall.java
@@ -97,5 +97,3 @@ public class SqlBasicCall extends SqlCall {
   }
 
 }
-
-// End SqlBasicCall.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlBasicTypeNameSpec.java b/core/src/main/java/org/apache/calcite/sql/SqlBasicTypeNameSpec.java
index 11318a5..01358fb 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlBasicTypeNameSpec.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlBasicTypeNameSpec.java
@@ -264,5 +264,3 @@ public class SqlBasicTypeNameSpec extends SqlTypeNameSpec {
     }
   }
 }
-
-// End SqlBasicTypeNameSpec.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlBinaryOperator.java b/core/src/main/java/org/apache/calcite/sql/SqlBinaryOperator.java
index 46cfc1e..1efd2b5 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlBinaryOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlBinaryOperator.java
@@ -221,5 +221,3 @@ public class SqlBinaryOperator extends SqlOperator {
     return litmus.succeed();
   }
 }
-
-// End SqlBinaryOperator.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlBinaryStringLiteral.java b/core/src/main/java/org/apache/calcite/sql/SqlBinaryStringLiteral.java
index d9c4ef2..a2f2433 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlBinaryStringLiteral.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlBinaryStringLiteral.java
@@ -68,5 +68,3 @@ public class SqlBinaryStringLiteral extends SqlAbstractStringLiteral {
         literals.get(0).getParserPosition());
   }
 }
-
-// End SqlBinaryStringLiteral.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlCall.java b/core/src/main/java/org/apache/calcite/sql/SqlCall.java
index 49a5f74..e425e16 100755
--- a/core/src/main/java/org/apache/calcite/sql/SqlCall.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlCall.java
@@ -207,5 +207,3 @@ public abstract class SqlCall extends SqlNode {
     return null;
   }
 }
-
-// End SqlCall.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlCallBinding.java b/core/src/main/java/org/apache/calcite/sql/SqlCallBinding.java
index 8fe2e82..5d0363b 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlCallBinding.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlCallBinding.java
@@ -295,5 +295,3 @@ public class SqlCallBinding extends SqlOperatorBinding {
     return validator.newValidationError(call, ex);
   }
 }
-
-// End SqlCallBinding.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlCharStringLiteral.java b/core/src/main/java/org/apache/calcite/sql/SqlCharStringLiteral.java
index d7d7b10..bf3e43b 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlCharStringLiteral.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlCharStringLiteral.java
@@ -81,5 +81,3 @@ public class SqlCharStringLiteral extends SqlAbstractStringLiteral {
         literals.get(0).getParserPosition());
   }
 }
-
-// End SqlCharStringLiteral.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlCollation.java b/core/src/main/java/org/apache/calcite/sql/SqlCollation.java
index 0ed2da0..6a700f1 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlCollation.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlCollation.java
@@ -280,5 +280,3 @@ public class SqlCollation implements Serializable {
     return coercibility;
   }
 }
-
-// End SqlCollation.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlCollectionTypeNameSpec.java b/core/src/main/java/org/apache/calcite/sql/SqlCollectionTypeNameSpec.java
index 155c661..56ba906 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlCollectionTypeNameSpec.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlCollectionTypeNameSpec.java
@@ -124,5 +124,3 @@ public class SqlCollectionTypeNameSpec extends SqlTypeNameSpec {
     }
   }
 }
-
-// End SqlCollectionTypeNameSpec.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlCreate.java b/core/src/main/java/org/apache/calcite/sql/SqlCreate.java
index b03390e..007e48d 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlCreate.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlCreate.java
@@ -53,5 +53,3 @@ public abstract class SqlCreate extends SqlDdl {
   }
 
 }
-
-// End SqlCreate.java
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDataTypeSpec.java b/core/src/main/java/org/apache/calcite/sql/SqlDataTypeSpec.java
... 14976 lines suppressed ...


[calcite] 04/05: [CALCITE-3559] Improve the layout of parenthesis in code

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit fcfeed53b8981b9b1bf5ccd07d924d56ca36b842
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Dec 4 14:17:07 2019 +0300

    [CALCITE-3559] Improve the layout of parenthesis in code
---
 .../org/apache/calcite/adapter/enumerable/EnumerableWindow.java   | 4 ++--
 .../apache/calcite/rel/metadata/JaninoRelMetadataProvider.java    | 4 ++--
 .../java/org/apache/calcite/rel/rules/AggregateValuesRule.java    | 5 +++--
 .../java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java   | 6 ++----
 core/src/main/java/org/apache/calcite/rex/RexLiteral.java         | 4 ++--
 core/src/main/java/org/apache/calcite/tools/Programs.java         | 7 ++++---
 .../java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java  | 4 ++--
 .../java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java  | 8 +++++---
 .../src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java  | 6 ++++--
 9 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
index 8fd80c2..0e8cc21 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
@@ -741,8 +741,8 @@ public class EnumerableWindow extends Window implements EnumerableRel {
   private Pair<Expression, Expression> getRowCollationKey(
       BlockBuilder builder, PhysType inputPhysType,
       Group group, int windowIdx) {
-    if (!(group.isRows || (group.upperBound.isUnbounded()
-        && group.lowerBound.isUnbounded()))) {
+    if (!(group.isRows
+        || (group.upperBound.isUnbounded() && group.lowerBound.isUnbounded()))) {
       Pair<Expression, Expression> pair =
           inputPhysType.generateCollationKey(
               group.collation().getFieldCollations());
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
index e5e6392..5e087fc 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java
@@ -204,8 +204,8 @@ public class JaninoRelMetadataProvider implements RelMetadataProvider {
         new ReflectiveRelMetadataProvider.Space((Multimap) map);
     for (MetadataHandler provider : space.providerMap.values()) {
       if (providerSet.add(provider)) {
-        providerList.add(Pair.of("provider" + (providerSet.size() - 1),
-            provider));
+        providerList.add(
+            Pair.of("provider" + (providerSet.size() - 1), provider));
       }
     }
 
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
index cf5115c..ee6e141 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateValuesRule.java
@@ -82,8 +82,9 @@ public class AggregateValuesRule extends RelOptRule {
       switch (aggregateCall.getAggregation().getKind()) {
       case COUNT:
       case SUM0:
-        literals.add((RexLiteral) rexBuilder.makeLiteral(
-            BigDecimal.ZERO, aggregateCall.getType(), false));
+        literals.add(
+            (RexLiteral) rexBuilder.makeLiteral(
+                BigDecimal.ZERO, aggregateCall.getType(), false));
         break;
 
       case MIN:
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
index 7fcaa4c..9d333ca 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/LoptOptimizeJoinRule.java
@@ -1883,10 +1883,8 @@ public class LoptOptimizeJoinRule extends RelOptRule {
     if ((leftRowCount != null)
         && (rightRowCount != null)
         && ((leftRowCount < rightRowCount)
-        || ((Math.abs(leftRowCount - rightRowCount)
-        < RelOptUtil.EPSILON)
-        && (rowWidthCost(left.getJoinTree())
-        < rowWidthCost(right.getJoinTree()))))) {
+        || ((Math.abs(leftRowCount - rightRowCount) < RelOptUtil.EPSILON)
+            && (rowWidthCost(left.getJoinTree()) < rowWidthCost(right.getJoinTree()))))) {
       swap = true;
     }
     return swap;
diff --git a/core/src/main/java/org/apache/calcite/rex/RexLiteral.java b/core/src/main/java/org/apache/calcite/rex/RexLiteral.java
index 0911a1e..5617d86 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexLiteral.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexLiteral.java
@@ -429,8 +429,8 @@ public class RexLiteral extends RexNode {
       NlsString nlsString = (NlsString) value;
 
       // Ignore type information for 'Bar':CHAR(3)
-      if (((nlsString.getCharset() != null
-          && type.getCharset().equals(nlsString.getCharset()))
+      if ((
+          (nlsString.getCharset() != null && type.getCharset().equals(nlsString.getCharset()))
           || (nlsString.getCharset() == null
           && SqlCollation.IMPLICIT.getCharset().equals(type.getCharset())))
           && nlsString.getCollation().equals(type.getCollation())
diff --git a/core/src/main/java/org/apache/calcite/tools/Programs.java b/core/src/main/java/org/apache/calcite/tools/Programs.java
index 7bdfe1f..2268a31 100644
--- a/core/src/main/java/org/apache/calcite/tools/Programs.java
+++ b/core/src/main/java/org/apache/calcite/tools/Programs.java
@@ -246,9 +246,10 @@ public class Programs {
 
   public static Program subQuery(RelMetadataProvider metadataProvider) {
     final HepProgramBuilder builder = HepProgram.builder();
-    builder.addRuleCollection(ImmutableList.of((RelOptRule) SubQueryRemoveRule.FILTER,
-        SubQueryRemoveRule.PROJECT,
-        SubQueryRemoveRule.JOIN));
+    builder.addRuleCollection(
+        ImmutableList.of(SubQueryRemoveRule.FILTER,
+            SubQueryRemoveRule.PROJECT,
+            SubQueryRemoveRule.JOIN));
     return of(builder.build(), true, metadataProvider);
   }
 
diff --git a/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java b/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
index 7515900..78f51eb 100644
--- a/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
+++ b/kafka/src/main/java/org/apache/calcite/adapter/kafka/KafkaTableFactory.java
@@ -68,8 +68,8 @@ public class KafkaTableFactory implements TableFactory<KafkaStreamTable> {
     tableOptionBuilder.setRowConverter(rowConverter);
 
     if (operand.containsKey(KafkaTableConstants.SCHEMA_CONSUMER_PARAMS)) {
-      tableOptionBuilder.setConsumerParams((Map<String, String>) operand.get(
-          KafkaTableConstants.SCHEMA_CONSUMER_PARAMS));
+      tableOptionBuilder.setConsumerParams(
+          (Map<String, String>) operand.get(KafkaTableConstants.SCHEMA_CONSUMER_PARAMS));
     }
     if (operand.containsKey(KafkaTableConstants.SCHEMA_CUST_CONSUMER)) {
       String custConsumerClass = (String) operand.get(KafkaTableConstants.SCHEMA_CUST_CONSUMER);
diff --git a/kafka/src/test/java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java b/kafka/src/test/java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java
index 86f98bf..e52b35a 100644
--- a/kafka/src/test/java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java
+++ b/kafka/src/test/java/org/apache/calcite/adapter/kafka/KafkaMockConsumer.java
@@ -39,9 +39,11 @@ public class KafkaMockConsumer extends MockConsumer {
     updateBeginningOffsets(beginningOffsets);
 
     for (int idx = 0; idx < 10; ++idx) {
-      addRecord(new ConsumerRecord<byte[], byte[]>("testtopic",
-          0, idx, ("mykey" + idx).getBytes(StandardCharsets.UTF_8),
-          ("myvalue" + idx).getBytes(StandardCharsets.UTF_8)));
+      addRecord(
+          new ConsumerRecord<>("testtopic",
+              0, idx,
+              ("mykey" + idx).getBytes(StandardCharsets.UTF_8),
+              ("myvalue" + idx).getBytes(StandardCharsets.UTF_8)));
     }
   }
 }
diff --git a/linq4j/src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java b/linq4j/src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java
index d3b96eb..bc79dae 100644
--- a/linq4j/src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java
+++ b/linq4j/src/test/java/org/apache/calcite/linq4j/test/Linq4jTest.java
@@ -1956,8 +1956,10 @@ public class Linq4jTest {
   @Test public void testGroupByWithKeySelectorAndResultSelector() {
     String s =
         Linq4j.asEnumerable(emps)
-            .groupBy(EMP_DEPTNO_SELECTOR, (key, group) -> String.format(Locale.ROOT, "%s: %s", key,
-                stringJoin("+", group.select(element -> element.name))))
+            .groupBy(
+                EMP_DEPTNO_SELECTOR,
+                (key, group) -> String.format(Locale.ROOT, "%s: %s", key,
+                    stringJoin("+", group.select(element -> element.name))))
             .toList()
             .toString();
     assertEquals(


[calcite] 02/05: [CALCITE-3559] Fix Checkstyle 8 findings

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 644629185432b67adde527dfbeadaa30e5e9f69d
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Dec 4 15:00:57 2019 +0300

    [CALCITE-3559] Fix Checkstyle 8 findings
---
 .../calcite/adapter/cassandra/CassandraRules.java   |  2 +-
 .../enumerable/EnumerableRepeatUnionRule.java       |  8 ++++----
 .../enumerable/EnumerableTableFunctionScan.java     |  2 +-
 .../adapter/enumerable/RexToLixTranslator.java      |  6 ++----
 .../apache/calcite/plan/SubstitutionVisitor.java    |  4 ++--
 .../apache/calcite/rel/metadata/RelMdCollation.java |  2 +-
 .../calcite/rel/rules/FilterMultiJoinMergeRule.java |  6 +++---
 .../rel/rules/ProjectMultiJoinMergeRule.java        |  4 ++--
 .../apache/calcite/sql/advise/SqlSimpleParser.java  | 12 ++++++------
 .../main/java/org/apache/calcite/util/NameSet.java  |  2 +-
 .../apache/calcite/test/SqlHintsConverterTest.java  |  8 ++++----
 .../calcite/adapter/druid/DruidDateTimeUtils.java   |  9 +++------
 .../apache/calcite/adapter/druid/DruidRules.java    |  2 +-
 .../adapter/elasticsearch/ElasticsearchRules.java   |  4 ++--
 .../elasticsearch/EmbeddedElasticsearchNode.java    |  8 ++++----
 .../apache/calcite/adapter/csv/CsvStreamReader.java | 12 ++++++------
 .../calcite/adapter/enumerable/package-info.java    | 21 +++++++++++++++++++++
 17 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java
index 90112aa..a5ae66d 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraRules.java
@@ -373,7 +373,7 @@ public class CassandraRules {
 
     private CassandraLimitRule() {
       super(operand(EnumerableLimit.class, operand(CassandraToEnumerableConverter.class, any())),
-        "CassandraLimitRule");
+          "CassandraLimitRule");
     }
 
     public RelNode convert(EnumerableLimit limit) {
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
index b57118a..6b7fec5 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRepeatUnionRule.java
@@ -29,10 +29,10 @@ public class EnumerableRepeatUnionRule extends ConverterRule {
 
   EnumerableRepeatUnionRule() {
     super(
-      LogicalRepeatUnion.class,
-      Convention.NONE,
-      EnumerableConvention.INSTANCE,
-      "EnumerableRepeatUnionRule");
+        LogicalRepeatUnion.class,
+        Convention.NONE,
+        EnumerableConvention.INSTANCE,
+        "EnumerableRepeatUnionRule");
 
   }
 
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java
index cc5b49a..1c27b7b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableFunctionScan.java
@@ -46,7 +46,7 @@ public class EnumerableTableFunctionScan extends TableFunctionScan
       RelDataType rowType, RexNode call,
       Set<RelColumnMapping> columnMappings) {
     super(cluster, traits, inputs, call, elementType, rowType,
-      columnMappings);
+        columnMappings);
   }
 
   @Override public EnumerableTableFunctionScan copy(
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
index 814e65b..ad3332b 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexToLixTranslator.java
@@ -662,16 +662,14 @@ public class RexToLixTranslator {
       nullAs = RexImpTable.NullAs.NOT_POSSIBLE;
     }
     switch (expr.getKind()) {
-    case INPUT_REF:
-    {
+    case INPUT_REF: {
       final int index = ((RexInputRef) expr).getIndex();
       Expression x = inputGetter.field(list, index, storageType);
 
       Expression input = list.append("inp" + index + "_", x); // safe to share
       return handleNullUnboxingIfNecessary(input, nullAs, storageType);
     }
-    case PATTERN_INPUT_REF:
-    {
+    case PATTERN_INPUT_REF: {
       final int index = ((RexInputRef) expr).getIndex();
       Expression x = inputGetter.field(list, index, storageType);
 
diff --git a/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java b/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
index 75484b0..df8146b 100644
--- a/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
+++ b/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
@@ -1153,8 +1153,8 @@ public class SubstitutionVisitor {
 
     private JoinOnLeftCalcToJoinUnifyRule() {
       super(
-        operand(MutableJoin.class, operand(MutableCalc.class, query(0)), query(1)),
-        operand(MutableJoin.class, target(0), target(1)), 2);
+          operand(MutableJoin.class, operand(MutableCalc.class, query(0)), query(1)),
+          operand(MutableJoin.class, target(0), target(1)), 2);
     }
 
     @Override protected UnifyResult apply(UnifyRuleCall call) {
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
index 4358373..34cd90e 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
@@ -254,7 +254,7 @@ public class RelMdCollation
         program
             .getProjectList()
             .stream()
-            .map((p) -> program.expandLocalRef(p))
+            .map(program::expandLocalRef)
             .collect(Collectors.toList());
     return project(mq, input, projects);
   }
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
index 553c4ac..5638956 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterMultiJoinMergeRule.java
@@ -60,9 +60,9 @@ public class FilterMultiJoinMergeRule extends RelOptRule {
   public FilterMultiJoinMergeRule(Class<? extends Filter> filterClass,
       RelBuilderFactory relBuilderFactory) {
     super(
-      operand(filterClass,
-        operand(MultiJoin.class, any())),
-      relBuilderFactory, null);
+        operand(filterClass,
+          operand(MultiJoin.class, any())),
+        relBuilderFactory, null);
   }
 
   //~ Methods ----------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
index a36c1f6..c41d474 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectMultiJoinMergeRule.java
@@ -59,8 +59,8 @@ public class ProjectMultiJoinMergeRule extends RelOptRule {
   public ProjectMultiJoinMergeRule(Class<? extends Project> projectClass,
       RelBuilderFactory relBuilderFactory) {
     super(
-      operand(projectClass,
-        operand(MultiJoin.class, any())), relBuilderFactory, null);
+        operand(projectClass,
+         operand(MultiJoin.class, any())), relBuilderFactory, null);
   }
 
   //~ Methods ----------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/advise/SqlSimpleParser.java b/core/src/main/java/org/apache/calcite/sql/advise/SqlSimpleParser.java
index 2e29d6d..1d51d5c 100644
--- a/core/src/main/java/org/apache/calcite/sql/advise/SqlSimpleParser.java
+++ b/core/src/main/java/org/apache/calcite/sql/advise/SqlSimpleParser.java
@@ -261,11 +261,11 @@ public class SqlSimpleParser {
   //~ Inner Classes ----------------------------------------------------------
 
   public static class Tokenizer {
-    private static final Map<String, TokenType> map = new HashMap<>();
+    private static final Map<String, TokenType> TOKEN_TYPES = new HashMap<>();
 
     static {
       for (TokenType type : TokenType.values()) {
-        map.put(type.name(), type);
+        TOKEN_TYPES.put(type.name(), type);
       }
     }
 
@@ -373,8 +373,8 @@ public class SqlSimpleParser {
               pos = indexOfLineEnd(sql, pos + 2);
               return new Token(TokenType.COMMENT);
             }
-            // fall through
           }
+          // fall through
 
         case '-':
           // possible start of '--' comment
@@ -415,7 +415,7 @@ public class SqlSimpleParser {
               }
             }
             String name = sql.substring(start, pos);
-            TokenType tokenType = map.get(name.toUpperCase(Locale.ROOT));
+            TokenType tokenType = TOKEN_TYPES.get(name.toUpperCase(Locale.ROOT));
             if (tokenType == null) {
               return new IdToken(TokenType.ID, name);
             } else {
@@ -480,7 +480,7 @@ public class SqlSimpleParser {
   static class Query extends Token {
     private final List<Token> tokenList;
 
-    public Query(List<Token> tokenList) {
+    Query(List<Token> tokenList) {
       super(TokenType.QUERY);
       this.tokenList = new ArrayList<>(tokenList);
     }
@@ -718,7 +718,7 @@ public class SqlSimpleParser {
         Token token = sublist.get(i);
         switch (token.type) {
         case QUERY:
-          if (((Query)token).contains(hintToken)) {
+          if (((Query) token).contains(hintToken)) {
             found = true;
           }
           break;
diff --git a/core/src/main/java/org/apache/calcite/util/NameSet.java b/core/src/main/java/org/apache/calcite/util/NameSet.java
index a04922b..d257276 100644
--- a/core/src/main/java/org/apache/calcite/util/NameSet.java
+++ b/core/src/main/java/org/apache/calcite/util/NameSet.java
@@ -43,7 +43,7 @@ public class NameSet {
 
   /** Creates a NameSet that is an immutable copy of a given collection. */
   public static NameSet immutableCopyOf(Set<String> names) {
-    return new NameSet(NameMap.immutableCopyOf(Maps.asMap(names, (k) -> DUMMY)));
+    return new NameSet(NameMap.immutableCopyOf(Maps.asMap(names, k -> DUMMY)));
   }
 
   @Override public String toString() {
diff --git a/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java b/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java
index 4fad77b..d1aa4d8 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlHintsConverterTest.java
@@ -387,10 +387,10 @@ public class SqlHintsConverterTest extends SqlToRelTestBase {
 
     MockEnumerableJoinRule(RelHint hint) {
       super(
-        LogicalJoin.class,
-        Convention.NONE,
-        EnumerableConvention.INSTANCE,
-        "MockEnumerableJoinRule");
+          LogicalJoin.class,
+          Convention.NONE,
+          EnumerableConvention.INSTANCE,
+          "MockEnumerableJoinRule");
       this.expectedHint = hint;
     }
 
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidDateTimeUtils.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidDateTimeUtils.java
index 8fa16da..7fceb67 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidDateTimeUtils.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidDateTimeUtils.java
@@ -170,8 +170,7 @@ public class DruidDateTimeUtils {
     case LESS_THAN:
     case LESS_THAN_OR_EQUAL:
     case GREATER_THAN:
-    case GREATER_THAN_OR_EQUAL:
-    {
+    case GREATER_THAN_OR_EQUAL: {
       final Long value;
       SqlKind kind = call.getKind();
       if (call.getOperands().get(0) instanceof RexInputRef
@@ -200,8 +199,7 @@ public class DruidDateTimeUtils {
         return ImmutableList.of(Range.lessThan(value), Range.greaterThan(value));
       }
     }
-    case BETWEEN:
-    {
+    case BETWEEN: {
       final Long value1;
       final Long value2;
       if (literalValue(call.getOperands().get(2)) != null
@@ -220,8 +218,7 @@ public class DruidDateTimeUtils {
       return ImmutableList.of(Range.lessThan(inverted ? value2 : value1),
           Range.greaterThan(inverted ? value1 : value2));
     }
-    case IN:
-    {
+    case IN: {
       ImmutableList.Builder<Range<Long>> ranges =
           ImmutableList.builder();
       for (RexNode operand : Util.skip(call.operands)) {
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
index a9abdb4..54aefea 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
@@ -804,7 +804,7 @@ public class DruidRules {
           operand(Project.class,
               operand(Filter.class,
                   operand(DruidQuery.class, none()))),
-              expr -> false,
+          expr -> false,
           relBuilderFactory);
     }
   }
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
index 5ad76df..6e34d6a 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
@@ -237,7 +237,7 @@ class ElasticsearchRules {
 
     private ElasticsearchFilterRule() {
       super(LogicalFilter.class, Convention.NONE, ElasticsearchRel.CONVENTION,
-        "ElasticsearchFilterRule");
+          "ElasticsearchFilterRule");
     }
 
     @Override public RelNode convert(RelNode relNode) {
@@ -288,7 +288,7 @@ class ElasticsearchRules {
 
     private ElasticsearchProjectRule() {
       super(LogicalProject.class, Convention.NONE, ElasticsearchRel.CONVENTION,
-        "ElasticsearchProjectRule");
+          "ElasticsearchProjectRule");
     }
 
     @Override public RelNode convert(RelNode relNode) {
diff --git a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
index c5a56fc..9a9c370 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
@@ -157,10 +157,10 @@ class EmbeddedElasticsearchNode implements AutoCloseable {
 
     private LocalNode(Settings settings, Collection<Class<? extends Plugin>> classpathPlugins) {
       super(
-        InternalSettingsPreparer.prepareEnvironment(settings, emptyMap(),
-          null, () -> "default_node_name"),
-        classpathPlugins,
-        false);
+          InternalSettingsPreparer.prepareEnvironment(settings, emptyMap(),
+            null, () -> "default_node_name"),
+          classpathPlugins,
+          false);
     }
   }
 }
diff --git a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvStreamReader.java b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvStreamReader.java
index 0478935..b9b8249 100644
--- a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvStreamReader.java
+++ b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvStreamReader.java
@@ -52,12 +52,12 @@ class CsvStreamReader extends CSVReader implements Closeable {
 
   CsvStreamReader(Source source) {
     this(source,
-      CSVParser.DEFAULT_SEPARATOR,
-      CSVParser.DEFAULT_QUOTE_CHARACTER,
-      CSVParser.DEFAULT_ESCAPE_CHARACTER,
-      DEFAULT_SKIP_LINES,
-      CSVParser.DEFAULT_STRICT_QUOTES,
-      CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
+        CSVParser.DEFAULT_SEPARATOR,
+        CSVParser.DEFAULT_QUOTE_CHARACTER,
+        CSVParser.DEFAULT_ESCAPE_CHARACTER,
+        DEFAULT_SKIP_LINES,
+        CSVParser.DEFAULT_STRICT_QUOTES,
+        CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
   }
 
   /**
diff --git a/ubenchmark/src/jmh/java/org/apache/calcite/adapter/enumerable/package-info.java b/ubenchmark/src/jmh/java/org/apache/calcite/adapter/enumerable/package-info.java
new file mode 100644
index 0000000..8a48fe8
--- /dev/null
+++ b/ubenchmark/src/jmh/java/org/apache/calcite/adapter/enumerable/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Benchmarks for Enumerable adapter
+ */
+package org.apache.calcite.adapter.enumerable;