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

Added snowflake extra options to resources #12

Merged
merged 1 commit into from
May 2, 2022
Merged

Added snowflake extra options to resources #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .../src/main/scala/com/damavis/spark/resource/datasource/snowflake/SnowflakeJoinReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ case class SnowflakeJoinReader(reader: SnowflakeReader, joinData: DataFrame)(
reader.database,
reader.schema,
stagingTable,
SaveMode.Overwrite).write(joinData)
SaveMode.Overwrite,
reader.sfExtraOptions).write(joinData)
reader.copy(table = None, query = Some(query)).read()
}

Expand Down
5 changes: 3 additions & 2 deletions ...lake/src/main/scala/com/damavis/spark/resource/datasource/snowflake/SnowflakeMerger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ case class SnowflakeMerger(account: String,
schema: String,
sourceTable: String,
targetTable: String,
pkColumns: Seq[String])(implicit spark: SparkSession) {
pkColumns: Seq[String],
sfExtraOptions: Map[String, String] = Map())(implicit spark: SparkSession) {

val sfOptions = Map(
"sfURL" -> s"${account}.snowflakecomputing.com",
Expand All @@ -38,7 +39,7 @@ case class SnowflakeMerger(account: String,
|WHEN MATCHED THEN DELETE
|""".stripMargin

Utils.runQuery(sfOptions, deleteQuery)
Utils.runQuery(sfOptions ++ sfExtraOptions, deleteQuery)
}

}
7 changes: 4 additions & 3 deletions ...lake/src/main/scala/com/damavis/spark/resource/datasource/snowflake/SnowflakeReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ case class SnowflakeReader(account: String,
database: String,
schema: String,
table: Option[String] = None,
query: Option[String] = None)(implicit spark: SparkSession)
extends ResourceReader {
query: Option[String] = None,
sfExtraOptions: Map[String, String] = Map())(implicit spark: SparkSession)
extends ResourceReader {

val settings = (table, query) match {
case (Some(tableName), None) => ("dbtable", tableName)
Expand All @@ -35,7 +36,7 @@ case class SnowflakeReader(account: String,
override def read(): DataFrame = {
spark.read
.format("net.snowflake.spark.snowflake")
.options(sfOptions)
.options(sfOptions ++ sfExtraOptions)
.load()
}

Expand Down
5 changes: 3 additions & 2 deletions ...lake/src/main/scala/com/damavis/spark/resource/datasource/snowflake/SnowflakeWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ case class SnowflakeWriter(account: String,
schema: String,
table: String,
mode: SaveMode = SaveMode.Ignore,
sfExtraOptions: Map[String, String] = Map(),
preScript: Option[String] = None)(implicit spark: SparkSession)
extends ResourceWriter {
extends ResourceWriter {

val sfOptions = Map(
"sfURL" -> s"${account}.snowflakecomputing.com",
Expand All @@ -28,7 +29,7 @@ case class SnowflakeWriter(account: String,
override def write(data: DataFrame): Unit = {
data.write
.format("net.snowflake.spark.snowflake")
.options(sfOptions)
.options(sfOptions ++ sfExtraOptions)
.mode(mode)
.save()
}
Expand Down
9 changes: 6 additions & 3 deletions ...rc/main/scala/com/damavis/spark/resource/datasource/snowflake/SnowflakeWriterMerger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ case class SnowflakeWriterMerger(writer: SnowflakeWriter, columns: Seq[String])(
writer.schema,
stagingTable,
targetTable,
columns).merge()
columns,
writer.sfExtraOptions).merge()
}

private def targetExists(): Boolean = {
Expand All @@ -45,8 +46,10 @@ case class SnowflakeWriterMerger(writer: SnowflakeWriter, columns: Seq[String])(
writer.warehouse,
writer.database,
"INFORMATION_SCHEMA",
query =
Some(s"SELECT COUNT(1) = 1 FROM TABLES WHERE TABLE_NAME = '${targetTable}'"))
query = Some(
s"SELECT COUNT(1) = 1 FROM TABLES WHERE TABLE_NAME = '${targetTable}'"),
sfExtraOptions = writer.sfExtraOptions
)

reader
.read()
Expand Down