sensorlog_lite: Rename SyncGroup to syncgroup.
Context: v.io/c/16420
Change-Id: Ibfbb1489d16fdb6a9dce6354312c02eb5c5be875
diff --git a/go/src/v.io/x/sensorlog/internal/config/defaults.go b/go/src/v.io/x/sensorlog/internal/config/defaults.go
index 8e40688..1854d83 100644
--- a/go/src/v.io/x/sensorlog/internal/config/defaults.go
+++ b/go/src/v.io/x/sensorlog/internal/config/defaults.go
@@ -22,6 +22,6 @@
var AllTables = []string{StreamDefTable}
-func SyncGroupName(publishService, devId string) string {
+func SyncgroupName(publishService, devId string) string {
return naming.Join(publishService, "%%sync", "sllite", "dev", devId)
}
diff --git a/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go b/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
index 3b16a8b..871e619 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
@@ -19,16 +19,16 @@
"v.io/x/sensorlog_lite/internal/sbutil"
)
-// InitSyncGroup creates the syncgroup for the measuring device devId, giving
+// InitSyncgroup creates the syncgroup for the measuring device devId, giving
// full configuration access to admin. The syncgroup uses sgPublishSb and
// sgMountTables for publishing (create/join) and syncing, respectively.
-// InitSyncGroup must not be called concurrently for the same devId, or
+// InitSyncgroup must not be called concurrently for the same devId, or
// retried with different parameters for the same devId, otherwise behaviour
// is unspecified.
-func InitSyncGroup(ctx *context.T, db nosql.Database, devId, admin, sgPublishSb string, sgMountTables []string) error {
- sgName := config.SyncGroupName(sgPublishSb, devId)
+func InitSyncgroup(ctx *context.T, db nosql.Database, devId, admin, sgPublishSb string, sgMountTables []string) error {
+ sgName := config.SyncgroupName(sgPublishSb, devId)
// Check for syncgroup. If it already exists, we have nothing to do.
- if sgs, err := db.GetSyncGroupNames(ctx); err != nil {
+ if sgs, err := db.GetSyncgroupNames(ctx); err != nil {
return err
} else {
for _, sg := range sgs {
@@ -44,11 +44,11 @@
sbutil.AddPermsForPattern(&sgAcl, admin, access.AllTypicalTags()...)
// Maps all syncgroup prefixes to ACLs.
- prefixSpec := make(map[nosql_wire.SyncGroupPrefix]access.Permissions)
+ prefixSpec := make(map[nosql_wire.SyncgroupPrefix]access.Permissions)
// StreamDef : <devId>
// Admin client has full permissions, measured drops to readonly.
- prefixStreamDef := nosql_wire.SyncGroupPrefix{
+ prefixStreamDef := nosql_wire.SyncgroupPrefix{
TableName: config.StreamDefTable,
RowPrefix: devId,
}
@@ -57,7 +57,7 @@
sbutil.AddPermsForPattern(&aclStreamDef, admin, access.AllTypicalTags()...)
prefixSpec[prefixStreamDef] = aclStreamDef
- var prefixes []nosql_wire.SyncGroupPrefix
+ var prefixes []nosql_wire.SyncgroupPrefix
// Apply prefix ACLs to all syncgroup prefixes.
for prefix, prefixAcl := range prefixSpec {
// Ignore ErrNoAccess, assume we already dropped permissions.
@@ -68,13 +68,13 @@
prefixes = append(prefixes, prefix)
}
- sgSpec := nosql_wire.SyncGroupSpec{
+ sgSpec := nosql_wire.SyncgroupSpec{
Description: fmt.Sprintf("measured-main-%s", devId),
Perms: sgAcl,
Prefixes: prefixes,
MountTables: sgMountTables,
}
- sgMemberInfo := nosql_wire.SyncGroupMemberInfo{SyncPriority: config.SyncPriority}
+ sgMemberInfo := nosql_wire.SyncgroupMemberInfo{SyncPriority: config.SyncPriority}
- return db.SyncGroup(sgName).Create(ctx, sgSpec, sgMemberInfo)
+ return db.Syncgroup(sgName).Create(ctx, sgSpec, sgMemberInfo)
}
diff --git a/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go b/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
index 5c2d473..24ba12f 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
@@ -31,20 +31,20 @@
syncMts := []string{}
// Creating the syncgroup should succeed.
- if err := measure.InitSyncGroup(ctxMeasured, db, devId, admin, sbName, syncMts); err != nil {
- t.Fatalf("InitSyncGroup failed: %v", err)
+ if err := measure.InitSyncgroup(ctxMeasured, db, devId, admin, sbName, syncMts); err != nil {
+ t.Fatalf("InitSyncgroup failed: %v", err)
}
- sgName := config.SyncGroupName(sbName, devId)
- if sgs, err := db.GetSyncGroupNames(ctxMeasured); err != nil {
- t.Fatalf("GetSyncGroupNames failed: %v", err)
+ sgName := config.SyncgroupName(sbName, devId)
+ if sgs, err := db.GetSyncgroupNames(ctxMeasured); err != nil {
+ t.Fatalf("GetSyncgroupNames failed: %v", err)
} else if got, want := sgs, []string{sgName}; !reflect.DeepEqual(got, want) {
- t.Errorf("GetSyncGroupNames got: %v, want: %v", got, want)
+ t.Errorf("GetSyncgroupNames got: %v, want: %v", got, want)
}
// Creating the syncgroup should be idempotent.
- if err := measure.InitSyncGroup(ctxMeasured, db, devId, admin, sbName, syncMts); err != nil {
- t.Errorf("InitSyncGroup should be idempotent, retry failed: %v", err)
+ if err := measure.InitSyncgroup(ctxMeasured, db, devId, admin, sbName, syncMts); err != nil {
+ t.Errorf("InitSyncgroup should be idempotent, retry failed: %v", err)
}
// measured should have dropped privileges on <StreamDefTable>/<devId>.
diff --git a/go/src/v.io/x/sensorlog/measured/measured.go b/go/src/v.io/x/sensorlog/measured/measured.go
index a353c51..ef36609 100644
--- a/go/src/v.io/x/sensorlog/measured/measured.go
+++ b/go/src/v.io/x/sensorlog/measured/measured.go
@@ -26,7 +26,7 @@
flagDevId = flag.String("devid", "", "DevId to be claimed by this measured. Must be specified.")
// Flags below are only applied the first time measured is run against a Syncbase service with the same devid.
flagAdmin = flag.String("admin", "", "Blessing of admin user allowed to join the syncgroup. Must be specified.")
- flagPublishSb = flag.String("publish-sb", "", "Syncbase service to publish the syncgroup at. Must be absolute. Must be specified. The syncgroup is published as '"+config.SyncGroupName("<publish-sb>", "<devid>")+"'.")
+ flagPublishSb = flag.String("publish-sb", "", "Syncbase service to publish the syncgroup at. Must be absolute. Must be specified. The syncgroup is published as '"+config.SyncgroupName("<publish-sb>", "<devid>")+"'.")
)
func main() {
@@ -58,7 +58,7 @@
}
vlog.VI(0).Infof("measured connected to %s", db.FullName())
- if err := measure.InitSyncGroup(ctx, db, *flagDevId, *flagAdmin, *flagPublishSb, publishMts); err != nil {
+ if err := measure.InitSyncgroup(ctx, db, *flagDevId, *flagAdmin, *flagPublishSb, publishMts); err != nil {
vlog.Errorf("Failed initializing syncgroup: %v", err)
return 1
}
