You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/01/26 05:46:27 UTC
[hbase] branch branch-2.4 updated: Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to unexpected client job down. (#4048)"
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 0af543c Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to unexpected client job down. (#4048)"
0af543c is described below
commit 0af543c57ce9fc278f11ee687d1d8837ced60e2a
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Jan 26 13:40:47 2022 +0800
Revert "HBASE-26688 Threads shared EMPTY_RESULT may lead to unexpected client job down. (#4048)"
This reverts commit fbd22f06bff8546e6d7a8757b3cf2f8eaed88f6b.
---
.../src/main/java/org/apache/hadoop/hbase/client/Result.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
index 138432aa..1ef1633 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
@@ -913,19 +913,16 @@ public class Result implements CellScannable, CellScanner {
@Override
public Cell current() {
- if (isEmpty()
+ if (cells == null
|| cellScannerIndex == INITIAL_CELLSCANNER_INDEX
- || cellScannerIndex >= cells.length) {
+ || cellScannerIndex >= cells.length)
return null;
- }
return this.cells[cellScannerIndex];
}
@Override
public boolean advance() {
- if (isEmpty()) {
- return false;
- }
+ if (cells == null) return false;
cellScannerIndex++;
if (cellScannerIndex < this.cells.length) {
return true;