azkaban-uncached

add db table changes

2/15/2013 6:59:40 PM

Details

diff --git a/src/java/azkaban/webapp/session/SessionCache.java b/src/java/azkaban/webapp/session/SessionCache.java
index c9c3e9f..8788226 100644
--- a/src/java/azkaban/webapp/session/SessionCache.java
+++ b/src/java/azkaban/webapp/session/SessionCache.java
@@ -43,6 +43,8 @@ public class SessionCache {
 	 * @param props
 	 */
 	public SessionCache(Props props) {
+		// disable ehcache auto update
+		System.setProperty("net.sf.ehcache.skipUpdateCheck", "true");
 		CacheConfiguration config = new CacheConfiguration();
 		config.setName("sessionCache");
 		config.setMaxEntriesLocalHeap(props.getInt("max.num.sessions", MAX_NUM_SESSIONS));
diff --git a/src/sql/create_schedule_table.sql b/src/sql/create_schedule_table.sql
index 381ce6d..462e244 100644
--- a/src/sql/create_schedule_table.sql
+++ b/src/sql/create_schedule_table.sql
@@ -13,7 +13,7 @@ CREATE TABLE schedules (
 	submit_time BIGINT,
 	submit_user VARCHAR(128),
 	enc_type TINYINT,
-    options LONGBLOB,
+    	schedule_options LONGBLOB,
 	primary key(project_id, flow_name)
 ) ENGINE=InnoDB;
 
diff --git a/src/sql/create_sla_table.sql b/src/sql/create_sla_table.sql
index 9914a03..030ca4c 100644
--- a/src/sql/create_sla_table.sql
+++ b/src/sql/create_sla_table.sql
@@ -1,4 +1,3 @@
-DROP TABLE if exists active_sla;
 CREATE TABLE active_sla (
 	exec_id INT NOT NULL,
 	job_name VARCHAR(128) NOT NULL,
@@ -6,5 +5,5 @@ CREATE TABLE active_sla (
 	rule TINYINT NOT NULL,
 	enc_type TINYINT,
 	options LONGBLOB NOT NULL,
-	primary key(exec_id, job_name, check_time, rule)
+	primary key(exec_id, job_name)
 ) ENGINE=InnoDB;
diff --git a/src/sql/update_2.0_to_2.01.sql b/src/sql/update_2.0_to_2.01.sql
index 010f5ed..80273f4 100644
--- a/src/sql/update_2.0_to_2.01.sql
+++ b/src/sql/update_2.0_to_2.01.sql
@@ -10,4 +10,9 @@ ALTER TABLE execution_logs ADD COLUMN attempt INT DEFAULT 0;
 ALTER TABLE execution_logs DROP PRIMARY KEY;
 ALTER TABLE execution_logs ADD PRIMARY KEY(exec_id, name, attempt);
 
+ALTER TABLE schedules ADD COLUMN enc_type TINYINT;
+ALTER TABLE schedules ADD COLUMN schedule_options LONGBLOB;
+
+
+