Skip to content

add ProcessingJob #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stufisher wants to merge 5 commits into
base: main
Choose a base branch
from
Open

add ProcessingJob #35

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8777723
add ProcessingJob
stufisher Oct 6, 2022
8ed229b
add ProcessingJob
stufisher Oct 6, 2022
811e425
add ProcessingJob
stufisher Oct 6, 2022
3237d24
add ProcessingJob
stufisher Oct 6, 2022
a92536d
add ProcessingJob
stufisher Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions schema/updates/2022_10_06_ProcessingJob.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
INSERT INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2022_10_06_ProcessingJob.sql', 'ONGOING');

CREATE TABLE `ProcessingJob` (
`processingJobId` int(11) unsigned NOT NULL AUTO_INCREMENT,
`dataCollectionId` int(11) unsigned DEFAULT NULL,
`displayName` varchar(80) DEFAULT NULL COMMENT 'xia2, fast_dp, dimple, etc',
`comments` varchar(255) DEFAULT NULL COMMENT 'For users to annotate the job and see the motivation for the job',
`recordTimestamp` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'When job was submitted',
`recipe` varchar(50) DEFAULT NULL COMMENT 'What we want to run (xia, dimple, etc).',
`automatic` tinyint(1) DEFAULT NULL COMMENT 'Whether this processing job was triggered automatically or not',
PRIMARY KEY (`processingJobId`),
KEY `ProcessingJob_ibfk1` (`dataCollectionId`),
CONSTRAINT `ProcessingJob_ibfk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='From this we get both job times and lag times';

CREATE TABLE `ProcessingJobImageSweep` (
`processingJobImageSweepId` int(11) unsigned NOT NULL AUTO_INCREMENT,
`processingJobId` int(11) unsigned DEFAULT NULL,
`dataCollectionId` int(11) unsigned DEFAULT NULL,
`startImage` mediumint(8) unsigned DEFAULT NULL,
`endImage` mediumint(8) unsigned DEFAULT NULL,
PRIMARY KEY (`processingJobImageSweepId`),
KEY `ProcessingJobImageSweep_ibfk1` (`processingJobId`),
KEY `ProcessingJobImageSweep_ibfk2` (`dataCollectionId`),
CONSTRAINT `ProcessingJobImageSweep_ibfk1` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`),
CONSTRAINT `ProcessingJobImageSweep_ibfk2` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='This allows multiple sweeps per processing job for multi-xia2';

CREATE TABLE `ProcessingJobParameter` (
`processingJobParameterId` int(11) unsigned NOT NULL AUTO_INCREMENT,
`processingJobId` int(11) unsigned DEFAULT NULL,
`parameterKey` varchar(80) DEFAULT NULL COMMENT 'E.g. resolution, spacegroup, pipeline',
`parameterValue` varchar(1024) DEFAULT NULL,
PRIMARY KEY (`processingJobParameterId`),
KEY `ProcessingJobParameter_ibfk1` (`processingJobId`),
CONSTRAINT `ProcessingJobParameter_ibfk1` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

ALTER TABLE `AutoProcProgram`
ADD `processingJobId` int(11) unsigned DEFAULT NULL,
ADD KEY `AutoProcProgram_FK2` (`processingJobId`),
ADD CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`);

UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2022_10_06_ProcessingJob.sql';