Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

datalake-486 avoid log creds #3

Merged
dichiarafrancesco merged 1 commit into from
May 10, 2018
Merged

datalake-486 avoid log creds #3

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
Avoid logging creds. log sql query statement only
  • Loading branch information
@dichiarafrancesco
dichiarafrancesco committed May 9, 2018
commit 3230aaad05fb05a446861856c8ff7182f989a07b
2 changes: 1 addition & 1 deletion 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 @@ -131,7 +131,6 @@ private[redshift] case class RedshiftRelation(
// Unload data from Redshift into a temporary directory in S3:
val tempDir = params.createPerQueryTempDir()
val unloadSql = buildUnloadStmt(requiredColumns, filters, tempDir, creds)
log.info(unloadSql)
val conn = jdbcWrapper.getConnector(params.jdbcDriver, params.jdbcUrl, params.credentials)
try {
jdbcWrapper.executeInterruptibly(conn.prepareStatement(unloadSql))
Expand Down Expand Up @@ -189,6 +188,7 @@ private[redshift] case class RedshiftRelation(
val escapedTableNameOrSubqury = tableNameOrSubquery.replace("\\", "\\\\").replace("'", "\\'")
s"SELECT $columnList FROM $escapedTableNameOrSubqury $whereClause"
}
log.info(query)
// We need to remove S3 credentials from the unload path URI because they will conflict with
// the credentials passed via `credsString`.
val fixedUrl = Utils.fixS3Url(Utils.removeCredentialsFromURI(new URI(tempDir)).toString)
Expand Down