-
Notifications
You must be signed in to change notification settings - Fork 8.8k
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
Conversation
server/src/main/java/io/seata/server/coordinator/AbstractCore.java
Outdated
Show resolved
Hide resolved
Codecov Report
Additional details and impacted files@@ 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
|
|
server/src/main/java/io/seata/server/coordinator/AbstractCore.java
Outdated
Show resolved
Hide resolved
37ee18c
to
9078442
Compare
# 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
f661d34
to
2c6ab1b
Compare
# 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
47f48e4
to
4177462
Compare
# 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
80dda91
to
2700d05
Compare
There was a problem hiding this 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模块要补充对应的配置示例
367893b
to
8c03d64
Compare
c80d5ec
to
110e55c
Compare
DONE |
21c6a55
to
bc22385
Compare
…-size-limit # Conflicts: # changes/en-us/2.0.0.md # changes/zh-cn/2.0.0.md
…-size-limit # Conflicts: # changes/en-us/2.0.0.md # changes/zh-cn/2.0.0.md
…-appdata-size-limit
There was a problem hiding this 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
...ver/src/main/java/io/seata/spring/boot/autoconfigure/properties/server/ServerProperties.java
Outdated
Show resolved
Hide resolved
server/src/main/java/io/seata/server/coordinator/AbstractCore.java
Outdated
Show resolved
Hide resolved
…-appdata-size-limit # Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Ⅰ. 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