From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 19 Jan 2021 18:17:06 +0000 (+0300)
Subject: [#3213] `timeout` option for `HashtagsTableMigrator.count/_`.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f0f0f2af00e8b73a7013c1308289795961b23f4b;p=akkoma

[#3213] `timeout` option for `HashtagsTableMigrator.count/_`.
---

diff --git a/lib/pleroma/migrators/hashtags_table_migrator.ex b/lib/pleroma/migrators/hashtags_table_migrator.ex
index 048f3c8ee..6a6a7b5b8 100644
--- a/lib/pleroma/migrators/hashtags_table_migrator.ex
+++ b/lib/pleroma/migrators/hashtags_table_migrator.ex
@@ -192,13 +192,13 @@ defmodule Pleroma.Migrators.HashtagsTableMigrator do
     end)
   end
 
-  def count(force \\ false) do
+  def count(force \\ false, timeout \\ :infinity) do
     stored_count = state()[:count]
 
     if stored_count && !force do
       stored_count
     else
-      count = Repo.aggregate(query(), :count, :id)
+      count = Repo.aggregate(query(), :count, :id, timeout: timeout)
       put_stat(:count, count)
       count
     end