Merge ac4414c into 5e88175

snowplow · Jun 7, 2023 · b0b4f8c · b0b4f8c
2 parents 5e88175 + ac4414c
commit b0b4f8c
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 6 deletions.
diff --git a/...s-loader/src/main/scala/com/snowplowanalytics/snowplow/loader/databricks/Databricks.scala b/...s-loader/src/main/scala/com/snowplowanalytics/snowplow/loader/databricks/Databricks.scala
@@ -196,6 +196,9 @@ object Databricks {
               case Statement.VacuumManifest => sql"""
                   OPTIMIZE ${Fragment.const0(qualify(Manifest.Name))}
                   ZORDER BY base"""
+              case Statement.CreateDbSchema =>
+                val schema = tgt.catalog.map(c => s"$c.${tgt.schema}").getOrElse(tgt.schema)
+                sql"""CREATE SCHEMA IF NOT EXISTS ${Fragment.const0(schema)}"""
             }
 
           private def qualify(tableName: String): String = tgt.catalog match {

diff --git a/modules/loader/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/Loader.scala b/modules/loader/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/Loader.scala
@@ -12,6 +12,7 @@
  */
 package com.snowplowanalytics.snowplow.rdbloader
 
+import java.sql.SQLException
 import scala.concurrent.duration._
 import cats.{Apply, Monad, MonadThrow}
 import cats.implicits._
@@ -112,9 +113,15 @@ object Loader {
     val noOperationPrepare = NoOperation.prepare(config.schedules.noOperation, control.makePaused) *>
       Logging[F].info("No operation prepare step is completed")
 
-    val eventsTableInit = initRetry(createEventsTable[F, C](target)).onError { case t: Throwable =>
-      Monitoring[F].alert(Alert.FailedToCreateEventsTable(t))
-    } *> Logging[F].info("Events table initialization is completed")
+    val dbSchemaInit = createDbSchema[F, C]
+      .onError { case t: Throwable =>
+        Monitoring[F].alert(Alert.FailedToCreateDatabaseSchema(t))
+      } *> Logging[F].info("Database schema initialization is completed")
+
+    val eventsTableInit = createEventsTable[F, C](target)
+      .onError { case t: Throwable =>
+        Monitoring[F].alert(Alert.FailedToCreateEventsTable(t))
+      } *> Logging[F].info("Events table initialization is completed")
 
     val manifestInit = initRetry(Manifest.initialize[F, C, I](config.storage, target)).onError { case t: Throwable =>
       Monitoring[F].alert(Alert.FailedToCreateManifestTable(t))
@@ -123,7 +130,10 @@ object Loader {
     val addLoadTstamp = addLoadTstampColumn[F, C](config.featureFlags.addLoadTstampColumn, config.storage) *>
       Logging[F].info("Adding load_tstamp column is completed")
 
-    val init: F[I] = blockUntilReady *> noOperationPrepare *> eventsTableInit *> manifestInit *> addLoadTstamp *> initQuery[F, C, I](target)
+    val init: F[I] =
+      blockUntilReady *> noOperationPrepare *> dbSchemaInit *> eventsTableInit *> manifestInit *> addLoadTstamp *> initQuery[F, C, I](
+        target
+      )
 
     val process = Stream.eval(init).flatMap { initQueryResult =>
       loading(initQueryResult)
@@ -281,8 +291,37 @@ object Loader {
         Monitoring[F].alert(Alert.FailedInitialConnection(t))
       }
 
-  private def createEventsTable[F[_]: Transaction[*[_], C], C[_]: DAO: Monad](target: Target[_]): F[Unit] =
-    Transaction[F, C].transact(DAO[C].executeUpdate(target.getEventTable, DAO.Purpose.NonLoading).void)
+  private def isSQLPermissionError(t: Throwable): Boolean =
+    t match {
+      case s: SQLException =>
+        Option(s.getSQLState) match {
+          case Some("42501") => true // Sql state for insufficient permissions for Databricks, Snowflake and Redshift
+          case _ => false
+        }
+      case _ => false
+    }
+
+  private def createEventsTable[F[_]: Transaction[*[_], C], C[_]: DAO: MonadThrow: Logging](target: Target[_]): F[Unit] =
+    Transaction[F, C].transact {
+      DAO[C]
+        .executeUpdate(target.getEventTable, DAO.Purpose.NonLoading)
+        .void
+        .recoverWith {
+          case t: Throwable if isSQLPermissionError(t) =>
+            Logging[C].warning(s"Failed to create events table due to permission error: ${getErrorMessage(t)}")
+        }
+    }
+
+  private def createDbSchema[F[_]: Transaction[*[_], C], C[_]: DAO: MonadThrow: Logging]: F[Unit] =
+    Transaction[F, C].transact {
+      DAO[C]
+        .executeUpdate(Statement.CreateDbSchema, DAO.Purpose.NonLoading)
+        .void
+        .recoverWith {
+          case t: Throwable if isSQLPermissionError(t) =>
+            Logging[C].warning(s"Failed to create database schema due to permission error: ${getErrorMessage(t)}")
+        }
+    }
 
   /**
    * Last level of failure handling, called when non-loading stream fail. Called on an application

diff --git a/modules/loader/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/db/Statement.scala b/modules/loader/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/db/Statement.scala
@@ -119,6 +119,7 @@ object Statement {
   case class CreateTable(ddl: Fragment) extends Statement
   case class AlterTable(ddl: Fragment) extends Statement
   case class DdlFile(ddl: Fragment) extends Statement
+  case object CreateDbSchema extends Statement
 
   // Optimize (housekeeping i.e. vacuum in redshift, optimize in databricks)
   case object VacuumManifest extends Statement

diff --git a/modules/loader/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/dsl/Alert.scala b/modules/loader/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/dsl/Alert.scala
@@ -36,6 +36,7 @@ object Alert {
   case class FailedInitialConnection(cause: Throwable) extends Alert
   case class FailedToCreateEventsTable(cause: Throwable) extends Alert
   case class FailedToCreateManifestTable(cause: Throwable) extends Alert
+  case class FailedToCreateDatabaseSchema(cause: Throwable) extends Alert
   case class FailedHealthCheck(cause: Throwable) extends Alert
   case class FailedFolderMonitoring(cause: Throwable, numFailures: Int) extends Alert
 
@@ -52,6 +53,7 @@ object Alert {
     case FailedInitialConnection(_) => None
     case FailedToCreateEventsTable(_) => None
     case FailedToCreateManifestTable(_) => None
+    case FailedToCreateDatabaseSchema(_) => None
     case FailedHealthCheck(_) => None
     case FailedFolderMonitoring(_, _) => None
   }
@@ -74,6 +76,7 @@ object Alert {
     case FailedInitialConnection(_) => Severity.Error
     case FailedToCreateEventsTable(_) => Severity.Error
     case FailedToCreateManifestTable(_) => Severity.Error
+    case FailedToCreateDatabaseSchema(_) => Severity.Error
   }
 
   def getMessage(am: Alert): String = {
@@ -88,6 +91,7 @@ object Alert {
       case FailedInitialConnection(t) => show"Failed to get connection at startup: $t"
       case FailedToCreateEventsTable(t) => show"Failed to create events table: $t"
       case FailedToCreateManifestTable(t) => show"Failed to create manifest table: $t"
+      case FailedToCreateDatabaseSchema(t) => show"Failed to create database schema: $t"
       case FailedHealthCheck(t) => show"DB failed health check: $t"
       case FailedFolderMonitoring(t, numFailures) => show"Folder monitoring failed $numFailures times in a row: $t"
     }

diff --git a/...shift-loader/src/main/scala/com/snowplowanalytics/snowplow/loader/redshift/Redshift.scala b/...shift-loader/src/main/scala/com/snowplowanalytics/snowplow/loader/redshift/Redshift.scala
@@ -257,6 +257,8 @@ object Redshift {
               case Statement.AddLoadTstampColumn =>
                 sql"""ALTER TABLE ${Fragment.const0(EventsTable.withSchema(schema))}
                       ADD COLUMN load_tstamp TIMESTAMP DEFAULT GETDATE() NULL"""
+              case Statement.CreateDbSchema =>
+                sql"""CREATE SCHEMA IF NOT EXISTS ${Fragment.const0(schema)}"""
 
               case Statement.CreateTable(ddl) =>
                 ddl

diff --git a/...ake-loader/src/main/scala/com/snowplowanalytics/snowplow/loader/snowflake/Snowflake.scala b/...ake-loader/src/main/scala/com/snowplowanalytics/snowplow/loader/snowflake/Snowflake.scala
@@ -283,6 +283,8 @@ object Snowflake {
               case Statement.AddLoadTstampColumn =>
                 sql"""ALTER TABLE ${Fragment.const0(EventsTable.withSchema(schema))}
                       ADD COLUMN load_tstamp TIMESTAMP NULL"""
+              case Statement.CreateDbSchema =>
+                sql"""CREATE SCHEMA IF NOT EXISTS ${Fragment.const0(schema)}"""
 
               case Statement.CreateTable(ddl) =>
                 ddl