--
-- Copyright (C) 2006 The Trustees of Princeton University
--
--- $Id: planetlab4.sql,v 1.27 2006/11/03 20:36:05 thierry Exp $
+-- $Id: planetlab4.sql,v 1.36 2006/11/15 16:42:12 tmack Exp $
--
--------------------------------------------------------------------------------
initcond = '{}'
);
+--------------------------------------------------------------------------------
+-- Version
+--------------------------------------------------------------------------------
+
+--version
+CREATE TABLE plc_db_version (
+ version integer NOT NULL
+) WITH OIDS;
+
+INSERT INTO plc_db_version (version) VALUES (4);
+
--------------------------------------------------------------------------------
-- Accounts
--------------------------------------------------------------------------------
-- Sites that each person is a member of
CREATE VIEW person_sites AS
SELECT person_id,
-array_to_string(array_accum(site_id), ',') AS site_ids
+array_accum(site_id) AS site_ids
FROM person_site_ordered
GROUP BY person_id;
-- Accounts at each site
CREATE VIEW site_persons AS
SELECT site_id,
-array_to_string(array_accum(person_id), ',') AS person_ids
+array_accum(person_id) AS person_ids
FROM person_site
GROUP BY site_id;
CREATE VIEW address_address_types AS
SELECT address_id,
-array_to_string(array_accum(address_type_id), ',') AS address_type_ids,
-array_to_string(array_accum(address_types.name), ',') AS address_types
+array_accum(address_type_id) AS address_type_ids,
+array_accum(address_types.name) AS address_types
FROM address_address_type
LEFT JOIN address_types USING (address_type_id)
GROUP BY address_id;
CREATE VIEW site_addresses AS
SELECT site_id,
-array_to_string(array_accum(address_id), ',') AS address_ids
+array_accum(address_id) AS address_ids
FROM site_address
GROUP BY site_id;
CREATE VIEW person_keys AS
SELECT person_id,
-array_to_string(array_accum(key_id), ',') AS key_ids
+array_accum(key_id) AS key_ids
FROM person_key
GROUP BY person_id;
-- Account roles
CREATE VIEW person_roles AS
SELECT person_id,
-array_to_string(array_accum(role_id), ',') AS role_ids,
-array_to_string(array_accum(roles.name), ',') AS roles
+array_accum(role_id) AS role_ids,
+array_accum(roles.name) AS roles
FROM person_role
LEFT JOIN roles USING (role_id)
GROUP BY person_id;
hostname text NOT NULL, -- Node hostname
site_id integer REFERENCES sites, -- At which site (clause NOT NULL removed for foreign_nodes)
boot_state text REFERENCES boot_states NOT NULL DEFAULT 'inst', -- Node boot state
- cached boolean NOT NULL DEFAULT false, -- is this entry cached from a peer ?
- peer_id integer REFERENCES peers, -- if cached, then from what peer
deleted boolean NOT NULL DEFAULT false, -- Is deleted
-- Optional
-- Nodes at each site
CREATE VIEW site_nodes AS
SELECT site_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
+array_accum(node_id) AS node_ids
FROM nodes
GROUP BY site_id;
+-- Nodes - peers relationship
+CREATE TABLE peer_node (
+ peer_id integer REFERENCES peers NOT NULL, -- Peer identifier
+ node_id integer REFERENCES nodes NOT NULL, -- (Local) node identifier
+ PRIMARY KEY (peer_id, node_id),
+ UNIQUE (node_id) -- Nodes can only be at one peer
+) WITH OIDS;
+CREATE INDEX peer_node_peer_id_idx ON peer_node (peer_id);
+
-- Nodes at each peer
CREATE VIEW peer_nodes AS
SELECT peer_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
-FROM nodes
+array_accum(node_id) AS node_ids
+FROM peer_node
GROUP BY peer_id;
-CREATE VIEW view_peers AS
-SELECT
-peers.*,
-peer_nodes.node_ids
-FROM peers
-LEFT JOIN peer_nodes USING (peer_id);
-
--------------------------------------------------------------------------------
-- Node groups
--------------------------------------------------------------------------------
-- Nodes in each node group
CREATE VIEW nodegroup_nodes AS
SELECT nodegroup_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
+array_accum(node_id) AS node_ids
FROM nodegroup_node
GROUP BY nodegroup_id;
-- Node groups that each node is a member of
CREATE VIEW node_nodegroups AS
SELECT node_id,
-array_to_string(array_accum(nodegroup_id), ',') AS nodegroup_ids
+array_accum(nodegroup_id) AS nodegroup_ids
FROM nodegroup_node
GROUP BY node_id;
-- Nodes linked to each configuration file
CREATE VIEW conf_file_nodes AS
SELECT conf_file_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
+array_accum(node_id) AS node_ids
FROM conf_file_node
GROUP BY conf_file_id;
-- Configuration files linked to each node
CREATE VIEW node_conf_files AS
SELECT node_id,
-array_to_string(array_accum(conf_file_id), ',') AS conf_file_ids
+array_accum(conf_file_id) AS conf_file_ids
FROM conf_file_node
GROUP BY node_id;
-- Node groups linked to each configuration file
CREATE VIEW conf_file_nodegroups AS
SELECT conf_file_id,
-array_to_string(array_accum(nodegroup_id), ',') AS nodegroup_ids
+array_accum(nodegroup_id) AS nodegroup_ids
FROM conf_file_nodegroup
GROUP BY conf_file_id;
-- Configuration files linked to each node group
CREATE VIEW nodegroup_conf_files AS
SELECT nodegroup_id,
-array_to_string(array_accum(conf_file_id), ',') AS conf_file_ids
+array_accum(conf_file_id) AS conf_file_ids
FROM conf_file_nodegroup
GROUP BY nodegroup_id;
-- Network interfaces on each node
CREATE VIEW node_nodenetworks AS
SELECT node_id,
-array_to_string(array_accum(nodenetwork_id), ',') AS nodenetwork_ids
+array_accum(nodenetwork_id) AS nodenetwork_ids
FROM nodenetworks_ordered
GROUP BY node_id;
CREATE VIEW site_pcus AS
SELECT site_id,
-array_to_string(array_accum(pcu_id), ',') AS pcu_ids
+array_accum(pcu_id) AS pcu_ids
FROM pcus
GROUP BY site_id;
CREATE VIEW node_pcus AS
SELECT node_id,
-array_to_string(array_accum(pcu_id), ',') AS pcu_ids,
-array_to_string(array_accum(port), ',') AS ports
+array_accum(pcu_id) AS pcu_ids,
+array_accum(port) AS ports
FROM pcu_node
GROUP BY node_id;
CREATE VIEW pcu_nodes AS
SELECT pcu_id,
-array_to_string(array_accum(node_id), ',') AS node_ids,
-array_to_string(array_accum(port), ',') AS ports
+array_accum(node_id) AS node_ids,
+array_accum(port) AS ports
FROM pcu_node
GROUP BY pcu_id;
-- Slices
CREATE TABLE slices (
slice_id serial PRIMARY KEY, -- Slice identifier
- site_id integer REFERENCES sites NOT NULL, -- Site identifier
+-- xxx temporarily remove the NOT NULL constraint
+ site_id integer REFERENCES sites, -- Site identifier
name text NOT NULL, -- Slice name
instantiation text REFERENCES slice_instantiations NOT NULL DEFAULT 'plc-instantiated', -- Slice state, e.g. plc-instantiated
url text, -- Project URL
max_nodes integer NOT NULL DEFAULT 100, -- Maximum number of nodes that can be assigned to this slice
- creator_person_id integer REFERENCES persons NOT NULL, -- Creator
+-- xxx temporarily remove the NOT NULL constraint
+ creator_person_id integer REFERENCES persons, -- Creator
created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, -- Creation date
expires timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP + '2 weeks', -- Expiration date
- is_deleted boolean NOT NULL DEFAULT false
+ deleted boolean NOT NULL DEFAULT false
) WITH OIDS;
-CREATE INDEX slices_site_id_idx ON slices (site_id) WHERE is_deleted IS false;
-CREATE INDEX slices_name_idx ON slices (name) WHERE is_deleted IS false;
+CREATE INDEX slices_site_id_idx ON slices (site_id) WHERE deleted IS false;
+CREATE INDEX slices_name_idx ON slices (name) WHERE deleted IS false;
-- Slivers
CREATE TABLE slice_node (
-- Nodes in each slice
CREATE VIEW slice_nodes AS
SELECT slice_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
+array_accum(node_id) AS node_ids
FROM slice_node
GROUP BY slice_id;
-- Slices on each node
CREATE VIEW node_slices AS
SELECT node_id,
-array_to_string(array_accum(slice_id), ',') AS slice_ids
+array_accum(slice_id) AS slice_ids
FROM slice_node
GROUP BY node_id;
-- Slices at each site
CREATE VIEW site_slices AS
SELECT site_id,
-array_to_string(array_accum(slice_id), ',') AS slice_ids
+array_accum(slice_id) AS slice_ids
FROM slices
GROUP BY site_id;
+-- Slices - peer relationship
+CREATE TABLE peer_slice (
+ peer_id integer REFERENCES peers NOT NULL, -- peer primary key
+ slice_id integer REFERENCES slices NOT NULL, -- node primary key
+ PRIMARY KEY (peer_id, slice_id)
+) WITH OIDS;
+CREATE INDEX peer_slice_peer_id_idx ON peer_slice (peer_id);
+CREATE INDEX peer_slice_slice_id_idx ON peer_slice (slice_id);
+
+CREATE VIEW peer_slices AS
+SELECT peer_id,
+array_accum(slice_id) AS slice_ids
+FROM peer_slice
+GROUP BY peer_id;
+
-- Slice membership
CREATE TABLE slice_person (
slice_id integer REFERENCES slices NOT NULL, -- Slice identifier
-- Members of the slice
CREATE VIEW slice_persons AS
SELECT slice_id,
-array_to_string(array_accum(person_id), ',') AS person_ids
+array_accum(person_id) AS person_ids
FROM slice_person
GROUP BY slice_id;
-- Slices of which each person is a member
CREATE VIEW person_slices AS
SELECT person_id,
-array_to_string(array_accum(slice_id), ',') AS slice_ids
+array_accum(slice_id) AS slice_ids
FROM slice_person
GROUP BY person_id;
CREATE VIEW slice_attributes AS
SELECT slice_id,
-array_to_string(array_accum(slice_attribute_id), ',') AS slice_attribute_ids
+array_accum(slice_attribute_id) AS slice_attribute_ids
FROM slice_attribute
GROUP BY slice_id;
INSERT INTO object_types (object_type) VALUES ('ConfFile');
INSERT INTO object_types (object_type) VALUES ('KeyType');
INSERT INTO object_types (object_type) VALUES ('Key');
+INSERT INTO object_types (object_type) VALUES ('Message');
INSERT INTO object_types (object_type) VALUES ('NetworkMethod');
INSERT INTO object_types (object_type) VALUES ('NetworkType');
INSERT INTO object_types (object_type) VALUES ('Network');
CREATE VIEW event_objects AS
SELECT event_id,
-array_to_string(array_accum(object_id), ',') AS object_ids
+array_accum(object_id) AS object_ids
FROM event_object
GROUP BY event_id;
events.event_id,
events.person_id,
events.node_id,
-event_objects.object_ids,
events.event_type,
events.object_type,
events.fault_code,
events.call,
events.runtime,
-CAST(date_part('epoch', events.time) AS bigint) AS time
+CAST(date_part('epoch', events.time) AS bigint) AS time,
+COALESCE(event_objects.object_ids, '{}') AS object_ids
FROM events
LEFT JOIN event_objects USING (event_id);
persons.bio,
CAST(date_part('epoch', persons.date_created) AS bigint) AS date_created,
CAST(date_part('epoch', persons.last_updated) AS bigint) AS last_updated,
-person_roles.role_ids, person_roles.roles,
-person_sites.site_ids,
-person_keys.key_ids,
-person_slices.slice_ids
+COALESCE(person_roles.role_ids, '{}') AS role_ids,
+COALESCE(person_roles.roles, '{}') AS roles,
+COALESCE(person_sites.site_ids, '{}') AS site_ids,
+COALESCE(person_keys.key_ids, '{}') AS key_ids,
+COALESCE(person_slices.slice_ids, '{}') AS slice_ids
FROM persons
LEFT JOIN person_roles USING (person_id)
LEFT JOIN person_sites USING (person_id)
nodes.hostname,
nodes.site_id,
nodes.boot_state,
+nodes.deleted,
nodes.model,
nodes.boot_nonce,
nodes.version,
nodes.key,
CAST(date_part('epoch', nodes.date_created) AS bigint) AS date_created,
CAST(date_part('epoch', nodes.last_updated) AS bigint) AS last_updated,
-node_nodenetworks.nodenetwork_ids,
-node_nodegroups.nodegroup_ids,
-node_slices.slice_ids,
-node_pcus.pcu_ids,
-node_pcus.ports,
-node_conf_files.conf_file_ids,
-node_session.session_id AS session,
-nodes.deleted
+COALESCE(node_nodenetworks.nodenetwork_ids, '{}') AS nodenetwork_ids,
+COALESCE(node_nodegroups.nodegroup_ids, '{}') AS nodegroup_ids,
+COALESCE(node_slices.slice_ids, '{}') AS slice_ids,
+COALESCE(node_pcus.pcu_ids, '{}') AS pcu_ids,
+COALESCE(node_pcus.ports, '{}') AS ports,
+COALESCE(node_conf_files.conf_file_ids, '{}') AS conf_file_ids,
+node_session.session_id AS session
FROM nodes
+LEFT JOIN peer_node USING (node_id)
LEFT JOIN node_nodenetworks USING (node_id)
LEFT JOIN node_nodegroups USING (node_id)
LEFT JOIN node_slices USING (node_id)
LEFT JOIN node_pcus USING (node_id)
LEFT JOIN node_conf_files USING (node_id)
LEFT JOIN node_session USING (node_id)
-WHERE nodes.cached=False;
+WHERE peer_node.peer_id IS NULL;
+
+CREATE VIEW view_peers AS
+SELECT
+peers.*,
+peer_nodes.node_ids,
+peer_slices.slice_ids
+FROM peers
+LEFT JOIN peer_nodes USING (peer_id)
+LEFT JOIN peer_slices USING (peer_id);
CREATE VIEW view_foreign_nodes AS
SELECT
nodes.node_id,
nodes.hostname,
-nodes.peer_id,
+peer_node.peer_id,
nodes.boot_state,
nodes.model,
nodes.version,
CAST(date_part('epoch', nodes.date_created) AS bigint) AS date_created,
CAST(date_part('epoch', nodes.last_updated) AS bigint) AS last_updated,
-node_slices.slice_ids,
+COALESCE(node_slices.slice_ids, '{}') AS slice_ids,
nodes.deleted
FROM nodes
+LEFT JOIN peer_node USING (node_id)
LEFT JOIN node_slices USING (node_id)
-WHERE nodes.cached=True AND nodes.deleted=False;
+WHERE peer_node.peer_id IS NOT NULL;
CREATE VIEW view_nodegroups AS
SELECT
nodegroups.nodegroup_id,
nodegroups.name,
nodegroups.description,
-nodegroup_nodes.node_ids,
-nodegroup_conf_files.conf_file_ids
+COALESCE(nodegroup_nodes.node_ids, '{}') AS node_ids,
+COALESCE(nodegroup_conf_files.conf_file_ids, '{}') AS conf_file_ids
FROM nodegroups
LEFT JOIN nodegroup_nodes USING (nodegroup_id)
LEFT JOIN nodegroup_conf_files USING (nodegroup_id);
conf_files.error_cmd,
conf_files.ignore_cmd_errors,
conf_files.always_update,
-conf_file_nodes.node_ids,
-conf_file_nodegroups.nodegroup_ids
+COALESCE(conf_file_nodes.node_ids, '{}') AS node_ids,
+COALESCE(conf_file_nodegroups.nodegroup_ids, '{}') AS nodegroup_ids
FROM conf_files
LEFT JOIN conf_file_nodes USING (conf_file_id)
LEFT JOIN conf_file_nodegroups USING (conf_file_id);
pcus.password,
pcus.model,
pcus.notes,
-pcu_nodes.node_ids,
-pcu_nodes.ports
+COALESCE(pcu_nodes.node_ids, '{}') AS node_ids,
+COALESCE(pcu_nodes.ports, '{}') AS ports
FROM pcus
LEFT JOIN pcu_nodes USING (pcu_id);
sites.url,
CAST(date_part('epoch', sites.date_created) AS bigint) AS date_created,
CAST(date_part('epoch', sites.last_updated) AS bigint) AS last_updated,
-site_persons.person_ids,
-site_nodes.node_ids,
-site_addresses.address_ids,
-site_slices.slice_ids,
-site_pcus.pcu_ids
+COALESCE(site_persons.person_ids, '{}') AS person_ids,
+COALESCE(site_nodes.node_ids, '{}') AS node_ids,
+COALESCE(site_addresses.address_ids, '{}') AS address_ids,
+COALESCE(site_slices.slice_ids, '{}') AS slice_ids,
+COALESCE(site_pcus.pcu_ids, '{}') AS pcu_ids
FROM sites
LEFT JOIN site_persons USING (site_id)
LEFT JOIN site_nodes USING (site_id)
addresses.state,
addresses.postalcode,
addresses.country,
-address_address_types.address_type_ids,
-address_address_types.address_types
+COALESCE(address_address_types.address_type_ids, '{}') AS address_type_ids,
+COALESCE(address_address_types.address_types, '{}') AS address_types
FROM addresses
LEFT JOIN address_address_types USING (address_id);
slices.description,
slices.max_nodes,
slices.creator_person_id,
-slices.is_deleted,
+slices.deleted,
CAST(date_part('epoch', slices.created) AS bigint) AS created,
CAST(date_part('epoch', slices.expires) AS bigint) AS expires,
-slice_nodes.node_ids,
-slice_persons.person_ids,
-slice_attributes.slice_attribute_ids
+COALESCE(slice_nodes.node_ids, '{}') AS node_ids,
+COALESCE(slice_persons.person_ids, '{}') AS person_ids,
+COALESCE(slice_attributes.slice_attribute_ids, '{}') AS slice_attribute_ids
FROM slices
+LEFT JOIN peer_slice USING (slice_id)
LEFT JOIN slice_nodes USING (slice_id)
LEFT JOIN slice_persons USING (slice_id)
-LEFT JOIN slice_attributes USING (slice_id);
+LEFT JOIN slice_attributes USING (slice_id)
+WHERE peer_slice.peer_id IS NULL
+AND slices.site_id IS NOT NULL
+AND slices.creator_person_id IS NOT NULL;
+CREATE VIEW view_foreign_slices AS
+SELECT
+slices.slice_id,
+slices.name,
+peer_slice.peer_id,
+slices.instantiation,
+slices.url,
+slices.description,
+slices.max_nodes,
+slices.deleted,
+CAST(date_part('epoch', slices.created) AS bigint) AS created,
+CAST(date_part('epoch', slices.expires) AS bigint) AS expires,
+COALESCE(slice_nodes.node_ids, '{}') AS node_ids
+FROM slices
+LEFT JOIN peer_slice USING (slice_id)
+LEFT JOIN slice_nodes USING (slice_id)
+WHERE peer_slice.peer_id IS NOT NULL;
+
+--
CREATE VIEW view_slice_attributes AS
SELECT
slice_attribute.slice_attribute_id,
VALUES
('pl', 'PlanetLab Central', 'PLC', 100);
--- federation stuff starting here
-
---CREATE TABLE foreign_nodes (
--- foreign_node_id serial PRIMARY KEY, -- identifier
--- hostname text NOT NULL,
--- boot_state text NOT NULL,
--- peer_id integer REFERENCES peers NOT NULL,
---
--- deleted boolean NOT NULL DEFAULT false
---) WITH OIDS;
-
---CREATE VIEW peer_foreign_nodes AS
---SELECT peer_id,
---array_to_string(array_accum(foreign_node_id), ',') AS foreign_node_ids
---FROM foreign_nodes
---GROUP BY peer_id;
git://git.onelab.eu / plcapi.git / blobdiff