chewy 7.0.0 → 7.1.0

data/lib/chewy/search/request.rb

@@ -41,7 +41,7 @@ module Chewy
       EXTRA_STORAGES = %i[aggs suggest].freeze
       # An array of storage names that are changing the returned hist collection in any way.
       WHERE_STORAGES = %i[
-        query filter post_filter none types min_score rescore indices_boost
+        query filter post_filter none min_score rescore indices_boost
       ].freeze
 
       delegate :hits, :wrappers, :objects, :records, :documents,
@@ -60,11 +60,11 @@ module Chewy
       #   Chewy::Search::Request.new(:places)
       #   # => <Chewy::Search::Request {:index=>["places"]}>
       #   Chewy::Search::Request.new(PlacesIndex)
-      #   # => <Chewy::Search::Request {:index=>["places"], :type=>["city", "country"]}>
+      #   # => <Chewy::Search::Request {:index=>["places"]}>
       #   Chewy::Search::Request.new(PlacesIndex::City)
-      #   # => <Chewy::Search::Request {:index=>["places"], :type=>["city"]}>
+      #   # => <Chewy::Search::Request {:index=>["places"]}>
       #   Chewy::Search::Request.new(UsersIndex, PlacesIndex::City)
-      #   # => <Chewy::Search::Request {:index=>["users", "places"], :type=>["city", "user"]}>
+      #   # => <Chewy::Search::Request {:index=>["users", "places"]}>
       # @param indexes_or_types [Array<Chewy::Index, Chewy::Type, String, Symbol>] indices and types in any combinations
       def initialize(*indices_or_types)
         indices = indices_or_types.reject do |klass|
@@ -75,8 +75,10 @@ module Chewy
           klass.is_a?(Class) && klass < Chewy::Type
         end
 
+        indices += types.map(&:index)
+
         parameters.modify!(:indices) do
-          replace!(indices: indices, types: types)
+          replace!(indices: indices)
         end
       end
 
@@ -305,34 +307,18 @@ module Chewy
         end
       end
 
-      # @!method indices(*values)
-      #   Modifies `index` request parameter. Updates the storage on every call.
-      #   Added passed indexes to the parameter list.
-      #
-      #   @example
-      #     UsersIndex.indices(CitiesIndex).indices(:another)
-      #     # => <UsersIndex::Query {:index=>["another", "cities", "users"], :type=>["city", "user"]}>
-      #   @see Chewy::Search::Parameters::Indices
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html
-      #   @param values [Array<Chewy::Index, String, Symbol>] index names
-      #   @return [Chewy::Search::Request]
+      # Modifies `index` request parameter. Updates the storage on every call.
+      # Added passed indexes to the parameter list.
       #
-      # @!method types(*values)
-      #   Modifies `type` request parameter. Updates the storage on every call.
-      #   Constrains types passed on the request initialization or adds them
-      #   to the list depending on circumstances.
-      #
-      #   @example
-      #     UsersIndex.types(CitiesIndex::City).types(:unexistent)
-      #     # => <UsersIndex::Query {:index=>["cities", "users"], :type=>["city", "user"]}>
-      #   @see Chewy::Search::Parameters::Indices
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html
-      #   @param values [Array<Chewy::Type, String, Symbol>] type names
-      #   @return [Chewy::Search::Request]
-      %i[indices types].each do |name|
-        define_method name do |value, *values|
-          modify(:indices) { update!(name => [value, *values]) }
-        end
+      # @example
+      #   UsersIndex.indices(CitiesIndex).indices(:another)
+      #   # => <UsersIndex::Query {:index=>["another", "cities", "users"]}>
+      # @see Chewy::Search::Parameters::Indices
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html
+      # @param values [Array<Chewy::Index, String, Symbol>] index names
+      # @return [Chewy::Search::Request]
+      def indices(value, *values)
+        modify(:indices) { update!(indices: [value, *values]) }
       end
 
       # @overload reorder(*values)
@@ -990,7 +976,6 @@ module Chewy
 
       def perform(additional = {})
         request_body = render.merge(additional)
-        request_body[:rest_total_hits_as_int] = true if Runtime.version >= '7.0.0'
         ActiveSupport::Notifications.instrument 'search_query.chewy',
           notification_payload(request: request_body) do
             begin
@@ -1003,9 +988,8 @@ module Chewy
 
       def notification_payload(additional)
         {
-          indexes: _indices, types: _types,
-          index: _indices.one? ? _indices.first : _indices,
-          type: _types.one? ? _types.first : _types
+          indexes: _indices,
+          index: _indices.one? ? _indices.first : _indices
         }.merge(additional)
       end
 
@@ -1013,10 +997,6 @@ module Chewy
         parameters[:indices].indices
       end
 
