[26/50] [abbrv] phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf

2015-07-20 Thread maryannxue 
PHOENIX-2109 - Joda time version conflict between phoenix and pherf


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

Branch: refs/heads/calcite
Commit: a772a4a0ca3c9ac98335ce2148eb2b34d3ce1369
Parents: 70c542d
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:23:53 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:23:53 2015 -0700

--
 phoenix-pherf/pom.xml| 2 +-
 .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java   | 8 
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a772a4a0/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 0facbde..4d27305 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
 dependency
 groupIdjoda-time/groupId
 artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
 /dependency
 dependency
 groupIdcom.googlecode.java-diff-utils/groupId

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a772a4a0/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 828ac38..8a340b3 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
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
 import org.apache.phoenix.pherf.rules.DataValue;
 import org.apache.phoenix.pherf.rules.RulesApplier;
 import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
 import org.apache.phoenix.pherf.workload.WorkloadExecutor;
 import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WriteWorkload loader = new WriteWorkload(util, parser, scenario);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
+executor.get();
 
 RulesApplier rulesApplier = loader.getRulesApplier();
 ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
 data.getDistribution() == Integer.MIN_VALUE);
 }
 }
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util, 
executor.getPool());
+executor.add(query);
+executor.get();
+
 } catch (Exception e) {
 fail(We had an exception:  + e.getMessage());
 }

phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf

2015-07-13 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/master 70c542d8e - a772a4a0c


PHOENIX-2109 - Joda time version conflict between phoenix and pherf


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

Branch: refs/heads/master
Commit: a772a4a0ca3c9ac98335ce2148eb2b34d3ce1369
Parents: 70c542d
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:23:53 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:23:53 2015 -0700

--
 phoenix-pherf/pom.xml| 2 +-
 .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java   | 8 
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a772a4a0/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 0facbde..4d27305 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
 dependency
 groupIdjoda-time/groupId
 artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
 /dependency
 dependency
 groupIdcom.googlecode.java-diff-utils/groupId

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a772a4a0/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 828ac38..8a340b3 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
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
 import org.apache.phoenix.pherf.rules.DataValue;
 import org.apache.phoenix.pherf.rules.RulesApplier;
 import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
 import org.apache.phoenix.pherf.workload.WorkloadExecutor;
 import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WriteWorkload loader = new WriteWorkload(util, parser, scenario);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
+executor.get();
 
 RulesApplier rulesApplier = loader.getRulesApplier();
 ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
 data.getDistribution() == Integer.MIN_VALUE);
 }
 }
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util, 
executor.getPool());
+executor.add(query);
+executor.get();
+
 } catch (Exception e) {
 fail(We had an exception:  + e.getMessage());
 }

phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf

2015-07-13 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-1.0 4ffdcdeea - d226c6a63


PHOENIX-2109 - Joda time version conflict between phoenix and pherf


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

Branch: refs/heads/4.4-HBase-1.0
Commit: d226c6a63d118da109299aa8d9f82001c4d8d61f
Parents: 4ffdcde
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:27:09 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:27:09 2015 -0700

--
 phoenix-pherf/pom.xml| 2 +-
 .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java   | 8 
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d226c6a6/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index dc03af4..f987a8c 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
 dependency
 groupIdjoda-time/groupId
 artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
 /dependency
 dependency
 groupIdcom.googlecode.java-diff-utils/groupId

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d226c6a6/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 828ac38..8a340b3 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
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
 import org.apache.phoenix.pherf.rules.DataValue;
 import org.apache.phoenix.pherf.rules.RulesApplier;
 import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
 import org.apache.phoenix.pherf.workload.WorkloadExecutor;
 import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WriteWorkload loader = new WriteWorkload(util, parser, scenario);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
+executor.get();
 
 RulesApplier rulesApplier = loader.getRulesApplier();
 ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
 data.getDistribution() == Integer.MIN_VALUE);
 }
 }
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util, 
executor.getPool());
+executor.add(query);
+executor.get();
+
 } catch (Exception e) {
 fail(We had an exception:  + e.getMessage());
 }

phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf

2015-07-13 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-1.1 26e8cf244 - eeefd6d12


PHOENIX-2109 - Joda time version conflict between phoenix and pherf


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

