Changeset 28304 for branches/czw_branch/20100519/dbconfig

Timestamp:

Jun 10, 2010, 6:28:51 PM (16 years ago)

Author:

watersc1

Message:

Skycell Summary and stack Association stuff should be finished. I'll merge and do final tests on monday.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• dbconfig/add.md (modified) (3 diffs)
• dbconfig/changes.txt (modified) (3 diffs)
• dbconfig/ipp.m4 (modified) (1 diff)
• dbconfig/minidvodb.md (copied) (copied from trunk/dbconfig/minidvodb.md )
• dbconfig/pstamp.md (modified) (1 diff)
• dbconfig/stack.md (modified) (1 diff)

branches/czw_branch/20100519/dbconfig/add.md

@@ -12 +12 @@
     note            STR     255
     image_only      BOOL    f
+    minidvodb       BOOL    f
+    minidvodb_group STR     64
+    minidvodb_name  STR     64
 END
 
@@ -18 +21 @@
     dtime_addstar   F32     0.0
     path_base       STR     255
+    dvodb_path      STR     255
     fault           S16     0       # Key NOT NULL
 END
@@ -24 +28 @@
     label           STR    64       # Primary Key
 END
-    
+
+
+

branches/czw_branch/20100519/dbconfig/changes.txt

@@ -1712 +1712 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE pstampWebRequest (
+        num BIGINT AUTO_INCREMENT,
+        PRIMARY KEY(num)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- Version 1.1.68 addition of minidvodb tables and changes to addTables 
+
+-- this modifies addTables
+
+ALTER TABLE addRun ADD COLUMN minidvodb tinyint NOT NULL AFTER image_only;
+ALTER TABLE addRun ADD COLUMN minidvodb_group varchar(64) AFTER minidvodb;
+ALTER TABLE addRun ADD COLUMN minidvodb_name varchar(64) AFTER minidvodb_group;
+
+ALTER TABLE addProcessedExp ADD COLUMN dvodb_path varchar(255) AFTER path_base;
+
+
+-- this adds the new tables 
+
+
+CREATE TABLE minidvodbRun (
+minidvodb_id BIGINT AUTO_INCREMENT,
+                    minidvodb_name VARCHAR(64),
+              minidvodb_group VARCHAR(64) NOT NULL,
+      minidvodb_path VARCHAR(255) NOT NULL,
+      mergedvodb_path VARCHAR(255) NOT NULL,
+       state VARCHAR(64) NOT NULL,
+       creation_date TIMESTAMP,
+       PRIMARY KEY(minidvodb_id), KEY(minidvodb_name), INDEX(minidvodb_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+
+
+CREATE TABLE minidvodbProcessed (
+      minidvodb_id BIGINT,
+      merge_order BIGINT,
+dtime_resort FLOAT,
+dtime_relphot FLOAT,
+dtime_merge FLOAT,
+epoch TIMESTAMP,
+mergedvodb_path VARCHAR(255) NOT NULL,
+fault SMALLINT NOT NULL,
+       KEY(minidvodb_id), CONSTRAINT UNIQUE(minidvodb_id), FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun (minidvodb_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 -- Version 1.1.69
@@ -1733 +1776 @@
 
 CREATE TABLE stackSummary (
-    stack_id     BIGINT,
+    sass_id     BIGINT,
     projection_cell VARCHAR(64) NOT NULL,
     path_base   VARCHAR(255) NOT NULL,
     PRIMARY KEY(stack_id),
     KEY(projection_cell),
-    FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id)
+    FOREIGN KEY(sass_id) REFERENCES stackAssociation(sass_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1760 +1803 @@
     FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
+

branches/czw_branch/20100519/dbconfig/ipp.m4

@@ -24 +24 @@
 include(label.md)
 include(magic.md)
+include(minidvodb.md)
 include(calibration.md)
 include(flatcorr.md)

branches/czw_branch/20100519/dbconfig/pstamp.md

@@ -59 +59 @@
     fault       S16         0
 END
+
+pstampWebRequest METADATA
+    num         S64         0    # Primary Key AUTO_INCREMENT
+END

branches/czw_branch/20100519/dbconfig/stack.md

@@ -55 +55 @@
 
 stackSummary METADATA
-    stack_id       S64      0       # Primary Key fkey(stack_id) ref stackRun(stack_id)
+    sass_id        S64      0       # Primary Key fkey(sass_id) ref stackAssociation(sass_id)
     projection_cell  STR            32      # Primary Key
     path_base      STR      255