X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/067a7263a97e1b4d96ee6572e79884bdcd937bbf..b5b9be4f0de954052c91ab8dbfbfe0c101f004c4:/services/api/db/structure.sql diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql index d7ee1532d0..5105914df0 100644 --- a/services/api/db/structure.sql +++ b/services/api/db/structure.sql @@ -172,7 +172,10 @@ CREATE TABLE public.collections ( 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 + storage_classes_confirmed_at timestamp without time zone, + current_version_uuid character varying, + version integer DEFAULT 1 NOT NULL, + preserve_version boolean DEFAULT false ); @@ -299,7 +302,8 @@ CREATE TABLE public.container_requests ( log_uuid character varying(255), output_name character varying(255) DEFAULT NULL::character varying, output_ttl integer DEFAULT 0 NOT NULL, - secret_mounts jsonb DEFAULT '{}'::jsonb + secret_mounts jsonb DEFAULT '{}'::jsonb, + runtime_token text ); @@ -354,7 +358,11 @@ CREATE TABLE public.containers ( locked_by_uuid character varying(255), scheduling_parameters text, secret_mounts jsonb DEFAULT '{}'::jsonb, - secret_mounts_md5 character varying DEFAULT '99914b932bd37a50b983c5e7c90ae93b'::character varying + secret_mounts_md5 character varying DEFAULT '99914b932bd37a50b983c5e7c90ae93b'::character varying, + runtime_status jsonb DEFAULT '{}'::jsonb, + runtime_user_uuid text, + runtime_auth_scopes jsonb, + runtime_token text ); @@ -1630,7 +1638,7 @@ CREATE INDEX collections_full_text_search_idx ON public.collections USING gin (t -- Name: collections_search_index; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX collections_search_index ON public.collections USING btree (owner_uuid, modified_by_client_uuid, modified_by_user_uuid, portable_data_hash, uuid, name); +CREATE INDEX collections_search_index ON public.collections USING btree (owner_uuid, modified_by_client_uuid, modified_by_user_uuid, portable_data_hash, uuid, name, current_version_uuid); -- @@ -1780,6 +1788,13 @@ CREATE UNIQUE INDEX index_authorized_keys_on_uuid ON public.authorized_keys USIN CREATE INDEX index_collections_on_created_at ON public.collections USING btree (created_at); +-- +-- Name: index_collections_on_current_version_uuid_and_version; Type: INDEX; Schema: public; Owner: - +-- + +CREATE UNIQUE INDEX index_collections_on_current_version_uuid_and_version ON public.collections USING btree (current_version_uuid, version); + + -- -- Name: index_collections_on_delete_at; Type: INDEX; Schema: public; Owner: - -- @@ -1819,7 +1834,7 @@ CREATE INDEX index_collections_on_owner_uuid ON public.collections USING btree ( -- Name: index_collections_on_owner_uuid_and_name; Type: INDEX; Schema: public; Owner: - -- -CREATE UNIQUE INDEX index_collections_on_owner_uuid_and_name ON public.collections USING btree (owner_uuid, name) WHERE (is_trashed = false); +CREATE UNIQUE INDEX index_collections_on_owner_uuid_and_name ON public.collections USING btree (owner_uuid, name) WHERE ((is_trashed = false) AND ((current_version_uuid)::text = (uuid)::text)); -- @@ -1899,6 +1914,20 @@ CREATE UNIQUE INDEX index_container_requests_on_uuid ON public.container_request CREATE INDEX index_containers_on_auth_uuid ON public.containers USING btree (auth_uuid); +-- +-- Name: index_containers_on_locked_by_uuid_and_priority; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_containers_on_locked_by_uuid_and_priority ON public.containers USING btree (locked_by_uuid, priority); + + +-- +-- Name: index_containers_on_locked_by_uuid_and_uuid; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_containers_on_locked_by_uuid_and_uuid ON public.containers USING btree (locked_by_uuid, uuid); + + -- -- Name: index_containers_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - -- @@ -1913,6 +1942,27 @@ CREATE INDEX index_containers_on_modified_at_uuid ON public.containers USING btr CREATE INDEX index_containers_on_owner_uuid ON public.containers USING btree (owner_uuid); +-- +-- Name: index_containers_on_queued_state; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_containers_on_queued_state ON public.containers USING btree (state, ((priority > 0))); + + +-- +-- Name: index_containers_on_reuse_columns; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_containers_on_reuse_columns ON public.containers USING btree (md5(command), cwd, md5(environment), output_path, container_image, md5(mounts), secret_mounts_md5, md5(runtime_constraints)); + + +-- +-- Name: index_containers_on_runtime_status; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_containers_on_runtime_status ON public.containers USING gin (runtime_status); + + -- -- Name: index_containers_on_secret_mounts_md5; Type: INDEX; Schema: public; Owner: - -- @@ -3123,5 +3173,29 @@ INSERT INTO schema_migrations (version) VALUES ('20180806133039'); INSERT INTO schema_migrations (version) VALUES ('20180820130357'); +INSERT INTO schema_migrations (version) VALUES ('20180820132617'); + INSERT INTO schema_migrations (version) VALUES ('20180820135808'); +INSERT INTO schema_migrations (version) VALUES ('20180824152014'); + +INSERT INTO schema_migrations (version) VALUES ('20180824155207'); + +INSERT INTO schema_migrations (version) VALUES ('20180904110712'); + +INSERT INTO schema_migrations (version) VALUES ('20180913175443'); + +INSERT INTO schema_migrations (version) VALUES ('20180915155335'); + +INSERT INTO schema_migrations (version) VALUES ('20180917205609'); + +INSERT INTO schema_migrations (version) VALUES ('20180919001158'); + +INSERT INTO schema_migrations (version) VALUES ('20181001175023'); + +INSERT INTO schema_migrations (version) VALUES ('20181004131141'); + +INSERT INTO schema_migrations (version) VALUES ('20181005192222'); + +INSERT INTO schema_migrations (version) VALUES ('20181011184200'); +