You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/08/09 06:02:14 UTC
git commit: Fixing warnings for MutableIndexFailureIT test
Repository: phoenix
Updated Branches:
refs/heads/3.0 49933eeaf -> fdfabba92
Fixing warnings for MutableIndexFailureIT test
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fdfabba9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fdfabba9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fdfabba9
Branch: refs/heads/3.0
Commit: fdfabba925adb3a86b5e4a743e27b6749c29fa5d
Parents: 49933ee
Author: James Taylor <jt...@salesforce.com>
Authored: Fri Aug 8 21:05:19 2014 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Fri Aug 8 21:05:19 2014 -0700
----------------------------------------------------------------------
.../end2end/index/MutableIndexFailureIT.java | 33 +++-----------------
1 file changed, 5 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fdfabba9/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index bbf8a6b..0d75737 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -27,13 +27,10 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import java.io.IOException;
import java.sql.Connection;
-import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Properties;
@@ -47,46 +44,25 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseCluster;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableNotFoundException;
import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.hadoop.hbase.filter.CompareFilter;
-import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.hadoop.hbase.regionserver.RegionScanner;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
-import org.apache.phoenix.index.PhoenixIndexFailurePolicy;
-import org.apache.phoenix.jdbc.PhoenixConnection;
-import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.jdbc.PhoenixTestDriver;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.query.QueryServicesOptions;
-import org.apache.phoenix.schema.MetaDataClient;
-import org.apache.phoenix.schema.PDataType;
import org.apache.phoenix.schema.PIndexState;
-import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.PTableType;
-import org.apache.phoenix.schema.TableRef;
-import org.apache.phoenix.util.MetaDataUtil;
-import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
/**
@@ -274,9 +250,9 @@ public class MutableIndexFailureIT extends BaseTest {
// find a RS which doesn't has CATALOG table
byte[] catalogTable = Bytes.toBytes("SYSTEM.CATALOG");
byte[] indexTable = Bytes.toBytes(INDEX_TABLE_FULL_NAME);
- final HBaseCluster cluster = this.util.getHBaseCluster();
+ final HBaseCluster cluster = util.getHBaseCluster();
Collection<ServerName> rss = cluster.getClusterStatus().getServers();
- HBaseAdmin admin = this.util.getHBaseAdmin();
+ HBaseAdmin admin = util.getHBaseAdmin();
List<HRegionInfo> regions = admin.getTableRegions(catalogTable);
ServerName catalogRS = cluster.getServerHoldingRegion(regions.get(0).getRegionName());
ServerName metaRS = cluster.getServerHoldingMeta();
@@ -315,10 +291,10 @@ public class MutableIndexFailureIT extends BaseTest {
Thread.sleep(100);
// kill RS hosting index table
- this.util.getHBaseCluster().killRegionServer(rsToBeKilled);
+ util.getHBaseCluster().killRegionServer(rsToBeKilled);
// wait for index table completes recovery
- this.util.waitUntilAllRegionsAssigned(indexTable);
+ util.waitUntilAllRegionsAssigned(indexTable);
// Verify the metadata for index is correct.
do {
@@ -348,6 +324,7 @@ public class MutableIndexFailureIT extends BaseTest {
this.conn = conn;
}
+ @Override
public void run() {
if(inProgress.get() > 0){
return;