You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ra...@apache.org on 2014/10/21 06:23:53 UTC

git commit: PHOENIX-1356 LocalIndexIT.testLocalIndexScanAfterRegionSplit() failed at distributed cluster when getting regions(Alicia Ying Shu)

Repository: phoenix
Updated Branches:
  refs/heads/master dc7e8c0e6 -> 1816f6e81


PHOENIX-1356 LocalIndexIT.testLocalIndexScanAfterRegionSplit() failed at distributed cluster when getting regions(Alicia Ying Shu)


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

Branch: refs/heads/master
Commit: 1816f6e81de5b8314624629b9f6b45a66cc94ede
Parents: dc7e8c0
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
Authored: Tue Oct 21 04:23:34 2014 +0000
Committer: Rajeshbabu Chintaguntla <ra...@apache.org>
Committed: Tue Oct 21 04:23:34 2014 +0000

----------------------------------------------------------------------
 .../phoenix/end2end/index/LocalIndexIT.java     | 35 ++++++++++----------
 1 file changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1816f6e8/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index 2478317..019e0fb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -650,25 +650,26 @@ public class LocalIndexIT extends BaseIndexIT {
             assertTrue(rs.next());
             
             HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin();
-            HMaster master = getUtility().getHBaseCluster().getMaster();
             for (int i = 1; i < 5; i++) {
-                
-                admin.split(Bytes.toBytes(DATA_TABLE_NAME), ByteUtil.concat(Bytes.toBytes(strings[3*i])));
-                List<HRegionInfo> regionsOfUserTable =
-                        master.getAssignmentManager().getRegionStates().getRegionsOfTable(TableName.valueOf(DATA_TABLE_NAME));
 
-                while (regionsOfUserTable.size() != (4+i)) {
-                    Thread.sleep(100);
-                    regionsOfUserTable = master.getAssignmentManager().getRegionStates().getRegionsOfTable(TableName.valueOf(DATA_TABLE_NAME));
-                }
-                assertEquals(4+i, regionsOfUserTable.size());
-                List<HRegionInfo> regionsOfIndexTable = master.getAssignmentManager().getRegionStates()
-                                .getRegionsOfTable(TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)));
-                while (regionsOfIndexTable.size() != (4+i)) {
-                    Thread.sleep(100);
-                    regionsOfIndexTable = master.getAssignmentManager().getRegionStates()
-                            .getRegionsOfTable(TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)));
-                }
+              admin.split(Bytes.toBytes(DATA_TABLE_NAME), ByteUtil.concat(Bytes.toBytes(strings[3*i])));
+              List<HRegionInfo> regionsOfUserTable = admin.getTableRegions(TableName.valueOf(DATA_TABLE_NAME));
+
+              while (regionsOfUserTable.size() != (4+i)) {
+                Thread.sleep(100);
+                regionsOfUserTable = admin.getTableRegions(TableName.valueOf(DATA_TABLE_NAME)); 
+              }
+              assertEquals(4+i, regionsOfUserTable.size());
+              List<HRegionInfo> regionsOfIndexTable =
+                  admin.getTableRegions(TableName.valueOf(MetaDataUtil
+                    .getLocalIndexTableName(DATA_TABLE_NAME))); 
+
+              while (regionsOfIndexTable.size() != (4+i)) {
+                Thread.sleep(100);
+                regionsOfIndexTable =
+                    admin.getTableRegions(TableName.valueOf(MetaDataUtil
+                      .getLocalIndexTableName(DATA_TABLE_NAME)));
+              }
                 assertEquals(4 + i, regionsOfIndexTable.size());
                 String query = "SELECT t_id,k1,v1 FROM " + DATA_TABLE_NAME;
                 rs = conn1.createStatement().executeQuery(query);