spark git commit: [SPARK-8862][SQL]Support multiple SQLContexts in Web UI

[rxin]

Repository: spark
Updated Branches:
  refs/heads/master f0cda587f -> 7aaed1b11


[SPARK-8862][SQL]Support multiple SQLContexts in Web UI

This is a follow-up PR to solve the UI issue when there are multiple 
SQLContexts. Each SQLContext has a separate tab and contains queries which are 
executed by this SQLContext.

<img width="1366" alt="multiple sqlcontexts" 
src="https://cloud.githubusercontent.com/assets/1000778/9088391/54584434-3bc2-11e5-9caf-94c2b0da528e.png";>

Author: zsxwing <zsxw...@gmail.com>

Closes #7962 from zsxwing/multi-sqlcontext-ui and squashes the following 
commits:

cf661e1 [zsxwing] sql -> SQL
39b0c97 [zsxwing] Support multiple SQLContexts in Web UI


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7aaed1b1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7aaed1b1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7aaed1b1

Branch: refs/heads/master
Commit: 7aaed1b114751a24835204b8c588533d5c5ffaf0
Parents: f0cda58
Author: zsxwing <zsxw...@gmail.com>
Authored: Thu Aug 6 22:52:23 2015 -0700
Committer: Reynold Xin <r...@databricks.com>
Committed: Thu Aug 6 22:52:23 2015 -0700

----------------------------------------------------------------------
 .../org/apache/spark/sql/ui/AllExecutionsPage.scala     |  2 +-
 .../src/main/scala/org/apache/spark/sql/ui/SQLTab.scala | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/7aaed1b1/sql/core/src/main/scala/org/apache/spark/sql/ui/AllExecutionsPage.scala
----------------------------------------------------------------------
diff --git 
a/sql/core/src/main/scala/org/apache/spark/sql/ui/AllExecutionsPage.scala 
b/sql/core/src/main/scala/org/apache/spark/sql/ui/AllExecutionsPage.scala
index 727fc4b..cb7ca60 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/ui/AllExecutionsPage.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/ui/AllExecutionsPage.scala
@@ -178,7 +178,7 @@ private[ui] abstract class ExecutionTable(
     "%s/jobs/job?id=%s".format(UIUtils.prependBaseUri(parent.basePath), jobId)
 
   private def executionURL(executionID: Long): String =
-    "%s/sql/execution?id=%s".format(UIUtils.prependBaseUri(parent.basePath), 
executionID)
+    
s"${UIUtils.prependBaseUri(parent.basePath)}/${parent.prefix}/execution?id=$executionID"
 }
 
 private[ui] class RunningExecutionTable(

http://git-wip-us.apache.org/repos/asf/spark/blob/7aaed1b1/sql/core/src/main/scala/org/apache/spark/sql/ui/SQLTab.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/ui/SQLTab.scala 
b/sql/core/src/main/scala/org/apache/spark/sql/ui/SQLTab.scala
index a9e5226..3bba0af 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/ui/SQLTab.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/ui/SQLTab.scala
@@ -17,13 +17,14 @@
 
 package org.apache.spark.sql.ui
 
+import java.util.concurrent.atomic.AtomicInteger
+
 import org.apache.spark.Logging
 import org.apache.spark.sql.SQLContext
 import org.apache.spark.ui.{SparkUI, SparkUITab}
 
 private[sql] class SQLTab(sqlContext: SQLContext, sparkUI: SparkUI)
-  extends SparkUITab(sparkUI, "sql") with Logging {
-
+  extends SparkUITab(sparkUI, SQLTab.nextTabName) with Logging {
 
   val parent = sparkUI
   val listener = sqlContext.listener
@@ -38,4 +39,11 @@ private[sql] class SQLTab(sqlContext: SQLContext, sparkUI: 
SparkUI)
 private[sql] object SQLTab {
 
   private val STATIC_RESOURCE_DIR = "org/apache/spark/sql/ui/static"
+
+  private val nextTabId = new AtomicInteger(0)
+
+  private def nextTabName: String = {
+    val nextId = nextTabId.getAndIncrement()
+    if (nextId == 0) "SQL" else s"SQL${nextId}"
+  }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org