[10/21] phoenix git commit: PHOENIX-4366 Rebuilding a local index fails sometimes
PHOENIX-4366 Rebuilding a local index fails sometimes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a874df3a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a874df3a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a874df3a Branch: refs/heads/4.x-cdh5.14 Commit: a874df3a70bb52ea56f0159c37cdbb16534d762f Parents: 0987d09 Author: James TaylorAuthored: Wed Apr 11 21:37:45 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:27:33 2018 +0100 -- .../coprocessor/BaseScannerRegionObserver.java | 7 + .../GroupedAggregateRegionObserver.java | 4 +++ .../phoenix/coprocessor/ScanRegionObserver.java | 4 ++- .../UngroupedAggregateRegionObserver.java | 7 - .../NonAggregateRegionScannerFactory.java | 29 +--- .../phoenix/iterate/RegionScannerFactory.java | 4 +-- .../apache/phoenix/iterate/SnapshotScanner.java | 6 +--- 7 files changed, 30 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a874df3a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java index 7ef64b0..3310131 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java @@ -139,8 +139,6 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { /** Exposed for testing */ public static final String SCANNER_OPENED_TRACE_INFO = "Scanner opened on server"; -protected QualifierEncodingScheme encodingScheme; -protected boolean useNewValueColumnQualifier; @Override public void start(CoprocessorEnvironment e) throws IOException { @@ -211,8 +209,6 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { // start exclusive and the stop inclusive. ScanUtil.setupReverseScan(scan); } -this.encodingScheme = EncodedColumnsUtil.getQualifierEncodingScheme(scan); -this.useNewValueColumnQualifier = EncodedColumnsUtil.useNewValueColumnQualifier(scan); return s; } @@ -350,8 +346,7 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { final byte[][] viewConstants, final TupleProjector projector, final ImmutableBytesWritable ptr, final boolean useQualiferAsListIndex) { -RegionScannerFactory regionScannerFactory = new NonAggregateRegionScannerFactory(c.getEnvironment(), -useNewValueColumnQualifier, encodingScheme); +RegionScannerFactory regionScannerFactory = new NonAggregateRegionScannerFactory(c.getEnvironment()); return regionScannerFactory.getWrappedScanner(c.getEnvironment(), s, null, null, offset, scan, dataColumns, tupleProjector, dataRegion, indexMaintainer, null, viewConstants, null, null, projector, ptr, useQualiferAsListIndex); http://git-wip-us.apache.org/repos/asf/phoenix/blob/a874df3a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java index 67cc114..201bcec 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java @@ -62,6 +62,7 @@ import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.join.HashJoinInfo; import org.apache.phoenix.memory.MemoryManager.MemoryChunk; import org.apache.phoenix.query.QueryConstants; +import org.apache.phoenix.schema.PTable; import org.apache.phoenix.schema.SortOrder; import org.apache.phoenix.schema.tuple.EncodedColumnQualiferCellsList; import org.apache.phoenix.schema.tuple.MultiKeyValueTuple; @@ -110,6 +111,7 @@ public class GroupedAggregateRegionObserver extends BaseScannerRegionObserver { keyOrdered = true; } int offset = 0; +boolean useNewValueColumnQualifier = EncodedColumnsUtil.useNewValueColumnQualifier(scan); if (ScanUtil.isLocalIndex(scan)) { /* * For local indexes, we need to set an offset on row key
[10/21] phoenix git commit: PHOENIX-4366 Rebuilding a local index fails sometimes
PHOENIX-4366 Rebuilding a local index fails sometimes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a874df3a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a874df3a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a874df3a Branch: refs/heads/4.x-cdh5.13 Commit: a874df3a70bb52ea56f0159c37cdbb16534d762f Parents: 0987d09 Author: James TaylorAuthored: Wed Apr 11 21:37:45 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:27:33 2018 +0100 -- .../coprocessor/BaseScannerRegionObserver.java | 7 + .../GroupedAggregateRegionObserver.java | 4 +++ .../phoenix/coprocessor/ScanRegionObserver.java | 4 ++- .../UngroupedAggregateRegionObserver.java | 7 - .../NonAggregateRegionScannerFactory.java | 29 +--- .../phoenix/iterate/RegionScannerFactory.java | 4 +-- .../apache/phoenix/iterate/SnapshotScanner.java | 6 +--- 7 files changed, 30 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a874df3a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java index 7ef64b0..3310131 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java @@ -139,8 +139,6 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { /** Exposed for testing */ public static final String SCANNER_OPENED_TRACE_INFO = "Scanner opened on server"; -protected QualifierEncodingScheme encodingScheme; -protected boolean useNewValueColumnQualifier; @Override public void start(CoprocessorEnvironment e) throws IOException { @@ -211,8 +209,6 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { // start exclusive and the stop inclusive. ScanUtil.setupReverseScan(scan); } -this.encodingScheme = EncodedColumnsUtil.getQualifierEncodingScheme(scan); -this.useNewValueColumnQualifier = EncodedColumnsUtil.useNewValueColumnQualifier(scan); return s; } @@ -350,8 +346,7 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { final byte[][] viewConstants, final TupleProjector projector, final ImmutableBytesWritable ptr, final boolean useQualiferAsListIndex) { -RegionScannerFactory regionScannerFactory = new NonAggregateRegionScannerFactory(c.getEnvironment(), -useNewValueColumnQualifier, encodingScheme); +RegionScannerFactory regionScannerFactory = new NonAggregateRegionScannerFactory(c.getEnvironment()); return regionScannerFactory.getWrappedScanner(c.getEnvironment(), s, null, null, offset, scan, dataColumns, tupleProjector, dataRegion, indexMaintainer, null, viewConstants, null, null, projector, ptr, useQualiferAsListIndex); http://git-wip-us.apache.org/repos/asf/phoenix/blob/a874df3a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java index 67cc114..201bcec 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java @@ -62,6 +62,7 @@ import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.join.HashJoinInfo; import org.apache.phoenix.memory.MemoryManager.MemoryChunk; import org.apache.phoenix.query.QueryConstants; +import org.apache.phoenix.schema.PTable; import org.apache.phoenix.schema.SortOrder; import org.apache.phoenix.schema.tuple.EncodedColumnQualiferCellsList; import org.apache.phoenix.schema.tuple.MultiKeyValueTuple; @@ -110,6 +111,7 @@ public class GroupedAggregateRegionObserver extends BaseScannerRegionObserver { keyOrdered = true; } int offset = 0; +boolean useNewValueColumnQualifier = EncodedColumnsUtil.useNewValueColumnQualifier(scan); if (ScanUtil.isLocalIndex(scan)) { /* * For local indexes, we need to set an offset on row key
[10/21] phoenix git commit: PHOENIX-4366 Rebuilding a local index fails sometimes
PHOENIX-4366 Rebuilding a local index fails sometimes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a874df3a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a874df3a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a874df3a Branch: refs/heads/4.x-cdh5.12 Commit: a874df3a70bb52ea56f0159c37cdbb16534d762f Parents: 0987d09 Author: James TaylorAuthored: Wed Apr 11 21:37:45 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:27:33 2018 +0100 -- .../coprocessor/BaseScannerRegionObserver.java | 7 + .../GroupedAggregateRegionObserver.java | 4 +++ .../phoenix/coprocessor/ScanRegionObserver.java | 4 ++- .../UngroupedAggregateRegionObserver.java | 7 - .../NonAggregateRegionScannerFactory.java | 29 +--- .../phoenix/iterate/RegionScannerFactory.java | 4 +-- .../apache/phoenix/iterate/SnapshotScanner.java | 6 +--- 7 files changed, 30 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a874df3a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java index 7ef64b0..3310131 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java @@ -139,8 +139,6 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { /** Exposed for testing */ public static final String SCANNER_OPENED_TRACE_INFO = "Scanner opened on server"; -protected QualifierEncodingScheme encodingScheme; -protected boolean useNewValueColumnQualifier; @Override public void start(CoprocessorEnvironment e) throws IOException { @@ -211,8 +209,6 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { // start exclusive and the stop inclusive. ScanUtil.setupReverseScan(scan); } -this.encodingScheme = EncodedColumnsUtil.getQualifierEncodingScheme(scan); -this.useNewValueColumnQualifier = EncodedColumnsUtil.useNewValueColumnQualifier(scan); return s; } @@ -350,8 +346,7 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { final byte[][] viewConstants, final TupleProjector projector, final ImmutableBytesWritable ptr, final boolean useQualiferAsListIndex) { -RegionScannerFactory regionScannerFactory = new NonAggregateRegionScannerFactory(c.getEnvironment(), -useNewValueColumnQualifier, encodingScheme); +RegionScannerFactory regionScannerFactory = new NonAggregateRegionScannerFactory(c.getEnvironment()); return regionScannerFactory.getWrappedScanner(c.getEnvironment(), s, null, null, offset, scan, dataColumns, tupleProjector, dataRegion, indexMaintainer, null, viewConstants, null, null, projector, ptr, useQualiferAsListIndex); http://git-wip-us.apache.org/repos/asf/phoenix/blob/a874df3a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java index 67cc114..201bcec 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java @@ -62,6 +62,7 @@ import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.join.HashJoinInfo; import org.apache.phoenix.memory.MemoryManager.MemoryChunk; import org.apache.phoenix.query.QueryConstants; +import org.apache.phoenix.schema.PTable; import org.apache.phoenix.schema.SortOrder; import org.apache.phoenix.schema.tuple.EncodedColumnQualiferCellsList; import org.apache.phoenix.schema.tuple.MultiKeyValueTuple; @@ -110,6 +111,7 @@ public class GroupedAggregateRegionObserver extends BaseScannerRegionObserver { keyOrdered = true; } int offset = 0; +boolean useNewValueColumnQualifier = EncodedColumnsUtil.useNewValueColumnQualifier(scan); if (ScanUtil.isLocalIndex(scan)) { /* * For local indexes, we need to set an offset on row key