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

Bulkloader stage 3 (reduce) #1410

Merged

peterstace merged 9 commits into master from bulkloader_stage_3

Sep 7, 2017

peterstace commented Sep 7, 2017 •

edited by manishrjain

Loading

This change is

Peter Stace added 8 commits

September 6, 2017 17:47


          First stage of reduce

ac0b3f9


          Write out to badger

28ba450


          Add schema

711d71d


          WIP for lease

fb0c9fe


          Finish lease

e83c617


          Add posting list count to progress

3771c9f


          Misc changes from self review

2263d7c


          Bump set args onto same line

5986f47

peterstace requested a review from manishrjain

September 7, 2017 00:15

manishrjain added the in progress label

Contributor

manishrjain commented Sep 7, 2017

Reviewed 8 of 8 files at r1.
Review status: all files reviewed at latest revision, 5 unresolved discussions.

cmd/bulkloader/loader.go, line 155 at r1 (raw file):

}

func (ld *loader) schemaStage() {

writeSchema.

cmd/bulkloader/loader.go, line 159 at r1 (raw file):

}

func (ld *loader) leaseStage() {

writeLease.

cmd/bulkloader/loader.go, line 161 at r1 (raw file):

func (ld *loader) leaseStage() {
	var buf [8]byte
	binary.BigEndian.PutUint64(buf[:], ld.um.lease())

Add a TODO to revisit this after dgraphzero.

cmd/bulkloader/reduce.go, line 22 at r1 (raw file):

		atomic.AddInt64(&prog.reduceKeyCount, 1)
		e := &badger.Entry{Key: currentKey}
		if len(pl.Postings) == 0 {

Add a comment explaining this arrangement.

cmd/bulkloader/uid_map.go, line 52 at r1 (raw file):

func (m *uidMap) lease() uint64 {
	// Round up to nearest X0001.
	return m.lastUID/10000*10000 + 10001

Set the lastUID directly.

Comments from Reviewable


          Address code review comments

e5337ec

Author

peterstace commented Sep 7, 2017

Review status: 4 of 8 files reviewed at latest revision, 5 unresolved discussions.

cmd/bulkloader/loader.go, line 155 at r1 (raw file):

Previously, manishrjain (Manish R Jain) wrote…

writeSchema.

Done.

cmd/bulkloader/loader.go, line 159 at r1 (raw file):

Previously, manishrjain (Manish R Jain) wrote…

writeLease.

Done.

cmd/bulkloader/loader.go, line 161 at r1 (raw file):

Previously, manishrjain (Manish R Jain) wrote…

Add a TODO to revisit this after dgraphzero.

Done.

cmd/bulkloader/reduce.go, line 22 at r1 (raw file):

Previously, manishrjain (Manish R Jain) wrote…

Add a comment explaining this arrangement.

Done.

cmd/bulkloader/uid_map.go, line 52 at r1 (raw file):

Previously, manishrjain (Manish R Jain) wrote…

Set the lastUID directly.

Done.

Comments from Reviewable

peterstace merged commit 5e4f08b into master

manishrjain removed the in progress label

pawanrawal deleted the bulkloader_stage_3 branch

December 19, 2017 08:40

jarifibrahim pushed a commit that referenced this pull request


          Update badger to v20.0.7-rc1

07e288e

This commit brings following new changes from badger
This commit also disable conflict detection in badger to save memory.

```
0dfb8b4 Changelog for v20.07.0 (#1411)
03ba278 Add missing changelog for v2.0.3 (#1410)
6001230 Revert "Compress/Encrypt Blocks in the background (#1227)" (#1409)
800305e Revert "Buffer pool for decompression (#1308)" (#1408)
63d9309 Revert "fix: Fix race condition in block.incRef (#1337)" (#1407)
e0d058c Revert "add assert to check integer overflow for table size (#1402)" (#1406)
d981f47 return error if the vlog writes exceeds more that 4GB. (#1400)
7f4e4b5 add assert to check integer overflow for table size (#1402)
8e896a7 Add a contribution guide (#1379)
b79aeef Avoid panic on multiple closer.Signal calls (#1401)
717b89c Enable cross-compiled 32bit tests on TravisCI (#1392)
09dfa66 Update ristretto to commit f66de99 (#1391)
509de73 Update head while replaying value log (#1372)
e013bfd Rework DB.DropPrefix (#1381)
3042e37 pre allocate cache key for the block cache and the bloom filter cache (#1371)
675efcd Increase default valueThreshold from 32B to 1KB (#1346)
158d927 Remove second initialization of writech in Open (#1382)
d37ce36 Tests: Use t.Parallel in TestIteratePrefix tests  (#1377)
3f4761d Force KeepL0InMemory to be true when InMemory is true (#1375)
dd332b0 Avoid panic in filltables() (#1365)
c45d966 Fix assert in background compression and encryption. (#1366)
```

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet