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

Fix windows build #1177

Merged
merged 3 commits into from
Jan 7, 2020
Merged

Fix windows build #1177

merged 3 commits into from
Jan 7, 2020

Conversation

jarifibrahim
Copy link
Contributor

@jarifibrahim jarifibrahim commented Dec 28, 2019 •
edited
Loading

The windows build has been failing since 690488d . This PR fixes it.

This change is Reviewable

@coveralls
Copy link

coveralls commented Dec 28, 2019 •
edited
Loading

Coverage Status

Coverage decreased (-0.2%) to 69.654% when pulling 27b7e26 on ibrahim/fix-windows-build into 465f28a on master.

martinmr
martinmr reviewed Dec 30, 2019
View reviewed changes
Copy link
Contributor

@martinmr martinmr left a comment

Choose a reason for hiding this comment

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

Just one comment but it looks good. Just have somebody with approval rights look at it.

Reviewed 4 of 6 files at r1, 2 of 2 files at r2.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @ashish-goswami, @jarifibrahim, and @manishrjain)

db_test.go, line 1680 at r2 (raw file):

	db, err := Open(DefaultOptions(dir))
	if err != nil {
		panic(err)

why this change, I thought log.Fatalf panics after printing the log? If this change is required to make the Windows build work, a comment here would be useful.

jarifibrahim
jarifibrahim commented Jan 6, 2020
View reviewed changes
Copy link
Contributor Author

@jarifibrahim jarifibrahim left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @ashish-goswami, @manishrjain, and @martinmr)

db_test.go, line 1680 at r2 (raw file):

Previously, martinmr (Martin Martinez Rivera) wrote…

why this change, I thought log.Fatalf panics after printing the log? If this change is required to make the Windows build work, a comment here would be useful.

This change is not really needed to fix windows build. DeepSource kept complaining that log.Fatal(..) should not be used because it contains os.Exit(..) call which means none of the defer calls will be executed.

ashish-goswami
ashish-goswami approved these changes Jan 7, 2020
View reviewed changes
Copy link
Contributor

@ashish-goswami ashish-goswami left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 6 files at r1, 2 of 2 files at r2.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @manishrjain and @martinmr)

ashish-goswami
ashish-goswami approved these changes Jan 7, 2020
View reviewed changes
Copy link
Contributor

@ashish-goswami ashish-goswami left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @manishrjain and @martinmr)

