Skip to content

Commit cb92eca

Browse files
committed
[Fix] fix kv_params is null
1 parent 214ff68 commit cb92eca

File tree

1 file changed

+6
-2
lines changed
  • src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/query

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public byte[] encode() {
178178
idx += len;
179179
}
180180

181-
if (isHbaseQuery) {
181+
if (isHbaseQuery && obKVParams != null) {
182182
len = (int) obKVParams.getPayloadSize();
183183
System.arraycopy(obKVParams.encode(), 0, bytes, idx, len);
184184
idx += len;
@@ -277,9 +277,13 @@ public long getPayloadContentSize() {
277277

278278
if (isHbaseQuery) {
279279
contentSize += hTableFilter.getPayloadSize();
280+
} else {
281+
contentSize += HTABLE_DUMMY_BYTES.length;
282+
}
283+
if (isHbaseQuery && obKVParams != null) {
280284
contentSize += obKVParams.getPayloadSize();
281285
} else {
282-
contentSize += 2 * HTABLE_DUMMY_BYTES.length;
286+
contentSize += HTABLE_DUMMY_BYTES.length;
283287
}
284288
contentSize += Serialization.getNeedBytes(scanRangeColumns.size());
285289
for (String scanRangeColumn : scanRangeColumns) {

0 commit comments

Comments
 (0)