bricolage 5.15.1 → 5.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26898f98eb266df22a4940e128b1ae4cf44afd83
-  data.tar.gz: fd57e7f63e899b6f9f560a2694a4e1466efcb655
+  metadata.gz: 5acaeef75f7cfc4d74814c7f036d7e7a187f728f
+  data.tar.gz: 4ef05fb1c2b2e292a51f2c6331ceaa9a12d445e9
 SHA512:
-  metadata.gz: 46996f94e09c5e9c2efd6814492ebaff39fbdfc1b765a906dbd71dc387b6fecc6bd446a6cd9d916be2479bc0f83588380c3f91afb985ee9ad29f0275c63ed779
-  data.tar.gz: fad034727fa9b0781eeb642bda3da779ff8183ea94e7f7eef9d5d5e049a41075c309c8585fcdc37784730fed6713eac26e7979b74f0a2532ce01da83fc96b989
+  metadata.gz: 4569b393900821b004f84b341e9e5ce87298c6e83d8fb49719960448bac8ad6d8d59cb29ce49acc7e5e5047a0a05324170e76957928ed7ea102944835a733c09
+  data.tar.gz: c17dddd3e8a46e246250e746a02e9f8eaa8f335a3cbfe245ab709aa35c8e59caf1629f0636b0928bfc285f60a84968456ae7556132386a71854634e546b09054

data/lib/bricolage/postgresconnection.rb

@@ -43,9 +43,9 @@ module Bricolage
         @logger.info "[#{@ds.name}] #{declare_cursor}"
         @connection.exec(declare_cursor)
       elsif !@cursor.nil? && cursor.nil?
-        raise "Cursor in use"
+        raise "Cannot declare new cursor. Cursor in use: #{@cursor}"
       elsif @cursor != cursor
-        raise "Invalid cursor"
+        raise "Specified cursor not exists. Specified: #{cursor}, Current: #{@cursor}"
       end
       fetch = "fetch #{fetch_size} in #{@cursor}"
       @logger.info "[#{@ds.name}] #{fetch}" if cursor.nil?

data/lib/bricolage/redisdatasource.rb

@@ -8,15 +8,15 @@ module Bricolage
   class RedisDataSource < DataSource
     declare_type 'redis'
 
-    def initialize(host: 'localhost', port: 6380, **opts)
+    def initialize(host: 'localhost', port: 6380, **options)
       @host = host
       @port = port
-      @options = opts
+      @options = options
     end
 
     attr_reader :host
     attr_reader :port
-    attr_reader :opts
+    attr_reader :options
 
     def new_task
       RedisTask.new(self)
@@ -58,22 +58,18 @@ module Bricolage
       end
 
       def import
-        results = []
         @src.cursor_transaction {
           read_count = 0
           loop do
-            futures = []
             ds.client.pipelined do 
               read_count = read_row do |row|
-                futures.push write_row row
+                write_row row
               end
             end
-            results.push futures.flatten.map {|f| f.value}.all?
             break if read_count == 0
           end
         }
         @cursor = nil
-        results.all?
       end
 
       def read_row
@@ -127,7 +123,7 @@ module Bricolage
           ds.logger.info "Key Pattern: #{prefix}<#{@key_columns.join('_')}>"
           ds.logger.info "Encode: #{@encode}"
           ds.logger.info "Expire: #{@expire}"
-          raise "Unexpected error. Please check data." unless import
+          import
         rescue => ex
           ds.logger.error ex.backtrace.join("\n")
           raise JobFailure, ex.message

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.15.1'
+  VERSION = '5.15.2'
 end

data/test/home/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    bricolage (5.15.1)
+    bricolage (5.15.2)
       aws-sdk (~> 2)
       mysql2
       pg

data/test/home/subsys/redis_export2.job

@@ -0,0 +1,8 @@
+class: redis-export
+src-ds: sql
+src-tables:
+    user_cook_recipes: $test_schema.user_cook_recipes
+dest-ds: redis
+key-column: user_id
+encode: json
+expire: 60

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.15.1
+  version: 5.15.2
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -209,6 +209,7 @@ files:
 - test/home/subsys/raw-vacuum.sql.job
 - test/home/subsys/rebuild.sql.job
 - test/home/subsys/redis_export.job
+- test/home/subsys/redis_export2.job
 - test/home/subsys/search_backends.ct
 - test/home/subsys/separated.job
 - test/home/subsys/separated.sql