chewy 0.8.4 → 5.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.gitignore +1 -0
- data/.rubocop.yml +56 -0
- data/.rubocop_todo.yml +44 -0
- data/.travis.yml +36 -67
- data/.yardopts +5 -0
- data/Appraisals +63 -58
- data/CHANGELOG.md +168 -11
- data/Gemfile +16 -9
- data/Guardfile +5 -5
- data/LEGACY_DSL.md +497 -0
- data/README.md +403 -470
- data/Rakefile +11 -1
- data/chewy.gemspec +12 -15
- data/gemfiles/rails.4.0.activerecord.gemfile +9 -9
- data/gemfiles/rails.4.1.activerecord.gemfile +9 -9
- data/gemfiles/rails.4.2.activerecord.gemfile +8 -8
- data/gemfiles/rails.4.2.mongoid.5.2.gemfile +16 -0
- data/gemfiles/rails.5.0.activerecord.gemfile +16 -0
- data/gemfiles/rails.5.0.mongoid.6.1.gemfile +16 -0
- data/gemfiles/rails.5.1.activerecord.gemfile +16 -0
- data/gemfiles/rails.5.1.mongoid.6.3.gemfile +16 -0
- data/gemfiles/rails.5.2.activerecord.gemfile +16 -0
- data/gemfiles/sequel.4.45.gemfile +11 -0
- data/lib/chewy/backports/deep_dup.rb +1 -1
- data/lib/chewy/backports/duplicable.rb +1 -0
- data/lib/chewy/config.rb +53 -21
- data/lib/chewy/errors.rb +6 -6
- data/lib/chewy/fields/base.rb +59 -29
- data/lib/chewy/fields/root.rb +49 -14
- data/lib/chewy/index/actions.rb +95 -36
- data/lib/chewy/index/aliases.rb +2 -1
- data/lib/chewy/index/settings.rb +10 -5
- data/lib/chewy/index/specification.rb +60 -0
- data/lib/chewy/index.rb +239 -138
- data/lib/chewy/journal.rb +55 -0
- data/lib/chewy/log_subscriber.rb +8 -8
- data/lib/chewy/minitest/helpers.rb +77 -0
- data/lib/chewy/minitest/search_index_receiver.rb +80 -0
- data/lib/chewy/minitest.rb +1 -0
- data/lib/chewy/query/compose.rb +18 -19
- data/lib/chewy/query/criteria.rb +34 -24
- data/lib/chewy/query/filters.rb +28 -11
- data/lib/chewy/query/loading.rb +3 -4
- data/lib/chewy/query/nodes/and.rb +1 -1
- data/lib/chewy/query/nodes/base.rb +1 -1
- data/lib/chewy/query/nodes/bool.rb +6 -4
- data/lib/chewy/query/nodes/equal.rb +4 -4
- data/lib/chewy/query/nodes/exists.rb +1 -1
- data/lib/chewy/query/nodes/expr.rb +2 -2
- data/lib/chewy/query/nodes/field.rb +35 -31
- data/lib/chewy/query/nodes/has_child.rb +1 -0
- data/lib/chewy/query/nodes/has_parent.rb +1 -0
- data/lib/chewy/query/nodes/has_relation.rb +10 -12
- data/lib/chewy/query/nodes/missing.rb +1 -1
- data/lib/chewy/query/nodes/not.rb +1 -1
- data/lib/chewy/query/nodes/or.rb +1 -1
- data/lib/chewy/query/nodes/prefix.rb +3 -2
- data/lib/chewy/query/nodes/query.rb +1 -1
- data/lib/chewy/query/nodes/range.rb +9 -9
- data/lib/chewy/query/nodes/raw.rb +1 -1
- data/lib/chewy/query/nodes/regexp.rb +13 -9
- data/lib/chewy/query/nodes/script.rb +4 -4
- data/lib/chewy/query/pagination.rb +10 -1
- data/lib/chewy/query.rb +286 -170
- data/lib/chewy/railtie.rb +7 -6
- data/lib/chewy/rake_helper.rb +275 -37
- data/lib/chewy/repository.rb +2 -2
- data/lib/chewy/rspec/update_index.rb +70 -65
- data/lib/chewy/rspec.rb +1 -1
- data/lib/chewy/runtime/version.rb +4 -4
- data/lib/chewy/search/loader.rb +83 -0
- data/lib/chewy/{query → search}/pagination/kaminari.rb +13 -5
- data/lib/chewy/search/pagination/will_paginate.rb +43 -0
- data/lib/chewy/search/parameters/aggs.rb +16 -0
- data/lib/chewy/search/parameters/allow_partial_search_results.rb +27 -0
- data/lib/chewy/search/parameters/concerns/bool_storage.rb +24 -0
- data/lib/chewy/search/parameters/concerns/hash_storage.rb +23 -0
- data/lib/chewy/search/parameters/concerns/integer_storage.rb +14 -0
- data/lib/chewy/search/parameters/concerns/query_storage.rb +238 -0
- data/lib/chewy/search/parameters/concerns/string_array_storage.rb +23 -0
- data/lib/chewy/search/parameters/concerns/string_storage.rb +14 -0
- data/lib/chewy/search/parameters/docvalue_fields.rb +12 -0
- data/lib/chewy/search/parameters/explain.rb +16 -0
- data/lib/chewy/search/parameters/filter.rb +47 -0
- data/lib/chewy/search/parameters/highlight.rb +16 -0
- data/lib/chewy/search/parameters/indices.rb +123 -0
- data/lib/chewy/search/parameters/indices_boost.rb +52 -0
- data/lib/chewy/search/parameters/limit.rb +17 -0
- data/lib/chewy/search/parameters/load.rb +32 -0
- data/lib/chewy/search/parameters/min_score.rb +16 -0
- data/lib/chewy/search/parameters/none.rb +27 -0
- data/lib/chewy/search/parameters/offset.rb +17 -0
- data/lib/chewy/search/parameters/order.rb +64 -0
- data/lib/chewy/search/parameters/post_filter.rb +19 -0
- data/lib/chewy/search/parameters/preference.rb +16 -0
- data/lib/chewy/search/parameters/profile.rb +16 -0
- data/lib/chewy/search/parameters/query.rb +19 -0
- data/lib/chewy/search/parameters/request_cache.rb +27 -0
- data/lib/chewy/search/parameters/rescore.rb +29 -0
- data/lib/chewy/search/parameters/script_fields.rb +16 -0
- data/lib/chewy/search/parameters/search_after.rb +20 -0
- data/lib/chewy/search/parameters/search_type.rb +16 -0
- data/lib/chewy/search/parameters/source.rb +73 -0
- data/lib/chewy/search/parameters/storage.rb +95 -0
- data/lib/chewy/search/parameters/stored_fields.rb +63 -0
- data/lib/chewy/search/parameters/suggest.rb +16 -0
- data/lib/chewy/search/parameters/terminate_after.rb +16 -0
- data/lib/chewy/search/parameters/timeout.rb +16 -0
- data/lib/chewy/search/parameters/track_scores.rb +16 -0
- data/lib/chewy/search/parameters/types.rb +20 -0
- data/lib/chewy/search/parameters/version.rb +16 -0
- data/lib/chewy/search/parameters.rb +167 -0
- data/lib/chewy/search/query_proxy.rb +257 -0
- data/lib/chewy/search/request.rb +1045 -0
- data/lib/chewy/search/response.rb +119 -0
- data/lib/chewy/search/scoping.rb +50 -0
- data/lib/chewy/search/scrolling.rb +134 -0
- data/lib/chewy/search.rb +81 -26
- data/lib/chewy/stash.rb +79 -0
- data/lib/chewy/strategy/active_job.rb +1 -0
- data/lib/chewy/strategy/atomic.rb +2 -4
- data/lib/chewy/strategy/base.rb +4 -4
- data/lib/chewy/strategy/bypass.rb +1 -2
- data/lib/chewy/strategy/resque.rb +1 -0
- data/lib/chewy/strategy/shoryuken.rb +40 -0
- data/lib/chewy/strategy/sidekiq.rb +13 -1
- data/lib/chewy/strategy/urgent.rb +1 -1
- data/lib/chewy/strategy.rb +19 -10
- data/lib/chewy/type/actions.rb +26 -2
- data/lib/chewy/type/adapter/active_record.rb +50 -24
- data/lib/chewy/type/adapter/base.rb +29 -9
- data/lib/chewy/type/adapter/mongoid.rb +19 -10
- data/lib/chewy/type/adapter/object.rb +195 -31
- data/lib/chewy/type/adapter/orm.rb +69 -33
- data/lib/chewy/type/adapter/sequel.rb +37 -19
- data/lib/chewy/type/crutch.rb +5 -4
- data/lib/chewy/type/import/bulk_builder.rb +122 -0
- data/lib/chewy/type/import/bulk_request.rb +78 -0
- data/lib/chewy/type/import/journal_builder.rb +45 -0
- data/lib/chewy/type/import/routine.rb +138 -0
- data/lib/chewy/type/import.rb +150 -176
- data/lib/chewy/type/mapping.rb +58 -42
- data/lib/chewy/type/observe.rb +21 -15
- data/lib/chewy/type/syncer.rb +222 -0
- data/lib/chewy/type/witchcraft.rb +89 -34
- data/lib/chewy/type/wrapper.rb +48 -16
- data/lib/chewy/type.rb +77 -49
- data/lib/chewy/version.rb +1 -1
- data/lib/chewy.rb +95 -52
- data/lib/generators/chewy/install_generator.rb +3 -3
- data/lib/sequel/plugins/chewy_observe.rb +4 -19
- data/lib/tasks/chewy.rake +91 -28
- data/spec/chewy/config_spec.rb +130 -12
- data/spec/chewy/fields/base_spec.rb +194 -172
- data/spec/chewy/fields/root_spec.rb +123 -17
- data/spec/chewy/fields/time_fields_spec.rb +10 -9
- data/spec/chewy/index/actions_spec.rb +228 -43
- data/spec/chewy/index/aliases_spec.rb +2 -2
- data/spec/chewy/index/settings_spec.rb +100 -49
- data/spec/chewy/index/specification_spec.rb +169 -0
- data/spec/chewy/index_spec.rb +159 -63
- data/spec/chewy/journal_spec.rb +268 -0
- data/spec/chewy/minitest/helpers_spec.rb +90 -0
- data/spec/chewy/minitest/search_index_receiver_spec.rb +120 -0
- data/spec/chewy/query/criteria_spec.rb +503 -236
- data/spec/chewy/query/filters_spec.rb +96 -68
- data/spec/chewy/query/loading_spec.rb +80 -42
- data/spec/chewy/query/nodes/and_spec.rb +3 -7
- data/spec/chewy/query/nodes/bool_spec.rb +5 -13
- data/spec/chewy/query/nodes/equal_spec.rb +20 -20
- data/spec/chewy/query/nodes/exists_spec.rb +7 -7
- data/spec/chewy/query/nodes/has_child_spec.rb +42 -23
- data/spec/chewy/query/nodes/has_parent_spec.rb +42 -23
- data/spec/chewy/query/nodes/match_all_spec.rb +2 -2
- data/spec/chewy/query/nodes/missing_spec.rb +6 -5
- data/spec/chewy/query/nodes/not_spec.rb +5 -7
- data/spec/chewy/query/nodes/or_spec.rb +3 -7
- data/spec/chewy/query/nodes/prefix_spec.rb +6 -6
- data/spec/chewy/query/nodes/query_spec.rb +3 -3
- data/spec/chewy/query/nodes/range_spec.rb +19 -19
- data/spec/chewy/query/nodes/raw_spec.rb +2 -2
- data/spec/chewy/query/nodes/regexp_spec.rb +31 -19
- data/spec/chewy/query/nodes/script_spec.rb +5 -5
- data/spec/chewy/query/pagination/kaminari_spec.rb +3 -55
- data/spec/chewy/query/pagination/will_paginate_spec.rb +5 -0
- data/spec/chewy/query/pagination_spec.rb +25 -22
- data/spec/chewy/query_spec.rb +510 -505
- data/spec/chewy/rake_helper_spec.rb +381 -0
- data/spec/chewy/repository_spec.rb +8 -8
- data/spec/chewy/rspec/update_index_spec.rb +215 -113
- data/spec/chewy/runtime_spec.rb +2 -2
- data/spec/chewy/search/loader_spec.rb +117 -0
- data/spec/chewy/search/pagination/kaminari_examples.rb +71 -0
- data/spec/chewy/search/pagination/kaminari_spec.rb +21 -0
- data/spec/chewy/search/pagination/will_paginate_examples.rb +63 -0
- data/spec/chewy/search/pagination/will_paginate_spec.rb +23 -0
- data/spec/chewy/search/parameters/aggs_spec.rb +5 -0
- data/spec/chewy/search/parameters/bool_storage_examples.rb +53 -0
- data/spec/chewy/search/parameters/docvalue_fields_spec.rb +5 -0
- data/spec/chewy/search/parameters/explain_spec.rb +5 -0
- data/spec/chewy/search/parameters/filter_spec.rb +5 -0
- data/spec/chewy/search/parameters/hash_storage_examples.rb +59 -0
- data/spec/chewy/search/parameters/highlight_spec.rb +5 -0
- data/spec/chewy/search/parameters/indices_spec.rb +191 -0
- data/spec/chewy/search/parameters/integer_storage_examples.rb +32 -0
- data/spec/chewy/search/parameters/limit_spec.rb +5 -0
- data/spec/chewy/search/parameters/load_spec.rb +60 -0
- data/spec/chewy/search/parameters/min_score_spec.rb +32 -0
- data/spec/chewy/search/parameters/none_spec.rb +5 -0
- data/spec/chewy/search/parameters/offset_spec.rb +5 -0
- data/spec/chewy/search/parameters/order_spec.rb +65 -0
- data/spec/chewy/search/parameters/post_filter_spec.rb +5 -0
- data/spec/chewy/search/parameters/preference_spec.rb +5 -0
- data/spec/chewy/search/parameters/profile_spec.rb +5 -0
- data/spec/chewy/search/parameters/query_spec.rb +5 -0
- data/spec/chewy/search/parameters/query_storage_examples.rb +388 -0
- data/spec/chewy/search/parameters/request_cache_spec.rb +67 -0
- data/spec/chewy/search/parameters/rescore_spec.rb +62 -0
- data/spec/chewy/search/parameters/script_fields_spec.rb +5 -0
- data/spec/chewy/search/parameters/search_after_spec.rb +32 -0
- data/spec/chewy/search/parameters/search_type_spec.rb +5 -0
- data/spec/chewy/search/parameters/source_spec.rb +156 -0
- data/spec/chewy/search/parameters/storage_spec.rb +60 -0
- data/spec/chewy/search/parameters/stored_fields_spec.rb +126 -0
- data/spec/chewy/search/parameters/string_array_storage_examples.rb +63 -0
- data/spec/chewy/search/parameters/string_storage_examples.rb +32 -0
- data/spec/chewy/search/parameters/suggest_spec.rb +5 -0
- data/spec/chewy/search/parameters/terminate_after_spec.rb +5 -0
- data/spec/chewy/search/parameters/timeout_spec.rb +5 -0
- data/spec/chewy/search/parameters/track_scores_spec.rb +5 -0
- data/spec/chewy/search/parameters/types_spec.rb +5 -0
- data/spec/chewy/search/parameters/version_spec.rb +5 -0
- data/spec/chewy/search/parameters_spec.rb +145 -0
- data/spec/chewy/search/query_proxy_spec.rb +68 -0
- data/spec/chewy/search/request_spec.rb +685 -0
- data/spec/chewy/search/response_spec.rb +192 -0
- data/spec/chewy/search/scrolling_spec.rb +169 -0
- data/spec/chewy/search_spec.rb +37 -20
- data/spec/chewy/stash_spec.rb +95 -0
- data/spec/chewy/strategy/active_job_spec.rb +8 -2
- data/spec/chewy/strategy/atomic_spec.rb +4 -1
- data/spec/chewy/strategy/resque_spec.rb +8 -2
- data/spec/chewy/strategy/shoryuken_spec.rb +66 -0
- data/spec/chewy/strategy/sidekiq_spec.rb +10 -2
- data/spec/chewy/strategy_spec.rb +6 -6
- data/spec/chewy/type/actions_spec.rb +29 -10
- data/spec/chewy/type/adapter/active_record_spec.rb +357 -139
- data/spec/chewy/type/adapter/mongoid_spec.rb +220 -101
- data/spec/chewy/type/adapter/object_spec.rb +129 -40
- data/spec/chewy/type/adapter/sequel_spec.rb +304 -152
- data/spec/chewy/type/import/bulk_builder_spec.rb +279 -0
- data/spec/chewy/type/import/bulk_request_spec.rb +102 -0
- data/spec/chewy/type/import/journal_builder_spec.rb +95 -0
- data/spec/chewy/type/import/routine_spec.rb +110 -0
- data/spec/chewy/type/import_spec.rb +360 -244
- data/spec/chewy/type/mapping_spec.rb +96 -29
- data/spec/chewy/type/observe_spec.rb +25 -15
- data/spec/chewy/type/syncer_spec.rb +123 -0
- data/spec/chewy/type/witchcraft_spec.rb +122 -44
- data/spec/chewy/type/wrapper_spec.rb +63 -23
- data/spec/chewy/type_spec.rb +32 -10
- data/spec/chewy_spec.rb +82 -12
- data/spec/spec_helper.rb +16 -2
- data/spec/support/active_record.rb +6 -2
- data/spec/support/class_helpers.rb +4 -19
- data/spec/support/mongoid.rb +17 -5
- data/spec/support/sequel.rb +6 -1
- metadata +250 -57
- data/gemfiles/rails.3.2.activerecord.gemfile +0 -15
- data/gemfiles/rails.3.2.activerecord.kaminari.gemfile +0 -14
- data/gemfiles/rails.3.2.activerecord.will_paginate.gemfile +0 -14
- data/gemfiles/rails.4.0.activerecord.kaminari.gemfile +0 -14
- data/gemfiles/rails.4.0.activerecord.will_paginate.gemfile +0 -14
- data/gemfiles/rails.4.0.mongoid.4.0.0.gemfile +0 -15
- data/gemfiles/rails.4.0.mongoid.4.0.0.kaminari.gemfile +0 -14
- data/gemfiles/rails.4.0.mongoid.4.0.0.will_paginate.gemfile +0 -14
- data/gemfiles/rails.4.0.mongoid.5.1.0.gemfile +0 -15
- data/gemfiles/rails.4.0.mongoid.5.1.0.kaminari.gemfile +0 -14
- data/gemfiles/rails.4.0.mongoid.5.1.0.will_paginate.gemfile +0 -14
- data/gemfiles/rails.4.1.activerecord.kaminari.gemfile +0 -14
- data/gemfiles/rails.4.1.activerecord.will_paginate.gemfile +0 -14
- data/gemfiles/rails.4.1.mongoid.4.0.0.gemfile +0 -15
- data/gemfiles/rails.4.1.mongoid.4.0.0.kaminari.gemfile +0 -14
- data/gemfiles/rails.4.1.mongoid.4.0.0.will_paginate.gemfile +0 -14
- data/gemfiles/rails.4.1.mongoid.5.1.0.gemfile +0 -15
- data/gemfiles/rails.4.1.mongoid.5.1.0.kaminari.gemfile +0 -14
- data/gemfiles/rails.4.1.mongoid.5.1.0.will_paginate.gemfile +0 -14
- data/gemfiles/rails.4.2.activerecord.kaminari.gemfile +0 -15
- data/gemfiles/rails.4.2.activerecord.will_paginate.gemfile +0 -15
- data/gemfiles/rails.4.2.mongoid.4.0.0.gemfile +0 -15
- data/gemfiles/rails.4.2.mongoid.4.0.0.kaminari.gemfile +0 -14
- data/gemfiles/rails.4.2.mongoid.4.0.0.will_paginate.gemfile +0 -14
- data/gemfiles/rails.4.2.mongoid.5.1.0.gemfile +0 -15
- data/gemfiles/rails.4.2.mongoid.5.1.0.kaminari.gemfile +0 -14
- data/gemfiles/rails.4.2.mongoid.5.1.0.will_paginate.gemfile +0 -14
- data/gemfiles/rails.5.0.0.beta3.activerecord.gemfile +0 -16
- data/gemfiles/rails.5.0.0.beta3.activerecord.kaminari.gemfile +0 -16
- data/gemfiles/rails.5.0.0.beta3.activerecord.will_paginate.gemfile +0 -15
- data/gemfiles/sequel.4.31.gemfile +0 -13
- data/lib/chewy/query/pagination/will_paginate.rb +0 -27
- data/lib/chewy/query/scoping.rb +0 -20
- data/spec/chewy/query/pagination/will_paginage_spec.rb +0 -60
data/lib/chewy/type/observe.rb
CHANGED
@@ -8,7 +8,21 @@ module Chewy
|
|
8
8
|
options = args.extract_options!
|
9
9
|
method = args.first
|
10
10
|
|
11
|
-
|
11
|
+
proc do
|
12
|
+
reference = if type_name.is_a?(Proc)
|
13
|
+
if type_name.arity.zero?
|
14
|
+
instance_exec(&type_name)
|
15
|
+
else
|
16
|
+
type_name.call(self)
|
17
|
+
end
|
18
|
+
else
|
19
|
+
type_name
|
20
|
+
end
|
21
|
+
|
22
|
+
type = Chewy.derive_type(reference)
|
23
|
+
|
24
|
+
next if Chewy.strategy.current.name == :bypass
|
25
|
+
|
12
26
|
backreference = if method && method.to_s == 'self'
|
13
27
|
self
|
14
28
|
elsif method
|
@@ -17,25 +31,17 @@ module Chewy
|
|
17
31
|
instance_eval(&block)
|
18
32
|
end
|
19
33
|
|
20
|
-
|
21
|
-
type_name.arity == 0 ?
|
22
|
-
instance_exec(&type_name) :
|
23
|
-
type_name.call(self)
|
24
|
-
else
|
25
|
-
type_name
|
26
|
-
end
|
27
|
-
|
28
|
-
Chewy.derive_type(reference).update_index(backreference, options)
|
34
|
+
type.update_index(backreference, options)
|
29
35
|
end
|
30
36
|
end
|
31
37
|
|
32
38
|
def extract_callback_options!(args)
|
33
39
|
options = args.extract_options!
|
34
|
-
options.each_key.with_object({})
|
35
|
-
hash[key] = options.delete(key) if [
|
36
|
-
|
37
|
-
|
38
|
-
|
40
|
+
result = options.each_key.with_object({}) do |key, hash|
|
41
|
+
hash[key] = options.delete(key) if %i[if unless].include?(key)
|
42
|
+
end
|
43
|
+
args.push(options) unless options.empty?
|
44
|
+
result
|
39
45
|
end
|
40
46
|
end
|
41
47
|
|
@@ -0,0 +1,222 @@
|
|
1
|
+
module Chewy
|
2
|
+
class Type
|
3
|
+
# This class is able to find missing and outdated documents in the ES
|
4
|
+
# comparing ids from the data source and the ES index. Also, if `outdated_sync_field`
|
5
|
+
# existss in the index definition, it performs comparison of this field
|
6
|
+
# values for each source object and corresponding ES document. Usually,
|
7
|
+
# this field is `updated_at` and if its value in the source is not equal
|
8
|
+
# to the value in the index - this means that this document outdated and
|
9
|
+
# should be reindexed.
|
10
|
+
#
|
11
|
+
# To fetch necessary data from the source it uses adapter method
|
12
|
+
# {Chewy::Type::Adapter::Base#import_fields}, in case when the Object
|
13
|
+
# adapter is used it makes sense to read corresponding documentation.
|
14
|
+
#
|
15
|
+
# If `parallel` option is passed to the initializer - it will fetch surce and
|
16
|
+
# index data in parallel and then perform outdated objects calculation in
|
17
|
+
# parallel processes. Also, further import (if required) will be performed
|
18
|
+
# in parallel as well.
|
19
|
+
#
|
20
|
+
# @note
|
21
|
+
# In rails 4.0 time converted to json with the precision of seconds
|
22
|
+
# without milliseconds used, so outdated check is not so precise there.
|
23
|
+
#
|
24
|
+
# ATTENTION: synchronization may be slow in case when synchronized tables
|
25
|
+
# are missing compound index on primary key and `outdated_sync_field`.
|
26
|
+
#
|
27
|
+
# @see Chewy::Type::Actions::ClassMethods#sync
|
28
|
+
class Syncer
|
29
|
+
DEFAULT_SYNC_BATCH_SIZE = 20_000
|
30
|
+
ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/
|
31
|
+
OUTDATED_IDS_WORKER = lambda do |outdated_sync_field_type, source_data_hash, type, total, index_data|
|
32
|
+
::Process.setproctitle("chewy [#{type}]: sync outdated calculation (#{::Parallel.worker_number + 1}/#{total})") if type
|
33
|
+
index_data.each_with_object([]) do |(id, index_sync_value), result|
|
34
|
+
next unless source_data_hash[id]
|
35
|
+
|
36
|
+
outdated = if outdated_sync_field_type == 'date'
|
37
|
+
!Chewy::Type::Syncer.dates_equal(typecast_date(source_data_hash[id]), Time.iso8601(index_sync_value))
|
38
|
+
else
|
39
|
+
source_data_hash[id] != index_sync_value
|
40
|
+
end
|
41
|
+
|
42
|
+
result.push(id) if outdated
|
43
|
+
end
|
44
|
+
end
|
45
|
+
SOURCE_OR_INDEX_DATA_WORKER = lambda do |syncer, type, kind|
|
46
|
+
::Process.setproctitle("chewy [#{type}]: sync fetching data (#{kind})")
|
47
|
+
result = case kind
|
48
|
+
when :source
|
49
|
+
syncer.send(:fetch_source_data)
|
50
|
+
when :index
|
51
|
+
syncer.send(:fetch_index_data)
|
52
|
+
end
|
53
|
+
{kind => result}
|
54
|
+
end
|
55
|
+
|
56
|
+
def self.typecast_date(string)
|
57
|
+
if string.is_a?(String) && (match = ISO_DATETIME.match(string))
|
58
|
+
microsec = (match[7].to_r * 1_000_000).to_i
|
59
|
+
date = "#{match[1]}-#{match[2]}-#{match[3]}T#{match[4]}:#{match[5]}:#{match[6]}.#{format('%06d', microsec)}+00:00"
|
60
|
+
Time.iso8601(date)
|
61
|
+
else
|
62
|
+
string
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
# Compares times with ms precision.
|
67
|
+
def self.dates_equal(one, two)
|
68
|
+
[one.to_i, one.usec / 1000] == [two.to_i, two.usec / 1000]
|
69
|
+
end
|
70
|
+
|
71
|
+
# In ActiveSupport ~> 4.0 json dumpled times without any
|
72
|
+
# milliseconds, so ES stored time with the seconds precision.
|
73
|
+
if ActiveSupport::VERSION::STRING < '4.1.0'
|
74
|
+
def self.dates_equal(one, two)
|
75
|
+
one.to_i == two.to_i
|
76
|
+
end
|
77
|
+
end
|
78
|
+
|
79
|
+
# @param type [Chewy::Type] chewy type
|
80
|
+
# @param parallel [true, Integer, Hash] options for parallel execution or the number of processes
|
81
|
+
def initialize(type, parallel: nil)
|
82
|
+
@type = type
|
83
|
+
@parallel = if !parallel || parallel.is_a?(Hash)
|
84
|
+
parallel
|
85
|
+
elsif parallel.is_a?(Integer)
|
86
|
+
{in_processes: parallel}
|
87
|
+
else
|
88
|
+
{}
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
# Finds all the missing and outdated ids and performs import for them.
|
93
|
+
#
|
94
|
+
# @return [Integer, nil] the amount of missing and outdated documents reindexed, nil in case of errors
|
95
|
+
def perform
|
96
|
+
ids = missing_ids | outdated_ids
|
97
|
+
return 0 if ids.blank?
|
98
|
+
@type.import(ids, parallel: @parallel) && ids.count
|
99
|
+
end
|
100
|
+
|
101
|
+
# Finds ids of all the objects that are not indexed yet or deleted
|
102
|
+
# from the source already.
|
103
|
+
#
|
104
|
+
# @return [Array<String>] an array of missing ids from both sides
|
105
|
+
def missing_ids
|
106
|
+
return [] if source_data.blank?
|
107
|
+
|
108
|
+
@missing_ids ||= begin
|
109
|
+
source_data_ids = data_ids(source_data)
|
110
|
+
index_data_ids = data_ids(index_data)
|
111
|
+
|
112
|
+
(source_data_ids - index_data_ids).concat(index_data_ids - source_data_ids)
|
113
|
+
end
|
114
|
+
end
|
115
|
+
|
116
|
+
# If type supports outdated sync, it compares for the values of the
|
117
|
+
# type `outdated_sync_field` for each object and document in the source
|
118
|
+
# and index and returns the ids of entities which which are having
|
119
|
+
# different values there.
|
120
|
+
#
|
121
|
+
# @see Chewy::Type::Mapping::ClassMethods#supports_outdated_sync?
|
122
|
+
# @return [Array<String>] an array of outdated ids
|
123
|
+
def outdated_ids
|
124
|
+
return [] if source_data.blank? || index_data.blank? || !@type.supports_outdated_sync?
|
125
|
+
@outdated_ids ||= begin
|
126
|
+
if @parallel
|
127
|
+
parallel_outdated_ids
|
128
|
+
else
|
129
|
+
linear_outdated_ids
|
130
|
+
end
|
131
|
+
end
|
132
|
+
end
|
133
|
+
|
134
|
+
private
|
135
|
+
|
136
|
+
def source_data
|
137
|
+
@source_data ||= source_and_index_data.first
|
138
|
+
end
|
139
|
+
|
140
|
+
def index_data
|
141
|
+
@index_data ||= source_and_index_data.second
|
142
|
+
end
|
143
|
+
|
144
|
+
def source_and_index_data
|
145
|
+
@source_and_index_data ||= begin
|
146
|
+
if @parallel
|
147
|
+
::ActiveRecord::Base.connection.close if defined?(::ActiveRecord::Base)
|
148
|
+
result = ::Parallel.map(%i[source index], @parallel, &SOURCE_OR_INDEX_DATA_WORKER.curry[self, @type])
|
149
|
+
::ActiveRecord::Base.connection.reconnect! if defined?(::ActiveRecord::Base)
|
150
|
+
if result.first.keys.first == :source
|
151
|
+
[result.first.values.first, result.second.values.first]
|
152
|
+
else
|
153
|
+
[result.second.values.first, result.first.values.first]
|
154
|
+
end
|
155
|
+
else
|
156
|
+
[fetch_source_data, fetch_index_data]
|
157
|
+
end
|
158
|
+
end
|
159
|
+
end
|
160
|
+
|
161
|
+
def fetch_source_data
|
162
|
+
if @type.supports_outdated_sync?
|
163
|
+
@type.adapter.import_fields(fields: [@type.outdated_sync_field], batch_size: DEFAULT_SYNC_BATCH_SIZE, typecast: false).to_a.flatten(1).each do |data|
|
164
|
+
data[0] = data[0].to_s
|
165
|
+
end
|
166
|
+
else
|
167
|
+
@type.adapter.import_fields(batch_size: DEFAULT_SYNC_BATCH_SIZE, typecast: false).to_a.flatten(1).map(&:to_s)
|
168
|
+
end
|
169
|
+
end
|
170
|
+
|
171
|
+
def fetch_index_data
|
172
|
+
if @type.supports_outdated_sync?
|
173
|
+
@type.pluck(:_id, @type.outdated_sync_field).each do |data|
|
174
|
+
data[0] = data[0].to_s
|
175
|
+
end
|
176
|
+
else
|
177
|
+
@type.pluck(:_id).map(&:to_s)
|
178
|
+
end
|
179
|
+
end
|
180
|
+
|
181
|
+
def data_ids(data)
|
182
|
+
return data unless @type.supports_outdated_sync?
|
183
|
+
data.map(&:first)
|
184
|
+
end
|
185
|
+
|
186
|
+
def linear_outdated_ids
|
187
|
+
OUTDATED_IDS_WORKER.call(outdated_sync_field_type, source_data.to_h, nil, nil, index_data)
|
188
|
+
end
|
189
|
+
|
190
|
+
def parallel_outdated_ids
|
191
|
+
size = processor_count.zero? ? index_data.size : (index_data.size / processor_count.to_f).ceil
|
192
|
+
batches = index_data.each_slice(size)
|
193
|
+
|
194
|
+
::ActiveRecord::Base.connection.close if defined?(::ActiveRecord::Base)
|
195
|
+
result = ::Parallel.map(batches, @parallel, &OUTDATED_IDS_WORKER.curry[outdated_sync_field_type, source_data.to_h, @type, batches.size]).flatten(1)
|
196
|
+
::ActiveRecord::Base.connection.reconnect! if defined?(::ActiveRecord::Base)
|
197
|
+
result
|
198
|
+
end
|
199
|
+
|
200
|
+
def processor_count
|
201
|
+
@processor_count ||= @parallel[:in_processes] || @parallel[:in_threads] || ::Parallel.processor_count
|
202
|
+
end
|
203
|
+
|
204
|
+
def outdated_sync_field_type
|
205
|
+
return @outdated_sync_field_type if instance_variable_defined?(:@outdated_sync_field_type)
|
206
|
+
return unless @type.outdated_sync_field
|
207
|
+
|
208
|
+
mappings = @type.client.indices.get_mapping(
|
209
|
+
index: @type.index_name,
|
210
|
+
type: @type.type_name
|
211
|
+
).values.first.fetch('mappings', {})
|
212
|
+
|
213
|
+
@outdated_sync_field_type = mappings
|
214
|
+
.fetch(@type.type_name, {})
|
215
|
+
.fetch('properties', {})
|
216
|
+
.fetch(@type.outdated_sync_field.to_s, {})['type']
|
217
|
+
rescue Elasticsearch::Transport::Transport::Errors::NotFound
|
218
|
+
nil
|
219
|
+
end
|
220
|
+
end
|
221
|
+
end
|
222
|
+
end
|
@@ -1,10 +1,11 @@
|
|
1
|
-
|
2
|
-
require
|
1
|
+
begin
|
2
|
+
require 'method_source'
|
3
|
+
require 'parser/current'
|
4
|
+
require 'unparser'
|
3
5
|
rescue LoadError
|
6
|
+
nil
|
4
7
|
end
|
5
8
|
|
6
|
-
%w[method_source parser/current unparser].each { |lib| try_require lib }
|
7
|
-
|
8
9
|
module Chewy
|
9
10
|
class Type
|
10
11
|
module Witchcraft
|
@@ -22,9 +23,9 @@ module Chewy
|
|
22
23
|
|
23
24
|
def check_requirements!
|
24
25
|
messages = []
|
25
|
-
messages << "MethodSource gem is required for the Witchcraft
|
26
|
-
messages << "Parser gem is required for the Witchcraft
|
27
|
-
messages << "Unparser gem is required for the Witchcraft
|
26
|
+
messages << "MethodSource gem is required for the Witchcraft, please add `gem 'method_source'` to your Gemfile" unless Proc.method_defined?(:source)
|
27
|
+
messages << "Parser gem is required for the Witchcraft, please add `gem 'parser'` to your Gemfile" unless '::Parser'.safe_constantize
|
28
|
+
messages << "Unparser gem is required for the Witchcraft, please add `gem 'unparser'` to your Gemfile" unless '::Unparser'.safe_constantize
|
28
29
|
messages = messages.join("\n")
|
29
30
|
|
30
31
|
raise messages if messages.present?
|
@@ -34,26 +35,32 @@ module Chewy
|
|
34
35
|
!!_witchcraft
|
35
36
|
end
|
36
37
|
|
37
|
-
def cauldron
|
38
|
-
@cauldron ||= Cauldron.new(self)
|
38
|
+
def cauldron(**options)
|
39
|
+
(@cauldron ||= {})[options] ||= Cauldron.new(self, **options)
|
39
40
|
end
|
40
41
|
end
|
41
42
|
|
42
43
|
class Cauldron
|
43
|
-
|
44
|
+
attr_reader :locals
|
45
|
+
|
46
|
+
# @param type [Chewy::Type] type for composition
|
47
|
+
# @param fields [Array<Symbol>] restricts the fields for composition
|
48
|
+
def initialize(type, fields: [])
|
44
49
|
@type = type
|
50
|
+
@locals = []
|
51
|
+
@fields = fields
|
45
52
|
end
|
46
53
|
|
47
54
|
def brew(object, crutches = nil)
|
48
|
-
alicorn.call(object, crutches).as_json
|
55
|
+
alicorn.call(locals, object, crutches).as_json
|
49
56
|
end
|
50
57
|
|
51
58
|
private
|
52
59
|
|
53
60
|
def alicorn
|
54
|
-
@alicorn ||= class_eval <<-RUBY
|
55
|
-
-> (object0, crutches) do
|
56
|
-
#{composed_values(@type.
|
61
|
+
@alicorn ||= class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
62
|
+
-> (locals, object0, crutches) do
|
63
|
+
#{composed_values(@type.root, 0)}
|
57
64
|
end
|
58
65
|
RUBY
|
59
66
|
end
|
@@ -87,55 +94,69 @@ module Chewy
|
|
87
94
|
end
|
88
95
|
|
89
96
|
def non_proc_values(field, nesting)
|
90
|
-
non_proc_fields = non_proc_fields_for(field)
|
97
|
+
non_proc_fields = non_proc_fields_for(field, nesting)
|
91
98
|
object = "object#{nesting}"
|
92
99
|
|
93
100
|
if non_proc_fields.present?
|
94
101
|
<<-RUBY
|
95
102
|
(if #{object}.is_a?(Hash)
|
96
103
|
{
|
97
|
-
#{non_proc_fields.map do |
|
98
|
-
|
99
|
-
"#{
|
104
|
+
#{non_proc_fields.map do |f|
|
105
|
+
key_name = f.value.is_a?(Symbol) || f.value.is_a?(String) ? f.value : f.name
|
106
|
+
fetcher = "#{object}.has_key?(:#{key_name}) ? #{object}[:#{key_name}] : #{object}['#{key_name}']"
|
107
|
+
"'#{f.name}'.freeze => #{composed_value(f, fetcher, nesting)}"
|
100
108
|
end.join(', ')}
|
101
109
|
}
|
102
110
|
else
|
103
111
|
{
|
104
|
-
#{non_proc_fields.map do |
|
105
|
-
|
112
|
+
#{non_proc_fields.map do |f|
|
113
|
+
method_name = f.value.is_a?(Symbol) || f.value.is_a?(String) ? f.value : f.name
|
114
|
+
"'#{f.name}'.freeze => #{composed_value(f, "#{object}.#{method_name}", nesting)}"
|
106
115
|
end.join(', ')}
|
107
116
|
}
|
108
117
|
end)
|
109
118
|
RUBY
|
110
119
|
else
|
111
|
-
|
120
|
+
'{}'
|
112
121
|
end
|
113
122
|
end
|
114
123
|
|
115
124
|
def proc_values(field, nesting)
|
116
|
-
proc_fields = proc_fields_for(field)
|
125
|
+
proc_fields = proc_fields_for(field, nesting)
|
117
126
|
|
118
127
|
if proc_fields.present?
|
119
128
|
<<-RUBY
|
120
129
|
{
|
121
|
-
#{proc_fields.map do |
|
122
|
-
"#{
|
130
|
+
#{proc_fields.map do |f|
|
131
|
+
"'#{f.name}'.freeze => (#{composed_value(f, source_for(f.value, nesting), nesting)})"
|
123
132
|
end.join(', ')}
|
124
133
|
}
|
125
134
|
RUBY
|
126
135
|
else
|
127
|
-
|
136
|
+
'{}'
|
128
137
|
end
|
129
138
|
end
|
130
139
|
|
131
|
-
def non_proc_fields_for(parent)
|
140
|
+
def non_proc_fields_for(parent, nesting)
|
132
141
|
return [] unless parent
|
133
|
-
(parent.children || []).
|
142
|
+
fields = (parent.children || []).reject { |field| field.value.is_a?(Proc) }
|
143
|
+
|
144
|
+
if nesting.zero? && @fields.present?
|
145
|
+
fields.select { |f| @fields.include?(f.name) }
|
146
|
+
else
|
147
|
+
fields
|
148
|
+
end
|
134
149
|
end
|
135
150
|
|
136
|
-
def proc_fields_for(parent)
|
151
|
+
def proc_fields_for(parent, nesting)
|
137
152
|
return [] unless parent
|
138
|
-
(parent.children || []).select { |field| field.value
|
153
|
+
fields = (parent.children || []).select { |field| field.value.is_a?(Proc) }
|
154
|
+
|
155
|
+
if nesting.zero? && @fields.present?
|
156
|
+
fields.select { |f| @fields.include?(f.name) }
|
157
|
+
else
|
158
|
+
fields
|
159
|
+
end
|
139
160
|
end
|
140
161
|
|
141
162
|
def source_for(proc, nesting)
|
@@ -145,26 +166,35 @@ module Chewy
|
|
145
166
|
raise "No lambdas found, try to reformat your code:\n`#{proc.source}`" unless lambdas
|
146
167
|
|
147
168
|
source = lambdas.first
|
148
|
-
|
169
|
+
proc_params = proc.parameters.map(&:second)
|
170
|
+
|
171
|
+
if proc.arity.zero?
|
149
172
|
source = replace_self(source, :"object#{nesting}")
|
150
173
|
source = replace_send(source, :"object#{nesting}")
|
151
174
|
elsif proc.arity < 0
|
152
175
|
raise "Splat arguments are unsupported by witchcraft:\n`#{proc.source}"
|
153
176
|
else
|
154
177
|
(nesting + 1).times do |n|
|
155
|
-
source = replace_lvar(source,
|
178
|
+
source = replace_lvar(source, proc_params[n], :"object#{n}") if proc_params[n]
|
179
|
+
end
|
180
|
+
source = replace_lvar(source, proc_params[nesting + 1], :crutches) if proc_params[nesting + 1]
|
181
|
+
|
182
|
+
binding_variable_list(source).each do |variable|
|
183
|
+
locals.push(proc.binding.eval(variable.to_s))
|
184
|
+
source = replace_local(source, variable, locals.size - 1)
|
156
185
|
end
|
157
|
-
source = replace_lvar(source, proc.parameters[nesting + 1][1], :crutches) if proc.parameters[nesting + 1]
|
158
186
|
end
|
187
|
+
|
159
188
|
Unparser.unparse(source)
|
160
189
|
end
|
161
190
|
|
162
191
|
def exctract_lambdas(node)
|
192
|
+
return unless node.is_a?(Parser::AST::Node)
|
163
193
|
if node.type == :block && node.children[0].type == :send && node.children[0].to_a == [nil, :lambda]
|
164
|
-
node.children[2]
|
194
|
+
[node.children[2]]
|
165
195
|
else
|
166
196
|
node.children.map { |child| exctract_lambdas(child) }.flatten.compact
|
167
|
-
end
|
197
|
+
end
|
168
198
|
end
|
169
199
|
|
170
200
|
def replace_lvar(node, old_variable, new_variable)
|
@@ -202,6 +232,31 @@ module Chewy
|
|
202
232
|
node
|
203
233
|
end
|
204
234
|
end
|
235
|
+
|
236
|
+
def replace_local(node, variable, local_index)
|
237
|
+
if node.is_a?(Parser::AST::Node)
|
238
|
+
if node.type == :send && node.children.to_a == [nil, variable]
|
239
|
+
node.updated(nil, [
|
240
|
+
Parser::AST::Node.new(:lvar, [:locals]),
|
241
|
+
:[],
|
242
|
+
Parser::AST::Node.new(:int, [local_index])
|
243
|
+
])
|
244
|
+
else
|
245
|
+
node.updated(nil, node.children.map { |child| replace_local(child, variable, local_index) })
|
246
|
+
end
|
247
|
+
else
|
248
|
+
node
|
249
|
+
end
|
250
|
+
end
|
251
|
+
|
252
|
+
def binding_variable_list(node)
|
253
|
+
return unless node.is_a?(Parser::AST::Node)
|
254
|
+
if node.type == :send && node.children[0].nil?
|
255
|
+
node.children[1]
|
256
|
+
else
|
257
|
+
node.children.map { |child| binding_variable_list(child) }.flatten.compact.uniq
|
258
|
+
end
|
259
|
+
end
|
205
260
|
end
|
206
261
|
end
|
207
262
|
end
|
data/lib/chewy/type/wrapper.rb
CHANGED
@@ -3,50 +3,82 @@ module Chewy
|
|
3
3
|
module Wrapper
|
4
4
|
extend ActiveSupport::Concern
|
5
5
|
|
6
|
-
|
6
|
+
included do
|
7
|
+
attr_accessor :_data, :_object
|
8
|
+
attr_reader :attributes
|
9
|
+
end
|
10
|
+
|
11
|
+
module ClassMethods
|
12
|
+
def build(hit)
|
13
|
+
attributes = (hit['_source'] || {})
|
14
|
+
.reverse_merge(id: hit['_id'])
|
15
|
+
.merge!(_score: hit['_score'])
|
16
|
+
.merge!(_explanation: hit['_explanation'])
|
17
|
+
|
18
|
+
wrapper = new(attributes)
|
19
|
+
wrapper._data = hit
|
20
|
+
wrapper
|
21
|
+
end
|
22
|
+
end
|
7
23
|
|
8
24
|
def initialize(attributes = {})
|
9
25
|
@attributes = attributes.stringify_keys
|
10
26
|
end
|
11
27
|
|
12
28
|
def ==(other)
|
29
|
+
return true if super
|
30
|
+
|
13
31
|
if other.is_a?(Chewy::Type)
|
14
32
|
self.class == other.class && (respond_to?(:id) ? id == other.id : attributes == other.attributes)
|
15
33
|
elsif other.respond_to?(:id)
|
16
|
-
|
34
|
+
self.class.adapter.target.is_a?(Class) &&
|
35
|
+
other.is_a?(self.class.adapter.target) &&
|
36
|
+
id.to_s == other.id.to_s
|
17
37
|
else
|
18
38
|
false
|
19
39
|
end
|
20
40
|
end
|
21
41
|
|
22
|
-
|
23
|
-
|
24
|
-
|
42
|
+
%w[_id _type _index].each do |name|
|
43
|
+
define_method name do
|
44
|
+
_data[name]
|
25
45
|
end
|
26
|
-
return @attributes[method_name.to_s] if @attributes.key?(method_name.to_s)
|
27
|
-
return nil if attribute_defined?(method_name.to_s)
|
28
|
-
super
|
29
46
|
end
|
30
47
|
|
31
|
-
def
|
32
|
-
|
33
|
-
|
34
|
-
|
48
|
+
def method_missing(method, *args, &block)
|
49
|
+
m = method.to_s
|
50
|
+
if (name = highlight_name(m))
|
51
|
+
highlight(name)
|
52
|
+
elsif @attributes.key?(m)
|
53
|
+
@attributes[m]
|
54
|
+
elsif attribute_defined?(m)
|
55
|
+
nil
|
56
|
+
else
|
35
57
|
super
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
def respond_to_missing?(method, include_private = false)
|
62
|
+
m = method.to_s
|
63
|
+
highlight_name(m) || @attributes.key?(m) || attribute_defined?(m) || super
|
36
64
|
end
|
37
65
|
|
38
|
-
|
66
|
+
private
|
67
|
+
|
68
|
+
def highlight_name(method)
|
69
|
+
method.sub(/_highlight\z/, '') if method.end_with?('_highlight')
|
70
|
+
end
|
39
71
|
|
40
72
|
def attribute_defined?(attribute)
|
41
|
-
self.class.
|
73
|
+
self.class.root && self.class.root.children.find { |a| a.name.to_s == attribute }.present?
|
42
74
|
end
|
43
75
|
|
44
76
|
def highlight(attribute)
|
45
|
-
_data[
|
77
|
+
_data['highlight'][attribute].first if highlight?(attribute)
|
46
78
|
end
|
47
79
|
|
48
80
|
def highlight?(attribute)
|
49
|
-
_data.key?(
|
81
|
+
_data.key?('highlight') && _data['highlight'].key?(attribute)
|
50
82
|
end
|
51
83
|
end
|
52
84
|
end
|