embulk-input-marketo 0.5.7.alpha.3 → 0.5.7.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d74b33cde7c0649fe4f4cac9de7180e1ae1facce
-  data.tar.gz: 9c55a46eb01f9ff2c7d304529d90a21528ae7a6f
+  metadata.gz: c42c9fcf28e826912b2e3c1f0952ba1d25b4652e
+  data.tar.gz: 87eb0b019feda052f4dd4c87cc8df852ffc2e33b
 SHA512:
-  metadata.gz: e3625b3fe800f9d005811df70a7f881f2183ad0a82dff1d5a5917955119c0594cc0848d73a5ef913175de6fb9f4449fc96fabed9f03ba5fd08ec0e45ad0ead85
-  data.tar.gz: db721e1064761acaf2d95f0bccc877985a2279b9ef5bf8b0a88ff1985dabe35d6cf8fbf146b7b050c9bfcf3421675fff5c937c9b547df9a1a885fc72a33d7f63
+  metadata.gz: a305f0e763086fb4cb6763840b3b7bffde0c475e9a0acf2e42a404341dc7dbe7a6bfdcce66727a9bd6febd48f55dd560b23cab9063c90a65dcdb8dd1887523e9
+  data.tar.gz: 250082fb8a23b96b9860fe7224b0b72ce49def3c791225acdb2a5262292b8d23a5c1958c712c2fe460168b498e34d383505b053a480b4c7b257e78440f7c9e64

data/build.gradle

@@ -16,7 +16,7 @@ repositories {
 configurations {
     provided
 }
-version = "0.5.7.alpha.3"
+version = "0.5.7.alpha.4"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 

data/src/main/java/org/embulk/input/marketo/delegate/MarketoBaseBulkExtractInputPlugin.java

@@ -110,22 +110,24 @@ public abstract class MarketoBaseBulkExtractInputPlugin<T extends MarketoBaseBul
         ConfigDiff configDiff = super.buildConfigDiff(task, schema, taskCount, taskReports);
         Long currentLatestFetchTime = 0L;
         Set<String> latestUIds = null;
-        for (TaskReport taskReport : taskReports) {
-            Long latestFetchTime = taskReport.get(Long.class, LATEST_FETCH_TIME);
-            if (latestFetchTime == null) {
-                continue;
+        if (incrementalColumn != null) {
+            for (TaskReport taskReport : taskReports) {
+                Long latestFetchTime = taskReport.get(Long.class, LATEST_FETCH_TIME);
+                if (latestFetchTime == null) {
+                    continue;
+                }
+                if (currentLatestFetchTime < latestFetchTime) {
+                    currentLatestFetchTime = latestFetchTime;
+                    latestUIds = taskReport.get(Set.class, LATEST_UID_LIST);
+                }
             }
-            if (currentLatestFetchTime < latestFetchTime) {
-                currentLatestFetchTime = latestFetchTime;
-                latestUIds = taskReport.get(Set.class, LATEST_UID_LIST);
+            if (!currentLatestFetchTime.equals(0L)) {
+                configDiff.set(LATEST_FETCH_TIME, currentLatestFetchTime);
+                DateFormat df = new SimpleDateFormat(MarketoUtils.MARKETO_DATE_SIMPLE_DATE_FORMAT);
+                configDiff.set("from_date", df.format(new Date(currentLatestFetchTime)));
+                configDiff.set(LATEST_UID_LIST, latestUIds);
             }
         }
-        if (!currentLatestFetchTime.equals(0L)) {
-            configDiff.set(LATEST_FETCH_TIME, currentLatestFetchTime);
-            DateFormat df = new SimpleDateFormat(MarketoUtils.MARKETO_DATE_SIMPLE_DATE_FORMAT);
-            configDiff.set("from_date", df.format(new Date(currentLatestFetchTime)));
-            configDiff.set(LATEST_UID_LIST, latestUIds);
-        }
         return configDiff;
     }
 
@@ -257,7 +259,7 @@ public abstract class MarketoBaseBulkExtractInputPlugin<T extends MarketoBaseBul
                 imported++;
             }
         }
-        taskReport.set(LATEST_FETCH_TIME, currentTimestamp == null ? null : currentTimestamp.getMillis());
+        taskReport.set(LATEST_FETCH_TIME, currentTimestamp == null ? 0L : currentTimestamp.getMillis());
         taskReport.set(LATEST_UID_LIST, latestUids);
         return taskReport;
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-marketo
 version: !ruby/object:Gem::Version
-  version: 0.5.7.alpha.3
+  version: 0.5.7.alpha.4
 platform: ruby
 authors:
 - Tai Khuu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -90,11 +90,11 @@ files:
 - src/main/java/org/embulk/input/marketo/rest/RecordPagingIterable.java
 - src/test/java/org/embulk/input/marketo/TestMarketoInputPlugin.java
 - src/test/java/org/embulk/input/marketo/rest/MarketoBaseRestClientTest.java
-- classpath/embulk-input-marketo-0.5.7.alpha.3.jar
 - classpath/jetty-http-9.2.14.v20151106.jar
 - classpath/embulk-base-restclient-0.5.3.jar
 - classpath/jetty-client-9.2.14.v20151106.jar
 - classpath/jetty-util-9.2.14.v20151106.jar
+- classpath/embulk-input-marketo-0.5.7.alpha.4.jar
 - classpath/embulk-util-retryhelper-jetty92-0.5.3.jar
 - classpath/jetty-io-9.2.14.v20151106.jar
 homepage: