Skip to content

Commit 1f6d14d

Browse files
committed
opt for lsop decode err
1 parent 3b46700 commit 1f6d14d

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

src/main/java/com/alipay/oceanbase/rpc/bolt/transport/ObTableRemoting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public ObPayload invokeSync(final ObTableConnection conn, final ObPayload reques
173173
payload.decode(buf);
174174
} catch (Exception e) {
175175
String errMessage = TraceUtil.formatTraceMessage(conn, response,
176-
"decode meet exception, cause: " + e.getMessage());
176+
"payload decode meet exception");
177177
throw new RuntimeException(errMessage, e);
178178
}
179179
return payload;

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/ObTableResult.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,10 @@ public String getErrMsg() {
132132
public void setMsg(byte[] msg) {
133133
this.msg = msg;
134134
}
135+
136+
@Override
137+
public String toString() {
138+
return String.format("ObTableResult[errno=%d, sqlState=%s, msg=%s]",
139+
errno, new String(sqlState), getErrMsg());
140+
}
135141
}

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/ObTableSingleOpEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public Object decode(ByteBuf buf) {
193193
} catch (Exception e) {
194194
String errMsg = String.format("ObTableSingleOpEntity decode exception: rowkeyBitLen=%d, rowkeyLen=%d, propertiesBitLen=%d, propertiesLen=%d"
195195
, rowKeyBitLen, rowkeyLen, propertiesBitLen, propLen);
196-
throw new IllegalArgumentException(errMsg + ", cause: " + e.getMessage(), e);
196+
throw new IllegalArgumentException(errMsg, e);
197197
}
198198

199199
return this;

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/ObTableSingleOpResult.java

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,27 @@ public byte[] encode() {
8080
*/
8181
@Override
8282
public Object decode(ByteBuf buf) {
83-
// 0. decode version
84-
super.decode(buf);
85-
86-
// 1. decode ObTableResult
87-
this.header.decode(buf);
88-
89-
// 2. decode types
90-
this.operationType = ObTableOperationType.valueOf(Serialization.decodeI8(buf.readByte()));
91-
92-
// 3. decode Entity
93-
this.entity.setAggPropertiesNames(propertiesColumnNames);
94-
this.entity.decode(buf);
95-
96-
// 4. decode affected rows
97-
this.affectedRows = Serialization.decodeVi64(buf);
83+
try {
84+
// 0. decode version
85+
super.decode(buf);
86+
87+
// 1. decode ObTableResult
88+
this.header.decode(buf);
89+
90+
// 2. decode types
91+
this.operationType = ObTableOperationType.valueOf(Serialization.decodeI8(buf.readByte()));
92+
93+
// 3. decode Entity
94+
this.entity.setAggPropertiesNames(propertiesColumnNames);
95+
this.entity.decode(buf);
96+
97+
// 4. decode affected rows
98+
this.affectedRows = Serialization.decodeVi64(buf);
99+
} catch (Exception e) {
100+
String errMsg = String.format("ObTableSingleOpResult decode exception: header=%s, operationType=%d",
101+
this.header.toString(), this.operationType);
102+
throw new IllegalArgumentException(errMsg + ", cause: " + e.getMessage(), e);
103+
}
98104

99105
return this;
100106
}

0 commit comments

Comments
 (0)