mirror of
				https://gitee.com/dromara/mayfly-go
				synced 2025-11-04 08:20:25 +08:00 
			
		
		
		
	重构数据库备份与恢复模块 (#80)
* fix: 保存 LastResult 时截断字符串过长部分,以避免数据库报错 * refactor: 新增 entity.DbTaskBase 和 persistence.dbTaskBase, 用于实现数据库备份和恢复任务处理相关部分 * fix: aeskey变更后,解密密码出现数组越界访问错误 * fix: 时间属性为零值时,保存到 mysql 数据库报错 * refactor db.infrastructure.service.scheduler * feat: 实现立即备份功能 * refactor db.infrastructure.service.db_instance * refactor: 从数据库中获取数据库备份目录、mysql文件路径等配置信息 * fix: 数据库备份和恢复问题 * fix: 修改 .gitignore 文件,忽略数据库备份目录和数据库程序目录
This commit is contained in:
		@@ -42,6 +42,28 @@ func NewDelayQueue[T Delayable](cap int) *DelayQueue[T] {
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (s *DelayQueue[T]) TryDequeue() (T, bool) {
 | 
			
		||||
	s.mutex.Lock()
 | 
			
		||||
	defer s.mutex.Unlock()
 | 
			
		||||
 | 
			
		||||
	if elm, ok := s.priorityQueue.Peek(0); ok {
 | 
			
		||||
		delay := elm.GetDeadline().Sub(time.Now())
 | 
			
		||||
		if delay < minTimerDelay {
 | 
			
		||||
			// 无需延迟,头部元素出队后直接返回
 | 
			
		||||
			_, _ = s.dequeue()
 | 
			
		||||
			return elm, true
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return s.zero, false
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (s *DelayQueue[T]) TryEnqueue(val T) bool {
 | 
			
		||||
	s.mutex.Lock()
 | 
			
		||||
	defer s.mutex.Unlock()
 | 
			
		||||
 | 
			
		||||
	return s.enqueue(val)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (s *DelayQueue[T]) Dequeue(ctx context.Context) (T, bool) {
 | 
			
		||||
	// 出队锁:避免因重复获取队列头部同一元素降低性能
 | 
			
		||||
	select {
 | 
			
		||||
@@ -64,7 +86,6 @@ func (s *DelayQueue[T]) Dequeue(ctx context.Context) (T, bool) {
 | 
			
		||||
		// 接收直接转发的不需要延迟的新元素
 | 
			
		||||
		select {
 | 
			
		||||
		case elm := <-s.transferChan:
 | 
			
		||||
			delete(s.elmMap, elm.GetId())
 | 
			
		||||
			s.mutex.Unlock()
 | 
			
		||||
			return elm, true
 | 
			
		||||
		default:
 | 
			
		||||
@@ -78,7 +99,6 @@ func (s *DelayQueue[T]) Dequeue(ctx context.Context) (T, bool) {
 | 
			
		||||
			if delay < minTimerDelay {
 | 
			
		||||
				// 无需延迟,头部元素出队后直接返回
 | 
			
		||||
				_, _ = s.dequeue()
 | 
			
		||||
				delete(s.elmMap, elm.GetId())
 | 
			
		||||
				s.mutex.Unlock()
 | 
			
		||||
				return elm, ok
 | 
			
		||||
			}
 | 
			
		||||
@@ -122,6 +142,7 @@ func (s *DelayQueue[T]) dequeue() (T, bool) {
 | 
			
		||||
	if !ok {
 | 
			
		||||
		return s.zero, false
 | 
			
		||||
	}
 | 
			
		||||
	delete(s.elmMap, elm.GetId())
 | 
			
		||||
	select {
 | 
			
		||||
	case s.dequeuedSignal <- struct{}{}:
 | 
			
		||||
	default:
 | 
			
		||||
@@ -133,6 +154,7 @@ func (s *DelayQueue[T]) enqueue(val T) bool {
 | 
			
		||||
	if ok := s.priorityQueue.Enqueue(val); !ok {
 | 
			
		||||
		return false
 | 
			
		||||
	}
 | 
			
		||||
	s.elmMap[val.GetId()] = val
 | 
			
		||||
	select {
 | 
			
		||||
	case s.enqueuedSignal <- struct{}{}:
 | 
			
		||||
	default:
 | 
			
		||||
@@ -156,7 +178,6 @@ func (s *DelayQueue[T]) Enqueue(ctx context.Context, val T) bool {
 | 
			
		||||
 | 
			
		||||
		// 如果队列未满,入队后直接返回
 | 
			
		||||
		if !s.priorityQueue.IsFull() {
 | 
			
		||||
			s.elmMap[val.GetId()] = val
 | 
			
		||||
			s.enqueue(val)
 | 
			
		||||
			s.mutex.Unlock()
 | 
			
		||||
			return true
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user