PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shado…

…w cells and no local indexes
zzzppi · Oct 23, 2018 · 0c28ea2 · 0c28ea2
1 parent 72d6109
commit 0c28ea2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
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
@@ -74,9 +74,12 @@ public StatsEnabledSplitSystemCatalogIT(String transactionProvider) {
 	        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

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
@@ -635,7 +635,7 @@ public void testRowCountAndByteCounts() throws SQLException {
                 // 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++;
             }
         }