pg_qtop 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b68b70f3b6f49e8bdde29887334cd1fcb64fa35
-  data.tar.gz: 0275546c0da92a4372e28b30715a55e80ce32001
+  metadata.gz: dcaa78ecf82e15a38b2638837f8828833e49cab5
+  data.tar.gz: 2fb75d88dde0903495c9386ce80e0f1255e68001
 SHA512:
-  metadata.gz: 8dae0bbf5bbf819d426ce4e478b663aa2dfaea1ba6a7ac918e6cb19605346323c44c2d0a05e149ee6bd64e6b669cc45fd755fa52684110c0b5e6ca77e8173139
-  data.tar.gz: 854098cd74a01161f667224e1003a66f25820d1197cf7747c012c74cfd8d29427bf43ce9566a135d33fe4cd5710ca8d08a98f63d2d9b5e79eba58948b2dbd2d3
+  metadata.gz: c92a12099f7f5c7ce54c41ee4ae53d06353d0fce61ac57aea7bcc002d5d3e213985c18595246c4b9c90c9d2887a8be73a21d3f1e1f62aa278d6e3807b0f72268
+  data.tar.gz: 1e2bea6b72edd335ccc1706f10afab389c211740236e25220d171efb176d94e55802b6770922ffa9647d85465eeb649fb89323b6f081d9489b9fb8fbc280b533

data/lib/pg_qtop.rb

@@ -1,2 +1,4 @@
+require 'active_support'
+
 require 'pg_qtop/version'
 require 'pg_qtop/monitor'

data/lib/pg_qtop/monitor.rb

@@ -8,16 +8,36 @@ module PgQtop
   class CLIHelper
     include Mixlib::CLI
 
-    option :database,
+    option :dbname,
         short: "-d DATABASE",
         long: "--database DATABASE",
-        description: "The database to be tracked",
+        description: "database name to connect to",
         required: true
 
+    option :host,
+        short: "-h HOSTNAME",
+        long: "--host HOSTNAME",
+        description: "database server host"
+
+    option :port,
+        short: "-p PORT",
+        long: "--port PORT",
+        description: "database server port (default: 5432)"
+
+    option :user,
+        short: "-U USERNAME",
+        long: "--username USERNAME",
+        description: "database user name"
+
     option :table,
         short: "-t TABLE",
         long: "--table TABLE",
         description: "Only show queries that use the specified table"
+
+    option :statement_type,
+        short: "-s TYPE",
+        long: "--statement-type TYPE",
+        description: "Only show queries of the specified type (SELECT, INSERT, UPDATE or DELETE)"
   end
 
   module Monitor
@@ -30,29 +50,50 @@ module PgQtop
       Curses.noecho
       Curses.init_screen
 
-      conn = PG::Connection.open(dbname: cli.config[:database])
-
+      conn = PG::Connection.open cli.config.slice(:dbname, :host, :port, :user)
       conn.exec('SELECT pg_stat_statements_reset()')
 
       while true do
         Curses.setpos(0, 0)
-        queries = conn.exec('SELECT query, calls, total_time FROM pg_stat_statements').to_a
+        queries = conn.exec('SELECT query, calls, total_time, shared_blks_read, shared_blks_hit FROM pg_stat_statements').to_a
 
         queries = queries.sort_by {|q| (q["total_time"].to_f / q["calls"].to_f) }.reverse
-        Curses.addstr("AVG\t| QUERY\n")
+
+        Curses.addstr("AVG\t| CALLS\t| HIT RATE\t| QUERY\n")
         Curses.addstr("-" * 80 + "\n")
+
         queries.each do |query|
-          if cli.config[:table]
-            next unless PgQuery.parse(query["query"]).tables.include?(cli.config[:table])
+          parsed_query = PgQuery.parse(query["query"])
+
+          next if cli.config[:statement_type] && !matches_statement_type?(parsed_query, cli.config[:statement_type])
+          next if cli.config[:table] && !parsed_query.tables.include?(cli.config[:table])
+
+          hit_rate = 100.0 * query["shared_blks_hit"].to_f / (query["shared_blks_hit"].to_i + query["shared_blks_read"].to_i)
+
+          Curses.addstr format("%0.1fms\t", query["total_time"].to_f / query["calls"].to_f)
+          Curses.addstr format("| %d\t", query["calls"].to_i)
+
+          if hit_rate.nan?
+            Curses.addstr "| -\t\t"
+          else
+            Curses.addstr format("| %0.1f\t\t", hit_rate)
           end
-          Curses.addstr("%0.1fms\t" % (query["total_time"].to_f / query["calls"].to_f))
-          Curses.addstr("| " + query["query"].gsub(/\s+/, " ").strip + "\n")
+          Curses.addstr format("| %s\n", query["query"].gsub(/\s+/, " ").strip)
         end
+
         Curses.refresh
+
         sleep 1
       end
 
       Curses.close_screen
     end
+
+    def matches_statement_type?(parsed_query, filter)
+      filter = filter.upcase
+      filter = 'INSERT INTO' if filter == 'INSERT'
+      filter = 'DELETE FROM' if filter == 'DELETE'
+      parsed_query.parsetree.flat_map {|q| q.keys }.include?(filter)
+    end
   end
 end

data/lib/pg_qtop/version.rb

@@ -1,3 +1,3 @@
 module PgQtop
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_qtop
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Lukas Fittl
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Shows the top queries running on your server using pg_stat_statements
 email: lukas@fittl.com
 executables: