chore: Merge release/v20.07 to release/v20.07-slash #6740
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Port GraphQL docs to v20.07 This reverts commit 8db61a3. Co-authored-by: Pawan Rawal <pawan0201@gmail.com>
Passing a few variables to the hugo theme
Co-authored-by: Sankalan Parajuli <sankalan.13@gmail.com>
…6272) (#6276) Currently a node is marked as visited if it's been visited before AND has been visited from the same source UID. In dense graphs, the second condition leads to exponential growth of the data and to other issues such as responses that are too big to encode. Removing this condition fixes the issue. Fixed tests and verified the new output makes sense. Fixes DGRAPH-2337 (cherry picked from commit 3638c12)
Clear out the start_ts field in the postings of deltas before they are marshalled to avoid storing that field in disk. This field is only meant to be used during in-memory processing. Related to https://discuss.dgraph.io/t/start-ts-not-being-cleared-before-postings-are-written-to-disk/9146 (cherry picked from commit fbbd731)
Reference: [Discuss Post](https://discuss.dgraph.io/t/custom-dql-typename-bug-strange-behaviour/9341) (cherry picked from commit 0faae40)
Fixes: #5516 Fixes: [Discuss Issue](https://discuss.dgraph.io/t/graphql-fragments-generates-unexpected-behaviour/7470) (cherry picked from commit dcce8bf)
Fixes DGRAPH-2181 The queries in dgraph are processed in separate goroutines. The pstore badger DB could be closed while the query was being processed. This causes panics such as ``` panic: runtime error: invalid memory address or nil pointer dereference panic: Unclosed iterator at time of Txn.Discard. [signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x11d2311] goroutine 19298 [running]: github.com/dgraph-io/badger/v2.(*Txn).Discard(0xc05586bc20) /go/pkg/mod/github.com/dgraph-io/badger/v2@v2.0.1-rc1.0.20200718033852-37ee16d8ad1c/txn.go:517 +0xc1 panic(0x19e26a0, 0x2988560) /usr/local/go/src/runtime/panic.go:969 +0x166 github.com/dgraph-io/badger/v2/skl.(*Skiplist).IncrRef(...) ``` This PR attempts to reduce the number of such crashes. This PR doesn't fix the actual issue but it tries to reduce the probability of such crashes by checking if badger is not closed before accessing it. An ideal fix would be to stop all the goroutines started by dgraph while closing DB so that we don't try to read from a closed badger DB. (cherry picked from commit 3cea0fe)
This badger update brings the following changes from badger. https://github.com/dgraph-io/badger/commits/b41e77a Fix(cleanup): Avoid truncating in value.Open on error https://github.com/dgraph-io/badger/commits/a0d4903 fix(cleanup): Do not close cache before compaction
…GQLSchema (#6349) (#6354) * fix(GraphQL): incorrect generatedSchema in updateGQLSchema (#6349) This PR fixes the behaviour where Dgraph schema was being given as generatedSchema field in updateGQLSchema request. Now, the newly generated complete GraphQL schema is given as generatedSchema. (cherry picked from commit 0b8681c) # Conflicts: # graphql/e2e/schema/schema_test.go
The test and utility were assuming that node 1 was in group 1, node 2 in group 2, and so on. This is not true all the time, hence the flakiness. Fixing the code to not make this assumptions as well as retrying the DropAll in NodesSetup to ensure all the nodes are up before proceeding with the test. (cherry picked from commit 36638a7)
#6634) fixed : Pagination param "after" does not work when using func: uid(v)
This PR fixes incorrect linking of objects with `hasInverse`. For example
For this schema, `type Country` has field `state` with `hasInverse` predicate.
```
type Country {
id: ID!
name: String! @search(by: [trigram, hash])
states: [State] @hasInverse(field: country)
}
type State {
id: ID!
xcode: String! @id @search(by: [regexp])
name: String!
capital: String
country: Country
}
```
And for the following mutation
```
mutation addCountry($input: [AddCountryInput!]!) {
addCountry(input: $input) {
country {
name
states{
xcode
name
country{
name
}
}
}
}
}
```
with `input`:
```
{
"input": {
"name": "A Country",
"states": [
{
"xcode": "abc",
"name": "Alphabet"
},
{
"xcode": "def",
"name": "Vowel",
"country": {
"name": "B country"
}
}
]
}
}
```
should result in
```
{
"addCountry": {
"country": [
{
"name": "A country",
"states": [
{
"country": {
"name": "A country"
},
"name": "Alphabet",
"xcode": "abc"
},
{
"country": {
"name": "A country"
},
"name": "Vowel",
"xcode": "def"
}
]
}
]
}
}`
```
whereas the incorrect output was
```
{
"addCountry": {
"country": [
{
"name": "A country",
"states": [
{
"country": {
"name": "A country"
},
"name": "Alphabet",
"xcode": "abc"
},
{
"country": {
"name": "B country"
},
"name": "Vowel",
"xcode": "def"
}
]
}
]
}
}`
```
This PR fixes this issue.
(cherry picked from commit e496467)
This is related to GRAPHQL-564. as is Dgraph reserved keyword. It's being used by DQL to identify variables. This PR is to restrict the naming for fields with the name as.
(cherry picked from commit 014ee10)
The k-shortest path query sometimes returns a wrong response. The cause of this issue is inappropriate use of sync.pools. Whenever a valid path is found a new variable is assigned with this route and that variable is appended in the kroutes (which is then parsed to produce response). But the route is also put in the sync.pool. Since the route is a structure containing a pointer to slice along with other fields, when it is fetched back from the pool in future then any mutation on this fetched route causes modification in the kroutes, resulting in garbage response. This issue is fixed by making a copy of the route struct rather than just assigning it to a variable, which causes a shallow copy. (cherry picked from commit 4792d8b)
(cherry picked from commit a8a47af) Co-authored-by: Manish R Jain <manish@dgraph.io>
Fixes DGRAPH-2419 Fixes [Discuss Issue](https://discuss.dgraph.io/t/acl-login-will-fail-if-auth-token-enabled-in-v20-07-0/10044) This PR fixes Poor-man's auth for following endpoints: * `/login` * `/admin` (cherry picked from commit 4fc328d) # Conflicts: # graphql/e2e/common/common.go
…imanyu/release-slash-merge # Conflicts: # dgraph/cmd/alpha/run.go # dgraph/cmd/bulk/reduce.go # dgraph/cmd/zero/raft.go # edgraph/server.go # go.mod # go.sum # graphql/e2e/common/common.go # graphql/e2e/common/fragment.go # graphql/e2e/common/mutation.go # graphql/e2e/common/query.go # graphql/e2e/custom_logic/custom_logic_test.go # graphql/e2e/directives/schema_response.json # graphql/e2e/normal/schema_response.json # graphql/e2e/schema/generatedSchema.graphql # graphql/resolve/resolver.go # graphql/schema/testdata/schemagen/output/type-without-orderables.graphql # protos/pb/pb.pb.go # wiki/content/enterprise-features/binary-backups.md # wiki/content/graphql/admin/index.md # wiki/content/graphql/schema/reserved.md
…imanyu/release-slash-merge # Conflicts: # dgraph/cmd/alpha/run.go # dgraph/cmd/bulk/reduce.go # dgraph/cmd/zero/raft.go # edgraph/server.go # go.mod # go.sum # graphql/e2e/common/common.go # graphql/e2e/common/fragment.go # graphql/e2e/common/mutation.go # graphql/e2e/common/query.go # graphql/e2e/custom_logic/custom_logic_test.go # graphql/e2e/directives/schema_response.json # graphql/e2e/normal/schema_response.json # graphql/e2e/schema/generatedSchema.graphql # graphql/resolve/resolver.go # graphql/schema/testdata/schemagen/output/type-without-orderables.graphql # protos/pb/pb.pb.go # wiki/content/enterprise-features/binary-backups.md # wiki/content/graphql/admin/index.md # wiki/content/graphql/schema/reserved.md
abhimanyusinghgaur
requested review from
danielmai,
manishrjain,
MichaelJCompton,
pawanrawal and
vvbalaji-dgraph
as code owners
github-actions
bot
added
area/bulk-loader
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge release/v20.07-slash with release/v20.07.
This change is
Docs Preview: