pgdexter 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62ad383008579d8dbe952b3f96c827e01aa198c0eb74b3b884188472459b34b8
-  data.tar.gz: b77596742f0e13bb058354edcd901d1e93ec94f61bf6a695957c51fe9c7e41dc
+  metadata.gz: 8e8097505929a24e8c038c7fe69ac667faaa05008a3aa94971501fc4b9f15157
+  data.tar.gz: a08bf061493ed984103ce768af1347d81250c51b4f068f69d3688a1e4fd25514
 SHA512:
-  metadata.gz: 1b5f18ce901729f9e22d4222b0ba7ee498be18edb7897221c28069f8beceb65058342c47e9211ce94814d04b380387b95506722b1568a1d44b4d3c8386beeb17
-  data.tar.gz: fa51ae2cde49dfcf9fc181a30bda4941c2ea01f1186fdd6a8cd002059a71c4b3341686cd62f2d1366874c941b92db1a4f74a6abd272baa66063907602e1376c5
+  metadata.gz: 9c2d99ecbd5fd68e460f25982fe31d1149d9682a7065cfb674d24785f78138ab04d94bcdbf3b81f2d8065468f6531bbaea1e0593bd8fd7ab4dcdb2b061276c1e
+  data.tar.gz: 0e55cc589470760d317e3ba0e895d7ce5e24cd79517cf02c59aaba1caf36eb1f9785725eedc61e7402d480a61870828aaf2b33683f8ca58223f380d518c7df9c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.4.2 (2023-01-29)
+
+- Fixed `--pg-stat-statements` option for Postgres 13+
+
+## 0.4.1 (2022-10-15)
+
+- Added support for `json` format
+
 ## 0.4.0 (2022-07-27)
 
 - Added support for pg_query 2

data/README.md

@@ -2,7 +2,7 @@
 
 The automatic indexer for Postgres
 
-[Read about how it works](https://ankane.org/introducing-dexter)
+[Read about how it works](https://ankane.org/introducing-dexter) or [watch the talk](https://www.youtube.com/watch?v=Mni_1yTaNbE)
 
 [![Build Status](https://github.com/ankane/dexter/workflows/build/badge.svg?branch=master)](https://github.com/ankane/dexter/actions)
 
@@ -190,11 +190,13 @@ dexter --log-sql --log-level debug2
 
 ## Hosted Postgres
 
-Some hosted providers like Amazon RDS and Heroku do not support the HypoPG extension, which Dexter needs to run. See [how to use Dexter](guides/Hosted-Postgres.md) in these cases. To request the extension:
+The `hypopg` extension, which Dexter needs to run, is available on [these providers](https://github.com/ankane/dexter/issues/44).
+
+For other providers, see [this guide](guides/Hosted-Postgres.md). To request a new extension:
 
 - Amazon RDS - follow the instructions on [this page](https://aws.amazon.com/rds/postgresql/faqs/)
-- Google Cloud SQL - star the [feature request](https://issuetracker.google.com/issues/69250435)
-- DigitalOcean Managed Databases - follow the instructions on [this page](https://docs.digitalocean.com/products/databases/postgresql/details/supported-extensions/#supported-extensions)
+- Google Cloud SQL - vote or comment on [this page](https://issuetracker.google.com/issues/69250435)
+- DigitalOcean Managed Databases - vote or comment on [this page](https://ideas.digitalocean.com/app-framework-services/p/support-hypopg-for-postgres)
 
 ## Additional Installation Methods
 
@@ -212,7 +214,7 @@ And run it with:
 docker run -ti ankane/dexter <connection-options>
 ```
 
-On Mac and Windows, use `host.docker.internal` as the database hostname for databases on your local machine.
+For databases on the host machine, use `host.docker.internal` as the hostname (on Linux, this requires Docker 20.04 and `--add-host=host.docker.internal:host-gateway`).
 
 ### Homebrew
 

data/lib/dexter/indexer.rb

@@ -620,6 +620,7 @@ module Dexter
     end
 
     def stat_statements
+      total_time = server_version_num >= 130000 ? "(total_plan_time + total_exec_time)" : "total_time"
       result = execute <<-SQL
         SELECT
           DISTINCT query
@@ -629,7 +630,7 @@ module Dexter
           pg_database ON pg_database.oid = pg_stat_statements.dbid
         WHERE
           datname = current_database()
-          AND total_time >= #{@min_time * 60000}
+          AND #{total_time} >= #{@min_time * 60000}
           AND calls >= #{@min_calls}
         ORDER BY
           1

data/lib/dexter/json_log_parser.rb

@@ -0,0 +1,23 @@
+require "json"
+
+module Dexter
+  class JsonLogParser < LogParser
+    FIRST_LINE_REGEX = /\A.+/
+
+    def perform
+      @logfile.each_line do |line|
+        row = JSON.parse(line.chomp)
+        if (m = REGEX.match(row["message"]))
+          # replace first line with match
+          # needed for multiline queries
+          active_line = row["message"].sub(FIRST_LINE_REGEX, m[3])
+
+          add_parameters(active_line, row["detail"]) if row["detail"]
+          process_entry(active_line, m[1].to_f)
+        end
+      end
+    rescue JSON::ParserError => e
+      raise Dexter::Abort, "ERROR: #{e.message}"
+    end
+  end
+end

data/lib/dexter/processor.rb

@@ -13,6 +13,8 @@ module Dexter
           PgStatActivityParser.new(@indexer, @collector)
         elsif options[:input_format] == "csv"
           CsvLogParser.new(logfile, @collector)
+        elsif options[:input_format] == "json"
+          JsonLogParser.new(logfile, @collector)
         elsif options[:input_format] == "sql"
           SqlLogParser.new(logfile, @collector)
         else

data/lib/dexter/version.rb

@@ -1,3 +1,3 @@
 module Dexter
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/lib/dexter.rb

@@ -16,6 +16,7 @@ require "dexter/collector"
 require "dexter/indexer"
 require "dexter/log_parser"
 require "dexter/csv_log_parser"
+require "dexter/json_log_parser"
 require "dexter/pg_stat_activity_parser"
 require "dexter/sql_log_parser"
 require "dexter/processor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgdexter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -68,6 +68,7 @@ files:
 - lib/dexter/collector.rb
 - lib/dexter/csv_log_parser.rb
 - lib/dexter/indexer.rb
+- lib/dexter/json_log_parser.rb
 - lib/dexter/log_parser.rb
 - lib/dexter/logging.rb
 - lib/dexter/pg_stat_activity_parser.rb
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: The automatic indexer for Postgres