From 9cf38d679671181cf539883981f92e6777beb951 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Tue, 20 Jun 2017 16:18:42 +0200 Subject: [PATCH] Use more efficient queries. --- lib/pleroma/activity.ex | 5 +++-- .../20170620133028_add_object_activity_index.exs | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 priv/repo/migrations/20170620133028_add_object_activity_index.exs diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index f48199cae..40e14005b 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -17,11 +17,12 @@ def get_by_ap_id(ap_id) do def all_by_object_ap_id(ap_id) do Repo.all(from activity in Activity, - where: fragment("? @> ?", activity.data, ^%{object: %{id: ap_id}})) + where: fragment("(?)->'object'->>'id' = ?", activity.data, ^to_string(ap_id))) end def get_create_activity_by_object_ap_id(ap_id) do Repo.one(from activity in Activity, - where: fragment("? @> ?", activity.data, ^%{type: "Create", object: %{id: ap_id}})) + where: fragment("(?)->'object'->>'id' = ?", activity.data, ^to_string(ap_id)) + and fragment("(?)->>'type' = 'Create'", activity.data)) end end diff --git a/priv/repo/migrations/20170620133028_add_object_activity_index.exs b/priv/repo/migrations/20170620133028_add_object_activity_index.exs new file mode 100644 index 000000000..1abbd7802 --- /dev/null +++ b/priv/repo/migrations/20170620133028_add_object_activity_index.exs @@ -0,0 +1,7 @@ +defmodule Pleroma.Repo.Migrations.AddObjectActivityIndex do + use Ecto.Migration + + def change do + create index(:objects, ["(data->'object'->>'id')", "(data->>'type')"], name: :activities_create_objects_index) + end +end