Remove progress estimate from MigrateAccountConversations (#9168)
This commit is contained in:
		
							parent
							
								
									7800e1af7e
								
							
						
					
					
						commit
						f2290e311b
					
				
					 1 changed files with 6 additions and 24 deletions
				
			
		| 
						 | 
				
			
			@ -14,9 +14,7 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
 | 
			
		|||
      sleep 1
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    total        = estimate_rows(local_direct_statuses) + estimate_rows(notifications_about_direct_statuses)
 | 
			
		||||
    migrated  = 0
 | 
			
		||||
    started_time = Time.zone.now
 | 
			
		||||
    last_time = Time.zone.now
 | 
			
		||||
 | 
			
		||||
    local_direct_statuses.includes(:account, mentions: :account).find_each do |status|
 | 
			
		||||
| 
						 | 
				
			
			@ -24,7 +22,7 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
 | 
			
		|||
      migrated += 1
 | 
			
		||||
 | 
			
		||||
      if Time.zone.now - last_time > 1
 | 
			
		||||
        say_progress(migrated, total, started_time)
 | 
			
		||||
        say_progress(migrated)
 | 
			
		||||
        last_time = Time.zone.now
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
| 
						 | 
				
			
			@ -34,7 +32,7 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
 | 
			
		|||
      migrated += 1
 | 
			
		||||
 | 
			
		||||
      if Time.zone.now - last_time > 1
 | 
			
		||||
        say_progress(migrated, total, started_time)
 | 
			
		||||
        say_progress(migrated)
 | 
			
		||||
        last_time = Time.zone.now
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
| 
						 | 
				
			
			@ -45,24 +43,8 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
 | 
			
		|||
 | 
			
		||||
  private
 | 
			
		||||
 | 
			
		||||
  def estimate_rows(query)
 | 
			
		||||
    result = exec_query("EXPLAIN #{query.to_sql}").first
 | 
			
		||||
    result['QUERY PLAN'].scan(/ rows=([\d]+)/).first&.first&.to_i || 0
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def say_progress(migrated, total, started_time)
 | 
			
		||||
    status = "Migrated #{migrated} rows"
 | 
			
		||||
 | 
			
		||||
    percentage = 100.0 * migrated / total
 | 
			
		||||
    status += " (~#{sprintf('%.2f', percentage)}%, "
 | 
			
		||||
 | 
			
		||||
    remaining_time = (100.0 - percentage) * (Time.zone.now - started_time) / percentage
 | 
			
		||||
 | 
			
		||||
    status += "#{(remaining_time / 60).to_i}:"
 | 
			
		||||
    status += sprintf('%02d', remaining_time.to_i % 60)
 | 
			
		||||
    status += ' remaining)'
 | 
			
		||||
 | 
			
		||||
    say status, true
 | 
			
		||||
  def say_progress(migrated)
 | 
			
		||||
    say "Migrated #{migrated} rows", true
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def local_direct_statuses
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue