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

2.19.03/lts #3665

Merged
merged 14 commits into from
Apr 23, 2023
Merged

2.19.03/lts #3665

merged 14 commits into from
Apr 23, 2023

Conversation

TommyZC
Copy link

@TommyZC TommyZC commented Apr 20, 2023

Reason:
  issue 3238 - fix cpu 100% (#3569)
Modify the culling logic of show @@sql.high, let it use time dimension firstly
add TOTAL_TIME parameter into "show @@sql.high"
Close sqlRwStat, sqlLastStatSQL, sqlLargeStat, big size sql functions and only leave sqlHighStat function when useSqlStat=1
#1542 support 8.0 transaction_ variables
#1687 simple route result (#1841)
#1687 change or
#1687 remove where unit
#1687 some bugs
#1687 alias without BackQuote
#1687 two table always false
#1687 rename field in
remove useless String
add "digest" parameter of SQL's hashcode into "show @@sql.high"
Type:
  BUG and Improve

TommyZC and others added 14 commits April 3, 2023 11:19
* issue 3238 - fix cpu 100%

* issue 3238 - remove useless code
# Conflicts:  StatSqlParser & SqlParser
#	src/main/java/com/actiontech/dble/statistic/stat/UserSqlHighStat.java
… and only leave sqlHighStat function when useSqlStat=1
# Conflicts:
#	src/main/java/com/actiontech/dble/backend/datasource/PhysicalDatasource.java
#	src/main/java/com/actiontech/dble/backend/heartbeat/MySQLDetector.java
#	src/main/java/com/actiontech/dble/net/mysql/HandshakeV10Packet.java
#	src/main/java/com/actiontech/dble/server/parser/ServerParseSelect.java
    # Conflicts:
    #       src/main/java/com/actiontech/dble/backend/mysql/nio/handler/builder/MergeBuilder.java
    #       src/main/java/com/actiontech/dble/route/RouteService.java
    #       src/main/java/com/actiontech/dble/route/parser/druid/ServerSchemaStatVisitor.java
    #       src/main/java/com/actiontech/dble/route/parser/druid/impl/DefaultDruidParser.java
    #       src/main/java/com/actiontech/dble/route/parser/druid/impl/DruidInsertParser.java
    #       src/main/java/com/actiontech/dble/route/parser/druid/impl/DruidInsertReplaceParser.java
    #       src/main/java/com/actiontech/dble/route/parser/druid/impl/DruidReplaceParser.java
    #       src/main/java/com/actiontech/dble/route/parser/druid/impl/DruidSelectParser.java
    #       src/main/java/com/actiontech/dble/route/parser/druid/impl/DruidSingleUnitSelectParser.java
    #       src/main/java/com/actiontech/dble/route/util/RouterUtil.java
    #       src/main/java/com/actiontech/dble/server/handler/ServerLoadDataInfileHandler.java
    #       src/test/java/com/actiontech/dble/route/HintDBTypeTest.java
    #       src/test/java/com/actiontech/dble/route/RouteWithOrTest.java
# Conflicts:
#	src/main/resources/schema_template.xml
# Conflicts:
#	src/main/java/com/actiontech/dble/route/util/ConditionUtil.java
# Conflicts:
#	src/main/java/com/actiontech/dble/route/parser/druid/WhereUnit.java
#	src/main/java/com/actiontech/dble/route/util/ConditionUtil.java
Copy link
Member

@LUAgam LUAgam left a comment

Choose a reason for hiding this comment

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

ok

@LUAgam LUAgam merged commit e6389ab into actiontech:2.19.03/lts Apr 23, 2023
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.

3 participants