esse 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31d2a1c181dccd9c2acd7256d958010e7c636016b1d5a267597f7aec9ed3334
-  data.tar.gz: cdb390a10b0492833a9360d4fd39df0c18df114a44b37554cba1dd39d229f75b
+  metadata.gz: 1a9a18ea9cc75f6e98edecd0c151fe3077dc362529dc562e380855ec651b898e
+  data.tar.gz: 3d1a96c3ba0a088e2a88b5e7aa3c1440662877d6ab2dc3e1edbd7276fe39611e
 SHA512:
-  metadata.gz: 59ae5dcafd8998c69e5705910b119f5f9d1333899a4320b8f7afa4c5782aa435d820dde222726de111cee00c6d3b4bbed9d6fdd18dac6a6f740cf64138b70d53
-  data.tar.gz: 84b876eaec5b090718e2d265dd5d9456c5dfaeedafdae6e9361ac790de91eab0ba46b9ceabee3c5e8a891c5027ff3ac8443217554219f8dce5f52c853912989c
+  metadata.gz: a70c285401ed1f1d3c43ebb73970339d9c48344d1872a8f5c8391ead77c75a3aeabbc8391acd88971e8bdfcc370abafdab726884deb86d713aabe75bf553c3da
+  data.tar.gz: 6ca5282a53d4e7b29bbe29e149fd5405c9a25a6bd561bc803969e173955f83625c33a6f5b1116280f5a327b54ad4ec5923b58844543da63c51ff029e805e64ec

data/lib/esse/backend/index/aliases.rb

@@ -11,12 +11,12 @@ module Esse
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/indices-aliases.html
         def aliases(**options)
-          response = client.indices.get_alias({ index: index_name, name: '*' }.merge(options))
+          response = coerce_exception { client.indices.get_alias({ index: index_name, name: '*' }.merge(options)) }
           idx_name = response.keys.find { |idx| idx.start_with?(index_name) }
           return [] unless idx_name
 
           response.dig(idx_name, 'aliases')&.keys || []
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+        rescue NotFoundError
           []
         end
 
@@ -25,8 +25,8 @@ module Esse
         # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
         # @return [Array] list of indices that match with `index_name`.
         def indices(**options)
-          client.indices.get_alias({ name: index_name }.merge(options)).keys
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+          coerce_exception { client.indices.get_alias({ name: index_name }.merge(options)).keys }
+        rescue NotFoundError
           []
         end
 
@@ -34,7 +34,7 @@ module Esse
         #
         # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
         # @option [String] :suffix The suffix of the index used for versioning.
-        # @raise [Elasticsearch::Transport::Transport::Errors::NotFound] in case of failure
+        # @raise [Esse::Backend::NotFoundError] in case of failure
         # @return [Hash] the elasticsearch response
         def update_aliases!(suffix:, **options)
           raise(ArgumentError, 'index suffix cannot be nil') if suffix.nil?
@@ -50,7 +50,7 @@ module Esse
 
           Esse::Events.instrument('elasticsearch.update_aliases') do |payload|
             payload[:request] = options
-            payload[:response] = client.indices.update_aliases(options)
+            payload[:response] = coerce_exception { client.indices.update_aliases(options)}
           end
         end
 
@@ -58,11 +58,11 @@ module Esse
         #
         # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
         # @option [String] :suffix The suffix of the index used for versioning.
-        # @raise [Elasticsearch::Transport::Transport::Errors::NotFound] in case of failure
+        # @raise [Esse::Backend::NotFoundError] in case of failure
         # @return [Hash] the elasticsearch response, or an hash with 'errors' as true in case of failure
         def update_aliases(suffix:, **options)
           update_aliases!(suffix: suffix, **options)
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+        rescue NotFoundError
           { 'errors' => true }
         end
       end

data/lib/esse/backend/index/close.rb

@@ -15,7 +15,7 @@ module Esse
         # @option options [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
         #   unavailable (missing, closed, etc)
         # @option options [Time] :timeout Explicit operation timeout
-        # @raise [Elasticsearch::Transport::Transport::Errors::BadRequest, Elasticsearch::Transport::Transport::Errors::NotFound]
+        # @raise [Esse::Backend::ServerError]
         #   in case of failure
         # @return [Hash] the elasticsearch response
         #
@@ -23,7 +23,7 @@ module Esse
         def close!(suffix: index_version, **options)
           Esse::Events.instrument('elasticsearch.close') do |payload|
             payload[:request] = attributes = options.merge(index: index_name(suffix: suffix))
-            payload[:response] = client.indices.close(**attributes)
+            payload[:response] = coerce_exception { client.indices.close(**attributes) }
           end
         end
 
@@ -43,7 +43,7 @@ module Esse
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html
         def close(suffix: index_version, **options)
           close!(suffix: suffix, **options)
-        rescue Elasticsearch::Transport::Transport::ServerError
+        rescue ServerError
           { 'errors' => true }
         end
       end

data/lib/esse/backend/index/create.rb

@@ -21,7 +21,7 @@ module Esse
         # @see http://www.elasticsearch.org/blog/changing-mapping-with-zero-downtime/
         def create_index(suffix: index_version, **options)
           create_index!(suffix: suffix, **options)
-        rescue Elasticsearch::Transport::Transport::Errors::BadRequest
+        rescue ServerError
           { 'errors' => true }
         end
 
@@ -39,7 +39,7 @@ module Esse
         # @option arguments [Time] :master_timeout Specify timeout for connection to master
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body The configuration for the index (`settings` and `mappings`)
-        # @raise [Elasticsearch::Transport::Transport::Errors::NotFound] when index already exists
+        # @raise [Esse::Backend::NotFoundError] when index already exists
         # @return [Hash] the elasticsearch response
         #
         # @see http://www.elasticsearch.org/blog/changing-mapping-with-zero-downtime/
@@ -54,8 +54,8 @@ module Esse
 
           Esse::Events.instrument('elasticsearch.create_index') do |payload|
             payload[:request] = opts = options.merge(index: name, body: definition)
-            payload[:response] = response = client.indices.create(**opts)
-            cluster.wait_for_status! if response
+            payload[:response] = response = coerce_exception { client.indices.create(**opts) }
+            coerce_exception { cluster.wait_for_status! } if response
             response
           end
         end

data/lib/esse/backend/index/delete.rb

@@ -9,13 +9,13 @@ module Esse
         #   UsersIndex.elasticsearch.delete_index! # deletes `<prefix_>users<_suffix|_index_version|_timestamp>` index
         #
         # @param suffix [String, nil] The index suffix Use nil if you want to delete the current index.
-        # @raise [Elasticsearch::Transport::Transport::Errors::NotFound] when index does not exists
+        # @raise [Esse::Backend::NotFoundError] when index does not exists
         # @return [Hash] elasticsearch response
         def delete_index!(suffix: index_version, **options)
           Esse::Events.instrument('elasticsearch.delete_index') do |payload|
             payload[:request] = opts = options.merge(index: index_name(suffix: suffix))
-            payload[:response] = response = client.indices.delete(**opts)
-            cluster.wait_for_status! if response
+            payload[:response] = response = coerce_exception { client.indices.delete(**opts) }
+            coerce_exception { cluster.wait_for_status! } if response
             response
           end
         end
@@ -28,7 +28,7 @@ module Esse
         # @return [Hash] the elasticsearch response, or an hash with 'errors' as true in case of failure
         def delete_index(suffix: index_version, **options)
           delete_index!(suffix: suffix, **options)
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+        rescue ServerError
           { 'errors' => true }
         end
       end

data/lib/esse/backend/index/documents.rb

@@ -4,17 +4,264 @@ module Esse
   module Backend
     class Index
       module InstanceMethods
-        def import!(**options)
-          type_hash.each_value do |type|
-            type.elasticsearch.import!(**options)
+        # Resolve collection and index data
+        #
+        # @param types [Array<String>] List of document types. Defaults to all types.
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @option [Hash] :context The collection context. This value will be passed as argument to the collection
+        #   May be SQL condition or any other filter you have defined on the collection.
+        # @return [Numeric] The number of documents imported
+        def import(*types, context: {}, suffix: nil, **options)
+          types = repo_hash.keys if types.empty?
+          count = 0
+          types.each do |type|
+            each_serialized_batch(type, **(context || {})) do |batch|
+              bulk(type: type, index: batch, suffix: suffix, **options)
+              count += batch.size
+            end
           end
+          count
         end
+        alias_method :import!, :import
 
-        def import(**options)
-          type_hash.each_value do |type|
-            type.elasticsearch.import(**options)
+        # Performs multiple indexing or delete operations in a single API call.
+        # This reduces overhead and can greatly increase indexing speed.
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @option [Array] :index list of serialized documents to be indexed(Optional)
+        # @option [Array] :delete list of serialized documents to be deleted(Optional)
+        # @option [Array] :create list of serialized documents to be created(Optional)
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @return [Hash, nil] the elasticsearch response or nil if there is no data.
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-bulk.html
+        # @see https://github.com/elastic/elasticsearch-ruby/blob/main/elasticsearch-api/lib/elasticsearch/api/utils.rb
+        # @see https://github.com/elastic/elasticsearch-ruby/blob/main/elasticsearch-api/lib/elasticsearch/api/actions/bulk.rb
+        def bulk(index: nil, delete: nil, create: nil, type: nil, suffix: nil, **options)
+          definition = {
+            index: index_name(suffix: suffix),
+          }.merge(options)
+          definition[:type] = type if document_type?
+
+          Esse::Import::Bulk.new(
+            index: index,
+            delete: delete,
+            create: create,
+          ).each_request do |request_body|
+            Esse::Events.instrument('elasticsearch.bulk') do |payload|
+              payload[:request] = definition.merge(body_stats: request_body.stats)
+              payload[:response] = resp = coerce_exception { client.bulk(**definition, body: request_body.body) }
+              # @todo move it to a BulkRequest class
+              if resp&.[]('errors')
+                payload[:error] = resp['errors']
+                raise resp&.fetch('items', [])&.select { |item| item.values.first['error'] }.join("\n")
+              end
+              if bulk_wait_interval > 0
+                payload[:wait_interval] = bulk_wait_interval
+                sleep(bulk_wait_interval)
+              else
+                payload[:wait_interval] = 0.0
+              end
+              resp
+            end
           end
         end
+        alias_method :bulk!, :bulk
+
+        # Adds a JSON document to the specified index and makes it searchable. If the document
+        # already exists, updates the document and increments its version.
+        #
+        #   UsersIndex::User.index(id: 1, body: { name: 'name' }) # { '_id' => 1, ...}
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, Integer] :id The `_id` of the elasticsearch document
+        # @option [Hash] :body The JSON document that will be indexed (Required)
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @return [Hash] the elasticsearch response Hash
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-index_.html
+        # @todo update to allow serialized document as parameter
+        def index(id:, body:, type: nil, suffix: nil, **options)
+          params = {
+            index: index_name(suffix: suffix),
+            id: id,
+            body: body,
+          }
+          params[:type] = type if document_type?
+          coerce_exception { client.index(**options, **params) }
+        end
+        alias_method :index!, :index
+
+        # Updates a document using the specified script.
+        #
+        #   UsersIndex::User.update!(id: 1, body: { doc: { ... } }) # { '_id' => 1, ...}
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, Integer] :id The `_id` of the elasticsearch document
+        # @option [Hash] :body the body of the request
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @raise [Esse::Backend::NotFoundError] when the doc does not exist
+        # @return [Hash] elasticsearch response hash
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-update.html
+        # @todo update to allow serialized document as parameter
+        def update!(id:, body:, type: nil, suffix: nil, **options)
+          params = {
+            index: index_name(suffix: suffix),
+            id: id,
+            body: body,
+          }
+          params[:type] = type if document_type?
+          coerce_exception { client.update(**options, **params) }
+        end
+
+        # Updates a document using the specified script.
+        #
+        #   UsersIndex::User.update(id: 1, body: { doc: { ... } }) # { '_id' => 1, ...}
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, Integer] :id The `_id` of the elasticsearch document
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [Hash] :body the body of the request
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @return [Hash] the elasticsearch response, or an hash with 'errors' as true in case of failure
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-update.html
+        # @todo update to allow serialized document as parameter
+        def update(id:, body:, suffix: nil, **options)
+          update!(id: id, body: body, suffix: suffix, **options)
+        rescue NotFoundError
+          { 'errors' => true }
+        end
+
+        # Removes a JSON document from the specified index.
+        #
+        #   UsersIndex::User.delete!(id: 1) # true
+        #   UsersIndex::User.delete!(id: 'missing') # raise Esse::Backend::NotFoundError
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, Integer] :id The `_id` of the elasticsearch document
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @raise [Esse::Backend::NotFoundError] when the doc does not exist
+        # @return [Boolean] true when the operation is successfully completed
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-delete.html
+        # @todo update to allow serialized document as parameter
+        def delete!(id:, type: nil, suffix: nil, **options)
+          params = {
+            index: index_name(suffix: suffix),
+            id: id,
+          }
+          params[:type] = type if document_type?
+          coerce_exception { client.delete(**options, **params) }
+        end
+
+        # Removes a JSON document from the specified index.
+        #
+        #   UsersIndex::User.delete(id: 1) # true
+        #   UsersIndex::User.delete(id: 'missing') # false
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, Integer] :id The `_id` of the elasticsearch document
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @raise [Esse::Backend::NotFoundError] when the doc does not exist
+        # @return [Boolean] true when the operation is successfully completed
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-delete.html
+        # @todo update to allow serialized document as parameter
+        def delete(id:, type: nil, suffix: nil, **options)
+          delete!(id: id, type: type, suffix: suffix, **options)
+        rescue NotFoundError
+          false
+        end
+
+        # Gets the number of matches for a search query.
+        #
+        #   UsersIndex::User.count # 999
+        #   UsersIndex::User.count(body: { ... }) # 32
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [Hash] :body A query to restrict the results specified with the Query DSL (optional)
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @return [Integer] amount of documents found
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/search-count.html
+        def count(type: nil, suffix: nil, **options)
+          params = {
+            index: index_name(suffix: suffix),
+          }
+          params[:type] = type if document_type?
+          response = coerce_exception { client.count(**options, **params) }
+          response['count']
+        rescue NotFoundError
+          0
+        end
+
+        # Check if a JSON document exists
+        #
+        #   UsersIndex::User.elasticsearch.exist?(id: 1) # true
+        #   UsersIndex::User.elasticsearch.exist?(id: 'missing') # false
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, Integer] :id The `_id` of the elasticsearch document
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @return [Boolean] true if the document exists
+        def exist?(id:, type: nil, suffix: nil, **options)
+          params = {
+            index: index_name(suffix: suffix),
+            id: id,
+          }
+          params[:type] = type if document_type?
+          coerce_exception { client.exists(**options, **params) }
+        end
+
+        # Retrieves the specified JSON document from an index.
+        #
+        #   UsersIndex::User.find!(id: 1) # { '_id' => 1, ... }
+        #   UsersIndex::User.find!(id: 'missing') # raise Esse::Backend::NotFoundError
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, Integer] :id The `_id` of the elasticsearch document
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @raise [Esse::Backend::NotFoundError] when the doc does not exist
+        # @return [Hash] The elasticsearch document.
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-get.html
+        def find!(id:, type: nil, suffix: nil, **options)
+          params = {
+            index: index_name(suffix: suffix),
+            id: id,
+          }
+          params[:type] = type if document_type?
+          coerce_exception { client.get(**options, **params) }
+        end
+
+        # Retrieves the specified JSON document from an index.
+        #
+        #   UsersIndex::User.find(id: 1) # { '_id' => 1, ... }
+        #   UsersIndex::User.find(id: 'missing') # nil
+        #
+        # @param options [Hash] Hash of paramenters that will be passed along to elasticsearch request
+        # @option [String, Integer] :id The `_id` of the elasticsearch document
+        # @option [String, NilClass] :type The type of the document (Optional for elasticsearch >= 7)
+        # @option [String, nil] :suffix The index suffix. Defaults to the nil.
+        # @return [Hash, nil] The elasticsearch document
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docs-get.html
+        def find(id:, suffix: nil, **options)
+          find!(id: id, suffix: suffix, **options)
+        rescue NotFoundError
+          nil
+        end
       end
 
       include InstanceMethods

data/lib/esse/backend/index/existance.rb

@@ -6,13 +6,13 @@ module Esse
       module InstanceMethods
         # Checks the index existance. Returns true or false
         #
-        #   UsersIndex.elasticsearch.exist? #=> true
+        #   UsersIndex.elasticsearch.index_exist? #=> true
         #
         # @param options [Hash] Options hash
         # @option options [String, nil] :suffix The index suffix. Defaults to the index_version.
         #   Use nil if you want to check existence of the `index_name` index or alias.
