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

test(datastore): improve concurrency of LQ test #6610

Merged
merged 4 commits into from
Sep 6, 2022
Merged

test(datastore): improve concurrency of LQ test #6610

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65fe164
test(datastore): improve concurrency of LQ test
telpirion Sep 2, 2022
1c7505d
Merge branch 'main' into datastore-flake-largequery
telpirion Sep 2, 2022
b321cea
Merge branch 'main' into datastore-flake-largequery
telpirion Sep 6, 2022
9f3054a
Merge branch 'main' into datastore-flake-largequery
telpirion Sep 6, 2022
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
33 changes: 16 additions & 17 deletions datastore/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"reflect"
"sort"
"strings"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -584,9 +583,6 @@ func TestIntegration_LargeQuery(t *testing.T) {

q := NewQuery("SQChild").Ancestor(parent).Filter("T=", now).Order("I")

// Wait group to allow us to run query tests in parallel below.
var wg sync.WaitGroup

// Check we get the expected count and results for various limits/offsets.
queryTests := []struct {
limit, offset, want int
Expand All @@ -607,12 +603,13 @@ func TestIntegration_LargeQuery(t *testing.T) {
{limit: 1000, offset: 100, want: n - 100},
{limit: 500, offset: 500, want: n - 500},
}
for _, tt := range queryTests {
for i, tt := range queryTests {
q := q.Limit(tt.limit).Offset(tt.offset)
wg.Add(1)
limit := tt.limit
offset := tt.offset
want := tt.want

go func(limit, offset, want int) {
defer wg.Done()
t.Run(fmt.Sprintf("queryTest_%d", i), func(t *testing.T) {
// Check Count returns the expected number of results.
count, err := client.Count(ctx, q)
if err != nil {
Expand All @@ -638,10 +635,11 @@ func TestIntegration_LargeQuery(t *testing.T) {
break
}
}
}(tt.limit, tt.offset, tt.want)
t.Parallel()
})
}

// Also check iterator cursor behaviour.
// Also check iterator cursor behavior.
cursorTests := []struct {
limit, offset int // Query limit and offset.
count int // The number of times to call "next"
Expand All @@ -662,12 +660,13 @@ func TestIntegration_LargeQuery(t *testing.T) {
{count: 200, offset: 500, limit: -1, want: 700},
{count: 200, offset: 1000, limit: -1, want: -1}, // No more results.
}
for _, tt := range cursorTests {
wg.Add(1)

go func(count, limit, offset, want int) {
defer wg.Done()
for i, tt := range cursorTests {
count := tt.count
limit := tt.limit
offset := tt.offset
want := tt.want

t.Run(fmt.Sprintf("cursorTest_%d", i), func(t *testing.T) {
ctx := context.WithValue(ctx, ckey{}, fmt.Sprintf("c=%d,l=%d,o=%d", count, limit, offset))
// Run iterator through count calls to Next.
it := client.Run(ctx, q.Limit(limit).Offset(offset).KeysOnly())
Expand Down Expand Up @@ -703,9 +702,9 @@ func TestIntegration_LargeQuery(t *testing.T) {
case entity.I != want:
t.Errorf("count=%d, limit=%d, offset=%d: got.I = %d, want %d", count, limit, offset, entity.I, want)
}
}(tt.count, tt.limit, tt.offset, tt.want)
t.Parallel()
})
}
wg.Wait()
}

func TestIntegration_EventualConsistency(t *testing.T) {
Expand Down