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/10/06 17:57:01 UTC

[7/7] git commit: Increase memory and tweak test settings to get tests to pass on Mac

Increase memory and tweak test settings to get tests to pass on Mac


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

Branch: refs/heads/3.0
Commit: 006bce10f5b768bac90f79e5d9e91568c7cbafbf
Parents: 002a9de
Author: James Taylor <jt...@salesforce.com>
Authored: Mon Oct 6 09:01:26 2014 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Mon Oct 6 09:01:26 2014 -0700

----------------------------------------------------------------------
 .../it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java    | 1 -
 .../test/java/org/apache/phoenix/query/QueryServicesTestImpl.java  | 2 +-
 pom.xml                                                            | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/006bce10/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
index 8e0866b..e48a938 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
@@ -65,7 +65,6 @@ public class ParallelIteratorsIT extends BaseHBaseManagedTimeIT {
         // Must update config before starting server
         props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, Long.toString(20));
         props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true));
-        props.put(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, Integer.toString(1));
         setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
     }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/006bce10/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java
index 155ba19..54d854f 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java
@@ -52,7 +52,7 @@ public final class QueryServicesTestImpl extends BaseQueryServicesImpl {
     public static final long DEFAULT_MAX_SERVER_METADATA_CACHE_SIZE =  1024L*1024L*4L; // 4 Mb
     public static final long DEFAULT_MAX_CLIENT_METADATA_CACHE_SIZE =  1024L*1024L*2L; // 2 Mb
     public static final long DEFAULT_HISTOGRAM_BYTE_DEPTH = 2000;
-    public static final int DEFAULT_STATS_UPDATE_FREQ_MS = 2000;
+    public static final int DEFAULT_STATS_UPDATE_FREQ_MS = 0;
     
     public QueryServicesTestImpl(ReadOnlyProps defaultProps) {
         this(defaultProps, ReadOnlyProps.EMPTY_PROPS);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/006bce10/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bd9e9c2..cfc0cba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,7 @@
                   <encoding>UTF-8</encoding>
                   <forkCount>${numForkedIT}</forkCount>
                   <reuseForks>true</reuseForks>
-                  <argLine>-enableassertions -Xmx2500m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom</argLine>
+                  <argLine>-enableassertions -Xmx3000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom</argLine>
                   <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
                   <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
                   <groups>org.apache.phoenix.end2end.HBaseManagedTimeTest</groups>