Repository: phoenix Updated Branches: refs/heads/4.0 632624e08 -> b61d182f4
Don't offset row key for local indexes on merge sort Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b61d182f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b61d182f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b61d182f Branch: refs/heads/4.0 Commit: b61d182f44d88b2373aec92e7800fa770f5e2d73 Parents: 632624e Author: James Taylor <jtay...@salesforce.com> Authored: Tue Jul 29 13:39:30 2014 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Tue Jul 29 13:39:30 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/execute/ScanPlan.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b61d182f/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java index f9af543..6ff5950 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java @@ -18,6 +18,9 @@ package org.apache.phoenix.execute; +import java.sql.SQLException; +import java.util.List; + import org.apache.phoenix.compile.GroupByCompiler.GroupBy; import org.apache.phoenix.compile.OrderByCompiler.OrderBy; import org.apache.phoenix.compile.RowProjector; @@ -40,14 +43,11 @@ import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.PTable; +import org.apache.phoenix.schema.PTable.IndexType; import org.apache.phoenix.schema.SaltingUtil; import org.apache.phoenix.schema.TableRef; -import org.apache.phoenix.schema.PTable.IndexType; import org.apache.phoenix.util.ScanUtil; -import java.sql.SQLException; -import java.util.List; - /** @@ -122,7 +122,7 @@ public class ScanPlan extends BasicQueryPlan { QueryServicesOptions.DEFAULT_ROW_KEY_ORDER_SALTED_TABLE) || orderBy == OrderBy.FWD_ROW_KEY_ORDER_BY || orderBy == OrderBy.REV_ROW_KEY_ORDER_BY)) { // ORDER BY was optimized out b/c query is in row key order - scanner = new MergeSortRowKeyResultIterator(iterators, SaltingUtil.NUM_SALTING_BYTES, orderBy == OrderBy.REV_ROW_KEY_ORDER_BY); + scanner = new MergeSortRowKeyResultIterator(iterators, isSalted ? SaltingUtil.NUM_SALTING_BYTES : 0, orderBy == OrderBy.REV_ROW_KEY_ORDER_BY); } else { scanner = new ConcatResultIterator(iterators); }
