embulk-input-zendesk 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bbd52d83f9670fdf5c7bad8bb916bbce2d2539c
-  data.tar.gz: 3ede177aa9ffe5d102a6bb68e62a256a209c68d6
+  metadata.gz: 873a74eb71d079359c4e2134e08bd0b9972477a6
+  data.tar.gz: 6a8c70921ab79299a8e10d77dd9bcb034033384c
 SHA512:
-  metadata.gz: 8fe16f902ee028b8f13237f4bd8784ded62e96df33527da4459cd59044212193d1994b8d8129b8a008e7bb76ec099e04a69e8fc8fd7e4134889c65593f53fb13
-  data.tar.gz: 08d9ada788c89cb5eb1beabd3462b7a1731965e2ecd4171b4bc781de3621a1ac95ab7d4fa1b5b935a5d678b63346f37be46b83950a555f14fc885044cff45a44
+  metadata.gz: baa602ab6ed0a7c33ee34fe7d200f9ea2680c1a41f5c2503ea94fc0e32f69b14571f2e45e7e85a548c06741daa63ccffa227953502add3e2503d76cbb9813f4d
+  data.tar.gz: 6aae5b2d71285613c3e89bba77244385b2854afe60c4e12104f098954f7ad82ba30cd2604fa77f0e8483391fd996cc3094ccaaf89627495b00cf459a49b57a09

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.12 - 2019-01-04
+* [enhancement] Fix performance issue [#47](https://github.com/treasure-data/embulk-input-zendesk/pull/47)
+
 ## 0.2.11 - 2018-15-26
 * [enhancement] Rate limit is fail fast instead of retry for guess/preview mode
 

data/embulk-input-zendesk.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-zendesk"
-  spec.version       = "0.2.11"
+  spec.version       = "0.2.12"
   spec.authors       = ["uu59", "muga", "sakama"]
   spec.summary       = "Zendesk input plugin for Embulk"
   spec.description   = "Loads records from Zendesk."
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'httpclient'
   spec.add_dependency 'concurrent-ruby'
   spec.add_development_dependency 'embulk', ['~> 0.8.1']
-  spec.add_development_dependency 'bundler', ['~> 1.0']
+  spec.add_development_dependency 'bundler', ['~> 1.0', '< 2.0']
   spec.add_development_dependency 'rake', ['>= 10.0']
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'test-unit', '~> 3.1.5'

data/lib/embulk/input/zendesk/client.rb

@@ -1,6 +1,7 @@
 require "strscan"
 require "httpclient"
 require 'concurrent'
+require 'set'
 
 module Embulk
   module Input
@@ -83,7 +84,7 @@ module Embulk
         %w(tickets ticket_events users organizations).each do |target|
           define_method(target) do |partial = true, start_time = 0, &block|
             # Always use incremental_export. There is some difference between incremental_export and export.
-            incremental_export("/api/v2/incremental/#{target}.json", target, start_time, [], partial, &block)
+            incremental_export("/api/v2/incremental/#{target}.json", target, start_time, Set.new, partial, &block)
           end
         end
 
@@ -97,7 +98,7 @@ module Embulk
             # Since partial is only use for preview and guess so this should be fine
             export('/api/v2/ticket_metrics.json', 'ticket_metrics', &block)
           else
-            incremental_export('/api/v2/incremental/tickets.json', 'metric_sets', start_time, [], partial, { include: 'metric_sets' }, &block)
+            incremental_export('/api/v2/incremental/tickets.json', 'metric_sets', start_time, Set.new, partial, { include: 'metric_sets' }, &block)
           end
         end
 
@@ -174,7 +175,7 @@ module Embulk
           end
         end
 
-        def incremental_export(path, key, start_time = 0, known_ids = [], partial = true, query = {}, &block)
+        def incremental_export(path, key, start_time = 0, known_ids = Set.new, partial = true, query = {}, &block)
           if partial
             records = request_partial(path, query.merge(start_time: start_time)).first(5)
             records.uniq{|r| r["id"]}.each do |record|

data/test/embulk/input/zendesk/test_client.rb

@@ -1,6 +1,7 @@
 require "embulk"
 Embulk.setup
 
+require "set"
 require "yaml"
 require "embulk/input/zendesk"
 require "override_assert_raise"
@@ -258,12 +259,12 @@ module Embulk
 
           sub_test_case "ticket_events" do
             test "invoke incremental_export when partial=true" do
-              mock(client).incremental_export(anything, "ticket_events", anything, [], true)
+              mock(client).incremental_export(anything, "ticket_events", anything, Set.new, true)
               client.ticket_events(true)
             end
 
             test "invoke incremental_export when partial=false" do
-              mock(client).incremental_export(anything, "ticket_events", anything, [], false)
+              mock(client).incremental_export(anything, "ticket_events", anything, Set.new, false)
               client.ticket_events(false)
             end
           end

data/test/embulk/input/zendesk/test_plugin.rb

@@ -379,7 +379,7 @@ module Embulk
 
             test "call ticket_all method instead of tickets" do
               mock(@client).export.never
-              mock(@client).incremental_export(anything, "tickets", 0, [], false) { [] }
+              mock(@client).incremental_export(anything, "tickets", 0, Set.new, false) { [] }
               mock(page_builder).finish
 
               @plugin.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-zendesk
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - uu59
@@ -74,6 +74,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   name: bundler
   prerelease: false
   type: :development
@@ -82,6 +85,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: