Skip to content
Snippets Groups Projects
Commit ef926594 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Code cleanup + added some initializations. 


Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent e4e9fd17
Branches
Tags
No related merge requests found
Pipeline #888 passed
Stage: dockerize
Show whitespace changes
Inline Side-by-side
00-init.sql
+ 10
− 22
View file @ ef926594
...@@ -32,7 +32,7 @@ CREATE EXTENSION IF NOT EXISTS ltree; ...@@ -32,7 +32,7 @@ CREATE EXTENSION IF NOT EXISTS ltree;
CREATE TYPE NodeType AS ENUM ('container', 'data', 'link'); CREATE TYPE NodeType AS ENUM ('container', 'data', 'link');
CREATE TYPE LocationType AS ENUM ('virtual', 'tape', 'user', 'LBT'); CREATE TYPE LocationType AS ENUM ('virtual', 'tape', 'user', 'LBT');
CREATE TABLE Node ( CREATE TABLE node (
node_id BIGSERIAL NOT NULL, node_id BIGSERIAL NOT NULL,
parent_path LTREE default NULL, parent_path LTREE default NULL,
parent_relative_path LTREE default NULL, parent_relative_path LTREE default NULL,
...@@ -40,12 +40,11 @@ CREATE TABLE Node ( ...@@ -40,12 +40,11 @@ CREATE TABLE Node (
os_name VARCHAR default NULL, os_name VARCHAR default NULL,
tstamp_wrapper_dir VARCHAR default NULL, tstamp_wrapper_dir VARCHAR default NULL,
type NodeType NOT NULL, type NodeType NOT NULL,
location_type LocationType default NULL, location_type LocationType default 'virtual',
format VARCHAR default NULL, format VARCHAR default NULL,
-- format serve per distinguere unstuctured (format=NULL) da structured che hanno un formato noto -- format is used to distinguish between unstuctured (format=NULL) and structured nodes having a well defined format
async_trans BOOLEAN default NULL, async_trans BOOLEAN default false,
-- async_trans serve per indicare se il nodo e` ospitato da un cold storage e deve essere necessariamente -- async_trans tells us whether a node is hosted on a cold storage and has to be transferred asynchronously
-- trasferito con un trasferimento asincrono
busy_state BOOLEAN default NULL, busy_state BOOLEAN default NULL,
owner_id VARCHAR default NULL, owner_id VARCHAR default NULL,
creator_id VARCHAR default NULL, creator_id VARCHAR default NULL,
...@@ -53,8 +52,8 @@ CREATE TABLE Node ( ...@@ -53,8 +52,8 @@ CREATE TABLE Node (
group_write VARCHAR[] default NULL, group_write VARCHAR[] default NULL,
is_public BOOLEAN default NULL, is_public BOOLEAN default NULL,
delta BIGINT default NULL, delta BIGINT default NULL,
/* potrebbe essere un delta di dati trasferito durante un trasferimento asincrono. /* it may be a delta of data which is transferred through an asynchronous transfer.
Dovrebbe stare sul servizio che fa il trasferimento (es. redis) */ It should stay on the transfer service (e.g. Redis) */
content_type VARCHAR default NULL, content_type VARCHAR default NULL,
content_encoding VARCHAR default NULL, content_encoding VARCHAR default NULL,
content_length BIGINT default NULL, content_length BIGINT default NULL,
...@@ -64,25 +63,14 @@ CREATE TABLE Node ( ...@@ -64,25 +63,14 @@ CREATE TABLE Node (
-- link TEXT default NULL, -- link TEXT default NULL,
accept_views TEXT[] default NULL, accept_views TEXT[] default NULL,
provide_views TEXT[] default NULL, provide_views TEXT[] default NULL,
-- serve per mappare il nome del servizio di storage da interrogare per accedere al contenuto di questo nodo -- storage service mapping used to access the content of this node
-- storage_id VARCHAR, -- storage_id VARCHAR,
protocols TEXT[] default NULL, protocols TEXT[] default NULL,
PRIMARY KEY (node_id) PRIMARY KEY (node_id)
); );
CREATE TABLE NodeProperty ( CREATE TABLE deleted_node (
node_id BIGSERIAL,
property_uri VARCHAR NOT NULL,
property_value VARCHAR default NULL,
last_modified TIMESTAMP default CURRENT_TIMESTAMP,
-- support replication with a fake primary key
-- _rep_support BIGINT NOT NULL PRIMARY KEY,
foreign key (node_id) references Node (node_id)
);
CREATE TABLE DeletedNode (
node_id BIGSERIAL NOT NULL, node_id BIGSERIAL NOT NULL,
name VARCHAR NOT NULL, name VARCHAR NOT NULL,
owner_id VARCHAR NOT NULL, owner_id VARCHAR NOT NULL,
...@@ -91,7 +79,7 @@ CREATE TABLE DeletedNode ( ...@@ -91,7 +79,7 @@ CREATE TABLE DeletedNode (
); );
CREATE TABLE Users ( CREATE TABLE users (
rap_id VARCHAR NOT NULL, rap_id VARCHAR NOT NULL,
user_name VARCHAR NOT NULL, user_name VARCHAR NOT NULL,
e_mail VARCHAR NOT NULL, e_mail VARCHAR NOT NULL,
......
02-indexes.sql
+ 8
− 8
View file @ ef926594
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
Email: sonia.zorba@inaf.it Email: sonia.zorba@inaf.it
*/ */
CREATE INDEX file_name_idx ON Node USING btree(name); CREATE INDEX file_name_idx ON node USING btree(name);
CREATE INDEX file_parent_path_gist_idx ON Node USING GIST(parent_path); CREATE INDEX file_parent_path_gist_idx ON node USING GIST(parent_path);
CREATE INDEX file_parent_path_idx ON Node USING btree(parent_path); CREATE INDEX file_parent_path_idx ON node USING btree(parent_path);
ALTER TABLE Node ADD COLUMN path ltree GENERATED ALWAYS AS (path(parent_path, node_id)) STORED; ALTER TABLE node ADD COLUMN path ltree GENERATED ALWAYS AS (path(parent_path, node_id)) STORED;
CREATE INDEX file_path_gist_idx ON Node USING GIST(path); CREATE INDEX file_path_gist_idx ON node USING GIST(path);
CREATE UNIQUE INDEX file_path_idx ON Node USING btree(path); CREATE UNIQUE INDEX file_path_idx ON node USING btree(path);
ALTER TABLE Node ADD COLUMN relative_path ltree GENERATED ALWAYS AS (path(parent_relative_path, node_id)) STORED; ALTER TABLE node ADD COLUMN relative_path ltree GENERATED ALWAYS AS (path(parent_relative_path, node_id)) STORED;
CREATE INDEX file_rel_path_gist_idx ON Node USING GIST(relative_path); CREATE INDEX file_rel_path_gist_idx ON node USING GIST(relative_path);
03-os_path_view.sql
+ 7
− 7
View file @ ef926594
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
-- This view allows to obtain the the ltree_path from the os_path -- This view allows to obtain the the ltree_path from the os_path
-- Example query: -- Example query:
-- SELECT path FROM Node n JOIN node_os_path o ON n.node_id = o.node_id WHERE os_path = '/curban/store'; -- SELECT path FROM node n JOIN node_os_path o ON n.node_id = o.node_id WHERE os_path = '/curban/store';
CREATE VIEW node_os_path AS CREATE VIEW node_os_path AS
SELECT node_id, '/' AS os_path FROM Node WHERE path = '' SELECT node_id, '/' AS os_path FROM node WHERE path = ''
UNION UNION
SELECT node_id, '/' || string_agg(name, '/') AS os_path SELECT node_id, '/' || string_agg(name, '/') AS os_path
FROM ( FROM (
SELECT (CASE WHEN os_name IS NOT NULL THEN os_name ELSE name END) AS name, p.node_id SELECT (CASE WHEN os_name IS NOT NULL THEN os_name ELSE name END) AS name, p.node_id
FROM Node n FROM node n
JOIN ( JOIN (
SELECT UNNEST(string_to_array(relative_path::varchar, '.')) AS rel_id, node_id SELECT UNNEST(string_to_array(relative_path::varchar, '.')) AS rel_id, node_id
FROM Node FROM node
) AS p ON n.node_id::varchar = p.rel_id ) AS p ON n.node_id::varchar = p.rel_id
ORDER BY p.node_id, nlevel(n.path) ORDER BY p.node_id, nlevel(n.path)
) AS j GROUP BY node_id; ) AS j GROUP BY node_id;
...@@ -24,15 +24,15 @@ FROM ( ...@@ -24,15 +24,15 @@ FROM (
-- View that maps node_id to vos_path -- View that maps node_id to vos_path
CREATE VIEW node_vos_path AS CREATE VIEW node_vos_path AS
SELECT node_id, '/' AS vos_path FROM Node WHERE path = '' SELECT node_id, '/' AS vos_path FROM node WHERE path = ''
UNION UNION
SELECT node_id, '/' || string_agg(name, '/') AS os_path SELECT node_id, '/' || string_agg(name, '/') AS os_path
FROM ( FROM (
SELECT name, p.node_id SELECT name, p.node_id
FROM Node n FROM node n
JOIN ( JOIN (
SELECT UNNEST(string_to_array(path::varchar, '.')) AS rel_id, node_id SELECT UNNEST(string_to_array(path::varchar, '.')) AS rel_id, node_id
FROM Node FROM node
) AS p ON n.node_id::varchar = p.rel_id ) AS p ON n.node_id::varchar = p.rel_id
ORDER BY p.node_id, nlevel(n.path) ORDER BY p.node_id, nlevel(n.path)
) AS j GROUP BY node_id; ) AS j GROUP BY node_id;
......
04-pgsql_os_path_recursive.sql
+ 3
− 3
View file @ ef926594
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
Email: sonia.zorba@inaf.it Email: sonia.zorba@inaf.it
*/ */
-- Generate the os_path from the Node id -- Generate the os_path from the node id
-- It could be used for initializing the os_path generated column -- It could be used for initializing the os_path generated column
CREATE OR REPLACE FUNCTION get_os_path(input_id int) RETURNS varchar AS CREATE OR REPLACE FUNCTION get_os_path(input_id int) RETURNS varchar AS
$func$ $func$
SELECT string_agg(name, '/') FROM ( SELECT string_agg(name, '/') FROM (
WITH RECURSIVE paths AS ( WITH RECURSIVE paths AS (
SELECT node_id, name, path, parent_path, 1 AS level SELECT node_id, name, path, parent_path, 1 AS level
FROM Node FROM node
WHERE node_id = input_id WHERE node_id = input_id
UNION ALL UNION ALL
SELECT f.node_id, f.name, f.path, f.parent_path, p.level + 1 SELECT f.node_id, f.name, f.path, f.parent_path, p.level + 1
FROM Node f FROM node f
INNER JOIN paths p ON p.parent_path = f.path INNER JOIN paths p ON p.parent_path = f.path
) SELECT name FROM paths ORDER BY LEVEL DESC ) SELECT name FROM paths ORDER BY LEVEL DESC
) AS names; ) AS names;
......
05-data.sql
+ 10
− 10
View file @ ef926594
/* /*
Initialization test for vospace Node table; for now owner_id and group_id are set equal to the rap_id Initialization test for vospace node table; for now owner_id and group_id are set equal to the rap_id
*/ */
-- parent_path = parent_relative_path -- parent_path = parent_relative_path
INSERT INTO Node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES (NULL, NULL, '', 'container', '0', '0'); -- / INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES (NULL, NULL, '', 'container', '0', '0'); -- /
INSERT INTO Node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('', '', 'curban', 'container', '3354', '3354'); -- /curban INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('', '', 'curban', 'container', '3354', '3354'); -- /curban
INSERT INTO Node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('', '', 'sbertocco', 'container', '2048', '2048'); -- /sbertocco INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('', '', 'sbertocco', 'container', '2048', '2048'); -- /sbertocco
INSERT INTO Node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('', '', 'szorba', 'container', '2386', '2386'); -- /szorba INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('', '', 'szorba', 'container', '2386', '2386'); -- /szorba
-- parent_path <> parent_relative_path -- parent_path <> parent_relative_path
INSERT INTO Node (parent_path, parent_relative_path, name, type, owner_id, creator_id, group_read, group_write) VALUES ('', NULL, 'test', 'container', '2386', '2386', '{"VOSpace.test1"}','{"VOSpace.test1"}'); -- /test INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id, group_read, group_write) VALUES ('', NULL, 'test', 'container', '2386', '2386', '{"VOSpace.test1"}','{"VOSpace.test1"}'); -- /test
INSERT INTO Node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('5', '', 'f1', 'container', '2386', '2386'); -- /test/f1 (rel: /f1) INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('5', '', 'f1', 'container', '2386', '2386'); -- /test/f1 (rel: /f1)
INSERT INTO Node (parent_path, parent_relative_path, name, os_name, type, owner_id, creator_id) VALUES ('5.6', '6', 'f2_renamed', 'f2', 'container', '2386', '2386'); -- /test/f1/f2_renamed (rel: /f1/f2) INSERT INTO node (parent_path, parent_relative_path, name, os_name, type, owner_id, creator_id) VALUES ('5.6', '6', 'f2_renamed', 'f2', 'container', '2386', '2386'); -- /test/f1/f2_renamed (rel: /f1/f2)
INSERT INTO Node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('5.6.7', '6.7', 'f3', 'data', '2386', '2386'); -- /test/f1/f2_renamed/f3 (rel: /f1/f2/f3) INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('5.6.7', '6.7', 'f3', 'data', '2386', '2386'); -- /test/f1/f2_renamed/f3 (rel: /f1/f2/f3)
/* /*
Initialization test for vospace Users table Initialization test for vospace users table
*/ */
INSERT INTO Users (rap_id, user_name, e_mail) VALUES ('3354', 'curban', 'cristiano.urban@inaf.it'); INSERT INTO Users (rap_id, user_name, e_mail) VALUES ('3354', 'curban', 'cristiano.urban@inaf.it');
......
06-uws.sql
+ 4
− 5
View file @ ef926594
CREATE TYPE job_phase_enum AS ENUM ('PENDING', 'QUEUED', 'EXECUTING', 'ABORTED', 'COMPLETED', 'HELD', 'SUSPENDED', 'ERROR', 'ARCHIVED'); CREATE TYPE JobPhaseEnum AS ENUM ('PENDING', 'QUEUED', 'EXECUTING', 'ABORTED', 'COMPLETED', 'HELD', 'SUSPENDED', 'ERROR', 'ARCHIVED');
CREATE TYPE JobTypeEnum AS ENUM ('pushToVoSpace', 'pullToVoSpace', 'pullFromVoSpace', 'pushFromVoSpace', 'moveNode', 'copyNode', 'other');
CREATE TYPE job_type_enum AS ENUM ('pushToVoSpace', 'pullToVoSpace', 'pullFromVoSpace', 'pushFromVoSpace', 'moveNode', 'copyNode', 'other');
CREATE TABLE job ( CREATE TABLE job (
job_id varchar not null, job_id varchar not null,
owner_id varchar not null, owner_id varchar not null,
job_type job_type_enum not null, job_type JobTypeEnum not null,
phase job_phase_enum not null, phase JobPhaseEnum not null,
start_time timestamp, start_time timestamp,
end_time timestamp, end_time timestamp,
job_info jsonb, job_info jsonb,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment