This is an automated email from the ASF dual-hosted git repository. taklwu pushed a commit to branch branch-2 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit c639d6f353b09c1466e2eb7ec76e4d4e0e42009d Author: Tak Lon (Stephen) Wu <[email protected]> AuthorDate: Tue Aug 24 17:45:04 2021 -0700 HBASE-26136 Backport HBASE-25723 "Temporarily remove the trace support for RegionScanner.next" to branch-2 (#3623) 13/17 commits of HBASE-22120, original commit 7f90c2201f6a17d2e2d031505c35ae7c2b1ed7ea Co-authored-by: Duo Zhang <[email protected]> Signed-off-by: Duo Zhang <[email protected]> --- .../hbase/regionserver/RegionScannerImpl.java | 58 +++++++++++----------- .../hbase/regionserver/TestHRegionTracing.java | 1 - 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java index b2e793f..881f423 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java @@ -255,39 +255,37 @@ class RegionScannerImpl implements RegionScanner, Shipper, RpcCallback { @Override public boolean nextRaw(List<Cell> outResults, ScannerContext scannerContext) throws IOException { - return TraceUtil.trace(() -> { - if (storeHeap == null) { - // scanner is closed - throw new UnknownScannerException("Scanner was closed"); - } - boolean moreValues = false; - if (outResults.isEmpty()) { - // Usually outResults is empty. This is true when next is called - // to handle scan or get operation. - moreValues = nextInternal(outResults, scannerContext); - } else { - List<Cell> tmpList = new ArrayList<>(); - moreValues = nextInternal(tmpList, scannerContext); - outResults.addAll(tmpList); - } + if (storeHeap == null) { + // scanner is closed + throw new UnknownScannerException("Scanner was closed"); + } + boolean moreValues = false; + if (outResults.isEmpty()) { + // Usually outResults is empty. This is true when next is called + // to handle scan or get operation. + moreValues = nextInternal(outResults, scannerContext); + } else { + List<Cell> tmpList = new ArrayList<>(); + moreValues = nextInternal(tmpList, scannerContext); + outResults.addAll(tmpList); + } - region.addReadRequestsCount(1); - if (region.getMetrics() != null) { - region.getMetrics().updateReadRequestCount(); - } + region.addReadRequestsCount(1); + if (region.getMetrics() != null) { + region.getMetrics().updateReadRequestCount(); + } - // If the size limit was reached it means a partial Result is being returned. Returning a - // partial Result means that we should not reset the filters; filters should only be reset in - // between rows - if (!scannerContext.mayHaveMoreCellsInRow()) { - resetFilters(); - } + // If the size limit was reached it means a partial Result is being returned. Returning a + // partial Result means that we should not reset the filters; filters should only be reset in + // between rows + if (!scannerContext.mayHaveMoreCellsInRow()) { + resetFilters(); + } - if (isFilterDoneInternal()) { - moreValues = false; - } - return moreValues; - }, () -> region.createRegionSpan("RegionScanner.next")); + if (isFilterDoneInternal()) { + moreValues = false; + } + return moreValues; } /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionTracing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionTracing.java index 17c3eb4..e5779b4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionTracing.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionTracing.java @@ -178,7 +178,6 @@ public class TestHRegionTracing { } assertSpan("Region.getScanner"); assertSpan("RegionScanner.reseek"); - assertSpan("RegionScanner.next"); assertSpan("RegionScanner.close"); } }
