This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 93f48c5 HBASE-22481 Javadoc Warnings reference not found
93f48c5 is described below
commit 93f48c5319e0aa4f6526208eb80c259475c56c40
Author: syedmurtazahassan <[email protected]>
AuthorDate: Sat Jun 8 20:25:31 2019 +0200
HBASE-22481 Javadoc Warnings reference not found
---
.../src/main/resources/hbase/checkstyle.xml | 7 ++++++
.../mapred/MultiTableSnapshotInputFormat.java | 27 +++++++++++-----------
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index 2001ae7..fd5ced8 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -31,6 +31,10 @@
-->
<module name="Checker">
+ <!-- Filter out Checkstyle warnings that have been suppressed with the
@SuppressWarnings
+ annotation -->
+ <module name="SuppressWarningsFilter"/>
+
<module name="FileTabCharacter"/>
<module name="TreeWalker">
@@ -130,5 +134,8 @@
http://checkstyle.sourceforge.net/config_whitespace.html -->
<module name="MethodParamPad"/>
<module name="ParenPad"/>
+
+ <!-- Make the @SuppressWarnings annotations available to Checkstyle -->
+ <module name="SuppressWarningsHolder"/>
</module>
</module>
diff --git
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/MultiTableSnapshotInputFormat.java
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/MultiTableSnapshotInputFormat.java
index 71e5296..7902d1a 100644
---
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/MultiTableSnapshotInputFormat.java
+++
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/MultiTableSnapshotInputFormat.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hbase.mapred;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.yetus.audience.InterfaceAudience;
@@ -38,15 +39,15 @@ import java.util.List;
import java.util.Map;
/**
- * MultiTableSnapshotInputFormat generalizes {@link
org.apache.hadoop.hbase.mapred
- * .TableSnapshotInputFormat}
+ * MultiTableSnapshotInputFormat generalizes
+ * {@link org.apache.hadoop.hbase.mapred.TableSnapshotInputFormat}
* allowing a MapReduce job to run over one or more table snapshots, with one
or more scans
* configured for each.
- * Internally, the input format delegates to {@link
org.apache.hadoop.hbase.mapreduce
- * .TableSnapshotInputFormat}
- * and thus has the same performance advantages; see {@link
org.apache.hadoop.hbase.mapreduce
- * .TableSnapshotInputFormat} for
- * more details.
+ * Internally, the input format delegates to
+ * {@link org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat}
+ * and thus has the same performance advantages; see
+ * {@link org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat}
+ * for more details.
* Usage is similar to TableSnapshotInputFormat, with the following exception:
* initMultiTableSnapshotMapperJob takes in a map
* from snapshot name to a collection of scans. For each snapshot in the map,
each corresponding
@@ -71,8 +72,8 @@ import java.util.Map;
* </pre>
* Internally, this input format restores each snapshot into a subdirectory of
the given tmp
* directory. Input splits and
- * record readers are created as described in {@link
org.apache.hadoop.hbase.mapreduce
- * .TableSnapshotInputFormat}
+ * record readers are created as described in
+ * {@link org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat}
* (one per region).
* See {@link org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat} for
more notes on
* permissioning; the
@@ -107,13 +108,13 @@ public class MultiTableSnapshotInputFormat extends
TableSnapshotInputFormat
return new TableSnapshotRecordReader((TableSnapshotRegionSplit) split,
job);
}
+ @SuppressWarnings("checkstyle:linelength")
/**
* Configure conf to read from snapshotScans, with snapshots restored to a
subdirectory of
* restoreDir.
- * Sets: {@link org.apache.hadoop.hbase.mapreduce
- * .MultiTableSnapshotInputFormatImpl#RESTORE_DIRS_KEY},
- * {@link org.apache.hadoop.hbase.mapreduce
- * .MultiTableSnapshotInputFormatImpl#SNAPSHOT_TO_SCANS_KEY}
+ * Sets:
+ * {@link
org.apache.hadoop.hbase.mapreduce.MultiTableSnapshotInputFormatImpl#RESTORE_DIRS_KEY},
+ * {@link
org.apache.hadoop.hbase.mapreduce.MultiTableSnapshotInputFormatImpl#SNAPSHOT_TO_SCANS_KEY}
*
* @param conf
* @param snapshotScans
