Repository: phoenix Updated Branches: refs/heads/master 91d0abc55 -> 241e72539
PHOENIX-1677 Immutable index deadlocks when number of guideposts are one half of thread pool size Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/241e7253 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/241e7253 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/241e7253 Branch: refs/heads/master Commit: 241e7253911f8ae866b256aac66b78ca56f1fe19 Parents: 91d0abc Author: James Taylor <[email protected]> Authored: Sat Mar 14 18:24:10 2015 -0700 Committer: James Taylor <[email protected]> Committed: Sun Mar 15 00:06:14 2015 -0700 ---------------------------------------------------------------------- .../end2end/index/ImmutableIndexWithStatsIT.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/241e7253/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java index 493c39b..867c0f7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java @@ -28,8 +28,7 @@ import java.sql.ResultSet; import java.util.Map; import java.util.Properties; -import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.Shadower; +import org.apache.phoenix.end2end.BaseOwnClusterHBaseManagedTimeIT; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; @@ -41,10 +40,9 @@ import org.junit.Test; import com.google.common.collect.Maps; -public class ImmutableIndexWithStatsIT extends BaseHBaseManagedTimeIT { +public class ImmutableIndexWithStatsIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass - @Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class) public static void doSetup() throws Exception { Map<String,String> props = Maps.newHashMapWithExpectedSize(5); props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, Long.toString(1)); @@ -62,9 +60,7 @@ public class ImmutableIndexWithStatsIT extends BaseHBaseManagedTimeIT { Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); Connection conn = DriverManager.getConnection(getUrl(), props); conn.setAutoCommit(false); - // Randomize table name to prevent using already created table - long rand = (long)(Math.random() * 1000000.0); - String tableName = TestUtil.DEFAULT_DATA_TABLE_FULL_NAME + rand; + String tableName = TestUtil.DEFAULT_DATA_TABLE_FULL_NAME; conn.createStatement().execute("CREATE TABLE " + tableName + " (k VARCHAR NOT NULL PRIMARY KEY, v VARCHAR) IMMUTABLE_ROWS=TRUE"); query = "SELECT * FROM " + tableName; rs = conn.createStatement().executeQuery(query); @@ -83,7 +79,7 @@ public class ImmutableIndexWithStatsIT extends BaseHBaseManagedTimeIT { rs = conn.createStatement().executeQuery("EXPLAIN " + query); assertTrue(QueryUtil.getExplainPlan(rs).startsWith("CLIENT 7-CHUNK PARALLEL 1-WAY FULL SCAN")); - String indexName = TestUtil.DEFAULT_INDEX_TABLE_NAME + rand; + String indexName = TestUtil.DEFAULT_INDEX_TABLE_NAME; conn.createStatement().execute("CREATE INDEX " + indexName + " ON " + tableName + " (v)"); query = "SELECT * FROM " + indexName;
