You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by pb...@apache.org on 2018/11/26 10:39:32 UTC
[03/12] phoenix git commit: PHOENIX-4975 Addendum to fix failing unit
tests for Omid due to shadow cells and no local indexes
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/b899734c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b899734c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b899734c
Branch: refs/heads/4.x-cdh5.15
Commit: b899734cee335c2b0e55d6d606092a96d60eedd6
Parents: 2c2113a
Author: James Taylor <ja...@apache.org>
Authored: Wed Oct 17 07:49:23 2018 +0100
Committer: pboado <pe...@gmail.com>
Committed: Sun Nov 25 22:09:00 2018 +0000
----------------------------------------------------------------------
.../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/b899734c/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/b899734c/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++;
}
}