mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-06 04:40:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dcy
2025-04-23 15:29:41 +08:00
committed by Rico
parent 2641085233
commit 84d07287da
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/actiontech/dble/rwsplit/RWSplitNonBlockingSession.java
View File

@@ -158,6 +158,10 @@ public class RWSplitNonBlockingSession {
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);

10
src/main/java/com/actiontech/dble/services/rwsplit/RWSplitQueryHandler.java
View File

@@ -49,18 +49,18 @@ public class RWSplitQueryHandler implements FrontendQueryHandler {
}
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);

4
src/main/java/com/actiontech/dble/singleton/RouteService.java
View File

@@ -94,6 +94,10 @@ public final class RouteService {
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());
}
}