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.

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

Bump Jaeger dependency on badger to 1.6.0 and resolve breaking changes #1884

Closed
wants to merge 3 commits into from
Closed

Bump Jaeger dependency on badger to 1.6.0 and resolve breaking changes #1884

wants to merge 3 commits into from

Conversation

andreynkravtsov
Copy link

Which problem is this PR solving?

  • Need to upgrade badger dependency to 1.6.0

Short description of the changes

  • DefaultOptions is now a function with path default passed in
  • Iterator now seems unhappy when you do it.Item() != null and expects to be checked against .Valid()

…anges.

1) DefaultOptions is now a function with path default passed in
2) Iterator now seems unhappy when you do it.Item() != null and expects to be checked against .Valid()

Signed-off-by: Andrey Kravtsov <qwerty@uber.com>
@andreynkravtsov
Copy link
Author

Ooops, will revert the elastic ver bump

Signed-off-by: Andrey Kravtsov <qwerty@uber.com>
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@burmanm any concerns?

Gopkg.toml Outdated
@@ -137,7 +137,7 @@ required = [

[[constraint]]
name = "github.com/dgraph-io/badger"
version = "=1.5.3"
version = "^1.6.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given breaking changes, are you sure we want ^ and not =?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call, will fix

Signed-off-by: Andrey Kravtsov <qwerty@uber.com>
@codecov
Copy link

codecov bot commented Oct 29, 2019

Codecov Report

Merging #1884 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1884      +/-   ##
==========================================
- Coverage   98.44%   98.44%   -0.01%     
==========================================
  Files         197      197              
  Lines        9645     9643       -2     
==========================================
- Hits         9495     9493       -2     
  Misses        114      114              
  Partials       36       36
Impacted Files Coverage Δ
plugin/storage/badger/factory.go 98.09% <100%> (-0.04%) ⬇️
plugin/storage/badger/spanstore/reader.go 96.75% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6887ae4...737fe90. Read the comment docs.

@@ -89,16 +88,14 @@ func (f *Factory) InitFromViper(v *viper.Viper) {
func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger) error {
f.logger = logger

opts := badger.DefaultOptions
opts.TableLoadingMode = options.MemoryMap
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this one no longer needed?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should have mentioned. In 1.6.0 TableLoadingMode is defaulted to MemoryMap

@burmanm
Copy link
Contributor

burmanm commented Oct 29, 2019

Yeah, 1.6.0 is slower and has couple of new bugs I didn't want. So I would skip this version (that's why I've never sent a PR).

yurishkuro
yurishkuro previously approved these changes Oct 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants