Repository: phoenix Updated Branches: refs/heads/4.x-cdh5.12 6b399f890 -> 44939d29e (forced update)
Revert "PHOENIX-4768 Re-enable testCompactUpdatesStats and testCompactUpdatesStatsWithMinStatsUpdateFreq of StatsCollectorIT" This reverts commit f6caad56dabd1576116d44625f1c4a150ae26368. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/89e40ffe Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/89e40ffe Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/89e40ffe Branch: refs/heads/4.x-cdh5.12 Commit: 89e40ffe0ea56f61254f74e0e8be20dbbba53627 Parents: f6caad5 Author: James Taylor <jamestay...@apache.org> Authored: Sun Jun 3 16:10:12 2018 -0700 Committer: James Taylor <jamestay...@apache.org> Committed: Sun Jun 3 16:10:12 2018 -0700 ---------------------------------------------------------------------- .../org/apache/phoenix/schema/stats/StatsCollectorIT.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/89e40ffe/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java index 5436311..09d28f8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java @@ -68,6 +68,7 @@ import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.TestUtil; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -403,11 +404,13 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT { } @Test + @Ignore //TODO remove this once https://issues.apache.org/jira/browse/TEPHRA-208 is fixed public void testCompactUpdatesStats() throws Exception { testCompactUpdatesStats(0, fullTableName); } @Test + @Ignore //TODO remove this once https://issues.apache.org/jira/browse/TEPHRA-208 is fixed public void testCompactUpdatesStatsWithMinStatsUpdateFreq() throws Exception { testCompactUpdatesStats(QueryServicesOptions.DEFAULT_STATS_UPDATE_FREQ_MS, fullTableName); } @@ -460,7 +463,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT { Scan scan = new Scan(); scan.setRaw(true); PhoenixConnection phxConn = conn.unwrap(PhoenixConnection.class); - try (HTableInterface htable = phxConn.getQueryServices().getTable(Bytes.toBytes(physicalTableName))) { + try (HTableInterface htable = phxConn.getQueryServices().getTable(Bytes.toBytes(tableName))) { ResultScanner scanner = htable.getScanner(scan); Result result; while ((result = scanner.next())!=null) { @@ -473,7 +476,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT { scan = new Scan(); scan.setRaw(true); phxConn = conn.unwrap(PhoenixConnection.class); - try (HTableInterface htable = phxConn.getQueryServices().getTable(Bytes.toBytes(physicalTableName))) { + try (HTableInterface htable = phxConn.getQueryServices().getTable(Bytes.toBytes(tableName))) { ResultScanner scanner = htable.getScanner(scan); Result result; while ((result = scanner.next())!=null) {
