From 0ce001a9da78f5bdc770f133bf7a630fea438ddf Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Mon, 23 Apr 2018 16:51:49 -0500 Subject: [PATCH 1/5] HBASE-20478 hbase-anti precommit test should log details and add a footer as needed. --- dev-support/hbase-personality.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index b010503553..c514a501b2 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -611,6 +611,7 @@ function hbaseanti_patchfile local patchfile=$1 local warnings local result + local logfile if [[ "${BUILDMODE}" = full ]]; then return 0 @@ -621,34 +622,53 @@ function hbaseanti_patchfile fi big_console_header "Checking for known anti-patterns" + logfile="patchfile-hbaseanti-results.txt" + > "${PATCH_DIR}/${logfile}" start_clock warnings=$(${GREP} -c 'new TreeMap>"${PATCH_DIR}/${logfile}" + ${GREP} 'new TreeMap>"${PATCH_DIR}/${logfile}" + start_clock ((result=result+1)) fi warnings=$(${GREP} -c 'import org.apache.hadoop.classification' "${patchfile}") if [[ ${warnings} -gt 0 ]]; then add_vote_table -1 hbaseanti "" "The patch appears use Hadoop classification instead of HBase." + echo "Use of Hadoop classification annotations in patch" + echo "Use of Hadoop classification annotations in patch" >>"${PATCH_DIR}/${logfile}" + ${GREP} 'import org.apache.hadoop.classification' "${patchfile}" >>"${PATCH_DIR}/${logfile}" + start_clock ((result=result+1)) fi warnings=$(${GREP} -c 'import org.codehaus.jackson' "${patchfile}") if [[ ${warnings} -gt 0 ]]; then add_vote_table -1 hbaseanti "" "The patch appears use Jackson 1 classes/annotations." + echo "Use of Jackson 1 classes/annotations in patch" + echo "Use of Jackson 1 classes/annotations in patch" >>"${PATCH_DIR}/${logfile}" + ${GREP} 'import org.codehaus.jackson' "${patchfile}" >>"${PATCH_DIR}/${logfile}" + start_clock ((result=result+1)) fi warnings=$(${GREP} -cE 'org.apache.commons.logging.Log(Factory|;)' "${patchfile}") if [[ ${warnings} -gt 0 ]]; then add_vote_table -1 hbaseanti "" "The patch appears to use commons-logging instead of slf4j." + echo "Use of commons-logging instead of slf4j in patch" + echo "Use of commons-logging instead of slf4j in patch" >>"${PATCH_DIR}/${logfile}" + ${GREP} -E 'org.apache.commons.logging.Log(Factory|;)' "${patchfile}" >>"${PATCH_DIR}/${logfile}" + start_clock ((result=result+1)) fi if [[ ${result} -gt 0 ]]; then + add_footer_table hbaseanti "@@BASE@@/${logfile}" return 1 fi -- 2.16.1 From 64bd668ae4bdf75d0cad5fe038800ae2abe57d98 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Mon, 23 Apr 2018 16:56:10 -0500 Subject: [PATCH 2/5] WIP break treemap. --- .../java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java index 5e174ebc3d..3cd351797b 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java @@ -273,7 +273,7 @@ public final class BackupSystemTable implements Closeable { try (Table table = connection.getTable(bulkLoadTableName); ResultScanner scanner = table.getScanner(scan)) { Result res = null; - Map map = new TreeMap<>(Bytes.BYTES_COMPARATOR); + Map map = new TreeMap<>(); while ((res = scanner.next()) != null) { res.advance(); byte[] row = CellUtil.cloneRow(res.listCells().get(0)); -- 2.16.1 From 487e11d341a20204efefa8bc22f3cf0d6de90647 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Mon, 23 Apr 2018 16:57:56 -0500 Subject: [PATCH 3/5] WIP break the hadoop classification. --- .../src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java index ff1e13f795..3623c00eef 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.util.BackupSet; -import org.apache.yetus.audience.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceAudience; /** * The administrative API for HBase Backup. Construct an instance and call {@link #close()} -- 2.16.1 From 207aee977b7b0f4859eac4c66aec3cfa70982f00 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Mon, 23 Apr 2018 16:58:59 -0500 Subject: [PATCH 4/5] WIP break jackson 1 --- .../src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index 5a63ef4393..ee7f368b31 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hbase; import com.codahale.metrics.Histogram; import com.codahale.metrics.UniformReservoir; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.ObjectMapper; +import org.codehaus.jackson.databind.MapperFeature; +import org.codehaus.jackson.databind.ObjectMapper; import java.io.IOException; import java.io.PrintStream; -- 2.16.1 From bbe1e8c36bac4c4150a0906fad72f82a20c1de74 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Mon, 23 Apr 2018 17:00:12 -0500 Subject: [PATCH 5/5] WIP break commons-logging --- .../main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java index e0975548ae..3beb9be0f2 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java @@ -29,8 +29,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.impl.BackupManifest; import org.apache.yetus.audience.InterfaceAudience; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * View to an on-disk Backup Image FileSytem Provides the set of methods necessary to interact with @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; */ @InterfaceAudience.Private public final class HBackupFileSystem { - public static final Logger LOG = LoggerFactory.getLogger(HBackupFileSystem.class); + public static final Log LOG = LogFactory.getLog(HBackupFileSystem.class); /** * This is utility class. -- 2.16.1