-        def exist?(suffix: index_version)
-          client.indices.exists(index: index_name(suffix: suffix))
+        def index_exist?(suffix: index_version)
+          coerce_exception { client.indices.exists(index: index_name(suffix: suffix)) }
         end
       end
 

data/lib/esse/backend/index/open.rb

@@ -15,7 +15,7 @@ module Esse
         # @option options [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
         #   unavailable (missing, closed, etc)
         # @option options [Time] :timeout Explicit operation timeout
-        # @raise [Elasticsearch::Transport::Transport::Errors::BadRequest, Elasticsearch::Transport::Transport::Errors::NotFound]
+        # @raise [Esse::Backend::ServerError]
         #   in case of failure
         # @return [Hash] the elasticsearch response
         #
@@ -23,7 +23,7 @@ module Esse
         def open!(suffix: index_version, **options)
           Esse::Events.instrument('elasticsearch.open') do |payload|
             payload[:request] = attributes = options.merge(index: index_name(suffix: suffix))
-            payload[:response] = client.indices.open(**attributes)
+            payload[:response] = coerce_exception { client.indices.open(**attributes) }
           end
         end
 
@@ -43,7 +43,7 @@ module Esse
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-open.html
         def open(suffix: index_version, **options)
           open!(suffix: suffix, **options)
-        rescue Elasticsearch::Transport::Transport::ServerError
+        rescue ServerError
           { 'errors' => true }
         end
       end

data/lib/esse/backend/index/refresh.rb

@@ -10,15 +10,17 @@ module Esse
         # @param :suffix [String, nil] :suffix The index suffix. Defaults to the index_version.
         #   A uniq index name will be generated if one index already exist with the given alias.
         # @param options [Hash] Options hash
-        # @raise [Elasticsearch::Transport::Transport::Errors::BadRequest, Elasticsearch::Transport::Transport::Errors::NotFound]
+        # @raise [Esse::Backend::ServerError]
         #   in case of failure
         # @return [Hash] the elasticsearch response
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-refresh.html
         def refresh!(suffix: index_version, **options)
-          client.indices.refresh(
-            options.merge(index: index_name(suffix: suffix)),
-          )
+          coerce_exception do
+            client.indices.refresh(
+              options.merge(index: index_name(suffix: suffix)),
+            )
+          end
         end
 
         # Performs the refresh operation in one or more indices.
@@ -32,7 +34,7 @@ module Esse
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-refresh.html
         def refresh(suffix: index_version, **options)
           refresh!(suffix: suffix, **options)
-        rescue Elasticsearch::Transport::Transport::ServerError
+        rescue ServerError
           { 'errors' => true }
         end
       end

data/lib/esse/backend/index/reset.rb

@@ -9,18 +9,18 @@ module Esse
         # @option options [String, nil] :suffix The index suffix. Defaults to the index_version.
         #   A uniq index name will be generated if one index already exist with the given alias.
         # @option options [Time] :timeout Explicit operation timeout
-        # @raise [Elasticsearch::Transport::Transport::Errors::BadRequest, Elasticsearch::Transport::Transport::Errors::NotFound]
+        # @raise [Esse::Backend::ServerError]
         #   in case of failure
         # @return [Hash] the elasticsearch response
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html
-        def reset_index!(suffix: index_version, **options)
+        def reset_index!(suffix: index_version, import: true, **options)
           existing = []
           suffix ||= Esse.timestamp
-          suffix = Esse.timestamp while exist?(suffix: suffix).tap { |exist| existing << suffix if exist }
+          suffix = Esse.timestamp while index_exist?(suffix: suffix).tap { |exist| existing << suffix if exist }
 
           create_index!(**options, suffix: suffix, alias: false)
-          import!(**options, suffix: suffix)
+          import!(**options, suffix: suffix) if import
           update_aliases!(suffix: suffix)
           existing.each { |_s| delete_index!(**options, suffix: suffix) }
           true

data/lib/esse/backend/index/update.rb

@@ -21,7 +21,7 @@ module Esse
         #   with the same name across all types
         # @option options [Time] :timeout Explicit operation timeout
         # @option options [Boolean] :master_timeout Timeout for connection to master
-        # @raise [Elasticsearch::Transport::Transport::Errors::BadRequest, Elasticsearch::Transport::Transport::Errors::NotFound]
+        # @raise [Esse::Backend::ServerError]
         #   in case of failure
         # @return [Hash] the elasticsearch response
         #
@@ -33,7 +33,7 @@ module Esse
               body = body[type.to_s] || body[type.to_sym]
             end
             payload[:request] = opts = options.merge(index: index_name(suffix: suffix), body: body)
-            payload[:response] = client.indices.put_mapping(**opts)
+            payload[:response] = coerce_exception { client.indices.put_mapping(**opts) }
           end
         end
 
@@ -59,7 +59,7 @@ module Esse
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-put-mapping/
         def update_mapping(suffix: index_version, **options)
           update_mapping!(suffix: suffix, **options)
-        rescue Elasticsearch::Transport::Transport::ServerError
+        rescue ServerError
           { 'errors' => true }
         end
 
@@ -76,7 +76,7 @@ module Esse
         #   If set to `true` existing settings on an index remain unchanged, the default is `false`
         # @option options [Time] :master_timeout Specify timeout for connection to master
         # @option options [Boolean] :flat_settings Return settings in flat format (default: false)
-        # @raise [Elasticsearch::Transport::Transport::Errors::BadRequest, Elasticsearch::Transport::Transport::Errors::NotFound]
+        # @raise [Esse::Backend::ServerError]
         #   in case of failure
         # @return [Hash] the elasticsearch response
         #
@@ -93,7 +93,7 @@ module Esse
             # closed index might prevent the index to be opened correctly again.
             Esse::Events.instrument('elasticsearch.update_settings') do |payload|
               payload[:request] = opts = options.merge(index: index_name(suffix: suffix), body: { index: settings })
-              payload[:response] = response = client.indices.put_settings(**opts)
+              payload[:response] = response = coerce_exception { client.indices.put_settings(**opts) }
             end
           end
 
@@ -104,7 +104,7 @@ module Esse
             begin
               Esse::Events.instrument('elasticsearch.update_settings') do |payload|
                 payload[:request] = opts = options.merge(index: index_name(suffix: suffix), body: { analysis: analysis })
-                payload[:response] = response = client.indices.put_settings(**opts)
+                payload[:response] = response = coerce_exception { client.indices.put_settings(**opts) }
               end
             ensure
               open!(suffix: suffix)
@@ -132,7 +132,7 @@ module Esse
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-update-settings/
         def update_settings(suffix: index_version, **options)
           update_settings!(suffix: suffix, **options)
-        rescue Elasticsearch::Transport::Transport::ServerError
+        rescue ServerError
           { 'errors' => true }
         end
       end

data/lib/esse/backend/index.rb

@@ -20,8 +20,10 @@ module Esse
 
       NAMING = %i[index_version].freeze
       DEFINITION = %i[settings_hash mappings_hash].freeze
+      DOCUMENTS = %i[each_serialized_batch].freeze
 
-      def_delegators :@index, :type_hash, *(NAMING + DEFINITION)
+      def_delegators :@index, :index_name, :cluster, :repo_hash, :bulk_wait_interval, *(NAMING + DEFINITION + DOCUMENTS)
+      def_delegators :cluster, :document_type?, :client
 
       def initialize(index)
         @index = index
@@ -29,25 +31,25 @@ module Esse
 
       protected
 
-      def index_name(suffix: nil)
-        suffix = Hstring.new(suffix).underscore.presence
-        return @index.index_name unless suffix
-
-        [@index.index_name, suffix].join('_')
-      end
-
       def build_real_index_name(suffix = nil)
         suffix = Hstring.new(suffix).underscore.presence || index_version || Esse.timestamp
 
         index_name(suffix: suffix)
       end
 
-      def client
-        cluster.client
-      end
-
-      def cluster
-        @index.cluster
+      # Elasticsearch::Transport was renamed to Elastic::Transport in 8.0
+      # This lib should support both versions that's why we are wrapping up the transport
+      # errors to local errors.
+      def coerce_exception
+        yield
+      rescue => exception
+        name = Hstring.new(exception.class.name)
+        if /^(Elasticsearch|Elastic|OpenSearch)?::Transport::Transport::Errors/.match?(name.value) && \
+            (exception_class = ERRORS[name.demodulize.value])
+          raise exception_class.new(exception.message)
+        else
+          raise exception
+        end
       end
     end
   end