You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ch...@apache.org on 2020/12/30 11:10:30 UTC
[phoenix] branch master updated: PHOENIX-6287 Fix incorrect log in
ParallelIterators.submitWork
This is an automated email from the ASF dual-hosted git repository.
chenglei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 3891050 PHOENIX-6287 Fix incorrect log in ParallelIterators.submitWork
3891050 is described below
commit 38910507659976c8a12e5f0d355beef55add382d
Author: chenglei <ch...@apache.org>
AuthorDate: Wed Dec 30 19:09:45 2020 +0800
PHOENIX-6287 Fix incorrect log in ParallelIterators.submitWork
---
.../org/apache/phoenix/iterate/ParallelIterators.java | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
index 8947668..828de39 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
@@ -123,12 +123,12 @@ public class ParallelIterators extends BaseResultIterators {
@Override
public PeekingResultIterator call() throws Exception {
long startTime = EnvironmentEdgeManager.currentTimeMillis();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(LogUtil.addCustomAnnotations("Id: " + scanId + ", Time: " +
- (EnvironmentEdgeManager.currentTimeMillis() - startTime) +
- "ms, Scan: " + scan, ScanUtil.getCustomAnnotations(scan)));
- }
- PeekingResultIterator iterator = iteratorFactory.newIterator(context, tableResultItr, scan, physicalTableName, ParallelIterators.this.plan);
+ PeekingResultIterator iterator = iteratorFactory.newIterator(
+ context,
+ tableResultItr,
+ scan,
+ physicalTableName,
+ ParallelIterators.this.plan);
if (initFirstScanOnly) {
if ((!isReverse && scanLocation.isFirstScan()) || (isReverse && scanLocation.isLastScan())) {
// Fill the scanner's cache. This helps reduce latency since we are parallelizing the I/O needed.
@@ -137,6 +137,13 @@ public class ParallelIterators extends BaseResultIterators {
} else {
iterator.peek();
}
+
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(LogUtil.addCustomAnnotations("Id: " + scanId + ", Time: " +
+ (EnvironmentEdgeManager.currentTimeMillis() - startTime) +
+ "ms, Scan: " + scan, ScanUtil.getCustomAnnotations(scan)));
+ }
+
allIterators.add(iterator);
return iterator;
}