chewy 5.1.0 → 7.2.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/CODEOWNERS +1 -0
- data/.github/ISSUE_TEMPLATE/bug_report.md +39 -0
- data/.github/ISSUE_TEMPLATE/feature_request.md +20 -0
- data/.github/PULL_REQUEST_TEMPLATE.md +16 -0
- data/.github/workflows/ruby.yml +73 -0
- data/.rubocop.yml +13 -8
- data/.rubocop_todo.yml +110 -22
- data/CHANGELOG.md +449 -347
- data/CODE_OF_CONDUCT.md +14 -0
- data/CONTRIBUTING.md +63 -0
- data/Gemfile +3 -7
- data/Guardfile +3 -1
- data/LICENSE.txt +1 -1
- data/README.md +423 -311
- data/chewy.gemspec +8 -10
- data/gemfiles/rails.5.2.activerecord.gemfile +9 -14
- data/gemfiles/rails.6.0.activerecord.gemfile +11 -0
- data/gemfiles/rails.6.1.activerecord.gemfile +13 -0
- data/gemfiles/rails.7.0.activerecord.gemfile +13 -0
- data/lib/chewy/config.rb +42 -60
- data/lib/chewy/errors.rb +4 -10
- data/lib/chewy/fields/base.rb +80 -20
- data/lib/chewy/fields/root.rb +7 -17
- data/lib/chewy/index/actions.rb +62 -35
- data/lib/chewy/{type → index}/adapter/active_record.rb +18 -4
- data/lib/chewy/{type → index}/adapter/base.rb +2 -3
- data/lib/chewy/{type → index}/adapter/object.rb +28 -32
- data/lib/chewy/{type → index}/adapter/orm.rb +26 -24
- data/lib/chewy/index/aliases.rb +14 -5
- data/lib/chewy/{type → index}/crutch.rb +5 -5
- data/lib/chewy/index/import/bulk_builder.rb +311 -0
- data/lib/chewy/{type → index}/import/bulk_request.rb +6 -7
- data/lib/chewy/{type → index}/import/journal_builder.rb +11 -12
- data/lib/chewy/{type → index}/import/routine.rb +17 -16
- data/lib/chewy/{type → index}/import.rb +51 -33
- data/lib/chewy/{type → index}/mapping.rb +32 -37
- data/lib/chewy/index/observe/active_record_methods.rb +87 -0
- data/lib/chewy/index/observe/callback.rb +34 -0
- data/lib/chewy/index/observe.rb +17 -0
- data/lib/chewy/index/specification.rb +1 -0
- data/lib/chewy/{type → index}/syncer.rb +61 -62
- data/lib/chewy/{type → index}/witchcraft.rb +15 -9
- data/lib/chewy/{type → index}/wrapper.rb +13 -3
- data/lib/chewy/index.rb +46 -96
- data/lib/chewy/journal.rb +25 -14
- data/lib/chewy/minitest/helpers.rb +86 -13
- data/lib/chewy/minitest/search_index_receiver.rb +22 -26
- data/lib/chewy/multi_search.rb +62 -0
- data/lib/chewy/railtie.rb +6 -20
- data/lib/chewy/rake_helper.rb +136 -108
- data/lib/chewy/rspec/build_query.rb +12 -0
- data/lib/chewy/rspec/helpers.rb +55 -0
- data/lib/chewy/rspec/update_index.rb +55 -44
- data/lib/chewy/rspec.rb +2 -0
- data/lib/chewy/runtime.rb +1 -1
- data/lib/chewy/search/loader.rb +19 -41
- data/lib/chewy/search/parameters/collapse.rb +16 -0
- data/lib/chewy/search/parameters/concerns/query_storage.rb +2 -2
- data/lib/chewy/search/parameters/ignore_unavailable.rb +27 -0
- data/lib/chewy/search/parameters/indices.rb +12 -57
- data/lib/chewy/search/parameters/none.rb +1 -3
- data/lib/chewy/search/parameters/order.rb +6 -19
- data/lib/chewy/search/parameters/source.rb +5 -1
- data/lib/chewy/search/parameters/track_total_hits.rb +16 -0
- data/lib/chewy/search/parameters.rb +7 -4
- data/lib/chewy/search/query_proxy.rb +9 -2
- data/lib/chewy/search/request.rb +180 -154
- data/lib/chewy/search/response.rb +5 -5
- data/lib/chewy/search/scoping.rb +7 -8
- data/lib/chewy/search/scrolling.rb +16 -13
- data/lib/chewy/search.rb +7 -22
- data/lib/chewy/stash.rb +19 -30
- data/lib/chewy/strategy/active_job.rb +2 -2
- data/lib/chewy/strategy/atomic_no_refresh.rb +18 -0
- data/lib/chewy/strategy/base.rb +10 -0
- data/lib/chewy/strategy/lazy_sidekiq.rb +64 -0
- data/lib/chewy/strategy/sidekiq.rb +3 -2
- data/lib/chewy/strategy.rb +5 -19
- data/lib/chewy/version.rb +1 -1
- data/lib/chewy.rb +36 -80
- data/lib/generators/chewy/install_generator.rb +1 -1
- data/lib/tasks/chewy.rake +26 -32
- data/migration_guide.md +56 -0
- data/spec/chewy/config_spec.rb +15 -61
- data/spec/chewy/fields/base_spec.rb +432 -145
- data/spec/chewy/fields/root_spec.rb +20 -28
- data/spec/chewy/fields/time_fields_spec.rb +5 -5
- data/spec/chewy/index/actions_spec.rb +388 -55
- data/spec/chewy/{type → index}/adapter/active_record_spec.rb +110 -44
- data/spec/chewy/{type → index}/adapter/object_spec.rb +21 -6
- data/spec/chewy/index/aliases_spec.rb +3 -3
- data/spec/chewy/index/import/bulk_builder_spec.rb +494 -0
- data/spec/chewy/{type → index}/import/bulk_request_spec.rb +5 -12
- data/spec/chewy/{type → index}/import/journal_builder_spec.rb +14 -22
- data/spec/chewy/{type → index}/import/routine_spec.rb +19 -19
- data/spec/chewy/{type → index}/import_spec.rb +149 -96
- data/spec/chewy/index/mapping_spec.rb +135 -0
- data/spec/chewy/index/observe/active_record_methods_spec.rb +68 -0
- data/spec/chewy/index/observe/callback_spec.rb +139 -0
- data/spec/chewy/index/observe_spec.rb +143 -0
- data/spec/chewy/index/settings_spec.rb +3 -1
- data/spec/chewy/index/specification_spec.rb +20 -30
- data/spec/chewy/{type → index}/syncer_spec.rb +14 -19
- data/spec/chewy/{type → index}/witchcraft_spec.rb +34 -21
- data/spec/chewy/index/wrapper_spec.rb +100 -0
- data/spec/chewy/index_spec.rb +69 -137
- data/spec/chewy/journal_spec.rb +46 -91
- data/spec/chewy/minitest/helpers_spec.rb +122 -14
- data/spec/chewy/minitest/search_index_receiver_spec.rb +24 -26
- data/spec/chewy/multi_search_spec.rb +84 -0
- data/spec/chewy/rake_helper_spec.rb +293 -101
- data/spec/chewy/rspec/build_query_spec.rb +34 -0
- data/spec/chewy/rspec/helpers_spec.rb +61 -0
- data/spec/chewy/rspec/update_index_spec.rb +106 -102
- data/spec/chewy/runtime_spec.rb +2 -2
- data/spec/chewy/search/loader_spec.rb +19 -53
- data/spec/chewy/search/pagination/kaminari_examples.rb +3 -5
- data/spec/chewy/search/pagination/kaminari_spec.rb +1 -1
- data/spec/chewy/search/parameters/collapse_spec.rb +5 -0
- data/spec/chewy/search/parameters/ignore_unavailable_spec.rb +67 -0
- data/spec/chewy/search/parameters/indices_spec.rb +26 -118
- data/spec/chewy/search/parameters/none_spec.rb +1 -1
- data/spec/chewy/search/parameters/order_spec.rb +18 -11
- data/spec/chewy/search/parameters/query_storage_examples.rb +67 -21
- data/spec/chewy/search/parameters/search_after_spec.rb +4 -1
- data/spec/chewy/search/parameters/source_spec.rb +8 -2
- data/spec/chewy/search/parameters/track_total_hits_spec.rb +5 -0
- data/spec/chewy/search/parameters_spec.rb +23 -7
- data/spec/chewy/search/query_proxy_spec.rb +68 -17
- data/spec/chewy/search/request_spec.rb +344 -149
- data/spec/chewy/search/response_spec.rb +35 -25
- data/spec/chewy/search/scrolling_spec.rb +28 -26
- data/spec/chewy/search_spec.rb +69 -59
- data/spec/chewy/stash_spec.rb +16 -26
- data/spec/chewy/strategy/active_job_spec.rb +23 -10
- data/spec/chewy/strategy/atomic_no_refresh_spec.rb +60 -0
- data/spec/chewy/strategy/atomic_spec.rb +9 -10
- data/spec/chewy/strategy/lazy_sidekiq_spec.rb +214 -0
- data/spec/chewy/strategy/sidekiq_spec.rb +14 -10
- data/spec/chewy/strategy_spec.rb +19 -15
- data/spec/chewy_spec.rb +17 -110
- data/spec/spec_helper.rb +6 -29
- data/spec/support/active_record.rb +43 -5
- metadata +102 -198
- data/.travis.yml +0 -45
- data/Appraisals +0 -81
- data/LEGACY_DSL.md +0 -497
- data/gemfiles/rails.4.0.activerecord.gemfile +0 -15
- data/gemfiles/rails.4.1.activerecord.gemfile +0 -15
- data/gemfiles/rails.4.2.activerecord.gemfile +0 -16
- data/gemfiles/rails.4.2.mongoid.5.2.gemfile +0 -16
- data/gemfiles/rails.5.0.activerecord.gemfile +0 -16
- data/gemfiles/rails.5.0.mongoid.6.1.gemfile +0 -16
- data/gemfiles/rails.5.1.activerecord.gemfile +0 -16
- data/gemfiles/rails.5.1.mongoid.6.3.gemfile +0 -16
- data/gemfiles/sequel.4.45.gemfile +0 -11
- data/lib/chewy/backports/deep_dup.rb +0 -46
- data/lib/chewy/backports/duplicable.rb +0 -91
- data/lib/chewy/query/compose.rb +0 -68
- data/lib/chewy/query/criteria.rb +0 -191
- data/lib/chewy/query/filters.rb +0 -244
- data/lib/chewy/query/loading.rb +0 -110
- data/lib/chewy/query/nodes/and.rb +0 -25
- data/lib/chewy/query/nodes/base.rb +0 -17
- data/lib/chewy/query/nodes/bool.rb +0 -34
- data/lib/chewy/query/nodes/equal.rb +0 -34
- data/lib/chewy/query/nodes/exists.rb +0 -20
- data/lib/chewy/query/nodes/expr.rb +0 -28
- data/lib/chewy/query/nodes/field.rb +0 -110
- data/lib/chewy/query/nodes/has_child.rb +0 -15
- data/lib/chewy/query/nodes/has_parent.rb +0 -15
- data/lib/chewy/query/nodes/has_relation.rb +0 -59
- data/lib/chewy/query/nodes/match_all.rb +0 -11
- data/lib/chewy/query/nodes/missing.rb +0 -20
- data/lib/chewy/query/nodes/not.rb +0 -25
- data/lib/chewy/query/nodes/or.rb +0 -25
- data/lib/chewy/query/nodes/prefix.rb +0 -19
- data/lib/chewy/query/nodes/query.rb +0 -20
- data/lib/chewy/query/nodes/range.rb +0 -63
- data/lib/chewy/query/nodes/raw.rb +0 -15
- data/lib/chewy/query/nodes/regexp.rb +0 -35
- data/lib/chewy/query/nodes/script.rb +0 -20
- data/lib/chewy/query/pagination.rb +0 -25
- data/lib/chewy/query.rb +0 -1142
- data/lib/chewy/search/pagination/will_paginate.rb +0 -43
- data/lib/chewy/search/parameters/types.rb +0 -20
- data/lib/chewy/strategy/resque.rb +0 -27
- data/lib/chewy/strategy/shoryuken.rb +0 -40
- data/lib/chewy/type/actions.rb +0 -43
- data/lib/chewy/type/adapter/mongoid.rb +0 -67
- data/lib/chewy/type/adapter/sequel.rb +0 -93
- data/lib/chewy/type/import/bulk_builder.rb +0 -122
- data/lib/chewy/type/observe.rb +0 -82
- data/lib/chewy/type.rb +0 -117
- data/lib/sequel/plugins/chewy_observe.rb +0 -63
- data/spec/chewy/query/criteria_spec.rb +0 -700
- data/spec/chewy/query/filters_spec.rb +0 -201
- data/spec/chewy/query/loading_spec.rb +0 -124
- data/spec/chewy/query/nodes/and_spec.rb +0 -12
- data/spec/chewy/query/nodes/bool_spec.rb +0 -14
- data/spec/chewy/query/nodes/equal_spec.rb +0 -32
- data/spec/chewy/query/nodes/exists_spec.rb +0 -18
- data/spec/chewy/query/nodes/has_child_spec.rb +0 -59
- data/spec/chewy/query/nodes/has_parent_spec.rb +0 -59
- data/spec/chewy/query/nodes/match_all_spec.rb +0 -11
- data/spec/chewy/query/nodes/missing_spec.rb +0 -16
- data/spec/chewy/query/nodes/not_spec.rb +0 -14
- data/spec/chewy/query/nodes/or_spec.rb +0 -12
- data/spec/chewy/query/nodes/prefix_spec.rb +0 -16
- data/spec/chewy/query/nodes/query_spec.rb +0 -12
- data/spec/chewy/query/nodes/range_spec.rb +0 -32
- data/spec/chewy/query/nodes/raw_spec.rb +0 -11
- data/spec/chewy/query/nodes/regexp_spec.rb +0 -43
- data/spec/chewy/query/nodes/script_spec.rb +0 -15
- data/spec/chewy/query/pagination/kaminari_spec.rb +0 -5
- data/spec/chewy/query/pagination/will_paginate_spec.rb +0 -5
- data/spec/chewy/query/pagination_spec.rb +0 -39
- data/spec/chewy/query_spec.rb +0 -637
- data/spec/chewy/search/pagination/will_paginate_examples.rb +0 -63
- data/spec/chewy/search/pagination/will_paginate_spec.rb +0 -23
- data/spec/chewy/search/parameters/types_spec.rb +0 -5
- data/spec/chewy/strategy/resque_spec.rb +0 -46
- data/spec/chewy/strategy/shoryuken_spec.rb +0 -66
- data/spec/chewy/type/actions_spec.rb +0 -50
- data/spec/chewy/type/adapter/mongoid_spec.rb +0 -372
- data/spec/chewy/type/adapter/sequel_spec.rb +0 -472
- data/spec/chewy/type/import/bulk_builder_spec.rb +0 -279
- data/spec/chewy/type/mapping_spec.rb +0 -173
- data/spec/chewy/type/observe_spec.rb +0 -137
- data/spec/chewy/type/wrapper_spec.rb +0 -98
- data/spec/chewy/type_spec.rb +0 -55
- data/spec/support/mongoid.rb +0 -93
- data/spec/support/sequel.rb +0 -80
data/chewy.gemspec
CHANGED
@@ -1,12 +1,12 @@
|
|
1
|
-
lib = File.expand_path('
|
1
|
+
lib = File.expand_path('lib', __dir__)
|
2
2
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
3
3
|
require 'chewy/version'
|
4
4
|
|
5
|
-
Gem::Specification.new do |spec| # rubocop:disable BlockLength
|
5
|
+
Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
|
6
6
|
spec.name = 'chewy'
|
7
7
|
spec.version = Chewy::VERSION
|
8
|
-
spec.authors = ['pyromaniac']
|
9
|
-
spec.email = ['kinwizard@gmail.com']
|
8
|
+
spec.authors = ['Toptal, LLC', 'pyromaniac']
|
9
|
+
spec.email = ['open-source@toptal.com', 'kinwizard@gmail.com']
|
10
10
|
spec.summary = 'Elasticsearch ODM client wrapper'
|
11
11
|
spec.description = 'Chewy provides functionality for Elasticsearch index handling, documents import mappings and chainable query DSL'
|
12
12
|
spec.homepage = 'https://github.com/toptal/chewy'
|
@@ -17,22 +17,20 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
|
|
17
17
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
18
18
|
spec.require_paths = ['lib']
|
19
19
|
|
20
|
-
spec.add_development_dependency 'appraisal'
|
21
20
|
spec.add_development_dependency 'database_cleaner'
|
22
21
|
spec.add_development_dependency 'elasticsearch-extensions'
|
23
22
|
spec.add_development_dependency 'rake'
|
24
|
-
spec.add_development_dependency '
|
25
|
-
spec.add_development_dependency 'rspec', '~> 3.7.0'
|
23
|
+
spec.add_development_dependency 'rspec', '>= 3.7.0'
|
26
24
|
spec.add_development_dependency 'rspec-collection_matchers'
|
27
25
|
spec.add_development_dependency 'rspec-its'
|
28
|
-
spec.add_development_dependency 'rubocop', '
|
26
|
+
spec.add_development_dependency 'rubocop', '1.11'
|
29
27
|
spec.add_development_dependency 'sqlite3'
|
30
28
|
spec.add_development_dependency 'timecop'
|
31
29
|
|
32
30
|
spec.add_development_dependency 'method_source'
|
33
31
|
spec.add_development_dependency 'unparser'
|
34
32
|
|
35
|
-
spec.add_dependency 'activesupport', '>=
|
36
|
-
spec.add_dependency 'elasticsearch', '>=
|
33
|
+
spec.add_dependency 'activesupport', '>= 5.2'
|
34
|
+
spec.add_dependency 'elasticsearch', '>= 7.12.0', '< 7.14.0'
|
37
35
|
spec.add_dependency 'elasticsearch-dsl'
|
38
36
|
end
|
@@ -1,16 +1,11 @@
|
|
1
|
-
|
1
|
+
source 'https://rubygems.org'
|
2
2
|
|
3
|
-
|
3
|
+
gem 'activejob', '~> 5.2.0'
|
4
|
+
gem 'activerecord', '~> 5.2.0'
|
5
|
+
gem 'activesupport', '~> 5.2.0'
|
6
|
+
gem 'kaminari-core', '~> 1.1.0', require: false
|
7
|
+
gem 'parallel', require: false
|
8
|
+
gem 'rspec_junit_formatter', '~> 0.4.1'
|
9
|
+
gem 'sidekiq', require: false
|
4
10
|
|
5
|
-
|
6
|
-
gem "activesupport", "~> 5.2.0"
|
7
|
-
gem "activejob", "~> 5.2.0"
|
8
|
-
gem "resque", require: false
|
9
|
-
gem "shoryuken", require: false
|
10
|
-
gem "aws-sdk-sqs", require: false
|
11
|
-
gem "sidekiq", require: false
|
12
|
-
gem "kaminari-core", "~> 1.1.0", require: false
|
13
|
-
gem "will_paginate", require: false
|
14
|
-
gem "parallel", require: false
|
15
|
-
|
16
|
-
gemspec path: "../"
|
11
|
+
gemspec path: '../'
|
@@ -0,0 +1,11 @@
|
|
1
|
+
source 'https://rubygems.org'
|
2
|
+
|
3
|
+
gem 'activejob', '~> 6.0.0'
|
4
|
+
gem 'activerecord', '~> 6.0.0'
|
5
|
+
gem 'activesupport', '~> 6.0.0'
|
6
|
+
gem 'kaminari-core', '~> 1.1.0', require: false
|
7
|
+
gem 'parallel', require: false
|
8
|
+
gem 'rspec_junit_formatter', '~> 0.4.1'
|
9
|
+
gem 'sidekiq', require: false
|
10
|
+
|
11
|
+
gemspec path: '../'
|
@@ -0,0 +1,13 @@
|
|
1
|
+
source 'https://rubygems.org'
|
2
|
+
|
3
|
+
gem 'activejob', '~> 6.1.0'
|
4
|
+
gem 'activerecord', '~> 6.1.0'
|
5
|
+
gem 'activesupport', '~> 6.1.0'
|
6
|
+
gem 'kaminari-core', '~> 1.1.0', require: false
|
7
|
+
gem 'parallel', require: false
|
8
|
+
gem 'rspec_junit_formatter', '~> 0.4.1'
|
9
|
+
gem 'sidekiq', require: false
|
10
|
+
|
11
|
+
gem 'rexml' if RUBY_VERSION >= '3.0.0'
|
12
|
+
|
13
|
+
gemspec path: '../'
|
@@ -0,0 +1,13 @@
|
|
1
|
+
source 'https://rubygems.org'
|
2
|
+
|
3
|
+
gem 'activejob', '~> 7.0.0'
|
4
|
+
gem 'activerecord', '~> 7.0.0'
|
5
|
+
gem 'activesupport', '~> 7.0.0'
|
6
|
+
gem 'kaminari-core', '~> 1.1.0', require: false
|
7
|
+
gem 'parallel', require: false
|
8
|
+
gem 'rspec_junit_formatter', '~> 0.4.1'
|
9
|
+
gem 'sidekiq', require: false
|
10
|
+
|
11
|
+
gem 'rexml' if RUBY_VERSION >= '3.0.0'
|
12
|
+
|
13
|
+
gemspec path: '../'
|
data/lib/chewy/config.rb
CHANGED
@@ -3,55 +3,46 @@ module Chewy
|
|
3
3
|
include Singleton
|
4
4
|
|
5
5
|
attr_accessor :settings, :logger,
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
# https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
|
43
|
-
:reset_no_replicas,
|
44
|
-
# Refresh or not when import async (sidekiq, resque, activejob)
|
45
|
-
:disable_refresh_async,
|
46
|
-
# Default options for root of Chewy type. Allows to set default options
|
47
|
-
# for type mappings like `_all`.
|
48
|
-
:default_root_options,
|
49
|
-
# Default field type for any field in any Chewy type. Defaults to 'string'.
|
50
|
-
:default_field_type
|
6
|
+
# The first strategy in stack. `:base` by default.
|
7
|
+
# If you need to return to the previous chewy behavior -
|
8
|
+
# just set it to `:bypass`
|
9
|
+
#
|
10
|
+
:root_strategy,
|
11
|
+
# Default request strategy middleware, used in e.g
|
12
|
+
# Rails controllers. See Chewy::Railtie::RequestStrategy
|
13
|
+
# for more info.
|
14
|
+
#
|
15
|
+
:request_strategy,
|
16
|
+
# Rails console strategy, `:urgent` by default.
|
17
|
+
#
|
18
|
+
:console_strategy,
|
19
|
+
# Use after_commit callbacks for RDBMS instead of
|
20
|
+
# after_save and after_destroy. True by default. Useful
|
21
|
+
# in tests with transactional fixtures or transactional
|
22
|
+
# DatabaseCleaner strategy.
|
23
|
+
#
|
24
|
+
:use_after_commit_callbacks,
|
25
|
+
# Where Chewy expects to find index definitions
|
26
|
+
# within a Rails app folder.
|
27
|
+
:indices_path,
|
28
|
+
# Set index refresh_interval setting to -1 before reset and put the original value after.
|
29
|
+
# If setting not present, put back to default 1s
|
30
|
+
# https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
|
31
|
+
:reset_disable_refresh_interval,
|
32
|
+
# Set number_of_replicas to 0 before reset and put the original value after
|
33
|
+
# https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
|
34
|
+
:reset_no_replicas,
|
35
|
+
# Refresh or not when import async (sidekiq, lazy_sidekiq, activejob)
|
36
|
+
:disable_refresh_async,
|
37
|
+
# Default options for root of Chewy type. Allows to set default options
|
38
|
+
# for type mappings like `_all`.
|
39
|
+
:default_root_options,
|
40
|
+
# Default field type for any field in any Chewy type. Defaults to 'text'.
|
41
|
+
:default_field_type
|
51
42
|
|
52
43
|
attr_reader :transport_logger, :transport_tracer,
|
53
|
-
|
54
|
-
|
44
|
+
# Chewy search request DSL base class, used by every index.
|
45
|
+
:search_class
|
55
46
|
|
56
47
|
def self.delegated
|
57
48
|
public_instance_methods - superclass.public_instance_methods - Singleton.public_instance_methods
|
@@ -59,10 +50,9 @@ module Chewy
|
|
59
50
|
|
60
51
|
def initialize
|
61
52
|
@settings = {}
|
62
|
-
@query_mode = :must
|
63
|
-
@filter_mode = :and
|
64
53
|
@root_strategy = :base
|
65
54
|
@request_strategy = :atomic
|
55
|
+
@console_strategy = :urgent
|
66
56
|
@use_after_commit_callbacks = true
|
67
57
|
@reset_disable_refresh_interval = false
|
68
58
|
@reset_no_replicas = false
|
@@ -70,7 +60,7 @@ module Chewy
|
|
70
60
|
@indices_path = 'app/chewy'
|
71
61
|
@default_root_options = {}
|
72
62
|
@default_field_type = 'text'.freeze
|
73
|
-
|
63
|
+
@search_class = build_search_class(Chewy::Search::Request)
|
74
64
|
end
|
75
65
|
|
76
66
|
def transport_logger=(logger)
|
@@ -83,10 +73,6 @@ module Chewy
|
|
83
73
|
@transport_tracer = tracer
|
84
74
|
end
|
85
75
|
|
86
|
-
def search_class=(base)
|
87
|
-
@search_class = build_search_class(base)
|
88
|
-
end
|
89
|
-
|
90
76
|
# Chewy core configurations. There is two ways to set it up:
|
91
77
|
# use `Chewy.settings=` method or, for Rails application,
|
92
78
|
# create `config/chewy.yml` file. Btw, `config/chewy.yml` supports
|
@@ -147,7 +133,7 @@ module Chewy
|
|
147
133
|
|
148
134
|
if File.exist?(file)
|
149
135
|
yaml = ERB.new(File.read(file)).result
|
150
|
-
hash = YAML.load(yaml) # rubocop:disable Security/YAMLLoad
|
136
|
+
hash = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(yaml) : YAML.load(yaml) # rubocop:disable Security/YAMLLoad
|
151
137
|
hash[Rails.env].try(:deep_symbolize_keys) if hash
|
152
138
|
end
|
153
139
|
end || {}
|
@@ -156,11 +142,7 @@ module Chewy
|
|
156
142
|
|
157
143
|
def build_search_class(base)
|
158
144
|
Class.new(base).tap do |search_class|
|
159
|
-
if defined?(::Kaminari)
|
160
|
-
search_class.send :include, Chewy::Search::Pagination::Kaminari
|
161
|
-
elsif defined?(::WillPaginate)
|
162
|
-
search_class.send :include, Chewy::Search::Pagination::WillPaginate
|
163
|
-
end
|
145
|
+
search_class.send :include, Chewy::Search::Pagination::Kaminari if defined?(::Kaminari)
|
164
146
|
end
|
165
147
|
end
|
166
148
|
end
|
data/lib/chewy/errors.rb
CHANGED
@@ -5,12 +5,6 @@ module Chewy
|
|
5
5
|
class UndefinedIndex < Error
|
6
6
|
end
|
7
7
|
|
8
|
-
class UndefinedType < Error
|
9
|
-
end
|
10
|
-
|
11
|
-
class UnderivableType < Error
|
12
|
-
end
|
13
|
-
|
14
8
|
class UndefinedUpdateStrategy < Error
|
15
9
|
def initialize(_type)
|
16
10
|
super <<-MESSAGE
|
@@ -37,9 +31,9 @@ module Chewy
|
|
37
31
|
end
|
38
32
|
end
|
39
33
|
|
40
|
-
class
|
41
|
-
|
42
|
-
|
43
|
-
|
34
|
+
class InvalidJoinFieldType < Error
|
35
|
+
def initialize(join_field_type, join_field_name, relations)
|
36
|
+
super("`#{join_field_type}` set for the join field `#{join_field_name}` is not on the :relations list (#{relations})")
|
37
|
+
end
|
44
38
|
end
|
45
39
|
end
|
data/lib/chewy/fields/base.rb
CHANGED
@@ -1,18 +1,20 @@
|
|
1
1
|
module Chewy
|
2
2
|
module Fields
|
3
3
|
class Base
|
4
|
-
attr_reader :name, :
|
5
|
-
attr_accessor :parent
|
4
|
+
attr_reader :name, :join_options, :options, :children
|
5
|
+
attr_accessor :parent # used by Chewy::Index::Mapping to expand nested fields
|
6
6
|
|
7
7
|
def initialize(name, value: nil, **options)
|
8
8
|
@name = name.to_sym
|
9
9
|
@options = {}
|
10
|
-
update_options!(options)
|
10
|
+
update_options!(**options)
|
11
11
|
@value = value
|
12
12
|
@children = []
|
13
|
+
@allowed_relations = find_allowed_relations(options[:relations]) # for join fields
|
13
14
|
end
|
14
15
|
|
15
16
|
def update_options!(**options)
|
17
|
+
@join_options = options.delete(:join) || {}
|
16
18
|
@options = options
|
17
19
|
end
|
18
20
|
|
@@ -31,21 +33,17 @@ module Chewy
|
|
31
33
|
else
|
32
34
|
{}
|
33
35
|
end
|
34
|
-
mapping.reverse_merge!(options)
|
36
|
+
mapping.reverse_merge!(options.except(:ignore_blank))
|
35
37
|
mapping.reverse_merge!(type: (children.present? ? 'object' : Chewy.default_field_type))
|
36
38
|
|
37
|
-
# This is done to support ES2 journaling and will be removed soon
|
38
|
-
if mapping[:type] == 'keyword' && Chewy::Runtime.version < '5.0'
|
39
|
-
mapping[:type] = 'string'
|
40
|
-
mapping[:index] = 'not_analyzed'
|
41
|
-
end
|
42
|
-
|
43
39
|
{name => mapping}
|
44
40
|
end
|
45
41
|
|
46
42
|
def compose(*objects)
|
47
43
|
result = evaluate(objects)
|
48
44
|
|
45
|
+
return {} if result.blank? && ignore_blank?
|
46
|
+
|
49
47
|
if children.present? && !multi_field?
|
50
48
|
result = if result.respond_to?(:to_ary)
|
51
49
|
result.to_ary.map { |item| compose_children(item, *objects) }
|
@@ -57,22 +55,70 @@ module Chewy
|
|
57
55
|
{name => result}
|
58
56
|
end
|
59
57
|
|
58
|
+
def value
|
59
|
+
if join_field?
|
60
|
+
join_type = join_options[:type]
|
61
|
+
join_id = join_options[:id]
|
62
|
+
# memoize
|
63
|
+
@value ||= proc do |object|
|
64
|
+
validate_join_type!(value_by_name_proc(join_type).call(object))
|
65
|
+
# If it's a join field and it has join_id, the value is compound and contains
|
66
|
+
# both name (type) and id of the parent object
|
67
|
+
if value_by_name_proc(join_id).call(object).present?
|
68
|
+
{
|
69
|
+
name: value_by_name_proc(join_type).call(object), # parent type
|
70
|
+
parent: value_by_name_proc(join_id).call(object) # parent id
|
71
|
+
}
|
72
|
+
else
|
73
|
+
value_by_name_proc(join_type).call(object)
|
74
|
+
end
|
75
|
+
end
|
76
|
+
else
|
77
|
+
@value
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
60
81
|
private
|
61
82
|
|
62
|
-
def
|
63
|
-
|
83
|
+
def geo_point?
|
84
|
+
@options[:type].to_s == 'geo_point'
|
85
|
+
end
|
64
86
|
|
87
|
+
def join_field?
|
88
|
+
@options[:type].to_s == 'join'
|
89
|
+
end
|
90
|
+
|
91
|
+
def ignore_blank?
|
92
|
+
@options.fetch(:ignore_blank) { geo_point? }
|
93
|
+
end
|
94
|
+
|
95
|
+
def evaluate(objects)
|
65
96
|
if value.is_a?(Proc)
|
66
|
-
|
67
|
-
object.instance_exec(&value)
|
68
|
-
elsif value.arity < 0
|
69
|
-
value.call(*object)
|
70
|
-
else
|
71
|
-
value.call(*objects.first(value.arity))
|
72
|
-
end
|
97
|
+
value_by_proc(objects, value)
|
73
98
|
else
|
74
|
-
|
99
|
+
value_by_name(objects, value)
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
def value_by_proc(objects, value)
|
104
|
+
object = objects.first
|
105
|
+
if value.arity.zero?
|
106
|
+
object.instance_exec(&value)
|
107
|
+
elsif value.arity.negative?
|
108
|
+
value.call(*object)
|
109
|
+
else
|
110
|
+
value.call(*objects.first(value.arity))
|
111
|
+
end
|
112
|
+
end
|
75
113
|
|
114
|
+
def value_by_name(objects, value)
|
115
|
+
object = objects.first
|
116
|
+
message = value.is_a?(Symbol) || value.is_a?(String) ? value.to_sym : name
|
117
|
+
value_by_name_proc(message).call(object)
|
118
|
+
end
|
119
|
+
|
120
|
+
def value_by_name_proc(message)
|
121
|
+
proc do |object|
|
76
122
|
if object.is_a?(Hash)
|
77
123
|
if object.key?(message)
|
78
124
|
object[message]
|
@@ -85,6 +131,20 @@ module Chewy
|
|
85
131
|
end
|
86
132
|
end
|
87
133
|
|
134
|
+
def validate_join_type!(type)
|
135
|
+
return unless type
|
136
|
+
return if @allowed_relations.include?(type.to_sym)
|
137
|
+
|
138
|
+
raise Chewy::InvalidJoinFieldType.new(type, @name, options[:relations])
|
139
|
+
end
|
140
|
+
|
141
|
+
def find_allowed_relations(relations)
|
142
|
+
return [] unless relations
|
143
|
+
return relations unless relations.is_a?(Hash)
|
144
|
+
|
145
|
+
(relations.keys + relations.values).flatten.uniq
|
146
|
+
end
|
147
|
+
|
88
148
|
def compose_children(value, *parent_objects)
|
89
149
|
return unless value
|
90
150
|
|
data/lib/chewy/fields/root.rb
CHANGED
@@ -1,13 +1,10 @@
|
|
1
1
|
module Chewy
|
2
2
|
module Fields
|
3
3
|
class Root < Chewy::Fields::Base
|
4
|
-
attr_reader :dynamic_templates
|
5
|
-
attr_reader :id
|
6
|
-
attr_reader :parent
|
7
|
-
attr_reader :parent_id
|
4
|
+
attr_reader :dynamic_templates, :id
|
8
5
|
|
9
|
-
def initialize(
|
10
|
-
super
|
6
|
+
def initialize(name, **options)
|
7
|
+
super(name, **options)
|
11
8
|
|
12
9
|
@value ||= -> { self }
|
13
10
|
@dynamic_templates = []
|
@@ -15,9 +12,7 @@ module Chewy
|
|
15
12
|
|
16
13
|
def update_options!(**options)
|
17
14
|
@id = options.fetch(:id, options.fetch(:_id, @id))
|
18
|
-
@
|
19
|
-
@parent_id = options.fetch(:parent_id, @parent_id)
|
20
|
-
@options.merge!(options.except(:id, :_id, :parent, :_parent, :parent_id, :type))
|
15
|
+
@options.merge!(options.except(:id, :_id, :type))
|
21
16
|
end
|
22
17
|
|
23
18
|
def mappings_hash
|
@@ -29,11 +24,10 @@ module Chewy
|
|
29
24
|
mappings[name][:dynamic_templates].concat dynamic_templates
|
30
25
|
end
|
31
26
|
|
32
|
-
mappings[name]
|
33
|
-
mappings
|
27
|
+
mappings[name]
|
34
28
|
end
|
35
29
|
|
36
|
-
def dynamic_template(*args)
|
30
|
+
ruby2_keywords def dynamic_template(*args)
|
37
31
|
options = args.extract_options!.deep_symbolize_keys
|
38
32
|
if args.first
|
39
33
|
template_name = :"template_#{dynamic_templates.count.next}"
|
@@ -54,13 +48,9 @@ module Chewy
|
|
54
48
|
end
|
55
49
|
end
|
56
50
|
|
57
|
-
def compose_parent(object)
|
58
|
-
return unless parent_id
|
59
|
-
parent_id.arity.zero? ? object.instance_exec(&parent_id) : parent_id.call(object)
|
60
|
-
end
|
61
|
-
|
62
51
|
def compose_id(object)
|
63
52
|
return unless id
|
53
|
+
|
64
54
|
id.arity.zero? ? object.instance_exec(&id) : id.call(object)
|
65
55
|
end
|
66
56
|
|
data/lib/chewy/index/actions.rb
CHANGED
@@ -30,8 +30,8 @@ module Chewy
|
|
30
30
|
# Suffixed index names might be used for zero-downtime mapping change, for example.
|
31
31
|
# Description: (http://www.elasticsearch.org/blog/changing-mapping-with-zero-downtime/).
|
32
32
|
#
|
33
|
-
def create(*args)
|
34
|
-
create!(*args)
|
33
|
+
def create(*args, **kwargs)
|
34
|
+
create!(*args, **kwargs)
|
35
35
|
rescue Elasticsearch::Transport::Transport::Errors::BadRequest
|
36
36
|
false
|
37
37
|
end
|
@@ -74,7 +74,13 @@ module Chewy
|
|
74
74
|
# UsersIndex.delete '01-2014' # deletes `users_01-2014` index
|
75
75
|
#
|
76
76
|
def delete(suffix = nil)
|
77
|
-
|
77
|
+
# Verify that the index_name is really the index_name and not an alias.
|
78
|
+
#
|
79
|
+
# "The index parameter in the delete index API no longer accepts alias names.
|
80
|
+
# Instead, it accepts only index names (or wildcards which will expand to matching indices)."
|
81
|
+
# https://www.elastic.co/guide/en/elasticsearch/reference/6.8/breaking-changes-6.0.html#_delete_index_api_resolves_indices_expressions_only_against_indices
|
82
|
+
index_names = client.indices.get_alias(index: index_name(suffix: suffix)).keys
|
83
|
+
result = client.indices.delete index: index_names.join(',')
|
78
84
|
Chewy.wait_for_status if result
|
79
85
|
result
|
80
86
|
# es-ruby >= 1.0.10 handles Elasticsearch::Transport::Transport::Errors::NotFound
|
@@ -123,35 +129,6 @@ module Chewy
|
|
123
129
|
create! suffix
|
124
130
|
end
|
125
131
|
|
126
|
-
# Perform import operation for every defined type
|
127
|
-
#
|
128
|
-
# UsersIndex.import # imports default data for every index type
|
129
|
-
# UsersIndex.import user: User.active # imports specified objects for user type and default data for other types
|
130
|
-
# UsersIndex.import refresh: false # to disable index refreshing after import
|
131
|
-
# UsersIndex.import suffix: Time.now.to_i # imports data to index with specified suffix if such is exists
|
132
|
-
# UsersIndex.import batch_size: 300 # import batch size
|
133
|
-
#
|
134
|
-
# See [import.rb](lib/chewy/type/import.rb) for more details.
|
135
|
-
#
|
136
|
-
%i[import import!].each do |method|
|
137
|
-
class_eval <<-METHOD, __FILE__, __LINE__ + 1
|
138
|
-
def #{method}(*args)
|
139
|
-
options = args.extract_options!
|
140
|
-
if args.one? && type_names.one?
|
141
|
-
objects = {type_names.first.to_sym => args.first}
|
142
|
-
elsif args.one?
|
143
|
-
fail ArgumentError, "Please pass objects for `#{method}` as a hash with type names"
|
144
|
-
else
|
145
|
-
objects = options.reject { |k, v| !type_names.map(&:to_sym).include?(k) }
|
146
|
-
end
|
147
|
-
types.map do |type|
|
148
|
-
args = [objects[type.type_name.to_sym], options.dup].reject(&:blank?)
|
149
|
-
type.#{method} *args
|
150
|
-
end.all?
|
151
|
-
end
|
152
|
-
METHOD
|
153
|
-
end
|
154
|
-
|
155
132
|
# Deletes, creates and imports data to the index. Returns the
|
156
133
|
# import result. If index name suffix is passed as the first
|
157
134
|
# argument - performs zero-downtime index resetting.
|
@@ -172,14 +149,18 @@ module Chewy
|
|
172
149
|
def reset!(suffix = nil, apply_journal: true, journal: false, **import_options)
|
173
150
|
result = if suffix.present?
|
174
151
|
start_time = Time.now
|
175
|
-
indexes = self.indexes
|
152
|
+
indexes = self.indexes - [index_name]
|
176
153
|
create! suffix, alias: false
|
177
154
|
|
178
155
|
general_name = index_name
|
179
156
|
suffixed_name = index_name(suffix: suffix)
|
180
157
|
|
181
158
|
optimize_index_settings suffixed_name
|
182
|
-
result = import
|
159
|
+
result = import(**import_options.merge(
|
160
|
+
suffix: suffix,
|
161
|
+
journal: journal,
|
162
|
+
refresh: !Chewy.reset_disable_refresh_interval
|
163
|
+
))
|
183
164
|
original_index_settings suffixed_name
|
184
165
|
|
185
166
|
delete if indexes.blank?
|
@@ -195,12 +176,13 @@ module Chewy
|
|
195
176
|
result
|
196
177
|
else
|
197
178
|
purge!
|
198
|
-
import
|
179
|
+
import(**import_options.merge(journal: journal))
|
199
180
|
end
|
200
181
|
|
201
182
|
specification.lock!
|
202
183
|
result
|
203
184
|
end
|
185
|
+
alias_method :reset, :reset!
|
204
186
|
|
205
187
|
# A {Chewy::Journal} instance for the particular index
|
206
188
|
#
|
@@ -209,6 +191,50 @@ module Chewy
|
|
209
191
|
@journal ||= Chewy::Journal.new(self)
|
210
192
|
end
|
211
193
|
|
194
|
+
def clear_cache(args = {index: index_name})
|
195
|
+
client.indices.clear_cache(args)
|
196
|
+
end
|
197
|
+
|
198
|
+
def reindex(source: index_name, dest: index_name)
|
199
|
+
client.reindex(
|
200
|
+
{
|
201
|
+
body:
|
202
|
+
{
|
203
|
+
source: {index: source},
|
204
|
+
dest: {index: dest}
|
205
|
+
}
|
206
|
+
}
|
207
|
+
)
|
208
|
+
end
|
209
|
+
|
210
|
+
# Adds new fields to an existing data stream or index.
|
211
|
+
# Change the search settings of existing fields.
|
212
|
+
#
|
213
|
+
# @example
|
214
|
+
# Chewy.client.update_mapping('cities', {properties: {new_field: {type: :text}}})
|
215
|
+
#
|
216
|
+
def update_mapping(name = index_name, body = root.mappings_hash)
|
217
|
+
client.indices.put_mapping(
|
218
|
+
index: name,
|
219
|
+
body: body
|
220
|
+
)['acknowledged']
|
221
|
+
end
|
222
|
+
|
223
|
+
# Performs missing and outdated objects synchronization for the current index.
|
224
|
+
#
|
225
|
+
# @example
|
226
|
+
# UsersIndex.sync
|
227
|
+
#
|
228
|
+
# @see Chewy::Index::Syncer
|
229
|
+
# @param parallel [true, Integer, Hash] options for parallel execution or the number of processes
|
230
|
+
# @return [Hash{Symbol, Object}, nil] a number of missing and outdated documents re-indexed and their ids,
|
231
|
+
# nil in case of errors
|
232
|
+
def sync(parallel: nil)
|
233
|
+
syncer = Syncer.new(self, parallel: parallel)
|
234
|
+
count = syncer.perform
|
235
|
+
{count: count, missing: syncer.missing_ids, outdated: syncer.outdated_ids} if count
|
236
|
+
end
|
237
|
+
|
212
238
|
private
|
213
239
|
|
214
240
|
def optimize_index_settings(index_name)
|
@@ -234,6 +260,7 @@ module Chewy
|
|
234
260
|
|
235
261
|
def index_settings(setting_name)
|
236
262
|
return {} unless settings_hash.key?(:settings) && settings_hash[:settings].key?(:index)
|
263
|
+
|
237
264
|
settings_hash[:settings][:index].slice(setting_name)
|
238
265
|
end
|
239
266
|
end
|