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

Support for conditional upsert #63

Merged
merged 4 commits into from Sep 3, 2019

Conversation

@prashant-shahi
Copy link
Member

commented Aug 29, 2019

Adding support for conditional upsert.


This change is Reviewable

@prashant-shahi prashant-shahi requested review from paulftw and mangalaman93 Aug 29, 2019

@pullrequest
Copy link

left a comment

A review job has been created and sent to the PullRequest network.


@prashant-shahi you can click here to see the review status or cancel the code review job.

@pullrequest
Copy link

left a comment

1 Message
The description of this pull request is blank. Adding a high-level summary will help our reviewers provide better feedback.

@pullrequest
Copy link

left a comment

👍 this looks good other than the issue of accessing a function vs calling a function I pointed out.


Reviewed with ❤️ by PullRequest

protos/api.proto Outdated Show resolved Hide resolved
protos/api.proto Outdated Show resolved Hide resolved
src/txn.ts Outdated Show resolved Hide resolved
@pullrequest
Copy link

left a comment

Looks good to me - minor comments inline :)


Reviewed with ❤️ by PullRequest

protos/api.proto Outdated Show resolved Hide resolved

@prashant-shahi prashant-shahi changed the title [WIP] Support for conditional upsert Support for conditional upsert Sep 2, 2019

@paulftw
Copy link
Contributor

left a comment

Reviewed 22 of 26 files at r1, 6 of 6 files at r2.
Reviewable status: all files reviewed, 5 unresolved discussions (waiting on @mangalaman93, @prashant-shahi, and @pullrequest[bot])


protos/api.proto, line 170 at r2 (raw file):

}

// vim: noexpandtab sw=2 ts=2

Just to confirm: this file is an identical copy of the api.proto in the main dgraph repo, right?

@paulftw
paulftw approved these changes Sep 2, 2019
Copy link
Contributor

left a comment

Reviewable status: all files reviewed, 6 unresolved discussions (waiting on @mangalaman93, @prashant-shahi, and @pullrequest[bot])

a discussion (no related file):
It seems like linReads is a separate unrelated API change, and if such it should be done in a separate PR.
OK to commit it as is since 1.1 release is so close, next time let's try to have a PR per feature.

Overall looks good to me.


@prashant-shahi
Copy link
Member Author

left a comment

Reviewable status: all files reviewed, 6 unresolved discussions (waiting on @mangalaman93, @paulftw, and @pullrequest[bot])

a discussion (no related file):

Previously, paulftw (Paul Korzhyk) wrote…

It seems like linReads is a separate unrelated API change, and if such it should be done in a separate PR.
OK to commit it as is since 1.1 release is so close, next time let's try to have a PR per feature.

Overall looks good to me.

oh, sure. will do it from now on.



protos/api.proto, line 18 at r1 (raw file):

Previously, pullrequest[bot] wrote…

Camel case with an initial capital is known as Pascal case.

Done.


protos/api.proto, line 19 at r1 (raw file):

Previously, pullrequest[bot] wrote…

underscore_separated_names is known as Snake case

Done.


protos/api.proto, line 26 at r1 (raw file):

Previously, pullrequest[bot] wrote…

Do these commented out lines still need to be part of the code? If yes - probably make them all one multiline comment, or multiple single-line comments.

Right now there are multiple multiline comments of 1 line each.

Done.


protos/api.proto, line 170 at r2 (raw file):

Previously, paulftw (Paul Korzhyk) wrote…

Just to confirm: this file is an identical copy of the api.proto in the main dgraph repo, right?

Yes. It is identical. Just that few comments have been either altered and removed.

@coveralls

This comment has been minimized.

Copy link

commented Sep 3, 2019

Coverage Status

Coverage decreased (-0.3%) to 93.284% when pulling d02d41a on prashant/merging-mutate-and-query into 0f08e71 on master.

@prashant-shahi prashant-shahi merged commit 7169903 into master Sep 3, 2019

2 of 4 checks passed

Build (dgraph-js) TeamCity build started
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@prashant-shahi prashant-shahi deleted the prashant/merging-mutate-and-query branch Sep 3, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.