zuora_connect 1.5.03 → 1.5.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166cb6acb2386c330f4bd0606bc49954a1f74ba2
-  data.tar.gz: 46d7c7d0fffaeca07947b0c445cc50615723e397
+  metadata.gz: 824aaae9f843edae29e1d76e21fa69a575ff2e47
+  data.tar.gz: 7b387043e25d6227a60f640ec988e73ee724e46a
 SHA512:
-  metadata.gz: e249d7640c336e2367baaaa6f7f8b7d5aa8ce6fd8bedd9740e46deb9ccc13ec2f639c8f0b317e8c25be725800ce47c4e8ee389d19a6c0c8bd31ce4e218934d11
-  data.tar.gz: 92bb490c7ba14f08364274407639a16de90875894b59f2f3a4af43ed4015ccb5ee77969713eca708dc9ed5a0d93a2ab77081cf7377aefb68945c821c5fbb7c1a
+  metadata.gz: e234f53cec985f83a88d22bf4aad67a6b269cc4987edca3e30aa91fbed1bf51540d8735c9f6c338cd05520895879ef718912a53efce85e18901f0cd2c249d174
+  data.tar.gz: e3a8601d48936dfd55c2bec6fda15343d6bb520b649d0a92dcf7841dbc967773688b0d335a21fa5fab5be80d1aab0929e9d05260ecfbeba57ec42ce57e2bd13b

data/app/models/zuora_connect/app_instance_base.rb

@@ -581,5 +581,17 @@ module ZuoraConnect
       end
       super
     end
+
+    def self.update_functions
+      ActiveRecord::Base.connection.execute(File.read("#{Gem.loaded_specs["zuora_connect"].gem_dir}/app/views/sql/refresh_aggregate_table.txt"))
+    end
+
+    def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true) 
+      self.update_functions
+      #Broke function into two parts to ensure transaction size was small enough
+      ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Table\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
+      ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Index\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)]) if index_table
+    end
+
   end
 end

data/app/views/sql/refresh_aggregate_table.txt

