syncbase: switch to /$/ hierarchy separator scheme
For detailed description, see http://v.io/c/15374
MultiPart: 2/5
Change-Id: I5aa7815bf194b236c5d094c0e80ce853c72fbeaf
diff --git a/services/syncbase/server/app.go b/services/syncbase/server/app.go
index e07094c..9bcec0d 100644
--- a/services/syncbase/server/app.go
+++ b/services/syncbase/server/app.go
@@ -9,7 +9,6 @@
"sync"
"v.io/v23/context"
- "v.io/v23/glob"
"v.io/v23/rpc"
"v.io/v23/security/access"
wire "v.io/v23/services/syncbase"
@@ -42,6 +41,8 @@
////////////////////////////////////////
// RPC methods
+// TODO(sadovsky): Implement Glob__ or GlobChildren__.
+
// TODO(sadovsky): Require the app name to match the client's blessing name.
// I.e. reserve names at the app level of the hierarchy.
func (a *app) Create(ctx *context.T, call rpc.ServerCall, perms access.Permissions) error {
@@ -83,17 +84,17 @@
return data.Perms, util.FormatVersion(data.Version), nil
}
-func (a *app) GlobChildren__(ctx *context.T, call rpc.GlobChildrenServerCall, matcher *glob.Element) error {
+func (a *app) ListDatabases(ctx *context.T, call rpc.ServerCall) ([]string, error) {
if !a.exists {
- return verror.New(verror.ErrNoExist, ctx, a.name)
+ return nil, verror.New(verror.ErrNoExist, ctx, a.name)
}
// Check perms.
sn := a.s.st.NewSnapshot()
if err := util.GetWithAuth(ctx, call, sn, a.stKey(), &appData{}); err != nil {
sn.Abort()
- return err
+ return nil, err
}
- return util.Glob(ctx, call, matcher, sn, sn.Abort, util.JoinKeyParts(util.DbInfoPrefix, a.name))
+ return util.ListChildren(ctx, call, sn, util.JoinKeyParts(util.DbInfoPrefix, a.name))
}
////////////////////////////////////////
diff --git a/services/syncbase/server/dispatcher.go b/services/syncbase/server/dispatcher.go
index dac3d34..06a6757 100644
--- a/services/syncbase/server/dispatcher.go
+++ b/services/syncbase/server/dispatcher.go
@@ -34,21 +34,26 @@
func (disp *dispatcher) Lookup(ctx *context.T, suffix string) (interface{}, security.Authorizer, error) {
suffix = strings.TrimPrefix(suffix, "/")
- parts := strings.SplitN(suffix, "/", 2)
if len(suffix) == 0 {
return wire.ServiceServer(disp.s), auth, nil
}
+ // If the first slash-separated component of suffix is SyncbaseSuffix,
+ // dispatch to the sync module.
+ parts := strings.SplitN(suffix, "/", 2)
if parts[0] == util.SyncbaseSuffix {
return interfaces.SyncServer(disp.s.sync), auth, nil
}
+ // Otherwise, split on NameSepWithSlashes to get hierarchy component names.
+ parts = strings.SplitN(suffix, pubutil.NameSepWithSlashes, 2)
+
// Validate all key atoms up front, so that we can avoid doing so in all our
// method implementations.
appName := parts[0]
if !pubutil.ValidName(appName) {
- return nil, nil, wire.NewErrInvalidName(nil, suffix)
+ return nil, nil, wire.NewErrInvalidName(ctx, suffix)
}
aExists := false
@@ -74,7 +79,7 @@
// All database, table, and row methods require the app to exist. If it
// doesn't, abort early.
if !aExists {
- return nil, nil, verror.New(verror.ErrNoExist, nil, a.name)
+ return nil, nil, verror.New(verror.ErrNoExist, ctx, a.name)
}
// Note, it's possible for the app to be deleted concurrently with downstream
diff --git a/services/syncbase/server/nosql/database.go b/services/syncbase/server/nosql/database.go
index 1755076..f6e14e1 100644
--- a/services/syncbase/server/nosql/database.go
+++ b/services/syncbase/server/nosql/database.go
@@ -7,13 +7,11 @@
import (
"math/rand"
"path"
- "strconv"
"strings"
"sync"
"time"
"v.io/v23/context"
- "v.io/v23/glob"
"v.io/v23/rpc"
"v.io/v23/security/access"
wire "v.io/v23/services/syncbase/nosql"
@@ -129,6 +127,8 @@
////////////////////////////////////////
// RPC methods
+// TODO(sadovsky): Implement Glob__ or GlobChildren__.
+
func (d *databaseReq) Create(ctx *context.T, call rpc.ServerCall, metadata *wire.SchemaMetadata, perms access.Permissions) error {
if d.exists {
return verror.New(verror.ErrExist, ctx, d.name)
@@ -178,24 +178,24 @@
d.mu.Lock()
defer d.mu.Unlock()
var id uint64
- var batchType string
+ var batchType util.BatchType
for {
id = uint64(rng.Int63())
if bo.ReadOnly {
if _, ok := d.sns[id]; !ok {
d.sns[id] = d.st.NewSnapshot()
- batchType = "sn"
+ batchType = util.BatchTypeSn
break
}
} else {
if _, ok := d.txs[id]; !ok {
d.txs[id] = d.st.NewTransaction()
- batchType = "tx"
+ batchType = util.BatchTypeTx
break
}
}
}
- return strings.Join([]string{d.name, batchType, strconv.FormatUint(id, 10)}, util.BatchSep), nil
+ return strings.Join([]string{d.name, util.JoinBatchInfo(batchType, id)}, util.BatchSep), nil
}
func (d *databaseReq) Commit(ctx *context.T, call rpc.ServerCall, schemaVersion int32) error {
@@ -251,10 +251,20 @@
}
func (d *databaseReq) Exec(ctx *context.T, call wire.DatabaseExecServerCall, schemaVersion int32, q string) error {
+ if !d.exists {
+ return verror.New(verror.ErrNoExist, ctx, d.name)
+ }
if err := d.checkSchemaVersion(ctx, schemaVersion); err != nil {
return err
}
- impl := func(headers []string, rs query.ResultStream, err error) error {
+ impl := func(sntx store.SnapshotOrTransaction) error {
+ db := &queryDb{
+ ctx: ctx,
+ call: call,
+ req: d,
+ sntx: sntx,
+ }
+ headers, rs, err := exec.Exec(db, q)
if err != nil {
return err
}
@@ -275,23 +285,13 @@
}
return rs.Err()
}
- var sntx store.SnapshotOrTransaction
if d.batchId != nil {
- sntx = d.batchReader()
+ return impl(d.batchReader())
} else {
- sntx = d.st.NewSnapshot()
+ sntx := d.st.NewSnapshot()
defer sntx.Abort()
+ return impl(sntx)
}
- // queryDb implements the query.Database interface, which is needed by the
- // exec.Exec function.
- db := &queryDb{
- ctx: ctx,
- call: call,
- req: d,
- sntx: sntx,
- }
-
- return impl(exec.Exec(db, q))
}
func (d *databaseReq) SetPermissions(ctx *context.T, call rpc.ServerCall, perms access.Permissions, version string) error {
@@ -318,20 +318,25 @@
return data.Perms, util.FormatVersion(data.Version), nil
}
-func (d *databaseReq) GlobChildren__(ctx *context.T, call rpc.GlobChildrenServerCall, matcher *glob.Element) error {
+func (d *databaseReq) ListTables(ctx *context.T, call rpc.ServerCall) ([]string, error) {
if !d.exists {
- return verror.New(verror.ErrNoExist, ctx, d.name)
+ return nil, verror.New(verror.ErrNoExist, ctx, d.name)
+ }
+ impl := func(sntx store.SnapshotOrTransaction) ([]string, error) {
+ // Check perms.
+ if err := util.GetWithAuth(ctx, call, sntx, d.stKey(), &databaseData{}); err != nil {
+ sntx.Abort()
+ return nil, err
+ }
+ return util.ListChildren(ctx, call, sntx, util.TablePrefix)
}
if d.batchId != nil {
- return wire.NewErrBoundToBatch(ctx)
+ return impl(d.batchReader())
+ } else {
+ sntx := d.st.NewSnapshot()
+ defer sntx.Abort()
+ return impl(sntx)
}
- // Check perms.
- sn := d.st.NewSnapshot()
- if err := util.GetWithAuth(ctx, call, sn, d.stKey(), &databaseData{}); err != nil {
- sn.Abort()
- return err
- }
- return util.Glob(ctx, call, matcher, sn, sn.Abort, util.TablePrefix)
}
////////////////////////////////////////
diff --git a/services/syncbase/server/nosql/database_watch.go b/services/syncbase/server/nosql/database_watch.go
index e201987..374cab4 100644
--- a/services/syncbase/server/nosql/database_watch.go
+++ b/services/syncbase/server/nosql/database_watch.go
@@ -172,7 +172,7 @@
}
parts := util.SplitKeyParts(opKey)
// TODO(rogulenko): Currently we process only rows, i.e. keys of the form
- // $row:xxx:yyy. Consider processing other keys.
+ // <RowPrefix>:xxx:yyy. Consider processing other keys.
if len(parts) != 3 || parts[0] != util.RowPrefix {
continue
}
@@ -188,7 +188,7 @@
continue
}
change := watch.Change{
- Name: naming.Join(table, row),
+ Name: naming.Join(table, pubutil.NameSep, row),
Continued: true,
}
switch op := logEntry.Op.(type) {
diff --git a/services/syncbase/server/nosql/dispatcher.go b/services/syncbase/server/nosql/dispatcher.go
index 269a7cd..4ec16c0 100644
--- a/services/syncbase/server/nosql/dispatcher.go
+++ b/services/syncbase/server/nosql/dispatcher.go
@@ -5,7 +5,6 @@
package nosql
import (
- "strconv"
"strings"
"v.io/v23/context"
@@ -34,25 +33,25 @@
// RPC method implementations to perform proper authorization.
var auth security.Authorizer = security.AllowEveryone()
-func (disp *dispatcher) Lookup(_ *context.T, suffix string) (interface{}, security.Authorizer, error) {
+func (disp *dispatcher) Lookup(ctx *context.T, suffix string) (interface{}, security.Authorizer, error) {
suffix = strings.TrimPrefix(suffix, "/")
- parts := strings.Split(suffix, "/")
+ parts := strings.Split(suffix, pubutil.NameSepWithSlashes)
if len(parts) == 0 {
vlog.Fatal("invalid nosql.dispatcher Lookup")
}
- dParts := strings.Split(parts[0], util.BatchSep)
+ dParts := strings.SplitN(parts[0], util.BatchSep, 2)
dName := dParts[0]
// Validate all key atoms up front, so that we can avoid doing so in all our
// method implementations.
if !pubutil.ValidName(dName) {
- return nil, nil, wire.NewErrInvalidName(nil, suffix)
+ return nil, nil, wire.NewErrInvalidName(ctx, suffix)
}
for _, s := range parts[1:] {
if !pubutil.ValidName(s) {
- return nil, nil, wire.NewErrInvalidName(nil, suffix)
+ return nil, nil, wire.NewErrInvalidName(ctx, suffix)
}
}
@@ -75,8 +74,10 @@
}
dReq := &databaseReq{database: d}
- if !setBatchFields(dReq, dParts) {
- return nil, nil, wire.NewErrInvalidName(nil, suffix)
+ if len(dParts) == 2 {
+ if !setBatchFields(dReq, dParts[1]) {
+ return nil, nil, wire.NewErrInvalidName(ctx, suffix)
+ }
}
if len(parts) == 1 {
return nosqlWire.DatabaseServer(dReq), auth, nil
@@ -85,7 +86,7 @@
// All table and row methods require the database to exist. If it doesn't,
// abort early.
if !dExists {
- return nil, nil, verror.New(verror.ErrNoExist, nil, d.name)
+ return nil, nil, verror.New(verror.ErrNoExist, ctx, d.name)
}
// Note, it's possible for the database to be deleted concurrently with
@@ -108,20 +109,14 @@
return nosqlWire.RowServer(rReq), auth, nil
}
- return nil, nil, verror.NewErrNoExist(nil)
+ return nil, nil, verror.NewErrNoExist(ctx)
}
// setBatchFields sets the batch-related fields in databaseReq based on the
-// value of dParts, the parts of the database name component. It returns false
-// if dParts is malformed.
-func setBatchFields(d *databaseReq, dParts []string) bool {
- if len(dParts) == 1 {
- return true
- }
- if len(dParts) != 3 {
- return false
- }
- batchId, err := strconv.ParseUint(dParts[2], 0, 64)
+// value of batchInfo (suffix of the database name component). It returns false
+// if batchInfo is malformed.
+func setBatchFields(d *databaseReq, batchInfo string) bool {
+ batchType, batchId, err := util.SplitBatchInfo(batchInfo)
if err != nil {
return false
}
@@ -129,13 +124,11 @@
d.mu.Lock()
defer d.mu.Unlock()
var ok bool
- switch dParts[1] {
- case "sn":
+ switch batchType {
+ case util.BatchTypeSn:
d.sn, ok = d.sns[batchId]
- case "tx":
+ case util.BatchTypeTx:
d.tx, ok = d.txs[batchId]
- default:
- return false
}
return ok
}
diff --git a/services/syncbase/server/nosql/row.go b/services/syncbase/server/nosql/row.go
index 758c58a..1efe739 100644
--- a/services/syncbase/server/nosql/row.go
+++ b/services/syncbase/server/nosql/row.go
@@ -26,6 +26,8 @@
////////////////////////////////////////
// RPC methods
+// TODO(sadovsky): Implement Glob__ or GlobChildren__.
+
func (r *rowReq) Exists(ctx *context.T, call rpc.ServerCall, schemaVersion int32) (bool, error) {
_, err := r.Get(ctx, call, schemaVersion)
return util.ErrorToExists(err)
diff --git a/services/syncbase/server/nosql/table.go b/services/syncbase/server/nosql/table.go
index 27097b6..8d68d7a 100644
--- a/services/syncbase/server/nosql/table.go
+++ b/services/syncbase/server/nosql/table.go
@@ -8,7 +8,6 @@
"strings"
"v.io/v23/context"
- "v.io/v23/glob"
"v.io/v23/rpc"
"v.io/v23/security/access"
wire "v.io/v23/services/syncbase/nosql"
@@ -31,6 +30,8 @@
////////////////////////////////////////
// RPC methods
+// TODO(sadovsky): Implement Glob__ or GlobChildren__.
+
func (t *tableReq) Create(ctx *context.T, call rpc.ServerCall, schemaVersion int32, perms access.Permissions) error {
if t.d.batchId != nil {
return wire.NewErrBoundToBatch(ctx)
@@ -316,26 +317,6 @@
}
}
-func (t *tableReq) GlobChildren__(ctx *context.T, call rpc.GlobChildrenServerCall, matcher *glob.Element) error {
- impl := func(sntx store.SnapshotOrTransaction, closeSntx func() error) error {
- // Check perms.
- if err := t.checkAccess(ctx, call, sntx, ""); err != nil {
- closeSntx()
- return err
- }
- // TODO(rogulenko): Check prefix permissions for children.
- return util.Glob(ctx, call, matcher, sntx, closeSntx, util.JoinKeyParts(util.RowPrefix, t.name))
- }
- if t.d.batchId != nil {
- return impl(t.d.batchReader(), func() error {
- return nil
- })
- } else {
- sn := t.d.st.NewSnapshot()
- return impl(sn, sn.Abort)
- }
-}
-
////////////////////////////////////////
// Internal helpers
diff --git a/services/syncbase/server/service.go b/services/syncbase/server/service.go
index 6ca96f1..f2ec671 100644
--- a/services/syncbase/server/service.go
+++ b/services/syncbase/server/service.go
@@ -13,7 +13,6 @@
"sync"
"v.io/v23/context"
- "v.io/v23/glob"
"v.io/v23/rpc"
"v.io/v23/security/access"
wire "v.io/v23/services/syncbase"
@@ -136,6 +135,8 @@
////////////////////////////////////////
// RPC methods
+// TODO(sadovsky): Implement Glob__ or GlobChildren__.
+
func (s *service) SetPermissions(ctx *context.T, call rpc.ServerCall, perms access.Permissions, version string) error {
return store.RunInTransaction(s.st, func(tx store.Transaction) error {
data := &serviceData{}
@@ -158,14 +159,14 @@
return data.Perms, util.FormatVersion(data.Version), nil
}
-func (s *service) GlobChildren__(ctx *context.T, call rpc.GlobChildrenServerCall, matcher *glob.Element) error {
+func (s *service) ListApps(ctx *context.T, call rpc.ServerCall) ([]string, error) {
// Check perms.
sn := s.st.NewSnapshot()
if err := util.GetWithAuth(ctx, call, sn, s.stKey(), &serviceData{}); err != nil {
sn.Abort()
- return err
+ return nil, err
}
- return util.Glob(ctx, call, matcher, sn, sn.Abort, util.AppPrefix)
+ return util.ListChildren(ctx, call, sn, util.AppPrefix)
}
////////////////////////////////////////
diff --git a/services/syncbase/server/util/constants.go b/services/syncbase/server/util/constants.go
index ab2e401..a14d006 100644
--- a/services/syncbase/server/util/constants.go
+++ b/services/syncbase/server/util/constants.go
@@ -8,9 +8,9 @@
"time"
)
-// TODO(sadovsky): Consider using shorter strings.
-
// Constants related to storage engine keys.
+// Note, these are persisted and therefore must not be modified.
+// Below, they are ordered lexicographically by value.
const (
AppPrefix = "$app"
ClockPrefix = "$clock"
@@ -23,26 +23,48 @@
SyncPrefix = "$sync"
TablePrefix = "$table"
VersionPrefix = "$version"
+
+ // TODO(sadovsky): Changing these prefixes breaks various tests. Tests
+ // generally shouldn't depend on the values of these constants.
+ /*
+ AppPrefix = "a"
+ ClockPrefix = "c"
+ DatabasePrefix = "d"
+ DbInfoPrefix = "i"
+ LogPrefix = "l"
+ PermsPrefix = "p"
+ RowPrefix = "r"
+ ServicePrefix = "s"
+ TablePrefix = "t"
+ VersionPrefix = "v"
+ SyncPrefix = "y"
+ */
+
+ // Separator for parts of storage engine keys.
+ // TODO(sadovsky): Allow ":" in names and use a different separator here.
+ KeyPartSep = ":"
+
+ // PrefixRangeLimitSuffix is a key suffix that indicates the end of a prefix
+ // range. Must be greater than any character allowed in client-provided keys.
+ PrefixRangeLimitSuffix = "\xff"
)
// Constants related to object names.
const (
- // Service object name suffix for Syncbase-to-Syncbase RPCs.
- SyncbaseSuffix = "$sync"
+ // Object name component for Syncbase-to-Syncbase (sync) RPCs.
+ // Sync object names have the form:
+ // <syncbase>/@@sync/...
+ SyncbaseSuffix = "@@sync"
// Separator for batch info in database names.
- BatchSep = ":"
- // Separator for parts of storage engine keys.
- KeyPartSep = ":"
- // PrefixRangeLimitSuffix is the suffix of a key which indicates the end of
- // a prefix range. Should be more than any regular key in the store.
- // TODO(rogulenko): Change this constant to something out of the UTF8 space.
- PrefixRangeLimitSuffix = "~"
+ // Batch object names have the form:
+ // <syncbase>/<app>/$/<database>@@<batchInfo>/...
+ BatchSep = "@@"
)
// Constants related to syncbase clock.
const (
- // The pool.ntp.org project is a big virtual cluster of timeservers
- // providing reliable easy to use NTP service for millions of clients.
+ // The pool.ntp.org project is a big virtual cluster of timeservers,
+ // providing reliable, easy-to-use NTP service for millions of clients.
// See more at http://www.pool.ntp.org/en/
NtpServerPool = "pool.ntp.org"
NtpSampleCount = 15
diff --git a/services/syncbase/server/util/glob.go b/services/syncbase/server/util/glob.go
deleted file mode 100644
index c483347..0000000
--- a/services/syncbase/server/util/glob.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package util
-
-import (
- "v.io/v23/context"
- "v.io/v23/glob"
- "v.io/v23/naming"
- "v.io/v23/rpc"
- "v.io/x/lib/vlog"
- "v.io/x/ref/services/syncbase/store"
-)
-
-// NOTE(nlacasse): Syncbase handles Glob requests by implementing
-// GlobChildren__ at each level (service, app, database, table).
-
-// Glob performs a glob. It calls closeSntx to close sntx.
-func Glob(ctx *context.T, call rpc.GlobChildrenServerCall, matcher *glob.Element, sntx store.SnapshotOrTransaction, closeSntx func() error, stKeyPrefix string) error {
- prefix, _ := matcher.FixedPrefix()
- it := sntx.Scan(ScanPrefixArgs(stKeyPrefix, prefix))
- defer closeSntx()
- key := []byte{}
- for it.Advance() {
- key = it.Key(key)
- parts := SplitKeyParts(string(key))
- name := parts[len(parts)-1]
- if matcher.Match(name) {
- if err := call.SendStream().Send(naming.GlobChildrenReplyName{Value: name}); err != nil {
- return err
- }
- }
- }
- if err := it.Err(); err != nil {
- vlog.VI(1).Infof("Glob() failed: %v", err)
- call.SendStream().Send(naming.GlobChildrenReplyError{Value: naming.GlobError{Error: err}})
- }
- return nil
-}
diff --git a/services/syncbase/server/util/key_util.go b/services/syncbase/server/util/key_util.go
index 0ac6686..c0d79ad 100644
--- a/services/syncbase/server/util/key_util.go
+++ b/services/syncbase/server/util/key_util.go
@@ -5,18 +5,21 @@
package util
import (
+ "strconv"
"strings"
"v.io/v23/syncbase/util"
+ "v.io/v23/verror"
)
// JoinKeyParts builds keys for accessing data in the storage engine.
+// TODO(sadovsky): Allow ":" in names and use a different separator here.
func JoinKeyParts(parts ...string) string {
- // TODO(sadovsky): Figure out which delimiter makes the most sense.
return strings.Join(parts, KeyPartSep)
}
// SplitKeyParts is the inverse of JoinKeyParts.
+// TODO(sadovsky): Allow ":" in names and use a different separator here.
func SplitKeyParts(key string) []string {
return strings.Split(key, KeyPartSep)
}
@@ -35,3 +38,36 @@
}
return []byte(fullStart), []byte(fullLimit)
}
+
+type BatchType int
+
+const (
+ BatchTypeSn BatchType = iota // snapshot
+ BatchTypeTx // transaction
+)
+
+// JoinBatchInfo encodes batch type and id into a single "info" string.
+func JoinBatchInfo(batchType BatchType, batchId uint64) string {
+ return strings.Join([]string{strconv.Itoa(int(batchType)), strconv.FormatUint(batchId, 10)}, BatchSep)
+}
+
+// SplitBatchInfo is the inverse of JoinBatchInfo.
+func SplitBatchInfo(batchInfo string) (BatchType, uint64, error) {
+ parts := strings.Split(batchInfo, BatchSep)
+ if len(parts) != 2 {
+ return BatchTypeSn, 0, verror.New(verror.ErrBadArg, nil, batchInfo)
+ }
+ batchTypeInt, err := strconv.Atoi(parts[0])
+ if err != nil {
+ return BatchTypeSn, 0, err
+ }
+ batchType := BatchType(batchTypeInt)
+ if batchType != BatchTypeSn && batchType != BatchTypeTx {
+ return BatchTypeSn, 0, verror.New(verror.ErrBadArg, nil, batchInfo)
+ }
+ batchId, err := strconv.ParseUint(parts[1], 0, 64)
+ if err != nil {
+ return BatchTypeSn, 0, err
+ }
+ return batchType, batchId, nil
+}
diff --git a/services/syncbase/server/util/list_children.go b/services/syncbase/server/util/list_children.go
new file mode 100644
index 0000000..eaa68bd
--- /dev/null
+++ b/services/syncbase/server/util/list_children.go
@@ -0,0 +1,29 @@
+// Copyright 2015 The Vanadium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package util
+
+import (
+ "v.io/v23/context"
+ "v.io/v23/rpc"
+ "v.io/x/ref/services/syncbase/store"
+)
+
+// ListChildren returns the names of all apps, databases, or tables with the
+// given key prefix. Designed for use by Service.ListApps, App.ListDatabases,
+// and Database.ListTables.
+func ListChildren(ctx *context.T, call rpc.ServerCall, sntx store.SnapshotOrTransaction, stKeyPrefix string) ([]string, error) {
+ it := sntx.Scan(ScanPrefixArgs(stKeyPrefix, ""))
+ key := []byte{}
+ res := []string{}
+ for it.Advance() {
+ key = it.Key(key)
+ parts := SplitKeyParts(string(key))
+ res = append(res, parts[len(parts)-1])
+ }
+ if err := it.Err(); err != nil {
+ return nil, err
+ }
+ return res, nil
+}
diff --git a/services/syncbase/testutil/layer.go b/services/syncbase/testutil/layer.go
index fc568b9..3f6cc54 100644
--- a/services/syncbase/testutil/layer.go
+++ b/services/syncbase/testutil/layer.go
@@ -12,6 +12,7 @@
"v.io/v23/context"
"v.io/v23/security"
"v.io/v23/security/access"
+ wire "v.io/v23/services/syncbase"
"v.io/v23/syncbase"
"v.io/v23/syncbase/nosql"
"v.io/v23/syncbase/util"
@@ -72,7 +73,8 @@
t.Errorf("Perms do not match: got %v, want %v", gotPerms, wantPerms)
}
- // Even though self2 exists, Exists returns false because Read access is needed.
+ // Even though self2 exists, Exists returns false because Read access is
+ // needed.
assertExists(t, ctx, self2, "self2", false)
// Test that create fails if the parent perms disallow access.
@@ -90,6 +92,33 @@
assertExists(t, ctx, self3, "self3", false)
}
+// Tests that non-ASCII UTF-8 chars are supported at all layers as long as they
+// satisfy util.ValidName.
+// This test only requires layer.Create to be implemented and thus works for
+// rows.
+func TestCreateNameValidation(t *testing.T, ctx *context.T, i interface{}) {
+ parent := makeLayer(i)
+
+ // Invalid names.
+ // TODO(sadovsky): Add names with slashes to this list once we implement
+ // client-side name validation. As it stands, some names with slashes result
+ // in RPCs against objects at the next layer of hierarchy, and naming.Join
+ // drops some leading and trailing slashes before they reach the server-side
+ // name-checking code.
+ for _, name := range []string{"a\x00", "\x00a", "@@", "a@@", "@@a", "@@a", "$", "a/$", "$/a"} {
+ if err := parent.Child(name).Create(ctx, nil); verror.ErrorID(err) != wire.ErrInvalidName.ID {
+ t.Fatalf("Create(%q) should have failed: %v", name, err)
+ }
+ }
+
+ // Valid names.
+ for _, name := range []string{"a", "aa", "*", "a*", "*a", "a*b", "a/b", "a/$$", "$$/a", "a/$$/b", "dev.v.io/a/admin@myapp.com", "alice/bob", "안녕하세요"} {
+ if err := parent.Child(name).Create(ctx, nil); err != nil {
+ t.Fatalf("Create(%q) failed: %v", name, err)
+ }
+ }
+}
+
// TestDestroy tests that object destruction works as expected.
func TestDestroy(t *testing.T, ctx *context.T, i interface{}) {
parent := makeLayer(i)
@@ -179,7 +208,7 @@
var err error
got, err = self.ListChildren(ctx)
- want = []string{}
+ want = []string(nil)
if err != nil {
t.Fatalf("self.ListChildren() failed: %v", err)
}
@@ -210,6 +239,19 @@
if !reflect.DeepEqual(got, want) {
t.Fatalf("Lists do not match: got %v, want %v", got, want)
}
+
+ hello := "안녕하세요"
+ if err := self.Child(hello).Create(ctx, nil); err != nil {
+ t.Fatalf("hello.Create() failed: %v", err)
+ }
+ got, err = self.ListChildren(ctx)
+ want = []string{"x", "y", hello}
+ if err != nil {
+ t.Fatalf("self.ListChildren() failed: %v", err)
+ }
+ if !reflect.DeepEqual(got, want) {
+ t.Fatalf("Lists do not match: got %v, want %v", got, want)
+ }
}
// TestPerms tests that {Set,Get}Permissions work as expected.
diff --git a/services/syncbase/testutil/v23util.go b/services/syncbase/testutil/v23util.go
index ef2c3f6..8e370a8 100644
--- a/services/syncbase/testutil/v23util.go
+++ b/services/syncbase/testutil/v23util.go
@@ -55,7 +55,7 @@
}
}
-// RunClient runs modules.Program and waits until it terminates.
+// RunClient runs the given program and waits until it terminates.
func RunClient(t *v23tests.T, creds *modules.CustomCredentials, program modules.Program, args ...string) {
client, err := t.Shell().StartWithOpts(
t.Shell().DefaultStartOpts().WithCustomCredentials(creds),
