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

optimize: rm appdata size limit #4473

Merged
merged 20 commits into from
Nov 28, 2023
Merged

Conversation

Bughue
Copy link
Contributor

@Bughue Bughue commented Mar 15, 2022

Ⅰ. Describe what this PR did

新增判断:一阶段上传的appdata数据大小。TC和RM都有判断。除了抛出错误的判断值也加入了warningsize的值,作为用户数据越来越大时的一个提醒。

Ⅱ. Does this pull request fix one issue?

fixes #4421

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@funky-eyes funky-eyes added this to the 2.0.0 milestone Mar 29, 2022
@codecov-commenter
Copy link

codecov-commenter commented Aug 25, 2022

Codecov Report

Merging #4473 (df1c0ad) into 2.x (2122c6d) will increase coverage by 0.02%.
The diff coverage is 42.55%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #4473      +/-   ##
============================================
+ Coverage     49.54%   49.57%   +0.02%     
- Complexity     4766     4786      +20     
============================================
  Files           909      909              
  Lines         31390    31418      +28     
  Branches       3782     3778       -4     
============================================
+ Hits          15553    15575      +22     
- Misses        14300    14312      +12     
+ Partials       1537     1531       -6     
Files Coverage Δ
...c/main/java/io/seata/common/ConfigurationKeys.java 0.00% <ø> (ø)
...n/src/main/java/io/seata/common/DefaultValues.java 0.00% <ø> (ø)
...java/io/seata/server/coordinator/AbstractCore.java 54.73% <66.66%> (+0.71%) ⬆️
.../autoconfigure/properties/client/RmProperties.java 37.70% <25.00%> (-1.92%) ⬇️
...oconfigure/properties/server/ServerProperties.java 27.27% <25.00%> (-0.51%) ⬇️
...rc/main/java/io/seata/common/util/StringUtils.java 44.48% <45.45%> (+3.41%) ⬆️

... and 8 files with indirect coverage changes

@CLAassistant
Copy link

CLAassistant commented Dec 12, 2022

CLA assistant check
All committers have signed the CLA.

@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 5 committers have signed the CLA.

❌ liuqiufeng
❌ Bughue
❌ pengten
❌ slievrly
❌ caohdgege
You have signed the CLA already but the status is still pending? Let us recheck it.

@Bughue Bughue changed the base branch from develop to 2.x November 6, 2023 07:44
@Bughue Bughue changed the base branch from 2.x to develop November 6, 2023 07:49
@Bughue Bughue changed the base branch from develop to 2.x November 6, 2023 08:35
@Bughue Bughue force-pushed the dev-appdata-size-limit branch 2 times, most recently from 37ee18c to 9078442 Compare November 7, 2023 06:33
# Conflicts:
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mariadb/MariadbEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mysql/MySQLEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/oracle/OracleEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/postgresql/PostgresqlEscapeHandler.java
#	rm-datasource/src/main/resources/META-INF/services/io.seata.sqlparser.EscapeHandler
#	rm-datasource/src/test/java/io/seata/rm/datasource/ColumnUtilsTest.java
#	rm-datasource/src/test/java/io/seata/rm/datasource/sql/handler/EscapeHandlerTest.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeHandler.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeSymbol.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/KeywordChecker.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/util/ColumnUtils.java
@Bughue Bughue changed the title optimize : appdata size limit optimize : rm appdata size limit Nov 7, 2023
# Conflicts:
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mariadb/MariadbEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mysql/MySQLEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/oracle/OracleEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/postgresql/PostgresqlEscapeHandler.java
#	rm-datasource/src/main/resources/META-INF/services/io.seata.sqlparser.EscapeHandler
#	rm-datasource/src/test/java/io/seata/rm/datasource/ColumnUtilsTest.java
#	rm-datasource/src/test/java/io/seata/rm/datasource/sql/handler/EscapeHandlerTest.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeHandler.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeSymbol.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/KeywordChecker.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/util/ColumnUtils.java
# Conflicts:
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mariadb/MariadbEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mysql/MySQLEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/oracle/OracleEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/postgresql/PostgresqlEscapeHandler.java
#	rm-datasource/src/main/resources/META-INF/services/io.seata.sqlparser.EscapeHandler
#	rm-datasource/src/test/java/io/seata/rm/datasource/ColumnUtilsTest.java
#	rm-datasource/src/test/java/io/seata/rm/datasource/sql/handler/EscapeHandlerTest.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeHandler.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeSymbol.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/KeywordChecker.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/util/ColumnUtils.java
…-size-limit

# Conflicts:
#	changes/en-us/2.0.0.md
#	changes/zh-cn/2.0.0.md
# Conflicts:
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mariadb/MariadbEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mysql/MySQLEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/oracle/OracleEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/postgresql/PostgresqlEscapeHandler.java
#	rm-datasource/src/main/resources/META-INF/services/io.seata.sqlparser.EscapeHandler
#	rm-datasource/src/test/java/io/seata/rm/datasource/ColumnUtilsTest.java
#	rm-datasource/src/test/java/io/seata/rm/datasource/sql/handler/EscapeHandlerTest.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeHandler.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeSymbol.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/KeywordChecker.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/util/ColumnUtils.java
# Conflicts:
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mariadb/MariadbEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/mysql/MySQLEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/oracle/OracleEscapeHandler.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/handler/postgresql/PostgresqlEscapeHandler.java
#	rm-datasource/src/main/resources/META-INF/services/io.seata.sqlparser.EscapeHandler
#	rm-datasource/src/test/java/io/seata/rm/datasource/ColumnUtilsTest.java
#	rm-datasource/src/test/java/io/seata/rm/datasource/sql/handler/EscapeHandlerTest.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeHandler.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/EscapeSymbol.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/KeywordChecker.java
#	sqlparser/seata-sqlparser-core/src/main/java/io/seata/sqlparser/util/ColumnUtils.java
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

script folder in the config.txt, application.properties/yml, file.conf, and server example thatyml to add configuration, springboot-autoconfigure module to add the corresponding configuration examples

script文件夹中的config.txt,application.properties/yml,file.conf,和server的example那个yml要补充配置,springboot-autoconfigure模块要补充对应的配置示例

@Bughue
Copy link
Contributor Author

Bughue commented Nov 9, 2023

script folder in the config.txt, application.properties/yml, file.conf, and server example thatyml to add configuration, springboot-autoconfigure module to add the corresponding configuration examples

script文件夹中的config.txt,application.properties/yml,file.conf,和server的example那个yml要补充配置,springboot-autoconfigure模块要补充对应的配置示例

DONE

@funky-eyes funky-eyes modified the milestones: 2.0.0, 2.x Backlog Nov 14, 2023
…-size-limit

# Conflicts:
#	changes/en-us/2.0.0.md
#	changes/zh-cn/2.0.0.md
@Bughue
Copy link
Contributor Author

Bughue commented Nov 23, 2023

文档更新 apache/incubator-seata-website#681

Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

changelog需要移动到2.x.md中
Move the changelog to 2.x.md

@funky-eyes funky-eyes modified the milestones: 2.x Backlog, 2.1.0 Nov 28, 2023
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

LGTM

@funky-eyes funky-eyes added mode: TCC TCC transaction mode module/common common module module/script script module labels Nov 28, 2023
@funky-eyes funky-eyes changed the title optimize : rm appdata size limit optimize: rm appdata size limit Nov 28, 2023
@funky-eyes funky-eyes merged commit 9fef2db into apache:2.x Nov 28, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mode: TCC TCC transaction mode module/common common module module/script script module module/server server module type: optimize
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tcc one-phase data need to be limited in size
5 participants