Changeset 25493 for trunk/dbconfig

Timestamp:

Sep 23, 2009, 10:22:33 AM (17 years ago)

Author:

bills

Message:

In distribution server merge rcDSProduct into rcDestination. It was illogical for
a product to be shared by multiple destinations.
In defineinterest define by query to allow destination names and target parameters
to be used. Much more administrator friendly.
Add a label to pstampRequest. Not used yet.
Split reverting of faults in distRuns from faults building components.

Location:

trunk/dbconfig

Files:

• changes.txt (modified) (1 diff)
• pstamp.md (modified) (1 diff)
• rc.md (modified) (3 diffs)

trunk/dbconfig/changes.txt

@@ -1260 +1260 @@
 -- Vesion 1.1.56
 
-
+-- Merge the rcDSProduct and rcDestination tables
+
+ALTER TABLE rcDestination ADD COLUMN dbname varchar(64) AFTER last_fileset;
+ALTER TABLE rcDestination ADD COLUMN dbhost varchar(64) AFTER dbname;
+
+UPDATE rcDestination JOIN rcDSProduct USING(prod_id)
+    SET rcDestination.name = rcDSProduct.name, 
+        rcDestination.dbname = rcDSProduct.dbname, 
+        rcDestination.dbhost = rcDSProduct.dbhost;
+
+ALTER TABLE rcDestination DROP foreign key rcDestination_ibfk_1 ;
+ALTER TABLE rcDestination DROP key prod_id;
+ALTER TABLE rcDestination DROP COLUMN prod_id;
+
+-- change references to rcDSProduct in rcDSFileset to reference rcDestination
+
+ALTER TABLE rcDSFileset DROP foreign key rcDSFileset_ibfk_2;
+ALTER TABLE rcDSFileset DROP key prod_id;
+ALTER TABLE rcDSFileset CHANGE COLUMN prod_id dest_id BIGINT NOT NULL DEFAULT '0';
+ALTER TABLE rcDSFileset ADD KEY (dest_id);
+ALTER TABLE rcDSFileset ADD FOREIGN KEY (dest_id) REFERENCES rcDestination(dest_id);
+
+-- finally drop the obsolete table
+DROP TABLE rcDSProduct;
+
+-- The following changes should have been made to the gpc1 database ages ago
+-- do not apply if these columns exist
+ALTER TABLE pstampRequest DROP COLUMN outFileset;
+ALTER TABLE pstampRequest ADD COLUMN name VARCHAR(64) UNIQUE AFTER state;
+ALTER TABLE pstampRequest ADD COLUMN reqType VARCHAR(16) AFTER name;
+ALTER TABLE pstampRequest ADD COLUMN outProduct VARCHAR(64) after reqType;
+ALTER TABLE pstampRequest ADD COLUMN fault SMALLINT AFTER uri;
+-- end of old changes
+
+-- This change is new
+ALTER TABLE pstampRequest ADD COLUMN label VARCHAR(64) AFTER reqType;

trunk/dbconfig/pstamp.md

@@ -24 +24 @@
     name        STR         64      # UNIQUE
     reqType     STR         16
+    label       STR         64
     outProduct  STR         64
     uri         STR         255

trunk/dbconfig/rc.md

@@ -1 @@
-rcDSProduct METADATA
-    prod_id     S64        0       # Primary Key
-    name        STR        64
-    dbname      STR        64
-    dbhost      STR        64
+rcDestination METADATA
+    dest_id     S64         0       # Primary Key
+    name        STR         64
+    status_uri  STR         255
+    comment     STR         255
+    last_fileset STR        255
+    dbname      STR         64
+    dbhost      STR         64
+    state       STR         64      # Key
 END
 
@@ -9 +13 @@
     fs_id       S64        0       # Primary Key
     dist_id     S64        0       # fkey(dist_id) ref distRun(dist_id)
-    prod_id     S64        0       # fkey(prod_id) ref rcDSProduct(prod_id)
+    dest_id     S64        0       # fkey(dest_id) ref rcDestination(dest_id)
     name        STR        255
     state       STR        64
@@ -15 +19 @@
 END
 
-rcDestination METADATA
-    dest_id     S64         0       # Primary Key
-    prod_id     S64         0       # fkey(prod_id) ref rcDSProduct(prod_id)
-    name        STR         64
-    status_uri  STR         255
-    comment     STR         255
-    last_fileset STR        255
-    state       STR         64      # Key
-END
 
 rcInterest METADATA