commit aa3defcdba81dfc6473e6d6ee8ddbe0970ad0da4 Author: David Lavati Date: Sun Apr 19 19:18:07 2020 +0200 HIVE-23088 Using Strings from log4j breaks non-log4j users Change-Id: Ieddaa10a722e81ab305f223ba441077a259c7fa6 diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestMiniClusters.java itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestMiniClusters.java index 997b35e18f..46e2f64a83 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestMiniClusters.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestMiniClusters.java @@ -37,6 +37,7 @@ import org.apache.avro.io.DatumWriter; import org.apache.avro.io.EncoderFactory; import org.apache.avro.specific.SpecificDatumWriter; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.FileSystem; @@ -62,7 +63,6 @@ import org.apache.hive.kafka.SingleNodeKafkaCluster; import org.apache.hive.kafka.Wikipedia; import org.apache.hive.testutils.MiniZooKeeperCluster; -import org.apache.logging.log4j.util.Strings; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; import org.apache.zookeeper.ZooKeeper; @@ -583,7 +583,7 @@ private void setFsRelatedProperties(HiveConf conf, boolean isLocalFs, FileSystem Path userInstallPath; if (isLocalFs) { String buildDir = QTestSystemProperties.getBuildDir(); - Preconditions.checkState(Strings.isNotBlank(buildDir)); + Preconditions.checkState(StringUtils.isNotBlank(buildDir)); Path path = new Path(fsUriString, buildDir); // Create a fake fs root for local fs diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestRunnerUtils.java itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestRunnerUtils.java index 102619596c..5fb138d0ed 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestRunnerUtils.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestRunnerUtils.java @@ -20,8 +20,8 @@ import java.io.File; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hive.ql.QTestMiniClusters.MiniClusterType; -import org.apache.logging.log4j.util.Strings; public class QTestRunnerUtils { public static final String DEFAULT_INIT_SCRIPT = "q_test_init.sql"; @@ -104,7 +104,7 @@ public static boolean queryListRunnerSingleThreaded(File[] qfiles, QTestUtil[] q StringBuilder builder = new StringBuilder(); builder.append("Test ").append(qfiles[i].getName()) .append(" results check failed with error code ").append(result.getReturnCode()); - if (Strings.isNotEmpty(result.getCapturedOutput())) { + if (StringUtils.isNotEmpty(result.getCapturedOutput())) { builder.append(" and diff value ").append(result.getCapturedOutput()); } System.err.println(builder.toString()); @@ -155,7 +155,7 @@ public static boolean queryListRunnerMultiThreaded(File[] qfiles, QTestUtil[] qt StringBuilder builder = new StringBuilder(); builder.append("Test ").append(qfiles[i].getName()) .append(" results check failed with error code ").append(result.getReturnCode()); - if (Strings.isNotEmpty(result.getCapturedOutput())) { + if (StringUtils.isNotEmpty(result.getCapturedOutput())) { builder.append(" and diff value ").append(result.getCapturedOutput()); } System.err.println(builder.toString()); diff --git llap-server/src/java/org/apache/hadoop/hive/llap/log/LlapWrappedAppender.java llap-server/src/java/org/apache/hadoop/hive/llap/log/LlapWrappedAppender.java index 5cd60059b1..f35d244794 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/log/LlapWrappedAppender.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/log/LlapWrappedAppender.java @@ -23,7 +23,6 @@ import java.nio.file.Paths; import java.util.concurrent.atomic.AtomicReference; -import com.google.common.base.Preconditions; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; diff --git ql/src/java/org/apache/hadoop/hive/ql/hooks/HookUtils.java ql/src/java/org/apache/hadoop/hive/ql/hooks/HookUtils.java index 0841d679c5..58e95e170f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/hooks/HookUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/hooks/HookUtils.java @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.ql.exec.Utilities; -import org.apache.logging.log4j.util.Strings; public class HookUtils { @@ -47,7 +47,7 @@ public static String redactLogString(HiveConf conf, String logString) throws InstantiationException, IllegalAccessException, ClassNotFoundException { String csHooks = conf.getVar(hookConfVar); List hooks = new ArrayList<>(); - if (Strings.isBlank(csHooks)) { + if (StringUtils.isBlank(csHooks)) { return hooks; } String[] hookClasses = csHooks.split(",");