Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

新增my2sql工具插件模块 #1224 #1314

Merged
merged 9 commits into from
Jan 5, 2022
Merged

新增my2sql工具插件模块 #1224 #1314

merged 9 commits into from
Jan 5, 2022

Conversation

nick2wang
Copy link
Collaborator

新增my2sql工具插件模块 #1224

对比了主流的几款闪回工具,MyFlash很快接近原生mysqlbinlog,缺点是不能生成直观可读的sql,而且非常吃内存,不支持mysql 8;binlog2sql功能性强,但是太慢了,在生产环境的大数据量下显得无力,而且同样对于mysql 8存在兼容性问题;my2sql算是比较均衡的,筛选功能丰富,实测解析速度能达到binlog2sql的5倍以上

  my2sql binlog2sql MyFlash mysqlbinlog
1.1G binlog回滚解析 1分50秒 19分钟 33秒 31秒

新增my2sql工具插件模块
新增my2sql工具插件模块 - 新增权限
新增my2sql工具插件模块 - Dockerfile更新
新增my2sql工具插件模块 - 单元测试
@codecov
Copy link

codecov bot commented Jan 4, 2022

Codecov Report

Merging #1314 (2fba107) into master (af13722) will increase coverage by 0.12%.
The diff coverage is 87.35%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1314      +/-   ##
==========================================
+ Coverage   77.89%   78.01%   +0.12%     
==========================================
  Files          77       78       +1     
  Lines       12051    12220     +169     
==========================================
+ Hits         9387     9534     +147     
- Misses       2664     2686      +22     
Impacted Files Coverage Δ
sql/models.py 96.10% <ø> (ø)
sql/urls.py 100.00% <ø> (ø)
sql/notify.py 87.80% <70.00%> (-1.16%) ⬇️
sql/binlog.py 82.84% <76.62%> (-4.08%) ⬇️
sql/plugins/my2sql.py 97.36% <97.36%> (ø)
sql/plugins/tests.py 100.00% <100.00%> (ø)
sql/tests.py 100.00% <100.00%> (ø)
sql/views.py 68.48% <100.00%> (+0.37%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update af13722...2fba107. Read the comment docs.

Copy link
Collaborator

@LeoQuote LeoQuote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看了下, 是用plugin实现的, 功能都完备, 本地测试没问题的话就ok
LGTM

Copy link
Collaborator

@LeoQuote LeoQuote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docker 编译没过, 其他ok, 修下 docker build

@nick2wang
Copy link
Collaborator Author

nick2wang commented Jan 4, 2022

docker 编译没过, 其他ok, 修下 docker build

修改了dockerfile-base,但是workflow里依赖的archery-base镜像好像不能自动构建?

FROM hhyo/archery-base:1.3

hhyo
hhyo previously approved these changes Jan 4, 2022
sql/plugins/my2sql.py Show resolved Hide resolved
@hhyo hhyo self-requested a review January 4, 2022 14:27
新增my2sql工具插件模块 - 漏洞修复&Dockerfile调整
暂时保留dockerfile-base里的my2sql依赖
@nick2wang
Copy link
Collaborator Author

docker 编译没过, 其他ok, 修下 docker build

dockerfile已调整

LeoQuote
LeoQuote previously approved these changes Jan 5, 2022
Copy link
Collaborator

@LeoQuote LeoQuote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

修复shell命令注入漏洞 - 通过实例信息注入
@nick2wang
Copy link
Collaborator Author

通过path和实例信息注入的漏洞已修复 #1316

nick2wang and others added 2 commits January 5, 2022 17:09
@hhyo hhyo merged commit f5292f4 into hhyo:master Jan 5, 2022
@nick2wang nick2wang deleted the nick-patch branch January 6, 2022 02:47
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.

None yet

3 participants