pghero 2.0.6 → 2.0.7

data/app/controllers/pg_hero/home_controller.rb

@@ -155,15 +155,16 @@ module PgHero
 
     def show_query
       @query_hash = params[:query_hash].to_i
+      @user = params[:user].to_s
       @title = @query_hash
 
-      stats = @database.query_stats(historical: true, query_hash: @query_hash, start_at: 24.hours.ago).first
+      stats = @database.query_stats(historical: true, query_hash: @query_hash, start_at: 24.hours.ago).find { |qs| qs[:user] == @user }
       if stats
         @query = stats[:query]
         @explainable_query = stats[:explainable_query]
 
         if @show_details
-          query_hash_stats = @database.query_hash_stats(@query_hash)
+          query_hash_stats = @database.query_hash_stats(@query_hash, user: @user)
 
           @chart_data = [{name: "Value", data: query_hash_stats.map { |r| [r[:captured_at], (r[:total_minutes] * 60 * 1000).round] }, library: chart_library_options}]
           @chart2_data = [{name: "Value", data: query_hash_stats.map { |r| [r[:captured_at], r[:average_time].round(1)] }, library: chart_library_options}]

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

@@ -51,7 +51,7 @@
               <% end %>
             <% end %>
             <% if @show_details && query[:query_hash] %>
-              <%= link_to "details", show_query_path(query[:query_hash]), target: "_blank" %>
+              <%= link_to "details", show_query_path(query[:query_hash], user: query[:user]), target: "_blank" %>
             <% end %>
           </span>
         </td>

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

@@ -259,7 +259,7 @@
             <td>
               <%= index[:name] %>
               <% if index[:schema] != "public" %>
-                <span class="text-muted"><%= query[:schema] %></span>
+                <span class="text-muted"><%= index[:schema] %></span>
               <% end %>
             </td>
           </tr>

data/guides/Contributing.md

@@ -0,0 +1,16 @@
+# Contributing
+
+```sh
+git clone https://github.com/ankane/pghero.git
+git clone https://github.com/pghero/pghero.git pghero-dev
+cd pghero-dev
+git checkout dev
+createdb pghero_dev
+export DATABASE_URL=postgres:///pghero_dev
+bundle exec rails generate pghero:query_stats
+bundle exec rails generate pghero:space_stats
+bundle exec rake db:migrate
+foreman start
+```
+
+And visit [http://localhost:5000](http://localhost:5000)

data/lib/pghero.rb

@@ -110,7 +110,7 @@ module PgHero
     def capture_query_stats(verbose: false)
       each_database do |database|
         puts "Capturing query stats for #{database.id}..." if verbose
-        database.capture_query_stats
+        database.capture_query_stats(raise_errors: true)
       end
     end
 

data/lib/pghero/methods/query_stats.rb

@@ -56,10 +56,11 @@ module PgHero
         true
       end
 
-      def reset_query_stats
+      def reset_query_stats(raise_errors: false)
         execute("SELECT pg_stat_statements_reset()")
         true
-      rescue ActiveRecord::StatementInvalid
+      rescue ActiveRecord::StatementInvalid => e
+        raise e if raise_errors
         false
       end
 
@@ -87,7 +88,7 @@ module PgHero
       #
       # to get around this, we capture queries for every Postgres database before we
       # reset query stats for the Postgres instance with the `capture_query_stats` option
-      def capture_query_stats
+      def capture_query_stats(raise_errors: false)
         return if config["capture_query_stats"] && config["capture_query_stats"] != true
 
         # get all databases that use same query stats and build mapping
@@ -105,7 +106,7 @@ module PgHero
 
         supports_query_hash = supports_query_hash?
 
-        if query_stats.any? { |_, v| v.any? } && reset_query_stats
+        if query_stats.any? { |_, v| v.any? } && reset_query_stats(raise_errors: raise_errors)
           query_stats.each do |db_id, db_query_stats|
             if db_query_stats.any?
               values =
@@ -133,7 +134,7 @@ module PgHero
         query_stats.select { |q| q[:calls].to_i >= slow_query_calls.to_i && q[:average_time].to_f >= slow_query_ms.to_f }
       end
 
-      def query_hash_stats(query_hash)
+      def query_hash_stats(query_hash, user: nil)
         if historical_query_stats_enabled? && supports_query_hash?
           start_at = 24.hours.ago
           select_all_stats <<-SQL
@@ -149,6 +150,7 @@ module PgHero
               database = #{quote(id)}
               AND captured_at >= #{quote(start_at)}
               AND query_hash = #{quote(query_hash)}
+              #{user ? "AND \"user\" = #{quote(user)}" : ""}
             ORDER BY
               1 ASC
           SQL

data/lib/pghero/methods/sequences.rb

@@ -2,43 +2,58 @@ module PgHero
   module Methods
     module Sequences
       def sequences
+        # get columns with default values
+        # use pg_get_expr to get correct default value
+        # it's what information_schema.columns uses
         sequences = select_all <<-SQL
           SELECT
-            n.nspname AS schema,
+            n.nspname AS table_schema,
             c.relname AS table,
             attname AS column,
             format_type(a.atttypid, a.atttypmod) AS column_type,
-            CASE WHEN format_type(a.atttypid, a.atttypmod) = 'integer' THEN 2147483647::bigint ELSE (pg_sequence_parameters(s.oid)).maximum_value::bigint END AS max_value,
-            s.relname AS sequence
+            pg_get_expr(d.adbin, d.adrelid) AS default_value
           FROM
             pg_catalog.pg_attribute a
           INNER JOIN
             pg_catalog.pg_class c ON c.oid = a.attrelid
           INNER JOIN
             pg_catalog.pg_namespace n ON n.oid = c.relnamespace
-          LEFT JOIN
-            pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid,  d.adnum)
           INNER JOIN
-            pg_catalog.pg_class s ON s.relkind = 'S'
-            AND s.relname = regexp_replace(d.adsrc, '^nextval\\(''(.*)''\\:\\:regclass\\)$', '\\1')
+            pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid,  d.adnum)
           WHERE
             NOT a.attisdropped
             AND a.attnum > 0
             AND d.adsrc LIKE 'nextval%'
-          ORDER BY
-            s.relname ASC
         SQL
 
+        # parse out sequence
+        sequences.each do |column|
+          m = /^nextval\('(.+)'\:\:regclass\)$/.match(column.delete(:default_value))
+          column[:schema], column[:sequence] = unquote_ident(m[1])
+          column[:max_value] = column[:column_type] == 'integer' ? 2147483647 : 9223372036854775807
+        end
+
         select_all(sequences.map { |s| "SELECT last_value FROM #{quote_ident(s[:schema])}.#{quote_ident(s[:sequence])}" }.join(" UNION ALL ")).each_with_index do |row, i|
           sequences[i][:last_value] = row[:last_value]
         end
 
-        sequences
+        sequences.sort_by { |s| s[:sequence] }
       end
 
       def sequence_danger(threshold: 0.9)
         sequences.select { |s| s[:last_value] / s[:max_value].to_f > threshold }.sort_by { |s| s[:max_value] - s[:last_value] }
       end
+
+      private
+
+      def unquote_ident(value)
+        schema, seq = value.split(".")
+        unless seq
+          seq = schema
+          schema = 'public'
+        end
+        [unquote(schema), unquote(seq)]
+      end
     end
   end
 end

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.0.6"
+  VERSION = "2.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -153,6 +153,7 @@ files:
 - app/views/pg_hero/home/system.html.erb
 - app/views/pg_hero/home/tune.html.erb
 - config/routes.rb
+- guides/Contributing.md
 - guides/Docker.md
 - guides/Heroku.md
 - guides/Linux.md
@@ -221,6 +222,7 @@ signing_key:
 specification_version: 4
 summary: A performance dashboard for Postgres
 test_files:
+- guides/Contributing.md
 - guides/Docker.md
 - guides/Heroku.md
 - guides/Linux.md