Skip to content

[SPARK-21751][SQL] CodeGeneraor.splitExpressions counts code size more precisely #18966

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.

Sign up for GitHub

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

Closed
kiszk wants to merge 9 commits into from
Closed

[SPARK-21751][SQL] CodeGeneraor.splitExpressions counts code size more precisely #18966

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ac090a
initial commit
kiszk Aug 16, 2017
d96f8e5
make threshold configurable
kiszk Aug 17, 2017
87578db
use lines per method as split threshold instead of chars per method
kiszk Aug 24, 2017
073e9e5
update benchmark results
kiszk Aug 25, 2017
63377a6
make a new option effective at runtime
kiszk Aug 26, 2017
a489938
rebase with master
kiszk Oct 4, 2017
b04c09c
avoid to use SparkEnv.get
kiszk Oct 6, 2017
4c47802
use the original threshold against Java code excluding comments
kiszk Oct 10, 2017
516a72a
revert test case
kiszk Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rebase with master
  • Loading branch information
@kiszk
kiszk committed Oct 4, 2017
commit a489938b3f128558df31c97a32e196620c9fd475
8 changes: 8 additions & 0 deletions ...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeFormatter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ object CodeFormatter {
}
new CodeAndComment(code.result().trim(), map)
}

def stripExtraNewLinesAndComments(input: String): String = {
val commentReg =
("""([ |\t]*?\/\*[\s|\S]*?\*\/[ |\t]*?)|""" + // strip /*comment*/
"""([ |\t]*?\/\/[\s\S]*?\n)""").r // strip //comment
val codeWithoutComment = commentReg.replaceAllIn(input, "")
codeWithoutComment.replaceAll("""\n\s*\n""", "\n") // strip ExtraNewLines
}
Copy link
Member

@gatorsmile gatorsmile Oct 10, 2017

Choose a reason for hiding this comment

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

Could you also add back the test case of this function?

}

private class CodeFormatter {
Expand Down