[ARVADOS] created: 1.2.0-33-ga0446e23b

[Git user]

        at  a0446e23b6795c8c90c5e66438a3a1bb82f9368a (commit)


commit a0446e23b6795c8c90c5e66438a3a1bb82f9368a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Aug 20 10:03:00 2018 -0400

    13924: Drop redundant index.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/db/migrate/20180820135808_drop_pdh_index_from_collections.rb b/services/api/db/migrate/20180820135808_drop_pdh_index_from_collections.rb
new file mode 100644
index 000000000..3d757e411
--- /dev/null
+++ b/services/api/db/migrate/20180820135808_drop_pdh_index_from_collections.rb
@@ -0,0 +1,9 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+class DropPdhIndexFromCollections < ActiveRecord::Migration
+  def change
+    remove_index :collections, column: :portable_data_hash
+  end
+end
diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index d2187514a..d7ee1532d 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -1823,13 +1823,6 @@ CREATE UNIQUE INDEX index_collections_on_owner_uuid_and_name ON public.collectio
 
 
 --
--- Name: index_collections_on_portable_data_hash; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_collections_on_portable_data_hash ON public.collections USING btree (portable_data_hash);
-
-
---
 -- Name: index_collections_on_portable_data_hash_and_trash_at; Type: INDEX; Schema: public; Owner: -
 --
 
@@ -3130,3 +3123,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180806133039');
 
 INSERT INTO schema_migrations (version) VALUES ('20180820130357');
 
+INSERT INTO schema_migrations (version) VALUES ('20180820135808');
+

commit 662a70957f0652acd6579efc635eed8f708ab48c
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Aug 20 09:17:26 2018 -0400

    13924: Add index for PDH lookups.
    
    Commit 2ee4ee2bb666835c41019b475dd2e286604bdd35 changed PDH lookup
    queries to sort on trash_at, which can be slow without an index.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/db/migrate/20180820130357_add_pdh_and_trash_index_to_collections.rb b/services/api/db/migrate/20180820130357_add_pdh_and_trash_index_to_collections.rb
new file mode 100644
index 000000000..8d1cdf39b
--- /dev/null
+++ b/services/api/db/migrate/20180820130357_add_pdh_and_trash_index_to_collections.rb
@@ -0,0 +1,9 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+class AddPdhAndTrashIndexToCollections < ActiveRecord::Migration
+  def change
+    add_index :collections, [:portable_data_hash, :trash_at]
+  end
+end
diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 12158e51b..d2187514a 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -1830,6 +1830,13 @@ CREATE INDEX index_collections_on_portable_data_hash ON public.collections USING
 
 
 --
+-- Name: index_collections_on_portable_data_hash_and_trash_at; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_collections_on_portable_data_hash_and_trash_at ON public.collections USING btree (portable_data_hash, trash_at);
+
+
+--
 -- Name: index_collections_on_trash_at; Type: INDEX; Schema: public; Owner: -
 --
 
@@ -3121,3 +3128,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180608123145');
 
 INSERT INTO schema_migrations (version) VALUES ('20180806133039');
 
+INSERT INTO schema_migrations (version) VALUES ('20180820130357');
+

-----------------------------------------------------------------------


hooks/post-receive
--