From 3b9f2b893eb742b3ea21e3bdf105ca693dda8c1c Mon Sep 17 00:00:00 2001 From: shanyujie <1196661499@qq.com> Date: Mon, 19 Jan 2026 17:57:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor(drivers):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=92=E5=85=A5=E6=93=8D=E4=BD=9C=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=9B=86=E5=90=88=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 dm 驱动中的 conflictKeySet 从 gset.New 修改为 gset.NewStrSet - 将 gaussdb 驱动中的 conflictKeySet 从 gset.New 修改为 gset.NewStrSet - 将 mssql 驱动中的 conflictKeySet 从 gset.New 修改为 gset.NewStrSet - 将 oracle 驱动中的 conflictKeySet 从 gset.New 修改为 gset.NewStrSet - 统一使用字符串集合类型以提高类型安全性 --- contrib/drivers/dm/dm_do_insert.go | 2 +- contrib/drivers/gaussdb/gaussdb_do_insert.go | 2 +- contrib/drivers/mssql/mssql_do_insert.go | 2 +- contrib/drivers/oracle/oracle_do_insert.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/drivers/dm/dm_do_insert.go b/contrib/drivers/dm/dm_do_insert.go index 72fc540b4..7f0aef7b4 100644 --- a/contrib/drivers/dm/dm_do_insert.go +++ b/contrib/drivers/dm/dm_do_insert.go @@ -108,7 +108,7 @@ func (d *Driver) doMergeInsert( one = list[0] oneLen = len(one) charL, charR = d.GetChars() - conflictKeySet = gset.New(false) + conflictKeySet = gset.NewStrSet(false) // queryHolders: Handle data with Holder that need to be merged // queryValues: Handle data that need to be merged diff --git a/contrib/drivers/gaussdb/gaussdb_do_insert.go b/contrib/drivers/gaussdb/gaussdb_do_insert.go index 16193239c..753e1ce71 100644 --- a/contrib/drivers/gaussdb/gaussdb_do_insert.go +++ b/contrib/drivers/gaussdb/gaussdb_do_insert.go @@ -307,7 +307,7 @@ func (d *Driver) doMergeInsert( one = list[0] oneLen = len(one) charL, charR = d.GetChars() - conflictKeySet = gset.New(false) + conflictKeySet = gset.NewStrSet(false) // queryHolders: Handle data with Holder that need to be merged // queryValues: Handle data that need to be merged diff --git a/contrib/drivers/mssql/mssql_do_insert.go b/contrib/drivers/mssql/mssql_do_insert.go index 93bc17cfa..fbdcba5d3 100644 --- a/contrib/drivers/mssql/mssql_do_insert.go +++ b/contrib/drivers/mssql/mssql_do_insert.go @@ -102,7 +102,7 @@ func (d *Driver) doMergeInsert( one = list[0] oneLen = len(one) charL, charR = d.GetChars() - conflictKeySet = gset.New(false) + conflictKeySet = gset.NewStrSet(false) // queryHolders: Handle data with Holder that need to be merged // queryValues: Handle data that need to be merged diff --git a/contrib/drivers/oracle/oracle_do_insert.go b/contrib/drivers/oracle/oracle_do_insert.go index 82f8373d5..ec0273f93 100644 --- a/contrib/drivers/oracle/oracle_do_insert.go +++ b/contrib/drivers/oracle/oracle_do_insert.go @@ -181,7 +181,7 @@ func (d *Driver) doMergeInsert( one = list[0] oneLen = len(one) charL, charR = d.GetChars() - conflictKeySet = gset.New(false) + conflictKeySet = gset.NewStrSet(false) // queryHolders: Handle data with Holder that need to be upsert // queryValues: Handle data that need to be upsert