-      def _types
-        parameters[:indices].types
-      end
-
       def raw_limit_value
         parameters[:limit].value
       end

data/lib/chewy/search/response.rb

@@ -23,7 +23,7 @@ module Chewy
       #
       # @return [Integer]
       def total
-        @total ||= hits_root['total'] || 0
+        @total ||= hits_root.fetch('total', {}).fetch('value', 0)
       end
 
       # Response `max_score` field.

data/lib/chewy/search/scrolling.rb

@@ -28,7 +28,7 @@ module Chewy
         return enum_for(:scroll_batches, batch_size: batch_size, scroll: scroll) unless block_given?
 
         result = perform(size: batch_size, scroll: scroll)
-        total = [raw_limit_value, result.fetch('hits', {}).fetch('total', 0)].compact.min
+        total = [raw_limit_value, result.fetch('hits', {}).fetch('total', {}).fetch('value', 0)].compact.min
         last_batch_size = total % batch_size
         fetched = 0
         scroll_id = nil

data/lib/chewy/stash.rb

@@ -46,11 +46,8 @@ module Chewy
         types = something.flat_map { |s| Chewy.derive_types(s) }
         return none if something.present? && types.blank?
         scope = all
-        types.group_by(&:index).each do |index, index_types|
-          scope = scope.or(
-            filter(term: {index_name: index.derivable_name})
-              .filter(terms: {type_name: index_types.map(&:type_name)})
-          )
+        types.map(&:index).uniq.each do |index|
+          scope = scope.or(filter(term: {index_name: index.derivable_name}))
         end
         scope
       end

data/lib/chewy/type/import/bulk_request.rb

@@ -47,8 +47,7 @@ module Chewy
 
         def request_base
           @request_base ||= {
-            index: @type.index_name(suffix: @suffix),
-            type: @type.type_name
+            index: @type.index_name(suffix: @suffix)
           }.merge!(@bulk_options)
         end
 

data/lib/chewy/type/import/journal_builder.rb

@@ -17,8 +17,7 @@ module Chewy
             ].compact
           ).bulk_body.each do |item|
             item.values.first.merge!(
-              _index: Chewy::Stash::Journal.index_name,
-              _type: Chewy::Stash::Journal::Journal.type_name
+              _index: Chewy::Stash::Journal.index_name
             )
           end
         end

data/lib/chewy/type/import/routine.rb

@@ -69,8 +69,8 @@ module Chewy
           @type.index.create!(**@bulk_options.slice(:suffix)) unless @type.index.exists?
         end
 
-        # The main process method. Converts passed objects to thr bulk request body,
-        # appends journal entires, performs this request and handles errors performing
+        # The main process method. Converts passed objects to the bulk request body,
+        # appends journal entries, performs this request and handles errors performing
         # failover procedures if applicable.
         #
         # @param index [Array<Object>] any acceptable objects for indexing

data/lib/chewy/type/mapping.rb

@@ -183,7 +183,7 @@ module Chewy
         # Returns compiled mappings hash for current type
         #
         def mappings_hash
-          root.mappings_hash[type_name.to_sym].present? ? root.mappings_hash : {}
+          root.mappings_hash
         end
 
         # Check whether the type has outdated_sync_field defined with a simple value.

data/lib/chewy/type/syncer.rb

@@ -205,12 +205,9 @@ module Chewy
         return @outdated_sync_field_type if instance_variable_defined?(:@outdated_sync_field_type)
         return unless @type.outdated_sync_field
 
-        args = {index: @type.index_name, type: @type.type_name}
-        args[:include_type_name] = true if Runtime.version >= '6.7.0'
-        mappings = @type.client.indices.get_mapping(**args).values.first.fetch('mappings', {})
+        mappings = @type.client.indices.get_mapping(index: @type.index_name).values.first.fetch('mappings', {})
 
         @outdated_sync_field_type = mappings
-          .fetch(@type.type_name, {})
           .fetch('properties', {})
           .fetch(@type.outdated_sync_field.to_s, {})['type']
       rescue Elasticsearch::Transport::Transport::Errors::NotFound

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '7.0.0'.freeze
+  VERSION = '7.1.0'.freeze
 end

data/lib/tasks/chewy.rake

@@ -23,22 +23,22 @@ end
 namespace :chewy do
   desc 'Destroys, recreates and imports data for the specified indexes or all of them'
   task reset: :environment do |_task, args|
-    Chewy::RakeHelper.reset(parse_classes(args.extras))
+    Chewy::RakeHelper.reset(**parse_classes(args.extras))
   end
 
   desc 'Resets data for the specified indexes or all of them only if the index specification is changed'
   task upgrade: :environment do |_task, args|
-    Chewy::RakeHelper.upgrade(parse_classes(args.extras))
+    Chewy::RakeHelper.upgrade(**parse_classes(args.extras))
   end
 
   desc 'Updates data for the specified indexes/types or all of them'
   task update: :environment do |_task, args|
-    Chewy::RakeHelper.update(parse_classes(args.extras))
+    Chewy::RakeHelper.update(**parse_classes(args.extras))
   end
 
   desc 'Synchronizes data for the specified indexes/types or all of them'
   task sync: :environment do |_task, args|
-    Chewy::RakeHelper.sync(parse_classes(args.extras))
+    Chewy::RakeHelper.sync(**parse_classes(args.extras))
   end
 
   desc 'Resets all the indexes with the specification changed and synchronizes the rest of them'
@@ -50,22 +50,22 @@ namespace :chewy do
   namespace :parallel do
     desc 'Parallel version of `rake chewy:reset`'
     task reset: :environment do |_task, args|
-      Chewy::RakeHelper.reset(parse_parallel_args(args.extras))
+      Chewy::RakeHelper.reset(**parse_parallel_args(args.extras))
     end
 
     desc 'Parallel version of `rake chewy:upgrade`'
     task upgrade: :environment do |_task, args|
-      Chewy::RakeHelper.upgrade(parse_parallel_args(args.extras))
+      Chewy::RakeHelper.upgrade(**parse_parallel_args(args.extras))
     end
 
     desc 'Parallel version of `rake chewy:update`'
     task update: :environment do |_task, args|
-      Chewy::RakeHelper.update(parse_parallel_args(args.extras))
+      Chewy::RakeHelper.update(**parse_parallel_args(args.extras))
     end
 
     desc 'Parallel version of `rake chewy:sync`'
     task sync: :environment do |_task, args|
-      Chewy::RakeHelper.sync(parse_parallel_args(args.extras))
+      Chewy::RakeHelper.sync(**parse_parallel_args(args.extras))
     end
 
     desc 'Parallel version of `rake chewy:deploy`'
@@ -79,12 +79,12 @@ namespace :chewy do
   namespace :journal do
     desc 'Applies changes that were done after the specified time for the specified indexes/types or all of them'
     task apply: :environment do |_task, args|
-      Chewy::RakeHelper.journal_apply(parse_journal_args(args.extras))
+      Chewy::RakeHelper.journal_apply(**parse_journal_args(args.extras))
     end
 
     desc 'Removes journal records created before the specified timestamp for the specified indexes/types or all of them'
     task clean: :environment do |_task, args|
-      Chewy::RakeHelper.journal_clean(parse_journal_args(args.extras))
+      Chewy::RakeHelper.journal_clean(**parse_journal_args(args.extras))
     end
   end
 

data/migration_guide.md

@@ -10,10 +10,13 @@ In order to upgrade Chewy 6/Elasticsearch 6 to Chewy 7/Elasticsearch 7 in the mo
 
 * Upgrade to the latest 6.x stable releases, namely Chewy 6.0, Elasticsearch 6.8
 * Study carefully [Breaking changes in 7.0](https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking-changes-7.0.htmll), make sure your application conforms.
-* Run your test suite on Chewy 7 / Elasticsearch 7
-* Run manual tests on Chewy 7 / Elasticsearch 7
-* Upgrade to Chewy 7
+* Run your test suite on Chewy 7.0 / Elasticsearch 7
+* Run manual tests on Chewy 7.0 / Elasticsearch 7
+* Upgrade to Chewy 7.0
 * Perform a [rolling upgrade](https://www.elastic.co/guide/en/elasticsearch/reference//rolling-upgrades.html) of Elasticsearch
+* Run your test suite on Chewy 7.1 / Elasticsearch 7
+* Run manual tests on Chewy 7.1 / Elasticsearch 7
+* Upgrade to Chewy 7.1
 
 ## Chewy 5/Elasticsearch 5 to Chewy 6/Elasticsearch 6
 

data/spec/chewy/fields/base_spec.rb

@@ -143,7 +143,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.mappings_hash).to eq(event: {
+        expect(EventsIndex::Event.mappings_hash).to eq(
           properties: {
             id: {type: 'integer'},
             category: {
@@ -160,7 +160,7 @@ describe Chewy::Fields::Base do
               }
             }
           }
-        })
+        )
       end
     end
 
@@ -296,7 +296,7 @@ describe Chewy::Fields::Base do
       end
 
       specify do
-        expect(EventsIndex::Event.mappings_hash).to eq(event: {
+        expect(EventsIndex::Event.mappings_hash).to eq(
           properties: {
             id: {type: 'integer'},
             name: {
@@ -307,7 +307,7 @@ describe Chewy::Fields::Base do
             },
             category: {type: 'object'}
           }
-        })
+        )
       end
 
       specify do

data/spec/chewy/fields/root_spec.rb

