14008: Merge branch 'master' into 14008-containers-index

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --combined services/api/db/structure.sql
index 37dcfc10716e4ead58e3a1d9352a7675b3866c5e,f42dd8d7cfa94669508c907538c01a0e644b2083..32b77ed17aa0a4b511fafb50dd04c7d5f45371fa
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -1899,20 -1899,6 +1899,20 @@@ CREATE UNIQUE INDEX index_container_req
  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: -
  --
@@@ -1927,13 -1913,13 +1927,20 @@@ CREATE INDEX index_containers_on_modifi
  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_secret_mounts_md5; Type: INDEX; Schema: public; Owner: -
  --
@@@ -3144,9 -3130,7 +3151,11 @@@ INSERT INTO schema_migrations (version
  
  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');
 +