Skip to content

Commit fa39780

Browse files
committed
revert skip lsop entity encode
1 parent 1ab5dfa commit fa39780

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,13 @@ public byte[] encode() {
6464
}
6565

6666
// 4. encode entities
67-
if (!((singleOpType == ObTableOperationType.SCAN) && query.isHbaseQuery())) {
68-
len = Serialization.getNeedBytes(entities.size());
69-
System.arraycopy(Serialization.encodeVi64(entities.size()), 0, bytes, idx, len);
67+
len = Serialization.getNeedBytes(entities.size());
68+
System.arraycopy(Serialization.encodeVi64(entities.size()), 0, bytes, idx, len);
69+
idx += len;
70+
for (ObTableSingleOpEntity entity : entities) {
71+
len = (int) entity.getPayloadSize();
72+
System.arraycopy(entity.encode(), 0, bytes, idx, len);
7073
idx += len;
71-
for (ObTableSingleOpEntity entity : entities) {
72-
len = (int) entity.getPayloadSize();
73-
System.arraycopy(entity.encode(), 0, bytes, idx, len);
74-
idx += len;
75-
}
7674
}
7775

7876
return bytes;
@@ -111,11 +109,9 @@ public long getPayloadContentSize() {
111109
if (ObTableOperationType.needEncodeQuery(singleOpType)) {
112110
payloadContentSize += query.getPayloadSize();
113111
}
114-
if (!((singleOpType == ObTableOperationType.SCAN) && query.isHbaseQuery())) {
115-
payloadContentSize += Serialization.getNeedBytes(entities.size());
116-
for (ObTableSingleOpEntity entity : entities) {
117-
payloadContentSize += entity.getPayloadSize();
118-
}
112+
payloadContentSize += Serialization.getNeedBytes(entities.size());
113+
for (ObTableSingleOpEntity entity : entities) {
114+
payloadContentSize += entity.getPayloadSize();
119115
}
120116
this.payLoadContentSize = payloadContentSize;
121117
}

0 commit comments

Comments
 (0)