Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Amol/v7.6.0 fork #14

Open
wants to merge 190 commits into
base: master
Choose a base branch
from
Open

Amol/v7.6.0 fork #14

wants to merge 190 commits into from

Conversation

amol21p
Copy link

@amol21p amol21p commented Oct 16, 2024 •
edited
Loading

This PR uses the toptal/chewy's 7.6.0 tag release and applies apollo specific changes required on it.

  1. Added support for multiple hosts
  2. Added searchable proc support - This is used to pass context of valid documents for index while reindexing
  3. Mongoid support was dropped in Chewy 7. We have added the adapter again along with feature parity from our current forked version
  4. Custom merge strategy for avoiding unnecessary nesting
  5. Added _index_type specific changes
  6. Some changes related to x_opaque_id
  7. Support for replace_post_filter

AlexVPopov and others added 30 commits April 21, 2020 17:22
@AlexVPopov
Fix deprecation warning for contructing new BigDecimal
ec643cf
@AlexVPopov
Merge pull request toptal#710 from toptal/fix-deprecation-warning
de2f06c 
Fix deprecation warning for contructing new BigDecimal
@mrzasa
Setup CircleCI
4364ebc 
This commit sets up CircleCI for combinations of ruby 2.6/2.5,
mongoid, ActiveRecord 6.0/5.2.

It also marks some specs as pending, as they are not allowed in
elasticsearch now. They will be addressed in a separate PR.
@mrzasa
Merge pull request toptal#711 from toptal/circleci
024d741 
Setup CI on CircleCI
@mrzasa
Allow configuration of ActiveJob queue
f11a51a
@mrzasa
Merge pull request toptal#707 from toptal/configure-active-job-queue
22f8f27 
Allow configuration of Active Job queue name
@mrzasa
Added Ruby 2.7 to CircleCI config
4225fdc
@mrzasa
Merge pull request toptal#718 from toptal/ruby-2.7-ci
388c4cf 
Added Ruby 2.7 to CircleCI config
Fix all ruby 2.7 deprecation warnings
0609d58
Bump version
4cea529
@mrzasa
Merge pull request toptal#715 from gseddon/fix-all-2.7-dep-warnings
74470f2 
Fixed deprecation warnings in Ruby 2.7
@aglushkov @bbatsov
Fix more ruby 2.7 keyword params deprecation warnings
0e6f609 
Fixes deprecation warnings
```
warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call
```

1. Fixed warning when calling `response.records`, warning backtrace:
```
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/search/loader.rb:55:in `block in load'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/search/loader.rb:50:in `each'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/search/loader.rb:50:in `each_with_object'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/search/loader.rb:50:in `load'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/search/response.rb:85:in `objects'
```

2. Fixed warning when calling `SomeIndex.reset!((Time.now.to_f * 1000).round)`, warning backtrace:
```
  # gems/chewy-74470f2525b2/lib/chewy/type/adapter/active_record.rb:25:in `import_scope'
  # gems/chewy-74470f2525b2/lib/chewy/type/adapter/orm.rb:79:in `import'
  # gems/chewy-74470f2525b2/lib/chewy/type/import.rb:142:in `block in import_linear'
  # /home/aglushkov/.rbenv/versions/2.7.1/lib/ruby/gems/2.7.0/gems/activesupport-6.0.3.4/lib/active_support/notifications.rb:180:in `block in instrument'
  # /home/aglushkov/.rbenv/versions/2.7.1/lib/ruby/gems/2.7.0/gems/activesupport-6.0.3.4/lib/active_support/notifications/instrumenter.rb:24:in `instrument'
  # /home/aglushkov/.rbenv/versions/2.7.1/lib/ruby/gems/2.7.0/gems/activesupport-6.0.3.4/lib/active_support/notifications.rb:180:in `instrument'
  # gems/chewy-74470f2525b2/lib/chewy/type/import.rb:141:in `import_linear'
  # gems/chewy-74470f2525b2/lib/chewy/type/import.rb:136:in `import_routine'
  # gems/chewy-74470f2525b2/lib/chewy/type/import.rb:76:in `import'
  # gems/chewy-74470f2525b2/lib/chewy/index/actions.rb:149:in `block in import'
  # gems/chewy-74470f2525b2/lib/chewy/index/actions.rb:147:in `map'
  # gems/chewy-74470f2525b2/lib/chewy/index/actions.rb:147:in `import'
  # gems/chewy-74470f2525b2/lib/chewy/index/actions.rb:182:in `reset!'
