Skip to content
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

Jump to bottom

Providing testing capabilities to outside packages #373

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Providing testing capabilities to outside packages #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0659b5
using PostgreSQL compatible queries
tobithiel Nov 3, 2017
5d4cee9
added ability to provide custom S3 client factory to DefaultSource fo…
tobithiel Nov 3, 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
5 changes: 5 additions & 0 deletions src/main/scala/com/databricks/spark/redshift/DefaultSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ class DefaultSource(
*/
def this() = this(DefaultJDBCWrapper, awsCredentials => new AmazonS3Client(awsCredentials))

/**
* Constructor to provide a custom S3 client factory
*/
def this(s3ClientFactory: AWSCredentialsProvider => AmazonS3Client) = this(DefaultJDBCWrapper, s3ClientFactory)

/**
* Create a new RedshiftRelation instance using parameters from Spark SQL DDL. Resolves the schema
* using JDBC connection over provided URL, which must contain credentials.
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/com/databricks/spark/redshift/RedshiftRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ private[redshift] case class RedshiftRelation(
}

private val tableNameOrSubquery =
params.query.map(q => s"($q)").orElse(params.table.map(_.toString)).get
params.query.map(q => s"($q) AS q").orElse(params.table.map(_.toString)).get

override lazy val schema: StructType = {
userSchema.getOrElse {
val tableNameOrSubquery =
params.query.map(q => s"($q)").orElse(params.table.map(_.toString)).get
params.query.map(q => s"($q) AS q").orElse(params.table.map(_.toString)).get
val conn = jdbcWrapper.getConnector(params.jdbcDriver, params.jdbcUrl, params.credentials)
try {
jdbcWrapper.resolveTable(conn, tableNameOrSubquery)
Expand Down
6 changes: 3 additions & 3 deletions src/test/scala/com/databricks/spark/redshift/RedshiftSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class RedshiftSourceSuite
|UNLOAD \('SELECT "testbyte", "testbool" FROM
| \(select testbyte, testbool
| from test_table
| where teststring = \\'\\\\\\\\Unicode\\'\\'s樂趣\\'\) '\)
| where teststring = \\'\\\\\\\\Unicode\\'\\'s樂趣\\'\) AS q '\)
""".stripMargin.lines.map(_.trim).mkString(" ").trim.r
val query =
"""select testbyte, testbool from test_table where teststring = '\\Unicode''s樂趣'"""
Expand All @@ -196,7 +196,7 @@ class RedshiftSourceSuite
{
val params = defaultParams + ("dbtable" -> s"($query)")
val mockRedshift =
new MockRedshift(defaultParams("url"), Map(params("dbtable") -> querySchema))
new MockRedshift(defaultParams("url"), Map(s"${params("dbtable")} AS q" -> querySchema))
val relation = new DefaultSource(
mockRedshift.jdbcWrapper, _ => mockS3Client).createRelation(testSqlContext, params)
assert(testSqlContext.baseRelationToDataFrame(relation).collect() === expectedValues)
Expand All @@ -207,7 +207,7 @@ class RedshiftSourceSuite
// Test with query parameter
{
val params = defaultParams - "dbtable" + ("query" -> query)
val mockRedshift = new MockRedshift(defaultParams("url"), Map(s"($query)" -> querySchema))
val mockRedshift = new MockRedshift(defaultParams("url"), Map(s"($query) AS q" -> querySchema))
val relation = new DefaultSource(
mockRedshift.jdbcWrapper, _ => mockS3Client).createRelation(testSqlContext, params)
assert(testSqlContext.baseRelationToDataFrame(relation).collect() === expectedValues)
Expand Down