pgslice 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a7f188ff426286b8fd13dbc359d7bbdf514de64
-  data.tar.gz: bf65c37948a1cbd88e072f7c88b20e0cf4b75b1c
+  metadata.gz: 595fd1ef4439e8f5180ee6f84596c088124cf900
+  data.tar.gz: 6a7144e70f93c4edeb7b48be0efe28e6ccfd87f9
 SHA512:
-  metadata.gz: 6cece21cd4d7bb10fcf510fa6ba6a1590ba24faaaf553315c1a0c2f2d734a39b77ac9fa419168eb75a09f6f7851bf1b62ab0f1cb59774daa6832b4a7e6ed3559
-  data.tar.gz: 1a820b128546c65a697c32d928955734bac43123af7bc714839530e1bfcb3ce06c61ac7d454caf1e92a2d8a188267dc94910e5ceb25ce0db2b23eb0a0c130cc5
+  metadata.gz: ffb023c7ceacab8f0362808131a6a8d680455d756ab636f558257390c68b20214edf2ad4eefb3dd6f5fb46b9a9b7a8eb264fa070ffc4fca34e051c9b069ca66f
+  data.tar.gz: 44869b8f950334d8db95a9a081937966367e1cac30caa5ce03254b694f54f893f04a429f935e2f6a80487465c5283005f280512ac3b600f027a2f9fd87d4ec16

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+## 0.1.2
+
+- Added `--dry-run` option
+- Print sql to stdout instead of stderr
+
 ## 0.1.1
 
-- Add sql commands to output
+- Added sql commands to output
 
 ## 0.1.0
 

data/README.md

@@ -84,6 +84,66 @@ To undo swap, use:
 pgslice unswap <table>
 ```
 
+## Sample Output
+
+`pgslice` prints the SQL commands that were executed on the server. To print without executing, use the `--dry-run` option.
+
+```console
+$ pgslice prep locations created_at day
+BEGIN;
+
+CREATE TABLE locations_intermediate (
+  LIKE locations INCLUDING INDEXES INCLUDING DEFAULTS
+);
+
+CREATE FUNCTION locations_insert_trigger()
+RETURNS trigger AS $$
+BEGIN
+  EXECUTE 'INSERT INTO public.locations_' || to_char(NEW.created_at, 'YYYYMMDD') || ' VALUES ($1.*)' USING NEW;
+  RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER locations_insert_trigger
+BEFORE INSERT ON locations_intermediate
+FOR EACH ROW EXECUTE PROCEDURE locations_insert_trigger();
+
+COMMIT;
+```
+
+```console
+$ pgslice add_partitions locations --intermediate --past 1 --future 1
+BEGIN;
+
+CREATE TABLE locations_20160423 (
+  LIKE locations_intermediate INCLUDING INDEXES INCLUDING DEFAULTS,
+  CHECK (created_at >= '2016-04-23'::date AND created_at < '2016-04-24'::date)
+) INHERITS (locations_intermediate);
+
+CREATE TABLE locations_20160424 (
+  LIKE locations_intermediate INCLUDING INDEXES INCLUDING DEFAULTS,
+  CHECK (created_at >= '2016-04-24'::date AND created_at < '2016-04-25'::date)
+) INHERITS (locations_intermediate);
+
+CREATE TABLE locations_20160425 (
+  LIKE locations_intermediate INCLUDING INDEXES INCLUDING DEFAULTS,
+  CHECK (created_at >= '2016-04-25'::date AND created_at < '2016-04-26'::date)
+) INHERITS (locations_intermediate);
+
+COMMIT;
+```
+
+```console
+$ pgslice swap locations
+BEGIN;
+
+ALTER TABLE locations RENAME TO locations_retired;
+
+ALTER TABLE locations_intermediate RENAME TO locations;
+
+COMMIT;
+```
+
 ## Upgrading
 
 Run:

data/lib/pgslice.rb

@@ -59,8 +59,6 @@ module PgSlice
       abort "Column not found: #{column}" unless columns(table).include?(column)
       abort "Invalid period: #{period}" unless SQL_FORMAT[period.to_sym]
 
-      log "Creating #{intermediate_table} from #{table}"
-
       queries = []
 
       queries << <<-SQL
@@ -97,8 +95,6 @@ FOR EACH ROW EXECUTE PROCEDURE #{trigger_name}();
       abort "Usage: pgslice unprep <table>" if arguments.length != 1
       abort "Table not found: #{intermediate_table}" unless table_exists?(intermediate_table)
 
-      log "Dropping #{intermediate_table}"
-
       queries = [
         "DROP TABLE #{intermediate_table} CASCADE;",
         "DROP FUNCTION #{trigger_name}();"
@@ -130,7 +126,6 @@ FOR EACH ROW EXECUTE PROCEDURE #{trigger_name}();
         partition_name = "#{original_table}_#{day.strftime(name_format)}"
         next if table_exists?(partition_name)
 
-        log "Creating #{partition_name} from #{table}"
         date_format = "%Y-%m-%d"
 
         queries << <<-SQL
@@ -175,22 +170,24 @@ CREATE TABLE #{partition_name} (
       fields = columns(source_table).join(", ")
       batch_size = options[:batch_size]
 
-      if starting_id < max_source_id
-        log "#{primary_key}: #{starting_id} -> #{max_source_id}"
-        log "time: #{starting_time.to_date} -> #{ending_time.to_date}"
+      log "Overview"
+      log "#{source_table} max #{primary_key}: #{max_source_id}"
+      log "#{dest_table} max #{primary_key}: #{max_dest_id}"
+      log "time period: #{starting_time.to_date} -> #{ending_time.to_date}"
+      log
 
-        while starting_id < max_source_id
-          log "#{starting_id}..#{[starting_id + batch_size - 1, max_source_id].min}"
+      log "Batches"
+      while starting_id <= max_source_id
+        log "#{starting_id}..#{[starting_id + batch_size - 1, max_source_id].min}"
 
-          query = "INSERT INTO #{dest_table} (#{fields}) SELECT #{fields} FROM #{source_table} WHERE #{primary_key} >= #{starting_id} AND #{primary_key} < #{starting_id + batch_size} AND #{field} >= '#{starting_time.strftime(date_format)}'::date AND #{field} < '#{ending_time.strftime(date_format)}'::date"
-          log query if options[:debug]
-          execute(query)
+        query = "INSERT INTO #{dest_table} (#{fields}) SELECT #{fields} FROM #{source_table} WHERE #{primary_key} >= #{starting_id} AND #{primary_key} < #{starting_id + batch_size} AND #{field} >= '#{starting_time.strftime(date_format)}'::date AND #{field} < '#{ending_time.strftime(date_format)}'::date"
+        log query if options[:debug]
+        execute(query)
 
-          starting_id += batch_size
+        starting_id += batch_size
 
-          if options[:sleep] && starting_id < max_source_id
-            sleep(options[:sleep])
-          end
+        if options[:sleep] && starting_id <= max_source_id
+          sleep(options[:sleep])
         end
       end
     end
@@ -205,9 +202,6 @@ CREATE TABLE #{partition_name} (
       abort "Table not found: #{intermediate_table}" unless table_exists?(intermediate_table)
       abort "Table already exists: #{retired_table}" if table_exists?(retired_table)
 
-      log "Renaming #{table} to #{retired_table}"
-      log "Renaming #{intermediate_table} to #{table}"
-
       queries = [
         "ALTER TABLE #{table} RENAME TO #{retired_table};",
         "ALTER TABLE #{intermediate_table} RENAME TO #{table};"
@@ -225,9 +219,6 @@ CREATE TABLE #{partition_name} (
       abort "Table not found: #{retired_table}" unless table_exists?(retired_table)
       abort "Table already exists: #{intermediate_table}" if table_exists?(intermediate_table)
 
-      log "Renaming #{table} to #{intermediate_table}"
-      log "Renaming #{retired_table} to #{table}"
-
       queries = [
         "ALTER TABLE #{table} RENAME TO #{intermediate_table};",
         "ALTER TABLE #{retired_table} RENAME TO #{table};"
@@ -246,6 +237,7 @@ CREATE TABLE #{partition_name} (
         o.integer "--future", default: 3
         o.integer "--past", default: 3
         o.integer "--batch-size", default: 10000
+        o.boolean "--dry-run", default: false
         o.on "-v", "--version", "print the version" do
           log PgSlice::VERSION
           @exit = true
@@ -263,6 +255,10 @@ CREATE TABLE #{partition_name} (
       $stderr.puts message
     end
 
+    def log_sql(message = nil)
+      $stdout.puts message
+    end
+
     def abort(message)
       raise PgSlice::Error, message
     end
@@ -294,13 +290,14 @@ CREATE TABLE #{partition_name} (
     def run_queries(queries)
       connection.transaction do
         execute("SET client_min_messages TO warning")
-        log
-        log "============================== SQL =============================="
+        log_sql "BEGIN;"
+        log_sql
         queries.each do |query|
-          log
-          log query
-          execute(query)
+          log_sql query
+          log_sql
+          execute(query) unless options[:dry_run]
         end
+        log_sql "COMMIT;"
       end
     end
 

data/lib/pgslice/version.rb

@@ -1,3 +1,3 @@
 module PgSlice
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgslice
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane