diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecOrcRowGroupCountPrinter.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecOrcRowGroupCountPrinter.java index 18ef325..ac79ceb 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecOrcRowGroupCountPrinter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecOrcRowGroupCountPrinter.java @@ -60,10 +60,10 @@ public void run(HookContext hookContext) throws Exception { if (counters != null) { for (CounterGroup group : counters) { if (group.getName().equals(LlapIOCounters.class.getName())) { - console.printError(tezTask.getId() + " LLAP IO COUNTERS:"); + console.printInfo(tezTask.getId() + " LLAP IO COUNTERS:", false); for (TezCounter counter : group) { if (counter.getDisplayName().equals(LlapIOCounters.SELECTED_ROWGROUPS.name())) { - console.printError(" " + counter.getDisplayName() + ": " + counter.getValue()); + console.printInfo(" " + counter.getDisplayName() + ": " + counter.getValue(), false); } } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecTezSummaryPrinter.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecTezSummaryPrinter.java index 412f45c..45bd6e0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecTezSummaryPrinter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecTezSummaryPrinter.java @@ -62,25 +62,25 @@ public void run(HookContext hookContext) throws Exception { String hiveCountersGroup = HiveConf.getVar(conf, HiveConf.ConfVars.HIVECOUNTERGROUP); for (CounterGroup group : counters) { if (hiveCountersGroup.equals(group.getDisplayName())) { - console.printError(tezTask.getId() + " HIVE COUNTERS:"); + console.printInfo(tezTask.getId() + " HIVE COUNTERS:", false); for (TezCounter counter : group) { - console.printError(" " + counter.getDisplayName() + ": " + counter.getValue()); + console.printInfo(" " + counter.getDisplayName() + ": " + counter.getValue(), false); } } else if (group.getName().equals(FileSystemCounter.class.getName())) { - console.printError(tezTask.getId() + " FILE SYSTEM COUNTERS:"); + console.printInfo(tezTask.getId() + " FILE SYSTEM COUNTERS:", false); for (TezCounter counter : group) { // HDFS counters should be relatively consistent across test runs when compared to // local file system counters if (counter.getName().contains("HDFS")) { - console.printError(" " + counter.getDisplayName() + ": " + counter.getValue()); + console.printInfo(" " + counter.getDisplayName() + ": " + counter.getValue(), false); } } } else if (group.getName().equals(LlapIOCounters.class.getName())) { - console.printError(tezTask.getId() + " LLAP IO COUNTERS:"); + console.printInfo(tezTask.getId() + " LLAP IO COUNTERS:", false); List testSafeCounters = LlapIOCounters.testSafeCounterNames(); for (TezCounter counter : group) { if (testSafeCounters.contains(counter.getDisplayName())) { - console.printError(" " + counter.getDisplayName() + ": " + counter.getValue()); + console.printInfo(" " + counter.getDisplayName() + ": " + counter.getValue(), false); } } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecutePrinter.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecutePrinter.java index b4fc125..3e74396 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecutePrinter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PostExecutePrinter.java @@ -116,8 +116,8 @@ public void run(QueryState queryState, Set inputs, } if (queryState != null) { - console.printError("POSTHOOK: query: " + queryState.getQueryString().trim()); - console.printError("POSTHOOK: type: " + queryState.getCommandType()); + console.printInfo("POSTHOOK: query: " + queryState.getQueryString().trim(), false); + console.printInfo("POSTHOOK: type: " + queryState.getCommandType(), false); } PreExecutePrinter.printEntities(console, inputs, "POSTHOOK: Input: "); @@ -167,7 +167,7 @@ public void run(QueryState queryState, Set inputs, } sb.append("]"); - console.printError(sb.toString()); + console.printInfo(sb.toString(), false); } } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PreExecutePrinter.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PreExecutePrinter.java index 232c62d..20acfb1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/PreExecutePrinter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/PreExecutePrinter.java @@ -65,8 +65,8 @@ public void run(QueryState queryState, Set inputs, } if (queryState != null) { - console.printError("PREHOOK: query: " + queryState.getQueryString().trim()); - console.printError("PREHOOK: type: " + queryState.getCommandType()); + console.printInfo("PREHOOK: query: " + queryState.getQueryString().trim(), false); + console.printInfo("PREHOOK: type: " + queryState.getCommandType(), false); } printEntities(console, inputs, "PREHOOK: Input: "); @@ -80,7 +80,7 @@ static void printEntities(LogHelper console, Set entities, String prefix) { } Collections.sort(strings); for (String s : strings) { - console.printError(prefix + s); + console.printInfo(prefix + s, false); } } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java b/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java index 1e9774f..ffce1d1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java @@ -1096,8 +1096,16 @@ public void printInfo(String info) { printInfo(info, null); } + public void printInfo(String info, boolean isSilent) { + printInfo(info, null, isSilent); + } + public void printInfo(String info, String detail) { - if (!getIsSilent()) { + printInfo(info, detail, getIsSilent()); + } + + public void printInfo(String info, String detail, boolean isSilent) { + if (!isSilent) { getInfoStream().println(info); } LOG.info(info + StringUtils.defaultString(detail));