From 9b98aef6a39a5a9ea9fc5481b5a0d92620ba6347 Mon Sep 17 00:00:00 2001
From: Sean Owen <sowen@cloudera.com>
Date: Wed, 27 Sep 2017 13:40:21 -0700
Subject: [PATCH] [HOTFIX][BUILD] Fix finalizer checkstyle error and re-disable
checkstyle
## What changes were proposed in this pull request?
Fix finalizer checkstyle violation by just turning it off; re-disable checkstyle as it won't be run by SBT PR builder. See https://github.com/apache/spark/pull/18887#issuecomment-332580700
## How was this patch tested?
`./dev/lint-java` runs successfully
Author: Sean Owen <sowen@cloudera.com>
Closes #19371 from srowen/HotfixFinalizerCheckstlye.
---
.../java/org/apache/spark/io/NioBufferedFileInputStream.java | 2 --
dev/checkstyle-suppressions.xml | 2 --
dev/checkstyle.xml | 1 -
pom.xml | 1 +
4 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/core/src/main/java/org/apache/spark/io/NioBufferedFileInputStream.java b/core/src/main/java/org/apache/spark/io/NioBufferedFileInputStream.java
index ea5f1a9abf..f6d1288cb2 100644
--- a/core/src/main/java/org/apache/spark/io/NioBufferedFileInputStream.java
+++ b/core/src/main/java/org/apache/spark/io/NioBufferedFileInputStream.java
@@ -130,10 +130,8 @@ public final class NioBufferedFileInputStream extends InputStream {
StorageUtils.dispose(byteBuffer);
}
- //checkstyle.off: NoFinalizer
@Override
protected void finalize() throws IOException {
close();
}
- //checkstyle.on: NoFinalizer
}
diff --git a/dev/checkstyle-suppressions.xml b/dev/checkstyle-suppressions.xml
index 6e15f69559..bbda824dd1 100644
--- a/dev/checkstyle-suppressions.xml
+++ b/dev/checkstyle-suppressions.xml
@@ -40,8 +40,6 @@
files="src/main/java/org/apache/hive/service/*"/>
<suppress checks="MethodName"
files="src/main/java/org/apache/hive/service/auth/PasswdAuthenticationProvider.java"/>
- <suppress checks="NoFinalizer"
- files="src/main/java/org/apache/hive/service/server/ThreadWithGarbageCleanup.java"/>
<suppress checks="MethodName"
files="sql/catalyst/src/main/java/org/apache/spark/sql/streaming/OutputMode.java"/>
<suppress checks="MethodName"
diff --git a/dev/checkstyle.xml b/dev/checkstyle.xml
index 68aee4d4c9..53c284888e 100644
--- a/dev/checkstyle.xml
+++ b/dev/checkstyle.xml
@@ -131,7 +131,6 @@
<message key="name.invalidPattern"
value="Method type name ''{0}'' must match pattern ''{1}''."/>
</module>
- <module name="NoFinalizer"/>
<module name="GenericWhitespace">
<message key="ws.followed"
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
diff --git a/pom.xml b/pom.xml
index b0408ecca0..83a3500670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2488,6 +2488,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<configuration>
+ <failOnViolation>false</failOnViolation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectories>${basedir}/src/main/java,${basedir}/src/main/scala</sourceDirectories>
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
--
GitLab