PHOENIX-4925 Use a Variant Segment tree to organize Guide Post Info

phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateIT.java

@@ -185,9 +185,9 @@ public void testAvgGroupByOrderPreservingWithStats() throws Exception {
         assertEquals(13,rs.getInt(1));
         testAvgGroupByOrderPreserving(conn, tableName, 13);
         conn.createStatement().execute("ALTER TABLE " + tableName + " SET " + PhoenixDatabaseMetaData.GUIDE_POSTS_WIDTH + "=100");
-        testAvgGroupByOrderPreserving(conn, tableName, 6);
+        testAvgGroupByOrderPreserving(conn, tableName, 8);
         conn.createStatement().execute("ALTER TABLE " + tableName + " SET " + PhoenixDatabaseMetaData.GUIDE_POSTS_WIDTH + "=null");
-        testAvgGroupByOrderPreserving(conn, tableName, 4);
+        testAvgGroupByOrderPreserving(conn, tableName, 7);
     }
 
     @Override

phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java

@@ -483,7 +483,7 @@ public void testAvgGroupByOrderPreservingWithNoStats() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl(), props);
         String tableName = generateUniqueName();
         initAvgGroupTable(conn, tableName, "");
-        testAvgGroupByOrderPreserving(conn, tableName, 4);
+        testAvgGroupByOrderPreserving(conn, tableName, 7);
     }
 
     protected void initAvgGroupTable(Connection conn, String tableName, String tableProps) throws SQLException {

phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java

@@ -76,7 +76,7 @@ public BaseViewIT( String txProvider) {
     public static Collection<Object[]> data() {
         return TestUtil.filterTxParamData(Arrays.asList(new Object[][] { {"TEPHRA"}, {"OMID"}, {null} }), 0);
     }
-    
+
     protected void testUpdatableViewWithIndex(Integer saltBuckets, boolean localIndex) throws Exception {
         String viewName = testUpdatableView(saltBuckets);
         Pair<String,Scan> pair = testUpdatableViewIndex(saltBuckets, localIndex, viewName);

phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java

@@ -63,19 +63,6 @@ public class ConcurrentMutationsIT extends ParallelStatsDisabledIT {
 
     private final Object lock = new Object();
 
-    private static class MyClock extends EnvironmentEdge {
-        public volatile long time;
-
-        public MyClock (long time) {
-            this.time = time;
-        }
-
-        @Override
-        public long currentTime() {
-            return time;
-        }
-    }
-
     @Test
     public void testSynchronousDeletesAndUpsertValues() throws Exception {
         final String tableName = generateUniqueName();