You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by la...@apache.org on 2019/05/30 21:27:48 UTC
[phoenix] branch master updated: PHOENIX-4273
MutableIndexSplitIT#testSplitDuringIndexScan is failing for local indexes.
This is an automated email from the ASF dual-hosted git repository.
larsh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 917f373 PHOENIX-4273 MutableIndexSplitIT#testSplitDuringIndexScan is failing for local indexes.
917f373 is described below
commit 917f37365284afe2605b902c908b5b9030387bd7
Author: Lars Hofhansl <la...@apache.org>
AuthorDate: Thu May 30 14:28:02 2019 -0700
PHOENIX-4273 MutableIndexSplitIT#testSplitDuringIndexScan is failing for local indexes.
---
.../org/apache/phoenix/end2end/index/MutableIndexSplitIT.java | 9 ++++++++-
.../phoenix/end2end/index/MutableIndexSplitReverseScanIT.java | 3 +--
2 files changed, 9 insertions(+), 3 deletions(-)
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 4d0e56f..14bc465 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);