简化接口

client/client.go

@@ -13,26 +13,26 @@ const (
 )
 
 type Client interface {
-	AutoMigrate(databaseID string, request *AutoMigrateRequest) error
+	AutoMigrate(request *AutoMigrateRequest) error
-	AutoMigrateBatch(databaseID string, request *AutoMigrateBatchRequest) error
+	AutoMigrateBatch(request *AutoMigrateBatchRequest) error
-	Transaction(databaseID string, txFunc TransactionFunc) error
+	Transaction(txFunc TransactionFunc) error
-	Insert(databaseID string, request *InsertRequest) (string, error)
+	Insert(request *InsertRequest) (string, error)
-	InsertBatch(databaseID string, request *InsertBatchRequest) (string, error)
+	InsertBatch(request *InsertBatchRequest) (string, error)
-	Delete(databaseID string, request *DeleteRequest) (string, error)
+	Delete(request *DeleteRequest) (string, error)
-	DeleteBatch(databaseID string, request *DeleteBatchRequest) (string, error)
+	DeleteBatch(request *DeleteBatchRequest) (string, error)
-	Update(databaseID string, request *UpdateRequest) (string, error)
+	Update(request *UpdateRequest) (string, error)
-	Replay(databaseID string, request *ReplayRequest) (string, error)
+	Replay(request *ReplayRequest) (string, error)
-	QueryByWhereAndOrderBy(databaseID string, request *QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error)
+	QueryByWhereAndOrderBy(request *QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error)
-	CommonQuery(databaseID string, request *CommonQueryRequest) (string, []map[string]any, int64, error)
+	CommonQuery(request *CommonQueryRequest) (string, []map[string]any, int64, error)
-	QueryByKeys(databaseID string, request *QueryByKeysRequest) (string, map[string]any, error)
+	QueryByKeys(request *QueryByKeysRequest) (string, map[string]any, error)
-	CountWhere(databaseID string, request *CountWhereRequest) (string, int64, error)
+	CountWhere(request *CountWhereRequest) (string, int64, error)
-	CommonCount(databaseID string, request *CommonCountRequest) (string, int64, error)
+	CommonCount(request *CommonCountRequest) (string, int64, error)
-	EventQueryByKeys(databaseID string, request *EventQueryByKeysRequest) (string, []EventInfo, int64, error)
+	EventQueryByKeys(request *EventQueryByKeysRequest) (string, []EventInfo, int64, error)
-	CommonEventQuery(databaseID string, request *CommonEventQueryRequest) (string, []EventInfo, int64, error)
+	CommonEventQuery(request *CommonEventQueryRequest) (string, []EventInfo, int64, error)
-	CountEventByKeys(databaseID string, request *CountEventByKeysRequest) (string, int64, error)
+	CountEventByKeys(request *CountEventByKeysRequest) (string, int64, error)
-	CommonCountEvent(databaseID string, request *CommonCountEventRequest) (string, int64, error)
+	CommonCountEvent(request *CommonCountEventRequest) (string, int64, error)
-	EventHistoryQueryByKeys(databaseID string, request *EventQueryByKeysRequest) (string, []EventInfo, int64, error)
+	EventHistoryQueryByKeys(request *EventQueryByKeysRequest) (string, []EventInfo, int64, error)
-	CommonEventHistoryQuery(databaseID string, request *CommonEventQueryRequest) (string, []EventInfo, int64, error)
+	CommonEventHistoryQuery(request *CommonEventQueryRequest) (string, []EventInfo, int64, error)
-	CountEventHistoryByKeys(databaseID string, request *CountEventByKeysRequest) (string, int64, error)
+	CountEventHistoryByKeys(request *CountEventByKeysRequest) (string, int64, error)
-	CommonCountEventHistory(databaseID string, request *CommonCountEventRequest) (string, int64, error)
+	CommonCountEventHistory(request *CommonCountEventRequest) (string, int64, error)
 }

client/transaction.go

@@ -3,10 +3,10 @@ package client
 type TransactionFunc func(tx Transaction) error
 
 type Transaction interface {
-	InsertTx(databaseID string, request *InsertRequest) (string, error)
+	InsertTx(request *InsertRequest) (string, error)
-	InsertBatchTx(databaseID string, request *InsertBatchRequest) (string, error)
+	InsertBatchTx(request *InsertBatchRequest) (string, error)
-	DeleteTx(databaseID string, request *DeleteRequest) (string, error)
+	DeleteTx(request *DeleteRequest) (string, error)
-	DeleteBatchTx(databaseID string, request *DeleteBatchRequest) (string, error)
+	DeleteBatchTx(request *DeleteBatchRequest) (string, error)
-	UpdateTx(databaseID string, request *UpdateRequest) (string, error)
+	UpdateTx(request *UpdateRequest) (string, error)
 	End() error
 }

dps.go

@@ -10,7 +10,7 @@ import (
 var clientMapMutex sync.Mutex
 var clientMap map[string]client.Client
 
-func NewClient(address string, version string) (client.Client, error) {
+func NewClient(address string, clientVersion string, databaseID string) (client.Client, error) {
 	clientMapMutex.Lock()
 	defer clientMapMutex.Unlock()
 
@@ -18,14 +18,16 @@ func NewClient(address string, version string) (client.Client, error) {
 		clientMap = make(map[string]client.Client)
 	}
 
-	c, ok := clientMap[version]
+	key := clientVersion + "::" + databaseID
+
+	c, ok := clientMap[key]
 	if ok {
 		return c, nil
 	}
 
-	switch version {
+	switch clientVersion {
 	case "v1":
-		innerClient, err := dpsv1.NewClient(address)
+		innerClient, err := dpsv1.NewClient(address, databaseID)
 		if err != nil {
 			return nil, err
 		}
@@ -35,21 +37,23 @@ func NewClient(address string, version string) (client.Client, error) {
 		return nil, errors.New("不支持的版本")
 	}
 
-	clientMap[version] = c
+	clientMap[clientVersion] = c
 
 	return c, nil
 }
 
-func DestroyClient(version string) error {
+func DestroyClient(clientVersion string, databaseID string) error {
 	clientMapMutex.Lock()
 	defer clientMapMutex.Unlock()
 
-	c, ok := clientMap[version]
+	key := clientVersion + "::" + databaseID
+
+	c, ok := clientMap[key]
 	if !ok {
 		return nil
 	}
 
-	switch version {
+	switch clientVersion {
 	case "v1":
 		err := dpsv1.DestroyClient(c.(*dpsv1.Client))
 		if err != nil {
@@ -59,7 +63,7 @@ func DestroyClient(version string) error {
 		break
 	}
 
-	delete(clientMap, version)
+	delete(clientMap, key)
 
 	return nil
 }

dpsv1/client.go

@@ -15,13 +15,14 @@ import (
 )
 
 type Client struct {
+	databaseID              string
 	conn                    *grpc.ClientConn
 	commandServiceClient    v1.CommandServiceClient
 	queryServiceClient      v1.QueryServiceClient
 	eventQueryServiceClient v1.EventQueryServiceClient
 }
 
-func NewClient(address string) (*Client, error) {
+func NewClient(address string, databaseID string) (*Client, error) {
 	conn, err := grpc.DialContext(context.Background(), address,
 		grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
@@ -29,6 +30,7 @@ func NewClient(address string) (*Client, error) {
 	}
 
 	return &Client{
+		databaseID:              databaseID,
 		conn:                    conn,
 		commandServiceClient:    v1.NewCommandServiceClient(conn),
 		queryServiceClient:      v1.NewQueryServiceClient(conn),
@@ -46,6 +48,7 @@ func DestroyClient(client *Client) error {
 		return err
 	}
 
+	client.databaseID = ""
 	client.conn = nil
 	client.commandServiceClient = nil
 	client.queryServiceClient = nil
@@ -54,14 +57,14 @@ func DestroyClient(client *Client) error {
 	return nil
 }
 
-func (c *Client) AutoMigrate(databaseID string, req *client.AutoMigrateRequest) error {
+func (c *Client) AutoMigrate(req *client.AutoMigrateRequest) error {
 	tableModelDescribeJsonBytes, err := json.Marshal(req.TableModelDescribe)
 	if err != nil {
 		return err
 	}
 
 	_, err = c.commandServiceClient.AutoMigrate(context.Background(), &request.AutoMigrateRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		TableModelDescribe:    tableModelDescribeJsonBytes,
@@ -73,7 +76,7 @@ func (c *Client) AutoMigrate(databaseID string, req *client.AutoMigrateRequest)
 	return nil
 }
 
-func (c *Client) AutoMigrateBatch(databaseID string, req *client.AutoMigrateBatchRequest) error {
+func (c *Client) AutoMigrateBatch(req *client.AutoMigrateBatchRequest) error {
 	items := make([]*request.AutoMigrateItem, 0)
 	for _, reqItem := range req.Items {
 		tableModelDescribeJsonBytes, err := json.Marshal(reqItem.TableModelDescribe)
@@ -89,7 +92,7 @@ func (c *Client) AutoMigrateBatch(databaseID string, req *client.AutoMigrateBatc
 	}
 
 	_, err := c.commandServiceClient.AutoMigrateBatch(context.Background(), &request.AutoMigrateBatchRequest{
-		DatabaseID: databaseID,
+		DatabaseID: c.databaseID,
 		Items:      items,
 	})
 	if err != nil {
@@ -99,7 +102,7 @@ func (c *Client) AutoMigrateBatch(databaseID string, req *client.AutoMigrateBatc
 	return nil
 }
 
-func (c *Client) Transaction(databaseID string, txFunc client.TransactionFunc) error {
+func (c *Client) Transaction(txFunc client.TransactionFunc) error {
 	stream, err := c.commandServiceClient.Transaction(context.Background())
 	if err != nil {
 		return err
@@ -107,7 +110,7 @@ func (c *Client) Transaction(databaseID string, txFunc client.TransactionFunc) e
 
 	err = stream.Send(&request.TransactionOperation{
 		Request: &request.TransactionOperation_TransactionBeginRequest{
-			TransactionBeginRequest: &request.TransactionBeginRequest{DatabaseID: databaseID},
+			TransactionBeginRequest: &request.TransactionBeginRequest{DatabaseID: c.databaseID},
 		}})
 	if err != nil {
 		return err
@@ -124,14 +127,14 @@ func (c *Client) Transaction(databaseID string, txFunc client.TransactionFunc) e
 	return nil
 }
 
-func (c *Client) Insert(databaseID string, req *client.InsertRequest) (string, error) {
+func (c *Client) Insert(req *client.InsertRequest) (string, error) {
 	tableRowJsonBytes, err := c.formTableRow(req.TableRow)
 	if err != nil {
 		return "", err
 	}
 
 	reply, err := c.commandServiceClient.Insert(context.Background(), &request.InsertRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		KeyColumns:            req.KeyColumns,
@@ -145,7 +148,7 @@ func (c *Client) Insert(databaseID string, req *client.InsertRequest) (string, e
 	return reply.Statement, nil
 }
 
-func (c *Client) InsertBatch(databaseID string, req *client.InsertBatchRequest) (string, error) {
+func (c *Client) InsertBatch(req *client.InsertBatchRequest) (string, error) {
 	tableItems := make([]*request.InsertTableItem, 0)
 
 	for _, reqTableItem := range req.Items {
@@ -170,7 +173,7 @@ func (c *Client) InsertBatch(databaseID string, req *client.InsertBatchRequest)
 	}
 
 	reply, err := c.commandServiceClient.InsertBatch(context.Background(), &request.InsertBatchRequest{
-		DatabaseID: databaseID,
+		DatabaseID: c.databaseID,
 		Items:      tableItems,
 		UserID:     req.UserID,
 	})
@@ -181,9 +184,9 @@ func (c *Client) InsertBatch(databaseID string, req *client.InsertBatchRequest)
 	return reply.Statement, nil
 }
 
-func (c *Client) Delete(databaseID string, req *client.DeleteRequest) (string, error) {
+func (c *Client) Delete(req *client.DeleteRequest) (string, error) {
 	reply, err := c.commandServiceClient.Delete(context.Background(), &request.DeleteRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		KeyValues:             req.KeyValues,
@@ -196,7 +199,7 @@ func (c *Client) Delete(databaseID string, req *client.DeleteRequest) (string, e
 	return reply.Statement, nil
 }
 
-func (c *Client) DeleteBatch(databaseID string, req *client.DeleteBatchRequest) (string, error) {
+func (c *Client) DeleteBatch(req *client.DeleteBatchRequest) (string, error) {
 	tableItems := make([]*request.DeleteTableItem, 0)
 
 	for _, reqTableItem := range req.Items {
@@ -215,7 +218,7 @@ func (c *Client) DeleteBatch(databaseID string, req *client.DeleteBatchRequest)
 	}
 
 	reply, err := c.commandServiceClient.DeleteBatch(context.Background(), &request.DeleteBatchRequest{
-		DatabaseID: databaseID,
+		DatabaseID: c.databaseID,
 		Items:      tableItems,
 		UserID:     req.UserID,
 	})
@@ -226,14 +229,14 @@ func (c *Client) DeleteBatch(databaseID string, req *client.DeleteBatchRequest)
 	return reply.Statement, nil
 }
 
-func (c *Client) Update(databaseID string, req *client.UpdateRequest) (string, error) {
+func (c *Client) Update(req *client.UpdateRequest) (string, error) {
 	newTableRowJsonByte, err := c.formTableRow(req.NewTableRow)
 	if err != nil {
 		return "", err
 	}
 
 	reply, err := c.commandServiceClient.Update(context.Background(), &request.UpdateRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		KeyValues:             req.KeyValues,
@@ -247,9 +250,9 @@ func (c *Client) Update(databaseID string, req *client.UpdateRequest) (string, e
 	return reply.Statement, nil
 }
 
-func (c *Client) Replay(databaseID string, req *client.ReplayRequest) (string, error) {
+func (c *Client) Replay(req *client.ReplayRequest) (string, error) {
 	reply, err := c.commandServiceClient.Replay(context.Background(), &request.ReplayRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		KeyValues:             req.KeyValues,
@@ -262,14 +265,14 @@ func (c *Client) Replay(databaseID string, req *client.ReplayRequest) (string, e
 	return reply.Statement, nil
 }
 
-func (c *Client) QueryByWhereAndOrderBy(databaseID string, req *client.QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error) {
+func (c *Client) QueryByWhereAndOrderBy(req *client.QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", nil, 0, err
 	}
 
 	reply, err := c.queryServiceClient.QueryByWhereAndOrderBy(context.Background(), &request.QueryByWhereAndOrderByRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Select:                req.Select,
@@ -290,7 +293,7 @@ func (c *Client) QueryByWhereAndOrderBy(databaseID string, req *client.QueryByWh
 	return reply.Statement, infosMap, reply.TotalCount, nil
 }
 
-func (c *Client) CommonQuery(databaseID string, req *client.CommonQueryRequest) (string, []map[string]any, int64, error) {
+func (c *Client) CommonQuery(req *client.CommonQueryRequest) (string, []map[string]any, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", nil, 0, err
@@ -307,7 +310,7 @@ func (c *Client) CommonQuery(databaseID string, req *client.CommonQueryRequest)
 	}
 
 	reply, err := c.queryServiceClient.CommonQuery(context.Background(), &request.CommonQueryRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Select:                req.Select,
@@ -332,9 +335,9 @@ func (c *Client) CommonQuery(databaseID string, req *client.CommonQueryRequest)
 	return reply.Statement, infosMap, reply.TotalCount, nil
 }
 
-func (c *Client) QueryByKeys(databaseID string, req *client.QueryByKeysRequest) (string, map[string]any, error) {
+func (c *Client) QueryByKeys(req *client.QueryByKeysRequest) (string, map[string]any, error) {
 	reply, err := c.queryServiceClient.QueryByKeys(context.Background(), &request.QueryByKeysRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Select:                req.Select,
@@ -352,14 +355,14 @@ func (c *Client) QueryByKeys(databaseID string, req *client.QueryByKeysRequest)
 	return reply.Statement, infoMap, nil
 }
 
-func (c *Client) CountWhere(databaseID string, req *client.CountWhereRequest) (string, int64, error) {
+func (c *Client) CountWhere(req *client.CountWhereRequest) (string, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", 0, err
 	}
 
 	reply, err := c.queryServiceClient.CountWhere(context.Background(), &request.CountWhereRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Where:                 whereJsonBytes,
@@ -371,7 +374,7 @@ func (c *Client) CountWhere(databaseID string, req *client.CountWhereRequest) (s
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCount(databaseID string, req *client.CommonCountRequest) (string, int64, error) {
+func (c *Client) CommonCount(req *client.CommonCountRequest) (string, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", 0, err
@@ -388,7 +391,7 @@ func (c *Client) CommonCount(databaseID string, req *client.CommonCountRequest)
 	}
 
 	reply, err := c.queryServiceClient.CommonCount(context.Background(), &request.CommonCountRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Version:               req.Version,
 		Where:                 whereJsonBytes,
@@ -404,9 +407,9 @@ func (c *Client) CommonCount(databaseID string, req *client.CommonCountRequest)
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) EventQueryByKeys(databaseID string, req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
+func (c *Client) EventQueryByKeys(req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.EventQueryByKeys(context.Background(), &request.EventQueryByKeysRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Select:                req.Select,
 		KeyValues:             req.KeyValues,
@@ -420,9 +423,9 @@ func (c *Client) EventQueryByKeys(databaseID string, req *client.EventQueryByKey
 	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CommonEventQuery(databaseID string, req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
+func (c *Client) CommonEventQuery(req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonEventQuery(context.Background(), &request.CommonEventQueryRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Select:                req.Select,
 		KeyValues:             req.KeyValues,
@@ -441,9 +444,9 @@ func (c *Client) CommonEventQuery(databaseID string, req *client.CommonEventQuer
 	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CountEventByKeys(databaseID string, req *client.CountEventByKeysRequest) (string, int64, error) {
+func (c *Client) CountEventByKeys(req *client.CountEventByKeysRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CountEventByKeys(context.Background(), &request.CountEventByKeysRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		KeyValues:             req.KeyValues,
 	})
@@ -454,9 +457,9 @@ func (c *Client) CountEventByKeys(databaseID string, req *client.CountEventByKey
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCountEvent(databaseID string, req *client.CommonCountEventRequest) (string, int64, error) {
+func (c *Client) CommonCountEvent(req *client.CommonCountEventRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonCountEvent(context.Background(), &request.CommonCountEventRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		KeyValues:             req.KeyValues,
 		Version:               req.Version,
@@ -472,9 +475,9 @@ func (c *Client) CommonCountEvent(databaseID string, req *client.CommonCountEven
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) EventHistoryQueryByKeys(databaseID string, req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
+func (c *Client) EventHistoryQueryByKeys(req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.EventHistoryQueryByKeys(context.Background(), &request.EventQueryByKeysRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Select:                req.Select,
 		KeyValues:             req.KeyValues,
@@ -488,9 +491,9 @@ func (c *Client) EventHistoryQueryByKeys(databaseID string, req *client.EventQue
 	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CommonEventHistoryQuery(databaseID string, req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
+func (c *Client) CommonEventHistoryQuery(req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonEventHistoryQuery(context.Background(), &request.CommonEventQueryRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		Select:                req.Select,
 		KeyValues:             req.KeyValues,
@@ -509,9 +512,9 @@ func (c *Client) CommonEventHistoryQuery(databaseID string, req *client.CommonEv
 	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CountEventHistoryByKeys(databaseID string, req *client.CountEventByKeysRequest) (string, int64, error) {
+func (c *Client) CountEventHistoryByKeys(req *client.CountEventByKeysRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CountEventHistoryByKeys(context.Background(), &request.CountEventByKeysRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		KeyValues:             req.KeyValues,
 	})
@@ -522,9 +525,9 @@ func (c *Client) CountEventHistoryByKeys(databaseID string, req *client.CountEve
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCountEventHistory(databaseID string, req *client.CommonCountEventRequest) (string, int64, error) {
+func (c *Client) CommonCountEventHistory(req *client.CommonCountEventRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonCountEventHistory(context.Background(), &request.CommonCountEventRequest{
-		DatabaseID:            databaseID,
+		DatabaseID:            c.databaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
 		KeyValues:             req.KeyValues,
 		Version:               req.Version,

dpsv1/transaction.go

@@ -12,7 +12,7 @@ type Transaction struct {
 	client *Client
 }
 
-func (tx *Transaction) InsertTx(databaseID string, req *client.InsertRequest) (string, error) {
+func (tx *Transaction) InsertTx(req *client.InsertRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -30,9 +30,8 @@ func (tx *Transaction) InsertTx(databaseID string, req *client.InsertRequest) (s
 	}
 
 	err = tx.stream.Send(&request.TransactionOperation{
-		Request: &request.TransactionOperation_InsertRequest{
+		Request: &request.TransactionOperation_InsertTxRequest{
-			InsertRequest: &request.InsertRequest{
+			InsertTxRequest: &request.InsertTxRequest{
-				DatabaseID:            databaseID,
 				TablePrefixWithSchema: req.TablePrefixWithSchema,
 				Version:               req.Version,
 				KeyColumns:            req.KeyColumns,
@@ -52,7 +51,7 @@ func (tx *Transaction) InsertTx(databaseID string, req *client.InsertRequest) (s
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) InsertBatchTx(databaseID string, req *client.InsertBatchRequest) (string, error) {
+func (tx *Transaction) InsertBatchTx(req *client.InsertBatchRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -88,11 +87,10 @@ func (tx *Transaction) InsertBatchTx(databaseID string, req *client.InsertBatchR
 	}
 
 	err = tx.stream.Send(&request.TransactionOperation{
-		Request: &request.TransactionOperation_InsertBatchRequest{
+		Request: &request.TransactionOperation_InsertBatchTxRequest{
-			InsertBatchRequest: &request.InsertBatchRequest{
+			InsertBatchTxRequest: &request.InsertBatchTxRequest{
-				DatabaseID: databaseID,
+				Items:  tableItems,
-				Items:      tableItems,
+				UserID: req.UserID,
-				UserID:     req.UserID,
 			},
 		}})
 	if err != nil {
@@ -107,7 +105,7 @@ func (tx *Transaction) InsertBatchTx(databaseID string, req *client.InsertBatchR
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) DeleteTx(databaseID string, req *client.DeleteRequest) (string, error) {
+func (tx *Transaction) DeleteTx(req *client.DeleteRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -120,9 +118,8 @@ func (tx *Transaction) DeleteTx(databaseID string, req *client.DeleteRequest) (s
 	}()
 
 	err = tx.stream.Send(&request.TransactionOperation{
-		Request: &request.TransactionOperation_DeleteRequest{
+		Request: &request.TransactionOperation_DeleteTxRequest{
-			DeleteRequest: &request.DeleteRequest{
+			DeleteTxRequest: &request.DeleteTxRequest{
-				DatabaseID:            databaseID,
 				TablePrefixWithSchema: req.TablePrefixWithSchema,
 				Version:               req.Version,
 				KeyValues:             req.KeyValues,
@@ -141,7 +138,7 @@ func (tx *Transaction) DeleteTx(databaseID string, req *client.DeleteRequest) (s
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) DeleteBatchTx(databaseID string, req *client.DeleteBatchRequest) (string, error) {
+func (tx *Transaction) DeleteBatchTx(req *client.DeleteBatchRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -171,11 +168,10 @@ func (tx *Transaction) DeleteBatchTx(databaseID string, req *client.DeleteBatchR
 	}
 
 	err = tx.stream.Send(&request.TransactionOperation{
-		Request: &request.TransactionOperation_DeleteBatchRequest{
+		Request: &request.TransactionOperation_DeleteBatchTxRequest{
-			DeleteBatchRequest: &request.DeleteBatchRequest{
+			DeleteBatchTxRequest: &request.DeleteBatchTxRequest{
-				DatabaseID: databaseID,
+				Items:  tableItems,
-				Items:      tableItems,
+				UserID: req.UserID,
-				UserID:     req.UserID,
 			},
 		}})
 	if err != nil {
@@ -190,7 +186,7 @@ func (tx *Transaction) DeleteBatchTx(databaseID string, req *client.DeleteBatchR
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) UpdateTx(databaseID string, req *client.UpdateRequest) (string, error) {
+func (tx *Transaction) UpdateTx(req *client.UpdateRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -208,9 +204,8 @@ func (tx *Transaction) UpdateTx(databaseID string, req *client.UpdateRequest) (s
 	}
 
 	err = tx.stream.Send(&request.TransactionOperation{
-		Request: &request.TransactionOperation_UpdateRequest{
+		Request: &request.TransactionOperation_UpdateTxRequest{
-			UpdateRequest: &request.UpdateRequest{
+			UpdateTxRequest: &request.UpdateTxRequest{
-				DatabaseID:            databaseID,
 				TablePrefixWithSchema: req.TablePrefixWithSchema,
 				Version:               req.Version,
 				KeyValues:             req.KeyValues,

pb/v1/request/command.validator.pb.go

@@ -59,6 +59,85 @@ func (this *AutoMigrateItem) Validate() error {
 	}
 	return nil
 }
+func (this *TransactionBeginRequest) Validate() error {
+	if this.DatabaseID == "" {
+		return github_com_mwitkow_go_proto_validators.FieldError("DatabaseID", fmt.Errorf(`value '%v' must not be an empty string`, this.DatabaseID))
+	}
+	return nil
+}
+func (this *InsertTxRequest) Validate() error {
+	if this.TablePrefixWithSchema == "" {
+		return github_com_mwitkow_go_proto_validators.FieldError("TablePrefixWithSchema", fmt.Errorf(`value '%v' must not be an empty string`, this.TablePrefixWithSchema))
+	}
+	if this.Version == "" {
+		return github_com_mwitkow_go_proto_validators.FieldError("Version", fmt.Errorf(`value '%v' must not be an empty string`, this.Version))
+	}
+	for _, item := range this.KeyColumns {
+		if !(len(item) > 0) {
+			return github_com_mwitkow_go_proto_validators.FieldError("KeyColumns", fmt.Errorf(`value '%v' must have a length greater than '0'`, item))
+		}
+	}
+	if this.TableRow != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.TableRow); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("TableRow", err)
+		}
+	}
+	return nil
+}
+func (this *InsertBatchTxRequest) Validate() error {
+	if len(this.Items) < 1 {
+		return github_com_mwitkow_go_proto_validators.FieldError("Items", fmt.Errorf(`value '%v' must contain at least 1 elements`, this.Items))
+	}
+	for _, item := range this.Items {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Items", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *DeleteTxRequest) Validate() error {
+	if this.TablePrefixWithSchema == "" {
+		return github_com_mwitkow_go_proto_validators.FieldError("TablePrefixWithSchema", fmt.Errorf(`value '%v' must not be an empty string`, this.TablePrefixWithSchema))
+	}
+	if this.Version == "" {
+		return github_com_mwitkow_go_proto_validators.FieldError("Version", fmt.Errorf(`value '%v' must not be an empty string`, this.Version))
+	}
+	// Validation of proto3 map<> fields is unsupported.
+	return nil
+}
+func (this *DeleteBatchTxRequest) Validate() error {
+	if len(this.Items) < 1 {
+		return github_com_mwitkow_go_proto_validators.FieldError("Items", fmt.Errorf(`value '%v' must contain at least 1 elements`, this.Items))
+	}
+	for _, item := range this.Items {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Items", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *UpdateTxRequest) Validate() error {
+	if this.TablePrefixWithSchema == "" {
+		return github_com_mwitkow_go_proto_validators.FieldError("TablePrefixWithSchema", fmt.Errorf(`value '%v' must not be an empty string`, this.TablePrefixWithSchema))
+	}
+	if this.Version == "" {
+		return github_com_mwitkow_go_proto_validators.FieldError("Version", fmt.Errorf(`value '%v' must not be an empty string`, this.Version))
+	}
+	// Validation of proto3 map<> fields is unsupported.
+	if this.NewTableRow != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.NewTableRow); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("NewTableRow", err)
+		}
+	}
+	return nil
+}
+func (this *TransactionEndRequest) Validate() error {
+	return nil
+}
 func (this *TransactionOperation) Validate() error {
 	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_TransactionBeginRequest); ok {
 		if oneOfNester.TransactionBeginRequest != nil {
@@ -67,38 +146,38 @@ func (this *TransactionOperation) Validate() error {
 			}
 		}
 	}
-	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_InsertRequest); ok {
+	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_InsertTxRequest); ok {
-		if oneOfNester.InsertRequest != nil {
+		if oneOfNester.InsertTxRequest != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.InsertRequest); err != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.InsertTxRequest); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("InsertRequest", err)
+				return github_com_mwitkow_go_proto_validators.FieldError("InsertTxRequest", err)
 			}
 		}
 	}
-	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_InsertBatchRequest); ok {
+	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_InsertBatchTxRequest); ok {
-		if oneOfNester.InsertBatchRequest != nil {
+		if oneOfNester.InsertBatchTxRequest != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.InsertBatchRequest); err != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.InsertBatchTxRequest); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("InsertBatchRequest", err)
+				return github_com_mwitkow_go_proto_validators.FieldError("InsertBatchTxRequest", err)
 			}
 		}
 	}
-	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_DeleteRequest); ok {
+	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_DeleteTxRequest); ok {
-		if oneOfNester.DeleteRequest != nil {
+		if oneOfNester.DeleteTxRequest != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.DeleteRequest); err != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.DeleteTxRequest); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("DeleteRequest", err)
+				return github_com_mwitkow_go_proto_validators.FieldError("DeleteTxRequest", err)
 			}
 		}
 	}
-	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_DeleteBatchRequest); ok {
+	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_DeleteBatchTxRequest); ok {
-		if oneOfNester.DeleteBatchRequest != nil {
+		if oneOfNester.DeleteBatchTxRequest != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.DeleteBatchRequest); err != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.DeleteBatchTxRequest); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("DeleteBatchRequest", err)
+				return github_com_mwitkow_go_proto_validators.FieldError("DeleteBatchTxRequest", err)
 			}
 		}
 	}
-	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_UpdateRequest); ok {
+	if oneOfNester, ok := this.GetRequest().(*TransactionOperation_UpdateTxRequest); ok {
-		if oneOfNester.UpdateRequest != nil {
+		if oneOfNester.UpdateTxRequest != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.UpdateRequest); err != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(oneOfNester.UpdateTxRequest); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("UpdateRequest", err)
+				return github_com_mwitkow_go_proto_validators.FieldError("UpdateTxRequest", err)
 			}
 		}
 	}
@@ -264,15 +343,6 @@ func (this *ReplayRequest) Validate() error {
 	// Validation of proto3 map<> fields is unsupported.
 	return nil
 }
-func (this *TransactionBeginRequest) Validate() error {
-	if this.DatabaseID == "" {
-		return github_com_mwitkow_go_proto_validators.FieldError("DatabaseID", fmt.Errorf(`value '%v' must not be an empty string`, this.DatabaseID))
-	}
-	return nil
-}
-func (this *TransactionEndRequest) Validate() error {
-	return nil
-}
 func (this *TableRow) Validate() error {
 	for _, item := range this.Columns {
 		if item != nil {

test/v1/sdk.go

@@ -10,8 +10,8 @@ import (
 
 var clientInstance client.Client
 
-func initClient(t *testing.T, address string) {
+func initClient(t *testing.T, address string, databaseID string) {
-	c, err := dps.NewClient(address, "v1")
+	c, err := dps.NewClient(address, "v1", databaseID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -19,8 +19,8 @@ func initClient(t *testing.T, address string) {
 	clientInstance = c
 }
 
-func destroyClient(t *testing.T) {
+func destroyClient(t *testing.T, databaseID string) {
-	err := dps.DestroyClient("v1")
+	err := dps.DestroyClient("v1", databaseID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,8 +36,8 @@ func newToolKit(t *testing.T) *ToolKit {
 	return &ToolKit{t: t}
 }
 
-func (toolKit *ToolKit) autoMigrate(databaseID string, req *client.AutoMigrateRequest) *ToolKit {
+func (toolKit *ToolKit) autoMigrate(req *client.AutoMigrateRequest) *ToolKit {
-	err := clientInstance.AutoMigrate(databaseID, req)
+	err := clientInstance.AutoMigrate(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -45,8 +45,8 @@ func (toolKit *ToolKit) autoMigrate(databaseID string, req *client.AutoMigrateRe
 	return toolKit
 }
 
-func (toolKit *ToolKit) autoMigrateBatch(databaseID string, req *client.AutoMigrateBatchRequest) *ToolKit {
+func (toolKit *ToolKit) autoMigrateBatch(req *client.AutoMigrateBatchRequest) *ToolKit {
-	err := clientInstance.AutoMigrateBatch(databaseID, req)
+	err := clientInstance.AutoMigrateBatch(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -54,8 +54,8 @@ func (toolKit *ToolKit) autoMigrateBatch(databaseID string, req *client.AutoMigr
 	return toolKit
 }
 
-func (toolKit *ToolKit) transaction(databaseID string, txFunc client.TransactionFunc) *ToolKit {
+func (toolKit *ToolKit) transaction(txFunc client.TransactionFunc) *ToolKit {
-	err := clientInstance.Transaction(databaseID, txFunc)
+	err := clientInstance.Transaction(txFunc)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -63,8 +63,8 @@ func (toolKit *ToolKit) transaction(databaseID string, txFunc client.Transaction
 	return toolKit
 }
 
-func (toolKit *ToolKit) insert(databaseID string, req *client.InsertRequest) *ToolKit {
+func (toolKit *ToolKit) insert(req *client.InsertRequest) *ToolKit {
-	statement, err := clientInstance.Insert(databaseID, req)
+	statement, err := clientInstance.Insert(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -74,8 +74,8 @@ func (toolKit *ToolKit) insert(databaseID string, req *client.InsertRequest) *To
 	return toolKit
 }
 
-func (toolKit *ToolKit) insertBatch(databaseID string, req *client.InsertBatchRequest) *ToolKit {
+func (toolKit *ToolKit) insertBatch(req *client.InsertBatchRequest) *ToolKit {
-	statement, err := clientInstance.InsertBatch(databaseID, req)
+	statement, err := clientInstance.InsertBatch(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -85,8 +85,8 @@ func (toolKit *ToolKit) insertBatch(databaseID string, req *client.InsertBatchRe
 	return toolKit
 }
 
-func (toolKit *ToolKit) delete(databaseID string, req *client.DeleteRequest) *ToolKit {
+func (toolKit *ToolKit) delete(req *client.DeleteRequest) *ToolKit {
-	statement, err := clientInstance.Delete(databaseID, req)
+	statement, err := clientInstance.Delete(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -96,8 +96,8 @@ func (toolKit *ToolKit) delete(databaseID string, req *client.DeleteRequest) *To
 	return toolKit
 }
 
-func (toolKit *ToolKit) deleteBatch(databaseID string, req *client.DeleteBatchRequest) *ToolKit {
+func (toolKit *ToolKit) deleteBatch(req *client.DeleteBatchRequest) *ToolKit {
-	statement, err := clientInstance.DeleteBatch(databaseID, req)
+	statement, err := clientInstance.DeleteBatch(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -107,8 +107,8 @@ func (toolKit *ToolKit) deleteBatch(databaseID string, req *client.DeleteBatchRe
 	return toolKit
 }
 
-func (toolKit *ToolKit) update(databaseID string, req *client.UpdateRequest) *ToolKit {
+func (toolKit *ToolKit) update(req *client.UpdateRequest) *ToolKit {
-	statement, err := clientInstance.Update(databaseID, req)
+	statement, err := clientInstance.Update(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -118,8 +118,8 @@ func (toolKit *ToolKit) update(databaseID string, req *client.UpdateRequest) *To
 	return toolKit
 }
 
-func (toolKit *ToolKit) reply(databaseID string, req *client.ReplayRequest) *ToolKit {
+func (toolKit *ToolKit) reply(req *client.ReplayRequest) *ToolKit {
-	statement, err := clientInstance.Replay(databaseID, req)
+	statement, err := clientInstance.Replay(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -129,8 +129,8 @@ func (toolKit *ToolKit) reply(databaseID string, req *client.ReplayRequest) *Too
 	return toolKit
 }
 
-func (toolKit *ToolKit) queryByWhereAndOrderBy(databaseID string, req *client.QueryByWhereAndOrderByRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) queryByWhereAndOrderBy(req *client.QueryByWhereAndOrderByRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
-	statement, infosMap, totalCount, err := clientInstance.QueryByWhereAndOrderBy(databaseID, req)
+	statement, infosMap, totalCount, err := clientInstance.QueryByWhereAndOrderBy(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -149,8 +149,8 @@ func (toolKit *ToolKit) queryByWhereAndOrderBy(databaseID string, req *client.Qu
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonQuery(databaseID string, req *client.CommonQueryRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonQuery(req *client.CommonQueryRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
-	statement, infosMap, totalCount, err := clientInstance.CommonQuery(databaseID, req)
+	statement, infosMap, totalCount, err := clientInstance.CommonQuery(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -169,8 +169,8 @@ func (toolKit *ToolKit) commonQuery(databaseID string, req *client.CommonQueryRe
 	return toolKit
 }
 
-func (toolKit *ToolKit) queryByKeys(databaseID string, req *client.QueryByKeysRequest, retInfoMap *map[string]any) *ToolKit {
+func (toolKit *ToolKit) queryByKeys(req *client.QueryByKeysRequest, retInfoMap *map[string]any) *ToolKit {
-	statement, infoMap, err := clientInstance.QueryByKeys(databaseID, req)
+	statement, infoMap, err := clientInstance.QueryByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -185,8 +185,8 @@ func (toolKit *ToolKit) queryByKeys(databaseID string, req *client.QueryByKeysRe
 	return toolKit
 }
 
-func (toolKit *ToolKit) countWhere(databaseID string, req *client.CountWhereRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) countWhere(req *client.CountWhereRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CountWhere(databaseID, req)
+	statement, count, err := clientInstance.CountWhere(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -200,8 +200,8 @@ func (toolKit *ToolKit) countWhere(databaseID string, req *client.CountWhereRequ
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCount(databaseID string, req *client.CommonCountRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonCount(req *client.CommonCountRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CommonCount(databaseID, req)
+	statement, count, err := clientInstance.CommonCount(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -215,8 +215,8 @@ func (toolKit *ToolKit) commonCount(databaseID string, req *client.CommonCountRe
 	return toolKit
 }
 
-func (toolKit *ToolKit) eventQueryByKeys(databaseID string, req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) eventQueryByKeys(req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
-	statement, infos, totalCount, err := clientInstance.EventQueryByKeys(databaseID, req)
+	statement, infos, totalCount, err := clientInstance.EventQueryByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -235,8 +235,8 @@ func (toolKit *ToolKit) eventQueryByKeys(databaseID string, req *client.EventQue
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonEventQuery(databaseID string, req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonEventQuery(req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
-	statement, infos, totalCount, err := clientInstance.CommonEventQuery(databaseID, req)
+	statement, infos, totalCount, err := clientInstance.CommonEventQuery(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -255,8 +255,8 @@ func (toolKit *ToolKit) commonEventQuery(databaseID string, req *client.CommonEv
 	return toolKit
 }
 
-func (toolKit *ToolKit) countEventByKeys(databaseID string, req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) countEventByKeys(req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CountEventByKeys(databaseID, req)
+	statement, count, err := clientInstance.CountEventByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -270,8 +270,8 @@ func (toolKit *ToolKit) countEventByKeys(databaseID string, req *client.CountEve
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCountEvent(databaseID string, req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonCountEvent(req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CommonCountEvent(databaseID, req)
+	statement, count, err := clientInstance.CommonCountEvent(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -285,8 +285,8 @@ func (toolKit *ToolKit) commonCountEvent(databaseID string, req *client.CommonCo
 	return toolKit
 }
 
-func (toolKit *ToolKit) eventHistoryQueryByKeys(databaseID string, req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) eventHistoryQueryByKeys(req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
-	statement, infos, totalCount, err := clientInstance.EventHistoryQueryByKeys(databaseID, req)
+	statement, infos, totalCount, err := clientInstance.EventHistoryQueryByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -305,8 +305,8 @@ func (toolKit *ToolKit) eventHistoryQueryByKeys(databaseID string, req *client.E
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonEventHistoryQuery(databaseID string, req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonEventHistoryQuery(req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
-	statement, infos, totalCount, err := clientInstance.CommonEventHistoryQuery(databaseID, req)
+	statement, infos, totalCount, err := clientInstance.CommonEventHistoryQuery(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -325,8 +325,8 @@ func (toolKit *ToolKit) commonEventHistoryQuery(databaseID string, req *client.C
 	return toolKit
 }
 
-func (toolKit *ToolKit) countEventHistoryByKeys(databaseID string, req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) countEventHistoryByKeys(req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CountEventHistoryByKeys(databaseID, req)
+	statement, count, err := clientInstance.CountEventHistoryByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}
@@ -340,8 +340,8 @@ func (toolKit *ToolKit) countEventHistoryByKeys(databaseID string, req *client.C
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCountEventHistory(databaseID string, req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonCountEventHistory(req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
-	statement, count, err := clientInstance.CommonCountEventHistory(databaseID, req)
+	statement, count, err := clientInstance.CommonCountEventHistory(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
 	}

test/v1/v1_test.go

@@ -18,18 +18,18 @@ var tableModelDescribe = client.TableModelDescribe{
 }
 
 func TestAutoMigrate(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: "test." + simpleUUID()[0:8],
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		autoMigrateBatch("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateBatchRequest{
+		autoMigrateBatch(&client.AutoMigrateBatchRequest{
 			Items: []client.AutoMigrateItem{
 				{
 					TablePrefixWithSchema: "test." + simpleUUID()[0:8],
@@ -46,8 +46,8 @@ func TestAutoMigrate(t *testing.T) {
 }
 
 func TestTransaction(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -63,15 +63,15 @@ func TestTransaction(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+		transaction(func(tx client.Transaction) error {
-			statement, err := tx.InsertTx("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
+			statement, err := tx.InsertTx(&client.InsertRequest{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				KeyColumns:            []string{"id"},
@@ -96,7 +96,7 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -105,8 +105,8 @@ func TestTransaction(t *testing.T) {
 		assertEqual(name, resultMap["name"], "名称不一致").
 		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum, resultMap["table_num"], "表数量不一致").
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+		transaction(func(tx client.Transaction) error {
-			statement, err := tx.UpdateTx("2b78141779ee432295ca371b91c5cac7", &client.UpdateRequest{
+			statement, err := tx.UpdateTx(&client.UpdateRequest{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				KeyValues:             map[string]string{"id": id},
@@ -131,7 +131,7 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -140,8 +140,8 @@ func TestTransaction(t *testing.T) {
 		assertEqual(newName, resultMap["name"], "名称不一致").
 		assertEqual(newNow.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(newTableNum, resultMap["table_num"], "表数量不一致").
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+		transaction(func(tx client.Transaction) error {
-			statement, err := tx.UpdateTx("2b78141779ee432295ca371b91c5cac7", &client.UpdateRequest{
+			statement, err := tx.UpdateTx(&client.UpdateRequest{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				KeyValues:             map[string]string{"id": id},
@@ -159,7 +159,7 @@ func TestTransaction(t *testing.T) {
 
 			fmt.Println(statement)
 
-			statement, err = tx.DeleteTx("2b78141779ee432295ca371b91c5cac7", &client.DeleteRequest{
+			statement, err = tx.DeleteTx(&client.DeleteRequest{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				KeyValues:             map[string]string{"id": id},
@@ -178,7 +178,7 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		countWhere("2b78141779ee432295ca371b91c5cac7", &client.CountWhereRequest{
+		countWhere(&client.CountWhereRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -193,8 +193,8 @@ func TestTransaction(t *testing.T) {
 }
 
 func TestTransactionBatch(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -212,15 +212,15 @@ func TestTransactionBatch(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+		transaction(func(tx client.Transaction) error {
-			statement, err := tx.InsertBatchTx("2b78141779ee432295ca371b91c5cac7", &client.InsertBatchRequest{
+			statement, err := tx.InsertBatchTx(&client.InsertBatchRequest{
 				Items: []*client.InsertTableItem{
 					{
 						TablePrefixWithSchema: tablePrefix,
@@ -262,7 +262,7 @@ func TestTransactionBatch(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id1},
@@ -271,7 +271,7 @@ func TestTransactionBatch(t *testing.T) {
 		assertEqual(name1, resultMap["name"], "名称不一致").
 		assertEqual(now1.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum1, resultMap["table_num"], "表数量不一致").
-		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id2},
@@ -280,8 +280,8 @@ func TestTransactionBatch(t *testing.T) {
 		assertEqual(name2, resultMap["name"], "名称不一致").
 		assertEqual(now2.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum2, resultMap["table_num"], "表数量不一致").
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+		transaction(func(tx client.Transaction) error {
-			statement, err := tx.DeleteBatchTx("2b78141779ee432295ca371b91c5cac7", &client.DeleteBatchRequest{
+			statement, err := tx.DeleteBatchTx(&client.DeleteBatchRequest{
 				Items: []*client.DeleteTableItem{
 					{
 						TablePrefixWithSchema: tablePrefix,
@@ -307,7 +307,7 @@ func TestTransactionBatch(t *testing.T) {
 
 			return nil
 		}).
-		countWhere("2b78141779ee432295ca371b91c5cac7", &client.CountWhereRequest{
+		countWhere(&client.CountWhereRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -319,7 +319,7 @@ func TestTransactionBatch(t *testing.T) {
 			},
 		}, &count).
 		assertEqual(int64(0), count, "数量不一致").
-		countWhere("2b78141779ee432295ca371b91c5cac7", &client.CountWhereRequest{
+		countWhere(&client.CountWhereRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -334,8 +334,8 @@ func TestTransactionBatch(t *testing.T) {
 }
 
 func TestInsert(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -347,14 +347,14 @@ func TestInsert(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
+		insert(&client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -366,7 +366,7 @@ func TestInsert(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -378,8 +378,8 @@ func TestInsert(t *testing.T) {
 }
 
 func TestInsertBatch(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -397,14 +397,14 @@ func TestInsertBatch(t *testing.T) {
 	var totalCount int64
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insertBatch("2b78141779ee432295ca371b91c5cac7", &client.InsertBatchRequest{
+		insertBatch(&client.InsertBatchRequest{
 			Items: []*client.InsertTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
@@ -433,7 +433,7 @@ func TestInsertBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByWhereAndOrderBy("2b78141779ee432295ca371b91c5cac7", &client.QueryByWhereAndOrderByRequest{
+		queryByWhereAndOrderBy(&client.QueryByWhereAndOrderByRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -449,7 +449,7 @@ func TestInsertBatch(t *testing.T) {
 		assertEqual(name1, resultsMap[0]["name"], "名称不一致").
 		assertEqual(now1.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
 		assertEqual(tableNum1, resultsMap[0]["table_num"], "表数量不一致").
-		commonQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonQueryRequest{
+		commonQuery(&client.CommonQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -468,8 +468,8 @@ func TestInsertBatch(t *testing.T) {
 }
 
 func TestUpdate(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -484,14 +484,14 @@ func TestUpdate(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
+		insert(&client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -503,7 +503,7 @@ func TestUpdate(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		update("2b78141779ee432295ca371b91c5cac7", &client.UpdateRequest{
+		update(&client.UpdateRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -515,7 +515,7 @@ func TestUpdate(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -527,8 +527,8 @@ func TestUpdate(t *testing.T) {
 }
 
 func TestDelete(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -540,14 +540,14 @@ func TestDelete(t *testing.T) {
 	var count int64
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
+		insert(&client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -559,13 +559,13 @@ func TestDelete(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		delete("2b78141779ee432295ca371b91c5cac7", &client.DeleteRequest{
+		delete(&client.DeleteRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		countWhere("2b78141779ee432295ca371b91c5cac7", &client.CountWhereRequest{
+		countWhere(&client.CountWhereRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			Where: []client.ColumnCompare{
@@ -580,8 +580,8 @@ func TestDelete(t *testing.T) {
 }
 
 func TestDeleteBatch(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -598,14 +598,14 @@ func TestDeleteBatch(t *testing.T) {
 	var count int64
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insertBatch("2b78141779ee432295ca371b91c5cac7", &client.InsertBatchRequest{
+		insertBatch(&client.InsertBatchRequest{
 			Items: []*client.InsertTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
@@ -634,7 +634,7 @@ func TestDeleteBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		deleteBatch("2b78141779ee432295ca371b91c5cac7", &client.DeleteBatchRequest{
+		deleteBatch(&client.DeleteBatchRequest{
 			Items: []*client.DeleteTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
@@ -647,7 +647,7 @@ func TestDeleteBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		commonCount("2b78141779ee432295ca371b91c5cac7", &client.CommonCountRequest{
+		commonCount(&client.CommonCountRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 		}, &count).
@@ -655,8 +655,8 @@ func TestDeleteBatch(t *testing.T) {
 }
 
 func TestReply(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -668,14 +668,14 @@ func TestReply(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
+		insert(&client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -687,13 +687,13 @@ func TestReply(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		reply("2b78141779ee432295ca371b91c5cac7", &client.ReplayRequest{
+		reply(&client.ReplayRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		queryByKeys("2b78141779ee432295ca371b91c5cac7", &client.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -705,8 +705,8 @@ func TestReply(t *testing.T) {
 }
 
 func TestEventQuery(t *testing.T) {
-	initClient(t, "localhost:30170")
+	initClient(t, "localhost:30170", "2b78141779ee432295ca371b91c5cac7")
-	defer destroyClient(t)
+	defer destroyClient(t, "2b78141779ee432295ca371b91c5cac7")
 
 	tablePrefix := "test." + simpleUUID()[0:8]
 
@@ -722,7 +722,7 @@ func TestEventQuery(t *testing.T) {
 	eventInfos := make([]client.EventInfo, 0)
 
 	newToolKit(t).
-		autoMigrate("2b78141779ee432295ca371b91c5cac7", &client.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 
 			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
@@ -730,7 +730,7 @@ func TestEventQuery(t *testing.T) {
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert("2b78141779ee432295ca371b91c5cac7", &client.InsertRequest{
+		insert(&client.InsertRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyColumns:            []string{"id"},
@@ -742,7 +742,7 @@ func TestEventQuery(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		update("2b78141779ee432295ca371b91c5cac7", &client.UpdateRequest{
+		update(&client.UpdateRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
@@ -754,12 +754,12 @@ func TestEventQuery(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		countEventByKeys("2b78141779ee432295ca371b91c5cac7", &client.CountEventByKeysRequest{
+		countEventByKeys(&client.CountEventByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 		}, &totalCount).
 		assertEqual(2, int(totalCount), "总数不一致").
-		commonCountEvent("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
+		commonCountEvent(&client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -769,7 +769,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEvent("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
+		commonCountEvent(&client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -779,7 +779,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		eventQueryByKeys("2b78141779ee432295ca371b91c5cac7", &client.EventQueryByKeysRequest{
+		eventQueryByKeys(&client.EventQueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			PageNo:                0,
@@ -799,7 +799,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[1].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[1].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[1].Value, "值为空不一致").
-		eventQueryByKeys("2b78141779ee432295ca371b91c5cac7", &client.EventQueryByKeysRequest{
+		eventQueryByKeys(&client.EventQueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			PageNo:                1,
@@ -813,7 +813,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
+		commonEventQuery(&client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -832,7 +832,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
+		commonEventQuery(&client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -851,18 +851,18 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		delete("2b78141779ee432295ca371b91c5cac7", &client.DeleteRequest{
+		delete(&client.DeleteRequest{
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		countEventHistoryByKeys("2b78141779ee432295ca371b91c5cac7", &client.CountEventByKeysRequest{
+		countEventHistoryByKeys(&client.CountEventByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 		}, &totalCount).
 		assertEqual(3, int(totalCount), "总数不一致").
-		commonCountEventHistory("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
+		commonCountEventHistory(&client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -872,7 +872,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEventHistory("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
+		commonCountEventHistory(&client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -882,7 +882,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEventHistory("2b78141779ee432295ca371b91c5cac7", &client.CommonCountEventRequest{
+		commonCountEventHistory(&client.CommonCountEventRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -892,7 +892,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		eventHistoryQueryByKeys("2b78141779ee432295ca371b91c5cac7", &client.EventQueryByKeysRequest{
+		eventHistoryQueryByKeys(&client.EventQueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			PageNo:                0,
@@ -918,7 +918,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[2].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[2].CreateTime, "创建事件为空").
 		assertEqual("", eventInfos[2].Value, "值为空不一致").
-		eventHistoryQueryByKeys("2b78141779ee432295ca371b91c5cac7", &client.EventQueryByKeysRequest{
+		eventHistoryQueryByKeys(&client.EventQueryByKeysRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			PageNo:                1,
@@ -932,7 +932,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
+		commonEventHistoryQuery(&client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -951,7 +951,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
+		commonEventHistoryQuery(&client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",
@@ -970,7 +970,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery("2b78141779ee432295ca371b91c5cac7", &client.CommonEventQueryRequest{
+		commonEventHistoryQuery(&client.CommonEventQueryRequest{
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 			Version:               "v1",