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(common): move Uniq to common package to reduce import cycles (#18780)
p0ny6f5f6295a4d4
diff --git a/backend/api/v1/project_service_converter.go b/backend/api/v1/project_service_converter.goindex 789ef9fa45..ef7da5d068 100644--- a/backend/api/v1/project_service_converter.go+++ b/backend/api/v1/project_service_converter.go@@ -14,7 +14,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1""github.com/bytebase/bytebase/backend/store"- "github.com/bytebase/bytebase/backend/utils")func convertToProtoAny(i any) (*anypb.Any, error) {@@ -202,7 +201,7 @@ func convertToStoreIamPolicy(iamPolicy *v1pb.IamPolicy) (*storepb.IamPolicy, errfor _, binding := range iamPolicy.Bindings {var members []string- for _, member := range utils.Uniq(binding.Members) {+ for _, member := range common.Uniq(binding.Members) {storeMember, err := convertToStoreIamPolicyMember(member)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert iam member with error"))diff --git a/backend/common/util.go b/backend/common/util.goindex 362eda86ea..e01068d04f 100644--- a/backend/common/util.go+++ b/backend/common/util.go@@ -232,3 +232,19 @@ func IsNil(val any) bool {func NewP[T any](x T) *T {return &x}++// Uniq returns a new slice with duplicate elements removed, preserving order.+func Uniq[T comparable](array []T) []T {+ res := make([]T, 0, len(array))+ seen := make(map[T]struct{}, len(array))++ for _, e := range array {+ if _, ok := seen[e]; ok {+ continue+ }+ seen[e] = struct{}{}+ res = append(res, e)+ }++ return res+}diff --git a/backend/store/sheet.go b/backend/store/sheet.goindex 8ca9480487..e6a85b3fb7 100644--- a/backend/store/sheet.go+++ b/backend/store/sheet.go@@ -6,7 +6,6 @@ import ("database/sql""encoding/hex""fmt"- "slices""github.com/pkg/errors"@@ -159,12 +158,8 @@ func (s *Store) HasSheets(ctx context.Context, sha256Hexes ...string) (bool, errreturn true, nil}- // Make a copy before sorting to avoid modifying the caller's slice- sha256Hexes = slices.Clone(sha256Hexes)-// Remove duplicates- slices.Sort(sha256Hexes)- sha256Hexes = slices.Compact(sha256Hexes)+ sha256Hexes = common.Uniq(sha256Hexes)q := qb.Q().Space(`SELECT COUNT(*)diff --git a/backend/utils/member.go b/backend/utils/member.goindex b210ac5382..d88a5bed1c 100644--- a/backend/utils/member.go+++ b/backend/utils/member.go@@ -246,7 +246,7 @@ func GetUserRolesInIamPolicy(ctx context.Context, stores *store.Store, user *storoles = append(roles, binding.Role)}}- roles = Uniq(roles)+ roles = common.Uniq(roles)return roles}diff --git a/backend/utils/utils.go b/backend/utils/utils.goindex 171796ebbe..a5075f91b8 100644--- a/backend/utils/utils.go+++ b/backend/utils/utils.go@@ -197,21 +197,6 @@ func CheckDatabaseGroupMatch(ctx context.Context, expression string, database *sreturn false, nil}-func Uniq[T comparable](array []T) []T {- res := make([]T, 0, len(array))- seen := make(map[T]struct{}, len(array))-- for _, e := range array {- if _, ok := seen[e]; ok {- continue- }- seen[e] = struct{}{}- res = append(res, e)- }-- return res-}-// IsSpaceOrSemicolon checks if the rune is a space or a semicolon.func IsSpaceOrSemicolon(r rune) bool {if ok := unicode.IsSpace(r); ok {