Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-13298][Core][UI]Escape "label" to avoid DAG being broken by some special character #11309

Closed
wants to merge 2 commits into from

Conversation

zsxwing
Copy link
Member

@zsxwing zsxwing commented Feb 22, 2016

What changes were proposed in this pull request?

When there are some special characters (e.g., ", \) in label, DAG will be broken. This patch just escapes label to avoid DAG being broken by some special characters

How was the this patch tested?

Jenkins tests

@zsxwing
Copy link
Member Author

zsxwing commented Feb 22, 2016

cc @andrewor14

@andrewor14
Copy link
Contributor

LGTM

@zsxwing
Copy link
Member Author

zsxwing commented Feb 22, 2016

retest this please

@@ -20,10 +20,11 @@ package org.apache.spark.ui.scope
import scala.collection.mutable
import scala.collection.mutable.{ListBuffer, StringBuilder}

import org.apache.commons.lang.StringEscapeUtils
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use anything from commons.lang; use commons.lang3.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, we should add a style-checker rule to ban the commons.lang import.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the import

@andrewor14
Copy link
Contributor

retest this please

1 similar comment
@zsxwing
Copy link
Member Author

zsxwing commented Feb 22, 2016

retest this please

@SparkQA
Copy link

SparkQA commented Feb 23, 2016

Test build #51691 has finished for PR 11309 at commit 813be50.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@andrewor14
Copy link
Contributor

Merged into master and 1.6.

@asfgit asfgit closed this in a11b399 Feb 23, 2016
asfgit pushed a commit that referenced this pull request Feb 23, 2016
…ome special character

## What changes were proposed in this pull request?

When there are some special characters (e.g., `"`, `\`) in `label`, DAG will be broken. This patch just escapes `label` to avoid DAG being broken by some special characters

## How was the this patch tested?

Jenkins tests

Author: Shixiong Zhu <shixiong@databricks.com>

Closes #11309 from zsxwing/SPARK-13298.

(cherry picked from commit a11b399)
Signed-off-by: Andrew Or <andrew@databricks.com>
@SparkQA
Copy link

SparkQA commented Feb 23, 2016

Test build #51698 has finished for PR 11309 at commit 813be50.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@zsxwing zsxwing deleted the SPARK-13298 branch February 23, 2016 05:54
ghost pushed a commit to dbtsai/spark that referenced this pull request Mar 9, 2016
When generating Graphviz DOT files in the SQL query visualization we need to escape double-quotes inside node labels. This is a followup to apache#11309, which fixed a similar graph in Spark Core's DAG visualization.

Author: Josh Rosen <joshrosen@databricks.com>

Closes apache#11587 from JoshRosen/graphviz-escaping.
asfgit pushed a commit that referenced this pull request Mar 9, 2016
When generating Graphviz DOT files in the SQL query visualization we need to escape double-quotes inside node labels. This is a followup to #11309, which fixed a similar graph in Spark Core's DAG visualization.

Author: Josh Rosen <joshrosen@databricks.com>

Closes #11587 from JoshRosen/graphviz-escaping.

(cherry picked from commit 81f54ac)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>
roygao94 pushed a commit to roygao94/spark that referenced this pull request Mar 22, 2016
When generating Graphviz DOT files in the SQL query visualization we need to escape double-quotes inside node labels. This is a followup to apache#11309, which fixed a similar graph in Spark Core's DAG visualization.

Author: Josh Rosen <joshrosen@databricks.com>

Closes apache#11587 from JoshRosen/graphviz-escaping.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants