ruby-pg-extras 4.5.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eccdaebec580ef42cfdb092693f1adf4db2b1b3dbfcb42a929d7d867fc4b853c
-  data.tar.gz: 87aefe7bf42510e3b3d1df787ce046eadef69965470edffd7cf02b462156a841
+  metadata.gz: eb8d111c78464e22c42ce800eb3843d44e474ee3a403680b368373fd757d2ffc
+  data.tar.gz: 0e34e7b2ff814db1de73b937b24767639c197cae5896687b18167cc33f79e206
 SHA512:
-  metadata.gz: 28bfa046456ae5fd15183d56c185ca5fc30ab8e2f3208e7640c53e5cdb4ad6d9df223f97d81b8e529405c44d6041ebefd0fe92b0135a1762a7a72fc83b3e5617
-  data.tar.gz: 1189fe24c64b2de4dfaa807f1b98e380b33cd60a4a8d209ba453d14cd41e726718dc42d6ca35300d4f812dcdd2d8730ce298bfebaa4911b29cf0441f105f9ae9
+  metadata.gz: 8124dbe7f0b64f518cecb4dd9088caca4a372c3b79d35476faeec6eb4060bcdb69ca5a2f8c460dbeda9f0c6c4c3c5e6e858f428be78770b84ecbb020ec708c9c
+  data.tar.gz: 9444732788d96f853c5a1a40d9b1d366df4ee72c5bc1659cf5ff69117dd590a6840f766f02c09db8163772c6bfb9219f5a0d83cf14e02e7fdc59cd7a4af2f886

data/.circleci/config.yml

@@ -2,39 +2,47 @@ version: 2
 jobs:
   test:
     docker:
-      - image: circleci/ruby:2.6.5
+      - image: cimg/ruby:2.7.6
         environment:
           DATABASE_URL: postgresql://postgres:secret@localhost:5432/ruby-pg-extras-test
-      - image: circleci/postgres:11.5
+      - image: cimg/postgres:11.15
         command: postgres -c shared_preload_libraries=pg_stat_statements
         name: postgres11
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: ruby-pg-extras-test
           POSTGRES_PASSWORD: secret
-      - image: circleci/postgres:12.7
+      - image: cimg/postgres:12.10
         command: postgres -c shared_preload_libraries=pg_stat_statements
         name: postgres12
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: ruby-pg-extras-test
           POSTGRES_PASSWORD: secret
-      - image: circleci/postgres:13.3
+      - image: cimg/postgres:13.6
         command: postgres -c shared_preload_libraries=pg_stat_statements
         name: postgres13
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: ruby-pg-extras-test
           POSTGRES_PASSWORD: secret
+      - image: cimg/postgres:14.2
+        command: postgres -c shared_preload_libraries=pg_stat_statements
+        name: postgres14
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: ruby-pg-extras-test
+          POSTGRES_PASSWORD: secret
     parallelism: 1
     steps:
       - checkout
       - run: gem update --system
       - run: gem install bundler
-      - run: bundle config set --local path 'vendor/bundle'
-      - run: bundle install
       - run: sudo apt-get update --allow-releaseinfo-change
       - run: sudo apt install postgresql-client
+      - run: sudo apt install libpq-dev
+      - run: bundle config set --local path 'vendor/bundle'
+      - run: bundle install
       - run: dockerize -wait tcp://postgres11:5432 -timeout 1m
       - run:
           name: Run specs for PG 11
@@ -51,6 +59,11 @@ jobs:
           environment:
             DATABASE_URL: postgresql://postgres:secret@postgres13:5432/ruby-pg-extras-test
           command: bundle exec rspec spec/
+      - run:
+          name: Run specs for PG 14
+          environment:
+            DATABASE_URL: postgresql://postgres:secret@postgres14:5432/ruby-pg-extras-test
+          command: bundle exec rspec spec/
 workflows:
   version: 2
   test:

data/README.md

@@ -255,14 +255,14 @@ This command provides information on the efficiency of indexes, represented as w
 
 RubyPgExtras.locks
 
- procpid | relname | transactionid | granted |     query_snippet     | mode             |       age
----------+---------+---------------+---------+-----------------------+-------------------------------------
-   31776 |         |               | t       | <IDLE> in transaction | ExclusiveLock    |  00:19:29.837898
-   31776 |         |          1294 | t       | <IDLE> in transaction | RowExclusiveLock |  00:19:29.837898
-   31912 |         |               | t       | select * from hello;  | ExclusiveLock    |  00:19:17.94259
-    3443 |         |               | t       |                      +| ExclusiveLock    |  00:00:00
-         |         |               |         |    select            +|                  |
-         |         |               |         |      pg_stat_activi   |                  |
+ procpid | relname | transactionid | granted |     query_snippet     | mode             |       age        |   application |
+---------+---------+---------------+---------+-----------------------+------------------------------------------------------
+   31776 |         |               | t       | <IDLE> in transaction | ExclusiveLock    |  00:19:29.837898 |  bin/rails
+   31776 |         |          1294 | t       | <IDLE> in transaction | RowExclusiveLock |  00:19:29.837898 |  bin/rails
+   31912 |         |               | t       | select * from hello;  | ExclusiveLock    |  00:19:17.94259  |  bin/rails
+    3443 |         |               | t       |                      +| ExclusiveLock    |  00:00:00        |  bin/sidekiq
+         |         |               |         |    select            +|                  |                  |
+         |         |               |         |      pg_stat_activi   |                  |                  |
 (4 rows)
 ```
 

data/Rakefile

@@ -5,5 +5,5 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Test all PG versions'
 task :test_all do
-  system("PG_VERSION=11 bundle exec rspec spec/ && PG_VERSION=12 bundle exec rspec spec/ && PG_VERSION=13 bundle exec rspec spec/")
+  system("PG_VERSION=11 bundle exec rspec spec/ && PG_VERSION=12 bundle exec rspec spec/ && PG_VERSION=13 bundle exec rspec spec/ && PG_VERSION=14 bundle exec rspec spec/")
 end

data/docker-compose.yml.sample

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   postgres11:
-    image: postgres:11.5-alpine
+    image: postgres:11.16-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
       POSTGRES_USER: postgres
@@ -11,7 +11,7 @@ services:
     ports:
       - '5432:5432'
   postgres12:
-    image: postgres:12.7-alpine
+    image: postgres:12.11-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
       POSTGRES_USER: postgres
@@ -20,7 +20,7 @@ services:
     ports:
       - '5433:5432'
   postgres13:
-    image: postgres:13.3-alpine
+    image: postgres:13.7-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
       POSTGRES_USER: postgres
@@ -28,3 +28,12 @@ services:
       POSTGRES_PASSWORD: secret
     ports:
       - '5434:5432'
+  postgres14:
+    image: postgres:14.3-alpine
+    command: postgres -c shared_preload_libraries=pg_stat_statements
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: ruby-pg-extras-test
+      POSTGRES_PASSWORD: secret
+    ports:
+      - '5435:5432'

data/lib/ruby-pg-extras.rb

@@ -3,6 +3,7 @@
 require 'terminal-table'
 require 'uri'
 require 'pg'
+require 'ruby_pg_extras/size_parser'
 require 'ruby_pg_extras/diagnose_data'
 require 'ruby_pg_extras/diagnose_print'
 require 'ruby_pg_extras/index_info'

data/lib/ruby_pg_extras/diagnose_data.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require 'filesize'
-
 module RubyPgExtras
   class DiagnoseData
     PG_EXTRAS_TABLE_CACHE_HIT_MIN_EXPECTED = "0.985"
     PG_EXTRAS_INDEX_CACHE_HIT_MIN_EXPECTED = "0.985"
     PG_EXTRAS_UNUSED_INDEXES_MAX_SCANS = 20
-    PG_EXTRAS_UNUSED_INDEXES_MIN_SIZE_BYTES = Filesize.from("1 MB").to_i # 1000000 bytes
+    PG_EXTRAS_UNUSED_INDEXES_MIN_SIZE_BYTES = SizeParser.to_i("1 MB") # 1000000 bytes
     PG_EXTRAS_NULL_INDEXES_MIN_SIZE_MB = 1 # 1 MB
     PG_EXTRAS_NULL_MIN_NULL_FRAC_PERCENT = 50 # 50%
     PG_EXTRAS_BLOAT_MIN_VALUE = 10
@@ -118,7 +116,7 @@ module RubyPgExtras
         in_format: :hash,
         args: { min_scans: PG_EXTRAS_UNUSED_INDEXES_MAX_SCANS }
       ).select do |i|
-        Filesize.from(i.fetch("index_size").sub("bytes", "").strip).to_i >= PG_EXTRAS_UNUSED_INDEXES_MIN_SIZE_BYTES
+        SizeParser.to_i(i.fetch("index_size").strip) >= PG_EXTRAS_UNUSED_INDEXES_MIN_SIZE_BYTES
       end
 
       if indexes.count == 0

data/lib/ruby_pg_extras/queries/all_locks.sql

@@ -7,7 +7,8 @@ SELECT
   pg_locks.granted,
   pg_locks.mode,
   pg_stat_activity.query AS query_snippet,
-  age(now(),pg_stat_activity.query_start) AS "age"
+  age(now(),pg_stat_activity.query_start) AS "age",
+  pg_stat_activity.application_name AS application
 FROM pg_stat_activity,pg_locks left
 OUTER JOIN pg_class
   ON (pg_locks.relation = pg_class.oid)

data/lib/ruby_pg_extras/queries/locks.sql

@@ -7,7 +7,8 @@ SELECT
   pg_locks.granted,
   pg_locks.mode,
   pg_stat_activity.query AS query_snippet,
-  age(now(),pg_stat_activity.query_start) AS "age"
+  age(now(),pg_stat_activity.query_start) AS "age",
+  pg_stat_activity.application_name AS application
 FROM pg_stat_activity,pg_locks left
 OUTER JOIN pg_class
   ON (pg_locks.relation = pg_class.oid)

data/lib/ruby_pg_extras/size_parser.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module RubyPgExtras
+  class SizeParser
+    def self.to_i(arg)
+      value = to_i_si(arg) || to_i_binary(arg) || to_i_digits(arg)
+      raise ArgumentError, "Unparseable size: #{arg}" if value.nil?
+
+      value
+    end
+
+    def self.regexp_for_units(units)
+      /\A(-?\d+)\s?(#{units.join('|')})\z/i
+    end
+
+    SI_UNITS = %w[bytes kB MB GB TB PB EB ZB YB].map(&:downcase).freeze
+    SI_REGEXP = regexp_for_units(SI_UNITS)
+
+    def self.to_i_si(arg)
+      to_i_for_units(arg, SI_REGEXP, SI_UNITS, 1000)
+    end
+
+    BINARY_UNITS = %w[bytes KiB MiB GiB TiB PiB EiB ZiB YiB].map(&:downcase).freeze
+    BINARY_REGEXP = regexp_for_units(BINARY_UNITS)
+
+    def self.to_i_binary(arg)
+      to_i_for_units(arg, BINARY_REGEXP, BINARY_UNITS, 1024)
+    end
+
+    def self.to_i_for_units(arg, regexp, units, multiplier)
+      match_data = regexp.match(arg)
+      return nil unless match_data
+
+      exponent = units.index(match_data[2].downcase).to_i
+      match_data[1].to_i * multiplier**exponent
+    end
+
+    DIGITS_ONLY_REGEXP = /\A(-?\d+)\z/.freeze
+    def self.to_i_digits(arg)
+      DIGITS_ONLY_REGEXP.match?(arg) ? arg.to_i : nil
+    end
+  end
+end

data/lib/ruby_pg_extras/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyPgExtras
-  VERSION = "4.5.0"
+  VERSION = "4.7.0"
 end

data/ruby-pg-extras.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license       = "MIT"
   s.add_dependency "pg"
-  s.add_dependency "filesize"
   s.add_dependency "terminal-table"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/spec/size_parser_spec.rb

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RubyPgExtras::SizeParser do
+  subject(:result) { described_class.to_i(arg) }
+
+  describe 'SI Units' do
+    let(:arg) { "#{num_units} #{unit}" }
+
+    context "when the argument is a number followed by 'bytes', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[bytes BYTES Bytes].sample }
+
+      it { is_expected.to eq(num_units) }
+    end
+
+    context "when the argument is a number followed by 'kB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[kB kb KB].sample }
+
+      it { is_expected.to eq(num_units * 1000) }
+    end
+
+    context "when the argument is a number followed by 'MB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[MB Mb mb].sample }
+
+      it { is_expected.to eq(num_units * 1000 * 1000) }
+    end
+
+    context "when the argument is a number followed by 'GB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[GB Gb gb].sample }
+
+      it { is_expected.to eq(num_units * 1000 * 1000 * 1000) }
+    end
+
+    context "when the argument is a number followed by 'TB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[TB Tb tb].sample }
+
+      it { is_expected.to eq(num_units * 1000 * 1000 * 1000 * 1000) }
+    end
+
+    context "when the argument is a number followed by 'PB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[PB Pb pb].sample }
+
+      it { is_expected.to eq(num_units * 1000 * 1000 * 1000 * 1000 * 1000) }
+    end
+
+    context "when the argument is a number followed by 'EB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[EB Eb eb].sample }
+
+      it { is_expected.to eq(num_units * 1000 * 1000 * 1000 * 1000 * 1000 * 1000) }
+    end
+
+    context "when the argument is a number followed by 'ZB', with possible case variations" do
+      let(:num_units) { 912 }
+      let(:unit) { %w[ZB Zb zb].sample }
+
+      it { is_expected.to eq(num_units * 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000) }
+    end
+
+    context "when the argument is a number followed by 'YB', with possible case variations" do
+      let(:num_units) { 912 }
+      let(:unit) { %w[YB Yb yb].sample }
+
+      it { is_expected.to eq(num_units * 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000) }
+    end
+  end
+
+  describe 'Binary Units' do
+    let(:arg) { "#{num_units} #{unit}" }
+
+    context "when the argument is a number followed by 'bytes', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[bytes BYTES Bytes].sample }
+
+      it { is_expected.to eq(num_units) }
+    end
+
+    context "when the argument is a number followed by 'kiB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[kiB kib KiB].sample }
+
+      it { is_expected.to eq(num_units * 1024) }
+    end
+
+    context "when the argument is a number followed by 'MiB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[MiB Mib mib].sample }
+
+      it { is_expected.to eq(num_units * 1024 * 1024) }
+    end
+
+    context "when the argument is a number followed by 'GiB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[GiB Gib gib].sample }
+
+      it { is_expected.to eq(num_units * 1024 * 1024 * 1024) }
+    end
+
+    context "when the argument is a number followed by 'TiB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[TiB Tib tib].sample }
+
+      it { is_expected.to eq(num_units * 1024 * 1024 * 1024 * 1024) }
+    end
+
+    context "when the argument is a number followed by 'PiB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[PiB Pib pib].sample }
+
+      it { is_expected.to eq(num_units * 1024 * 1024 * 1024 * 1024 * 1024) }
+    end
+
+    context "when the argument is a number followed by 'EiB', with possible case variations" do
+      let(:num_units) { rand(1000) }
+      let(:unit) { %w[EiB Eib eib].sample }
+
+      it { is_expected.to eq(num_units * 1024 * 1024 * 1024 * 1024 * 1024 * 1024) }
+    end
+
+    context "when the argument is a number followed by 'ZB', with possible case variations" do
+      let(:num_units) { 912 }
+      let(:unit) { %w[ZiB Zib zib].sample }
+
+      it { is_expected.to eq(num_units * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024) }
+    end
+
+    context "when the argument is a number followed by 'YB', with possible case variations" do
+      let(:num_units) { 912 }
+      let(:unit) { %w[YiB Yib yib].sample }
+
+      it { is_expected.to eq(num_units * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024) }
+    end
+  end
+
+  context 'when the argument has only digits' do
+    let(:arg) { '654245' }
+
+    it { is_expected.to eq(arg.to_i) }
+  end
+
+  describe 'errors' do
+    it 'raises an error when the argument has an invalid prefix' do
+      expect do
+        described_class.to_i('123 qb')
+      end.to raise_error ArgumentError
+    end
+
+    it 'raises an error when the argument does not have a unit in bytes' do
+      expect do
+        described_class.to_i('123 mL')
+      end.to raise_error ArgumentError
+    end
+
+    it 'when the argument cannot be parsed an number of units' do
+      expect do
+        described_class.to_i('1c3 MB')
+      end.to raise_error ArgumentError
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ elsif pg_version == "12"
   "5433"
 elsif pg_version == "13"
   "5434"
+elsif pg_version == "14"
+  "5435"
 else
   "5432"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pg-extras
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.7.0
 platform: ruby
 authors:
 - pawurb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: filesize
-  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'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +124,7 @@ files:
 - lib/ruby_pg_extras/queries/total_table_size.sql
 - lib/ruby_pg_extras/queries/unused_indexes.sql
 - lib/ruby_pg_extras/queries/vacuum_stats.sql
+- lib/ruby_pg_extras/size_parser.rb
 - lib/ruby_pg_extras/table_info.rb
 - lib/ruby_pg_extras/table_info_print.rb
 - lib/ruby_pg_extras/version.rb
@@ -146,6 +133,7 @@ files:
 - spec/diagnose_data_spec.rb
 - spec/diagnose_print_spec.rb
 - spec/index_info_spec.rb
+- spec/size_parser_spec.rb
 - spec/smoke_spec.rb
 - spec/spec_helper.rb
 - spec/table_info_spec.rb
@@ -177,6 +165,7 @@ test_files:
 - spec/diagnose_data_spec.rb
 - spec/diagnose_print_spec.rb
 - spec/index_info_spec.rb
+- spec/size_parser_spec.rb
 - spec/smoke_spec.rb
 - spec/spec_helper.rb
 - spec/table_info_spec.rb