pg_reindex 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    pg_reindex (0.1.2)
+    pg_reindex (0.1.3)
       pg
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.5)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)

data/README.md

@@ -9,10 +9,10 @@ Install:
   
 Using:
 
-    export PGRE_CFG=/some/path/database.yml 
+    export PGRE_CFG=/some/path/database.yml
     pgre --help
 
-User in connection should be an owner of relations. And for rebuild pkey, should be superuser.
+Database.yml from rails application. User in connection settings should be an owner of relations. And for rebuild pkey, should be a superuser.
 
 Tasks:
 
@@ -21,13 +21,16 @@ Tasks:
     pgre rebuild ENV (table|index)[,(table|index)]  # rebuild tables,indexes,pkeys
     pgre tables ENV                                 # Show tables of database
 
-Examples:
+Use case:
+  
+    # Show databases
+    pgre dbs
 
     # Show tables with indexes, which full size more than 1Gb
     pgre tables production -s 1000
 
     # Show process without really rebuild
-    pgre rebuild production users,some_index1,some_index2
+    pgre rebuild production users,some_index1
   
     # Rebuild indexes 
     pgre rebuild production users --write
@@ -46,8 +49,9 @@ Rebuild index produces sqls:
     3. DROP INDEX bla;
     4. ALTER INDEX bla2 RENAME TO bla; 
     
-2 can be blocked by long running query(LRQ), or autovacuum (in this case just kill autovacuum or wait LRQ).
-By careful, if between 2 and (3,4) started LRQ or autovacuum, (3,4) can blocks all queries on this table. If this happens, and (3,4) not quit after < 30s, should stop (3,4) by cancel query in PostgreSQL. And execute (3,4) manually.
+1 can be blocked by long running query(LRQ), or autovacuum (in this case kill autovacuum or wait LRQ).
+**By careful**, if between 1 and (3,4) started LRQ or autovacuum, in this case (3,4) will block all queries on this table. 
+If it happens, and (3,4) not quit after < 30s, you should stop (3,4) by cancel query in PostgreSQL, and later execute manually.
   
   
 Rebuild pkey produces sqls:
@@ -56,7 +60,7 @@ Rebuild pkey produces sqls:
     2. ANALYZE some_table;
     3. SELECT swap_for_pkey('public', 'some_table_pkey', 'some_table_pkey2');
 
-  Same issue with 2 and 3.
+  Same issue with 1 and 3.
 
 
 MIT-LICENCE

data/bin/pgre

@@ -16,7 +16,7 @@ class PgReindexer < Thor
     render_db_list(list)
   end
 
-  desc "tables ENV", "Show tables of database"
+  desc "tables ENV", "Show tables/indexes for database"
   method_option :size, :aliases => '-s', :type => :string
   def tables(env)
     conn = get_connection(env)
@@ -46,7 +46,7 @@ class PgReindexer < Thor
     end
   end
   
-  desc "install ENV", "Install need function to database, like function: swap_for_pkey"
+  desc "install ENV", "Install function swap_for_pkey to database"
   def install(env)
     conn = get_connection(env)
     conn.install_swap_for_pkey
@@ -111,7 +111,7 @@ private
     cfg = cfg.sort_by{|a| a[0]}
     cfg.map do |env, config|
       x = [env, config]
-      x << (connection(env).database_size(config['database']) rescue '-') if show_sizes
+      x << (connection(env).database_size(config['database']) rescue 'not connected') if show_sizes
       x
     end
   end
@@ -119,7 +119,7 @@ private
   def do_rebuild(conn, row, write = true, ask = true)
     #ask = false unless write
     
-    say "=> rebuild #{row['index']} (#{row['i_size_p']}), write #{write}, ask #{ask}", :yellow
+    say "=> #{row['index']} (#{row['i_size_p']}), write #{write}, ask #{ask}", :yellow
     
     sqls = conn.index_sqls(row)
     
@@ -138,13 +138,23 @@ private
       end
     end
     
-    if row['index'].end_with?("_pkey")
+    if row['primary'] == 't'
+      unless conn.have_rebuild_for_relation?('pg_catalog.pg_class')
+        say "  ... no permission for rebuild pkey, should be superuser\n", :red
+        return
+      end
+      
       unless conn.check_swap_for_pkey
-        say "  ... You should install function swap_for_pkey for rebuild pkey, call: #{$0} install ENV\n", :red
+        say "  ... install function swap_for_pkey for rebuild pkey, call: #{$0} install ENV\n", :red
         return
       end
     end
     
+    unless conn.have_rebuild_for_relation?(row['table'])
+      say "  ... no permission for rebuild #{row['table']}, should be an owner or superuser\n", :red
+      return
+    end                               
+    
     started_at = Time.now
     
     if write
@@ -159,7 +169,7 @@ private
       end
       
       new_size = conn.get_index_size(row['index'])['i_size_p'] rescue '-'
-      say "<= rebuilded #{row['index']} (#{new_size})", :yellow
+      say "<= #{row['index']} (#{new_size})", :yellow
       say "  DONE! (#{"%.3f" % (Time.now - started_at)}s)\n", :green
     else
       say "  DRY-RUN DONE\n", :green

