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?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
