pgslice 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca58e320a519d76827d4e80a0ac06f6de27c6a4
-  data.tar.gz: 42c56e058c53df60248f805215cae4b42ce71246
+  metadata.gz: 24b5596e6ea1c788ff5b367fb6ca05b0c76e626f
+  data.tar.gz: a6776fcdf658bd08f4a6adbeee3239b602eba91d
 SHA512:
-  metadata.gz: f25931d431807f8e8a6155042f4a87a2bd76812d4d28b09b6f283e9445996e9a2a86f3991eff1c2f274b9b8afddd1e1ea9c31e6794a8c623f5aebee3fa20c1a6
-  data.tar.gz: fc9fe5a59c005c348ff19ec3e1ecf7ff946a9af2fca577ca6566360367b0b1ae3b810fce17375c69973d6720db54eebd2f2737de4c6c414f91ce6e6aec66abac
+  metadata.gz: 5bb36f0e164418e57d54ebf9bb0192d75bf20977261fc6e83ff613d15afe3199aace4a0af343f8784518e6b4e460b245ba6029e61e427c5abd0405fff8a70acf
+  data.tar.gz: da11ed42838cd526441469108892379aadbee43bfcbaa657568b8d7c0721b19e5bc275af330bfd1e924c1bb54ae2109751ab62b207dc440332231b2277b7fa32

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.4
+
+- Added `analyze` method
+- Fixed `fill` with `--dry-run` option
+- Better error message for tables without primary key
+
 ## 0.3.3
 
 - Fixed error when creating partitions

data/README.md

@@ -54,7 +54,13 @@ This will give you the `pgslice` command.
 
   To sync data across different databases, check out [pgsync](https://github.com/ankane/pgsync).
 
-6. Swap the intermediate table with the original table
+6. Analyze tables
+
+  ```sh
+  pgslice analyze <table>
+  ```
+
+7. Swap the intermediate table with the original table
 
   ```sh
   pgslice swap <table>
@@ -62,13 +68,13 @@ This will give you the `pgslice` command.
 
   The original table is renamed `<table>_retired` and the intermediate table is renamed `<table>`.
 
-7. Fill the rest (rows inserted between the first fill and the swap)
+8. Fill the rest (rows inserted between the first fill and the swap)
 
   ```sh
   pgslice fill <table> --swapped
   ```
 
-8. Back up the retired table with a tool like [pg_dump](https://www.postgresql.org/docs/current/static/app-pgdump.html) and drop it
+9. Back up the retired table with a tool like [pg_dump](https://www.postgresql.org/docs/current/static/app-pgdump.html) and drop it
 
   ```sql
   pg_dump -c -Fc -t <table>_retired $PGSLICE_URL > <table>_retired.dump

data/Rakefile

@@ -5,6 +5,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"]
+  t.warning = false
 end
 
-task default: :spec
+task default: :test

data/lib/pgslice.rb

@@ -37,8 +37,10 @@ module PgSlice
         unswap
       when "unprep"
         unprep
+      when "analyze"
+        analyze
       when nil
-        log "Commands: add_partitions, fill, prep, swap, unprep, unswap"
+        log "Commands: add_partitions, analyze, fill, prep, swap, unprep, unswap"
       else
         abort "Unknown command: #{@command}"
       end
@@ -242,6 +244,7 @@ CREATE OR REPLACE FUNCTION #{trigger_name}()
       end
 
       primary_key = self.primary_key(table)
+      abort "No primary key" unless primary_key
       max_source_id = max_id(source_table, primary_key)
 
       max_dest_id =
@@ -264,6 +267,11 @@ CREATE OR REPLACE FUNCTION #{trigger_name}()
 
       i = 1
       batch_count = ((max_source_id - starting_id) / batch_size.to_f).ceil
+
+      if batch_count == 0
+        log_sql "/* nothing to fill */"
+      end
+
       while starting_id < max_source_id
         where = "#{primary_key} > #{starting_id} AND #{primary_key} <= #{starting_id + batch_size}"
         if starting_time
@@ -280,9 +288,7 @@ INSERT INTO #{dest_table} (#{fields})
     WHERE #{where}
         SQL
 
-        log_sql(query)
-        log_sql
-        execute(query)
+        run_query(query)
 
         starting_id += batch_size
         i += 1
@@ -339,6 +345,17 @@ INSERT INTO #{dest_table} (#{fields})
       run_queries(queries)
     end
 
+    def analyze
+      table = arguments.first
+      parent_table = options[:swapped] ? table : intermediate_name(table)
+
+      abort "Usage: pgslice analyze <table>" if arguments.length != 1
+
+      existing_tables = self.existing_tables(like: "#{table}_%").select { |t| /\A#{Regexp.escape("#{table}_")}\d{6,8}\z/.match(t) }
+      analyze_list = existing_tables + [parent_table]
+      run_queries_without_transaction analyze_list.map { |t| "ANALYZE VERBOSE #{t};" }
+    end
+
     # arguments
 
     def parse_args(args)
@@ -420,21 +437,29 @@ INSERT INTO #{dest_table} (#{fields})
         execute("SET LOCAL client_min_messages TO warning") unless options[:dry_run]
         log_sql "BEGIN;"
         log_sql
-        queries.each do |query|
-          log_sql query
-          log_sql
-          unless options[:dry_run]
-            begin
-              execute(query)
-            rescue PG::ServerError => e
-              abort("#{e.class.name}: #{e.message}")
-            end
-          end
-        end
+        run_queries_without_transaction(queries)
         log_sql "COMMIT;"
       end
     end
 
+    def run_query(query)
+      log_sql query
+      unless options[:dry_run]
+        begin
+          execute(query)
+        rescue PG::ServerError => e
+          abort("#{e.class.name}: #{e.message}")
+        end
+      end
+      log_sql
+    end
+
+    def run_queries_without_transaction(queries)
+      queries.each do |query|
+        run_query(query)
+      end
+    end
+
     def server_version_num
       execute("SHOW server_version_num")[0]["server_version_num"].to_i
     end

data/lib/pgslice/version.rb

@@ -1,3 +1,3 @@
 module PgSlice
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/pgslice.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgslice
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - andrew@chartkick.com
@@ -103,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Postgres partitioning as easy as pie