[ https://issues.apache.org/jira/browse/PHOENIX-2628?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15225600#comment-15225600 ]
ASF GitHub Bot commented on PHOENIX-2628: ----------------------------------------- Github user JamesRTaylor commented on a diff in the pull request: https://github.com/apache/phoenix/pull/156#discussion_r58482201 --- Diff: phoenix-core/src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java --- @@ -196,26 +196,31 @@ public Expression getDynamicFilter() { @Override public final ResultIterator iterator(ParallelScanGrouper scanGrouper) throws SQLException { - return iterator(Collections.<SQLCloseable>emptyList(), scanGrouper); + return iterator(Collections.<SQLCloseable>emptyList(), scanGrouper, this.context.getScan()); } - + + @Override + public final ResultIterator iterator(ParallelScanGrouper scanGrouper, Scan scan) throws SQLException { + return iterator(Collections.<SQLCloseable>emptyList(), scanGrouper, scan); + } + @Override public final ResultIterator iterator() throws SQLException { - return iterator(Collections.<SQLCloseable>emptyList(), DefaultParallelScanGrouper.getInstance()); + return iterator(Collections.<SQLCloseable>emptyList(), DefaultParallelScanGrouper.getInstance(), this.context.getScan()); } - public final ResultIterator iterator(final List<? extends SQLCloseable> dependencies, ParallelScanGrouper scanGrouper) throws SQLException { + public final ResultIterator iterator(final List<? extends SQLCloseable> dependencies, ParallelScanGrouper scanGrouper, Scan s) throws SQLException { if (context.getScanRanges() == ScanRanges.NOTHING) { return ResultIterator.EMPTY_ITERATOR; } if (tableRef == TableRef.EMPTY_TABLE_REF) { - return newIterator(scanGrouper); + return newIterator(scanGrouper, s); } // Set miscellaneous scan attributes. This is the last chance to set them before we // clone the scan for each parallelized chunk. - Scan scan = context.getScan(); + Scan scan = s == null ? context.getScan() : s; --- End diff -- Is this null check required? > Ensure split when iterating through results handled correctly > ------------------------------------------------------------- > > Key: PHOENIX-2628 > URL: https://issues.apache.org/jira/browse/PHOENIX-2628 > Project: Phoenix > Issue Type: Bug > Reporter: James Taylor > Assignee: Rajeshbabu Chintaguntla > Fix For: 4.8.0 > > Attachments: PHOENIX-2628-wip.patch, PHOENIX-2628.patch, > PHOENIX-2628_v7.patch, PHOENIX-2628_v8.patch > > > We should start with a test case to ensure this works correctly, both for > scans and aggregates. -- This message was sent by Atlassian JIRA (v6.3.4#6332)