peter-toth commented on a change in pull request #28041: [SPARK-30564][SQL]
Improved extra new line and comment remove
URL: https://github.com/apache/spark/pull/28041#discussion_r400235880
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeFormatter.scala
##########
@@ -95,9 +95,128 @@ object CodeFormatter {
new CodeAndComment(code.result().trim(), map)
}
- def stripExtraNewLinesAndComments(input: String): String = {
+ def stripExtraNewLinesAndCommentsUsingRegexp(input: String): String = {
extraNewLinesRegexp.replaceAllIn(commentRegexp.replaceAllIn(input, ""),
"\n")
}
+
+ private object State extends Enumeration {
+ val TEXT, SEPARATOR, SEPARATOR_WITH_NEWLINE, MAYBE_COMMENT, LINE_COMMENT,
BLOCK_COMMENT,
+ BLOCK_COMMENT_WITH_NEWLINE, MAYBE_BLOCK_COMMENT_CLOSING,
+ MAYBE_BLOCK_COMMENT_WITH_NEWLINE_CLOSING = Value
+ }
+
+ def stripExtraNewLinesAndComments(input: String): String = {
Review comment:
I've brushed it up a bit. I left `if`s instead of `match/case`s where we
have only 2 or less branches. Let me know if it needs more brushing.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
