Changeset 25493 for trunk/ippTools/share

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/ippTools/share

Files:

• Makefile.am (modified) (2 diffs)
• disttool_defineinterest.sql (added)
• disttool_listinterest.sql (added)
• disttool_pendingfileset.sql (modified) (1 diff)
• disttool_queuercrun.sql (modified) (1 diff)
• disttool_revertcomponent.sql (moved) (moved from trunk/ippTools/share/disttool_revertrun_delete.sql ) (1 prop)
• disttool_revertrun.sql (moved) (moved from trunk/ippTools/share/disttool_revertrun_update.sql ) (1 prop)
• disttool_updatercrun.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (3 diffs)
• rcserver_updatercrun.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -110 +110 @@
      disttool_definebyquery_stack.sql \
      disttool_definebyquery_warp.sql \
+     disttool_defineinterest.sql \
+     disttool_listinterest.sql \
      disttool_pending_camera.sql \
      disttool_pending_chip.sql \
@@ -122 +124 @@
      disttool_queuercrun.sql \
      disttool_revertrcrun.sql \
-     disttool_revertrun_update.sql \
-     disttool_revertrun_delete.sql \
+     disttool_revertrun.sql \
+     disttool_revertcomponent.sql \
      disttool_revertfileset.sql \
      disttool_toadvance.sql \

trunk/ippTools/share/disttool_pendingfileset.sql

@@ -5 +5 @@
     stage_id,
     CONCAT_WS('.', distRun.outroot, CONVERT(distRun.dist_id, CHAR)) as dist_dir,
-    rcDSProduct.name AS product_name,
-    rcDSProduct.prod_id,
-    rcDSProduct.dbname AS ds_dbname,
-    rcDSProduct.dbhost AS ds_dbhost
+    rcDestination.name AS product_name,
+    rcDestination.prod_id,
+    rcDestination.dbname AS ds_dbname,
+    rcDestination.dbhost AS ds_dbhost
 FROM rcDestination 
 JOIN rcInterest USING(dest_id) 
 JOIN distTarget USING(target_id) 
-JOIN rcDSProduct USING(prod_id)
 JOIN distRun USING(target_id) 
-LEFT JOIN rcDSFileset USING(prod_id, dist_id)
+LEFT JOIN rcDSFileset USING(dest_id, dist_id)
 WHERE distRun.state = 'full'
     AND rcDestination.state = 'enabled'

trunk/ippTools/share/disttool_queuercrun.sql

@@ -13 +13 @@
 JOIN rcInterest USING(dest_id) 
 JOIN distTarget USING(target_id) 
-JOIN rcDSProduct USING(prod_id)
 JOIN distRun USING(target_id, stage) 
-JOIN rcDSFileset USING(prod_id, dist_id)
+JOIN rcDSFileset USING(dest_id, dist_id)
 LEFT JOIN rcRun using(fs_id, dest_id)
 WHERE rcRun.rc_id IS NULL

trunk/ippTools/share/disttool_updatercrun.sql

@@ -1 +1 @@
 UPDATE rcRun
 JOIN rcDestination USING(dest_id)
-JOIN rcDSProduct USING(prod_id) 
-JOIN rcDSFileset using(prod_id, fs_id)
+JOIN rcDSFileset using(dest_id, fs_id)
 SET
     -- set hook %s

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1232 +1232 @@
         name VARCHAR(64) UNIQUE,
         reqType VARCHAR(16),
+        label VARCHAR(64),
         outProduct VARCHAR(64),
         uri VARCHAR(255),
@@ -1297 +1298 @@
 
 
-CREATE TABLE rcDSProduct (
-    prod_id     BIGINT AUTO_INCREMENT,
-    name        VARCHAR(64),
-    dbname      VARCHAR(64),
-    dbhost      VARCHAR(64),
-    PRIMARY KEY(prod_id)
-)  ENGINE=innodb DEFAULT CHARSET=latin1;
-
 CREATE TABLE rcDestination (
     dest_id     BIGINT AUTO_INCREMENT,
-    prod_id     BIGINT,
     name        VARCHAR(64),
     status_uri  VARCHAR(255),
     comment     VARCHAR(255),
     last_fileset VARCHAR(255),
+    dbname      VARCHAR(64),
+    dbhost      VARCHAR(64),
     state       VARCHAR(64),
-    PRIMARY KEY(dest_id),
-    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
+    PRIMARY KEY(dest_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
-
 
 CREATE TABLE rcInterest (
@@ -1332 +1324 @@
     fs_id       BIGINT AUTO_INCREMENT,
     dist_id     BIGINT,
-    prod_id     BIGINT,
+    dest_id     BIGINT,
     name        VARCHAR(255),
     state       VARCHAR(64),
     registered  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     fault       SMALLINT DEFAULT 0,
-    PRIMARY KEY(dist_id, prod_id),
+    PRIMARY KEY(dist_id, dest_id),
     KEY(fs_id),
     FOREIGN KEY(dist_id) REFERENCES distRun(dist_id),
-    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
---    KEY(dist_id, prod_id)
+    FOREIGN KEY(dest_id) REFERENCES rcDestination(dest_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
 

trunk/ippTools/share/rcserver_updatercrun.sql

@@ -1 +1 @@
 UPDATE rcRun
 JOIN rcDestination USING(dest_id)
-JOIN rcDSProduct USING(prod_id) 
-JOIN rcDSFileset using(prod_id, fs_id)
+JOIN rcDSFileset using(dest_id, fs_id)
 SET
-rcRun.fault= 42, rcDestination.last_fileset = 'o4741g0236o.chip.14519.33.1'
-
-
-