From 0527302c0adc4430d9e1c4cf9f898793b187da58 Mon Sep 17 00:00:00 2001
From: Rob Story <wrobstory@gmail.com>
Date: Tue, 20 Sep 2016 12:45:12 -0400
Subject: [PATCH 1/2] REF: Update to 0.2.1, which includes migrating to the AWS
 Java SDK to avoid some amazonica bugs

---
 project.clj       |  6 ++---
 src/tumalo/es.clj | 61 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/project.clj b/project.clj
index 695f3ec..e265e86 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject tumalo "0.2.0"
+(defproject tumalo "0.2.1"
   :description "Clojure Elasticsearch Indexing Tools"
   :license {:name "MIT"
             :url "https://opensource.org/licenses/MIT"}
@@ -6,8 +6,8 @@
                  [org.clojure/tools.logging "0.3.1"]
                  [org.clojure/core.async "0.2.374"]
                  [ch.qos.logback/logback-classic "1.1.3"]
-                 [amazonica "0.3.59"]
-                 [clojurewerkz/elastisch "2.2.1"]
+                 [clojurewerkz/elastisch "2.2.1" :exclusions [com.fasterxml.jackson.core/jackson-core]]
+                 [com.amazonaws/aws-java-sdk-s3 "1.11.35"]
                  [prismatic/schema "1.1.1"]
                  [clj-http "2.2.0"]
                  [clj-time "0.11.0"]]
diff --git a/src/tumalo/es.clj b/src/tumalo/es.clj
index f960567..95974fe 100644
--- a/src/tumalo/es.clj
+++ b/src/tumalo/es.clj
@@ -1,7 +1,6 @@
 (ns tumalo.es
   (:require [clojure.tools.logging :refer [log logf]]
             [clojure.core.async :refer [chan thread close! >!! <!!]]
-            [amazonica.aws.s3 :as s3]
             [clojurewerkz.elastisch.rest.bulk :as esb]
             [clojurewerkz.elastisch.rest.document :as esd]
             [clojurewerkz.elastisch.rest :as esr]
@@ -9,7 +8,10 @@
             [tumalo.schemas :as ts])
   (:import [java.util HashMap]
            [clojurewerkz.elastisch.rest Connection]
-           [clojure.core.async.impl.channels ManyToManyChannel]))
+           [clojure.core.async.impl.channels ManyToManyChannel]
+           [com.amazonaws.services.s3 AmazonS3Client]
+           [com.amazonaws.services.s3.model ListObjectsRequest ObjectListing
+                                            S3ObjectSummary]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Connections
@@ -67,7 +69,7 @@
    batch-size :- s/Num]
   (let [partitioned-docs (partition-all batch-size docs)]
     (doseq [doc-batch partitioned-docs
-            :let [bulk-batch (esb/bulk-index doc-batch)]]
+            :let [bulk-batch (esb/bulk-create doc-batch)]]
       (esb/bulk-with-index-and-type pool target-index-name target-mapping-type bulk-batch))))
 
 
@@ -113,31 +115,37 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Indexing from S3
 
-(defn reduce-objects-and-streams
+(s/defn reduce-objects-and-streams
   "Reducer: get the S3 object, process it, concat the returned values and streams to the :values and
   :streams sequences in the accumulating map"
-  [processing-fn accum s3-object]
-  (let [s3-object (s3/get-object (:bucket-name s3-object) (:key s3-object))
+  [s3-client :- AmazonS3Client
+   processing-fn
+   accum :- [s/Any]
+   s3-object-summary :- S3ObjectSummary]
+  (let [bucket-name (.getBucketName s3-object-summary)
+        key (.getKey s3-object-summary)
+        s3-object (.getObject s3-client bucket-name key)
         processed-obj-and-streams (processing-fn s3-object)]
     {:values  (concat (:values accum) (:values processed-obj-and-streams))
      :streams (concat (:streams accum) (:streams processed-obj-and-streams))}))
 
-
 (s/defn get-next-s3-object-batch!
   "Get next batch of S3 objects and put them on the `chan`"
-  [s3-chan :- ManyToManyChannel
-   last-object-batch :- {s/Keyword s/Any}
+  [s3-client :- AmazonS3Client
+   s3-chan :- ManyToManyChannel
+   object-batch :- ObjectListing
    processing-fn]
   (logf :info "Fetching next batch of %s objects from %s"
-        (:max-keys last-object-batch) (:bucket-name last-object-batch))
-  (let [object-summaries (:object-summaries last-object-batch)
-        reducer (partial reduce-objects-and-streams processing-fn)
+        (.getMaxKeys object-batch) (.getBucketName object-batch))
+  (let [object-summaries (.getObjectSummaries object-batch)
+        reducer (partial reduce-objects-and-streams s3-client processing-fn)
         processed-objects (reduce reducer [] object-summaries)]
     (log :info "S3 Objects fetched, putting on channel to ES writer!")
     (>!! s3-chan processed-objects)
-    (if (:truncated? last-object-batch)
-      (get-next-s3-object-batch! s3-chan
-                                 (s3/list-next-batch-of-objects last-object-batch)
+    (if (.isTruncated object-batch)
+      (get-next-s3-object-batch! s3-client
+                                 s3-chan
+                                 (.listNextBatchOfObjects s3-client object-batch)
                                  processing-fn)
       (do
         (log :info "Finished fetching S3 data! Closing channel.")
@@ -152,11 +160,26 @@
    es-batch-size :- s/Num
    s3-batch-size :- s/Num
    f]
+  "Index data from S3 to Elasticsearch.
+
+   The batches will be fetched from S3 and written to ES in parallel after processing. You
+   can use es-batch-size and s3-batch-size to balance this parallelism, as each S3 batch
+   will get written to ES in N batches of es-batch-size.
+
+   The argument 'f' must be a function that can accept an AWD SDK S3Object and return the following response shape:
+   {:values [docs-ready-for-indexing]
+    :streams [Closeable]}
+
+    where docs-ready-for-indexing is a sequence of documents prepared for bulk indexing,
+     e.g. they contain :_index,  :_type, and :_id,"
   (let [s3-chan (chan 10)
-        s3-first-batch (s3/list-objects :bucket-name bucket-name
-                                        :prefix prefix
-                                        :max-keys s3-batch-size)]
-    (thread (get-next-s3-object-batch! s3-chan s3-first-batch f))
+        s3-client (AmazonS3Client.)
+        object-request (doto (ListObjectsRequest. )
+                         (.setBucketName bucket-name)
+                         (.setPrefix prefix)
+                         (.setMaxKeys (int s3-batch-size)))
+        s3-first-batch (.listObjects s3-client object-request)]
+    (thread (get-next-s3-object-batch! s3-client s3-chan s3-first-batch f))
     (loop [batches-and-streams (<!! s3-chan)]
       (let [bulk-batch (:values batches-and-streams)
             streams (:streams batches-and-streams)]

From 18fec5e95d0cf3b53647b2bba1704fc60c65f08a Mon Sep 17 00:00:00 2001
From: Rob Story <wrobstory@gmail.com>
Date: Wed, 21 Sep 2016 10:34:51 -0400
Subject: [PATCH 2/2] REF: Don't be so heavy handed with java version

---
 project.clj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/project.clj b/project.clj
index e265e86..fbcea2e 100644
--- a/project.clj
+++ b/project.clj
@@ -14,5 +14,4 @@
   :resource-paths ["resources"]
   :profiles {:dev {:resource-paths ["resources/test"]}
              :uberjar {:aot :all}}
-  :global-vars {*warn-on-reflection* true}
-  :javac-options ["-target" "1.8" "-source" "1.8"])
+  :global-vars {*warn-on-reflection* true})