Skip to content

[SPARK-6202] [SQL] enable variable substitution on test framework #4930

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
adrian-wang wants to merge 4 commits into from
Closed

[SPARK-6202] [SQL] enable variable substitution on test framework #4930

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18fb481
enable variable substitute on test framework
adrian-wang Mar 6, 2015
9c4a950
add a comment explaining
adrian-wang Mar 18, 2015
b1d68bf
only substitute for parseSql
adrian-wang Mar 20, 2015
2ce590f
add explicit function types
adrian-wang Mar 23, 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
Next Next commit
only substitute for parseSql
  • Loading branch information
@adrian-wang
adrian-wang committed Mar 23, 2015
commit b1d68bfde905d469369d85fc7f935f1089b26c36
11 changes: 4 additions & 7 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,13 @@ class TestHiveContext(sc: SparkContext) extends HiveContext(sc) {

val vs = new VariableSubstitution()

protected[hive] class HiveQLQueryExecution(hql: String)
extends this.SubstitutedHiveQLQueryExecution(vs.substitute(hiveconf, hql))

// we should substitute variables in hql to pass the text to parseSql() as a parameter.
// Hive parser need substituted text. HiveContext.sql() does this but return a DataFrame,
// while we need a logicalPlan so we cannot reuse that.
protected[hive] class SubstitutedHiveQLQueryExecution(hql: String)
extends this.QueryExecution(HiveQl.parseSql(hql)) {
def hiveExec(): Seq[String] = runSqlHive(hql)
override def toString: String = hql + "\n" + super.toString
protected[hive] class HiveQLQueryExecution(hql: String)
extends this.QueryExecution(HiveQl.parseSql(vs.substitute(hiveconf, hql))) {
def hiveExec() = runSqlHive(hql)
override def toString = hql + "\n" + super.toString
}

/**
Expand Down