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

Make dgraphloader pass errors up #1400

Closed
wants to merge 2 commits into from
Closed

Make dgraphloader pass errors up #1400

wants to merge 2 commits into from

Conversation

srh
Copy link

@srh srh commented Sep 5, 2017

We were aborting instead of expressing useful output semi-randomly when the user pressed Ctrl+C.

Connected to #1376.


This change is Reviewable

@srh
Copy link
Author

srh commented Sep 5, 2017

Review status: 0 of 1 files reviewed at latest revision, 2 unresolved discussions.


cmd/dgraphloader/main.go, line 167 at r1 (raw file):

		err = readLine(bufReader, &buf)
		if err != nil {
			if err != io.EOF {

Moved this up here (without changing behavior of the code, other than that the value gets returned) because it's more readable (to see that this is the only err case that flows into the != EOF check).


cmd/dgraphloader/main.go, line 199 at r1 (raw file):

		if batchSize >= *numRdf {
			if err = dgraphClient.BatchSetWithMark(r, absPath, line); err != nil {
				return err

Sacrificed some error messaging for simplicity, since we have err != context.Canceled logic elsewhere.


Comments from Reviewable

@pawanrawal
Copy link
Contributor

:lgtm:


Review status: 0 of 1 files reviewed at latest revision, 2 unresolved discussions.


Comments from Reviewable

@srh
Copy link
Author

srh commented Sep 5, 2017

In master as of 34cd170.

@srh srh closed this Sep 5, 2017
@srh srh removed the in progress label Sep 5, 2017
@pawanrawal pawanrawal deleted the sam/1376 branch December 19, 2017 08:40
jarifibrahim pushed a commit that referenced this pull request Jul 11, 2020
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
Development

Successfully merging this pull request may close these issues.

2 participants