Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: simplify stats counting functions (#18597)
Danny Xu4ef238d37362
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.goindex 6f6d28c7ca..acfe3b202d 100644--- a/backend/api/v1/actuator_service.go+++ b/backend/api/v1/actuator_service.go@@ -16,7 +16,6 @@ import ("github.com/bytebase/bytebase/backend/component/config""github.com/bytebase/bytebase/backend/component/sampleinstance""github.com/bytebase/bytebase/backend/enterprise"- storepb "github.com/bytebase/bytebase/backend/generated-go/store"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1""github.com/bytebase/bytebase/backend/generated-go/v1/v1connect""github.com/bytebase/bytebase/backend/runner/schemasync"@@ -132,7 +131,7 @@ func (s *ActuatorService) SetupSample(}func (s *ActuatorService) getServerInfo(ctx context.Context) (*v1pb.ActuatorInfo, error) {- count, err := s.store.CountUsers(ctx, storepb.PrincipalType_END_USER)+ activeEndUserCount, err := s.store.CountActiveEndUsers(ctx)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -174,7 +173,7 @@ func (s *ActuatorService) getServerInfo(ctx context.Context) (*v1pb.ActuatorInfoGitCommit: s.profile.GitCommit,Saas: s.profile.SaaS,Demo: s.profile.Demo,- NeedAdminSetup: count == 0,+ NeedAdminSetup: activeEndUserCount == 0,ExternalUrl: externalURL,DisallowSignup: setting.DisallowSignup || s.profile.SaaS,Require_2Fa: setting.Require_2Fa,@@ -207,11 +206,11 @@ func (s *ActuatorService) getServerInfo(ctx context.Context) (*v1pb.ActuatorInfo}serverInfo.ActivatedInstanceCount = int32(activatedInstanceCount)- totalInstanceCount, err := s.store.CountInstance(ctx, &store.CountInstanceMessage{})+ activeInstanceCount, err := s.store.CountActiveInstances(ctx)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to count total instance"))}- serverInfo.TotalInstanceCount = int32(totalInstanceCount)+ serverInfo.TotalInstanceCount = int32(activeInstanceCount)return &serverInfo, nil}diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex 501b7f31bf..4e9f5fd835 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -246,7 +246,7 @@ func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMesif !passwordRestriction.GetRequireResetPasswordForFirstLogin() {return false}- count, err := s.store.CountUsers(ctx, storepb.PrincipalType_END_USER)+ count, err := s.store.CountActiveEndUsers(ctx)if err != nil {slog.Error("failed to count end users", log.BBError(err))return false@@ -488,7 +488,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.func (s *AuthService) userCountGuard(ctx context.Context) error {userLimit := s.licenseService.GetUserLimit(ctx)- count, err := s.store.CountActiveUsers(ctx)+ count, err := s.store.CountActiveEndUsers(ctx)if err != nil {return connect.NewError(connect.CodeInternal, err)}diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.goindex 9a57c51a0a..390b2e2c94 100644--- a/backend/api/v1/instance_service.go+++ b/backend/api/v1/instance_service.go@@ -940,7 +940,7 @@ func buildEnvironmentName(environmentID *string) *string {func (s *InstanceService) instanceCountGuard(ctx context.Context) error {instanceLimit := s.licenseService.GetInstanceLimit(ctx)- count, err := s.store.CountInstance(ctx, &store.CountInstanceMessage{})+ count, err := s.store.CountActiveInstances(ctx)if err != nil {return connect.NewError(connect.CodeInternal, err)}diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.goindex 5b901a66e0..6dbe064644 100644--- a/backend/api/v1/user_service.go+++ b/backend/api/v1/user_service.go@@ -205,7 +205,7 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v}}- count, err := s.store.CountUsers(ctx, storepb.PrincipalType_END_USER)+ count, err := s.store.CountActiveEndUsers(ctx)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to count users, error: %v", err))}@@ -909,7 +909,7 @@ func generateRecoveryCodes(n int) ([]string, error) {func (s *UserService) userCountGuard(ctx context.Context) error {userLimit := s.licenseService.GetUserLimit(ctx)- count, err := s.store.CountActiveUsers(ctx)+ count, err := s.store.CountActiveEndUsers(ctx)if err != nil {return connect.NewError(connect.CodeInternal, err)}diff --git a/backend/store/stats.go b/backend/store/stats.goindex 1e673069e2..efe0272d57 100644--- a/backend/store/stats.go+++ b/backend/store/stats.go@@ -2,53 +2,16 @@ package storeimport ("context"- "database/sql""github.com/pkg/errors"- "github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/common/qb"storepb "github.com/bytebase/bytebase/backend/generated-go/store")-// CountInstanceMessage is the message for counting instances.-type CountInstanceMessage struct {- EnvironmentID *string-}--// CountUsers counts the principal.-func (s *Store) CountUsers(ctx context.Context, userType storepb.PrincipalType) (int, error) {- tx, err := s.GetDB().BeginTx(ctx, nil)- if err != nil {- return 0, err- }- defer tx.Rollback()-- count := 0-- q := qb.Q().Space("SELECT COUNT(*) FROM principal WHERE principal.type = ?", userType.String())- query, args, err := q.ToSQL()- if err != nil {- return 0, errors.Wrapf(err, "failed to build sql")- }-- if err := tx.QueryRowContext(ctx, query, args...).Scan(&count); err != nil {- return 0, err- }-- if err := tx.Commit(); err != nil {- return 0, err- }-- return count, nil-}--// CountInstance counts the number of instances.-func (s *Store) CountInstance(ctx context.Context, find *CountInstanceMessage) (int, error) {+// CountActiveInstances counts the number of instances.+func (s *Store) CountActiveInstances(ctx context.Context) (int, error) {q := qb.Q().Space("SELECT count(1) FROM instance WHERE instance.deleted = ?", false)- if v := find.EnvironmentID; v != nil {- q = q.Space("AND instance.environment = ?", *v)- }query, args, err := q.ToSQL()if err != nil {@@ -71,8 +34,8 @@ func (s *Store) CountInstance(ctx context.Context, find *CountInstanceMessage) (return count, nil}-// CountActiveUsers counts the number of endusers.-func (s *Store) CountActiveUsers(ctx context.Context) (int, error) {+// CountActiveEndUsers counts the number of endusers.+func (s *Store) CountActiveEndUsers(ctx context.Context) (int, error) {tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {return 0, err@@ -87,9 +50,6 @@ func (s *Store) CountActiveUsers(ctx context.Context) (int, error) {var count intif err := tx.QueryRowContext(ctx, query, args...).Scan(&count); err != nil {- if err == sql.ErrNoRows {- return 0, common.FormatDBErrorEmptyRowWithQuery(query)- }return 0, err}if err := tx.Commit(); err != nil {