@jarifibrahim jarifibrahim merged commit 0f2e629 into master Jan 7, 2020
@jarifibrahim jarifibrahim deleted the ibrahim/fix-windows-build branch January 7, 2020 12:34
jarifibrahim pushed a commit that referenced this pull request Mar 5, 2020
Fix windows build (#1177)
c66c7a4 
Fix windows build and some deepsource warnings

(cherry picked from commit 0f2e629)
jarifibrahim pushed a commit that referenced this pull request Mar 6, 2020
@paralin @lgalatin
@damz @martinmr @Dieterbe @vardhanapoorv
Add missing commits to release/v2.0 branch (#1245)
8fd5740 
* Cast sz to uint32 to fix compilation on 32 bit (#1175)

`env GOOS=linux GOARCH=arm GOARM=7 go build` no longer fails with overflow.

Similar to commit fb0cdb8.

Signed-off-by: Christian Stewart <[email protected]>
(cherry picked from commit 465f28a)

* Fix commit sha for WithInMemory in CHANGELOG. (#1172)

(cherry picked from commit 03af216)

* Fix windows build (#1177)

Fix windows build and some deepsource warnings

(cherry picked from commit 0f2e629)

* Fix checkOverlap in compaction (#1166)

The overlap check in compaction would keep additional keys in case
the levels under compaction had overlap amongst themselves.
This commit fixes it.

This commit also fixes the `numVersionsToKeep` check. Without this
commit, we would end up keeping `2` versions of a key even when the
number of versions to keep was set to `1`. See
`level 0 to level 1 with lower overlap` test.

Fixes #1053

The following test fails on master but works with this commit
```go
func TestCompaction(t *testing.T) {
	t.Run("level 0 to level 1", func(t *testing.T) {
		dir, err := ioutil.TempDir("", "badger-test")
		require.NoError(t, err)
		defer removeDir(dir)

		// Disable compactions and keep single version of each key.
		opt := DefaultOptions(dir).WithNumCompactors(0).WithNumVersionsToKeep(1)
		db, err := OpenManaged(opt)
		require.NoError(t, err)

		l0 := []keyValVersion{{"foo", "bar", 3}, {"fooz", "baz", 1}}
		l01 := []keyValVersion{{"foo", "bar", 2}}
		l1 := []keyValVersion{{"foo", "bar", 1}}
		// Level 0 has table l0 and l01.
		createAndOpen(db, l0, 0)
		createAndOpen(db, l01, 0)
		// Level 1 has table l1.
		createAndOpen(db, l1, 1)

		// Set a high discard timestamp so that all the keys are below the discard timestamp.
		db.SetDiscardTs(10)

		getAllAndCheck(t, db, []keyValVersion{
			{"foo", "bar", 3}, {"foo", "bar", 2}, {"foo", "bar", 1}, {"fooz", "baz", 1},
		})
		cdef := compactDef{
			thisLevel: db.lc.levels[0],
			nextLevel: db.lc.levels[1],
			top:       db.lc.levels[0].tables,
			bot:       db.lc.levels[1].tables,
		}
		require.NoError(t, db.lc.runCompactDef(0, cdef))
		// foo version 2 should be dropped after compaction.
		getAllAndCheck(t, db, []keyValVersion{{"foo", "bar", 3}, {"fooz", "baz", 1}})
	})
}
```

(cherry picked from commit 0a06173)

* Remove the 'this entry should've caught' log from value.go (#1170)

Fixes - #1031
(There wasn't a bug to fix. The log statement shouldn't have been there)

This PR removes the warning message `WARNING: This entry should have
been caught.`. The warning message assumed that we will always find the
**newest key if two keys have the same version** This assumption is
valid in case of a normal key but it's **NOT TRUE** in case of
**move keys**.

Here's how we can end up fetching the older version of a move key if
two move keys have the same version.

```
It might be possible that the entry read from LSM Tree points to an
older vlog file. This can happen in the following situation. Assume DB
is opened with numberOfVersionsToKeep=1

Now, if we have ONLY one key in the system "FOO" which has been updated
3 times and the same key has been garbage collected 3 times, we'll have
3 versions of the movekey for the same key "FOO".
NOTE: moveKeyi is the moveKey with version i
Assume we have 3 move keys in L0.
- moveKey1 (points to vlog file 10),
- moveKey2 (points to vlog file 14) and
- moveKey3 (points to vlog file 15).

Also, assume there is another move key "moveKey1" (points to vlog
file 6) (this is also a move Key for key "FOO" ) on upper levels (let's
say level 3). The move key "moveKey1" on level 0 was inserted because
vlog file 6 was GCed.

Here's what the arrangement looks like
L0 => (moveKey1 => vlog10), (moveKey2 => vlog14), (moveKey3 => vlog15)
L1 => ....
L2 => ....
L3 => (moveKey1 => vlog6)

When L0 compaction runs, it keeps only moveKey3 because the number of
versions to keep is set to 1. (we've dropped moveKey1's latest version)

The new arrangement of keys is
L0 => ....
L1 => (moveKey3 => vlog15)
L2 => ....
L3 => (moveKey1 => vlog6)

Now if we try to GC vlog file 10, the entry read from vlog file will
point to vlog10 but the entry read from LSM Tree will point to vlog6.
The move key read from LSM tree will point to vlog6 because we've asked
for version 1 of the move key.

This might seem like an issue but it's not really an issue because the
user has set the number of versions to keep to 1 and the latest version
of moveKey points to the correct vlog file and offset. The stale move
key on L3 will be eventually dropped by compaction because there is a
newer version in the upper levels.
```

(cherry picked from commit 2a90c66)

* Avoid sync in inmemory mode (#1190)

This makes db.Sync() no-op when badger is running in in-memory mode.
The previous code would unnecessarily load up an atomic and
acquire locks.

(cherry picked from commit 2698bfc)

* Use fastRand instead of locked-rand in skiplist (#1173)

The math/rand package (https://golang.org/src/math/rand/rand.go) uses
a global lock to allow concurrent access to the rand object.

The PR replaces `math.Rand` with `ristretto/z.FastRand()`. `FastRand`
is much faster than `math.Rand` and `rand.New(..)` generators.

The change improves concurrent writes to skiplist by ~30%
```go
func BenchmarkWrite(b *testing.B) {
	value := newValue(123)
	l := NewSkiplist(int64((b.N + 1) * MaxNodeSize))
	defer l.DecrRef()
	b.ResetTimer()
	b.RunParallel(func(pb *testing.PB) {
		rng := rand.New(rand.NewSource(time.Now().UnixNano()))
		for pb.Next() {
			l.Put(randomKey(rng), y.ValueStruct{Value: value, Meta: 0, UserMeta: 0})
		}
	})
}
```
```
name      old time/op  new time/op  delta
Write-16   657ns ± 3%   441ns ± 1%  -32.94%  (p=0.000 n=9+10)
```

(cherry picked from commit 9d6512b)

* Add Jaegar to list of projects (#1192)


(cherry picked from commit 01a00cb)

* Run all tests on CI (#1189)

This could possibly be a bug in `go test` command
golang/go#36527 .

The `go test` command would skip tests in sub-packages if
the top-level package has a `custom flag` defined and the
sub-packages don't define it.

Issue golang/go#36527 (comment)
has an example of this.

This PR also removes the code from the test that would unnecessary
start a web server. I see two problems here
1. An unnecessary web server running.
2. We cannot run multiple tests are the same time since the second
    run of the test would try to start a web server and
    crash saying `port already in use`.

(cherry picked from commit 5870b7b)

* Improve write stalling on level 0 and 1

We don't need to stall writes if Level 1 does not have enough space.
Level 1 is stored on the disk and it should be okay to have more
number of tables (more size) on Level 1 than the `max level 1 size`.
These tables will eventually be compacted to lower levels.

This commit changes the following
- We no longer stall writes if L1 doesn't have enough space.
- We stall writes on level 0 only if `KeepL0InMemory` is true.
- Upper levels (L0, L1, etc) get priority in compaction (previously,
    level with higher priority score would get preference)

(cherry picked from commit 3747be5)

* Update ristretto to version  8f368f2 (#1195)

This commit pulls following changes from ristretto
```
git log c1f00be0418e...8f368f2 --oneline
```
```

8f368f2 (HEAD -> master) Fix DeepSource warnings
adb35f0 delete item immediately 
fce5e91 Support nil *Cache values in Clear and Close
4e224f9 Add .travis.yml 
8350826 Fix the way metrics are handled for deletions
99d1bbb (tag: v0.0.1) default to 128bit hashing for collision checks
1eea1b1 atomic Get-Delete operation for eviction
8d6a8a7 add cache test for identifying MaxCost overflows
ae09250 use the custom KeyToHash function if one is set
1dd5a4d #19 Fixes memory leak due to Oct 1st regression in processItems
```

(cherry picked from commit 82381ac)

* Support disabling the cache completely. (#1183) (#1185)

The cache can be disabled by setting `opt.MaxCacheSize=0`

(cherry picked from commit 7e5a956)

* Fix L0/L1 stall test (#1201)

The test `TestL0Stall` and `TestL1Stall` would never fail
because of errors in the manifest file. This commit fixes it.

(cherry picked from commit 0acb3f6)

* Disable compression and set ZSTD Compression Level to 1 (#1191)

This PR
- Disables compression. By default, badger does not use any compression.
- Set default ZSTD compression level to 1
    Level 15 is very slow for any practical use of badger.

```
no_compression-16              10	 502848865 ns/op	 165.46 MB/s
zstd_compression/level_1-16     7	 739037966 ns/op	 112.58 MB/s
zstd_compression/level_3-16     7	 756950250 ns/op	 109.91 MB/s
zstd_compression/level_15-16    1	11135686219 ns/op	   7.47 MB/s
```

(cherry picked from commit c3333a5)

* Add support for caching bloomfilters (#1204)

This PR adds support for caching bloom filters in ristretto.
The bloom filters and blocks are removed from the cache 
when the table is deleted.

(cherry picked from commit 4676ca9)

* Rework concurrency semantics of valueLog.maxFid (#1184) (#1187)

Move all access to `valueLog.maxFid` under `valueLog.filesLock`, while
all mutations happen either with writes stopped or sequentially under
valueLog.write.

Fixes a concurrency issue in `valueLog.Read` where the maxFid variable
and the `writableLogOffset` variable could point to two different log files.

(cherry picked from commit 3e25d77)

* Change else-if statements to idiomatic switch statements. (#1207)



(cherry picked from commit eee1602)

* Fix flaky TestPageBufferReader2 test (#1210)

Fixes #1197

The `TestPageBufferReader2` test would fail often because of an
`off-by-1` issue. The problem can be reproduced by setting `randOffset`
to the biggest number that randInt31n may return statically like:

```
    //randOffset := int(rand.Int31n(int32(b.length)))
    randOffset := int(int32(b.length-1))
```

This makes the problem reliably reproducible as the offset is now
pointing at EOF.

Thus changing the line to this should hopefully solve the problem:
`randOffset := int(rand.Int31n(int32(b.length-1

(cherry picked from commit c51748e)

* Replace t.Fatal with require.NoError in tests (#1213)

We are using the following pattern in tests that can be
replaced with `require.NoError(t, err)`.
```go
if err != nil {
    t.Fatal(err)
}
```

(cherry picked from commit 78d405a)

* Add missing package to README for badger.NewEntry (#1223)


(cherry picked from commit 8734e3a)

* Remove ExampleDB_Subscribe Test (#1214)

The test ExampleDB_Subscribe doesn't run reliably on appveyor.
This commit removes it.

(cherry picked from commit e029e93)

* Fix int overflow for 32bit (#1216)

- Fix tests for 32 bit systems
- Enable 32-bit builds on Travis

(cherry picked from commit bce069c)

* Update CHANGELOG for Badger 2.0.2 release. (#1230)

Co-authored-by: Ibrahim Jarif <[email protected]>
(cherry picked from commit e908818)

* Fix changelog for v2.0.2

(cherry picked from commit b81faa5)

Co-authored-by: Christian Stewart <[email protected]>
Co-authored-by: Leyla Galatin <[email protected]>
Co-authored-by: Damien Tournoud <[email protected]>
Co-authored-by: Martin Martinez Rivera <[email protected]>
Co-authored-by: Dieter Plaetinck <[email protected]>
Co-authored-by: Apoorv Vardhan <[email protected]>
jarifibrahim pushed a commit that referenced this pull request Mar 12, 2020
Fix windows build (#1177)
b0941d4 
Fix windows build and some deepsource warnings

(cherry picked from commit 0f2e629)
jarifibrahim pushed a commit that referenced this pull request Mar 24, 2020
Fix windows build (#1177)
ab09a2d 
Fix windows build and some deepsource warnings

(cherry picked from commit 0f2e629)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinmr martinmr martinmr left review comments

@ashish-goswami ashish-goswami ashish-goswami approved these changes

@manishrjain manishrjain Awaiting requested review from manishrjain

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jarifibrahim @coveralls @martinmr @ashish-goswami