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/05/23 05:31:02 UTC
git commit: PHOENIX-982 Avoid spinning up and tearing down mini
cluster in tests (SamarthJain)
Repository: incubator-phoenix
Updated Branches:
refs/heads/3.0 dbbd53321 -> e3193abb8
PHOENIX-982 Avoid spinning up and tearing down mini cluster in tests (SamarthJain)
Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/e3193abb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/e3193abb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/e3193abb
Branch: refs/heads/3.0
Commit: e3193abb82aa0c3399948bb44391cc2b239bbaec
Parents: dbbd533
Author: James Taylor <jt...@salesforce.com>
Authored: Thu May 22 20:32:06 2014 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Thu May 22 20:32:06 2014 -0700
----------------------------------------------------------------------
.../apache/phoenix/end2end/BaseClientManagedTimeIT.java | 6 +++---
.../apache/phoenix/end2end/BaseHBaseManagedTimeIT.java | 6 +++---
.../end2end/RoundFloorCeilFunctionsEnd2EndIT.java | 10 +++++-----
.../test/java/org/apache/phoenix/query/BaseTest.java | 12 ------------
4 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/e3193abb/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
index 7590a31..79cb64b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
@@ -29,8 +29,8 @@ import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
import org.apache.phoenix.jdbc.PhoenixTestDriver;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.ReadOnlyProps;
+import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
@@ -64,8 +64,8 @@ public abstract class BaseClientManagedTimeIT extends BaseTest {
return new Configuration(config);
}
- @Before
- public void cleanUpBeforeTest() throws Exception {
+ @After
+ public void cleanUpAfterTest() throws Exception {
long ts = nextTimestamp();
deletePriorTables(ts - 1, getUrl());
}
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/e3193abb/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
index ae83585..047afb8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
@@ -28,8 +28,8 @@ import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
import org.apache.phoenix.jdbc.PhoenixTestDriver;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.ReadOnlyProps;
+import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
@@ -63,8 +63,8 @@ public abstract class BaseHBaseManagedTimeIT extends BaseTest {
return new Configuration(config);
}
- @Before
- public void cleanUpBeforeTest() throws Exception {
+ @After
+ public void cleanUpAfterTest() throws Exception {
deletePriorTables(HConstants.LATEST_TIMESTAMP, getUrl());
}
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/e3193abb/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
index dcb79ce..c38f4d6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
@@ -34,7 +34,7 @@ import org.apache.phoenix.expression.function.CeilFunction;
import org.apache.phoenix.expression.function.FloorFunction;
import org.apache.phoenix.expression.function.RoundFunction;
import org.apache.phoenix.util.DateUtil;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -49,8 +49,8 @@ import com.google.common.primitives.Floats;
* @since 3.0.0
*/
-@Category(ClientManagedTimeTest.class)
-public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
+@Category(HBaseManagedTimeTest.class)
+public class RoundFloorCeilFunctionsEnd2EndIT extends BaseHBaseManagedTimeIT {
private static long millisPart = 660;
private static int nanosPart = 500100;
@@ -60,8 +60,8 @@ public class RoundFloorCeilFunctionsEnd2EndIT extends BaseClientManagedTimeIT {
private static float floatUpserted = 1.264f;
private static float unsignedFloatUpserted = 1.264f;
- @BeforeClass
- public static void initTable() throws Exception {
+ @Before
+ public void initTable() throws Exception {
String testString = "abc";
Connection conn = null;
PreparedStatement stmt = null;
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/e3193abb/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index fad5944..51a834d 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -532,18 +532,6 @@ public abstract class BaseTest {
conf.setInt("hbase.regionserver.handler.count", 5);
conf.setInt("hbase.regionserver.metahandler.count", 2);
conf.setInt("hbase.master.handler.count", 2);
- conf.setInt("dfs.namenode.handler.count", 1);
- conf.setInt("dfs.namenode.service.handler.count", 1);
- conf.setInt("dfs.datanode.handler.count", 1);
- conf.setInt("ipc.server.read.threadpool.size", 2);
- conf.setInt("ipc.server.handler.threadpool.size", 2);
- conf.setInt("hbase.hconnection.threads.max", 2);
- conf.setInt("hbase.hconnection.threads.core", 2);
- conf.setInt("hbase.htable.threads.max", 2);
- conf.setInt("hbase.regionserver.hlog.syncer.count", 2);
- conf.setInt("hbase.hlog.asyncer.number", 2);
- conf.setInt("hbase.assignment.zkevent.workers", 5);
- conf.setInt("hbase.assignment.threads.max", 5);
return conf;
}