@@ -13,7 +13,7 @@ describe Chewy::Fields::Root do
       field.dynamic_template template_42: {mapping: {}, match: ''}
       field.dynamic_template(/hello\..*/)
 
-      expect(field.mappings_hash).to eq(product: {dynamic_templates: [
+      expect(field.mappings_hash).to eq(dynamic_templates: [
         {template_1: {mapping: {type: 'keyword'}, match: 'hello'}},
         {template_2: {mapping: {}, match_mapping_type: 'integer', match: 'hello*'}},
         {template_3: {mapping: {}, path_match: 'hello.*'}},
@@ -21,7 +21,7 @@ describe Chewy::Fields::Root do
         {template_5: {mapping: {}, match: 'hello.*', match_pattern: 'regexp'}},
         {template_42: {mapping: {}, match: ''}},
         {template_7: {mapping: {}, path_match: 'hello\..*', match_pattern: 'regexp'}}
-      ]})
+      ])
     end
 
     context do
@@ -33,10 +33,10 @@ describe Chewy::Fields::Root do
 
       specify do
         field.dynamic_template 'hello', type: 'keyword'
-        expect(field.mappings_hash).to eq(product: {dynamic_templates: [
+        expect(field.mappings_hash).to eq(dynamic_templates: [
           {template_42: {mapping: {}, match: ''}},
           {template_1: {mapping: {type: 'keyword'}, match: 'hello'}}
-        ]})
+        ])
       end
     end
   end

data/spec/chewy/index/specification_spec.rb

@@ -56,12 +56,12 @@ describe Chewy::Index::Specification do
     specify do
       expect { specification1.lock! }.to change { Chewy::Stash::Specification.all.hits }.from([]).to([{
         '_index' => 'chewy_specifications',
-        '_type' => 'specification',
+        '_type' => '_doc',
         '_id' => 'places',
         '_score' => 1.0,
         '_source' => {'specification' => Base64.encode64({
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+          'mappings' => {'properties' => {'founded_on' => {'type' => 'date'}}}
         }.to_json)}
       }])
     end
@@ -72,21 +72,21 @@ describe Chewy::Index::Specification do
       specify do
         expect { specification5.lock! }.to change { Chewy::Stash::Specification.all.hits }.to([{
           '_index' => 'chewy_specifications',
-          '_type' => 'specification',
+          '_type' => '_doc',
           '_id' => 'places',
           '_score' => 1.0,
           '_source' => {'specification' => Base64.encode64({
             'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-            'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+            'mappings' => {'properties' => {'founded_on' => {'type' => 'date'}}}
           }.to_json)}
         }, {
           '_index' => 'chewy_specifications',
-          '_type' => 'specification',
+          '_type' => '_doc',
           '_id' => 'namespace/cities',
           '_score' => 1.0,
           '_source' => {'specification' => Base64.encode64({
             'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-            'mappings' => {'city' => {'properties' => {'population' => {'type' => 'integer'}}}}
+            'mappings' => {'properties' => {'population' => {'type' => 'integer'}}}
           }.to_json)}
         }])
       end
@@ -97,14 +97,14 @@ describe Chewy::Index::Specification do
     specify do
       expect { specification1.lock! }.to change { specification1.locked }.from({}).to(
         'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-        'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+        'mappings' => {'properties' => {'founded_on' => {'type' => 'date'}}}
       )
     end
 
     specify do
       expect { specification5.lock! }.to change { specification5.locked }.from({}).to(
         'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-        'mappings' => {'city' => {'properties' => {'population' => {'type' => 'integer'}}}}
+        'mappings' => {'properties' => {'population' => {'type' => 'integer'}}}
       )
     end
 
@@ -114,20 +114,20 @@ describe Chewy::Index::Specification do
       specify do
         expect { specification2.lock! }.to change { specification2.locked }.from(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+          'mappings' => {'properties' => {'founded_on' => {'type' => 'date'}}}
         ).to(
           'settings' => {'analyzer' => {}, 'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+          'mappings' => {'properties' => {'founded_on' => {'type' => 'date'}}}
         )
       end
 
       specify do
         expect { specification3.lock! }.to change { specification3.locked }.from(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+          'mappings' => {'properties' => {'founded_on' => {'type' => 'date'}}}
         ).to(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}, 'population' => {'type' => 'integer'}}}}
+          'mappings' => {'properties' => {'founded_on' => {'type' => 'date'}, 'population' => {'type' => 'integer'}}}
         )
       end
     end
@@ -136,7 +136,7 @@ describe Chewy::Index::Specification do
   describe '#current' do
     specify do
       expect(specification2.current).to eq(
-        'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}},
+        'mappings' => {'properties' => {'founded_on' => {'type' => 'date'}}},
         'settings' => {'analyzer' => {}, 'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}}
       )
     end