sqlx: optimize get query for stmt

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/alimy/yesql v1.9.0
 	github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible
 	github.com/allegro/bigcache/v3 v3.1.0
-	github.com/bitbus/sqlx v1.6.0
+	github.com/bitbus/sqlx v1.7.0
 	github.com/bufbuild/connect-go v1.10.0
 	github.com/bytedance/sonic v1.10.0
 	github.com/cockroachdb/errors v1.10.0

go.sum

@@ -178,8 +178,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bitbus/sqlx v1.6.0 h1:ewrBydRkyHZqfOqvHVYpiBlqQtLn93B/loa2EwjpZ74=
+github.com/bitbus/sqlx v1.7.0 h1:n/hAlfY9bI29J9uObqAtjfITgNU2+XtY1ECnJUdmCZc=
-github.com/bitbus/sqlx v1.6.0/go.mod h1:MemKLfQ600g6PxUVsIDe48PlY3wOquyW2ApeiXoynFo=
+github.com/bitbus/sqlx v1.7.0/go.mod h1:MemKLfQ600g6PxUVsIDe48PlY3wOquyW2ApeiXoynFo=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=

internal/dao/sakila/contacts.go

@@ -160,8 +160,7 @@ func (s *contactManageSrv) IsFriend(userId int64, friendId int64) (res bool) {
 }
 
 func (s *contactManageSrv) fetchOrNewContact(tx *sqlx.Tx, userId int64, friendId int64, status int8) (res *cs.Contact, err error) {
-	res = &cs.Contact{}
+	if err = stmtGet(tx.Stmtx(s.q.GetContact), res, userId, friendId); err == nil {
-	if err = tx.Stmtx(s.q.GetContact).Get(res, userId, friendId); err == nil {
 		return
 	}
 	result, xerr := tx.Stmtx(s.q.CreateContact).Exec(userId, friendId, status, time.Now().Unix())

internal/dao/sakila/messages.go

@@ -45,7 +45,7 @@ func (s *messageSrv) GetUnreadCount(userID int64) (res int64, err error) {
 }
 
 func (s *messageSrv) GetMessageByID(id int64) (res *ms.Message, err error) {
-	err = s.q.GetMessageById.Get(res, id)
+	err = stmtGet(s.q.GetMessageById, res, id)
 	return
 }
 

internal/dao/sakila/security.go

@@ -29,8 +29,7 @@ type securitySrv struct {
 
 // GetLatestPhoneCaptcha 获取最新短信验证码
 func (s *securitySrv) GetLatestPhoneCaptcha(phone string) (res *ms.Captcha, err error) {
-	res = &ms.Captcha{}
+	err = stmtGet(s.q.GetLatestPhoneCaptcha, res, phone)
-	err = s.q.GetLatestPhoneCaptcha.Get(res, phone)
 	return
 }
 

internal/dao/sakila/sqlx.go

@@ -35,6 +35,24 @@ func newSqlxSrv(db *sqlx.DB) *sqlxSrv {
 	}
 }
 
+//lint:ignore U1000 stmtGet
+func stmtGet[T any](stmt *sqlx.Stmt, dest *T, args ...any) error {
+	*dest = *new(T)
+	return stmt.Get(dest, args...)
+}
+
+//lint:ignore U1000 stmtGetContext
+func stmtGetContext[T any](ctx context.Context, stmt *sqlx.Stmt, dest *T, args ...any) error {
+	*dest = *new(T)
+	return stmt.GetContext(ctx, dest, args...)
+}
+
+//lint:ignore U1000 inGet
+func inGet[T any](q sqlx.Queryable, dest *T, query string, args ...any) error {
+	*dest = *new(T)
+	return q.InGet(dest, query, args...)
+}
+
 //lint:ignore U1000 r
 func r(query string) string {
 	return _db.Rebind(t(query))

internal/dao/sakila/tweets.go

@@ -440,8 +440,7 @@ func (s *tweetSrv) GetUserPostStarCount(userID int64) (res int64, err error) {
 }
 
 func (s *tweetSrv) GetUserPostCollection(postID, userID int64) (res *ms.PostCollection, err error) {
-	res = &ms.PostCollection{}
+	err = stmtGet(s.q.GetUserPostCollection, res, postID, userID, userID)
-	err = s.q.GetUserPostCollection.Get(res, postID, userID, userID)
 	return
 }
 
@@ -467,8 +466,7 @@ func (s *tweetSrv) GetPostContentsByIDs(ids []int64) (res []*ms.PostContent, err
 }
 
 func (s *tweetSrv) GetPostContentByID(id int64) (res *ms.PostContent, err error) {
-	res = &ms.PostContent{}
+	err = stmtGet(s.q.GetPostContentById, res, id)
-	err = s.q.GetPostContentById.Get(res, id)
 	return
 }
 

internal/dao/sakila/user.go

@@ -24,20 +24,17 @@ type userManageSrv struct {
 }
 
 func (s *userManageSrv) GetUserByID(id int64) (res *ms.User, err error) {
-	res = &ms.User{}
+	err = stmtGet(s.q.GetUserById, res, id)
-	err = s.q.GetUserById.Get(res, id)
 	return
 }
 
 func (s *userManageSrv) GetUserByUsername(username string) (res *ms.User, err error) {
-	res = &ms.User{}
+	err = stmtGet(s.q.GetUserByUsername, res, username)
-	err = s.q.GetUserByUsername.Get(res, username)
 	return
 }
 
 func (s *userManageSrv) GetUserByPhone(phone string) (res *ms.User, err error) {
-	res = &ms.User{}
+	err = stmtGet(s.q.GetUserByPhone, res, phone)
-	err = s.q.GetUserByPhone.Get(res, phone)
 	return
 }
 

internal/dao/sakila/wallet.go

@@ -25,7 +25,7 @@ type walletSrv struct {
 }
 
 func (s *walletSrv) GetRechargeByID(id int64) (res *ms.WalletRecharge, err error) {
-	err = s.q.GetRechargeById.Get(res, id)
+	err = stmtGet(s.q.GetRechargeById, res, id)
 	return
 }