Branch: refs/heads/4.4-HBase-1.1
Commit: eeefd6d12fd3a6ffc58e1674ddacec6986307c38
Parents: 26e8cf2
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:28:14 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:28:14 2015 -0700

--
 phoenix-pherf/pom.xml| 2 +-
 .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java   | 8 
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/eeefd6d1/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index a852a85..b6b9130 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
 dependency
 groupIdjoda-time/groupId
 artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
 /dependency
 dependency
 groupIdcom.googlecode.java-diff-utils/groupId

http://git-wip-us.apache.org/repos/asf/phoenix/blob/eeefd6d1/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 828ac38..8a340b3 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
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
 import org.apache.phoenix.pherf.rules.DataValue;
 import org.apache.phoenix.pherf.rules.RulesApplier;
 import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
 import org.apache.phoenix.pherf.workload.WorkloadExecutor;
 import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WriteWorkload loader = new WriteWorkload(util, parser, scenario);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
+executor.get();
 
 RulesApplier rulesApplier = loader.getRulesApplier();
 ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
 data.getDistribution() == Integer.MIN_VALUE);
 }
 }
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util, 
executor.getPool());
+executor.add(query);
+executor.get();
+
 } catch (Exception e) {
 fail(We had an exception:  + e.getMessage());
 }

phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf

2015-07-13 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 54e98aa4a - fae7ee04a


PHOENIX-2109 - Joda time version conflict between phoenix and pherf


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

Branch: refs/heads/4.x-HBase-0.98
Commit: fae7ee04a50460c8b2255f26340510f3120f26c9
Parents: 54e98aa
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:31:07 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:31:07 2015 -0700

--
 phoenix-pherf/pom.xml| 2 +-
 .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java   | 8 
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fae7ee04/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index bc4a07a..9bdd583 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -218,7 +218,7 @@
 dependency
 groupIdjoda-time/groupId
 artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
 /dependency
 dependency
 groupIdcom.googlecode.java-diff-utils/groupId

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fae7ee04/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 828ac38..8a340b3 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
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
 import org.apache.phoenix.pherf.rules.DataValue;
 import org.apache.phoenix.pherf.rules.RulesApplier;
 import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
 import org.apache.phoenix.pherf.workload.WorkloadExecutor;
 import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WriteWorkload loader = new WriteWorkload(util, parser, scenario);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
+executor.get();
 
 RulesApplier rulesApplier = loader.getRulesApplier();
 ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
 data.getDistribution() == Integer.MIN_VALUE);
 }
 }
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util, 
executor.getPool());
+executor.add(query);
+executor.get();
+
 } catch (Exception e) {
 fail(We had an exception:  + e.getMessage());
 }

phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf

2015-07-13 Thread codymarcel 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-0.98 7fa989ad2 - 421f851dc


PHOENIX-2109 - Joda time version conflict between phoenix and pherf


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

Branch: refs/heads/4.4-HBase-0.98
Commit: 421f851dc4b5352527cae0413f207ca13c28cd25
Parents: 7fa989a
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:25:58 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:25:58 2015 -0700

--
 phoenix-pherf/pom.xml| 2 +-
 .../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java   | 8 
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/421f851d/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 9319a7d..1b3f0a1 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
 dependency
 groupIdjoda-time/groupId
 artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
 /dependency
 dependency
 groupIdcom.googlecode.java-diff-utils/groupId

http://git-wip-us.apache.org/repos/asf/phoenix/blob/421f851d/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 828ac38..8a340b3 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
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
 import org.apache.phoenix.pherf.rules.DataValue;
 import org.apache.phoenix.pherf.rules.RulesApplier;
 import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
 import org.apache.phoenix.pherf.workload.WorkloadExecutor;
 import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
 WriteWorkload loader = new WriteWorkload(util, parser, scenario);
 WorkloadExecutor executor = new WorkloadExecutor();
 executor.add(loader);
+executor.get();
 
 RulesApplier rulesApplier = loader.getRulesApplier();
 ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
 data.getDistribution() == Integer.MIN_VALUE);
 }
 }
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util, 
executor.getPool());
+executor.add(query);
+executor.get();
+
 } catch (Exception e) {
 fail(We had an exception:  + e.getMessage());
 }