pghero 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7edafa3113ab1d1e6dd6df9c2abb1fe90ccd1077811475c001cfef05c021e8d9
-  data.tar.gz: f7e65b01aa540e9023c30c9cefcbf2fd7381fb71b24852043c82e81e878bc8f7
+  metadata.gz: 4874b649139843b2369ad67f3b6620b764fd83ffc61c06dfdc1a79955ebed872
+  data.tar.gz: 60e7beb266ac32ca3d2dc9de5c1a57b3641c6eed6a754a1dc4c71e5cab4876c2
 SHA512:
-  metadata.gz: 857502906ac831709d69a371f4da5ca2bce260f55f72731f3db48be28b159d0816080e2dd90f87301653c609dc5d0dd27ec36d0e58f0649c45d18e9046851bc0
-  data.tar.gz: f54eb2b5e13a75b691fcb3efcc3b63d921a33194caf2f4d62147f8d7090faa4cfa70abfc379315bed61378176f2ef8919747990ed9ba8ff4f3886a32f54edbd3
+  metadata.gz: ee85c07246b1941f9cb1086f684ab79c43847f2435b8ed588bb188821c67e735e2362a048fe522ce732dd9f921d282c794b629f94ba8611820322b1a1b14312c
+  data.tar.gz: a4de31e8bb1762fe2a7a0ed5f1aea4caca2e9f016f7d9c6c8c7515a1d6067e933d6bdf8d8f8a85615e9718d6aadef23d4b7db3ee00590372d340d0f256256ce8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.3.0
+
+- Added support for Postgres 12 beta 1
+- Added methods and tasks for cleaning up stats
+- Dropped support for Rails < 5
+
 ## 2.2.1
 
 - Added `config_path` option

data/app/controllers/pg_hero/home_controller.rb

@@ -390,11 +390,7 @@ module PgHero
     end
 
     def render_text(message)
-      if Rails::VERSION::MAJOR >= 5
-        render plain: message
-      else
-        render text: message
-      end
+      render plain: message
     end
 
     def ensure_query_stats

data/app/views/pg_hero/home/_live_queries_table.html.erb

@@ -20,8 +20,7 @@
           <% end %>
         </td>
         <td class="text-right">
-          <% button_path, button_options = Rails.version >= "4.1" ? [explain_path, {params: {query: query[:query]}}] : [explain_path(query: query[:query]), {}] %>
-          <%= button_to "Explain", button_path, button_options.merge(form: {target: "_blank"}, class: "btn btn-info") %>
+          <%= button_to "Explain", explain_path, params: {query: query[:query]}, form: {target: "_blank"}, class: "btn btn-info" %>
           <%= button_to "Kill", kill_path(pid: query[:pid]), class: "btn btn-danger" %>
         </td>
       </tr>

data/app/views/pg_hero/home/show_query.html.erb

@@ -6,8 +6,7 @@
 
   <% if @explainable_query %>
     <p>
-      <% button_path, button_options = Rails.version >= "4.1" ? [explain_path, {params: {query: @explainable_query}}] : [explain_path(query: @explainable_query), {}] %>
-      <%= button_to "Explain", button_path, button_options.merge(form: {target: "_blank"}, class: "btn btn-info") %>
+      <%= button_to "Explain", explain_path, params: {query: @explainable_query}, form: {target: "_blank"}, class: "btn btn-info" %>
     </p>
   <% end %>
 

data/lib/generators/pghero/config_generator.rb

@@ -3,7 +3,7 @@ require "rails/generators"
 module Pghero
   module Generators
     class ConfigGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.join(__dir__, "templates")
 
       def create_initializer
         template "config.yml", "config/pghero.yml"

data/lib/generators/pghero/query_stats_generator.rb

@@ -1,34 +1,17 @@
-# taken from https://github.com/collectiveidea/audited/blob/master/lib/generators/audited/install_generator.rb
-require "rails/generators"
-require "rails/generators/migration"
-require "active_record"
 require "rails/generators/active_record"
 
 module Pghero
   module Generators
     class QueryStatsGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-
-      source_root File.expand_path("../templates", __FILE__)
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ::ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
 
       def copy_migration
         migration_template "query_stats.rb", "db/migrate/create_pghero_query_stats.rb", migration_version: migration_version
       end
 
       def migration_version
-        if ActiveRecord::VERSION::MAJOR >= 5
-          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-        end
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
       end
     end
   end

data/lib/generators/pghero/space_stats_generator.rb

@@ -1,34 +1,17 @@
-# taken from https://github.com/collectiveidea/audited/blob/master/lib/generators/audited/install_generator.rb
-require "rails/generators"
-require "rails/generators/migration"
-require "active_record"
 require "rails/generators/active_record"
 
 module Pghero
   module Generators
     class SpaceStatsGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-
-      source_root File.expand_path("../templates", __FILE__)
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ::ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
 
       def copy_migration
         migration_template "space_stats.rb", "db/migrate/create_pghero_space_stats.rb", migration_version: migration_version
       end
 
       def migration_version
-        if ActiveRecord::VERSION::MAJOR >= 5
-          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-        end
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
       end
     end
   end

data/lib/pghero.rb

@@ -26,7 +26,9 @@ require "pghero/version"
 
 module PgHero
   autoload :Connection, "pghero/connection"
+  autoload :Stats, "pghero/stats"
   autoload :QueryStats, "pghero/query_stats"
+  autoload :SpaceStats, "pghero/space_stats"
 
   class Error < StandardError; end
   class NotEnabled < Error; end
@@ -137,7 +139,7 @@ module PgHero
 
     def autoindex_all(create: false, verbose: true)
       each_database do |database|