data/lib/pg-reindex.rb

@@ -5,10 +5,10 @@ class PgReindex
   MIN_SIZE = 50 # megabyte min, total table size
 
   def initialize(conf)
-    cfg = {:host => conf['host'] || '127.0.0.1', :dbname => conf['database'],
+    @cfg = {:host => conf['host'] || '127.0.0.1', :dbname => conf['database'],
            :user => conf['username'] || `whoami`.chop, :password => conf['password'] || 'password', :port => conf['port'].to_s}
 
-    @conn = PGconn.new cfg
+    @conn = PGconn.new @cfg
   end
   
   def get_struct_relations(min_size = nil)
@@ -51,7 +51,8 @@ class PgReindex
         pg_size_pretty(pg_total_relation_size(C.oid)) AS "total_size_p",
         pg_size_pretty(pg_total_relation_size(C.oid) - pg_relation_size(C.oid)) AS "total_i_size_p",
         pg_relation_size(i.oid) as "i_size",
-        pg_size_pretty(pg_relation_size(i.oid)) as "i_size_p"
+        pg_size_pretty(pg_relation_size(i.oid)) as "i_size_p",
+        ix.indisprimary as "primary"
       FROM pg_class C, pg_class i, pg_index ix, pg_namespace N
       WHERE nspname IN ('public') AND
               C.oid = ix.indrelid and i.oid = ix.indexrelid
@@ -129,17 +130,17 @@ $$language plpgsql;
   end
 
   def index_sqls(index_row)
-    index_sql_array(index_row['table'], index_row['index_oid'], index_row['index'])
+    index_sql_array(index_row['table'], index_row['index_oid'], index_row['index'], index_row['primary'] == 't')
   end
     
-  def index_sql_array(table, oid, name)
+  def index_sql_array(table, oid, name, primary = false)
     new_name = if name.size < 61  
       name + "_2"
     else
       name[0..-3] + "_2"
     end
     
-    if name.end_with?('_pkey')
+    if primary
       [
         index_sql(oid, name, new_name),
         "ANALYZE #{table}",
@@ -187,7 +188,14 @@ $$language plpgsql;
   end
   
   def cancel(procpid)
-    @conn.exec "select pg_cancel_backend(#{procpid.to_i})"
+    @conn.exec("select pg_cancel_backend(#{procpid.to_i})")
   end
-
+  
+  def have_rebuild_for_relation?(relation)
+    res = @conn.exec "select has_table_privilege(E'#{@cfg[:user]}', E'#{relation}', 'update,references')"
+    res[0]['has_table_privilege'] == 't' ? true : false
+  rescue
+    false
+  end
+  
 end

data/pg_reindex.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pg_reindex}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.authors = ["Makarchev Konstantin"]
  

data/spec/reindex_spec.rb

@@ -122,20 +122,28 @@ describe PgReindex do
     def1 = @pgre.index_def(r['index_oid'])
         
     sqls = @pgre.index_sqls(r)
-    sqls.each do |sql|
-      @pgre.exec sql
-    end
+    if @pgre.have_rebuild_for_relation?('pg_catalog.pg_class')
+      sqls.each do |sql|
+        @pgre.exec sql
+      end      
                           
-    r2 = row('tests_pkey')
-    r2['index_oid'].to_i.should > 0
+      r2 = row('tests_pkey')
+      r2['index_oid'].to_i.should > 0
 
-    r2['index_oid'].should == r['index_oid']
-    def1.should == @pgre.index_def(r2['index_oid'])
+      r2['index_oid'].should == r['index_oid']
+      def1.should == @pgre.index_def(r2['index_oid'])
                                       
-    # index should be
-    res = @pgre.filter_relations('tests')
-    res.size.should == 4
-    res.map{|el| el['index']}.sort.should == ["a_b_c", "index_tests_on_a", "index_tests_on_b_and_c", "tests_pkey"]
+      # index should be
+      res = @pgre.filter_relations('tests')
+      res.size.should == 4
+      res.map{|el| el['index']}.sort.should == ["a_b_c", "index_tests_on_a", "index_tests_on_b_and_c", "tests_pkey"]
+    else
+      puts "you havn't permission to rebuild pkey, test impossible!"
+    end
+  end
+  
+  it "have_rebuild_for_relation? should be true for created table" do
+    @pgre.have_rebuild_for_relation?('tests').should == true
   end
 
 end

data/spec/spec_support.rb

@@ -1,4 +1,4 @@
-$cfg = {'adapter' => 'postgresql', 'database' => 'pgre_test', 'encoding' => 'utf8', 'username' => 'kostya', 'password' => 'password'}
+$cfg = {'adapter' => 'postgresql', 'database' => 'pgre_test'}
 ActiveRecord::Base.establish_connection $cfg
 
 class Test < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_reindex
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -137,3 +137,4 @@ specification_version: 3
 summary: Console utility for gracefully rebuild indexes/pkeys for PostgreSQL, with
   minimal locking in semi-auto mode.
 test_files: []
+has_rdoc: