HIVE-18469 : HS2UI: Introduce separate option to show query on web ui (Bharathkrishna Guruvayoor Murali reviewed by Zoltan Haindrich and Vihang Karajgaonkar)

Author: Bharathkrishna Guruvayoor Murali

common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

@@ -1809,6 +1809,9 @@ public static enum ConfVars {
       "HTTP/[email protected]", "The HiveServer2 WebUI SPNEGO service principal.\n" +
       "The special string _HOST will be replaced automatically with \n" +
       "the value of hive.server2.webui.host or the correct host name."),
+    HIVE_SERVER2_WEBUI_EXPLAIN_OUTPUT("hive.server2.webui.explain.output", false,
+        "When set to true, the EXPLAIN output for every query is displayed"
+            + " in the HS2 WebUI / Drilldown / Query Plan tab.\n"),
 
     // Configuration for async thread pool in SessionManager
     HIVE_SERVER2_ASYNC_EXEC_THREADS("hive.server2.async.exec.threads", 100,
@@ -3184,4 +3187,4 @@ public static boolean isLoadHiveServer2Config() {
   public static void setLoadHiveServer2Config(boolean loadHiveServer2Config) {
     HiveConf.loadHiveServer2Config = loadHiveServer2Config;
   }
-}
+}

ql/src/java/org/apache/hadoop/hive/ql/Driver.java

@@ -548,14 +548,15 @@ public Map<String, String> getHiveVariable() {
         }
       }
 
-      if (conf.getBoolVar(ConfVars.HIVE_LOG_EXPLAIN_OUTPUT)) {
+      if (conf.getBoolVar(ConfVars.HIVE_LOG_EXPLAIN_OUTPUT)
+          || conf.getBoolVar(ConfVars.HIVE_SERVER2_WEBUI_EXPLAIN_OUTPUT)) {
         String explainOutput = getExplainOutput(sem, plan, tree.dump());
         if (explainOutput != null) {
           if (conf.getBoolVar(ConfVars.HIVE_LOG_EXPLAIN_OUTPUT)) {
-            LOG.info("EXPLAIN output for queryid " + queryId + " : "
-              + explainOutput);
+            LOG.info("EXPLAIN output for queryid " + queryId + " : " + explainOutput);
           }
-          if (conf.isWebUiQueryInfoCacheEnabled()) {
+          if (conf.isWebUiQueryInfoCacheEnabled()
+              && conf.getBoolVar(ConfVars.HIVE_SERVER2_WEBUI_EXPLAIN_OUTPUT)) {
             queryDisplay.setExplainPlan(explainOutput);
           }
         }