YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-04-02 03:50:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: add vacuum memo relation to dev guard (#1644)

Browse Source 
* chore: add vacuum memo relation to dev guard

* chore: update
This commit is contained in:
boojack 2023-05-09 09:02:59 +08:00 committed by GitHub
parent 84546ff11c
commit 9b8d69b2dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
store/activity.go
View File

@ -38,7 +38,7 @@ func (raw *activityRaw) toActivity() *api.Activity {
// CreateActivity creates an instance of Activity. // CreateActivity creates an instance of Activity.
func (s *Store) CreateActivity(ctx context.Context, create *api.ActivityCreate) (*api.Activity, error) { func (s *Store) CreateActivity(ctx context.Context, create *api.ActivityCreate) (*api.Activity, error) {
if s.profile.Mode == "prod" { if s.Profile.Mode == "prod" {
return nil, nil return nil, nil
} }

4
store/memo.go
View File

@ -53,7 +53,7 @@ func (s *Store) ComposeMemo(ctx context.Context, memo *api.Memo) (*api.Memo, err
if err := s.ComposeMemoResourceList(ctx, memo); err != nil { if err := s.ComposeMemoResourceList(ctx, memo); err != nil {
return nil, err return nil, err
} }
if s.profile.IsDev() { if s.Profile.IsDev() {
if err := s.ComposeMemoRelationList(ctx, memo); err != nil { if err := s.ComposeMemoRelationList(ctx, memo); err != nil {
return nil, err return nil, err
} }
@ -184,7 +184,7 @@ func (s *Store) DeleteMemo(ctx context.Context, delete *api.MemoDelete) error {
if err := deleteMemo(ctx, tx, delete); err != nil { if err := deleteMemo(ctx, tx, delete); err != nil {
return FormatError(err) return FormatError(err)
} }
if err := vacuum(ctx, tx); err != nil { if err := s.vacuumImpl(ctx, tx); err != nil {
return err return err
} }

2
store/resource.go
View File

@ -160,7 +160,7 @@ func (s *Store) DeleteResource(ctx context.Context, delete *api.ResourceDelete)
if err := deleteResource(ctx, tx, delete); err != nil { if err := deleteResource(ctx, tx, delete); err != nil {
return err return err
} }
if err := vacuum(ctx, tx); err != nil { if err := s.vacuumImpl(ctx, tx); err != nil {
return err return err
} }

18
store/store.go
View File

@ -10,9 +10,8 @@ import (
// Store provides database access to all raw objects. // Store provides database access to all raw objects.
type Store struct { type Store struct {
db *sql.DB Profile *profile.Profile
profile *profile.Profile db *sql.DB
systemSettingCache sync.Map // map[string]*systemSettingRaw systemSettingCache sync.Map // map[string]*systemSettingRaw
userCache sync.Map // map[int]*userRaw userCache sync.Map // map[int]*userRaw
userSettingCache sync.Map // map[string]*userSettingRaw userSettingCache sync.Map // map[string]*userSettingRaw
@ -24,8 +23,8 @@ type Store struct {
// New creates a new instance of Store. // New creates a new instance of Store.
func New(db *sql.DB, profile *profile.Profile) *Store { func New(db *sql.DB, profile *profile.Profile) *Store {
return &Store{ return &Store{
Profile: profile,
db: db, db: db,
profile: profile,
} }
} }
@ -36,7 +35,7 @@ func (s *Store) Vacuum(ctx context.Context) error {
} }
defer tx.Rollback() defer tx.Rollback()
if err := vacuum(ctx, tx); err != nil { if err := s.vacuumImpl(ctx, tx); err != nil {
return err return err
} }
@ -52,8 +51,7 @@ func (s *Store) Vacuum(ctx context.Context) error {
return nil return nil
} }
// Exec vacuum records in a transaction. func (s *Store) vacuumImpl(ctx context.Context, tx *sql.Tx) error {
func vacuum(ctx context.Context, tx *sql.Tx) error {
if err := vacuumMemo(ctx, tx); err != nil { if err := vacuumMemo(ctx, tx); err != nil {
return err return err
} }
@ -72,8 +70,10 @@ func vacuum(ctx context.Context, tx *sql.Tx) error {
if err := vacuumMemoResource(ctx, tx); err != nil { if err := vacuumMemoResource(ctx, tx); err != nil {
return err return err
} }
if err := vacuumMemoRelations(ctx, tx); err != nil { if s.Profile.IsDev() {
return err if err := vacuumMemoRelations(ctx, tx); err != nil {
return err
}
} }
if err := vacuumTag(ctx, tx); err != nil { if err := vacuumTag(ctx, tx); err != nil {
// Prevent revive warning. // Prevent revive warning.

2
store/user.go
View File

@ -163,7 +163,7 @@ func (s *Store) DeleteUser(ctx context.Context, delete *api.UserDelete) error {
if err := deleteUser(ctx, tx, delete); err != nil { if err := deleteUser(ctx, tx, delete); err != nil {
return err return err
} }
if err := vacuum(ctx, tx); err != nil { if err := s.vacuumImpl(ctx, tx); err != nil {
return err return err
} }