From 1986a6ec3131ab8654380e2598cde75488b9ad83 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Fri, 10 Apr 2020 11:00:53 -0500 Subject: [PATCH] HBASE-24163 MOB compactor implementations should use format specifiers when calling String.format Signed-off-by: stack Signed-off-by: Viraj Jasani Signed-off-by: Josh Elser --- .../hadoop/hbase/mob/DefaultMobStoreCompactor.java | 10 +++++----- .../hadoop/hbase/mob/FaultyMobStoreCompactor.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java index 6de12111a821..e93d87237cca 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java @@ -439,9 +439,9 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel mobRefSet.get().put(refTable.get(), fName); writer.append(c); } else { - throw new IOException("MOB cell did not contain a tablename " + throw new IOException(String.format("MOB cell did not contain a tablename " + "tag. should not be possible. see ref guide on mob troubleshooting. " - + "store=" + getStoreInfo() + " cell=" + c); + + "store=%s cell=%s", getStoreInfo(), c)); } } } @@ -495,9 +495,9 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel mobRefSet.get().put(refTable.get(), MobUtils.getMobFileName(c)); writer.append(c); } else { - throw new IOException("MOB cell did not contain a tablename " - + "tag. should not be possible. see ref guide on mob troubleshooting. " + "store=" - + getStoreInfo() + " cell=" + c); + throw new IOException(String.format("MOB cell did not contain a tablename " + + "tag. should not be possible. see ref guide on mob troubleshooting. " + + "store=%s cell=%s", getStoreInfo(), c)); } } else { String errMsg = String.format("Corrupted MOB reference: %s", c.toString()); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java index f19289dca753..324b897d9fde 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java @@ -246,9 +246,9 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel mobRefSet.get().put(refTable.get(), MobUtils.getMobFileName(c)); writer.append(c); } else { - throw new IOException("MOB cell did not contain a tablename " + throw new IOException(String.format("MOB cell did not contain a tablename " + "tag. should not be possible. see ref guide on mob troubleshooting. " - + "store=" + getStoreInfo() + " cell=" + c); + + "store=%s cell=%s", getStoreInfo(), c)); } } else { // If the value is not larger than the threshold, it's not regarded a mob. Retrieve @@ -270,9 +270,9 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel mobRefSet.get().put(refTable.get(), MobUtils.getMobFileName(c)); writer.append(c); } else { - throw new IOException("MOB cell did not contain a tablename " + throw new IOException(String.format("MOB cell did not contain a tablename " + "tag. should not be possible. see ref guide on mob troubleshooting. " - + "store=" + getStoreInfo() + " cell=" + c); + + "store=%s cell=%s", getStoreInfo(), c)); } } }