This is an automated email from the ASF dual-hosted git repository. larsh pushed a commit to branch 4.x-HBase-1.5 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push: new 6f94d98 PHOENIX-4273 MutableIndexSplitIT#testSplitDuringIndexScan is failing for local indexes. 6f94d98 is described below commit 6f94d980f21b1c297589a40d4ad24990d288548e Author: Lars Hofhansl <la...@apache.org> AuthorDate: Thu May 30 14:38:24 2019 -0700 PHOENIX-4273 MutableIndexSplitIT#testSplitDuringIndexScan is failing for local indexes. --- .../phoenix/end2end/index/MutableIndexSplitForwardScanIT.java | 3 +-- .../org/apache/phoenix/end2end/index/MutableIndexSplitIT.java | 9 ++++++++- .../phoenix/end2end/index/MutableIndexSplitReverseScanIT.java | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitForwardScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitForwardScanIT.java index 83320c2..75e2ae2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitForwardScanIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitForwardScanIT.java @@ -19,8 +19,7 @@ package org.apache.phoenix.end2end.index; import org.junit.Test; -//TODO: re-enable once PHOENIX-4273 is fixed -public abstract class MutableIndexSplitForwardScanIT extends MutableIndexSplitIT { +public class MutableIndexSplitForwardScanIT extends MutableIndexSplitIT { public MutableIndexSplitForwardScanIT(boolean localIndex, boolean multiTenant) { super(localIndex, multiTenant); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitIT.java index b05c9b7..c341823 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitIT.java @@ -40,6 +40,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; import org.apache.phoenix.util.ByteUtil; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.TestUtil; @@ -84,7 +85,13 @@ public abstract class MutableIndexSplitIT extends ParallelStatsDisabledIT { ResultSet rs = conn1.createStatement().executeQuery("SELECT * FROM " + tableName); assertTrue(rs.next()); - splitDuringScan(conn1, tableName, indexName, strings, admin, isReverse); + try { + splitDuringScan(conn1, tableName, indexName, strings, admin, isReverse); + // a local index scan has to fail with a concurrent split + assertFalse(localIndex); + } catch (StaleRegionBoundaryCacheException x) { + assertTrue(localIndex); + } } finally { if(conn1 != null) conn1.close(); if(admin != null) admin.close(); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitReverseScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitReverseScanIT.java index f57dfdd..d7afb31 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitReverseScanIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexSplitReverseScanIT.java @@ -19,8 +19,7 @@ package org.apache.phoenix.end2end.index; import org.junit.Test; -//TODO: re-enable once PHOENIX-4273 is fixeds -public abstract class MutableIndexSplitReverseScanIT extends MutableIndexSplitIT { +public class MutableIndexSplitReverseScanIT extends MutableIndexSplitIT { public MutableIndexSplitReverseScanIT(boolean localIndex, boolean multiTenant) { super(localIndex, multiTenant);