debloater 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b62165f1a67989f3ba01274484d44adf38ec35
-  data.tar.gz: 841d4684a2f920552621faf5a17bdc043756e30a
+  metadata.gz: d071b8c2e619cc724f84453444f600241088c6ac
+  data.tar.gz: 54f8a1a4b93b2ec4dee3ea3730c2874ff030e9d8
 SHA512:
-  metadata.gz: 0cc3f9c0af2e80101fe7fb8aeb3571ac707f11332adbbcd91f0669a6da21c8f777f2364ad7465193a5782cfcef529a4869f3319aa78446c95e7d5a2eb781f917
-  data.tar.gz: 3c6745026be290c0df30697fcc0c957fdbc616d285b92ac4d49837122e70a48718b2e1f32fca266daae0e233bf9a4971320b531f62c045b32e79b1fd7ac185fd
+  metadata.gz: 9de264341cffe510b287d4013448ba5fecf2b9cba86519aa05a224f14bf95c1757908102f5dee8f8c07f088833c1bf0b826be9917795d9be7db5bee56d33bcd2
+  data.tar.gz: 4b4e430e2d7978ce58ce627d83cbed6572a2546780a2320bdb55c4a3c2210102d4654b46a34403b735d533c5e7f4800929399154e0daea8bd38e663c5aecfcc3

data/lib/debloater/index.rb

@@ -56,21 +56,31 @@ module Debloater
 
 
     def debloat!
+      _log "Old index definition:"
+      _log @sql
+
       [
-        "DROP INDEX IF EXISTS idx_debloat_new",
+        'DROP INDEX IF EXISTS idx_debloat_new',
         @sql.
           sub(/CONCURRENTLY/i, '').
-          sub(/CREATE (UNIQUE)? INDEX/i, 'CREATE \1 INDEX CONCURRENTLY').
+          sub(/CREATE\s+(UNIQUE\s+)?INDEX/i, 'CREATE \1INDEX CONCURRENTLY').
           sub(@name, 'idx_debloat_new'),
-        'BEGIN',
-        "ALTER INDEX #{@name} RENAME TO idx_debloat_old",
-        "ALTER INDEX idx_debloat_new RENAME TO #{@name}",
-        'DROP INDEX idx_debloat_old',
-        'COMMIT',
+        %{
+          BEGIN;
+          ALTER INDEX #{@name} RENAME TO idx_debloat_old;
+          ALTER INDEX idx_debloat_new RENAME TO #{@name};
+          DROP INDEX idx_debloat_old;
+          COMMIT;
+        },
       ].each do |sql|
-        _log "\t#{sql}"
         begin
+          _log "\t#{sql}"
           @conn.exec sql
+        rescue PG::TRDeadlockDetected => e
+          _log "Deadlock encountered. Press enter to retry, ^C to abort."
+          IO.console.gets
+          @conn.exec 'ROLLBACK;'
+          retry
         rescue PG::DependentObjectsStillExist => e
           _log "Could not debloat '#{@name}', skipping. Details:"
           _log e.message

data/lib/debloater/version.rb

@@ -1,3 +1,3 @@
 module Debloater
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debloater
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler