Skip to content

[SPARK-12362][SQL][WIP] Inline Hive Parser #10525

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
hvanhovell wants to merge 16 commits into from
Closed

[SPARK-12362][SQL][WIP] Inline Hive Parser #10525

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9d51dd1
[SPARK-12363] [SQL] Inline Hive parser into spark sql.
nongli Dec 16, 2015
0cbf502
Updates to support antlr 3.5.2 and SBT build.
nongli Dec 21, 2015
7e1a145
Add anti join to grammar as an example.
nongli Dec 16, 2015
cd07d7f
Remove dead code from the parser.
hvanhovell Dec 28, 2015
8ced9c0
Remove tests no longer supported by parser (HIVE-11145).
hvanhovell Dec 29, 2015
cb60ba0
Remove ASTNodeOrigin
hvanhovell Dec 29, 2015
feee2ba
Merge remote-tracking branch 'spark/master' into SPARK-12362
hvanhovell Dec 29, 2015
2e30d92
Fix CTE and position errors.
hvanhovell Dec 29, 2015
b8e76b2
Fix described errors.
hvanhovell Dec 29, 2015
a7749a8
Change log level of the Hive Compilation phase to 'debug'.
hvanhovell Dec 30, 2015
90c11e8
Add the generated files to the build by hand
hvanhovell Dec 30, 2015
84db0f4
Embed ANTLR generation code in build.
hvanhovell Dec 30, 2015
ad8fecd
Merge remote-tracking branch 'spark/master' into SPARK-12362
hvanhovell Dec 30, 2015
84b006b
Fix deps.
hvanhovell Dec 31, 2015
edfbd35
Revert deps.
hvanhovell Dec 31, 2015
e3e2f72
Remove debugging code from the build code. Do not use SBT internal AP…
hvanhovell Dec 31, 2015
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
Remove debugging code from the build code. Do not use SBT internal AP… 
…I: <+=.
  • Loading branch information
@hvanhovell
hvanhovell committed Dec 31, 2015
commit e3e2f72d8080f8e0040be351032c7e3b24289c77
18 changes: 9 additions & 9 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ object SQL {
}

object Hive {

lazy val settings = Seq(
javaOptions += "-XX:MaxPermSize=256m",
// Specially disable assertions since some Hive tests fail them
Expand Down Expand Up @@ -418,9 +419,8 @@ object Hive {
//
// This has been heavily inspired by com.github.stefri.sbt-antlr (0.5.3). It fixes a number of
// build errors in the current plugin.
logLevel in Compile := Level.Debug,
// Create Parser from ANTLR grammar files.
sourceGenerators in Compile <+= Def.task {
sourceGenerators in Compile += Def.task {
val log = streams.value.log

val grammarFileNames = Seq(
Expand All @@ -439,10 +439,10 @@ object Hive {
antlr.setMake(true)

// Add grammar files.
grammarFileNames.flatMap(g => (sourceDir ** g).get).foreach { g =>
val relPath = (g relativeTo sourceDir).get.getPath
log.info("ANTLR: Grammar file '%s' detected.".format(relPath))
antlr.addGrammarFile(relPath)
grammarFileNames.flatMap(gFileName => (sourceDir ** gFileName).get).foreach { gFilePath =>
val relGFilePath = (gFilePath relativeTo sourceDir).get.getPath
log.info("ANTLR: Grammar file '%s' detected.".format(relGFilePath))
antlr.addGrammarFile(relGFilePath)
}

// Generate the parser.
Expand All @@ -453,11 +453,11 @@ object Hive {

// Return all generated java files.
(targetDir ** "*.java").get.toSeq
},
}.taskValue,
// Include ANTLR tokens files.
resourceGenerators in Compile <+= Def.task {
resourceGenerators in Compile += Def.task {
((sourceManaged in Compile).value ** "*.tokens").get.toSeq
}
}.taskValue
)
}

Expand Down