zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,063 Commits 2 Branches 3 Tags 58 MiB
2.4.1-dm
Commit Graph

82 Commits

Author SHA1 Message Date
zhuyijun
b6b58ad584 新增DM的TrustedDmFunctionEnum枚举 2024-08-22 18:14:44 +08:00
zhuyijun
528c33a9fb 适配2.4.1达梦 2024-08-21 16:37:53 +08:00
Sitosoym
3e28b586bb
fix default sql in the comment to be consistent with the implementation (#12324) 2024-07-24 16:11:01 +08:00
blake.qiu
8aba80d3c1
fix(#12231): When inserting and updating configurations in the database, the time-related field values need to be set using the time obtained from the database's built-in time function. (#12244) 2024-07-09 11:19:22 +08:00
shalk(xiao kun)
21bfac76e7
upgrade module naocs-plugin from junit4 to junit5 (#12229) 2024-06-17 14:08:09 +08:00
mikolls
9a6ec0ca3d
[ISSUE#12022] Fix nacos datasource plugin ClassCastException bug (#12… (#12031) 
* [ISSUE#12022] Fix nacos datasource plugin ClassCastException bug (#12022)

* [ISSUE#12022] Fix nacos datasource plugin ClassCastException bug (#12022)

* [ISSUE#12022] Fix nacos datasource plugin ClassCastException bug (#12022)

* [ISSUE#12022] Fix nacos datasource plugin ClassCastException bug (#12022)

* [ISSUE#12022] Fix MapperManagerTest test (#12022)

* [ISSUE#12022] Fix MapperManagerTest test (#12022)
 2024-05-15 10:56:54 +08:00
tangmingyao
facf4c8270
fix：add param for ConfigInfoMapperByMySql#findAllConfigInfoBaseFetchRows (#11883) 
* fix：add param for ConfigInfoMapperByMySql#findAllConfigInfoBaseFetchRows

* fix：code style modify

* fix：code style modify

* fix：code style modify

---------

Co-authored-by: zhangyang <1445621702@qq.com>
 2024-04-02 11:36:29 +08:00
杨翊 SionYang
64b9e8d3f7
Make findMapper log to debug level to avoid nacos.log print much log. (#11786) 2024-03-01 13:35:30 +08:00
hth
817eb58597
[ISSUE#11695] fix PreviousConfigHistory encryption (#11707) 
* fix PreviousConfigHistory encryption

* UT fix
 2024-01-31 09:30:46 +08:00
nov.lzf
849393c4a1
optimize dump all logic and optimize dump change interface (#11658) 
* optimize config dump all,do not select content in page query,single query config on md5 and ts updated.

* 1.optimize config dump all,do not select content in page query,single query config on md5 and ts updated.
2. remove convertDeleteConfig and convertConfigConfig ，use standard RowMapper instead.

* remove unecessary code

* use context param instead of adding plugin method params

* bug and test fix
 2024-01-19 15:26:28 +08:00
nov.lzf
c70a86820d
config module coverage (#11592) 
* coverage

* coverage

* coverage up tp 80% ,fix checkstyle pmd

* coverage up tp 80% ,fix checkstyle pmd

* fix checkstyle

* optmize grpc connection push

* testcase

* grp connection coverage
 2024-01-08 14:25:15 +08:00
nov.lzf
d4e2ccda82
config module coverage up to 60% (#11560) 
* fix test case

* test case coverage

* open config module testcases

* config module testcases coverage

* test case coverage up to 55%

* test case coverage up to 55%

* test case coverage up to 60%

* fix test case

* fix test case

* fix test case

* fix test case

* fix test case

* fix test case

* coverage makeup

* coverage makeup

* coverage makeup

* coverage makeup
 2023-12-29 11:46:54 +08:00
nov.lzf
790bb197cf
优化增量对账，减少开销 (#11248) 
* 优化增量dump，减少开销

* check style fix

* pmd fix

* testcase fix

* testcase fix

* checkstyle fix
 2023-12-18 13:41:27 +08:00
zhanghong
d84a566235
fix proxy mapper bug (#11507) 2023-12-15 15:42:01 +08:00
nov.lzf
06edd123f9
check server stream ready state to avoid bytebuffer back up in flow control pending write queue. (#11514) 
* 修复客户端cmsgc导致服务端推送积压直接内存oom问题

* 修复ut及bug

* 修复ut及bug，checkstyle

* 修复ut

* 修复覆盖率

* checkstyle
 2023-12-15 15:40:45 +08:00
kanghailin
cc656e19d3
Optimize MapperManager (#11195) 2023-11-06 15:40:31 +08:00
brother-戎
ca34694f2b
fixup derby test case (#11064) 
* fixup derby test case

* tiny fix
 2023-09-01 09:32:08 +08:00
brother-戎
b3b74b7219
[ISSUE#10908] Fix Bean injection in class of ConfigCacheService (#10929) 
* fix:
1. derby syntax error
2. IllegalArgumentException:RowMapper is required
3. bean injection in Class of ConfigCacheService

* remove @Autowared

* recover properties
 2023-08-31 13:40:20 +08:00
ZhangShenao
25ef67db9a
Reactor code in datasource-plugin (#10791) 
* Reactor code in datasource-plugin

* Fix Abstract Mapper Test Case

* Add Empty Check

* Fix Checkstyle

* fix checkstyle

* fix check style

* fix check style

* Fix CheckStyle

* Fix SQL Blank
 2023-07-25 09:44:01 +08:00
nov.lzf
a83e2cc542
dump change check task submit (#10755) 
* dump change check task submit

* delete config nid convert error fix

* fix test case

* checkstyle
 2023-07-11 19:00:23 +08:00
suncong
ee30e354d1
Update MapperProxy.java (#10487) 
* Update MapperProxy.java

fix:代理类打印日志错误

* Update MapperProxy.java

fix:代理类打印日志错误

* 规范格式

* Update MapperProxy.java

reformat code

* Update MapperProxy.java

reformat code
 2023-05-17 16:57:56 +08:00
KomachiSion
a972e02b13 Move NACOS_PLUGIN_DATASOURCE_LOG to datasource plugin module. 2023-05-08 20:34:07 +08:00
vivid
5c4bbe85f7 补充完整剩余dataSource的MapperContext改造 (#10140) 2023-04-14 15:28:47 +08:00
KomachiSion
08f7c9ff2a Re-commit #9851 #9967. 2023-04-14 15:28:47 +08:00
杨翊 SionYang
b3b5236cd4
Develop synced from 2.2.2 (#10307) 
* Fix dynamic change token to illegal value will use old token.

* Add description in pom for release.

* Upgrade to 2.2.2

* Upgrade to 2.3.0-SNAPSHOT
 2023-04-11 17:34:06 +08:00
zhanghong
953fa9e74b
修改mapperProxy单例 (#10162) 2023-03-28 09:41:46 +08:00
杨翊 SionYang
1968b3fc98
Develop revert#9851 #9967 (#10069) 
* Revert "[ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters (#9967)"

This reverts commit d16023c1

* Revert "[ISSUE #9821] Update data-source-plugin input and output parameters (#9851)"

This reverts commit 1ff7a3f6
 2023-03-10 10:25:25 +08:00
zhanghong
a6332b250d
[ISSUE #9276] 新增根据配置信息检索内容的功能 (#9925) 
* 新增根据配置信息检索内容的功能

* use offer replace add

* use offer replace add

* use offer replace add

* update exception type and  limit some config as configurable

* update

* update params

* update params

* update params
 2023-02-21 10:25:19 +08:00
The-Gamer-01
d16023c156
[ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters (#9967) 
* Add MapperContext and MapperResult.

* Update ConfigInfoAggrMapper by MapperContext and MapperResult.

Update ConfigInfoAggrMapper by MapperContext and MapperResult.

* resolve git conflicts.

* Added Map mapping refinement corresponding to UPDATE and WHERE.

* [ISSUE #9821] Fix API of return class of ConfigInfoAggrMapper.

* [ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters
 2023-02-20 10:04:10 +08:00
The-Gamer-01
1ff7a3f6bd
[ISSUE #9821] Update data-source-plugin input and output parameters (#9851) 
* Add MapperContext and MapperResult.

* Update ConfigInfoAggrMapper by MapperContext and MapperResult.

Update ConfigInfoAggrMapper by MapperContext and MapperResult.

* resolve git conflicts.
 2023-02-10 09:45:14 +08:00
liu-xg
65da789215
fix(修复配置历史分页异常): 配置历史分页异常，所有页都是全部记录 (#9828) 
* fix(修复配置历史分页异常): 配置历史分页异常，所有页都是全部记录

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求
 2023-02-03 15:41:13 +08:00
xzxiaoshan
41f03fea0f
[ISSUE#9730] 对多数据源插件代码进行调整（向前兼容） (#9784) 
* Upgrade to 2.2.1-RC (#9741)

* 补充处理所有 tenantId

* 补充处理 tenantId

* 处理tenantid，内部类引用的变量不能被修改，换个变量名

* 新增支持：nacos 默认的 tenant/namespaceId 为空字符串，自 nacos 2.2.0 版本起开始支持多数据源插件，为空的 ID 会在 oracle 数据库适配中出现问题 ( where tenantid = '' )，本次修改对以往程序不产生影响。

* 固定填充的ID为public，完全自定义没有太大意义，目的是在保证默认id不为空，可选填充，不配置默认照旧

* fix bug

* 将通用的SQL提取到Mapper接口中，这样能很大的降低不同数据库需要重写的SQL的量，同时避免了大量的重复代码问题。

* 将原来sql中固定写死的 tenant_id = ''  修改为 tenant_id =  NamespaceUtil.getNamespaceDefaultId() 。暂时没深究为什么不用问号动参而是固定写死。

* 方法提取到 mapper 接口中，顺便解决了多余 paramList 定义的（虽然这个方法好像已经弃用）

* 方法迁移到接口默认实现中

* 恢复 publci id 默认值为空值 ""，等以后决策好使用默认值为 "public" 时，再设置 NAMESPACE_PUBLIC_ID_DEFAULT="public" 即可。

* 回滚 Controller 层对 tenant_id 的处理，另起PR讨论和修改。

* code style

* 变量名称和注释未通过 checkStyle 检查，按规范调整。

* nacos check style 修改，无代码变动

* fix code

* fix checkstyle

* fix checkstyle 去除多余的 return

* fix pmd

* fix test unit bug

* 因为将sql提取到 mapper 接口中，一些不影响sql语句运行的sql，有空格等差异，出现了test用例差异问题，逐个处理。比如（where a =? 和 where a= ?）

Co-authored-by: 杨翊 SionYang <xiweng.yy@alibaba-inc.com>
 2023-01-16 16:14:29 +08:00
gongzhongqiang
708387c277
fix:replace nacos website url to https. (#9797) 2023-01-10 09:47:52 +08:00
wenxuan70
60528cd21b
fix: replace the concatenated string with a placeholder in the batchRemoveAggr method (#9646) (#9659) 2023-01-03 12:05:31 +08:00
The-Gamer-01
b14cc257bf
[ISSUE #9510]Add sql log print function. (#9511) 
* [ISSUE #9510]Add sql log print function.

* [ISSUE #9510]Remove AspectJ and add sql proxy.

* [ISSUE #9510]Update data source plugin log.

* [ISSUE #9510]Update args log.

* [ISSUE #9510]Add unit test.
 2022-11-11 11:28:22 +08:00
李晓双 Li Xiao Shuang
d7e296d1fd
Add unit tests to GroupCapacityMapperByDerby class (#9546) 2022-11-11 11:22:39 +08:00
李晓双 Li Xiao Shuang
2bfca22412
Add unit tests to ConfigInfoTagRelationMapperByDerby class (#9545) 2022-11-11 11:22:16 +08:00
李晓双 Li Xiao Shuang
70cfa4c234
Add unit tests to ConfigInfoTagMapperByDerby class (#9544) 2022-11-11 11:21:56 +08:00
李晓双 Li Xiao Shuang
3dc72d827e
Add unit tests to ConfigInfoMapperByDerby class (#9543) 2022-11-11 11:21:31 +08:00
李晓双 Li Xiao Shuang
3aee80aa78
Add unit tests to ConfigInfoBetaMapperByDerby class (#9542) 2022-11-11 11:21:08 +08:00
李晓双 Li Xiao Shuang
c5a0a5b3b5
Add unit tests to ConfigInfoAggrMapperByDerby class (#9541) 2022-11-11 11:19:40 +08:00
李晓双 Li Xiao Shuang
28ac7a669f
Add unit tests to HistoryConfigInfoMapperByDerby class (#9547) 2022-11-11 10:25:22 +08:00
李晓双 Li Xiao Shuang
de7e3b9d3e
Add unit tests to TenantCapacityMapperByDerby class (#9548) 2022-11-11 10:23:35 +08:00
李晓双 Li Xiao Shuang
226d1bacd0
Add unit tests to TenantInfoMapperByDerby class (#9549) 2022-11-11 10:22:39 +08:00
李晓双 Li Xiao Shuang
8995de31f0
Add unit tests to ConfigInfoAggrMapperByMySql class (#9524) 2022-11-10 15:16:18 +08:00
李晓双 Li Xiao Shuang
7e2e5dd07e
[ISSUE #9524] Add unit tests to ConfigInfoBetaMapperByMySql class (#9525) 
* Add unit tests to ConfigInfoBetaMapperByMySql class

* Add unit tests to ConfigInfoBetaMapperByMySql class
 2022-11-10 15:15:45 +08:00
李晓双 Li Xiao Shuang
e2931f324c
[ISSUE #9523] Add unit tests to ConfigInfoMapperByMySql class (#9526) 
* Add unit tests to ConfigInfoMapperByMySql class

* Add unit tests to ConfigInfoMapperByMySql class
 2022-11-10 15:15:17 +08:00
李晓双 Li Xiao Shuang
3b40d41723
Add unit tests to ConfigInfoTagMapperByMySql class (#9527) 2022-11-10 15:14:07 +08:00
李晓双 Li Xiao Shuang
5f815e69b1
Add unit tests to ConfigTagsRelationMapperByMySql class (#9528) 2022-11-10 15:13:30 +08:00
李晓双 Li Xiao Shuang
ac8a24754e
Add unit tests to HistoryConfigInfoMapperByMySql class (#9530) 2022-11-10 15:12:59 +08:00