zelastic 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be9663f3819fc9057a838604106173e90e8b48219542a67eeac5f6493e696921
-  data.tar.gz: 67c3775b7911527728fc417c1978e223155d73bb7ade42629d8c595f2fcb0193
+  metadata.gz: 57c75cdfd5b9131b9836f4fe62975e634b19e6fdaf203c43dfb04fa47cfab19e
+  data.tar.gz: a45bbd2a537e3363e3ab77690b5ad60a059f6e2526f7ce7410242e93c6b266bb
 SHA512:
-  metadata.gz: 668853db1e94c690e8a86c32b1de997d11563d531cdef95b8f9dcab49df74ac412e36d2b79832ff12bcd82a8dc7740ca0afaa76acf82af2a83efb12e2d55f15d
-  data.tar.gz: e2e6f75c50b0c763654136fdf753e0734c0d79f5112f467c5f4fa6142cb332272595eecf1061120e82110bfd18ae08e0215fe205090cf35c23ea03b461fe6b98
+  metadata.gz: b2090c1670134753ac7f3cab263c36d795f3b409b7e4a0d74cf9d27a57d1a80250ce7f2ec47dcacae564485a7645775010d57a55cd5ee61216af7584865b9b45
+  data.tar.gz: 05f156758b28a8c5198282567490ccfc93d3c499f785dd2eaf654b5243a3cada6e2f5362e7842bc9f32bda084f5d43a4fb775ecc91f90e3bbdbf8fab0680153b

data/.github/workflows/ci.yml

@@ -14,10 +14,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        elasticsearch: ["8.3.3"]
+        elasticsearch: ["8.19.15"]
         elasticsearch_gem: ["~> 8", "~> 7"]
         include:
-          - elasticsearch: "7.17.5"
+          - elasticsearch: "7.17.28"
             elasticsearch_gem: "~> 7"
 
     services:

data/CHANGELOG.md

@@ -31,6 +31,13 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased] - XXXX-XX-XX
 
+## [0.9.1]
+### Added
+- `op_type` and `conflicts` kwargs on `IndexManager#reindex_from_local` and `#reindex_from_remote`. Defaults to `nil`, 
+  which omits them from the request body and preserves Elasticsearch defaults. Pass `op_type: 'create'` and
+  `conflicts: 'proceed'` for safe concurrent backfills - this avoids overwriting fresher live writes at the destination, and 
+  logs conflicts instead of aborting.
+
 ## [0.8.0] - 2022-08-19
 ### Added
 - Support for Ruby 3 (and keep support for 2.7).

data/lib/zelastic/index_manager.rb

@@ -19,9 +19,9 @@ module Zelastic
     def populate_index(unique_name = nil, batch_size: 3000, refresh: false)
       index_name = index_name_from_unique(unique_name)
 
-      config.data_source.find_in_batches(batch_size: batch_size).with_index do |batch, i|
-        logger.info(populate_index_log(batch_size: batch_size, batch_number: i + 1))
-        indexer.index_batch(batch, client: client, index_name: index_name, refresh: refresh)
+      config.data_source.find_in_batches(batch_size:).with_index do |batch, i|
+        logger.info(populate_index_log(batch_size:, batch_number: i + 1))
+        indexer.index_batch(batch, client:, index_name:, refresh:)
       end
     end
 
@@ -64,9 +64,9 @@ module Zelastic
                  )
 
       actions = other_write_indices.map do |index|
-        { remove: { index: index, alias: config.write_alias } }
+        { remove: { index:, alias: config.write_alias } }
       end
-      client.indices.update_aliases(body: { actions: actions })
+      client.indices.update_aliases(body: { actions: })
     end
 
     def cleanup_old_indices
@@ -92,23 +92,38 @@ module Zelastic
       client.indices.delete(index: indices_to_delete)
     end
 
-    def reindex_from_local(source_index:, dest_index:, wait_for_completion: false)
+    def reindex_from_local(source_index:, dest_index:, wait_for_completion: false, op_type: nil, conflicts: nil)
       logger.info("Reindexing from #{source_index} to #{dest_index}")
-      reindex(source: { index: source_index }, dest_index: dest_index,
-        wait_for_completion: wait_for_completion
+      reindex(
+        source: { index: source_index }, dest_index:,
+        wait_for_completion:,
+        op_type:,
+        conflicts:
       )
     end
 
-    def reindex_from_remote(source_host:, source_index:, dest_index:,
-      username: nil, password: nil, wait_for_completion: false)
+    def reindex_from_remote(
+      source_host:,
+      source_index:,
+      dest_index:,
+      username: nil,
+      password: nil,
+      wait_for_completion: false,
+      op_type: nil,
+      conflicts: nil
+    )
       logger.info("Reindexing from remote #{source_host}/#{source_index} to #{dest_index}")
 
       remote = { host: source_host }
       remote[:username] = username if username
       remote[:password] = password if password
 
-      reindex(source: { remote: remote, index: source_index }, dest_index: dest_index,
-        wait_for_completion: wait_for_completion
+      reindex(
+        source: { remote:, index: source_index },
+        dest_index:,
+        wait_for_completion:,
+        op_type:,
+        conflicts:
       )
     end
 
@@ -126,14 +141,14 @@ module Zelastic
 
     def_delegators :config, :logger
 
-    def reindex(source:, dest_index:, wait_for_completion:)
-      client.reindex(
-        body: {
-          source: source,
-          dest: { index: dest_index }
-        },
-        wait_for_completion: wait_for_completion
-      )
+    def reindex(source:, dest_index:, wait_for_completion:, op_type: nil, conflicts: nil)
+      dest = { index: dest_index }
+      dest[:op_type] = op_type if op_type
+
+      body = { source:, dest: }
+      body[:conflicts] = conflicts if conflicts
+
+      client.reindex(body:, wait_for_completion:)
     end
 
     def indexer

data/lib/zelastic/indexer.rb

@@ -23,9 +23,9 @@ module Zelastic
 
     def index_batch(batch, client: nil, index_name: nil, refresh: false)
       version = current_version
-      execute_bulk(client: client, index_name: index_name, refresh: refresh) do |index|
+      execute_bulk(client:, index_name:, refresh:) do |index|
         batch.map do |record|
-          index_command(index: index, version: version, record: record)
+          index_command(index:, version:, record:)
         end
       end
     end
@@ -33,8 +33,8 @@ module Zelastic
     def index_record(record, refresh: false)
       version = current_version
 
-      execute_bulk(refresh: refresh) do |index_name|
-        [index_command(index: index_name, version: version, record: record)]
+      execute_bulk(refresh:) do |index_name|
+        [index_command(index: index_name, version:, record:)]
       end
     end
 
@@ -56,7 +56,7 @@ module Zelastic
       logger.info('ES: Deleting batch records')
 
       config.clients.map do |client|
-        client.delete_by_query(index: config.write_alias, body: { query: query })
+        client.delete_by_query(index: config.write_alias, body: { query: })
       end
     end
 
@@ -82,7 +82,7 @@ module Zelastic
           _index: index,
           _id: record.id,
           data: config.index_data(record),
-          version: version,
+          version:,
           version_type: :external
         }
       }
@@ -96,7 +96,7 @@ module Zelastic
 
         commands = indices.flat_map(&block)
 
-        current_client.bulk(body: commands, refresh: refresh).tap do |result|
+        current_client.bulk(body: commands, refresh:).tap do |result|
           check_errors!(result)
         end
       end

data/lib/zelastic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zelastic
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - carwow Developers
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Zero-downtime (re-)indexing of ActiveRecord models into Elasticsearch.
 test_files: []