Changeset 23885 for trunk/ippTools/share

Timestamp:

Apr 16, 2009, 12:39:27 PM (17 years ago)

Author:

Paul Price

Message:

Modifying distribution client workflow (currently composed of receivetool and associated tables) since Bill points out that a fileset is composed of files, and we don't want to download them all serially.

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 diff)
• receivetool_pendingfile.sql (added)
• receivetool_pendingfileset.sql (moved) (moved from trunk/ippTools/share/receivetool_pendingrun.sql ) (1 diff)
• receivetool_revert.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -171 +171 @@
      pztool_revertcopied.sql \
      receivetool_list.sql \
-     receivetool_pendingrun.sql \
+     receivetool_pendingfileset.sql \
+     receivetool_pendingfile.sql \
      receivetool_revert.sql \
      regtool_create_dup_table.sql \

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1317 +1317 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
--- Run for receiving files
-CREATE TABLE receiveRun (
-    receive_id BIGINT AUTO_INCREMENT, -- unique identifier
+-- Filesets to receive
+CREATE TABLE receiveFileset (
+    fileset_id BIGINT AUTO_INCREMENT, -- unique identifier
     source_id BIGINT NOT NULL,  -- link to receiveSource
     fileset VARCHAR(128) NOT NULL, -- fileset to receive
-    PRIMARY KEY(receive_id),
+    PRIMARY KEY(fileset_id),
     KEY(source_id),
     FOREIGN KEY(source_id) REFERENCES receiveSource(source_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+-- Files to receive
+CREATE TABLE receiveFile (
+    file_id BIGINT AUTO_INCREMENT, -- unique identifier
+    fileset_id BIGINT NOT NULL,  -- link to receiveFileset
+    file VARCHAR(128) NOT NULL, -- file to receive
+    PRIMARY KEY(file_id),
+    KEY(fileset_id),
+    FOREIGN KEY(fileset_id) REFERENCES receiveFileset(fileset_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 -- Result of receiving files
 CREATE TABLE receiveResult (
-    receive_id BIGINT AUTO_INCREMENT, -- unique identifier, link to receiveRun
+    file_id BIGINT AUTO_INCREMENT, -- link to receiveFile
     dtime_copy FLOAT,           -- Time to copy
     dtime_extract FLOAT,        -- Time to extract
     fault SMALLINT NOT NULL DEFAULT 0, -- Fault code
-    PRIMARY KEY(receive_id),
-    KEY(fault),
-    FOREIGN KEY(receive_id) REFERENCES receiveRun(receive_id)
+    PRIMARY KEY(file_id),
+    KEY(fault),
+    FOREIGN KEY(file_id) REFERENCES receiveFile(file_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 

trunk/ippTools/share/receivetool_pendingfileset.sql

@@ -1 +1 @@
 SELECT *
-FROM receiveRun
+FROM receiveFileset
 JOIN receiveSource USING(source_id)
-LEFT JOIN receiveResult USING(receive_id)
-WHERE receiveResult.receive_id IS NULL
+LEFT JOIN receiveFile USING(fileset_id)
+WHERE receiveFile.fileset_id IS NULL

trunk/ippTools/share/receivetool_revert.sql

@@ -1 +1 @@
 DELETE FROM receiveResult
-USING receiveResult, receiveRun, receiveSource
-WHERE receiveResult.receive_id = receiveRun.receive_id
-    AND receiveRun.source_id = receiveSource.source_id
+USING receiveResult, receiveFile, receiveFileset, receiveSource
+WHERE receiveResult.file_id = receiveFile.file_id
+    AND receiveFile.fileset_id = receiveFileset.fileset_id
+    AND receiveFileset.source_id = receiveSource.source_id
     AND fault != 0