Skip to content

Conversation

@BugsGuru
Copy link
Collaborator

@BugsGuru BugsGuru commented Dec 11, 2025

User description

关联的 issue

https://github.com/actiontech/sqle-ee/issues/2604

描述你的变更

  • 修复OptionalModule常量和proto定义不一致
  • 修复proto的BackupStrategy值和业务中的不一致

确认项(pr提交后操作)

Tip

请在指定复审人之前,确认并完成以下事项,完成后✅


  • 我已完成自测
  • 我已记录完整日志方便进行诊断
  • 我已在关联的issue里补充了实现方案
  • 我已在关联的issue里补充了测试影响面
  • 我已确认了变更的兼容性,如果不兼容则在issue里标记 not_compatible
  • 我已确认了是否要更新文档,如果要更新则在issue里标记 need_update_doc


Description

  • 使用ConvertProtoBackupStrategyToDriver转换备份策略

  • 替换调用BackupStrategy.String方法

  • 新增两个OptionalModule常量


Diagram Walkthrough

flowchart LR
  A["修改RecommendBackupStrategy返回值转换"] --> B["新增ConvertProtoBackupStrategyToDriver函数"]
  B --> C["添加OptionalGetDatabaseObjectDDL与OptionalGetDatabaseDiffModifySQL常量"]
Loading

File Walkthrough

Relevant files
Enhancement
plugin_adapter_v2.go
调整备份策略转换函数调用                                                                                         

sqle/driver/plugin_adapter_v2.go

  • 替换BackupStrategy.String()调用
  • 调用ConvertProtoBackupStrategyToDriver进行转换
+1/-1     
util.go
新增转换函数与常量支持备份策略                                                                                   

sqle/driver/v2/util.go

  • 新增OptionalGetDatabaseObjectDDL和OptionalGetDatabaseDiffModifySQL常量
  • 增加ConvertProtoBackupStrategyToDriver函数映射策略
+17/-0   

…kupStrategyRes

- Updated the RecommendBackupStrategy method to use ConvertProtoBackupStrategyToDriver for better handling of backup strategies
- Added ConvertProtoBackupStrategyToDriver function to map proto backup strategies to driver-specific strings.
- Introduced new constants for optional database operations in util.go.
@github-actions
Copy link

PR Reviewer Guide 🔍

🎫 Ticket compliance analysis 🔶

2604 - Partially compliant

Compliant requirements:

  • 修复proto的BackupStrategy与业务逻辑不匹配
  • 修复OptionalModule常量和proto定义不一致

Non-compliant requirements:

  • 包含审核结果的接口返回国际化信息
  • 分析页中Column&Index Information表格标题国际化
  • 使用dms-common/i18nPkg
⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪
🧪 No relevant tests
🔒 No security concerns identified
⚡ Recommended focus areas for review

逻辑变更

使用 driverV2.ConvertProtoBackupStrategyToDriver 替换了原来的 .String() 方法,请确认该备份策略转换逻辑符合业务预期。

BackupStrategy:    driverV2.ConvertProtoBackupStrategyToDriver(resp.BackupStrategy),
备份策略转换

新增了 ConvertProtoBackupStrategyToDriver 函数,请检查各备份策略的映射逻辑是否全面覆盖所有有效情况。

func ConvertProtoBackupStrategyToDriver(strategy protoV2.BackupStrategy) string {
	switch strategy {
	case protoV2.BackupStrategy_None:
		return BackupStrategyNone
	case protoV2.BackupStrategy_ReverseSql:
		return BackupStrategyReverseSql
	case protoV2.BackupStrategy_OriginalRow:
		return BackupStrategyOriginalRow
	case protoV2.BackupStrategy_Manually:
		return BackupStrategyManually
	default:
		return BackupStrategyNone
	}
}
常量扩展

新增了 OptionalGetDatabaseObjectDDLOptionalGetDatabaseDiffModifySQL 常量,建议验证这些新增的常量是否与现有业务逻辑充分兼容。

OptionalGetDatabaseObjectDDL
OptionalGetDatabaseDiffModifySQL

@github-actions
Copy link

PR Code Suggestions ✨

No code suggestions found for the PR.

@littleniannian littleniannian merged commit 7812cd6 into main Dec 15, 2025
4 checks passed
@littleniannian littleniannian deleted the fix-backup-ce branch December 15, 2025 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants