fix unittests

router/frontend_test.go

@@ -65,6 +65,7 @@ func TestFrontendSimple(t *testing.T) {
 	beRule := &config.BackendRule{}
 
 	srv.EXPECT().Name().AnyTimes().Return("serv1")
+	srv.EXPECT().DatashardIds().AnyTimes().Return([]string{"sh1"})
 
 	cl.EXPECT().Server().AnyTimes().Return(srv)
 
@@ -167,6 +168,7 @@ func TestFrontendXProto(t *testing.T) {
 	beRule := &config.BackendRule{}
 
 	srv.EXPECT().Name().AnyTimes().Return("serv1")
+	srv.EXPECT().DatashardIds().AnyTimes().Return([]string{"sh1"})
 
 	/* query Router */
 
@@ -302,6 +304,7 @@ func TestFrontendSimpleCopyIn(t *testing.T) {
 	beRule := &config.BackendRule{}
 
 	srv.EXPECT().Name().AnyTimes().Return("serv1")
+	srv.EXPECT().DatashardIds().AnyTimes().Return([]string{"sh1"})
 
 	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", server.DatashardIds()).
 		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", rst.Client().Server().DatashardIds()).
 		Msg("deploy prepared statement")
 
 	// TODO: multi-shard statements

router/server/multishard.go

@@ -439,4 +439,12 @@ func (m *MultiShardServer) Datashards() []shard.Shard {
 	return m.activeShards
 }
 
+func (m *MultiShardServer) DatashardIds() []string {
+	ret := []string{}
+	for _, shard := range m.activeShards {
+		ret = append(ret, shard.ID())
+	}
+	return ret
+}
+
 var _ Server = &MultiShardServer{}

router/server/server.go

@@ -24,6 +24,7 @@ type Server interface {
 	AddDataShard(clid string, shardKey kr.ShardKey, tsa string) error
 	UnRouteShard(sh kr.ShardKey, rule *config.FrontendRule) error
 	Datashards() []shard.Shard
+	DatashardIds() []string
 
 	Cancel() error
 

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", srv.DatashardIds()).
 		Msg("single-shard receiving msg from server")
 	return msg, err
 }
@@ -194,4 +194,8 @@ func (srv *ShardServer) Datashards() []shard.Shard {
 	return []shard.Shard{srv.shard}
 }
 
+func (srv *ShardServer) DatashardIds() []string {
+	return []string{srv.shard.ID()}
+}
+
 var _ Server = &ShardServer{}