paul-rogers commented on a change in pull request #1981: DRILL-7583: Remove STOP status from operator outcome URL: https://github.com/apache/drill/pull/1981#discussion_r379848798
########## File path: exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java ########## @@ -386,52 +398,52 @@ protected void buildSchema() { * Prefetches the first build side data holding batch. */ private void prefetchFirstBuildBatch() { - rightUpstream = prefetchFirstBatch(rightUpstream, - prefetchedBuild, - buildSideIsEmpty, - RIGHT_INDEX, - buildBatch, - () -> { - batchMemoryManager.update(RIGHT_INDEX, 0, true); - RecordBatchStats.logRecordBatchStats(RecordBatchIOType.INPUT_RIGHT, - batchMemoryManager.getRecordBatchSizer(RIGHT_INDEX), - getRecordBatchStatsContext()); - }); + rightUpstream = prefetchFirstBatch(rightUpstream, prefetchedBuild, + buildSideIsEmpty, RIGHT_INDEX, buildBatch, () -> { + batchMemoryManager.update(RIGHT_INDEX, 0, true); + RecordBatchStats.logRecordBatchStats(RecordBatchIOType.INPUT_RIGHT, + batchMemoryManager.getRecordBatchSizer(RIGHT_INDEX), + getRecordBatchStatsContext()); + }); } /** * Prefetches the first build side data holding batch. */ private void prefetchFirstProbeBatch() { - leftUpstream = prefetchFirstBatch(leftUpstream, - prefetchedProbe, - probeSideIsEmpty, - LEFT_INDEX, - probeBatch, - () -> { - batchMemoryManager.update(LEFT_INDEX, 0); - RecordBatchStats.logRecordBatchStats(RecordBatchIOType.INPUT_LEFT, - batchMemoryManager.getRecordBatchSizer(LEFT_INDEX), - getRecordBatchStatsContext()); - }); + leftUpstream = prefetchFirstBatch(leftUpstream, prefetchedProbe, + probeSideIsEmpty, LEFT_INDEX, probeBatch, () -> { + batchMemoryManager.update(LEFT_INDEX, 0); + RecordBatchStats.logRecordBatchStats(RecordBatchIOType.INPUT_LEFT, + batchMemoryManager.getRecordBatchSizer(LEFT_INDEX), + getRecordBatchStatsContext()); + }); } /** - * Used to fetch the first data holding batch from either the build or probe side. - * @param outcome The current upstream outcome for either the build or probe side. - * @param prefetched A flag indicating if we have already done a prefetch of the first data holding batch for the probe or build side. - * @param isEmpty A flag indicating if the probe or build side is empty. - * @param index The upstream index of the probe or build batch. - * @param batch The probe or build batch itself. - * @param memoryManagerUpdate A lambda function to execute the memory manager update for the probe or build batch. - * @return The current {@link org.apache.drill.exec.record.RecordBatch.IterOutcome}. + * Used to fetch the first data holding batch from either the build or probe + * side. + * + * @param outcome + * The current upstream outcome for either the build or probe side. + * @param prefetched + * A flag indicating if we have already done a prefetch of the first + * data holding batch for the probe or build side. + * @param isEmpty + * A flag indicating if the probe or build side is empty. + * @param index + * The upstream index of the probe or build batch. + * @param batch + * The probe or build batch itself. + * @param memoryManagerUpdate + * A lambda function to execute the memory manager update for the + * probe or build batch. + * @return The current + * {@link org.apache.drill.exec.record.RecordBatch.IterOutcome}. */ private IterOutcome prefetchFirstBatch(IterOutcome outcome, - MutableBoolean prefetched, - MutableBoolean isEmpty, - int index, - RecordBatch batch, - Runnable memoryManagerUpdate) { + MutableBoolean prefetched, MutableBoolean isEmpty, int index, Review comment: Reverted, Another over-aggressive bit of help from the code formatter. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services