Fix unittests and etcd paths

pkg/shard/utils.go

@@ -0,0 +1,9 @@
+package shard
+
+func ShardIDs(shards []Shard) []string {
+	ret := []string{}
+	for _, shard := range shards {
+		ret = append(ret, shard.ID())
+	}
+	return ret
+}

qdb/etcdqdb.go

@@ -47,16 +47,16 @@ func NewEtcdQDB(addr string) (*EtcdQDB, error) {
 }
 
 const (
-	keyspace               = "key_space"
-	keyRangesNamespace     = "/keyranges"
-	dataspaceNamespace     = "/dataspaces"
-	keyRangeMovesNamespace = "/krmoves"
-	routersNamespace       = "/routers"
-	shardingRulesNamespace = "/sharding_rules"
-	shardsNamespace        = "/shards"
+	keyRangesNamespace     = "/keyranges/"
+	dataspaceNamespace     = "/dataspaces/"
+	keyRangeMovesNamespace = "/krmoves/"
+	routersNamespace       = "/routers/"
+	shardingRulesNamespace = "/sharding_rules/"
+	shardsNamespace        = "/shards/"
+
 	CoordKeepAliveTtl      = 3
+	keyspace               = "key_space"
 	coordLockKey           = "coordinator_exists"
-	coordLockVal           = "exists"
 )
 
 func keyLockPath(key string) string {

router/frontend_test.go

@@ -64,6 +64,8 @@ func TestFrontendSimple(t *testing.T) {
 
 	beRule := &config.BackendRule{}
 
+
+	srv.EXPECT().Datashards().AnyTimes().Return([]shard.Shard{})
 	srv.EXPECT().Name().AnyTimes().Return("serv1")
 
 	cl.EXPECT().Server().AnyTimes().Return(srv)
@@ -167,6 +169,7 @@ func TestFrontendXProto(t *testing.T) {
 	beRule := &config.BackendRule{}
 
 	srv.EXPECT().Name().AnyTimes().Return("serv1")
+	srv.EXPECT().Datashards().AnyTimes().Return([]shard.Shard{})
 
 	/* query Router */
 
@@ -302,6 +305,7 @@ func TestFrontendSimpleCopyIn(t *testing.T) {
 	beRule := &config.BackendRule{}
 
 	srv.EXPECT().Name().AnyTimes().Return("serv1")
+	srv.EXPECT().Datashards().AnyTimes().Return([]shard.Shard{})
 
 	cl.EXPECT().Server().AnyTimes().Return(srv)
 

router/relay/relay.go

@@ -608,7 +608,7 @@ func (rst *RelayStateImpl) ProcQuery(query pgproto3.FrontendMessage, waitForResp
 	}
 
 	spqrlog.Zero.Debug().
-		Str("server", server.Datashards()[0].ID()).
+		Strs("shards", shard.ShardIDs(server.Datashards())).
 		Type("query-type", query).
 		Msg("client process query")
 
@@ -918,7 +918,7 @@ func (rst *RelayStateImpl) DeployPrepStmt(qname string) (shard.PreparedStatement
 		Str("query", query).
 		Uint64("hash", hash).
 		Str("client", rst.Client().ID()).
-		Str("shard", rst.Client().Server().Datashards()[0].ID()).
+		Strs("shards", shard.ShardIDs(rst.Client().Server().Datashards())).
 		Msg("deploy prepared statement")
 
 	// TODO: multi-shard statements

router/server/shard.go

@@ -144,7 +144,7 @@ func (srv *ShardServer) Receive() (pgproto3.BackendMessage, error) {
 		Uint("single-shard", spqrlog.GetPointer(srv)).
 		Type("message-type", msg).
 		Str("txstatus", srv.TxStatus().String()).
-		Str("shard", srv.Datashards()[0].ID()).
+		Strs("shards", shard.ShardIDs(srv.Datashards())).
 		Msg("single-shard receiving msg from server")
 	return msg, err
 }