rails-pg-extras 5.1.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7109cdaf06d94ed2a1707fffcd477a471c84ece3e648e4279f602f27e89b67
-  data.tar.gz: 583b204cfad10e9c3602946d5e00d0c10eaf1a7407e7234fc1f22db154e22bab
+  metadata.gz: 4bd83f21b85de2b816dc334b72ad1bd0dfcb0f13ea6946fec42ebb93f47ba876
+  data.tar.gz: 4e9e5b00cc7e07cf3baa1bc3e224fe8ab50510afa909b47e753873fb1e7a11e7
 SHA512:
-  metadata.gz: a3f334dcdf081777134219ab9f3c6ca0a0e95ca36495d71447690526c71bf893960219bda40d12c82973a2779131ff6977e99a141829f3a4121378b65d8e1659
-  data.tar.gz: 8eb2229994c72de036a4cf5e865b2503efcb831dd12c1182e4b45d43956cc89ffecb44f2bb1b7fe7a5ab50b82f4a662ddf2f7bee3756cac054d75639c8c5a6e2
+  metadata.gz: 1a30823d47f9e0cab719b7ee6e750da28c751f4dc20d21756f7f3a633c07dd6390397e09502300cfcf9185184a9e00af83de40f2fd9b12a6319a6ade31ccb26f
+  data.tar.gz: f01d58920638949122f26a74857cdab232168b274aee2d28d180eed09ea60a48ace036aa3ba772dc8ce41893d6e4a4397255167bc5ccf699a181c7205438ed93

data/README.md

@@ -142,47 +142,47 @@ end
 
 ### `measure_queries`
 
-This method displays query types executed when running a provided Ruby snippet, with their avg., min., max., and total duration. It also outputs info about the snippet execution duration and the portion spent running SQL queries (`total_duration`/`sql_duration`). It can help debug N+1 issues and review the impact of configuring eager loading:
-
-```ruby
-
-User.measure_queries { User.limit(10).map(&:team) }
-
-# {:count=>11,
-#  :queries=>
-#   {"SELECT \"users\".* FROM \"users\" LIMIT $1"=>
-#     {:count=>1,
-#      :total_duration=>0.003183000022545457,
-#      :min_duration=>0.003183000022545457,
-#      :max_duration=>0.003183000022545457,
-#      :avg_duration=>0.003183000022545457},
-#    "SELECT \"teams\".* FROM \"teams\" WHERE \"teams\".\"id\" = $1 LIMIT $2"=>
-#     {:count=>10,
-#      :total_duration=>0.011682000011205673,
-#      :min_duration=>0.0007209999894257635,
-#      :max_duration=>0.0024030000204220414,
-#      :avg_duration=>0.0011682000011205673}},
-#  :total_duration=>0.15247199998702854,
-#  :sql_duration=>0.01486500003375113}
-
-User.measure_queries { User.limit(10).includes(:team).map(&:team) }
-
-# {:count=>2,
-#  :queries=>
-#   {"SELECT \"users\".* FROM \"users\" LIMIT $1"=>
-#     {:count=>1,
-#      :total_duration=>0.0036189999955240637,
-#      :min_duration=>0.0036189999955240637,
-#      :max_duration=>0.0036189999955240637,
-#      :avg_duration=>0.0036189999955240637},
-#    "SELECT \"teams\".* FROM \"teams\" WHERE \"teams\".\"id\" IN ($1, $2, $3, $4, $5, $6, $7, $8)"=>
-#     {:count=>1,
-#      :total_duration=>0.003714999998919666,
-#      :min_duration=>0.003714999998919666,
-#      :max_duration=>0.003714999998919666,
-#      :avg_duration=>0.003714999998919666}},
-#  :total_duration=>0.023814999993192032,
-#  :sql_duration=>0.0073339999944437295}
+This method displays query types executed when running a provided Ruby snippet, with their avg., min., max., and total duration in miliseconds. It also outputs info about the snippet execution duration and the portion spent running SQL queries (`total_duration`/`sql_duration`). It can help debug N+1 issues and review the impact of configuring eager loading:
+
+```ruby
+
+RailsPgExtras.measure_queries { User.limit(10).map(&:team) }
+
+{:count=>11,
+ :queries=>
+  {"SELECT \"users\".* FROM \"users\" LIMIT $1"=>
+    {:count=>1,
+     :total_duration=>3.452000004472211,
+     :min_duration=>3.452000004472211,
+     :max_duration=>3.452000004472211,
+     :avg_duration=>3.452000004472211},
+   "SELECT \"teams\".* FROM \"teams\" WHERE \"teams\".\"id\" = $1 LIMIT $2"=>
+    {:count=>10,
+     :total_duration=>14.487000000372063,
+     :min_duration=>0.778000001446344,
+     :max_duration=>1.985000002605375,
+     :avg_duration=>1.4487000000372063}},
+ :total_duration=>24.812000003294088,
+ :sql_duration=>17.939000004844274}
+
+RailsPgExtras.measure_queries { User.limit(10).includes(:team).map(&:team) }
+
+{:count=>2,
+ :queries=>
+  {"SELECT \"users\".* FROM \"users\" LIMIT $1"=>
+    {:count=>1,
+     :total_duration=>3.7079999965499155,
+     :min_duration=>3.7079999965499155,
+     :max_duration=>3.7079999965499155,
+     :avg_duration=>3.7079999965499155},
+   "SELECT \"teams\".* FROM \"teams\" WHERE \"teams\".\"id\" IN ($1, $2, $3, $4, $5, $6, $7, $8)"=>
+    {:count=>1,
+     :total_duration=>2.422000005026348,
+     :min_duration=>2.422000005026348,
+     :max_duration=>2.422000005026348,
+     :avg_duration=>2.422000005026348}},
+ :total_duration=>9.905999999318738,
+ :sql_duration=>6.1300000015762635}
 
 ```
 

data/lib/rails-pg-extras.rb

@@ -66,8 +66,7 @@ module RailsPgExtras
     starting = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     block.call
     ending = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    elapsed = ending - starting
-    elapsed
+    (ending - starting) * 1000
   end
 
   def self.measure_queries(&block)
@@ -85,16 +84,16 @@ module RailsPgExtras
         key = payload[:sql]
         queries[key] ||= { count: 0, total_duration: 0, min_duration: nil, max_duration: nil }
         queries[key][:count] += 1
-        duration = finish - start
+        duration = (finish - start) * 1000
         queries[key][:total_duration] += duration
         sql_duration += duration
 
         if queries[key][:min_duration] == nil || queries[key][:min_duration] > duration
-          queries[key][:min_duration] = duration
+          queries[key][:min_duration] = duration.round(2)
         end
 
         if queries[key][:max_duration] == nil || queries[key][:max_duration] < duration
-          queries[key][:max_duration] = duration
+          queries[key][:max_duration] = duration.round(2)
         end
       end
     end
@@ -104,7 +103,8 @@ module RailsPgExtras
     end
 
     queries = queries.reduce({}) do |agg, val|
-      val[1][:avg_duration] = val[1][:total_duration] / val[1][:count]
+      val[1][:avg_duration] = (val[1][:total_duration] / val[1][:count]).round(2)
+      val[1][:total_duration] = val[1][:total_duration].round(2)
       agg.merge(val[0] => val[1])
     end
 
@@ -112,11 +112,12 @@ module RailsPgExtras
     {
       count: queries.reduce(0) { |agg, val| agg + val[1].fetch(:count) },
       queries: queries,
-      total_duration: total_duration,
-      sql_duration: sql_duration
+      total_duration: total_duration.round(2),
+      sql_duration: sql_duration.round(2)
     }
   end
 
+
   def self.index_info(args: {}, in_format: :display_table)
     data = RailsPgExtras::IndexInfo.call(args[:table_name])
 

data/lib/rails_pg_extras/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsPgExtras
-  VERSION = "5.1.0"
+  VERSION = "5.2.1"
 end

data/spec/smoke_spec.rb

@@ -30,7 +30,7 @@ describe RailsPgExtras do
   end
 
   it "collecting queries data works" do
-    output = RailsPgExtras.queries_data { RailsPgExtras.diagnose(in_format: :hash) }
+    output = RailsPgExtras.measure_queries { RailsPgExtras.diagnose(in_format: :hash) }
     expect(output.fetch(:count)).to eq 10
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-extras
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.1
 platform: ruby
 authors:
 - pawurb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-pg-extras
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement