Repository: phoenix Updated Branches: refs/heads/encodecolumns ff15ee8c7 -> 9915c047f
Tweak statistics tests to take into account column name encoding Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9915c047 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9915c047 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9915c047 Branch: refs/heads/encodecolumns Commit: 9915c047fb61df683c5b9a32971ffb7e7a27e8a3 Parents: ff15ee8 Author: Samarth <[email protected]> Authored: Fri Apr 8 09:52:25 2016 -0700 Committer: Samarth <[email protected]> Committed: Fri Apr 8 09:52:25 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/end2end/StatsCollectorIT.java | 2 +- .../end2end/StatsCollectorWithSplitsAndMultiCFIT.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9915c047/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java index bc575fd..e4a7e4b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java @@ -129,7 +129,7 @@ public class StatsCollectorIT extends StatsCollectorAbstractIT { rs = conn.createStatement().executeQuery("EXPLAIN SELECT * FROM " + fullTableName); explainPlan = QueryUtil.getExplainPlan(rs); assertEquals( - "CLIENT 4-CHUNK 1 ROWS 34 BYTES PARALLEL 3-WAY FULL SCAN OVER " + fullTableName + "\n" + + "CLIENT 4-CHUNK 1 ROWS 28 BYTES PARALLEL 3-WAY FULL SCAN OVER " + fullTableName + "\n" + "CLIENT MERGE SORT", explainPlan); http://git-wip-us.apache.org/repos/asf/phoenix/blob/9915c047/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java index d922ad9..046d6c4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java @@ -116,25 +116,25 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends StatsCollectorAbstract assertTrue(rs.next()); assertEquals("A", rs.getString(1)); assertEquals(25, rs.getInt(2)); - assertEquals(12420, rs.getInt(3)); + assertEquals(12530, rs.getInt(3)); assertEquals(25, rs.getInt(4)); assertTrue(rs.next()); assertEquals("B", rs.getString(1)); assertEquals(20, rs.getInt(2)); - assertEquals(5540, rs.getInt(3)); + assertEquals(5600, rs.getInt(3)); assertEquals(20, rs.getInt(4)); assertTrue(rs.next()); assertEquals("C", rs.getString(1)); assertEquals(25, rs.getInt(2)); - assertEquals(6930, rs.getInt(3)); + assertEquals(7005, rs.getInt(3)); assertEquals(25, rs.getInt(4)); assertTrue(rs.next()); assertEquals("D", rs.getString(1)); assertEquals(25, rs.getInt(2)); - assertEquals(6930, rs.getInt(3)); + assertEquals(7005, rs.getInt(3)); assertEquals(25, rs.getInt(4)); } @@ -166,7 +166,7 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends StatsCollectorAbstract int startIndex = r.nextInt(strings.length); int endIndex = r.nextInt(strings.length - startIndex) + startIndex; long rows = endIndex - startIndex; - long c2Bytes = rows * 35; + long c2Bytes = rows * 37; System.out.println(rows + ":" + startIndex + ":" + endIndex); rs = conn.createStatement().executeQuery( "SELECT COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH) from SYSTEM.STATS where PHYSICAL_NAME = '"
