PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells and no local indexes
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2ff316a8 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2ff316a8 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2ff316a8 Branch: refs/heads/omid2 Commit: 2ff316a8094fee089057e49d080cc8d0d0790531 Parents: 79ca071 Author: James Taylor <jamestay...@apache.org> Authored: Tue Oct 16 23:49:23 2018 -0700 Committer: James Taylor <jamestay...@apache.org> Committed: Tue Oct 23 08:19:02 2018 -0700 ---------------------------------------------------------------------- .../phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java | 9 ++++++--- .../org/apache/phoenix/schema/stats/StatsCollectorIT.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ff316a8/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java index 0a0dd21..9665fb6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java @@ -74,9 +74,12 @@ public class StatsEnabledSplitSystemCatalogIT extends BaseUniqueNamesOwnClusterI this.tableDDLOptions = optionBuilder.toString(); } - @Parameters(name = "transactional = {0}") - public static Collection<Object> data() { - return Arrays.asList(new Object[] { null, "TEPHRA", "OMID" }); + @Parameters(name = "transactionProvider = {0}") + public static Collection<Object[]> data() { + return TestUtil.filterTxParamData(Arrays.asList(new Object[][] { + { "TEPHRA" }, + { "OMID" }, + { null }}),0); } @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ff316a8/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 0caf61a..f1c4e45 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 @@ -635,7 +635,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT { // an exact byte count based on the number or rows is not possible because // it is variable on a row-by-row basis. long sumOfGuidePostsWidth = rs.getLong(3); - assertTrue(hasShadowCells ? sumOfGuidePostsWidth > 2 * c2Bytes && sumOfGuidePostsWidth <= 3 * c2Bytes: rs.getLong(3) == c2Bytes); + assertTrue(hasShadowCells ? sumOfGuidePostsWidth > c2Bytes : sumOfGuidePostsWidth == c2Bytes); count++; } }
