[21/50] [abbrv] phoenix git commit: PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes

2018-09-24 Thread jamestaylor 
PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes


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

Branch: refs/heads/omid2
Commit: 7a2531d5a9efbefbcf158f73cbdc218d3556354c
Parents: 17773a8
Author: Thomas D'Silva 
Authored: Tue Jul 24 10:49:31 2018 -0700
Committer: Thomas D'Silva 
Committed: Mon Aug 6 10:53:18 2018 -0700

--
 .../phoenix/end2end/AlterTableWithViewsIT.java  |   2 +-
 .../phoenix/end2end/BasePermissionsIT.java  |  66 +++---
 .../phoenix/end2end/ChangePermissionsIT.java|   4 +-
 .../MigrateSystemTablesToSystemNamespaceIT.java |  13 +-
 .../end2end/QueryDatabaseMetaDataIT.java|   4 +
 .../phoenix/end2end/TableDDLPermissionsIT.java  |   9 +-
 .../end2end/TenantSpecificTablesDDLIT.java  |   2 +
 .../org/apache/phoenix/end2end/UpgradeIT.java   |  34 +--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 235 +--
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   2 +
 .../phoenix/query/ConnectionQueryServices.java  |  14 ++
 .../query/ConnectionQueryServicesImpl.java  | 170 +++---
 .../query/ConnectionlessQueryServicesImpl.java  |  20 ++
 .../query/DelegateConnectionQueryServices.java  |  11 +
 .../apache/phoenix/query/QueryConstants.java|  14 ++
 .../apache/phoenix/schema/MetaDataClient.java   |  95 +++-
 16 files changed, 523 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a2531d5/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index e39d492..e97a40d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -530,7 +530,7 @@ public class AlterTableWithViewsIT extends 
SplitSystemCatalogIT {
 
 try {
 // should fail because there are two view with different pk 
columns
-conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL PRIMARY KEY, VIEW_COL2 VARCHAR PRIMARY KEY");
+conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL(10,2) PRIMARY KEY, VIEW_COL2 VARCHAR(256) PRIMARY KEY");
 fail();
 }
 catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a2531d5/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
index d33d538..88a942e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
@@ -16,8 +16,29 @@
  */
 package org.apache.phoenix.end2end;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -36,34 +57,13 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.QueryUtil;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.io.IOException;
-import java.lang.reflect.UndeclaredThrowableException;
-import

phoenix git commit: PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes

2018-08-06 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/master 2379080d8 -> fbf6d3549


PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes


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

Branch: refs/heads/master
Commit: fbf6d3549056fc7dddc1b0130656caf83f077f71
Parents: 2379080
Author: Thomas D'Silva 
Authored: Tue Jul 24 10:49:31 2018 -0700
Committer: Thomas D'Silva 
Committed: Mon Aug 6 10:52:47 2018 -0700

--
 .../phoenix/end2end/AlterTableWithViewsIT.java  |   2 +-
 .../phoenix/end2end/BasePermissionsIT.java  |  65 ++---
 .../phoenix/end2end/ChangePermissionsIT.java|   4 +-
 .../MigrateSystemTablesToSystemNamespaceIT.java |  13 +-
 .../end2end/QueryDatabaseMetaDataIT.java|   4 +
 .../phoenix/end2end/TableDDLPermissionsIT.java  |   8 +
 .../end2end/TenantSpecificTablesDDLIT.java  |   2 +
 .../org/apache/phoenix/end2end/UpgradeIT.java   |  33 +--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 242 +--
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   2 +
 .../phoenix/query/ConnectionQueryServices.java  |  14 ++
 .../query/ConnectionQueryServicesImpl.java  | 163 +++--
 .../query/ConnectionlessQueryServicesImpl.java  |  20 ++
 .../query/DelegateConnectionQueryServices.java  |  11 +
 .../apache/phoenix/query/QueryConstants.java|  14 ++
 .../apache/phoenix/schema/MetaDataClient.java   |  95 +++-
 16 files changed, 529 insertions(+), 163 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fbf6d354/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index e39d492..e97a40d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -530,7 +530,7 @@ public class AlterTableWithViewsIT extends 
SplitSystemCatalogIT {
 
 try {
 // should fail because there are two view with different pk 
columns
-conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL PRIMARY KEY, VIEW_COL2 VARCHAR PRIMARY KEY");
+conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL(10,2) PRIMARY KEY, VIEW_COL2 VARCHAR(256) PRIMARY KEY");
 fail();
 }
 catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fbf6d354/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
index 7698fca..515de47 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
@@ -16,8 +16,28 @@
  */
 package org.apache.phoenix.end2end;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -38,34 +58,13 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.QueryUtil;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.io.IOException;
-import java.lang.reflect.UndeclaredThrowableException;

phoenix git commit: PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes

2018-08-06 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.11 c760ac54b -> 4ebbfeb30


PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes


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

Branch: refs/heads/4.x-cdh5.11
Commit: 4ebbfeb305cd81e3b0a5131fa61d008df844c39d
Parents: c760ac5
Author: Thomas D'Silva 
Authored: Tue Jul 24 10:49:31 2018 -0700
Committer: Thomas D'Silva 
Committed: Mon Aug 6 14:27:16 2018 -0700

--
 .../phoenix/end2end/AlterTableWithViewsIT.java  |   2 +-
 .../phoenix/end2end/BasePermissionsIT.java  |  66 +++---
 .../phoenix/end2end/ChangePermissionsIT.java|   4 +-
 .../MigrateSystemTablesToSystemNamespaceIT.java |  14 +-
 .../end2end/QueryDatabaseMetaDataIT.java|   4 +
 .../phoenix/end2end/TableDDLPermissionsIT.java  |   9 +-
 .../end2end/TenantSpecificTablesDDLIT.java  |   2 +
 .../org/apache/phoenix/end2end/UpgradeIT.java   |  34 +--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 235 +--
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   2 +
 .../phoenix/query/ConnectionQueryServices.java  |  14 ++
 .../query/ConnectionQueryServicesImpl.java  | 170 +++---
 .../query/ConnectionlessQueryServicesImpl.java  |  20 ++
 .../query/DelegateConnectionQueryServices.java  |  11 +
 .../apache/phoenix/query/QueryConstants.java|  14 ++
 .../apache/phoenix/schema/MetaDataClient.java   |  95 +++-
 16 files changed, 523 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4ebbfeb3/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index e39d492..e97a40d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -530,7 +530,7 @@ public class AlterTableWithViewsIT extends 
SplitSystemCatalogIT {
 
 try {
 // should fail because there are two view with different pk 
columns
-conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL PRIMARY KEY, VIEW_COL2 VARCHAR PRIMARY KEY");
+conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL(10,2) PRIMARY KEY, VIEW_COL2 VARCHAR(256) PRIMARY KEY");
 fail();
 }
 catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4ebbfeb3/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
index d33d538..88a942e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
@@ -16,8 +16,29 @@
  */
 package org.apache.phoenix.end2end;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -36,34 +57,13 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.QueryUtil;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.io.IOException;

phoenix git commit: PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes

2018-08-06 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 17773a8be -> 7a2531d5a


PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes


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

Branch: refs/heads/4.x-HBase-1.3
Commit: 7a2531d5a9efbefbcf158f73cbdc218d3556354c
Parents: 17773a8
Author: Thomas D'Silva 
Authored: Tue Jul 24 10:49:31 2018 -0700
Committer: Thomas D'Silva 
Committed: Mon Aug 6 10:53:18 2018 -0700

--
 .../phoenix/end2end/AlterTableWithViewsIT.java  |   2 +-
 .../phoenix/end2end/BasePermissionsIT.java  |  66 +++---
 .../phoenix/end2end/ChangePermissionsIT.java|   4 +-
 .../MigrateSystemTablesToSystemNamespaceIT.java |  13 +-
 .../end2end/QueryDatabaseMetaDataIT.java|   4 +
 .../phoenix/end2end/TableDDLPermissionsIT.java  |   9 +-
 .../end2end/TenantSpecificTablesDDLIT.java  |   2 +
 .../org/apache/phoenix/end2end/UpgradeIT.java   |  34 +--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 235 +--
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   2 +
 .../phoenix/query/ConnectionQueryServices.java  |  14 ++
 .../query/ConnectionQueryServicesImpl.java  | 170 +++---
 .../query/ConnectionlessQueryServicesImpl.java  |  20 ++
 .../query/DelegateConnectionQueryServices.java  |  11 +
 .../apache/phoenix/query/QueryConstants.java|  14 ++
 .../apache/phoenix/schema/MetaDataClient.java   |  95 +++-
 16 files changed, 523 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a2531d5/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index e39d492..e97a40d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -530,7 +530,7 @@ public class AlterTableWithViewsIT extends 
SplitSystemCatalogIT {
 
 try {
 // should fail because there are two view with different pk 
columns
-conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL PRIMARY KEY, VIEW_COL2 VARCHAR PRIMARY KEY");
+conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL(10,2) PRIMARY KEY, VIEW_COL2 VARCHAR(256) PRIMARY KEY");
 fail();
 }
 catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a2531d5/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
index d33d538..88a942e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
@@ -16,8 +16,29 @@
  */
 package org.apache.phoenix.end2end;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -36,34 +57,13 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.QueryUtil;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import

phoenix git commit: PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes

2018-08-06 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 2541634da -> c9b8d114c


PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes


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

Branch: refs/heads/4.x-HBase-1.2
Commit: c9b8d114c5bf7e4230c11b0714f9ca853d667145
Parents: 2541634
Author: Thomas D'Silva 
Authored: Tue Jul 24 10:49:31 2018 -0700
Committer: Thomas D'Silva 
Committed: Mon Aug 6 10:53:07 2018 -0700

--
 .../phoenix/end2end/AlterTableWithViewsIT.java  |   2 +-
 .../phoenix/end2end/BasePermissionsIT.java  |  66 +++---
 .../phoenix/end2end/ChangePermissionsIT.java|   4 +-
 .../MigrateSystemTablesToSystemNamespaceIT.java |  13 +-
 .../end2end/QueryDatabaseMetaDataIT.java|   4 +
 .../phoenix/end2end/TableDDLPermissionsIT.java  |   9 +-
 .../end2end/TenantSpecificTablesDDLIT.java  |   2 +
 .../org/apache/phoenix/end2end/UpgradeIT.java   |  34 +--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 235 +--
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   2 +
 .../phoenix/query/ConnectionQueryServices.java  |  14 ++
 .../query/ConnectionQueryServicesImpl.java  | 170 +++---
 .../query/ConnectionlessQueryServicesImpl.java  |  20 ++
 .../query/DelegateConnectionQueryServices.java  |  11 +
 .../apache/phoenix/query/QueryConstants.java|  14 ++
 .../apache/phoenix/schema/MetaDataClient.java   |  95 +++-
 16 files changed, 523 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c9b8d114/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index e39d492..e97a40d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -530,7 +530,7 @@ public class AlterTableWithViewsIT extends 
SplitSystemCatalogIT {
 
 try {
 // should fail because there are two view with different pk 
columns
-conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL PRIMARY KEY, VIEW_COL2 VARCHAR PRIMARY KEY");
+conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL(10,2) PRIMARY KEY, VIEW_COL2 VARCHAR(256) PRIMARY KEY");
 fail();
 }
 catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c9b8d114/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
index d33d538..88a942e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
@@ -16,8 +16,29 @@
  */
 package org.apache.phoenix.end2end;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -36,34 +57,13 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.QueryUtil;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import

phoenix git commit: PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes

2018-08-06 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.4 6e9244e79 -> d0d7daecd


PHOENIX-4799 Write cells using checkAndMutate to prevent conflicting changes


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

Branch: refs/heads/4.x-HBase-1.4
Commit: d0d7daecd9480261c2bcd94436c3e33abb973399
Parents: 6e9244e
Author: Thomas D'Silva 
Authored: Tue Jul 24 10:49:31 2018 -0700
Committer: Thomas D'Silva 
Committed: Mon Aug 6 10:53:27 2018 -0700

--
 .../phoenix/end2end/AlterTableWithViewsIT.java  |   2 +-
 .../phoenix/end2end/BasePermissionsIT.java  |  66 +++---
 .../phoenix/end2end/ChangePermissionsIT.java|   4 +-
 .../MigrateSystemTablesToSystemNamespaceIT.java |  13 +-
 .../end2end/QueryDatabaseMetaDataIT.java|   4 +
 .../phoenix/end2end/TableDDLPermissionsIT.java  |   9 +-
 .../end2end/TenantSpecificTablesDDLIT.java  |   2 +
 .../org/apache/phoenix/end2end/UpgradeIT.java   |  34 +--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 235 +--
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   2 +
 .../phoenix/query/ConnectionQueryServices.java  |  14 ++
 .../query/ConnectionQueryServicesImpl.java  | 170 +++---
 .../query/ConnectionlessQueryServicesImpl.java  |  20 ++
 .../query/DelegateConnectionQueryServices.java  |  11 +
 .../apache/phoenix/query/QueryConstants.java|  14 ++
 .../apache/phoenix/schema/MetaDataClient.java   |  95 +++-
 16 files changed, 523 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d0d7daec/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index e39d492..e97a40d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -530,7 +530,7 @@ public class AlterTableWithViewsIT extends 
SplitSystemCatalogIT {
 
 try {
 // should fail because there are two view with different pk 
columns
-conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL PRIMARY KEY, VIEW_COL2 VARCHAR PRIMARY KEY");
+conn.createStatement().execute("ALTER TABLE " + tableName + " 
ADD VIEW_COL1 DECIMAL(10,2) PRIMARY KEY, VIEW_COL2 VARCHAR(256) PRIMARY KEY");
 fail();
 }
 catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d0d7daec/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
index d33d538..88a942e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
@@ -16,8 +16,29 @@
  */
 package org.apache.phoenix.end2end;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -36,34 +57,13 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.QueryUtil;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import