Changeset 14597

Timestamp:

Aug 21, 2007, 4:25:06 PM (19 years ago)

Author:

jhoblitt

Message:

remove exp_id field from pz* tables
formatting

Location:

trunk/dbconfig

Files:

• magic.md (modified) (2 diffs)
• tasks.md (modified) (6 diffs)

trunk/dbconfig/magic.md

@@ -1 @@
-# $Id: magic.md,v 1.3 2007-08-14 04:04:30 jhoblitt Exp $
+# $Id: magic.md,v 1.4 2007-08-22 02:25:06 jhoblitt Exp $
 
 magicRun METADATA
@@ -13 +13 @@
 magicInputSkyfile METADATA
     magic_id    S64         0       # Primary Key fkey(magic_id) ref magicRun(magic_id)
-    diff_id     S64         0       # Primary Key fkey(diff_id) ref diffRun(diff_id)
-    node        S32         0       # AUTO_INCREMENT
+    diff_id     S64         0       # Key fkey(diff_id) ref diffRun(diff_id)
+    node        S32         0       # AUTO_INCREMENT INDEX(magic_id, node)
 END
 
 magicTree METADATA
     magic_id    S64         0       # Primary Key fkey(magic_id) ref magicRun(magic_id)
-    node        STR         64 
-    dep         STR         64
+    node        STR         64      # Primary Key fkey(magic_id, node) ref magicInputSkyfile(magic_id, node)
+    dep         STR         64      # fkey(magic_id, dep) ref magicInputSkyfile(magic_id, node)
+
 END
 
 magicNodeResult METADATA
     magic_id    S64         0       # Primary Key fkey(magic_id) ref magicRun(magic_id)
-    node        STR         64 
+    node        STR         64      # Primary Key fkey(magic_id, node) ref magicInputSkyfile(magic_id, node)
     uri         STR         255
 END
 
 magicMask METADATA
-    magic_id    S64         0       # Primary Key AUTO_INCREMENT
+    magic_id    S64         0       # Primary Key fkey(magic_id) ref magicRun(magic_id)
     uri         STR         255
 END

trunk/dbconfig/tasks.md

@@ -1 @@
-# $Id: tasks.md,v 1.139 2007-07-10 01:20:10 jhoblitt Exp $
+# $Id: tasks.md,v 1.140 2007-08-22 02:25:06 jhoblitt Exp $
 
 # this table records all exposure ID ever seen from the summit
@@ -24 +24 @@
 # -1 as NULL or 0 might be a valid value (empty fileset)
 summitExp METADATA
-    exp_name      STR         64      # Primary Key
+    exp_name    STR         64      # Primary Key
     camera      STR         64      # Primary Key
     telescope   STR         64      # Primary Key
@@ -37 +37 @@
 # list of source images -- updated as exposures/filesets are queried
 summitImfile METADATA
-    exp_name      STR         64      # Primary Key
+    exp_name    STR         64      # Primary Key
     camera      STR         64      # Primary Key
     telescope   STR         64      # Primary Key
@@ -51 +51 @@
 # downloaded) 
 pzPendingExp METADATA
-    exp_name      STR         64      # Primary Key
+    exp_name    STR         64      # Primary Key
     camera      STR         64      # Primary Key
     telescope   STR         64      # Primary Key
@@ -62 +62 @@
     class       STR         64      # Primary Key
     class_id    STR         64      # Primary Key
-    exp_id      S64         64      # Unique Key
 END
 
@@ -78 +77 @@
     class       STR         64      # Primary Key
     class_id    STR         64      # Primary Key
-    exp_id      S64         64      # Unique Key
     uri         STR         255
 END