-        puts "Autoindexing #{database}..." if verbose
+        puts "Autoindexing #{database.id}..." if verbose
         database.autoindex(create: create)
       end
     end
@@ -146,6 +148,21 @@ module PgHero
       ActiveSupport::NumberHelper.number_to_human_size(value, precision: 3)
     end
 
+    # delete previous stats
+    # go database by database to use an index
+    # stats for old databases are not cleaned up since we can't use an index
+    def clean_query_stats
+      each_database do |database|
+        PgHero::QueryStats.where(database: database.id).where("captured_at < ?", 14.days.ago).delete_all
+      end
+    end
+
+    def clean_space_stats
+      each_database do |database|
+        PgHero::SpaceStats.where(database: database.id).where("captured_at < ?", 90.days.ago).delete_all
+      end
+    end
+
     private
 
     def each_database

data/lib/pghero/methods/basic.rb

@@ -38,8 +38,7 @@ module PgHero
         retries = 0
         begin
           result = conn.select_all(add_source(squish(sql)))
-          cast_method = ActiveRecord::VERSION::MAJOR < 5 ? :type_cast : :cast_value
-          result.map { |row| Hash[row.map { |col, val| [col.to_sym, result.column_types[col].send(cast_method, val)] }] }
+          result.map { |row| Hash[row.map { |col, val| [col.to_sym, result.column_types[col].send(:cast_value, val)] }] }
         rescue ActiveRecord::StatementInvalid => e
           # fix for random internal errors
           if e.message.include?("PG::InternalError") && retries < 2
@@ -81,7 +80,7 @@ module PgHero
       end
 
       def stats_connection
-        ::PgHero::QueryStats.connection
+        ::PgHero::Stats.connection
       end
 
       def insert_stats(table, columns, values)
@@ -125,22 +124,7 @@ module PgHero
       end
 
       def table_exists?(table)
-        ["PostgreSQL", "PostGIS"].include?(stats_connection.adapter_name) &&
-        select_one_stats(<<-SQL
-          SELECT EXISTS (
-            SELECT
-              1
-            FROM
-              pg_catalog.pg_class c
-            INNER JOIN
-              pg_catalog.pg_namespace n ON n.oid = c.relnamespace
-            WHERE
-              n.nspname = 'public'
-              AND c.relname = #{quote(table)}
-              AND c.relkind = 'r'
-          )
-        SQL
-        )
+        stats_connection.table_exists?(table)
       end
     end
   end

data/lib/pghero/methods/queries.rb

@@ -31,7 +31,7 @@ module PgHero
       end
 
       # from https://wiki.postgresql.org/wiki/Lock_Monitoring
-      # and http://big-elephants.com/2013-09/exploring-query-locks-in-postgres/
+      # and https://big-elephants.com/2013-09/exploring-query-locks-in-postgres/
       def blocked_queries
         select_all <<-SQL
           SELECT

data/lib/pghero/methods/sequences.rb

@@ -25,7 +25,7 @@ module PgHero
           WHERE
             NOT a.attisdropped
             AND a.attnum > 0
-            AND d.adsrc LIKE 'nextval%'
+            AND pg_get_expr(d.adbin, d.adrelid) LIKE 'nextval%'
             AND n.nspname NOT LIKE 'pg\\_temp\\_%'
         SQL
 

data/lib/pghero/query_stats.rb

@@ -1,7 +1,5 @@
 module PgHero
-  class QueryStats < ActiveRecord::Base
-    self.abstract_class = true
+  class QueryStats < Stats
     self.table_name = "pghero_query_stats"
-    establish_connection ENV["PGHERO_STATS_DATABASE_URL"] if ENV["PGHERO_STATS_DATABASE_URL"]
   end
 end

data/lib/pghero/space_stats.rb

@@ -0,0 +1,5 @@
+module PgHero
+  class SpaceStats < Stats
+    self.table_name = "pghero_space_stats"
+  end
+end

data/lib/pghero/stats.rb

@@ -0,0 +1,6 @@
+module PgHero
+  class Stats < ActiveRecord::Base
+    self.abstract_class = true
+    establish_connection ENV["PGHERO_STATS_DATABASE_URL"] if ENV["PGHERO_STATS_DATABASE_URL"]
+  end
+end

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

data/lib/tasks/pghero.rake

@@ -1,21 +1,27 @@
 namespace :pghero do
-  desc "capture query stats"
+  desc "Capture query stats"
   task capture_query_stats: :environment do
     PgHero.capture_query_stats(verbose: true)
   end
 
-  desc "capture space stats"
+  desc "Capture space stats"
   task capture_space_stats: :environment do
     PgHero.capture_space_stats(verbose: true)
   end
 
-  desc "analyze tables"
+  desc "Analyze tables"
   task analyze: :environment do
     PgHero.analyze_all(verbose: true, min_size: ENV["MIN_SIZE_GB"].to_f.gigabytes)
   end
 
-  desc "autoindex"
+  desc "Autoindex tables"
   task autoindex: :environment do
     PgHero.autoindex_all(verbose: true, create: true)
   end
+
+  desc "Remove old query stats"
+  task clean_query_stats: :environment do
+    puts "Deleting old query stats..."
+    PgHero.clean_query_stats
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg_query
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +176,8 @@ files:
 - lib/pghero/methods/tables.rb
 - lib/pghero/methods/users.rb
 - lib/pghero/query_stats.rb
+- lib/pghero/space_stats.rb
+- lib/pghero/stats.rb
 - lib/pghero/version.rb
 - lib/tasks/pghero.rake
 homepage: https://github.com/ankane/pghero
@@ -190,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="