@@ -0,0 +1,84 @@
+CREATE OR REPLACE FUNCTION "shared_extensions".refresh_aggregate_table(aggregate_table_name text, table_name text, filter text, mode text) RETURNS void AS $$
+DECLARE
+  schema RECORD;
+  result RECORD;
+  sql TEXT := '';
+  i INTEGER;
+  created boolean := false;
+  fields_order character varying;
+  index_name varchar;
+  index_string varchar;
+  index_id varchar;
+BEGIN
+  IF mode = 'Table' THEN
+    raise notice 'Starting aggregate of % to %', table_name, aggregate_table_name;
+
+
+    EXECUTE format('DROP TABLE IF EXISTS "public".%I', aggregate_table_name);
+    raise notice 'Filter %', filter;
+
+    FOR schema IN EXECUTE
+      format(
+        'SELECT schema_name FROM information_schema.schemata WHERE schema_name ~ ''^[0-9]+$'''
+      )
+    LOOP
+      IF NOT created THEN
+        -- Create the aggregate table if we haven't already
+        EXECUTE format(
+          'CREATE TABLE "public".%I (LIKE %I.%I)',
+          aggregate_table_name,
+          schema.schema_name, table_name
+        );
+        -- Add a special `schema_name` column, which we'll populate with the name of the schema
+        -- each row originated from
+        EXECUTE format(
+          'ALTER TABLE "public".%I ADD COLUMN schema_name text', aggregate_table_name
+        );
+        created := true;
+      END IF;
+
+      -- Finally, we'll select everything from this schema's target table, plus the schema's name,
+      -- and insert them into our new aggregate table
+      EXECUTE format(
+        'SELECT string_agg(column_name, '','') from information_schema.columns where table_name = ''%s'' AND table_schema = ''%s''',  
+        table_name, schema.schema_name
+      ) into fields_order;
+      
+      raise notice 'Importing Schema %', schema.schema_name;
+
+      EXECUTE format(        
+        'INSERT INTO "public".%I (schema_name, %s) (SELECT ''%s'' AS schema_name, * FROM %I.%I  %s )',
+        aggregate_table_name,
+        fields_order,
+        schema.schema_name,
+        schema.schema_name, table_name, 
+        filter
+      );
+    END LOOP;
+
+    EXECUTE
+      format('CREATE INDEX ON "public".%I (schema_name)', aggregate_table_name);
+    EXECUTE
+      format('CREATE INDEX ON "public".%I (id)', aggregate_table_name);
+  END IF;
+  IF mode = 'Index' THEN
+    FOR index_string, index_name, index_id IN
+       SELECT pg_get_indexdef(idx.oid)||';', idx.relname, idx.oid
+       from pg_index ind
+       join pg_class idx on idx.oid = ind.indexrelid
+       join pg_class tbl on tbl.oid = ind.indrelid
+       left join pg_namespace ns on ns.oid = tbl.relnamespace where idx.relname != concat(table_name, '_pkey') and tbl.relname = table_name and ns.nspname = 'public'
+    LOOP
+      BEGIN
+        EXECUTE
+          format('DROP INDEX IF EXISTS "public"."%s"', concat(aggregate_table_name, '_', index_id));
+
+        EXECUTE
+          format(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')));
+
+        RAISE NOTICE 'Creating Indexes %', replace(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')), concat('public.', table_name), concat( 'public.', aggregate_table_name)) ;
+      END;
+    END LOOP;
+  END IF;
+END
+$$ LANGUAGE plpgsql;

data/config/initializers/redis.rb

@@ -1,6 +1,6 @@
 redis_url = ENV["REDIS_URL"].present? ?  ENV["REDIS_URL"] : 'redis://localhost:6379/1'
 if defined?(Redis.current)
-  Redis.current = Redis.new(:url => redis_url, :timeout => 1)
+  Redis.current = Redis.new(:url => redis_url, :timeout => 10)
   if defined?(Resque.redis)
     Resque.redis = Redis.current
   end

data/config/initializers/resque.rb

@@ -1,5 +1,5 @@
 if defined?(Resque::Worker)
   Resque.send(:extend, Resque::Additions)
-  Resque::Worker.send(:include, Resque::DynamicQueues)
+  #Resque::Worker.send(:include, Resque::DynamicQueues)
   Resque::Job.send(:include, Resque::SelfLookup)
 end

data/lib/resque/dynamic_queues.rb

@@ -22,11 +22,11 @@ module Resque
       matched_queues = []
 
       #Remove Queues under Api Limits
-      api_limit_instances = Redis.current.keys("APILimits:*").map {|key| key.split('APILimits:').last.to_i}
+      api_limit_instances = Redis.current.keys('APILimits:*').map {|key| key.split('APILimits:').last.to_i}
       real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
       
       #Queue Pausing 
-      paused_instances = Redis.current.keys("resque:PauseQueue:*").map {|key| key.split('resque:PauseQueue:').last.to_i}
+      paused_instances = Redis.current.keys('resque:PauseQueue:*').map {|key| key.split('resque:PauseQueue:').last.to_i}
       real_queues = real_queues.select {|key| key if !paused_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
 
       while q = queue_names.shift
@@ -48,7 +48,7 @@ module Resque
           q = q[1..-1]
         end
 
-        patstr = q.gsub(/\*/, ".*")
+        patstr = q.gsub(/\*/, '.*')
         pattern = /^#{patstr}$/
         if negated
           matched_queues -= matched_queues.grep(pattern)

data/lib/resque/self_lookup.rb

@@ -9,7 +9,6 @@ module Resque
       return @payload_class
     end
 
-
     def self.included(receiver)
       receiver.class_eval do
         alias payload_class_old payload_class

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.5.03"
+  VERSION = "1.5.04"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.03
+  version: 1.5.04
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -207,6 +207,7 @@ files:
 - app/models/zuora_connect/app_instance_base.rb
 - app/models/zuora_connect/login.rb
 - app/views/layouts/zuora_connect/application.html.erb
+- app/views/sql/refresh_aggregate_table.txt
 - app/views/zuora_connect/static/invalid_app_instance_error.html.erb
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb