zelastic 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3ad1bd811164b7227b243782cea048602ece2c
-  data.tar.gz: 6796d5134935589ca86d27601a2eb6d771ae53a7
+  metadata.gz: f642b0f5988b4f4a0fb9198da0f0276208d3039a
+  data.tar.gz: bb4a08940cf9791cac531be04d7eed6d63ca6fe4
 SHA512:
-  metadata.gz: 4569aedd2380a6974ecc467cff030cc75527fc7d5adeec4c347f73595b298f9f21115f012c76a7f2e3ee881613f884139785e9ead50bed86acf2f32db127fbed
-  data.tar.gz: fa8a9be28763777a93bf052fa3e53b9ce855c441a9dd4492eebf49e025aa3ed59a631c84e53fc1a9715e6ce1170ed89eaf1acd35c96b83ec74a20ed86606ed14
+  metadata.gz: bb13a0754667b7de1bb7a78e478beb4740641775bd609a2294063bcbc27186dd835d77ca7789f67dbef0d462b3e204402697ea92714fe9c19be8dab415535de7
+  data.tar.gz: 29ecd1278cca977883c5f2e90ddc4163f674e5064308955ba1363a58fbc7cc56e7f357ce557329422cd6e777d34ae023bac80403f2608dc697b0d3d0549a40de

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zelastic (0.2.0)
+    zelastic (0.3.0)
       activesupport
 
 GEM

data/lib/zelastic/config.rb

@@ -2,7 +2,7 @@
 
 module Zelastic
   class Config
-    attr_reader :client, :data_source
+    attr_reader :clients, :data_source
 
     def initialize(
       client:,
@@ -11,7 +11,7 @@ module Zelastic
       **overrides,
       &index_data
     )
-      @client = client
+      @clients = Array(client)
       @data_source = data_source
       @mapping = mapping
       @index_data = index_data

data/lib/zelastic/index_manager.rb

@@ -4,8 +4,9 @@ module Zelastic
   class IndexManager
     extend Forwardable
 
-    def initialize(config)
+    def initialize(config, client: nil)
       @config = config
+      @client = client || config.clients.first
     end
 
     def create_index(unique_name)
@@ -97,8 +98,8 @@ module Zelastic
 
     private
 
-    attr_reader :config
-    def_delegators :config, :client, :logger
+    attr_reader :config, :client
+    def_delegators :config, :logger
 
     def indexer
       @indexer ||= Indexer.new(config)

data/lib/zelastic/indexer.rb

@@ -5,8 +5,8 @@ module Zelastic
     class IndexingError < StandardError
       attr_reader :errors
 
-      def initialize(errors)
-        @errors = errors
+      def initialize(result)
+        @errors = result['items'].map { |item| item['error'] }.compact
         super("Errors indexing: #{errors.join(', ')}")
       end
     end
@@ -18,65 +18,50 @@ module Zelastic
     end
 
     def index_batch(batch, index_name: nil)
-      indices = Array(index_name || write_indices)
       logger.info("ES: Indexing #{config.type} record")
 
       version = current_version
-      execute_bulk(
-        indices.flat_map do |index|
-          batch.map do |record|
-            index_command(index: index, version: version, record: record)
-          end
+      execute_bulk do |index_name|
+        batch.map do |record|
+          index_command(index: index_name, version: version, record: record)
         end
-      )
+      end
     end
 
     def index_record(record)
       version = current_version
 
-      execute_bulk(
-        write_indices.map do |index|
-          index_command(index: index, version: version, record: record)
-        end
-      )
+      execute_bulk do |index_name|
+        index_command(index: index_name, version: version, record: record)
+      end
     end
 
     def delete_by_id(id)
-      indices = client.indices.get_alias(name: config.write_alias).keys
-
-      indices.each do |index|
-        client.delete(
-          index: index,
-          type: config.type,
-          id: id
-        )
-      end
+      delete_by_ids([id])
     end
 
     def delete_by_ids(ids)
       logger.info('ES: Deleting batch records')
 
-      indices = config.client.indices.get_alias(name: config.write_alias).keys
-
-      execute_bulk(
-        indices.flat_map do |index|
-          ids.map do |id|
-            {
-              delete: {
-                _index: index,
-                _type: config.type,
-                _id: id
-              }
+      execute_bulk do |index_name|
+        ids.map do |id|
+          {
+            delete: {
+              _index: index_name,
+              _type: config.type,
+              _id: id
             }
-          end
+          }
         end
-      )
+      end
     end
 
     def delete_by_query(query)
       logger.info('ES: Deleting batch records')
 
-      config.client.delete_by_query(index: config.write_alias, body: { query: query })
+      config.clients.each do |client|
+        client.delete_by_query(index: config.write_alias, body: { query: query })
+      end
     end
 
     private
@@ -88,8 +73,8 @@ module Zelastic
       config.data_source.connection.select_one('SELECT txid_current()').fetch('txid_current')
     end
 
-    def write_indices
-      config.client.indices.get_alias(name: config.write_alias).keys
+    def write_indices(client)
+      client.indices.get_alias(name: config.write_alias).keys
     end
 
     def index_command(index:, version:, record:)
@@ -105,11 +90,13 @@ module Zelastic
       }
     end
 
-    def execute_bulk(commands)
-      result = config.client.bulk(body: commands)
-      return result unless result['errors']
-      errors = result['items'].map { |item| item['error'] }.compact
-      raise IndexingError, errors
+    def execute_bulk
+      config.clients.map do |client|
+        commands = write_indices(client).map { |index_name| yield(index) }
+        client.bulk(body: commands).tap do |result|
+          raise IndexingError, result if result['errors']
+        end
+      end
     end
   end
 end

data/lib/zelastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zelastic
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zelastic
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - carwow Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport