Skip to content

ATK-4339&ATK-4341 -supplement:fix hint doesn't work #3904

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.

Sign up for GitHub

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

Merged
dcy10000 merged 1 commit into from
Apr 23, 2025
Merged

ATK-4339&ATK-4341 -supplement:fix hint doesn't work #3904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/com/actiontech/dble/rwsplit/RWSplitNonBlockingSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ public void executeHint(int sqlType, String sql, Callback callback) throws IOExc
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("route sql {} to {}", sql, dbInstance);
}
endRoute();
setPreExecuteEnd(RwTraceResult.SqlTraceType.RWSPLIT_QUERY);
setTraceSimpleHandler((ResponseHandler) handler);
traceResult.setDBInstance(dbInstance);
dbInstance.getConnection(rwSplitService.getSchema(), handler, null, false);
} catch (Exception e) {
executeException(e, sql);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/actiontech/dble/services/rwsplit/RWSplitQueryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ public void query(String sql) {
}
int rs = RwSplitServerParse.parse(sql);
int sqlType = rs & 0xff;
if (AppendTraceId.getInstance().isEnable()) {
sql = String.format("/*+ trace_id=%d-%d */ %s", session.getService().getConnection().getId(), session.getService().getSqlUniqueId().incrementAndGet(), sql);
}

session.getService().setExecuteSql(sql);

session.endParse();
int hintLength = RouteService.isHintSql(sql);

if (hintLength >= 0) {
session.executeHint(sqlType, sql, null);
} else {

if (AppendTraceId.getInstance().isEnable()) {
sql = String.format("/*+ trace_id=%d-%d */ %s", session.getService().getConnection().getId(), session.getService().getSqlUniqueId().incrementAndGet(), sql);
}
session.getService().setExecuteSql(sql);
if (AppendTraceId.getInstance().isEnable()) {
CommandPacket packet = new CommandPacket();
packet.setCommand(COM_QUERY);
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/actiontech/dble/singleton/RouteService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ public PhysicalDbInstance routeRwSplit(int sqlType, String stmt, RWSplitService
int endPos = stmt.substring(hintLength).indexOf("*/") + hintLength;
if (endPos > 0) {
hintInfo = parseHintSql(stmt, hintLength, endPos);
if (AppendTraceId.getInstance().isEnable()) {
String sql = String.format("/*+ trace_id=%d-%d */ %s", service.getConnection().getId(), service.getSqlUniqueId().incrementAndGet(), hintInfo.getRealSQL());
hintInfo.setRealSQL(sql);
}
service.setExecuteSql(hintInfo.getRealSQL());
}
}
Expand Down
Loading