Syncbase client: shuffle around client libs, restore compilaation
Next steps:
- Same, on server side
- Enable client-side tests, and add more tests
- Revisit the more pressing TODOs
Change-Id: Ie38d86b27cdbc6d9c888d1e078bf285eccd24899
diff --git a/services/syncbase/server/database.go b/services/syncbase/server/database.go
index 5a0c4ae..4328caa 100644
--- a/services/syncbase/server/database.go
+++ b/services/syncbase/server/database.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package server
import (
diff --git a/services/syncbase/server/dispatcher.go b/services/syncbase/server/dispatcher.go
index 5ea36d6..925d47a 100644
--- a/services/syncbase/server/dispatcher.go
+++ b/services/syncbase/server/dispatcher.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package server
import (
diff --git a/services/syncbase/server/item.go b/services/syncbase/server/item.go
index 94f5df4..ae849c9 100644
--- a/services/syncbase/server/item.go
+++ b/services/syncbase/server/item.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package server
import (
diff --git a/services/syncbase/server/key_util.go b/services/syncbase/server/key_util.go
index 7506b38..39ca7b1 100644
--- a/services/syncbase/server/key_util.go
+++ b/services/syncbase/server/key_util.go
@@ -4,6 +4,9 @@
package server
+// Note, some of the code below is copied from
+// v.io/syncbase/v23/syncbase/key_util.go.
+
import (
"regexp"
"strings"
@@ -18,5 +21,6 @@
}
func joinKeyParts(parts ...string) string {
+ // TODO(sadovsky): Figure out which delimeter makes the most sense.
return strings.Join(parts, ":")
}
diff --git a/services/syncbase/server/server_test.go b/services/syncbase/server/server_test.go
index e12f396..ce7ba39 100644
--- a/services/syncbase/server/server_test.go
+++ b/services/syncbase/server/server_test.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package server_test
// Note: core/veyron/services/security/groups/server/server_test.go has some
diff --git a/services/syncbase/server/service.go b/services/syncbase/server/service.go
index ef30019..8f7e7d3 100644
--- a/services/syncbase/server/service.go
+++ b/services/syncbase/server/service.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package server
import (
diff --git a/services/syncbase/server/table.go b/services/syncbase/server/table.go
index 2c1af6a..00a4cd6 100644
--- a/services/syncbase/server/table.go
+++ b/services/syncbase/server/table.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package server
import "v.io/syncbase/v23/services/syncbase"
diff --git a/services/syncbase/server/types.vdl b/services/syncbase/server/types.vdl
index 8e7a751..7f53561 100644
--- a/services/syncbase/server/types.vdl
+++ b/services/syncbase/server/types.vdl
@@ -2,32 +2,32 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package server
import (
- "v.io/syncbase/v23/services/syncbase"
"v.io/v23/security/access"
)
// serviceData represents the persistent state of a Service.
type serviceData struct {
- Universes set[string]
- Version uint64 // covers the fields below
- Permissions access.Permissions
+ Universes set[string]
+ Version uint64 // covers the fields below
+ Acl access.Permissions
}
// universeData represents the persistent state of a Universe.
type universeData struct {
- Name string
- Databases set[string]
- Version uint64 // covers the fields below
- Permissions access.Permissions
+ Name string
+ Databases set[string]
+ Version uint64 // covers the fields below
+ Acl access.Permissions
}
// databaseData represents the persistent state of a Database.
type databaseData struct {
- Name string
- Version uint64 // covers the fields below
- Permissions access.Permissions
- Schema syncbase.Schema
+ Name string
+ Version uint64 // covers the fields below
+ Acl access.Permissions
}
diff --git a/services/syncbase/server/types.vdl.go b/services/syncbase/server/types.vdl.go
index d029dd1..b99afd9 100644
--- a/services/syncbase/server/types.vdl.go
+++ b/services/syncbase/server/types.vdl.go
@@ -12,15 +12,14 @@
"v.io/v23/vdl"
// VDL user imports
- "v.io/syncbase/v23/services/syncbase"
"v.io/v23/security/access"
)
// serviceData represents the persistent state of a Service.
type serviceData struct {
- Universes map[string]struct{}
- Version uint64 // covers the fields below
- Permissions access.Permissions
+ Universes map[string]struct{}
+ Version uint64 // covers the fields below
+ Acl access.Permissions
}
func (serviceData) __VDLReflect(struct {
@@ -30,10 +29,10 @@
// universeData represents the persistent state of a Universe.
type universeData struct {
- Name string
- Databases map[string]struct{}
- Version uint64 // covers the fields below
- Permissions access.Permissions
+ Name string
+ Databases map[string]struct{}
+ Version uint64 // covers the fields below
+ Acl access.Permissions
}
func (universeData) __VDLReflect(struct {
@@ -43,10 +42,9 @@
// databaseData represents the persistent state of a Database.
type databaseData struct {
- Name string
- Version uint64 // covers the fields below
- Permissions access.Permissions
- Schema syncbase.Schema
+ Name string
+ Version uint64 // covers the fields below
+ Acl access.Permissions
}
func (databaseData) __VDLReflect(struct {
diff --git a/services/syncbase/server/universe.go b/services/syncbase/server/universe.go
index 8f0f9b7..27c5a21 100644
--- a/services/syncbase/server/universe.go
+++ b/services/syncbase/server/universe.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package server
import (
diff --git a/services/syncbase/sync/vsync.vdl.go b/services/syncbase/sync/vsync.vdl.go
index e202947..0d0e00d 100644
--- a/services/syncbase/sync/vsync.vdl.go
+++ b/services/syncbase/sync/vsync.vdl.go
@@ -359,11 +359,7 @@
}
func (c implSyncClientStub) Dump(ctx *context.T, opts ...rpc.CallOpt) (err error) {
- var call rpc.ClientCall
- if call, err = v23.GetClient(ctx).StartCall(ctx, c.name, "Dump", nil, opts...); err != nil {
- return
- }
- err = call.Finish()
+ err = v23.GetClient(ctx).Call(ctx, c.name, "Dump", nil, nil, opts...)
return
}
diff --git a/services/syncbase/syncbased/main.go b/services/syncbase/syncbased/main.go
index e4f9c18..e8f7a52 100644
--- a/services/syncbase/syncbased/main.go
+++ b/services/syncbase/syncbased/main.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
// syncbased is a syncbase daemon.
package main
