phoenix-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From JamesRTaylor <...@git.apache.org>
Subject [GitHub] phoenix pull request: PHOENIX-2628 Ensure split when iterating thr...
Date Tue, 05 Apr 2016 04:04:31 GMT
Github user JamesRTaylor commented on a diff in the pull request:

    https://github.com/apache/phoenix/pull/156#discussion_r58484293
  
    --- Diff: phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
---
    @@ -107,8 +127,37 @@ public synchronized void close() throws SQLException {
         @Override
         public synchronized Tuple next() throws SQLException {
             initScanner();
    -        Tuple t = scanIterator.next();
    -        return t;
    +        try {
    +            lastTuple = scanIterator.next();
    +            if (lastTuple != null) {
    +                ImmutableBytesWritable ptr = new ImmutableBytesWritable();
    +                lastTuple.getKey(ptr);
    +            }
    +        } catch (SQLException e) {
    +            try {
    +                throw ServerUtil.parseServerException(e);
    +            } catch(StaleRegionBoundaryCacheException e1) {
    +                if(scan.getAttribute(NON_AGGREGATE_QUERY)!=null) {
    +                    Scan newScan = ScanUtil.newScan(scan);
    +                    if(lastTuple != null) {
    +                        lastTuple.getKey(ptr);
    +                        byte[] startRowSuffix = ByteUtil.copyKeyBytesIfNecessary(ptr);
    +                        if(ScanUtil.isLocalIndex(newScan)) {
    +                            newScan.setAttribute(SCAN_START_ROW_SUFFIX, ByteUtil.nextKey(startRowSuffix));
    +                        } else {
    +                            newScan.setStartRow(ByteUtil.nextKey(startRowSuffix));
    +                        }
    +                    }
    +                    plan.getContext().getConnection().getQueryServices().clearTableRegionCache(htable.getTableName());
    +                    this.scanIterator =
    +                            plan.iterator(DefaultParallelScanGrouper.getInstance(), newScan);
    --- End diff --
    
    Getting the ParallelScanGrouper here as state instead of assuming the default one is being
used may be necessary (or making it not necessary to have this ParallelScanGrouper - it's
an edge case for the MR integration - there's likely a better way - perhaps the plan itself
could know what to use for the ParallelScanGrouper?)


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message