```

3. Same  `SomeIndex.reset!((Time.now.to_f * 1000).round)`, warning backtrace:
```
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/type/import.rb:130:in `new'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/type/import.rb:130:in `import_routine'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/type/import.rb:76:in `import'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/index/actions.rb:149:in `block in import'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/index/actions.rb:147:in `map'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/index/actions.rb:147:in `import'
  # gems/2.7.0/bundler/gems/chewy-74470f2525b2/lib/chewy/index/actions.rb:182:in `reset!'
```
@olancheg @bbatsov
Update instructions for AWS ElasticSearch
57cb24e 
Fix instructions for AWS ElasticSearch configuration in README as it is outdated.
@bbatsov
Update the CI badge
55b6f0a
@bbatsov
Remove broken logo
15637e8
@bbatsov
Update copyright
b25e57c
@bbatsov
Update the gemspec
a2cdb4a
@bbatsov
Add Ruby 3 to the CI matrix
da4ff3e
@bbatsov
Delete .travis.yml
4e6bd37
@bbatsov
Revert "Add Ruby 3 to the CI matrix"
c59ade5 
Seems we're blocked by rspec/rspec-mocks#1394

This reverts commit da4ff3e.
@bbatsov
Add a note about compatibility
9c709a7
@bbatsov
Tweak some wording and formatting
94746fa
@Bhacaz
Update Rails gemspec dependencies and CI matrix gemfiles
9f97dac
@Bhacaz
Patch witchcraft to work with ActiveSupport 6.1
e87c5e5 
Thanks to @rabotyaga for the solution
Merge pull request toptal#733 from petalmd/update_ci_matrix
ac0e5ef 
Update Rails version in CI matrix
@Bhacaz
Patch deprecation warning in Elasticsearch 5.6 to Elasticsearch 6
61a59e7
Merge pull request toptal#735 from petalmd/correct_es_6_delete_by_que…
1f2e682 
…ry_warning

Patch ElasticSearch deprecation warning
@lowang
Add support for Ruby 3
8e9186a
Merge pull request toptal#734 from toptal/ruby3-support
cd9570c 
Add support for Ruby 3
@TaylorMerritt
Fix nil children when using witchcraft
068759a
dependabot bot and others added 30 commits April 25, 2024 09:56
@dependabot
Update rubocop requirement from 1.63.2 to 1.63.3 (toptal#945)
3d559bb 
Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v1.63.2...v1.63.3)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mjankowski
Relax allowed elasticsearch dependency version (toptal#933)
7e65698 
* Relax allowed `elasticsearch` dependency version

* Update tracer/logger access style

* Add changelog notes
@mjankowski
Fix intermittent time-based failure in delayed sidekiq spec (toptal#947)
f45460f 
* Fix intermittent time-based failure in delayed sidekiq spec

This example was previously failing when it was run at exactly an "even"
10 second increment time. For example, it would fail at "12:00:10", but
pass at "12:00:09" and "12:00:11". This leads to intermittent failures
on CI (presumably around ~10% of runs).

Updated to use a helper method in the spec which more closely mirrors
the scheduler code.

* Add changelog notes
@dependabot
Update rubocop requirement from 1.63.3 to 1.63.4 (toptal#946)
04e5984 
Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v1.63.3...v1.63.4)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@skcc321
[fix] delayed_sidekiq race condition (toptal#937)
c99741e
@konalegi
Bump version to 7.6.0 (toptal#948)
17cd230
@amol21p
added changes for apollo fork
bad41b0
@amol21p
added searchable proc support
578bda3
@amol21p
added mongoid support
181932a
@amol21p
commented mongoid methods
d1ee9ba
@amol21p
added new files
57ad8d5
@amol21p
uncommented mongoid methods
929a880
@amol21p
commented again
010f76e
@amol21p
added mongo id adapter import
29690d2
@amol21p
removed redundant merge
8215998
@amol21p
added logic for determining if direct import is needed
5783913
@amol21p
added index types
6dae0e0
@akshay-apollo
Added handling for mongo direct import in mongoid adapter
a7461b3
@akshay-apollo
Fix rubocop class length limit
ff1a31d
@akshay-apollo
Changed handling for indextype
6c650e5
@amol21p
fixed rubocop errors
16ea00d
@amol21p
fixed override for import objects in mongoid adapter
a8c1100
@amol21p
fixed arguments to import objects mongoid override
2b7f81f
@amol21p
temp revert override
420d4cd
@amol21p
changed index type
888b3d2
@amol21p
reverted to old logic
1fc7ce9
@amol21p
Revert "temp revert override"
0ed3d75 
This reverts commit 420d4cd.
@amol21p
fixed elastic clients
c270093
@amol21p
changed added for passing chewy handled errors from #16
c5c1f49
@amol21p
revert count behavior
e93811a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.