[SPARK-11352] [SQL] Escape */ in the generated comments. #10072
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -95,7 +95,7 @@ abstract class Expression extends TreeNode[Expression] { | |||
| ctx.subExprEliminationExprs.get(this).map { subExprState => | |||
| // This expression is repeated meaning the code to evaluated has already been added | |||
| // as a function and called in advance. Just use it. | |||
| val code = s"/* $this */" | |||
| val code = s"/* ${this.toString.replace("*/", "\\*\\/")} */" | |||
There was a problem hiding this comment.
Should we put this as a utility in ctx?
Maybe. def escapeComment(< thing to put inside /* */>)
This seems easy to get wrong in the future too.
|
Test build #46981 has finished for PR 10072 at commit
|
|
We should backport this into 1.5 as well. |
|
sure |
|
LGTM |
|
Test build #46997 has finished for PR 10072 at commit
|
|
Merging to master, branch 1.6, and branch 1.5. |
asfgit
pushed a commit
that referenced
this pull request
Dec 2, 2015
https://issues.apache.org/jira/browse/SPARK-11352 Author: Yin Huai <yhuai@databricks.com> Closes #10072 from yhuai/SPARK-11352. (cherry picked from commit 5872a9d) Signed-off-by: Yin Huai <yhuai@databricks.com>
|
I will have a pr for branch 1.5. The current on conflicts a lot with branch 1.5. |
asfgit
pushed a commit
that referenced
this pull request
Dec 2, 2015
https://issues.apache.org/jira/browse/SPARK-11352 This one backports #10072 to branch 1.5. Author: Yin Huai <yhuai@databricks.com> Closes #10084 from yhuai/SPARK-11352-branch-1.5.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.apache.org/jira/browse/SPARK-11352