[24/40] phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

2015-08-23 Thread maryannxue 
PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/calcite
Commit: d41a0fcbd75456bc68eaa673361290504abd9895
Parents: e4ed2d9
Author: Mujtaba 
Authored: Tue Aug 4 15:47:44 2015 -0700
Committer: Mujtaba 
Committed: Tue Aug 4 15:47:44 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d41a0fcb/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 66b949b..b548c04 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@


config
-   
-   **/*.properties
-   




http://git-wip-us.apache.org/repos/asf/phoenix/blob/d41a0fcb/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue("Could not get phoenix columns.", 
columnListFromPhoenix.size() > 0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d41a0fcb/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   /
   
 org.apache.phoenix:phoenix-pherf
-org.jfree:jfreechart
+org.jfree:*
 com.googlecode.java-diff-utils:diffutils
 org.apache.commons:commons-lang3
 org.apache.commons:commons-math3

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d41a0fcb/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorManager;
 import org.apache.phoenix.pherf.schema.SchemaReader;
@@ -73,6 +74,8 @@ public class Pherf {

[10/12] phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

2015-08-11 Thread jamestaylor 
PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 7cf5e20ea7f33e40cb4d38603ec185eb4d6b5819
Parents: f2b94a7
Author: Mujtaba 
Authored: Tue Aug 4 15:47:44 2015 -0700
Committer: James Taylor 
Committed: Tue Aug 11 18:44:51 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cf5e20e/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index b734e4d..d68ddc7 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@


config
-   
-   **/*.properties
-   




http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cf5e20e/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue("Could not get phoenix columns.", 
columnListFromPhoenix.size() > 0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cf5e20e/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   /
   
 org.apache.phoenix:phoenix-pherf
-org.jfree:jfreechart
+org.jfree:*
 com.googlecode.java-diff-utils:diffutils
 org.apache.commons:commons-lang3
 org.apache.commons:commons-math3

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cf5e20e/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorManager;
 import org.apache.phoenix.pherf.schema.SchemaReader;
@@ -73,6 +74,8 @@ public c

[10/12] phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

2015-08-11 Thread jamestaylor 
PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/4.5-HBase-1.0
Commit: 4c945d3c551ecb27fd0ad3af5d6737720f5e6c51
Parents: 01825cc
Author: Mujtaba 
Authored: Tue Aug 4 15:47:44 2015 -0700
Committer: James Taylor 
Committed: Tue Aug 11 18:42:11 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c945d3c/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 281c771..bd92c9e 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@


config
-   
-   **/*.properties
-   




http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c945d3c/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue("Could not get phoenix columns.", 
columnListFromPhoenix.size() > 0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c945d3c/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   /
   
 org.apache.phoenix:phoenix-pherf
-org.jfree:jfreechart
+org.jfree:*
 com.googlecode.java-diff-utils:diffutils
 org.apache.commons:commons-lang3
 org.apache.commons:commons-math3

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c945d3c/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorManager;
 import org.apache.phoenix.pherf.schema.SchemaReader;
@@ -73,6 +74,8 @@ public c

[10/12] phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

2015-08-11 Thread jamestaylor 
PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 060a00ca50f84da561a7c583f55e22bca5d26641
Parents: 0fcefaa
Author: Mujtaba 
Authored: Tue Aug 4 15:47:44 2015 -0700
Committer: James Taylor 
Committed: Tue Aug 11 18:36:52 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/060a00ca/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 68a8905..6cfb0e8 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@


config
-   
-   **/*.properties
-   




http://git-wip-us.apache.org/repos/asf/phoenix/blob/060a00ca/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue("Could not get phoenix columns.", 
columnListFromPhoenix.size() > 0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/060a00ca/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   /
   
 org.apache.phoenix:phoenix-pherf
-org.jfree:jfreechart
+org.jfree:*
 com.googlecode.java-diff-utils:diffutils
 org.apache.commons:commons-lang3
 org.apache.commons:commons-math3

http://git-wip-us.apache.org/repos/asf/phoenix/blob/060a00ca/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorManager;
 import org.apache.phoenix.pherf.schema.SchemaReader;
@@ -73,6 +74,8 @@ public

phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

2015-08-04 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 19fa8389b -> 9205d49b8


PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 9205d49b8333e5fd45ae773702ae4bcfdd3250b2
Parents: 19fa838
Author: Mujtaba 
Authored: Tue Aug 4 15:46:55 2015 -0700
Committer: Mujtaba 
Committed: Tue Aug 4 15:46:55 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9205d49b/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index b7976ec..fdee11e 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@


config
-   
-   **/*.properties
-   




http://git-wip-us.apache.org/repos/asf/phoenix/blob/9205d49b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue("Could not get phoenix columns.", 
columnListFromPhoenix.size() > 0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9205d49b/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   /
   
 org.apache.phoenix:phoenix-pherf
-org.jfree:jfreechart
+org.jfree:*
 com.googlecode.java-diff-utils:diffutils
 org.apache.commons:commons-lang3
 org.apache.commons:commons-math3

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9205d49b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorManag

phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

2015-08-04 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/master e4ed2d9f6 -> d41a0fcbd


PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/master
Commit: d41a0fcbd75456bc68eaa673361290504abd9895
Parents: e4ed2d9
Author: Mujtaba 
Authored: Tue Aug 4 15:47:44 2015 -0700
Committer: Mujtaba 
Committed: Tue Aug 4 15:47:44 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d41a0fcb/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 66b949b..b548c04 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@


config
-   
-   **/*.properties
-   




http://git-wip-us.apache.org/repos/asf/phoenix/blob/d41a0fcb/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue("Could not get phoenix columns.", 
columnListFromPhoenix.size() > 0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d41a0fcb/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   /
   
 org.apache.phoenix:phoenix-pherf
-org.jfree:jfreechart
+org.jfree:*
 com.googlecode.java-diff-utils:diffutils
 org.apache.commons:commons-lang3
 org.apache.commons:commons-math3

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d41a0fcb/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorManager;
 import or

phoenix git commit: PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting after performance run

2015-08-04 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 c2df17656 -> 0410dde88


PHOENIX-2145 Pherf - Make update stats optional and fix threads not exiting 
after performance run


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 0410dde889c67238dd7bb62c38ee7e6f10041797
Parents: c2df176
Author: Mujtaba 
Authored: Tue Aug 4 15:45:00 2015 -0700
Committer: Mujtaba 
Committed: Tue Aug 4 15:45:00 2015 -0700

--
 phoenix-pherf/pom.xml   |  3 --
 .../org/apache/phoenix/pherf/DataIngestIT.java  |  4 +-
 .../src/main/assembly/components-minimal.xml|  2 +-
 .../java/org/apache/phoenix/pherf/Pherf.java| 23 +--
 .../apache/phoenix/pherf/PherfConstants.java|  5 +++
 .../apache/phoenix/pherf/util/PhoenixUtil.java  | 11 +
 .../phoenix/pherf/workload/QueryExecutor.java   |  3 +-
 .../phoenix/pherf/workload/WriteWorkload.java   | 43 ++--
 .../org/apache/phoenix/pherf/PherfTest.java |  2 +-
 9 files changed, 55 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0410dde8/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index e7f8dcd..60b4d60 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -108,9 +108,6 @@


config
-   
-   **/*.properties
-   




http://git-wip-us.apache.org/repos/asf/phoenix/blob/0410dde8/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 8a340b3..1defbb1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -20,6 +20,8 @@ package org.apache.phoenix.pherf;
 
 import com.jcabi.jdbc.JdbcSession;
 import com.jcabi.jdbc.Outcome;
+
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.DataTypeMapping;
@@ -66,7 +68,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 scenario.getTableNameWithoutSchemaName(), 
util.getConnection());
 assertTrue("Could not get phoenix columns.", 
columnListFromPhoenix.size() > 0);
 
-WriteWorkload loader = new WriteWorkload(util, parser, scenario);
+WriteWorkload loader = new WriteWorkload(util, parser, scenario, 
GeneratePhoenixStats.NO);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
 executor.get();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0410dde8/phoenix-pherf/src/main/assembly/components-minimal.xml
--
diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml 
b/phoenix-pherf/src/main/assembly/components-minimal.xml
index 38c6929..9c9b9a1 100644
--- a/phoenix-pherf/src/main/assembly/components-minimal.xml
+++ b/phoenix-pherf/src/main/assembly/components-minimal.xml
@@ -23,7 +23,7 @@
   /
   
 org.apache.phoenix:phoenix-pherf
-org.jfree:jfreechart
+org.jfree:*
 com.googlecode.java-diff-utils:diffutils
 org.apache.commons:commons-lang3
 org.apache.commons:commons-math3

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0410dde8/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
--
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 5a9f45f..0421b6f 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -19,6 +19,7 @@
 package org.apache.phoenix.pherf;
 
 import org.apache.commons.cli.*;
+import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.jmx.MonitorMan