From 5817af401428e9fbf3dc259c4de6801424032b4e Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 16 Feb 2020 19:17:46 -0600 Subject: [PATCH] burs/show: remove BUR update count estimate. Remove the post update count estimate from BUR show pages. This was complex, slow, and usually inaccurate since it assumed that requests in a BUR had no overlap with each other, which usually wasn't the case. --- app/jobs/tag_batch_change_job.rb | 6 ----- app/logical/alias_and_implication_importer.rb | 18 --------------- app/models/bulk_update_request.rb | 4 ---- app/models/tag_relationship.rb | 4 ---- app/views/bulk_update_requests/show.html.erb | 1 - test/jobs/tag_batch_change_job_test.rb | 6 ----- .../alias_and_implication_importer_test.rb | 22 ------------------- test/unit/bulk_update_request_test.rb | 22 ------------------- test/unit/tag_alias_test.rb | 11 ---------- test/unit/tag_implication_test.rb | 11 ---------- 10 files changed, 105 deletions(-) diff --git a/app/jobs/tag_batch_change_job.rb b/app/jobs/tag_batch_change_job.rb index e66f824f2..542752d13 100644 --- a/app/jobs/tag_batch_change_job.rb +++ b/app/jobs/tag_batch_change_job.rb @@ -20,12 +20,6 @@ class TagBatchChangeJob < ApplicationJob end end - def self.estimate_update_count(antecedent, consequent) - CurrentUser.without_safe_mode do - Post.tag_match(antecedent).count - end - end - def migrate_posts(normalized_antecedent, normalized_consequent) ::Post.tag_match(normalized_antecedent.join(" ")).find_each do |post| post.with_lock do diff --git a/app/logical/alias_and_implication_importer.rb b/app/logical/alias_and_implication_importer.rb index eda5daa05..ccf5502e0 100644 --- a/app/logical/alias_and_implication_importer.rb +++ b/app/logical/alias_and_implication_importer.rb @@ -78,24 +78,6 @@ class AliasAndImplicationImporter end end - def estimate_update_count - tokens = self.class.tokenize(text) - tokens.map do |token| - case token[0] - when :create_alias - TagAlias.new(antecedent_name: token[1], consequent_name: token[2]).estimate_update_count - when :create_implication - TagImplication.new(antecedent_name: token[1], consequent_name: token[2]).estimate_update_count - when :mass_update - TagBatchChangeJob.estimate_update_count(token[1], token[2]) - when :change_category - Tag.find_by_name(token[1]).try(:post_count) || 0 - else - 0 - end - end.sum - end - def affected_tags tokens = self.class.tokenize(text) tokens.inject([]) do |all, token| diff --git a/app/models/bulk_update_request.rb b/app/models/bulk_update_request.rb index 82ba4257f..70d64d85f 100644 --- a/app/models/bulk_update_request.rb +++ b/app/models/bulk_update_request.rb @@ -206,10 +206,6 @@ class BulkUpdateRequest < ApplicationRecord status == "rejected" end - def estimate_update_count - AliasAndImplicationImporter.new(script, nil).estimate_update_count - end - def update_notice TagChangeNoticeService.update_cache( AliasAndImplicationImporter.new(script, nil).affected_tags, diff --git a/app/models/tag_relationship.rb b/app/models/tag_relationship.rb index 0b596960e..994e2531b 100644 --- a/app/models/tag_relationship.rb +++ b/app/models/tag_relationship.rb @@ -198,10 +198,6 @@ class TagRelationship < ApplicationRecord end end - def estimate_update_count - Post.fast_count(antecedent_name, skip_cache: true) - end - def update_posts Post.without_timeout do Post.raw_tag_match(antecedent_name).find_each do |post| diff --git a/app/views/bulk_update_requests/show.html.erb b/app/views/bulk_update_requests/show.html.erb index 097b846d0..0fcc617a8 100644 --- a/app/views/bulk_update_requests/show.html.erb +++ b/app/views/bulk_update_requests/show.html.erb @@ -9,7 +9,6 @@
  • Creator <%= link_to_user @bulk_update_request.user %>
  • Date <%= @bulk_update_request.created_at %>
  • Status: <%= @bulk_update_request.status %>
    • -
  • Estimate: <%= @bulk_update_request.estimate_update_count %>
    • diff --git a/test/jobs/tag_batch_change_job_test.rb b/test/jobs/tag_batch_change_job_test.rb index eb376ff9b..07b183556 100644 --- a/test/jobs/tag_batch_change_job_test.rb +++ b/test/jobs/tag_batch_change_job_test.rb @@ -7,12 +7,6 @@ class TagBatchChangeJobTest < ActiveJob::TestCase @post = create(:post, :tag_string => "aaa") end - context "#estimate_update_count" do - should "find the correct count" do - assert_equal(1, TagBatchChangeJob.estimate_update_count("aaa", "bbb")) - end - end - should "execute" do TagBatchChangeJob.perform_now("aaa", "bbb", @user, "127.0.0.1") assert_equal("bbb", @post.reload.tag_string) diff --git a/test/unit/alias_and_implication_importer_test.rb b/test/unit/alias_and_implication_importer_test.rb index 326b580f5..34b4acad5 100644 --- a/test/unit/alias_and_implication_importer_test.rb +++ b/test/unit/alias_and_implication_importer_test.rb @@ -48,28 +48,6 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase end end - context "#estimate_update_count" do - setup do - FactoryBot.create(:post, tag_string: "aaa") - FactoryBot.create(:post, tag_string: "bbb") - FactoryBot.create(:post, tag_string: "ccc") - FactoryBot.create(:post, tag_string: "ddd") - FactoryBot.create(:post, tag_string: "eee") - - @script = "create alias aaa -> 000\n" + - "create implication bbb -> 111\n" + - "remove alias ccc -> 222\n" + - "remove implication ddd -> 333\n" + - "mass update eee -> 444\n" - end - - subject { AliasAndImplicationImporter.new(@script, nil) } - - should "return the correct count" do - assert_equal(3, subject.estimate_update_count) - end - end - context "given a valid list" do setup do @list = "create alias abc -> def\ncreate implication aaa -> bbb\n" diff --git a/test/unit/bulk_update_request_test.rb b/test/unit/bulk_update_request_test.rb index ddde19c8a..8077e140d 100644 --- a/test/unit/bulk_update_request_test.rb +++ b/test/unit/bulk_update_request_test.rb @@ -13,28 +13,6 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase CurrentUser.ip_addr = nil end - context "#estimate_update_count" do - setup do - FactoryBot.create(:post, tag_string: "aaa") - FactoryBot.create(:post, tag_string: "bbb") - FactoryBot.create(:post, tag_string: "ccc") - FactoryBot.create(:post, tag_string: "ddd") - FactoryBot.create(:post, tag_string: "eee") - - @script = "create alias aaa -> 000\n" + - "create implication bbb -> 111\n" + - "remove alias ccc -> 222\n" + - "remove implication ddd -> 333\n" + - "mass update eee -> 444\n" - end - - subject { BulkUpdateRequest.new(script: @script) } - - should "return the correct count" do - assert_equal(3, subject.estimate_update_count) - end - end - context "#update_notice" do setup do @forum_topic = create(:forum_topic, creator: @admin) diff --git a/test/unit/tag_alias_test.rb b/test/unit/tag_alias_test.rb index 7c963c9b0..7f56f7734 100644 --- a/test/unit/tag_alias_test.rb +++ b/test/unit/tag_alias_test.rb @@ -57,17 +57,6 @@ class TagAliasTest < ActiveSupport::TestCase end end - context "#estimate_update_count" do - setup do - FactoryBot.create(:post, tag_string: "aaa bbb ccc") - @alias = FactoryBot.create(:tag_alias, antecedent_name: "aaa", consequent_name: "bbb", status: "pending") - end - - should "get the right count" do - assert_equal(1, @alias.estimate_update_count) - end - end - context "#update_notice" do setup do @forum_topic = FactoryBot.create(:forum_topic) diff --git a/test/unit/tag_implication_test.rb b/test/unit/tag_implication_test.rb index 279dcd68f..a27799ce0 100644 --- a/test/unit/tag_implication_test.rb +++ b/test/unit/tag_implication_test.rb @@ -53,17 +53,6 @@ class TagImplicationTest < ActiveSupport::TestCase end end - context "#estimate_update_count" do - setup do - FactoryBot.create(:post, tag_string: "aaa bbb ccc") - @implication = FactoryBot.create(:tag_implication, antecedent_name: "aaa", consequent_name: "bbb", status: "pending") - end - - should "get the right count" do - assert_equal(1, @implication.estimate_update_count) - end - end - context "#update_notice" do setup do @forum_topic = FactoryBot.create(:forum_topic)