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

chore(upgrade): run tests from v23.1.0 -> main #9097

Merged
merged 2 commits into from
May 28, 2024
Merged

chore(upgrade): run tests from v23.1.0 -> main #9097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbb5c6b
chore(upgrade): run tests from v23.1.0 -> main
mangalaman93 May 24, 2024
2310a34
fix failing upgrade tests
shivaji-dgraph May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions dgraphtest/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,8 @@ func AllUpgradeCombos(v20 bool) []UpgradeCombo {
// In mainCombos list, we keep latest version to current HEAD as well as
// older versions of dgraph to ensure that a change does not cause failures.
mainCombos := []UpgradeCombo{
{"v23.0.1", localVersion, BackupRestore},
{"v23.0.1", localVersion, InPlace},
{"v21.03.0", "4fc9cfd", BackupRestore},
{"v23.1.0", localVersion, BackupRestore},
{"v23.1.0", localVersion, InPlace},
}

if v20 {
Expand Down
59 changes: 32 additions & 27 deletions query/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,14 @@ type Speaker {
language
}

type User {
name
password
gender
friend
alive
}

name : string @index(term, exact, trigram) @count @lang .
name_lang : string @lang .
lang_type : string @index(exact) .
Expand Down Expand Up @@ -337,7 +345,6 @@ tweet-c : string @index(fulltext) .
tweet-d : string @index(trigram) .
name2 : string @index(term) .
age2 : int @index(int) .
vectorNonIndex : float32vector .
`

func populateCluster(dc dgraphtest.Cluster) {
Expand All @@ -348,32 +355,30 @@ func populateCluster(dc dgraphtest.Cluster) {
// all the UIDs we are using during the tests.
x.Panic(dc.AssignUids(client.Dgraph, 65536))

higher, err := dgraphtest.IsHigherVersion(dc.GetVersion(), "160a0faa5fc6233fdc5a4caa4a7a3d1591f460d0")
x.Panic(err)
var ts string
if higher {
ts = testSchema + `type User {
name
password
gender
friend
alive
user_profile
}
user_profile : float32vector @index(hnsw(metric:"euclidian")) .`
} else {
ts = testSchema + `type User {
name
password
gender
friend
alive
}`
}
setSchema(ts)
err = addTriplesToCluster(`
<1> <vectorNonIndex> "[1.0, 1.0, 2.0, 2.0]" .
<2> <vectorNonIndex> "[2.0, 1.0, 2.0, 2.0]" .
// higher, err := dgraphtest.IsHigherVersion(dc.GetVersion(), "160a0faa5fc6233fdc5a4caa4a7a3d1591f460d0")
// x.Panic(err)
// var ts string
// if higher {
// ts = testSchema + `type User {
// name
// password
// gender
// friend
// alive
// user_profile
// }
// user_profile : float32vector @index(hnsw(metric:"euclidian")) .`
// } else {
// ts = testSchema + `type User {
// name
// password
// gender
// friend
// alive
// }`
// }
setSchema(testSchema)
err := addTriplesToCluster(`
<1> <name> "Michonne" .
<2> <name> "King Lear" .
<3> <name> "Margaret" .
Expand Down
36 changes: 0 additions & 36 deletions query/query0_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,6 @@ import (
"github.com/dgraph-io/dgraph/dql"
)

func TestGetVector(t *testing.T) {
query := `
{
me(func: has(vectorNonIndex)) {
a as vectorNonIndex
}
aggregation() {
avg(val(a))
sum(val(a))
}
}
`
js := processQueryNoErr(t, query)
k := `{
"data": {
"me": [
{
"vectorNonIndex": [1,1,2,2]
},
{
"vectorNonIndex": [2,1,2,2]
}
],
"aggregation": [
{
"avg(val(a))": [1.5,1,2,2]
},
{
"sum(val(a))": [3,2,4,4]
}
]
}
}`
require.JSONEq(t, k, js)
}

func TestGetUID(t *testing.T) {
query := `
{
Expand Down
63 changes: 63 additions & 0 deletions query/vector/vector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,3 +727,66 @@ func TestVectorTwoTxnWithoutCommit(t *testing.T) {
require.Contains(t, resp, vectors[i])
}
}

func TestGetVector(t *testing.T) {
setSchema("vectorNonIndex : float32vector .")

rdfs := `
<1> <vectorNonIndex> "[1.0, 1.0, 2.0, 2.0]" .
<2> <vectorNonIndex> "[2.0, 1.0, 2.0, 2.0]" .`
require.NoError(t, addTriplesToCluster(rdfs))

query := `
{
me(func: has(vectorNonIndex)) {
a as vectorNonIndex
}
aggregation() {
avg(val(a))
sum(val(a))
}
}
`
js := processQueryNoErr(t, query)
k := `{
"data": {
"me": [
{
"vectorNonIndex": [
1,
1,
2,
2
]
},
{
"vectorNonIndex": [
2,
1,
2,
2
]
}
],
"aggregation": [
{
"avg(val(a))": [
1.5,
1,
2,
2
]
},
{
"sum(val(a))": [
3,
2,
4,
4
]
}
]
}
}`
require.JSONEq(t, k, js)
}