From 07b694814ee98c1062c12140245c48ddc22275ec Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Tue, 12 Sep 2017 13:48:48 +0200 Subject: [PATCH] Optimize conversation fetching. --- lib/pleroma/web/activity_pub/activity_pub.ex | 2 +- priv/repo/migrations/20170912114248_add_context_index.exs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 priv/repo/migrations/20170912114248_add_context_index.exs diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index e3dce9cba..5acbb859e 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -96,7 +96,7 @@ def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ tru def fetch_activities_for_context(context) do query = from activity in Activity, - where: fragment("? @> ?", activity.data, ^%{ type: "Create", context: context }), + where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context), order_by: [desc: :inserted_at] Repo.all(query) end diff --git a/priv/repo/migrations/20170912114248_add_context_index.exs b/priv/repo/migrations/20170912114248_add_context_index.exs new file mode 100644 index 000000000..83c585136 --- /dev/null +++ b/priv/repo/migrations/20170912114248_add_context_index.exs @@ -0,0 +1,8 @@ +defmodule Pleroma.Repo.Migrations.AddContextIndex do + use Ecto.Migration + @disable_ddl_transaction true + + def change do + create index(:activities, ["(data->>'type')", "(data->>'context')"], name: :activities_context_index, concurrently: true) + end +end