phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject git commit: Run SpillableGroupByIT in its own cluster due to server-side config settings
Date Thu, 09 Oct 2014 00:46:10 GMT
Repository: phoenix
Updated Branches:
  refs/heads/master c7c59604e -> 87664bd3d


Run SpillableGroupByIT in its own cluster due to server-side config settings


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

Branch: refs/heads/master
Commit: 87664bd3d0295b9d0aa6d4294c77c2fb757f4bdb
Parents: c7c5960
Author: James Taylor <jtaylor@salesforce.com>
Authored: Wed Oct 8 17:51:38 2014 -0700
Committer: James Taylor <jtaylor@salesforce.com>
Committed: Wed Oct 8 17:51:38 2014 -0700

----------------------------------------------------------------------
 .../phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java   | 2 ++
 .../phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java    | 2 ++
 .../java/org/apache/phoenix/end2end/SpillableGroupByIT.java  | 8 ++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/87664bd3/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
index d986e40..3920c7d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
@@ -20,7 +20,9 @@
 package org.apache.phoenix.end2end;
 
 import org.junit.After;
+import org.junit.experimental.categories.Category;
 
+@Category(NeedsOwnMiniClusterTest.class)
 public class BaseOwnClusterClientManagedTimeIT extends BaseOwnClusterIT {
     @After
     public void cleanUpAfterTest() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/87664bd3/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
index 3472230..c420473 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
@@ -21,7 +21,9 @@ package org.apache.phoenix.end2end;
 
 import org.apache.hadoop.hbase.HConstants;
 import org.junit.After;
+import org.junit.experimental.categories.Category;
 
+@Category(NeedsOwnMiniClusterTest.class)
 public class BaseOwnClusterHBaseManagedTimeIT extends BaseOwnClusterIT {
     @After
     public void cleanUpAfterTest() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/87664bd3/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
index 9c7e4b9..d3045f8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
@@ -42,8 +42,13 @@ import org.junit.experimental.categories.Category;
 
 import com.google.common.collect.Maps;
 
+/*
+ * Run in own cluster since it updates QueryServices.MAX_MEMORY_SIZE_ATTRIB
+ * and we wouldn't want that to be set for other tests sharing the same
+ * cluster.
+ */
 @Category(HBaseManagedTimeTest.class)
-public class SpillableGroupByIT extends BaseHBaseManagedTimeIT {
+public class SpillableGroupByIT extends BaseOwnClusterHBaseManagedTimeIT {
 
     private static final int NUM_ROWS_INSERTED = 1000;
     
@@ -55,7 +60,6 @@ public class SpillableGroupByIT extends BaseHBaseManagedTimeIT {
     private int id;
 
     @BeforeClass
-    @Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class)
     public static void doSetup() throws Exception {
         Map<String, String> props = Maps.newHashMapWithExpectedSize(1);
         // Set a very small cache size to force plenty of spilling


Mime
View raw message