refactor: remove dataset cron records
This commit is contained in:
@@ -7,13 +7,13 @@ import (
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"senlinai-agent/backend/internal/models"
|
||||
"senlinai-agent/backend/internal/logic/dataset"
|
||||
)
|
||||
|
||||
const datasetInterval = 5 * time.Minute
|
||||
var datasetInterval = 5 * time.Minute
|
||||
|
||||
type DatasetCollector interface {
|
||||
SyncAllSources(context.Context) ([]models.SaDatasetCron, error)
|
||||
SyncAllSources(context.Context) ([]dataset.SyncResult, error)
|
||||
}
|
||||
|
||||
type DatasetScheduler struct {
|
||||
@@ -70,11 +70,11 @@ func (s *DatasetScheduler) Run(ctx context.Context) {
|
||||
}
|
||||
|
||||
func (s *DatasetScheduler) collect(ctx context.Context) {
|
||||
crons, err := s.collector.SyncAllSources(ctx)
|
||||
results, err := s.collector.SyncAllSources(ctx)
|
||||
completed := 0
|
||||
failed := 0
|
||||
for _, cron := range crons {
|
||||
switch cron.Status {
|
||||
for _, result := range results {
|
||||
switch result.Status {
|
||||
case "completed":
|
||||
completed++
|
||||
case "failed":
|
||||
@@ -82,8 +82,8 @@ func (s *DatasetScheduler) collect(ctx context.Context) {
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
s.logger.Printf("dataset collection failed: tasks=%d completed=%d failed=%d error=%v", len(crons), completed, failed, err)
|
||||
s.logger.Printf("dataset collection failed: sources=%d completed=%d failed=%d error=%v", len(results), completed, failed, err)
|
||||
return
|
||||
}
|
||||
s.logger.Printf("dataset collection finished: tasks=%d completed=%d failed=%d", len(crons), completed, failed)
|
||||
s.logger.Printf("dataset collection finished: sources=%d completed=%d failed=%d", len(results), completed, failed)
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"senlinai-agent/backend/internal/models"
|
||||
"senlinai-agent/backend/internal/logic/dataset"
|
||||
)
|
||||
|
||||
func TestDatasetSchedulerCollectsImmediatelyAndRepeats(t *testing.T) {
|
||||
@@ -95,13 +95,13 @@ type recordingDatasetCollector struct {
|
||||
calls chan time.Time
|
||||
}
|
||||
|
||||
func (c *recordingDatasetCollector) SyncAllSources(context.Context) ([]models.SaDatasetCron, error) {
|
||||
func (c *recordingDatasetCollector) SyncAllSources(context.Context) ([]dataset.SyncResult, error) {
|
||||
now := time.Now()
|
||||
c.mu.Lock()
|
||||
c.count++
|
||||
c.mu.Unlock()
|
||||
c.calls <- now
|
||||
return []models.SaDatasetCron{{Status: "completed"}}, nil
|
||||
return []dataset.SyncResult{{Status: "completed"}}, nil
|
||||
}
|
||||
|
||||
func (c *recordingDatasetCollector) callCount() int {
|
||||
@@ -128,7 +128,7 @@ type blockingDatasetCollector struct {
|
||||
release chan struct{}
|
||||
}
|
||||
|
||||
func (c *blockingDatasetCollector) SyncAllSources(ctx context.Context) ([]models.SaDatasetCron, error) {
|
||||
func (c *blockingDatasetCollector) SyncAllSources(ctx context.Context) ([]dataset.SyncResult, error) {
|
||||
c.mu.Lock()
|
||||
c.count++
|
||||
c.mu.Unlock()
|
||||
|
||||
Reference in New Issue
Block a user