pghero 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5de5f457151a5d2e77e515b117225033f2f5153b
-  data.tar.gz: fa0a4eea1887464cc49e376aa5675610819f92fb
+  metadata.gz: 33902e779edd42795e8f3c48d51a8f0abf4edf6c
+  data.tar.gz: b16a37597ad809d2aefe83fd0ff6f6478319c655
 SHA512:
-  metadata.gz: af9c72a1eaf428e6c2b7b43a5df732f848633e5f1fa4835c697ff801384fd3b8920d43516a7a5fef9f212b46ee70b9f33ef81e7557fa78b1d086d7e180321aab
-  data.tar.gz: 2a687404ad19e82ee2bd7517cd7a81837fe9ea469110028f2fe656b82849977ad139c5407b52168678dfd006e547a316ebc886f953e7db034ea8daae99eb79b4
+  metadata.gz: 65850829e7cd4071748b03b453f1ee91e0739048001802d5d8ecc290bb0f3e137d7c08bfa2f51cb0bc76ced94087865c6e8d276ed98b5b86c88916fea56e52a6
+  data.tar.gz: 1cf67bd24d6e2780b63b44466f8e964ea10be8ef6bfbf4286e636a3b0f7baee16e20ab5e25bf3092ece33095ea22e7688596e7227b19c1093ea1243c41612b1d

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.2
+rvm: 2.2.4
 cache: bundler
 sudo: false
 script: TRAVIS_CI=1 bundle exec rake test

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.1
+
+- Improved grouping of query stats
+- Added `blocked_queries` method
+
 ## 1.3.0
 
 - Added query hash for better query stats grouping

data/README.md

@@ -31,3 +31,5 @@ A big thanks to [Craig Kerstiens](http://www.craigkerstiens.com/2013/01/10/more-
 Know a bit about PostgreSQL? [Suggestions](https://github.com/ankane/pghero/issues) are greatly appreciated.
 
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
+
+[![Build Status](https://travis-ci.org/ankane/pghero.svg?branch=master)](https://travis-ci.org/ankane/pghero)

data/app/controllers/pg_hero/home_controller.rb

@@ -95,6 +95,8 @@ module PgHero
 
       set_suggested_indexes
 
+      # fix back button issue with caching
+      response.headers["Cache-Control"] = "must-revalidate, no-store, no-cache, private"
       if request.xhr?
         render layout: false, partial: "queries_table", locals: {queries: @query_stats, xhr: true}
       end

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

@@ -153,7 +153,13 @@
       $(this).attr("href", queriesPath(p));
     });
 
-    $("#queries").html('<tr><td colspan="3"><p class="queries-info text-muted">...</p></td></tr>').load(path);
+
+    var callback = function (response, status, xhr) {
+      if (status === "error" ) {
+        $(".queries-info").css("color", "red").html(xhr.status + " " + xhr.statusText);
+      }
+    };
+    $("#queries").html('<tr><td colspan="3"><p class="queries-info text-muted">...</p></td></tr>').load(path, callback);
 
     if (push && history.pushState) {
       history.pushState(null, null, path);

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

@@ -158,13 +158,14 @@
 <% if @sequence_danger.any? %>
   <div class="content">
     <h2>Columns Near Overflow</h2>
-    <p>Consider changing the column type to support a larger range of values.</p>
+    <p>Consider changing columns to bigint to support a larger range of values.</p>
     <table class="table">
       <thead>
         <tr>
           <th>Column</th>
           <th style="width: 20%;">Type</th>
           <th style="width: 20%;">Values Left</th>
+          <th style="width: 10%;">% Left</th>
         </tr>
       </thead>
       <tbody>
@@ -174,11 +175,14 @@
               <%= query["table"] %>.<%= query["column"] %>
             </td>
             <td>
-              <span class="text-muted"><%= query["column_type"] %></span>
+              <%= query["column_type"] %>
             </td>
             <td>
               <%= number_with_delimiter(query["max_value"].to_i - query["last_value"].to_i) %>
             </td>
+            <td>
+              <%= number_to_percentage((query["max_value"].to_i - query["last_value"].to_i) * 100.0 / query["max_value"].to_i, precision: 2, significant: true) %>
+            </td>
           </tr>
         <% end %>
       </tbody>

data/lib/pghero/methods/queries.rb

@@ -73,6 +73,34 @@ module PgHero
             query_start
         SQL
       end
+
+      # from https://wiki.postgresql.org/wiki/Lock_Monitoring
+      def blocked_queries
+        select_all <<-SQL
+          SELECT
+            bl.pid AS blocked_pid,
+            a.usename AS blocked_user,
+            ka.query AS current_or_recent_query_in_blocking_process,
+            ka.state AS state_of_blocking_process,
+            age(now(), ka.query_start) AS blocking_duration,
+            kl.pid AS blocking_pid,
+            ka.usename AS blocking_user,
+            a.query AS blocked_query,
+            age(now(), a.query_start) AS blocked_duration
+          FROM
+            pg_catalog.pg_locks bl
+          JOIN
+            pg_catalog.pg_stat_activity a ON a.pid = bl.pid
+          JOIN
+            pg_catalog.pg_locks kl ON kl.transactionid = bl.transactionid AND kl.pid != bl.pid
+          JOIN
+            pg_catalog.pg_stat_activity ka ON ka.pid = kl.pid
+          WHERE
+            NOT bl.GRANTED
+          ORDER BY
+            blocked_duration DESC
+        SQL
+      end
     end
   end
 end

data/lib/pghero/methods/query_stats.rb

@@ -2,23 +2,19 @@ module PgHero
   module Methods
     module QueryStats
       def query_stats(options = {})
-        current_query_stats = (options[:historical] && options[:end_at] && options[:end_at] < Time.now ? [] : current_query_stats(options)).index_by { |q| q["query_hash"] }
-        historical_query_stats = (options[:historical] ? historical_query_stats(options) : []).index_by { |q| q["query_hash"] }
-        current_query_stats.default = {}
-        historical_query_stats.default = {}
+        current_query_stats = options[:historical] && options[:end_at] && options[:end_at] < Time.now ? [] : current_query_stats(options)
+        historical_query_stats = options[:historical] ? historical_query_stats(options) : []
 
-        query_stats = []
-        (current_query_stats.keys + historical_query_stats.keys).uniq.each do |query_hash|
-          value = {
-            "query" => current_query_stats[query_hash]["query"] || historical_query_stats[query_hash]["query"],
-            "query_hash" => query_hash,
-            "total_minutes" => current_query_stats[query_hash]["total_minutes"].to_f + historical_query_stats[query_hash]["total_minutes"].to_f,
-            "calls" => current_query_stats[query_hash]["calls"].to_i + historical_query_stats[query_hash]["calls"].to_i
-          }
-          value["average_time"] = value["total_minutes"] * 1000 * 60 / value["calls"]
-          value["total_percent"] = value["total_minutes"] * 100.0 / (current_query_stats[query_hash]["all_queries_total_minutes"].to_f + historical_query_stats[query_hash]["all_queries_total_minutes"].to_f)
-          query_stats << value
+        query_stats = combine_query_stats((current_query_stats + historical_query_stats).group_by { |q| q["query_hash"] })
+        query_stats = combine_query_stats(query_stats.group_by { |q| normalize_query(q["query"]) })
+
+        # add percentages
+        all_queries_total_minutes = [current_query_stats, historical_query_stats].sum { |s| (s.first || {})["all_queries_total_minutes"].to_f }
+        query_stats.each do |query|
+          query["average_time"] = query["total_minutes"] * 1000 * 60 / query["calls"]
+          query["total_percent"] = query["total_minutes"] * 100.0 / all_queries_total_minutes
         end
+
         sort = options[:sort] || "total_minutes"
         query_stats = query_stats.sort_by { |q| -q[sort] }.first(100)
         if options[:min_average_time]
@@ -235,6 +231,30 @@ module PgHero
         @server_version ||= {}
         @server_version[current_database] ||= select_all("SHOW server_version_num").first["server_version_num"].to_i
       end
+
+      private
+
+      def combine_query_stats(grouped_stats)
+        query_stats = []
+        grouped_stats.each do |_, stats2|
+          value = {
+            "query" => (stats2.find { |s| s["query"] } || {})["query"],
+            "query_hash" => (stats2.find { |s| s["query"] } || {})["query_hash"],
+            "total_minutes" => stats2.sum { |s| s["total_minutes"].to_f },
+            "calls" => stats2.sum { |s| s["calls"].to_i },
+            "all_queries_total_minutes" => stats2.sum { |s| s["all_queries_total_minutes"].to_f }
+          }
+          value["total_percent"] = value["total_minutes"] * 100.0 / value["all_queries_total_minutes"]
+          query_stats << value
+        end
+        query_stats
+      end
+
+      # removes comments
+      # combines ?, ?, ? => ?
+      def normalize_query(query)
+        squish(query.to_s.gsub(/\?(, ?\?)+/, "?").gsub(/\/\*.+?\*\//, ""))
+      end
     end
   end
 end

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord