Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion internal/badgerd/replication/gossip/pb/gossip.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (c *client) Get(ctx context.Context, m proto.Message, opts ...protodb.GetOp
if o.Filter != nil {
f = o.Filter.Expr()
}
res, err := c.c.Get(ctx, &pb.GetRequest{Search: a, Filter: f, Paging: o.Paging, FieldMask: o.FieldMask, Reverse: o.Reverse, One: o.One})
res, err := c.c.Get(ctx, &pb.GetRequest{Search: a, Filter: f, Paging: o.Paging, FieldMask: o.FieldMask, Reverse: o.Reverse, One: o.One, OrderBy: o.OrderBy})
if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -264,7 +264,7 @@ func (t *txc) Get(ctx context.Context, m proto.Message, opts ...protodb.GetOptio
}
if err := t.txn.Send(&pb.TxRequest{
Request: &pb.TxRequest_Get{
Get: &pb.GetRequest{Search: a, Filter: f, Paging: o.Paging, FieldMask: o.FieldMask, One: o.One},
Get: &pb.GetRequest{Search: a, Filter: f, Paging: o.Paging, FieldMask: o.FieldMask, Reverse: o.Reverse, One: o.One, OrderBy: o.OrderBy},
},
}); err != nil {
return nil, nil, err
Expand Down
112 changes: 112 additions & 0 deletions internal/db/index_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,110 @@ func TestIndexReversePaging(t *testing.T) {
require.Equal(t, "k2", keyFromMessage(t, res[0]))
}

func TestOrderByIndexedPagingAndKeyTieBreak(t *testing.T) {
ctx := context.Background()
path := t.TempDir()

dbif, err := Open(ctx, WithPath(path), WithApplyDefaults(true))
require.NoError(t, err)
defer dbif.Close()

db := dbif.(*db)
fd := buildIndexedFileDescriptor(t)
require.NoError(t, db.RegisterProto(ctx, fd))

md, err := lookupMessage(db, "tests.index.Indexed")
require.NoError(t, err)

_, err = db.Set(ctx, newIndexedMessage(md, "k2", "up", nil, "admin", "a"))
require.NoError(t, err)
_, err = db.Set(ctx, newIndexedMessage(md, "k1", "up", nil, "admin", "b"))
require.NoError(t, err)
_, err = db.Set(ctx, newIndexedMessage(md, "k0", "down", nil, "admin", "c"))
require.NoError(t, err)

paging := &protodb.Paging{Limit: 2}
res, pi, err := db.Get(ctx, dynamicpb.NewMessage(md), protodb.WithOrderByAsc("status"), protodb.WithPaging(paging))
require.NoError(t, err)
require.Len(t, res, 2)
require.True(t, pi.GetHasNext())
require.Equal(t, []string{"k0", "k1"}, keysFromMessages(t, res))

paging = &protodb.Paging{Limit: 2, Token: pi.GetToken()}
res, pi, err = db.Get(ctx, dynamicpb.NewMessage(md), protodb.WithOrderByAsc("status"), protodb.WithPaging(paging))
require.NoError(t, err)
require.Len(t, res, 1)
require.False(t, pi.GetHasNext())
require.Equal(t, []string{"k2"}, keysFromMessages(t, res))
}

func TestOrderByKeyDesc(t *testing.T) {
ctx := context.Background()
path := t.TempDir()

dbif, err := Open(ctx, WithPath(path), WithApplyDefaults(true))
require.NoError(t, err)
defer dbif.Close()

db := dbif.(*db)
fd := buildIndexedFileDescriptor(t)
require.NoError(t, db.RegisterProto(ctx, fd))

md, err := lookupMessage(db, "tests.index.Indexed")
require.NoError(t, err)

_, err = db.Set(ctx, newIndexedMessage(md, "k1", "up", nil, "admin", "a"))
require.NoError(t, err)
_, err = db.Set(ctx, newIndexedMessage(md, "k3", "up", nil, "admin", "b"))
require.NoError(t, err)
_, err = db.Set(ctx, newIndexedMessage(md, "k2", "up", nil, "admin", "c"))
require.NoError(t, err)

res, _, err := db.Get(ctx, dynamicpb.NewMessage(md), protodb.WithOrderByDesc("key"))
require.NoError(t, err)
require.Equal(t, []string{"k3", "k2", "k1"}, keysFromMessages(t, res))
}

func TestOrderByRejectsNonIndexedField(t *testing.T) {
ctx := context.Background()
path := t.TempDir()

dbif, err := Open(ctx, WithPath(path), WithApplyDefaults(true))
require.NoError(t, err)
defer dbif.Close()

db := dbif.(*db)
fd := buildIndexedFileDescriptor(t)
require.NoError(t, db.RegisterProto(ctx, fd))

md, err := lookupMessage(db, "tests.index.Indexed")
require.NoError(t, err)

_, _, err = db.Get(ctx, dynamicpb.NewMessage(md), protodb.WithOrderByAsc("description"))
require.Error(t, err)
require.ErrorContains(t, err, "must be indexed")
}

func TestOrderByRejectsReverseCombination(t *testing.T) {
ctx := context.Background()
path := t.TempDir()

dbif, err := Open(ctx, WithPath(path), WithApplyDefaults(true))
require.NoError(t, err)
defer dbif.Close()

db := dbif.(*db)
fd := buildIndexedFileDescriptor(t)
require.NoError(t, db.RegisterProto(ctx, fd))

md, err := lookupMessage(db, "tests.index.Indexed")
require.NoError(t, err)

_, _, err = db.Get(ctx, dynamicpb.NewMessage(md), protodb.WithOrderByAsc("status"), protodb.WithReverse())
require.Error(t, err)
require.ErrorContains(t, err, "cannot be combined")
}

func TestIndexAndOr(t *testing.T) {
ctx := context.Background()
path := t.TempDir()
Expand Down Expand Up @@ -740,6 +844,14 @@ func keyFromMessage(t *testing.T, msg proto.Message) string {
return pm.Get(fd).String()
}

func keysFromMessages(t *testing.T, msgs []proto.Message) []string {
out := make([]string, 0, len(msgs))
for _, msg := range msgs {
out = append(out, keyFromMessage(t, msg))
}
return out
}

func countIndexFieldKeys(db *db, md protoreflect.MessageDescriptor, fieldPath string) (int, error) {
count := 0
path, err := fieldNumberPath(md, fieldPath)
Expand Down
Loading
Loading