astra/plc-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove deleted_at

Browse source
This commit is contained in:
Max Ignatenko 2024-02-15 20:29:08 +00:00
parent 8561d90caf
commit 8313c74482
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/consumer/consumer.go
View file

@ -151,7 +151,7 @@ func (c *Consumer) checkForCursorReset(ctx context.Context, seq int64) error {
func (c *Consumer) resetCursor(ctx context.Context, seq int64) error {
zerolog.Ctx(ctx).Warn().Str("pds", c.remote.Host).Msgf("Cursor reset: %d -> %d", c.remote.Cursor, seq)
err := c.db.Model(&c.remote).
Where(&pds.PDS{Model: gorm.Model{ID: c.remote.ID}}).
Where(&pds.PDS{ID: c.remote.ID}).
Updates(&pds.PDS{FirstCursorSinceReset: seq}).Error
if err != nil {
return fmt.Errorf("updating FirstCursorSinceReset: %w", err)
@ -167,7 +167,7 @@ func (c *Consumer) updateCursor(ctx context.Context, seq int64) error {
}
err := c.db.Model(&c.remote).
Where(&pds.PDS{Model: gorm.Model{ID: c.remote.ID}}).
Where(&pds.PDS{ID: c.remote.ID}).
Updates(&pds.PDS{Cursor: seq}).Error
if err != nil {
return fmt.Errorf("updating Cursor: %w", err)
@ -271,7 +271,7 @@ func (c *Consumer) processMessage(ctx context.Context, typ string, r io.Reader,
if payload.TooBig {
// Just trigger a re-index by resetting rev.
err := c.db.Model(r).Where(&repo.Repo{Model: gorm.Model{ID: repoInfo.ID}}).
err := c.db.Model(r).Where(&repo.Repo{ID: repoInfo.ID}).
Updates(&repo.Repo{
FirstCursorSinceReset: c.remote.FirstCursorSinceReset,
FirstRevSinceReset: payload.Rev,
@ -282,7 +282,7 @@ func (c *Consumer) processMessage(ctx context.Context, typ string, r io.Reader,
}
if repoInfo.FirstCursorSinceReset != c.remote.FirstCursorSinceReset {
err := c.db.Model(r).Where(&repo.Repo{Model: gorm.Model{ID: repoInfo.ID}}).
err := c.db.Model(r).Where(&repo.Repo{ID: repoInfo.ID}).
Updates(&repo.Repo{
FirstCursorSinceReset: c.remote.FirstCursorSinceReset,
FirstRevSinceReset: payload.Rev,

4
cmd/record-indexer/workerpool.go
View file

@ -117,7 +117,7 @@ func (p *WorkerPool) worker(ctx context.Context, signal chan struct{}) {
}
updates.LastIndexAttempt = time.Now()
err := p.db.Model(&repo.Repo{}).
Where(&repo.Repo{Model: gorm.Model{ID: work.Repo.ID}}).
Where(&repo.Repo{ID: work.Repo.ID}).
Updates(updates).Error
if err != nil {
log.Error().Err(err).Msgf("Failed to update repo info for %q: %s", work.Repo.DID, err)
@ -216,7 +216,7 @@ retry:
}
}
err = p.db.Model(&repo.Repo{}).Where(&repo.Repo{Model: gorm.Model{ID: work.Repo.ID}}).
err = p.db.Model(&repo.Repo{}).Where(&repo.Repo{ID: work.Repo.ID}).
Updates(&repo.Repo{LastIndexedRev: newRev}).Error
if err != nil {
return fmt.Errorf("updating repo rev: %w", err)