phoenix git commit: PHOENIX-2647 Fix errors in 2 tests related to DDL issues for transaction (addendum)

2016-02-05 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 7bbca60c4 -> 9d52105e5


PHOENIX-2647 Fix errors in 2 tests related to DDL issues for transaction 
(addendum)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 9d52105e54198a271491f0337b79ec1d64ad8bd2
Parents: 7bbca60
Author: Ankit Singhal 
Authored: Sat Feb 6 01:12:50 2016 +0530
Committer: Ankit Singhal 
Committed: Sat Feb 6 01:12:50 2016 +0530

--
 .../src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9d52105e/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 4450152..e72f41f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -131,8 +131,8 @@ public class StatsCollectorIT extends 
StatsCollectorAbstractIT {
 conn = DriverManager.getConnection(getUrl(), props);
 conn.createStatement()
 .execute("CREATE TABLE " + fullTableName
-+ " ( k VARCHAR, c1.a bigint,c2.b bigint CONSTRAINT pk 
PRIMARY KEY (k)) "
-+ (splitKey != null ? "split on (" + splitKey + ")" : 
""));
++ " ( k VARCHAR, c1.a bigint,c2.b bigint CONSTRAINT pk 
PRIMARY KEY (k))"+ tableDDLOptions
++ (splitKey != null ? " split on (" + splitKey + ")" : 
"") );
 conn.createStatement().execute("upsert into " + fullTableName + " 
values ('abc',1,3)");
 conn.createStatement().execute("upsert into " + fullTableName + " 
values ('def',2,4)");
 conn.commit();

phoenix git commit: PHOENIX-2647 Fix errors in 2 tests related to DDL issues for transaction (addendum)

2016-02-05 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 5cd5fe45c -> bd2cf10c5


PHOENIX-2647 Fix errors in 2 tests related to DDL issues for transaction 
(addendum)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: bd2cf10c5c7ef9fbd7b202dd094928f63b69e901
Parents: 5cd5fe4
Author: Ankit Singhal 
Authored: Sat Feb 6 01:12:00 2016 +0530
Committer: Ankit Singhal 
Committed: Sat Feb 6 01:12:00 2016 +0530

--
 .../src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bd2cf10c/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index b1d21c7..ff2bcda 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -132,8 +132,8 @@ public class StatsCollectorIT extends 
StatsCollectorAbstractIT {
 conn = DriverManager.getConnection(getUrl(), props);
 conn.createStatement()
 .execute("CREATE TABLE " + fullTableName
-+ " ( k VARCHAR, c1.a bigint,c2.b bigint CONSTRAINT pk 
PRIMARY KEY (k)) "
-+ (splitKey != null ? "split on (" + splitKey + ")" : 
""));
++ " ( k VARCHAR, c1.a bigint,c2.b bigint CONSTRAINT pk 
PRIMARY KEY (k))"+ tableDDLOptions
++ (splitKey != null ? " split on (" + splitKey + ")" : 
"") );
 conn.createStatement().execute("upsert into " + fullTableName + " 
values ('abc',1,3)");
 conn.createStatement().execute("upsert into " + fullTableName + " 
values ('def',2,4)");
 conn.commit();

phoenix git commit: PHOENIX-2647 Fix errors in 2 tests related to DDL issues for transaction (addendum)

2016-02-05 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/master b64edb754 -> fa58fc5fc


PHOENIX-2647 Fix errors in 2 tests related to DDL issues for transaction 
(addendum)


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

Branch: refs/heads/master
Commit: fa58fc5fccd11cbeb14e701a59122b3cba77d67e
Parents: b64edb7
Author: Ankit Singhal 
Authored: Sat Feb 6 01:11:22 2016 +0530
Committer: Ankit Singhal 
Committed: Sat Feb 6 01:11:22 2016 +0530

--
 .../src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fa58fc5f/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 4450152..e72f41f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -131,8 +131,8 @@ public class StatsCollectorIT extends 
StatsCollectorAbstractIT {
 conn = DriverManager.getConnection(getUrl(), props);
 conn.createStatement()
 .execute("CREATE TABLE " + fullTableName
-+ " ( k VARCHAR, c1.a bigint,c2.b bigint CONSTRAINT pk 
PRIMARY KEY (k)) "
-+ (splitKey != null ? "split on (" + splitKey + ")" : 
""));
++ " ( k VARCHAR, c1.a bigint,c2.b bigint CONSTRAINT pk 
PRIMARY KEY (k))"+ tableDDLOptions
++ (splitKey != null ? " split on (" + splitKey + ")" : 
"") );
 conn.createStatement().execute("upsert into " + fullTableName + " 
values ('abc',1,3)");
 conn.createStatement().execute("upsert into " + fullTableName + " 
values ('def',2,4)");
 conn.commit();