syncbase: Implementation and tests for Glob and Scan.
This CL includes a few smaller changes on the side:
- Implements row-level Get/Put/Delete, needed so we can
test the behavior of Scan. Includes tests for those
methods.
- Enables TestTableCreate and TestTableDelete (since Table
Create/Delete is a prereq for Scan). This required
extending the utilities in testutil/layer.go a bit, and
implementing Table.{Get,Set}Permissions for the "empty
prefix" case.
- Adds FullName() methods to all levels of hierarchy.
I ended up not needing these, but they seem worth keeping
nonetheless.
- Adds various util functions (along with tests for them)
and fixes a few small TODOs.
Change-Id: I55a4b0da9fb8f5551958d09c5ac8afd88dff2ebb
diff --git a/services/syncbase/server/nosql/database.go b/services/syncbase/server/nosql/database.go
index 03377fc..7ca9271 100644
--- a/services/syncbase/server/nosql/database.go
+++ b/services/syncbase/server/nosql/database.go
@@ -10,6 +10,7 @@
"v.io/syncbase/x/ref/services/syncbase/store"
"v.io/syncbase/x/ref/services/syncbase/store/memstore"
"v.io/v23/context"
+ "v.io/v23/naming"
"v.io/v23/rpc"
"v.io/v23/security/access"
"v.io/v23/verror"
@@ -34,7 +35,7 @@
// Designed for use from within App.CreateNoSQLDatabase.
func NewDatabase(ctx *context.T, call rpc.ServerCall, a util.App, name string, perms access.Permissions) (*database, error) {
if perms == nil {
- return nil, verror.New(verror.ErrInternal, nil, "perms must be specified")
+ return nil, verror.New(verror.ErrInternal, ctx, "perms must be specified")
}
// TODO(sadovsky): Make storage engine pluggable.
d := &database{
@@ -90,7 +91,15 @@
return data.Perms, util.FormatVersion(data.Version), nil
}
-// TODO(sadovsky): Implement Glob.
+func (d *database) Glob__(ctx *context.T, call rpc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
+ // Check perms.
+ sn := d.st.NewSnapshot()
+ if err := util.Get(ctx, call, sn, d, &databaseData{}); err != nil {
+ sn.Close()
+ return nil, err
+ }
+ return util.Glob(ctx, call, pattern, sn, util.TablePrefix)
+}
////////////////////////////////////////
// util.Database methods
