Skip to content

Commit

Permalink
Merge pull request #69 from PanDAWMS/eddiedev
Browse files Browse the repository at this point in the history
Fixing ATLASPANDA-979: New column OUTPUTFILETYPE in jobs tables (postgres)
  • Loading branch information
EdwardKaravakis authored May 22, 2024
2 parents 4705269 + db8a249 commit dbb4e32
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
4 changes: 2 additions & 2 deletions schema/oracle/ATLAS_PANDA.sql
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
-- IMPORTANT: Please always update to up2date version
--------------------------------------------------------

INSERT INTO "ATLAS_PANDA"."PANDADB_VERSION" VALUES ('SERVER', 0, 0, 16);
INSERT INTO "ATLAS_PANDA"."PANDADB_VERSION" VALUES ('JEDI', 0, 0, 16);
INSERT INTO "ATLAS_PANDA"."PANDADB_VERSION" VALUES ('SERVER', 0, 0, 17);
INSERT INTO "ATLAS_PANDA"."PANDADB_VERSION" VALUES ('JEDI', 0, 0, 17);

--------------------------------------------------------
-- DDL for Sequence CLOUDTASKS_ID_SEQ
Expand Down
3 changes: 2 additions & 1 deletion schema/postgres/sqls/pg_PANDAARCH_TABLE.sql
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ CREATE TABLE jobsarchived (
meancorecount decimal(8,2),
gco2_regional decimal(10,2),
gco2_global decimal(10,2),
cpu_architecture_level varchar(20)
cpu_architecture_level varchar(20),
outputfiletype varchar(32)
) ;
COMMENT ON COLUMN jobsarchived.avgpss IS E'Average PSS in the job';
COMMENT ON COLUMN jobsarchived.avgrss IS E'Average RSS in the job';
Expand Down
12 changes: 8 additions & 4 deletions schema/postgres/sqls/pg_PANDA_TABLE.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,8 @@ CREATE TABLE jobsactive4 (
meancorecount decimal(8,2),
gco2_regional decimal(10,2),
gco2_global decimal(10,2),
cpu_architecture_level varchar(20)
cpu_architecture_level varchar(20),
outputfiletype varchar(32),
) ;
COMMENT ON TABLE jobsactive4 IS E'Table for hosting all PanDA jobs that are in active running mode. All timestamp and date type columns are in UTC';
COMMENT ON COLUMN jobsactive4.assignedpriority IS E'defined priority value';
Expand Down Expand Up @@ -1492,7 +1493,8 @@ CREATE TABLE jobsarchived4 (
meancorecount decimal(8,2),
gco2_regional decimal(10,2),
gco2_global decimal(10,2),
cpu_architecture_level varchar(20)
cpu_architecture_level varchar(20),
outputfiletype varchar(32)
) PARTITION BY RANGE (modificationtime) ;
COMMENT ON TABLE jobsarchived4 IS E'Table for hosting all PanDA jobs that are in finished, failed or cancelled status. Data is regularly copied to an archive table in ATLAS_PANDAARCH schema. Data retention of the JOBSARCHIVED4 table is defined to be 3 days (can be changed if necessary). All timestamp and date type columns are in UTC ';
COMMENT ON COLUMN jobsarchived4.assignedpriority IS E'defined priority value';
Expand Down Expand Up @@ -1791,7 +1793,8 @@ CREATE TABLE jobsdefined4 (
meancorecount decimal(8,2),
gco2_regional decimal(10,2),
gco2_global decimal(10,2),
cpu_architecture_level varchar(20)
cpu_architecture_level varchar(20),
outputfiletype varchar(32)
) ;
COMMENT ON COLUMN jobsdefined4.assignedpriority IS E'defined priority value';
COMMENT ON COLUMN jobsdefined4.atlasrelease IS E'Release required to run the job';
Expand Down Expand Up @@ -2086,7 +2089,8 @@ CREATE TABLE jobswaiting4 (
meancorecount decimal(8,2),
gco2_regional decimal(10,2),
gco2_global decimal(10,2),
cpu_architecture_level varchar(20)
cpu_architecture_level varchar(20),
outputfiletype varchar(32)
) ;
COMMENT ON TABLE jobswaiting4 IS E'Table for hosting all PanDA jobs that are in waiting state. The columns (and their description) are the same as the ones in JOBSACTIVE4 table. All timestamp and date type columns are in UTC';
COMMENT ON COLUMN jobswaiting4.assignedpriority IS E'defined priority value';
Expand Down
2 changes: 1 addition & 1 deletion schema/postgres/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.16
0.0.17

0 comments on commit dbb4e32

Please sign in to comment.