croupier: Step #1 of simplified Syncbase API transition
MultiPart: 5/7
Change-Id: I7810eb3d374ce30c50f99c14a8cfee38377cfbbe
diff --git a/go/src/hearts/img/view/view.go b/go/src/hearts/img/view/view.go
index 81b8099..026077b 100644
--- a/go/src/hearts/img/view/view.go
+++ b/go/src/hearts/img/view/view.go
@@ -137,7 +137,7 @@
addr := scanner.Text()
// Search through all the database's syncgroups to see if addr represents a current syncgroup
app := u.Service.App(util.AppName)
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
allAddrs, _ := db.GetSyncgroupNames(u.Ctx)
fmt.Println(allAddrs)
for _, a := range allAddrs {
diff --git a/go/src/hearts/sync/client.go b/go/src/hearts/sync/client.go
index dab0278..27139b1 100644
--- a/go/src/hearts/sync/client.go
+++ b/go/src/hearts/sync/client.go
@@ -15,8 +15,8 @@
"v.io/v23/context"
"v.io/v23/discovery"
- wire "v.io/v23/services/syncbase/nosql"
- "v.io/v23/syncbase/nosql"
+ wire "v.io/v23/services/syncbase"
+ "v.io/v23/syncbase"
ldiscovery "v.io/x/ref/lib/discovery"
"v.io/x/ref/lib/discovery/plugins/mdns"
"v.io/x/ref/lib/signals"
@@ -77,8 +77,8 @@
}
// Returns a watchstream of the data in the table
-func WatchData(tableName, prefix string, u *uistate.UIState) (nosql.WatchStream, error) {
- db := u.Service.App(util.AppName).NoSQLDatabase(util.DbName, nil)
+func WatchData(tableName, prefix string, u *uistate.UIState) (syncbase.WatchStream, error) {
+ db := u.Service.App(util.AppName).Database(util.DbName, nil)
resumeMarker, err := db.GetResumeMarker(u.Ctx)
if err != nil {
fmt.Println("RESUMEMARKER ERR: ", err)
@@ -87,11 +87,11 @@
}
// Returns a scanstream of the data in the table
-func ScanData(tableName, prefix string, u *uistate.UIState) nosql.ScanStream {
+func ScanData(tableName, prefix string, u *uistate.UIState) syncbase.ScanStream {
app := u.Service.App(util.AppName)
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
table := db.Table(tableName)
- rowRange := nosql.Range(prefix, "")
+ rowRange := syncbase.Range(prefix, "")
return table.Scan(u.Ctx, rowRange)
}
@@ -100,7 +100,7 @@
fmt.Println("Joining gamelog syncgroup")
u.IsOwner = creator
app := u.Service.App(util.AppName)
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
logSg := db.Syncgroup(logName)
myInfoJoiner := wire.SyncgroupMemberInfo{8, creator}
_, err := logSg.Join(u.Ctx, myInfoJoiner)
@@ -120,7 +120,7 @@
func JoinSettingsSyncgroup(settingsName string, u *uistate.UIState) {
fmt.Println("Joining user settings syncgroup")
app := u.Service.App(util.AppName)
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
settingsSg := db.Syncgroup(settingsName)
myInfoJoiner := wire.SyncgroupMemberInfo{8, false}
_, err := settingsSg.Join(u.Ctx, myInfoJoiner)
@@ -133,7 +133,7 @@
func NumInSG(logName string, u *uistate.UIState) int {
app := u.Service.App(util.AppName)
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
sg := db.Syncgroup(logName)
members, err := sg.GetMembers(u.Ctx)
if err != nil {
diff --git a/go/src/hearts/sync/server.go b/go/src/hearts/sync/server.go
index c618155..1456915 100644
--- a/go/src/hearts/sync/server.go
+++ b/go/src/hearts/sync/server.go
@@ -21,7 +21,7 @@
"v.io/v23/discovery"
"v.io/v23/security"
"v.io/v23/security/access"
- wire "v.io/v23/services/syncbase/nosql"
+ wire "v.io/v23/services/syncbase"
"v.io/v23/syncbase"
ldiscovery "v.io/x/ref/lib/discovery"
"v.io/x/ref/lib/discovery/plugins/mdns"
@@ -57,7 +57,7 @@
// Puts key and value into the syncbase gamelog table
func AddKeyValue(service syncbase.Service, ctx *context.T, key, value string) bool {
app := service.App(util.AppName)
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
table := db.Table(util.LogName)
valueByte := []byte(value)
err := table.Put(ctx, key, valueByte)
@@ -79,7 +79,7 @@
fmt.Println("APP ERROR: ", err)
}
}
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
if isThere, err := db.Exists(u.Ctx); err != nil {
fmt.Println("DB EXISTS ERROR: ", err)
} else if !isThere {
@@ -155,7 +155,7 @@
}
myInfoCreator := wire.SyncgroupMemberInfo{8, true}
app := u.Service.App(util.AppName)
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
logSG := db.Syncgroup(logSGName)
err = logSG.Create(u.Ctx, logSpec, myInfoCreator)
if err != nil {
@@ -191,7 +191,7 @@
tables := []string{util.MountPoint + "/croupier"}
myInfoCreator := wire.SyncgroupMemberInfo{8, true}
app := u.Service.App(util.AppName)
- db := app.NoSQLDatabase(util.DbName, nil)
+ db := app.Database(util.DbName, nil)
settingsSGName := fmt.Sprintf("%s/croupier/%s/%%%%sync/discovery-%d", util.MountPoint, util.SBName, util.UserID)
settingsPref := wire.TableRow{util.SettingsName, fmt.Sprintf("users/%d", util.UserID)}
settingsPrefs := []wire.TableRow{settingsPref}
diff --git a/go/src/hearts/sync/watch.go b/go/src/hearts/sync/watch.go
index 6cb8af7..2badd28 100644
--- a/go/src/hearts/sync/watch.go
+++ b/go/src/hearts/sync/watch.go
@@ -28,7 +28,7 @@
"hearts/sound"
"hearts/util"
- "v.io/v23/syncbase/nosql"
+ "v.io/v23/syncbase"
)
func UpdateSettings(u *uistate.UIState) {
@@ -52,7 +52,7 @@
for {
if updateExists := stream.Advance(); updateExists {
c := stream.Change()
- if c.ChangeType == nosql.PutChange {
+ if c.ChangeType == syncbase.PutChange {
key := c.Row
var value []byte
if err := c.Value(&value); err != nil {
@@ -122,7 +122,7 @@
if err2 != nil {
fmt.Println("WatchData error:", err2)
}
- updateBlock := make([]nosql.WatchChange, 0)
+ updateBlock := make([]syncbase.WatchChange, 0)
for {
if updateExists := stream.Advance(); updateExists {
c := stream.Change()
@@ -134,7 +134,7 @@
case <-quit:
return
default:
- if c.ChangeType == nosql.PutChange {
+ if c.ChangeType == syncbase.PutChange {
key := c.Row
var value []byte
if err := c.Value(&value); err != nil {
@@ -146,7 +146,7 @@
}
}
}
- updateBlock = make([]nosql.WatchChange, 0)
+ updateBlock = make([]syncbase.WatchChange, 0)
}
}
}
@@ -505,7 +505,7 @@
}
// Used to sort an array of watch changes
-type updateSorter []nosql.WatchChange
+type updateSorter []syncbase.WatchChange
// Returns the length of the array
func (us updateSorter) Len() int {
