package com.socrata.datacoordinator.truth.universe
package sql

import java.sql.Connection

import com.rojoma.simplearm.util._

class SqlTableCleanup(conn: Connection, daysDelay: Int = 1) extends TableCleanup {
  val log = org.slf4j.LoggerFactory.getLogger(classOf[SqlTableCleanup])
  def cleanupPendingDrops(): Boolean = {
    using(conn.createStatement()) { stmt =>
      using(stmt.executeQuery(s"SELECT id, table_name FROM pending_table_drops WHERE queued_at < now() - ('$daysDelay day' :: INTERVAL) ORDER BY queued_at LIMIT 1 FOR UPDATE")) { rs =>
        if(rs.next()) {
          val id = rs.getLong("id")
          val tableName = rs.getString("table_name")
          log.info("Physically dropping table " + tableName)
          stmt.execute("DROP TABLE IF EXISTS " + tableName)
          using(conn.prepareStatement("DELETE FROM pending_table_drops WHERE id = ?")) { delStmt =>
            delStmt.setLong(1, id)
            delStmt.execute()
          }
          true
        } else {
          false
        }
      }
    }
  }
}

package com.socrata.datacoordinator.truth.universe
package sql

import java.sql.Connection

import com.rojoma.simplearm.util._

class SqlTableCleanup(conn: Connection) extends TableCleanup {
  val log = org.slf4j.LoggerFactory.getLogger(classOf[SqlTableCleanup])
  def cleanupPendingDrops(): Boolean = {
    using(conn.createStatement()) { stmt =>
      using(stmt.executeQuery("SELECT id, table_name FROM pending_table_drops WHERE queued_at < now() - ('1 day' :: INTERVAL) ORDER BY queued_at LIMIT 1 FOR UPDATE")) { rs =>
        if(rs.next()) {
          val id = rs.getLong("id")
          val tableName = rs.getString("table_name")
          log.info("Physically dropping table " + tableName)
          stmt.execute("DROP TABLE IF EXISTS " + tableName)
          using(conn.prepareStatement("DELETE FROM pending_table_drops WHERE id = ?")) { delStmt =>
            delStmt.setLong(1, id)
            delStmt.execute()
          }
          true
        } else {
          false
        }
      }
    }
  }
}

--- 
+++ 
@@ -5,11 +5,11 @@
 
 import com.rojoma.simplearm.util._
 
-class SqlTableCleanup(conn: Connection) extends TableCleanup {
+class SqlTableCleanup(conn: Connection, daysDelay: Int = 1) extends TableCleanup {
   val log = org.slf4j.LoggerFactory.getLogger(classOf[SqlTableCleanup])
   def cleanupPendingDrops(): Boolean = {
     using(conn.createStatement()) { stmt =>
-      using(stmt.executeQuery("SELECT id, table_name FROM pending_table_drops WHERE queued_at < now() - ('1 day' :: INTERVAL) ORDER BY queued_at LIMIT 1 FOR UPDATE")) { rs =>
+      using(stmt.executeQuery(s"SELECT id, table_name FROM pending_table_drops WHERE queued_at < now() - ('$daysDelay day' :: INTERVAL) ORDER BY queued_at LIMIT 1 FOR UPDATE")) { rs =>
         if(rs.next()) {
           val id = rs.getLong("id")
           val tableName = rs.getString("table_name")
Make days delay in table cleanup a variable.

Reviewed-by: 379449c53b58c2818f7cb56b671fe2032d24481c@socrata.com
