Skip to content

Commit 2641085

Browse files
committed
ATK-4339&ATK-4341 :fix ci && disable config by default
1 parent 89b77b7 commit 2641085

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

src/main/java/com/actiontech/dble/config/model/SystemConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private SystemConfig() {
180180
//unit: ms
181181
private long releaseTimeout = 10L;
182182

183-
private int appendTraceId = 1;
183+
private int appendTraceId = 0;
184184

185185

186186
public int getAppendTraceId() {

src/main/java/com/actiontech/dble/server/trace/ITraceResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Create Date: 2025-04-17
1414
*/
1515
public interface ITraceResult {
16-
public enum SqlTraceType {
16+
enum SqlTraceType {
1717
SINGLE_NODE_QUERY, MULTI_NODE_QUERY, MULTI_NODE_GROUP, COMPLEX_QUERY, RWSPLIT_QUERY;
1818
}
1919

src/main/java/com/actiontech/dble/server/trace/RwTraceResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public void setVeryStartPrepare(long veryStartPrepare) {
4848
this.requestStartPrepare = new TraceRecord(veryStartPrepare);
4949
}
5050

51-
public void setDBInstance(PhysicalDbInstance dbInstance) {
52-
this.dbInstance = dbInstance;
51+
public void setDBInstance(PhysicalDbInstance tmpDbInstance) {
52+
this.dbInstance = tmpDbInstance;
5353
}
5454

5555
public void setParseStartPrepare(TraceRecord parseStartPrepare) {

src/main/java/com/actiontech/dble/services/rwsplit/RWSplitQueryHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import java.io.ByteArrayOutputStream;
2020

21+
import static com.actiontech.dble.net.mysql.MySQLPacket.COM_QUERY;
22+
2123

2224
public class RWSplitQueryHandler implements FrontendQueryHandler {
2325

@@ -46,21 +48,21 @@ public void query(String sql) {
4648
return;
4749
}
4850
int rs = RwSplitServerParse.parse(sql);
51+
int sqlType = rs & 0xff;
4952
if (AppendTraceId.getInstance().isEnable()) {
5053
sql = String.format("/*+ trace_id=%d-%d */ %s", session.getService().getConnection().getId(), session.getService().getSqlUniqueId().incrementAndGet(), sql);
5154
}
5255

5356
session.getService().setExecuteSql(sql);
5457
session.endParse();
5558
int hintLength = RouteService.isHintSql(sql);
56-
int sqlType = rs & 0xff;
59+
5760
if (hintLength >= 0) {
5861
session.executeHint(sqlType, sql, null);
5962
} else {
6063

6164
if (AppendTraceId.getInstance().isEnable()) {
6265
CommandPacket packet = new CommandPacket();
63-
final byte COM_QUERY = 0x3;
6466
packet.setCommand(COM_QUERY);
6567
packet.setArg(sql.getBytes());
6668
packet.setPacketId(session.getService().getExecuteSqlBytes()[3]);

src/main/java/com/actiontech/dble/services/rwsplit/RWSplitService.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import java.util.regex.Matcher;
3232
import java.util.regex.Pattern;
3333

34+
import static com.actiontech.dble.net.mysql.MySQLPacket.COM_STMT_PREPARE;
35+
3436
public class RWSplitService extends BusinessService {
3537

3638
private static final Logger LOGGER = LoggerFactory.getLogger(RWSplitService.class);
@@ -122,7 +124,7 @@ protected void handleInnerData(byte[] data) {
122124
handleComQuery(data);
123125
break;
124126
// prepared statement
125-
case MySQLPacket.COM_STMT_PREPARE:
127+
case COM_STMT_PREPARE:
126128
commands.doStmtPrepare();
127129
handleComStmtPrepare(data);
128130
break;
@@ -225,15 +227,13 @@ private void handleComStmtPrepare(byte[] data) {
225227
sql = sql.substring(0, sql.length() - 1).trim();
226228
}
227229
sql = sql.trim();
228-
int rs = ServerParse.parse(sql);
229-
int sqlType = rs & 0xff;
230+
230231

231232
String tmpSql = sql;
232233
byte[] tmpData = data;
233234
if (AppendTraceId.getInstance().isEnable()) {
234235
tmpSql = String.format("/*+ trace_id=%d-%d */ %s", session.getService().getConnection().getId(), getSqlUniqueId().incrementAndGet(), sql);
235236
CommandPacket packet = new CommandPacket();
236-
final byte COM_STMT_PREPARE = 0x16;
237237
packet.setCommand(COM_STMT_PREPARE);
238238
packet.setArg(tmpSql.getBytes());
239239
packet.setPacketId(data[3]);
@@ -242,6 +242,8 @@ private void handleComStmtPrepare(byte[] data) {
242242
tmpData = out.toByteArray();
243243
}
244244

245+
int rs = ServerParse.parse(sql);
246+
int sqlType = rs & 0xff;
245247
final String finalSql = tmpSql;
246248
setExecuteSql(finalSql);
247249
final byte[] finalData = tmpData;

0 commit comments

Comments
 (0)