X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c3647ea9542ced1dfc9239c845f4b118b6743df0..6f020ee8e060d44811e92f5b3faa1b1cba876b42:/services/api/db/structure.sql diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql index 9c08b81e0e..45559757a7 100644 --- a/services/api/db/structure.sql +++ b/services/api/db/structure.sql @@ -254,8 +254,6 @@ $$; SET default_tablespace = ''; -SET default_with_oids = false; - -- -- Name: api_client_authorizations; Type: TABLE; Schema: public; Owner: - -- @@ -480,7 +478,9 @@ CREATE TABLE public.container_requests ( output_ttl integer DEFAULT 0 NOT NULL, secret_mounts jsonb DEFAULT '{}'::jsonb, runtime_token text, - output_storage_classes jsonb DEFAULT '["default"]'::jsonb + output_storage_classes jsonb DEFAULT '["default"]'::jsonb, + output_properties jsonb DEFAULT '{}'::jsonb, + cumulative_cost double precision DEFAULT 0.0 NOT NULL ); @@ -543,7 +543,10 @@ CREATE TABLE public.containers ( lock_count integer DEFAULT 0 NOT NULL, gateway_address character varying, interactive_session_started boolean DEFAULT false NOT NULL, - output_storage_classes jsonb DEFAULT '["default"]'::jsonb + output_storage_classes jsonb DEFAULT '["default"]'::jsonb, + output_properties jsonb DEFAULT '{}'::jsonb, + cost double precision DEFAULT 0.0 NOT NULL, + subrequests_cost double precision DEFAULT 0.0 NOT NULL ); @@ -1782,7 +1785,7 @@ CREATE INDEX container_requests_search_index ON public.container_requests USING -- Name: container_requests_trgm_text_search_idx; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX container_requests_trgm_text_search_idx ON public.container_requests USING gin (((((((((((((((((((((((((((((((((((((((((((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)) public.gin_trgm_ops); +CREATE INDEX container_requests_trgm_text_search_idx ON public.container_requests USING gin (((((((((((((((((((((((((((((((((((((((((((((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) || ' '::text) || COALESCE((output_properties)::text, ''::text))) public.gin_trgm_ops); -- @@ -1911,13 +1914,6 @@ CREATE UNIQUE INDEX index_authorized_keys_on_uuid ON public.authorized_keys USIN CREATE INDEX index_collections_on_created_at_and_uuid ON public.collections USING btree (created_at, uuid); --- --- Name: index_collections_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_collections_on_created_at_uuid ON public.collections USING btree (created_at, uuid); - - -- -- Name: index_collections_on_current_version_uuid_and_version; Type: INDEX; Schema: public; Owner: - -- @@ -1940,10 +1936,10 @@ CREATE INDEX index_collections_on_is_trashed ON public.collections USING btree ( -- --- Name: index_collections_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_collections_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_collections_on_modified_at_uuid ON public.collections USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_collections_on_modified_at_and_uuid ON public.collections USING btree (modified_at, uuid); -- @@ -1989,17 +1985,17 @@ CREATE INDEX index_container_requests_on_container_uuid ON public.container_requ -- --- Name: index_container_requests_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_container_requests_on_created_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_container_requests_on_created_at_uuid ON public.container_requests USING btree (created_at, uuid); +CREATE INDEX index_container_requests_on_created_at_and_uuid ON public.container_requests USING btree (created_at, uuid); -- --- Name: index_container_requests_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_container_requests_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_container_requests_on_modified_at_uuid ON public.container_requests USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_container_requests_on_modified_at_and_uuid ON public.container_requests USING btree (modified_at, uuid); -- @@ -2107,13 +2103,6 @@ CREATE UNIQUE INDEX index_frozen_groups_on_uuid ON public.frozen_groups USING bt CREATE INDEX index_groups_on_created_at_and_uuid ON public.groups USING btree (created_at, uuid); --- --- Name: index_groups_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_groups_on_created_at_uuid ON public.groups USING btree (created_at, uuid); - - -- -- Name: index_groups_on_delete_at; Type: INDEX; Schema: public; Owner: - -- @@ -2136,10 +2125,10 @@ CREATE INDEX index_groups_on_is_trashed ON public.groups USING btree (is_trashed -- --- Name: index_groups_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_groups_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_groups_on_modified_at_uuid ON public.groups USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_groups_on_modified_at_and_uuid ON public.groups USING btree (modified_at, uuid); -- @@ -2373,13 +2362,6 @@ CREATE UNIQUE INDEX index_keep_services_on_uuid ON public.keep_services USING bt CREATE INDEX index_links_on_created_at_and_uuid ON public.links USING btree (created_at, uuid); --- --- Name: index_links_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_links_on_created_at_uuid ON public.links USING btree (created_at, uuid); - - -- -- Name: index_links_on_head_uuid; Type: INDEX; Schema: public; Owner: - -- @@ -2388,10 +2370,10 @@ CREATE INDEX index_links_on_head_uuid ON public.links USING btree (head_uuid); -- --- Name: index_links_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_links_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_links_on_modified_at_uuid ON public.links USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_links_on_modified_at_and_uuid ON public.links USING btree (modified_at, uuid); -- @@ -2436,13 +2418,6 @@ CREATE UNIQUE INDEX index_links_on_uuid ON public.links USING btree (uuid); CREATE INDEX index_logs_on_created_at_and_uuid ON public.logs USING btree (created_at, uuid); --- --- Name: index_logs_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_logs_on_created_at_uuid ON public.logs USING btree (created_at, uuid); - - -- -- Name: index_logs_on_event_at; Type: INDEX; Schema: public; Owner: - -- @@ -2458,10 +2433,10 @@ CREATE INDEX index_logs_on_event_type ON public.logs USING btree (event_type); -- --- Name: index_logs_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_logs_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_logs_on_modified_at_uuid ON public.logs USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_logs_on_modified_at_and_uuid ON public.logs USING btree (modified_at, uuid); -- @@ -2612,17 +2587,17 @@ CREATE UNIQUE INDEX index_pipeline_templates_on_uuid ON public.pipeline_template -- --- Name: index_repositories_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_repositories_on_created_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_repositories_on_created_at_uuid ON public.repositories USING btree (created_at, uuid); +CREATE INDEX index_repositories_on_created_at_and_uuid ON public.repositories USING btree (created_at, uuid); -- --- Name: index_repositories_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_repositories_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_repositories_on_modified_at_uuid ON public.repositories USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_repositories_on_modified_at_and_uuid ON public.repositories USING btree (modified_at, uuid); -- @@ -2709,13 +2684,6 @@ CREATE UNIQUE INDEX index_trashed_groups_on_group_uuid ON public.trashed_groups CREATE INDEX index_users_on_created_at_and_uuid ON public.users USING btree (created_at, uuid); --- --- Name: index_users_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_users_on_created_at_uuid ON public.users USING btree (created_at, uuid); - - -- -- Name: index_users_on_identity_url; Type: INDEX; Schema: public; Owner: - -- @@ -2724,10 +2692,10 @@ CREATE UNIQUE INDEX index_users_on_identity_url ON public.users USING btree (ide -- --- Name: index_users_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_users_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_users_on_modified_at_uuid ON public.users USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_users_on_modified_at_and_uuid ON public.users USING btree (modified_at, uuid); -- @@ -2752,10 +2720,10 @@ CREATE UNIQUE INDEX index_users_on_uuid ON public.users USING btree (uuid); -- --- Name: index_virtual_machines_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_virtual_machines_on_created_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_virtual_machines_on_created_at_uuid ON public.virtual_machines USING btree (created_at, uuid); +CREATE INDEX index_virtual_machines_on_created_at_and_uuid ON public.virtual_machines USING btree (created_at, uuid); -- @@ -2766,10 +2734,10 @@ CREATE INDEX index_virtual_machines_on_hostname ON public.virtual_machines USING -- --- Name: index_virtual_machines_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_virtual_machines_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_virtual_machines_on_modified_at_uuid ON public.virtual_machines USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_virtual_machines_on_modified_at_and_uuid ON public.virtual_machines USING btree (modified_at, uuid); -- @@ -2787,17 +2755,17 @@ CREATE UNIQUE INDEX index_virtual_machines_on_uuid ON public.virtual_machines US -- --- Name: index_workflows_on_created_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_workflows_on_created_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_workflows_on_created_at_uuid ON public.workflows USING btree (created_at, uuid); +CREATE INDEX index_workflows_on_created_at_and_uuid ON public.workflows USING btree (created_at, uuid); -- --- Name: index_workflows_on_modified_at_uuid; Type: INDEX; Schema: public; Owner: - +-- Name: index_workflows_on_modified_at_and_uuid; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_workflows_on_modified_at_uuid ON public.workflows USING btree (modified_at DESC, uuid DESC); +CREATE INDEX index_workflows_on_modified_at_and_uuid ON public.workflows USING btree (modified_at, uuid); -- @@ -3214,6 +3182,8 @@ INSERT INTO "schema_migrations" (version) VALUES ('20220224203102'), ('20220301155729'), ('20220303204419'), -('20220401153101'); - +('20220401153101'), +('20220505112900'), +('20220726034131'), +('20220804133317');