X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e768a05df9fd75cee3724e6b68cb65beeebaaa38..d6c7e2952413c33a4af9b1599e4000b9df622661:/services/api/db/structure.sql diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql index 14729d31bc..f1f57f51d9 100644 --- a/services/api/db/structure.sql +++ b/services/api/db/structure.sql @@ -170,7 +170,10 @@ CREATE TABLE collections ( delete_at timestamp without time zone, file_names character varying(8192), trash_at timestamp without time zone, - is_trashed boolean DEFAULT false NOT NULL + is_trashed boolean DEFAULT false NOT NULL, + storage_classes_desired jsonb DEFAULT '["default"]'::jsonb, + storage_classes_confirmed jsonb DEFAULT '[]'::jsonb, + storage_classes_confirmed_at timestamp without time zone ); @@ -274,7 +277,7 @@ CREATE TABLE container_requests ( modified_by_user_uuid character varying(255), name character varying(255), description text, - properties text, + properties jsonb, state character varying(255), requesting_container_uuid character varying(255), container_uuid character varying(255), @@ -296,7 +299,8 @@ CREATE TABLE container_requests ( output_uuid character varying(255), log_uuid character varying(255), output_name character varying(255) DEFAULT NULL::character varying, - output_ttl integer DEFAULT 0 NOT NULL + output_ttl integer DEFAULT 0 NOT NULL, + secret_mounts jsonb DEFAULT '{}'::jsonb ); @@ -344,12 +348,14 @@ CREATE TABLE containers ( output character varying(255), container_image character varying(255), progress double precision, - priority integer, + priority bigint, updated_at timestamp without time zone NOT NULL, exit_code integer, auth_uuid character varying(255), locked_by_uuid character varying(255), - scheduling_parameters text + scheduling_parameters text, + secret_mounts jsonb DEFAULT '{}'::jsonb, + secret_mounts_md5 character varying DEFAULT '99914b932bd37a50b983c5e7c90ae93b'::character varying ); @@ -390,7 +396,8 @@ CREATE TABLE groups ( group_class character varying(255), trash_at timestamp without time zone, is_trashed boolean DEFAULT false NOT NULL, - delete_at timestamp without time zone + delete_at timestamp without time zone, + properties jsonb DEFAULT '{}'::jsonb ); @@ -676,7 +683,7 @@ CREATE TABLE links ( link_class character varying(255), name character varying(255), head_uuid character varying(255), - properties text, + properties jsonb, updated_at timestamp without time zone NOT NULL ); @@ -762,7 +769,8 @@ CREATE TABLE users ( updated_at timestamp without time zone NOT NULL, default_owner_uuid character varying(255), is_active boolean DEFAULT false, - username character varying(255) + username character varying(255), + redirect_to_user_uuid character varying ); @@ -846,9 +854,9 @@ CREATE TABLE nodes ( ip_address character varying(255), first_ping_at timestamp without time zone, last_ping_at timestamp without time zone, - info text, + info jsonb, updated_at timestamp without time zone NOT NULL, - properties text, + properties jsonb, job_uuid character varying(255) ); @@ -1630,7 +1638,14 @@ CREATE INDEX collections_search_index ON collections USING btree (owner_uuid, mo -- Name: container_requests_full_text_search_idx; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX container_requests_full_text_search_idx ON container_requests USING gin (to_tsvector('english'::regconfig, (((((((((((((((((((((((((((((((((((((((((COALESCE(uuid, ''::character varying))::text || ' '::text) || (COALESCE(owner_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(modified_by_client_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(modified_by_user_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(name, ''::character varying))::text) || ' '::text) || COALESCE(description, ''::text)) || ' '::text) || COALESCE(properties, ''::text)) || ' '::text) || (COALESCE(state, ''::character varying))::text) || ' '::text) || (COALESCE(requesting_container_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(container_uuid, ''::character varying))::text) || ' '::text) || COALESCE(runtime_constraints, ''::text)) || ' '::text) || (COALESCE(container_image, ''::character varying))::text) || ' '::text) || COALESCE(environment, ''::text)) || ' '::text) || (COALESCE(cwd, ''::character varying))::text) || ' '::text) || COALESCE(command, ''::text)) || ' '::text) || (COALESCE(output_path, ''::character varying))::text) || ' '::text) || COALESCE(filters, ''::text)) || ' '::text) || COALESCE(scheduling_parameters, ''::text)) || ' '::text) || (COALESCE(output_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(log_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(output_name, ''::character varying))::text))); +CREATE INDEX container_requests_full_text_search_idx ON container_requests USING gin (to_tsvector('english'::regconfig, (((((((((((((((((((((((((((((((((((((((((COALESCE(uuid, ''::character varying))::text || ' '::text) || (COALESCE(owner_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(modified_by_client_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(modified_by_user_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(name, ''::character varying))::text) || ' '::text) || COALESCE(description, ''::text)) || ' '::text) || COALESCE((properties)::text, ''::text)) || ' '::text) || (COALESCE(state, ''::character varying))::text) || ' '::text) || (COALESCE(requesting_container_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(container_uuid, ''::character varying))::text) || ' '::text) || COALESCE(runtime_constraints, ''::text)) || ' '::text) || (COALESCE(container_image, ''::character varying))::text) || ' '::text) || COALESCE(environment, ''::text)) || ' '::text) || (COALESCE(cwd, ''::character varying))::text) || ' '::text) || COALESCE(command, ''::text)) || ' '::text) || (COALESCE(output_path, ''::character varying))::text) || ' '::text) || COALESCE(filters, ''::text)) || ' '::text) || COALESCE(scheduling_parameters, ''::text)) || ' '::text) || (COALESCE(output_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(log_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(output_name, ''::character varying))::text))); + + +-- +-- Name: container_requests_index_on_properties; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX container_requests_index_on_properties ON container_requests USING gin (properties); -- @@ -1647,11 +1662,18 @@ CREATE INDEX container_requests_search_index ON container_requests USING btree ( CREATE INDEX containers_search_index ON containers USING btree (uuid, owner_uuid, modified_by_client_uuid, modified_by_user_uuid, state, log, cwd, output_path, output, container_image, auth_uuid, locked_by_uuid); +-- +-- Name: group_index_on_properties; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX group_index_on_properties ON groups USING gin (properties); + + -- -- Name: groups_full_text_search_idx; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX groups_full_text_search_idx ON groups USING gin (to_tsvector('english'::regconfig, (((((((((((((COALESCE(uuid, ''::character varying))::text || ' '::text) || (COALESCE(owner_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(modified_by_client_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(modified_by_user_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(name, ''::character varying))::text) || ' '::text) || (COALESCE(description, ''::character varying))::text) || ' '::text) || (COALESCE(group_class, ''::character varying))::text))); +CREATE INDEX groups_full_text_search_idx ON groups USING gin (to_tsvector('english'::regconfig, (((((((((((((((COALESCE(uuid, ''::character varying))::text || ' '::text) || (COALESCE(owner_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(modified_by_client_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(modified_by_user_uuid, ''::character varying))::text) || ' '::text) || (COALESCE(name, ''::character varying))::text) || ' '::text) || (COALESCE(description, ''::character varying))::text) || ' '::text) || (COALESCE(group_class, ''::character varying))::text) || ' '::text) || COALESCE((properties)::text, ''::text)))); -- @@ -1871,6 +1893,13 @@ CREATE INDEX index_container_requests_on_requesting_container_uuid ON container_ CREATE UNIQUE INDEX index_container_requests_on_uuid ON container_requests USING btree (uuid); +-- +-- Name: index_containers_on_auth_uuid; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_containers_on_auth_uuid ON containers USING btree (auth_uuid); + + -- -- Name: index_containers_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - -- @@ -1885,6 +1914,13 @@ CREATE INDEX index_containers_on_modified_at_uuid ON containers USING btree (mod CREATE INDEX index_containers_on_owner_uuid ON containers USING btree (owner_uuid); +-- +-- Name: index_containers_on_secret_mounts_md5; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_containers_on_secret_mounts_md5 ON containers USING btree (secret_mounts_md5); + + -- -- Name: index_containers_on_uuid; Type: INDEX; Schema: public; Owner: - -- @@ -2592,6 +2628,13 @@ CREATE INDEX keep_disks_search_index ON keep_disks USING btree (uuid, owner_uuid CREATE INDEX keep_services_search_index ON keep_services USING btree (uuid, owner_uuid, modified_by_client_uuid, modified_by_user_uuid, service_host, service_type); +-- +-- Name: links_index_on_properties; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX links_index_on_properties ON links USING gin (properties); + + -- -- Name: links_search_index; Type: INDEX; Schema: public; Owner: - -- @@ -2613,6 +2656,20 @@ CREATE UNIQUE INDEX links_tail_name_unique_if_link_class_name ON links USING btr CREATE INDEX logs_search_index ON logs USING btree (uuid, owner_uuid, modified_by_client_uuid, modified_by_user_uuid, object_uuid, event_type, object_owner_uuid); +-- +-- Name: nodes_index_on_info; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX nodes_index_on_info ON nodes USING gin (info); + + +-- +-- Name: nodes_index_on_properties; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX nodes_index_on_properties ON nodes USING gin (properties); + + -- -- Name: nodes_search_index; Type: INDEX; Schema: public; Owner: - -- @@ -2701,7 +2758,7 @@ CREATE UNIQUE INDEX unique_schema_migrations ON schema_migrations USING btree (v -- Name: users_search_index; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX users_search_index ON users USING btree (uuid, owner_uuid, modified_by_client_uuid, modified_by_user_uuid, email, first_name, last_name, identity_url, default_owner_uuid, username); +CREATE INDEX users_search_index ON users USING btree (uuid, owner_uuid, modified_by_client_uuid, modified_by_user_uuid, email, first_name, last_name, identity_url, default_owner_uuid, username, redirect_to_user_uuid); -- @@ -3049,3 +3106,17 @@ INSERT INTO schema_migrations (version) VALUES ('20171208203841'); INSERT INTO schema_migrations (version) VALUES ('20171212153352'); +INSERT INTO schema_migrations (version) VALUES ('20180216203422'); + +INSERT INTO schema_migrations (version) VALUES ('20180228220311'); + +INSERT INTO schema_migrations (version) VALUES ('20180313180114'); + +INSERT INTO schema_migrations (version) VALUES ('20180501182859'); + +INSERT INTO schema_migrations (version) VALUES ('20180514135529'); + +INSERT INTO schema_migrations (version) VALUES ('20180607175050'); + +INSERT INTO schema_migrations (version) VALUES ('20180608123145'); +