phoenix git commit: PHOENIX-2683 store rowCount and byteCount at guidePost level(Ankit Singhal)

2016-02-16 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 75e4f4132 -> 6ef45b677


PHOENIX-2683 store rowCount and byteCount at guidePost level(Ankit Singhal)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6ef45b67
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6ef45b67
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6ef45b67

Branch: refs/heads/4.x-HBase-1.0
Commit: 6ef45b677d90ec0a75c8e99f47fe15b83db5628f
Parents: 75e4f41
Author: Ankit Singhal 
Authored: Tue Feb 16 22:05:15 2016 +0530
Committer: Ankit Singhal 
Committed: Tue Feb 16 22:05:15 2016 +0530

--
 .../StatsCollectorWithSplitsAndMultiCFIT.java   |  66 +++-
 .../generated/PGuidePostsProtos.java| 336 ++-
 .../org/apache/phoenix/execute/ScanPlan.java|   5 +-
 .../org/apache/phoenix/schema/PTableImpl.java   |  25 +-
 .../phoenix/schema/stats/GuidePostsInfo.java|  69 ++--
 .../schema/stats/GuidePostsInfoBuilder.java |  61 ++--
 .../schema/stats/StatisticsCollector.java   |  21 +-
 .../phoenix/schema/stats/StatisticsWriter.java  |  18 +-
 phoenix-protocol/src/main/PGuidePosts.proto |   2 +
 9 files changed, 502 insertions(+), 101 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ef45b67/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 dfe8b60..13cd54c 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
@@ -26,9 +26,11 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Random;
 
 import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -102,10 +104,10 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends 
StatsCollectorAbstract
 
 TestUtil.analyzeTable(conn, STATS_TEST_TABLE_NAME_NEW);
 String query = "UPDATE STATISTICS " + STATS_TEST_TABLE_NAME_NEW + " 
SET \""
-+ QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB + "\"=" + 
Long.toString(2000);
++ QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB + "\"=" + 
Long.toString(250);
 conn.createStatement().execute(query);
 keyRanges = getAllSplits(conn, STATS_TEST_TABLE_NAME_NEW);
-assertEquals(6, keyRanges.size());
+assertEquals(26, keyRanges.size());
 
 rs = conn.createStatement().executeQuery(
 "SELECT 
COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH),COUNT(*) from 
SYSTEM.STATS where PHYSICAL_NAME = '"
@@ -115,27 +117,71 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends 
StatsCollectorAbstract
 assertTrue(rs.next());
 assertEquals("A", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(11040, rs.getInt(3));
-assertEquals(5, rs.getInt(4));
+assertEquals(12420, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("B", rs.getString(1));
 assertEquals(20, rs.getInt(2));
-assertEquals(4432, rs.getInt(3));
-assertEquals(2, rs.getInt(4));
+assertEquals(5540, rs.getInt(3));
+assertEquals(20, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("C", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(6652, rs.getInt(3));
-assertEquals(3, rs.getInt(4));
+assertEquals(6930, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("D", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(6652, rs.getInt(3));
-assertEquals(3, rs.getInt(4));
+assertEquals(6930, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 }
 
+@Test
+public void testRowCountAndByteCounts() throws SQLException {
+Connection conn;
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+conn = DriverManager.getConnection(getUrl(), props);
+String tableName = "T";
+String ddl = "CREATE TABLE " + tableName + " (t_id VARCHAR NOT 
NULL,\n" + "k1 INTEGER NOT NULL,\n"
+

phoenix git commit: PHOENIX-2683 store rowCount and byteCount at guidePost level(Ankit Singhal)

2016-02-16 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 0b80eef66 -> 8f1370f55


PHOENIX-2683 store rowCount and byteCount at guidePost level(Ankit Singhal)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8f1370f5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8f1370f5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8f1370f5

Branch: refs/heads/4.x-HBase-0.98
Commit: 8f1370f55bab620abdb14321c1518076be1002d2
Parents: 0b80eef
Author: Ankit Singhal 
Authored: Tue Feb 16 22:04:39 2016 +0530
Committer: Ankit Singhal 
Committed: Tue Feb 16 22:04:39 2016 +0530

--
 .../StatsCollectorWithSplitsAndMultiCFIT.java   |  66 +++-
 .../generated/PGuidePostsProtos.java| 336 ++-
 .../org/apache/phoenix/execute/ScanPlan.java|   5 +-
 .../org/apache/phoenix/schema/PTableImpl.java   |  25 +-
 .../phoenix/schema/stats/GuidePostsInfo.java|  69 ++--
 .../schema/stats/GuidePostsInfoBuilder.java |  61 ++--
 .../schema/stats/StatisticsCollector.java   |  21 +-
 .../phoenix/schema/stats/StatisticsWriter.java  |  18 +-
 phoenix-protocol/src/main/PGuidePosts.proto |   2 +
 9 files changed, 502 insertions(+), 101 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8f1370f5/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 dfe8b60..13cd54c 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
@@ -26,9 +26,11 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Random;
 
 import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -102,10 +104,10 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends 
StatsCollectorAbstract
 
 TestUtil.analyzeTable(conn, STATS_TEST_TABLE_NAME_NEW);
 String query = "UPDATE STATISTICS " + STATS_TEST_TABLE_NAME_NEW + " 
SET \""
-+ QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB + "\"=" + 
Long.toString(2000);
++ QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB + "\"=" + 
Long.toString(250);
 conn.createStatement().execute(query);
 keyRanges = getAllSplits(conn, STATS_TEST_TABLE_NAME_NEW);
-assertEquals(6, keyRanges.size());
+assertEquals(26, keyRanges.size());
 
 rs = conn.createStatement().executeQuery(
 "SELECT 
COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH),COUNT(*) from 
SYSTEM.STATS where PHYSICAL_NAME = '"
@@ -115,27 +117,71 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends 
StatsCollectorAbstract
 assertTrue(rs.next());
 assertEquals("A", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(11040, rs.getInt(3));
-assertEquals(5, rs.getInt(4));
+assertEquals(12420, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("B", rs.getString(1));
 assertEquals(20, rs.getInt(2));
-assertEquals(4432, rs.getInt(3));
-assertEquals(2, rs.getInt(4));
+assertEquals(5540, rs.getInt(3));
+assertEquals(20, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("C", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(6652, rs.getInt(3));
-assertEquals(3, rs.getInt(4));
+assertEquals(6930, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("D", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(6652, rs.getInt(3));
-assertEquals(3, rs.getInt(4));
+assertEquals(6930, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 }
 
+@Test
+public void testRowCountAndByteCounts() throws SQLException {
+Connection conn;
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+conn = DriverManager.getConnection(getUrl(), props);
+String tableName = "T";
+String ddl = "CREATE TABLE " + tableName + " (t_id VARCHAR NOT 
NULL,\n" + "k1 INTEGER NOT NULL,\n"
+

phoenix git commit: PHOENIX-2683 store rowCount and byteCount at guidePost level(Ankit Singhal)

2016-02-16 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/master e797b36c2 -> d2fcd21d4


PHOENIX-2683 store rowCount and byteCount at guidePost level(Ankit Singhal)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d2fcd21d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d2fcd21d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d2fcd21d

Branch: refs/heads/master
Commit: d2fcd21d4f55c17585adbbc41f72027323a8a870
Parents: e797b36
Author: Ankit Singhal 
Authored: Tue Feb 16 22:03:58 2016 +0530
Committer: Ankit Singhal 
Committed: Tue Feb 16 22:03:58 2016 +0530

--
 .../StatsCollectorWithSplitsAndMultiCFIT.java   |  66 +++-
 .../generated/PGuidePostsProtos.java| 336 ++-
 .../org/apache/phoenix/execute/ScanPlan.java|   5 +-
 .../org/apache/phoenix/schema/PTableImpl.java   |  25 +-
 .../phoenix/schema/stats/GuidePostsInfo.java|  69 ++--
 .../schema/stats/GuidePostsInfoBuilder.java |  61 ++--
 .../schema/stats/StatisticsCollector.java   |  21 +-
 .../phoenix/schema/stats/StatisticsWriter.java  |  18 +-
 phoenix-protocol/src/main/PGuidePosts.proto |   2 +
 9 files changed, 502 insertions(+), 101 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2fcd21d/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 dfe8b60..13cd54c 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
@@ -26,9 +26,11 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Random;
 
 import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -102,10 +104,10 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends 
StatsCollectorAbstract
 
 TestUtil.analyzeTable(conn, STATS_TEST_TABLE_NAME_NEW);
 String query = "UPDATE STATISTICS " + STATS_TEST_TABLE_NAME_NEW + " 
SET \""
-+ QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB + "\"=" + 
Long.toString(2000);
++ QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB + "\"=" + 
Long.toString(250);
 conn.createStatement().execute(query);
 keyRanges = getAllSplits(conn, STATS_TEST_TABLE_NAME_NEW);
-assertEquals(6, keyRanges.size());
+assertEquals(26, keyRanges.size());
 
 rs = conn.createStatement().executeQuery(
 "SELECT 
COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH),COUNT(*) from 
SYSTEM.STATS where PHYSICAL_NAME = '"
@@ -115,27 +117,71 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends 
StatsCollectorAbstract
 assertTrue(rs.next());
 assertEquals("A", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(11040, rs.getInt(3));
-assertEquals(5, rs.getInt(4));
+assertEquals(12420, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("B", rs.getString(1));
 assertEquals(20, rs.getInt(2));
-assertEquals(4432, rs.getInt(3));
-assertEquals(2, rs.getInt(4));
+assertEquals(5540, rs.getInt(3));
+assertEquals(20, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("C", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(6652, rs.getInt(3));
-assertEquals(3, rs.getInt(4));
+assertEquals(6930, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 assertTrue(rs.next());
 assertEquals("D", rs.getString(1));
 assertEquals(25, rs.getInt(2));
-assertEquals(6652, rs.getInt(3));
-assertEquals(3, rs.getInt(4));
+assertEquals(6930, rs.getInt(3));
+assertEquals(25, rs.getInt(4));
 
 }
 
+@Test
+public void testRowCountAndByteCounts() throws SQLException {
+Connection conn;
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+conn = DriverManager.getConnection(getUrl(), props);
+String tableName = "T";
+String ddl = "CREATE TABLE " + tableName + " (t_id VARCHAR NOT 
NULL,\n" + "k1 INTEGER NOT NULL,\n"
+